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

Fix doom/clone-and-narrow-buffer

Browse source 
Also restores window scroll position after widening.
This commit is contained in:
Henrik Lissner 2019-06-10 00:59:18 +02:00
parent 5d94f048b6
commit 158e4cc97c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/autoload/ui.el
View file

@ -161,6 +161,7 @@ OPACITY is an integer between 0 to 100, inclusive."
(set-frame-parameter nil 'alpha opacity)) (set-frame-parameter nil 'alpha opacity))
(defvar-local doom--buffer-narrowed-origin nil) (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/clone-and-narrow-buffer (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. With CLONE-P,
@ -168,18 +169,26 @@ clone the buffer and hard-narrow the selection. If mark isn't active, then widen
the buffer (if narrowed). the buffer (if narrowed).
Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
(interactive "rP") (interactive
(list (or (bound-and-true-p evil-visual-beginning) (region-beginning))
(or (bound-and-true-p evil-visual-end) (region-end))
current-prefix-arg))
(cond ((or (region-active-p) (cond ((or (region-active-p)
(and beg end)) (not (buffer-narrowed-p)))
(deactivate-mark) (unless (region-active-p)
(setq beg (line-beginning-position)
end (line-end-position)))
(setq deactivate-mark t)
(when clone-p (when clone-p
(let ((old-buf (current-buffer))) (let ((old-buf (current-buffer)))
(switch-to-buffer (clone-indirect-buffer nil nil)) (switch-to-buffer (clone-indirect-buffer nil nil))
(setq doom--buffer-narrowed-origin old-buf))) (setq doom--buffer-narrowed-origin old-buf)))
(setq doom--buffer-narrowed-window-start (window-start))
(narrow-to-region beg end)) (narrow-to-region beg end))
(doom--buffer-narrowed-origin (doom--buffer-narrowed-origin
(kill-current-buffer) (kill-current-buffer)
(switch-to-buffer doom--buffer-narrowed-origin) (switch-to-buffer doom--buffer-narrowed-origin)
(setq doom--buffer-narrowed-origin nil)) (setq doom--buffer-narrowed-origin nil))
(t (t
(widen)))) (widen)
(set-window-start nil doom--buffer-narrowed-window-start))))