[Emacs-diffs] Changes to emacs/lisp/window.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/08 02:07:48

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- window.el   6 Jun 2008 08:00:59 -0000       1.137
+++ window.el   8 Jun 2008 02:07:47 -0000       1.138
@@ -440,6 +440,7 @@
   "Factor by which the window area should be over-estimated.
 This is used by `balance-windows-area'.
 Changing this globally has no effect.")
+(make-variable-buffer-local 'window-area-factor)
 
 (defun balance-windows-area ()
   "Make all visible windows the same area (approximately).
@@ -542,11 +543,12 @@
 would be used to make a frame for that buffer.  The variables
 `special-display-buffer-names' and `special-display-regexps'
 control this."
+  (let (tmp)
   (cond
    ((not (stringp buffer-name)))
    ;; Make sure to return t in the following two cases.
    ((member buffer-name special-display-buffer-names) t)
-   ((assoc buffer-name special-display-buffer-names) t)
+     ((setq tmp (assoc buffer-name special-display-buffer-names)) (cdr tmp))
    ((catch 'found
       (dolist (regexp special-display-regexps)
        (cond
@@ -555,7 +557,7 @@
            (throw 'found t)))
         ((and (consp regexp) (stringp (car regexp))
               (string-match-p (car regexp) buffer-name))
-         (throw 'found (cdr regexp)))))))))
+            (throw 'found (cdr regexp))))))))))
 
 (defcustom special-display-buffer-names nil
   "List of buffer names that should have their own special frames.
@@ -931,11 +933,11 @@
 
 0 - consider windows on all visible or iconified frames.
 
-`t' - consider windows on all frames.
+t - consider windows on all frames.
 
 A specific frame - consider windows on that frame only.
 
-`nil' - consider windows on the selected frame \(actually the
+nil - consider windows on the selected frame \(actually the
 last non-minibuffer frame\) only.  If, however, either
 `display-buffer-reuse-frames' or `pop-up-frames' is non-nil,
 consider all visible or iconified frames."
@@ -988,7 +990,7 @@
           (let ((pars (special-display-p name-of-buffer)))
             (when pars
               (funcall special-display-function
-                       (if (eq pars t) buffer pars))))))
+                       buffer (if (listp pars) pars))))))
      ((or pop-up-frames (not frame-to-use))
       ;; We want or need a new frame.
       (window--display-buffer-2
@@ -1053,7 +1055,7 @@
 
 ;; I think this should be the default; I think people will prefer it--rms.
 (defcustom split-window-keep-point t
-  "*If non-nil, \\[split-window-vertically] keeps the original point \
+  "If non-nil, \\[split-window-vertically] keeps the original point \
 in both children.
 This is often more convenient for editing.
 If nil, adjust point in each of the two windows to minimize redisplay.
@@ -1577,8 +1579,8 @@
                     (progn
                       ;; Cancel any delayed autoselection.
                       (mouse-autoselect-window-cancel t)
-                      ;; Start delayed autoselection from current mouse 
position
-                      ;; and window.
+                      ;; Start delayed autoselection from current mouse
+                      ;; position and window.
                       (mouse-autoselect-window-start (mouse-position) window)
                       ;; Executing a command cancels delayed autoselection.
                       (add-hook