[Emacs-diffs] Changes to emacs/lisp/buff-menu.el

[John Paul Wallington]

Index: emacs/lisp/buff-menu.el
diff -c emacs/lisp/buff-menu.el:1.59 emacs/lisp/buff-menu.el:1.60
*** emacs/lisp/buff-menu.el:1.59        Sat Jan 11 18:15:10 2003
--- emacs/lisp/buff-menu.el     Wed Mar  5 22:51:53 2003
***************
*** 96,102 ****
  
  (defconst Buffer-menu-buffer-column 4)
  
! (defvar Buffer-menu-mode-map nil "")
  
  (if Buffer-menu-mode-map
      ()
--- 96,103 ----
  
  (defconst Buffer-menu-buffer-column 4)
  
! (defvar Buffer-menu-mode-map nil
!   "Local keymap for `Buffer-menu-mode' buffers.")
  
  (if Buffer-menu-mode-map
      ()
***************
*** 199,206 ****
                (error "No buffer named `%s'" name)
              nil))
        (or (and buf (buffer-name buf) buf)
!       (if error-if-non-existent-p
!         (error "No buffer on this line")
            nil)))))
  
  (defun buffer-menu (&optional arg)
--- 200,207 ----
                (error "No buffer named `%s'" name)
              nil))
        (or (and buf (buffer-name buf) buf)
!         (if error-if-non-existent-p
!             (error "No buffer on this line")
            nil)))))
  
  (defun buffer-menu (&optional arg)
***************
*** 556,562 ****
    (let* ((old-buffer (current-buffer))
         (standard-output standard-output)
         (mode-end (make-string (- Buffer-menu-mode-width 2) ? ))
-        ;; Fixme: This is wrong for left-hand scroll-bars.
         (header (concat "CRM " (Buffer-menu-buffer+size "Buffer" "Size")
                         "  Mode" mode-end "File\n"))
         list desired-point name file mode)
--- 557,562 ----
***************
*** 639,646 ****
        (princ "\n"))
        (Buffer-menu-mode)
        (when Buffer-menu-use-header-line
!       (set (make-local-variable 'Buffer-menu-header-line)
!            (concat " " header))
        (setq header-line-format 'Buffer-menu-header-line))
        ;; DESIRED-POINT doesn't have to be set; it is not when the
        ;; current buffer is not displayed for some reason.
--- 639,653 ----
        (princ "\n"))
        (Buffer-menu-mode)
        (when Buffer-menu-use-header-line
!       (let ((spaces
!              (/ (+ (or (frame-parameter nil 'left-fringe) 0)
!                    (or (if (eq (frame-parameter nil 'vertical-scroll-bars)
!                                'left)
!                            (frame-parameter nil 'scroll-bar-width))
!                        0))
!                 (frame-char-width))))
!         (set (make-local-variable 'Buffer-menu-header-line)
!              (concat (make-string spaces ? ) header)))
        (setq header-line-format 'Buffer-menu-header-line))
        ;; DESIRED-POINT doesn't have to be set; it is not when the
        ;; current buffer is not displayed for some reason.