[Emacs-diffs] emacs/lisp ChangeLog window.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/25 16:36:08

Modified files:
        lisp           : ChangeLog window.el 

Log message:
        Really make the *Completions* window soft-dedicated (bug#5030).
        * window.el (window--display-buffer-2): Add `dedicated' argument.
        (display-buffer): Pass it when needed so the dedicated flag is set
        after calling set-window-buffer, which would otherwise reset it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16730&r2=1.16731
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/window.el?cvsroot=emacs&r1=1.188&r2=1.189

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16730
retrieving revision 1.16731
diff -u -b -r1.16730 -r1.16731
--- ChangeLog   25 Nov 2009 06:08:42 -0000      1.16730
+++ ChangeLog   25 Nov 2009 16:36:04 -0000      1.16731
@@ -1,5 +1,12 @@
 2009-11-25  Stefan Monnier  <address@hidden>
 
+       Really make the *Completions* window soft-dedicated (bug#5030).
+       * window.el (window--display-buffer-2): Add `dedicated' argument.
+       (display-buffer): Pass it when needed so the dedicated flag is set
+       after calling set-window-buffer, which would otherwise reset it.
+
+2009-11-25  Stefan Monnier  <address@hidden>
+
        * progmodes/meta-mode.el (meta-complete-symbol):
        * progmodes/etags.el (complete-tag):
        * mail/mailabbrev.el (mail-abbrev-complete-alias):

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- window.el   23 Nov 2009 05:37:37 -0000      1.188
+++ window.el   25 Nov 2009 16:36:08 -0000      1.189
@@ -1035,11 +1035,14 @@
       (raise-frame frame))
     window))
 
-(defun window--display-buffer-2 (buffer window)
+(defun window--display-buffer-2 (buffer window &optional dedicated)
   "Display BUFFER in WINDOW and make its frame visible.
+Set `window-dedicated-p' to DEDICATED if non-nil.
 Return WINDOW."
   (when (and (buffer-live-p buffer) (window-live-p window))
     (set-window-buffer window buffer)
+    (when dedicated
+      (set-window-dedicated-p window-to-use dedicated))
     (window--display-buffer-1 window)))
 
 (defvar display-buffer-mark-dedicated nil
@@ -1139,9 +1142,7 @@
      ((or use-pop-up-frames (not frame-to-use))
       ;; We want or need a new frame.
       (let ((win (frame-selected-window (funcall pop-up-frame-function))))
-        (when display-buffer-mark-dedicated
-          (set-window-dedicated-p win display-buffer-mark-dedicated))
-        (window--display-buffer-2 buffer win)))
+        (window--display-buffer-2 buffer win display-buffer-mark-dedicated)))
      ((and pop-up-windows
           ;; Make a new window.
           (or (not (frame-parameter frame-to-use 'unsplittable))
@@ -1157,9 +1158,8 @@
                      (get-largest-window frame-to-use t))
                     (window--try-to-split-window
                      (get-lru-window frame-to-use t)))))
-      (when display-buffer-mark-dedicated
-        (set-window-dedicated-p window-to-use display-buffer-mark-dedicated))
-      (window--display-buffer-2 buffer window-to-use))
+      (window--display-buffer-2 buffer window-to-use
+                                display-buffer-mark-dedicated))
      ((let ((window-to-undedicate
             ;; When NOT-THIS-WINDOW is non-nil, temporarily dedicate
             ;; the selected window to its buffer, to avoid that some of