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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/11/22 18:08:06

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- window.el   16 Nov 2007 18:50:35 -0000      1.127
+++ window.el   22 Nov 2007 18:08:05 -0000      1.128
@@ -215,8 +215,7 @@
 The optional arg MINIBUF non-nil means count the minibuffer
 even if it is inactive."
    (let ((count 0))
-     (walk-windows (function (lambda (w)
-                              (setq count (+ count 1))))
+     (walk-windows (lambda (w) (setq count (+ count 1)))
                   minibuf)
      count))
 
@@ -379,8 +378,7 @@
         (h)
         (tried-sizes)
         (last-sizes)
-        (windows (window-list nil 0))
-        (counter 0))
+        (windows (window-list nil 0)))
     (when wt
       (while (not (member last-sizes tried-sizes))
         (when last-sizes (setq tried-sizes (cons last-sizes tried-sizes)))
@@ -421,7 +419,6 @@
             (when (/= 0 dh)
               (bw-adjust-window wt dh nil)))))
     (let* ((childs (cdr (assq 'childs wt)))
-           (lastchild (car (last childs)))
            (cw (when w (/ w (if (bw-eqdir 'hor wt) (length childs) 1))))
            (ch (when h (/ h (if (bw-eqdir 'ver wt) (length childs) 1)))))
       (dolist (c childs)
@@ -561,7 +558,7 @@
        (old-point (point))
        (size (and arg (prefix-numeric-value arg)))
         (window-full-p nil)
-       new-w bottom switch moved)
+       new-w bottom moved)
     (and size (< size 0) (setq size (+ (window-height) size)))
     (setq new-w (split-window nil size))
     (or split-window-keep-point
@@ -904,11 +901,8 @@
    (arg (recenter arg))                 ; Always respect ARG.
    ((not (eq this-command last-command))
     ;; First time - save mode and recenter.
-    (let ((bottom (1+ (count-lines 1 (window-end))))
-          (current (1+ (count-lines 1 (point))))
-          (total (window-height)))
       (setq recenter-last-op 'middle)
-      (recenter)))
+    (recenter))
    (t ;; repeat: loop through various options.
     (setq recenter-last-op
           (ecase recenter-last-op