[Emacs-diffs] /srv/bzr/emacs/trunk r108539: In special-display-popup-frame don't use window--display-buffer (Bug#11651).

[martin rudalics]

------------------------------------------------------------
revno: 108539
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-09 11:59:14 +0200
message:
  In special-display-popup-frame don't use window--display-buffer (Bug#11651).
  
  * window.el (special-display-popup-frame): Don't use
  window--display-buffer (Bug#11651).
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-09 09:15:13 +0000
+++ b/lisp/ChangeLog    2012-06-09 09:59:14 +0000
@@ -1,3 +1,8 @@
+2012-06-09  Martin Rudalics  <address@hidden>
+
+       * window.el (special-display-popup-frame): Don't use
+       window--display-buffer (Bug#11651).
+
 2012-06-09  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200.  (Bug#11649)

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-06-05 09:11:06 +0000
+++ b/lisp/window.el    2012-06-09 09:59:14 +0000
@@ -4263,11 +4263,13 @@
                special-display-buffer-names special-display-regexps)
           (display-buffer buffer)))
        ;; If no window yet, make one in a new frame.
-       (let ((frame
-             (with-current-buffer buffer
-               (make-frame (append args special-display-frame-alist)))))
-        (window--display-buffer
-         buffer (frame-selected-window frame) 'frame t))))))
+       (let* ((frame
+              (with-current-buffer buffer
+                (make-frame (append args special-display-frame-alist))))
+             (window (frame-selected-window frame)))
+        (display-buffer-record-window 'frame window buffer)
+        (set-window-dedicated-p window t)
+        window)))))
 
 (defcustom special-display-function 'special-display-popup-frame
   "Function to call for displaying special buffers.