[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105502: When displaying a buffer don
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105502: When displaying a buffer don't use or split a side window unless explicitly requested. |
Date: |
Sat, 20 Aug 2011 12:02:04 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105502
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-20 12:02:04 +0200
message:
When displaying a buffer don't use or split a side window unless explicitly
requested.
* window.el (display-buffer-reuse-window)
(display-buffer-pop-up-window): Don't reuse or split a side
window.
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-08-19 18:23:09 +0000
+++ b/lisp/ChangeLog 2011-08-20 10:02:04 +0000
@@ -1,3 +1,9 @@
+2011-08-20 Martin Rudalics <address@hidden>
+
+ * window.el (display-buffer-reuse-window)
+ (display-buffer-pop-up-window): Don't reuse or split a side
+ window.
+
2011-08-19 Glenn Morris <address@hidden>
* files.el (hack-local-variables-prop-line, hack-local-variables):
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-08-17 06:50:31 +0000
+++ b/lisp/window.el 2011-08-20 10:02:04 +0000
@@ -4763,8 +4763,10 @@
(dolist (window (window-list-1 nil 'nomini method-frame))
(let ((window-buffer (window-buffer window)))
(when (and (not (window-minibuffer-p window))
- ;; Don't reuse a side window.
- (or (not (eq (window-parameter window 'window-side) 'side))
+ ;; Don't reuse a side window unless it shows the
+ ;; buffer already.
+ (or (memq (window-parameter window 'window-side)
+ '(nil none))
(eq window-buffer buffer))
(or (not method-window)
(and (eq method-window 'same)
@@ -5033,7 +5035,8 @@
;; and must be neither a minibuffer window
(not (window-minibuffer-p window))
;; nor a side window.
- (not (eq (window-parameter window 'window-side) 'side)))
+ (memq (window-parameter window 'window-side)
+ '(nil none)))
(setq window
(cond
((memq side display-buffer-side-specifiers)
@@ -6079,9 +6082,6 @@
See also `same-window-regexps'."
:type '(repeat (string :format "%v"))
:group 'windows)
-;; (make-obsolete-variable
- ;; 'same-window-buffer-names
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom same-window-regexps nil
"List of regexps saying which buffers should appear in the \"same\" window.
@@ -6097,9 +6097,6 @@
See also `same-window-buffer-names'."
:type '(repeat (regexp :format "%v"))
:group 'windows)
-;; (make-obsolete-variable
- ;; 'same-window-regexps
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defun same-window-p (buffer-name)
"Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\"
window.
@@ -6143,9 +6140,6 @@
(symbol :tag "Parameter")
(sexp :tag "Value")))
:group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-frame-alist
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defun special-display-popup-frame (buffer &optional args)
"Display BUFFER in a special frame and return the window chosen.
@@ -6210,9 +6204,6 @@
:type 'function
:group 'windows
:group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom special-display-buffer-names nil
"List of names of buffers that should be displayed specially.
@@ -6277,9 +6268,6 @@
(repeat :tag "Arguments" (sexp)))))
:group 'windows
:group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-buffer-names
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
;;;###autoload
(put 'special-display-buffer-names 'risky-local-variable t)
@@ -6348,9 +6336,6 @@
(repeat :tag "Arguments" (sexp)))))
:group 'windows
:group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-regexps
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defun special-display-p (buffer-name)
"Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -6400,9 +6385,6 @@
(symbol :tag "Parameter")
(sexp :tag "Value")))
:group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frame-alist
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom pop-up-frame-function
(lambda () (make-frame pop-up-frame-alist))
@@ -6412,9 +6394,6 @@
`pop-up-frame-alist'."
:type 'function
:group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frame-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom pop-up-frames nil
"Whether `display-buffer' should make a separate frame.
@@ -6428,9 +6407,6 @@
(const :tag "Always" t))
:group 'windows
:group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom display-buffer-reuse-frames nil
"Set and non-nil means `display-buffer' should reuse frames.
@@ -6440,17 +6416,11 @@
:version "21.1"
:group 'windows
:group 'frames)
-;; (make-obsolete-variable
- ;; 'display-buffer-reuse-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom pop-up-windows t
"Non-nil means `display-buffer' should make a new window."
:type 'boolean
:group 'windows)
-;; (make-obsolete-variable
- ;; 'pop-up-windows
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom split-window-preferred-function 'split-window-sensibly
"Function called by `display-buffer' to split a window.
@@ -6477,9 +6447,6 @@
:type 'function
:version "23.1"
:group 'windows)
-;; (make-obsolete-variable
- ;; 'split-window-preferred-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom split-height-threshold 80
"Minimum height for splitting a window to display a buffer.
@@ -6491,9 +6458,6 @@
:type '(choice (const nil) (integer :tag "lines"))
:version "23.1"
:group 'windows)
-;; (make-obsolete-variable
- ;; 'split-height-threshold
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom split-width-threshold 160
"Minimum width for splitting a window to display a buffer.
@@ -6503,9 +6467,6 @@
:type '(choice (const nil) (integer :tag "columns"))
:version "23.1"
:group 'windows)
-;; (make-obsolete-variable
- ;; 'split-width-threshold
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defcustom even-window-heights t
"If non-nil `display-buffer' will try to even window heights.
@@ -6514,17 +6475,11 @@
window that appears above or below the selected window."
:type 'boolean
:group 'windows)
-;; (make-obsolete-variable
- ;; 'even-window-heights
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defvar display-buffer-mark-dedicated nil
"Non-nil means `display-buffer' marks the windows it creates as dedicated.
The actual non-nil value of this variable will be copied to the
`window-dedicated-p' flag.")
-;; (make-obsolete-variable
- ;; 'display-buffer-mark-dedicated
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
(defun window-splittable-p (window &optional horizontal)
"Return non-nil if `split-window-sensibly' may split WINDOW.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105502: When displaying a buffer don't use or split a side window unless explicitly requested.,
martin rudalics <=