;;; bs.el --- menu for selecting and displaying buffers
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
;; Keywords: convenience
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;; Version: 1.17
-;; X-URL: http://home.netsurf.de/olaf.sylvester/emacs
+;; X-URL: http://www.geekware.de/software/emacs
;;
;; The bs-package contains a main function bs-show for poping up a
;; buffer in a way similar to `list-buffers' and `electric-buffer-list':
;;; Code:
+(defvar font-lock-verbose)
+
;; ----------------------------------------------------------------------
;; Globals for customization
;; ----------------------------------------------------------------------
"Buffer Selection: Maintaining buffers by buffer menu."
:version "21.1"
:link '(emacs-commentary-link "bs")
- :link '(url-link "http://home.netsurf.de/olaf.sylvester/emacs")
+ :link '(url-link "http://www.geekware.de/software/emacs")
:group 'convenience)
(defgroup bs-appearance nil
"*List specifying the layout of a Buffer Selection Menu buffer.
Each entry specifies a column and is a list of the form of:
\(HEADER MINIMUM-LENGTH MAXIMUM-LENGTH ALIGNMENT FUN-OR-STRING)
-HEADER : string for header for first line or a function
- which calculates column title.
-MINIMUM-LENGTH : minimum width of column (number or name of function).
- The function must return a positive integer.
-MAXIMUM-LENGTH : maximum width of column (number or name of function)
- (currently ignored)
-ALIGNMENT : alignment of column: (`left' `right' `middle')
-FUN-OR-STRING : Name of a function for calculating the value or
-a string for a constant value.
+
+HEADER : String for header for first line or a function
+ which calculates column title.
+MINIMUM-LENGTH : Minimum width of column (number or name of function).
+ The function must return a positive integer.
+MAXIMUM-LENGTH : Maximum width of column (number or name of function)
+ (currently ignored).
+ALIGNMENT : Alignment of column (`left', `right', `middle').
+FUN-OR-STRING : Name of a function for calculating the value or a
+ string for a constant value.
+
The function gets as parameter the buffer where we have started
buffer selection and the list of all buffers to show. The function must
return a string representing the column's value."
:group 'bs-appearance
:type '(repeat sexp))
-(defvar bs--running-in-xemacs (string-match "XEmacs" (emacs-version))
- "Non-nil when running under XEmacs.")
-
(defun bs--make-header-match-string ()
"Return a regexp matching the first line of a Buffer Selection Menu buffer."
(let ((res "^\\(")
(defvar bs--show-all nil
"Flag whether showing all buffers regardless of current configuration.
-Non nil means to show all buffers. Otherwise show buffers
+Non-nil means to show all buffers. Otherwise show buffers
defined by current configuration `bs-current-configuration'.")
(defvar bs--window-config-coming-from nil
"Window configuration before starting Buffer Selection Menu.")
+(make-variable-frame-local 'bs--window-config-coming-from)
(defvar bs--intern-show-never "^ \\|\\*buffer-selection\\*"
"Regular expression specifying which buffers never to show.
(extern-must-show-from-fun (and bs-must-show-function
(funcall bs-must-show-function
(car list))))
- (show-flag (save-excursion
- (set-buffer (car list))
- bs-buffer-show-mark)))
+ (show-flag (buffer-local-value 'bs-buffer-show-mark (car list))))
(if (or (eq show-flag 'always)
(and (or bs--show-all (not (eq show-flag 'never)))
(not int-show-never)
(defun bs--redisplay (&optional keep-line-p sort-description)
"Redisplay whole Buffer Selection Menu.
-If KEEP-LINE-P is non nil the point will stay on current line.
-SORT-DESCRIPTION is an element of `bs-sort-functions'"
+If KEEP-LINE-P is non-nil the point will stay on current line.
+SORT-DESCRIPTION is an element of `bs-sort-functions'."
(let ((line (1+ (count-lines 1 (point)))))
(bs-show-in-buffer (bs-buffer-list nil sort-description))
(if keep-line-p
\\[bs-tmp-select-other-window] -- make another window display that buffer and
remain in Buffer Selection Menu.
\\[bs-mouse-select] -- select current line's buffer and other marked buffers.
-\\[bs-save] -- save current line's buffer immediatly.
-\\[bs-delete] -- kill current line's buffer immediatly.
+\\[bs-save] -- save current line's buffer immediately.
+\\[bs-delete] -- kill current line's buffer immediately.
\\[bs-toggle-readonly] -- toggle read-only status of current line's buffer.
\\[bs-clear-modified] -- clear modified-flag on that buffer.
\\[bs-mark-current] -- mark current line's buffer to be displayed.
(use-local-map bs-mode-map)
(make-local-variable 'font-lock-defaults)
(make-local-variable 'font-lock-verbose)
+ (buffer-disable-undo)
(setq major-mode 'bs-mode
mode-name "Buffer-Selection-Menu"
buffer-read-only t
truncate-lines t
font-lock-defaults '(bs-mode-font-lock-keywords t)
font-lock-verbose nil)
- (run-hooks 'bs-mode-hook))
+ (run-mode-hooks 'bs-mode-hook))
+
+(defun bs--restore-window-config ()
+ "Restore window configuration on the current frame."
+ (when bs--window-config-coming-from
+ (set-window-configuration bs--window-config-coming-from)
+ (setq bs--window-config-coming-from nil)))
(defun bs-kill ()
"Let buffer disappear and reset window-configuration."
(interactive)
(bury-buffer (current-buffer))
- (set-window-configuration bs--window-config-coming-from))
+ (bs--restore-window-config))
(defun bs-abort ()
"Ding and leave Buffer Selection Menu without a selection."
(interactive)
(bs--redisplay t))
-(defun bs--window-for-buffer (buffer-name)
- "Return a window showing a buffer with name BUFFER-NAME.
-Take only windows of current frame into account.
-Return nil if there is no such buffer."
- (let ((window nil))
- (walk-windows (lambda (wind)
- (if (string= (buffer-name (window-buffer wind))
- buffer-name)
- (setq window wind))))
- window))
-
(defun bs--set-window-height ()
"Change the height of the selected window to suit the current buffer list."
(unless (one-window-p t)
- (shrink-window (- (window-height (selected-window))
- ;; window-height in xemacs includes mode-line
- (+ (if bs--running-in-xemacs 3 1)
- bs-header-lines-length
- (min (length bs-current-list)
- bs-max-window-height))))))
+ (fit-window-to-buffer (selected-window) bs-max-window-height)))
(defun bs--current-buffer ()
"Return buffer on current line.
(interactive)
(let ((buffer (bs--current-buffer)))
(bury-buffer (current-buffer))
- (set-window-configuration bs--window-config-coming-from)
+ (bs--restore-window-config)
(switch-to-buffer buffer)
(if bs--marked-buffers
;; Some marked buffers for selection
(interactive)
(let ((buffer (bs--current-buffer)))
(bury-buffer (current-buffer))
- (set-window-configuration bs--window-config-coming-from)
+ (bs--restore-window-config)
(switch-to-buffer-other-window buffer)))
(defun bs-tmp-select-other-window ()
(interactive)
(let ((buffer (bs--current-buffer)))
(bury-buffer (current-buffer))
- (set-window-configuration bs--window-config-coming-from)
+ (bs--restore-window-config)
(switch-to-buffer-other-frame buffer)))
(defun bs-mouse-select-other-frame (event)
"Set value `bs-buffer-show-mark' of buffer BUFFER to WHAT.
Redisplay current line and display a message describing
the status of buffer on current line."
- (save-excursion
- (set-buffer buffer)
- (setq bs-buffer-show-mark what))
+ (with-current-buffer buffer (setq bs-buffer-show-mark what))
(bs--update-current-line)
(bs--set-window-height)
(bs--show-config-message what))
"Move cursor vertically up one line.
If on top of buffer list go to last line."
(interactive "p")
- (previous-line 1)
- (if (<= (count-lines 1 (point)) (1- bs-header-lines-length))
- (progn
- (goto-char (point-max))
- (beginning-of-line)
- (recenter -1))
- (beginning-of-line)))
+ (if (> (count-lines 1 (point)) bs-header-lines-length)
+ (forward-line -1)
+ (goto-char (point-max))
+ (beginning-of-line)
+ (recenter -1)))
(defun bs-down (arg)
"Move cursor vertically down ARG lines in Buffer Selection Menu."
(defun bs--down ()
"Move cursor vertically down one line.
If at end of buffer list go to first line."
- (let ((last (line-end-position)))
- (if (eq last (point-max))
- (goto-line (1+ bs-header-lines-length))
- (next-line 1))))
+ (if (eq (line-end-position) (point-max))
+ (goto-line (1+ bs-header-lines-length))
+ (forward-line 1)))
(defun bs-visits-non-file (buffer)
"Return t or nil whether BUFFER visits no file.
(bs--set-window-height)
(bs--goto-current-buffer)
(font-lock-fontify-buffer)
- (bs-apply-sort-faces)))
+ (bs-apply-sort-faces)
+ (set-buffer-modified-p nil)))
(defun bs-next-buffer (&optional buffer-list sorting-p)
"Return next buffer and buffer list for buffer cycling in BUFFER-LIST.
(or (cdr bs--cycle-list)
"this buffer"))))))
-
;;;###autoload
(defun bs-cycle-previous ()
"Select previous buffer defined by buffer cycling.
for mouse highlighting.
START-BUFFER is the buffer where we started buffer selection.
ALL-BUFFERS is the list of buffer appearing in Buffer Selection Menu."
- (let ((name (copy-sequence (buffer-name))))
- (add-text-properties
- 0 (length name)
- '(mouse-face highlight
- help-echo
- "mouse-2: select this buffer, mouse-3: select in other frame")
- name)
- (if (< (length name) bs--name-entry-length)
- (concat name
- (make-string (- bs--name-entry-length (length name)) ? ))
- name)))
+ (propertize (buffer-name)
+ 'help-echo "mouse-2: select this buffer, mouse-3: select in other frame"
+ 'mouse-face 'highlight))
(defun bs--get-mode-name (start-buffer all-buffers)
"Return the name of mode of current buffer for Buffer Selection Menu.
default directory.
START-BUFFER is the buffer where we started buffer selection.
ALL-BUFFERS is the list of buffer appearing in Buffer Selection Menu."
- (let ((string (copy-sequence (if (member major-mode
- '(shell-mode dired-mode))
- default-directory
- (or buffer-file-name "")))))
- (add-text-properties
- 0 (length string)
- '(mouse-face highlight
- help-echo "mouse-2: select this buffer, mouse-3: select in other frame")
- string)
- string))
+ (propertize (if (member major-mode '(shell-mode dired-mode))
+ default-directory
+ (or buffer-file-name ""))
+ 'mouse-face 'highlight
+ 'help-echo "mouse-2: select this buffer, mouse-3: select in other frame"))
(defun bs--insert-one-entry (buffer)
"Generate one entry for buffer BUFFER in Buffer Selection Menu.
(defun bs--format-aux (string align len)
"Generate a string with STRING with alignment ALIGN and length LEN.
ALIGN is one of the symbols `left', `middle', or `right'."
- (let ((length (length string)))
- (if (>= length len)
- string
- (if (eq 'right align)
- (concat (make-string (- len length) ? ) string)
- (concat string (make-string (- len length) ? ))))))
+ (let* ((width (length string))
+ (len (max len width)))
+ (format (format "%%%s%ds" (if (eq align 'right) "" "-") len)
+ (if (eq align 'middle)
+ (concat (make-string (/ (- len width) 2) ?\s) string)
+ string))))
(defun bs--show-header ()
"Insert header for Buffer Selection Menu in current buffer."
(unless (string= "*buffer-selection*" (buffer-name))
;; Only when not in buffer *buffer-selection*
;; we have to set the buffer we started the command
- (progn
- (setq bs--buffer-coming-from (current-buffer))
- (setq bs--window-config-coming-from (current-window-configuration))))
+ (setq bs--buffer-coming-from (current-buffer)))
(let ((liste (bs-buffer-list))
- (active-window (bs--window-for-buffer "*buffer-selection*")))
+ (active-window (get-window-with-predicate
+ (lambda (w)
+ (string= (buffer-name (window-buffer w))
+ "*buffer-selection*")))))
(if active-window
(select-window active-window)
- (if (> (window-height (selected-window)) 7)
- (progn
- (split-window-vertically)
- (other-window 1))))
+ (modify-frame-parameters nil
+ (list (cons 'bs--window-config-coming-from
+ (current-window-configuration))))
+ (when (> (window-height (selected-window)) 7)
+ (split-window-vertically)
+ (other-window 1)))
(bs-show-in-buffer liste)
(bs-message-without-log "%s" (bs--current-config-message)))))
;; Now provide feature bs
(provide 'bs)
+;;; arch-tag: c0d9ab34-bf06-4368-ae9d-af88878e6802
;;; bs.el ends here