[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/buff-menu.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/buff-menu.el [lexbind] |
Date: |
Mon, 25 Oct 2004 00:41:56 -0400 |
Index: emacs/lisp/buff-menu.el
diff -c emacs/lisp/buff-menu.el:1.54.4.6 emacs/lisp/buff-menu.el:1.54.4.7
*** emacs/lisp/buff-menu.el:1.54.4.6 Thu Sep 16 00:12:21 2004
--- emacs/lisp/buff-menu.el Mon Oct 25 04:22:23 2004
***************
*** 197,205 ****
(defun Buffer-menu-revert-function (ignore1 ignore2)
;; We can not use save-excursion here. The buffer gets erased.
! (let ((old-point (point)))
(list-buffers-noselect Buffer-menu-files-only)
! (goto-char old-point)))
(defun Buffer-menu-toggle-files-only (arg)
"Toggle whether the current buffer-menu displays only file buffers.
--- 197,211 ----
(defun Buffer-menu-revert-function (ignore1 ignore2)
;; 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)))
(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.
***************
*** 354,366 ****
(delete-char 1)
(insert (if arg ?* ? ))))))
(defun Buffer-menu-execute ()
"Save and/or delete buffers marked with
\\<Buffer-menu-mode-map>\\[Buffer-menu-save] or
\\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands."
(interactive)
(save-excursion
! (goto-char (point-min))
! (unless Buffer-menu-use-header-line
! (forward-line 1))
(while (re-search-forward "^..S" nil t)
(let ((modp nil))
(save-excursion
--- 360,375 ----
(delete-char 1)
(insert (if arg ?* ? ))))))
+ (defun Buffer-menu-beginning ()
+ (goto-char (point-min))
+ (unless Buffer-menu-use-header-line
+ (forward-line)))
+
(defun Buffer-menu-execute ()
"Save and/or delete buffers marked with
\\<Buffer-menu-mode-map>\\[Buffer-menu-save] or
\\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands."
(interactive)
(save-excursion
! (Buffer-menu-beginning)
(while (re-search-forward "^..S" nil t)
(let ((modp nil))
(save-excursion
***************
*** 371,379 ****
(delete-char -1)
(insert (if modp ?* ? ))))))
(save-excursion
! (goto-char (point-min))
! (unless Buffer-menu-use-header-line
! (forward-line 1))
(let ((buff-menu-buffer (current-buffer))
(buffer-read-only nil))
(while (re-search-forward "^D" nil t)
--- 380,386 ----
(delete-char -1)
(insert (if modp ?* ? ))))))
(save-excursion
! (Buffer-menu-beginning)
(let ((buff-menu-buffer (current-buffer))
(buffer-read-only nil))
(while (re-search-forward "^D" nil t)
***************
*** 399,407 ****
(menu (current-buffer))
(others ())
tem)
! (goto-char (point-min))
! (unless Buffer-menu-use-header-line
! (forward-line 1))
(while (re-search-forward "^>" nil t)
(setq tem (Buffer-menu-buffer t))
(let ((buffer-read-only nil))
--- 406,412 ----
(menu (current-buffer))
(others ())
tem)
! (Buffer-menu-beginning)
(while (re-search-forward "^>" nil t)
(setq tem (Buffer-menu-buffer t))
(let ((buffer-read-only nil))
***************
*** 581,587 ****
(if (< column 2) (setq column 2))
(if (> column 5) (setq column 5)))
(setq Buffer-menu-sort-column column)
! (Buffer-menu-revert))
(defun Buffer-menu-make-sort-button (name column)
(if (equal column Buffer-menu-sort-column) (setq column nil))
--- 586,620 ----
(if (< column 2) (setq column 2))
(if (> column 5) (setq column 5)))
(setq Buffer-menu-sort-column column)
! (let (buffer-read-only l buf m1 m2)
! (save-excursion
! (Buffer-menu-beginning)
! (while (not (eobp))
! (when (buffer-live-p (setq buf (get-text-property (+ (point) 4)
'buffer)))
! (setq m1 (char-after)
! m1 (if (memq m1 '(?> ?D)) m1)
! m2 (char-after (+ (point) 2))
! m2 (if (eq m2 ?S) m2))
! (if (or m1 m2)
! (push (list buf m1 m2) l)))
! (forward-line)))
! (Buffer-menu-revert)
! (setq buffer-read-only)
! (save-excursion
! (Buffer-menu-beginning)
! (while (not (eobp))
! (when (setq buf (assq (get-text-property (+ (point) 4) 'buffer) l))
! (setq m1 (cadr buf)
! m2 (cadr (cdr buf)))
! (when m1
! (delete-char 1)
! (insert m1)
! (backward-char 1))
! (when m2
! (forward-char 2)
! (delete-char 1)
! (insert m2)))
! (forward-line)))))
(defun Buffer-menu-make-sort-button (name column)
(if (equal column Buffer-menu-sort-column) (setq column nil))
***************
*** 592,598 ****
'mouse-face 'highlight
'keymap (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-2]
! `(lambda () (interactive)
(Buffer-menu-sort ,column)))
map)))
--- 625,633 ----
'mouse-face 'highlight
'keymap (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-2]
! `(lambda (e)
! (interactive "e")
! (if e (set-buffer (window-buffer (posn-window
(event-end e)))))
(Buffer-menu-sort ,column)))
map)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/buff-menu.el [lexbind],
Miles Bader <=