emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bind to zn/zN to new narrow/widen (indirect) commands

Browse source
This commit is contained in:
Henrik Lissner 2019-09-13 00:26:25 -04:00
parent a217b0132e
commit 5e6c2205b8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
core/autoload/ui.el
View file

@ -169,35 +169,43 @@ OPACITY is an integer between 0 to 100, inclusive."
100)))) 100))))
(set-frame-parameter nil 'alpha opacity)) (set-frame-parameter nil 'alpha opacity))
(defvar-local doom--buffer-narrowed-origin nil)
(defvar-local doom--buffer-narrowed-window-start nil)
;;;###autoload ;;;###autoload
(defun doom/clone-and-narrow-buffer (beg end &optional clone-p) (defun doom/narrow-buffer-indirectly (beg end &optional clone-p)
"Restrict editing in this buffer to the current region, indirectly. With CLONE-P, "Restrict editing in this buffer to the current region, indirectly.
clone the buffer and hard-narrow the selection. If mark isn't active, then widen
the buffer (if narrowed). This creates an indirect clone of the buffer, so that the narrowing doesn't
affect other windows displaying the same buffer. Call
`doom/widen-indirectly-narrowed-buffer' to undo it.
Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
(interactive (interactive
(list (or (bound-and-true-p evil-visual-beginning) (region-beginning)) (list (or (bound-and-true-p evil-visual-beginning) (region-beginning))
(or (bound-and-true-p evil-visual-end) (region-end)) (or (bound-and-true-p evil-visual-end) (region-end))
current-prefix-arg)) current-prefix-arg))
(cond ((or (region-active-p)
(not (buffer-narrowed-p)))
(unless (region-active-p) (unless (region-active-p)
(setq beg (line-beginning-position) (setq beg (line-beginning-position)
end (line-end-position))) end (line-end-position)))
(setq deactivate-mark t) (deactivate-mark)
(when clone-p (with-current-buffer (switch-to-buffer (clone-indirect-buffer nil nil))
(let ((old-buf (current-buffer))) (narrow-to-region beg end)))
(switch-to-buffer (clone-indirect-buffer nil nil))
(setq doom--buffer-narrowed-origin old-buf))) ;;;###autoload
(setq doom--buffer-narrowed-window-start (window-start)) (defun doom/widen-indirectly-narrowed-buffer (&optional dontkill)
(narrow-to-region beg end)) "Widens narrowed indirect buffer, created with
(doom--buffer-narrowed-origin
(kill-current-buffer) Mainly used for indirectly narrowed buffers created by
(switch-to-buffer doom--buffer-narrowed-origin) `doom/narrow-buffer-indirectly', but will work with `narrow-to-region' and
(setq doom--buffer-narrowed-origin nil)) others."
(t (interactive "P")
(widen) (unless (buffer-narrowed-p)
(set-window-start nil doom--buffer-narrowed-window-start)))) (user-error "Buffer isn't narrowed"))
(let ((buffers (list (current-buffer)))
buffer)
(while (setq buffer (buffer-base-buffer buffer))
(when (buffer-live-p buffer)
(push buffer buffers)))
(when buffers
(switch-to-buffer (car buffers))
(unless dontkill
(mapc #'kill-buffer (cdr buffers))))
(widen)))

2
modules/config/default/+evil-bindings.el
View file

@ -116,6 +116,8 @@
:v "g+" #'evil-numbers/inc-at-pt :v "g+" #'evil-numbers/inc-at-pt
;; custom evil keybinds ;; custom evil keybinds
:n "zn" #'doom/narrow-buffer-indirectly
:n "zN" #'doom/widen-indirectly-narrowed-buffer
:n "zx" #'kill-current-buffer :n "zx" #'kill-current-buffer
:n "ZX" #'bury-buffer :n "ZX" #'bury-buffer
;; repeat in visual mode (FIXME buggy) ;; repeat in visual mode (FIXME buggy)