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

[Juanma Barranquero]

Index: emacs/lisp/buff-menu.el
diff -c emacs/lisp/buff-menu.el:1.86 emacs/lisp/buff-menu.el:1.87
*** emacs/lisp/buff-menu.el:1.86        Mon Jul  4 23:08:52 2005
--- emacs/lisp/buff-menu.el     Wed Jul 20 11:32:17 2005
***************
*** 305,311 ****
  
  (defun Buffer-menu-unmark (&optional backup)
    "Cancel all requested operations on buffer on this line and move down.
! Optional ARG means move up."
    (interactive "P")
    (when (Buffer-menu-no-header)
      (let* ((buf (Buffer-menu-buffer t))
--- 305,311 ----
  
  (defun Buffer-menu-unmark (&optional backup)
    "Cancel all requested operations on buffer on this line and move down.
! Optional prefix arg means move up."
    (interactive "P")
    (when (Buffer-menu-no-header)
      (let* ((buf (Buffer-menu-buffer t))
***************
*** 369,378 ****
    (save-excursion
     (beginning-of-line)
     (forward-char 2)
!    (if (= (char-after) (if arg ?  ?*))
         (let ((buffer-read-only nil))
         (delete-char 1)
!        (insert (if arg ?* ? ))))))
  
  (defun Buffer-menu-beginning ()
    (goto-char (point-min))
--- 369,378 ----
    (save-excursion
     (beginning-of-line)
     (forward-char 2)
!    (if (= (char-after) (if arg ?\s ?*))
         (let ((buffer-read-only nil))
         (delete-char 1)
!        (insert (if arg ?* ?\s))))))
  
  (defun Buffer-menu-beginning ()
    (goto-char (point-min))
***************
*** 392,398 ****
          (setq modp (buffer-modified-p)))
        (let ((buffer-read-only nil))
          (delete-char -1)
!         (insert (if modp ?* ? ))))))
    (save-excursion
      (Buffer-menu-beginning)
      (let ((buff-menu-buffer (current-buffer))
--- 392,398 ----
          (setq modp (buffer-modified-p)))
        (let ((buffer-read-only nil))
          (delete-char -1)
!         (insert (if modp ?* ?\s))))))
    (save-excursion
      (Buffer-menu-beginning)
      (let ((buff-menu-buffer (current-buffer))
***************
*** 405,411 ****
              (save-excursion (kill-buffer buf)))
          (if (and buf (buffer-name buf))
            (progn (delete-char 1)
!                  (insert ? ))
          (delete-region (point) (progn (forward-line 1) (point)))
            (unless (bobp)
              (forward-char -1))))))))
--- 405,411 ----
              (save-excursion (kill-buffer buf)))
          (if (and buf (buffer-name buf))
            (progn (delete-char 1)
!                  (insert ?\s))
          (delete-region (point) (progn (forward-line 1) (point)))
            (unless (bobp)
              (forward-char -1))))))))
***************
*** 425,431 ****
        (setq tem (Buffer-menu-buffer t))
        (let ((buffer-read-only nil))
        (delete-char -1)
!       (insert ?\ ))
        (or (eq tem buff) (memq tem others) (setq others (cons tem others))))
      (setq others (nreverse others)
          tem (/ (1- (frame-height)) (1+ (length others))))
--- 425,431 ----
        (setq tem (Buffer-menu-buffer t))
        (let ((buffer-read-only nil))
        (delete-char -1)
!       (insert ?\s))
        (or (eq tem buff) (memq tem others) (setq others (cons tem others))))
      (setq others (nreverse others)
          tem (/ (1- (frame-height)) (1+ (length others))))
***************
*** 521,527 ****
      (save-excursion
        (set-buffer (Buffer-menu-buffer t))
        (vc-toggle-read-only)
!       (setq char (if buffer-read-only ?% ? )))
      (save-excursion
        (beginning-of-line)
        (forward-char 1)
--- 521,527 ----
      (save-excursion
        (set-buffer (Buffer-menu-buffer t))
        (vc-toggle-read-only)
!       (setq char (if buffer-read-only ?% ?\s)))
      (save-excursion
        (beginning-of-line)
        (forward-char 1)
***************
*** 594,600 ****
          (make-string (- Buffer-menu-buffer+size-width
                          (length name)
                          (length size))
!                      ? )
          size))
  
  (defun Buffer-menu-sort (column)
--- 594,600 ----
          (make-string (- Buffer-menu-buffer+size-width
                          (length name)
                          (length size))
!                      ?\s)
          size))
  
  (defun Buffer-menu-sort (column)
***************
*** 677,683 ****
  For more information, see the function `buffer-menu'."
    (let* ((old-buffer (current-buffer))
         (standard-output standard-output)
!        (mode-end (make-string (- Buffer-menu-mode-width 2) ? ))
         (header (concat "CRM "
                         (Buffer-menu-buffer+size
                          (Buffer-menu-make-sort-button "Buffer" 2)
--- 677,683 ----
  For more information, see the function `buffer-menu'."
    (let* ((old-buffer (current-buffer))
         (standard-output standard-output)
!        (mode-end (make-string (- Buffer-menu-mode-width 2) ?\s))
         (header (concat "CRM "
                         (Buffer-menu-buffer+size
                          (Buffer-menu-make-sort-button "Buffer" 2)
***************
*** 712,718 ****
          (insert header
                  (apply 'string
                         (mapcar (lambda (c)
!                                  (if (memq c '(?\n ?\ )) c underline))
                                 header)))))
        ;; Collect info for every buffer we're interested in.
        (dolist (buffer (or buffer-list (buffer-list)))
--- 712,718 ----
          (insert header
                  (apply 'string
                         (mapcar (lambda (c)
!                                  (if (memq c '(?\n ?\s)) c underline))
                                 header)))))
        ;; Collect info for every buffer we're interested in.
        (dolist (buffer (or buffer-list (buffer-list)))
***************
*** 732,748 ****
                                      (format-mode-line mode-line-process
                                                        nil nil buffer))))
                    (bits (string
!                          (if (eq buffer old-buffer) ?. ?\ )
                           ;; Handle readonly status.  The output buffer
                           ;; is special cased to appear readonly; it is
                           ;; actually made so at a later date.
                           (if (or (eq buffer standard-output)
                                   buffer-read-only)
!                              ?% ?\ )
                           ;; Identify modified buffers.
!                          (if (buffer-modified-p) ?* ?\ )
                           ;; Space separator.
!                          ?\ )))
                (unless file
                  ;; No visited file.  Check local value of
                  ;; list-buffers-directory.
--- 732,748 ----
                                      (format-mode-line mode-line-process
                                                        nil nil buffer))))
                    (bits (string
!                          (if (eq buffer old-buffer) ?. ?\s)
                           ;; Handle readonly status.  The output buffer
                           ;; is special cased to appear readonly; it is
                           ;; actually made so at a later date.
                           (if (or (eq buffer standard-output)
                                   buffer-read-only)
!                              ?% ?\s)
                           ;; Identify modified buffers.
!                          (if (buffer-modified-p) ?* ?\s)
                           ;; Space separator.
!                          ?\s)))
                (unless file
                  ;; No visited file.  Check local value of
                  ;; list-buffers-directory.