emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/edit-indirect 99a88e9590 17/28: Make edit-indirect-quit-wi


From: ELPA Syncer
Subject: [nongnu] elpa/edit-indirect 99a88e9590 17/28: Make edit-indirect-quit-window a buffer-local variable
Date: Thu, 7 Jul 2022 11:59:14 -0400 (EDT)

branch: elpa/edit-indirect
commit 99a88e9590bc0e2f94618a7daa97d0f9526ef1f0
Author: Fanael Linithien <fanael4@gmail.com>
Commit: Fanael Linithien <fanael4@gmail.com>

    Make edit-indirect-quit-window a buffer-local variable
    
    Fixes another instance of #2 that occured when the edit-indirect buffer
    was displayed in the same window as the parent buffer.
---
 edit-indirect.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/edit-indirect.el b/edit-indirect.el
index fb5a0afc63..a91bf4f56c 100644
--- a/edit-indirect.el
+++ b/edit-indirect.el
@@ -106,6 +106,7 @@ end of the changed region."
            "This is not an edit-indirect buffer"))
 
 (defvar edit-indirect--overlay)
+(defvar edit-indirect--should-quit-window nil)
 
 ;;;###autoload
 (defun edit-indirect-region (beg end &optional display-buffer)
@@ -143,9 +144,9 @@ In any case, return the edit-indirect buffer."
      (user-error "No region")))
   (let ((buffer (edit-indirect--get-edit-indirect-buffer beg end)))
     (when display-buffer
-      (let ((window (display-buffer buffer)))
-        (set-window-parameter window 'edit-indirect-should-quit t)
-        (select-window window)))
+      (with-current-buffer buffer
+        (setq-local edit-indirect--should-quit-window t))
+      (select-window (display-buffer buffer)))
     buffer))
 
 (defvar edit-indirect-mode-map
@@ -340,7 +341,7 @@ called with updated positions."
   ;; won't try to call us again.
   (setq edit-indirect--overlay nil)
   ;; If we created a window, get rid of it. Kill the buffer we created.
-  (if (window-parameter nil 'edit-indirect-should-quit)
+  (if edit-indirect--should-quit-window
       (quit-window t)
     (kill-buffer)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]