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

[Luc Teirlinck]

Index: emacs/lisp/buff-menu.el
diff -c emacs/lisp/buff-menu.el:1.82 emacs/lisp/buff-menu.el:1.83
*** emacs/lisp/buff-menu.el:1.82        Sun May 22 22:01:22 2005
--- emacs/lisp/buff-menu.el     Wed May 25 15:50:44 2005
***************
*** 203,219 ****
    (or (eq buffer-undo-list t)
        (setq buffer-undo-list nil))
    ;; We can not use save-excursion here.  The buffer gets erased.
!   (let ((ocol (current-column))
        (oline (progn (move-to-column 4)
                      (get-text-property (point) 'buffer)))
        (prop (point-min))
        ;; do not make undo records for the reversion.
        (buffer-undo-list t))
      (list-buffers-noselect Buffer-menu-files-only)
!     (while (setq prop (next-single-property-change prop 'buffer))
!       (when (eq (get-text-property prop 'buffer) oline)
!       (goto-char prop)
!       (move-to-column ocol)))))
  
  (defun Buffer-menu-toggle-files-only (arg)
    "Toggle whether the current buffer-menu displays only file buffers.
--- 203,223 ----
    (or (eq buffer-undo-list t)
        (setq buffer-undo-list nil))
    ;; We can not use save-excursion here.  The buffer gets erased.
!   (let ((opoint (point))
!       (eobp (eobp))
!       (ocol (current-column))
        (oline (progn (move-to-column 4)
                      (get-text-property (point) 'buffer)))
        (prop (point-min))
        ;; do not make undo records for the reversion.
        (buffer-undo-list t))
      (list-buffers-noselect Buffer-menu-files-only)
!     (if oline
!       (while (setq prop (next-single-property-change prop 'buffer))
!         (when (eq (get-text-property prop 'buffer) oline)
!           (goto-char prop)
!           (move-to-column ocol)))
!       (goto-char (if eobp (point-max) opoint)))))
  
  (defun Buffer-menu-toggle-files-only (arg)
    "Toggle whether the current buffer-menu displays only file buffers.
***************
*** 633,647 ****
    (if (equal column Buffer-menu-sort-column) (setq column nil))
    (propertize name
              'help-echo (if column
!                            (concat "mouse-2: sort by " (downcase name))
!                          "mouse-2: sort by visited order")
              'mouse-face 'highlight
              'keymap (let ((map (make-sparse-keymap)))
!                       (define-key map [header-line mouse-2]
!                         `(lambda (e)
!                            (interactive "e")
!                            (save-window-excursion
                               (if e (mouse-select-window e))
                               (Buffer-menu-sort ,column))))
                        map)))
  
--- 637,665 ----
    (if (equal column Buffer-menu-sort-column) (setq column nil))
    (propertize name
              'help-echo (if column
!                            (if Buffer-menu-use-header-line
!                                (concat "mouse-2: sort by " (downcase name))
!                              (concat "mouse-2, RET: sort by "
!                                      (downcase name)))
!                          (if Buffer-menu-use-header-line
!                              "mouse-2: sort by visited order"
!                            "mouse-2, RET: sort by visited order"))
              'mouse-face 'highlight
              'keymap (let ((map (make-sparse-keymap)))
!                       (if Buffer-menu-use-header-line
!                           (define-key map [header-line mouse-2]
!                             `(lambda (e)
!                                (interactive "e")
!                                (save-window-excursion
!                                  (if e (mouse-select-window e))
!                                  (Buffer-menu-sort ,column))))
!                         (define-key map [mouse-2]
!                           `(lambda (e)
!                              (interactive "e")
                               (if e (mouse-select-window e))
+                              (Buffer-menu-sort ,column)))
+                         (define-key map "\C-m"
+                           `(lambda () (interactive)
                               (Buffer-menu-sort ,column))))
                        map)))