aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-08-20 12:10:05 +0200
committerMartin Rudalics2011-08-20 12:10:05 +0200
commit11994f9ba68c3607edb86e86d86e554abe2f955c (patch)
tree08b1eb1f931b2273b2ca3bdd41a4022a9b3c2baa
parent13009bd867606ba6bdb826389781e12a8d931523 (diff)
downloademacs-11994f9ba68c3607edb86e86d86e554abe2f955c.tar.gz
emacs-11994f9ba68c3607edb86e86d86e554abe2f955c.zip
Remove some commented-out obsoletion declarations from window.el.
-rw-r--r--lisp/window.el12
1 files changed, 0 insertions, 12 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 757740ca53b..8ddb6165197 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6121,8 +6121,6 @@ selected rather than \(as usual\) some other window. See
6121 (and (consp regexp) (stringp (car regexp)) 6121 (and (consp regexp) (stringp (car regexp))
6122 (string-match-p (car regexp) buffer-name))) 6122 (string-match-p (car regexp) buffer-name)))
6123 (throw 'found t)))))))) 6123 (throw 'found t))))))))
6124;; (make-obsolete
6125 ;; 'same-window-p "pass argument to buffer display function instead." "24.1")
6126 6124
6127(defcustom special-display-frame-alist 6125(defcustom special-display-frame-alist
6128 '((height . 14) (width . 80) (unsplittable . t)) 6126 '((height . 14) (width . 80) (unsplittable . t))
@@ -6185,9 +6183,6 @@ and (cdr ARGS) as the rest of the arguments."
6185 (set-window-buffer (frame-selected-window frame) buffer) 6183 (set-window-buffer (frame-selected-window frame) buffer)
6186 (set-window-dedicated-p (frame-selected-window frame) t) 6184 (set-window-dedicated-p (frame-selected-window frame) t)
6187 (frame-selected-window frame)))))) 6185 (frame-selected-window frame))))))
6188;; (make-obsolete
6189 ;; 'special-display-popup-frame
6190 ;; "use 2nd arg of `display-buffer' instead." "24.1")
6191 6186
6192(defcustom special-display-function 'special-display-popup-frame 6187(defcustom special-display-function 'special-display-popup-frame
6193 "Function to call for displaying special buffers. 6188 "Function to call for displaying special buffers.
@@ -6363,9 +6358,6 @@ entry."
6363 ((and (consp regexp) (stringp (car regexp)) 6358 ((and (consp regexp) (stringp (car regexp))
6364 (string-match-p (car regexp) buffer-name)) 6359 (string-match-p (car regexp) buffer-name))
6365 (throw 'found (cdr regexp)))))))))) 6360 (throw 'found (cdr regexp))))))))))
6366;; (make-obsolete
6367 ;; 'special-display-p
6368 ;; "pass argument to buffer display function instead." "24.1")
6369 6361
6370(defcustom pop-up-frame-alist nil 6362(defcustom pop-up-frame-alist nil
6371 "Alist of parameters for automatically generated new frames. 6363 "Alist of parameters for automatically generated new frames.
@@ -6530,8 +6522,6 @@ hold:
6530 (max split-height-threshold 6522 (max split-height-threshold
6531 (* 2 (max window-min-height 6523 (* 2 (max window-min-height
6532 (if mode-line-format 2 1)))))))))) 6524 (if mode-line-format 2 1))))))))))
6533;; (make-obsolete
6534 ;; 'window-splittable-p "use 2nd arg of `display-buffer' instead." "24.1")
6535 6525
6536(defun split-window-sensibly (window) 6526(defun split-window-sensibly (window)
6537 "Split WINDOW in a way suitable for `display-buffer'. 6527 "Split WINDOW in a way suitable for `display-buffer'.
@@ -6581,8 +6571,6 @@ split."
6581 (when (with-no-warnings (window-splittable-p window)) 6571 (when (with-no-warnings (window-splittable-p window))
6582 (with-selected-window window 6572 (with-selected-window window
6583 (split-window-vertically))))))) 6573 (split-window-vertically)))))))
6584;; (make-obsolete
6585 ;; 'split-window-sensibly "use 2nd arg of `display-buffer' instead." "24.1")
6586 6574
6587;; Functions for converting Emacs 23 buffer display options to buffer 6575;; Functions for converting Emacs 23 buffer display options to buffer
6588;; display specifiers. 6576;; display specifiers.