mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-31 19:23:02 -07:00
* lisp/epa-file.el (epa-file--find-file-not-found-function): Use `error-slot-value` and `error-data`. (epa-file-insert-file-contents): Use `error-has-type-p`, `error-slot-value`, and `error-data`. * lisp/jka-compr.el (jka-compr-insert-file-contents): Use `error-has-type-p` and `error-slot-value` as well as new re-signaling form of `signal`. * lisp/simple.el (minibuffer-error-function): Use `error-has-type-p`. * lisp/startup.el (startup--load-user-init-file): Use `error-message-string`. (command-line): Use `error-has-type-p` and `error-message-string`. * lisp/type-break.el (type-break-demo-life): Use `error-message-string`. * lisp/emacs-lisp/bytecomp.el (batch-byte-compile-file): Use `error-message-string` and `error-has-type-p`. * lisp/emacs-lisp/edebug.el (edebug-safe-eval, edebug-report-error) (edebug-eval-expression): * lisp/emacs-lisp/debug.el (debugger-eval-expression): Use `error-message-string`. * lisp/emacs-lisp/ert.el (ert--should-error-handle-error): Use `error-has-type-p` and `error-type`. * lisp/net/sasl.el (sasl-error): Use `define-error`. * lisp/net/tramp-compat.el (tramp-error-type-p): New function. (tramp-permission-denied, tramp-compat-permission-denied): Use it. * lisp/progmodes/elisp-mode.el (elisp-completion-at-point): Use `error-type-p`. * lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal) (turn-off-xterm-mouse-tracking-on-terminal): Use `error-slot-value`. * lisp/simple.el (next-line, previous-line): Remove useless `condition-case` handler, and hence the whole `condition-case`, and then simplify. * lisp/gnus/nnrss.el (nnrss-insert): Use `with-demoted-errors`. * lisp/gnus/nnmaildir.el (nnmaildir--emlink-p, nnmaildir--enoent-p) (nnmaildir--eexist-p): Use `error-has-type-p`. (nnmaildir--new-number, nnmaildir-request-set-mark): Use single-arg `signal`. * lisp/ffap.el (ffap-machine-p): Use `error-slot-value`. * lisp/emacs-lisp/comp.el (comp--native-compile): Use `error-has-type-p` as well as single-arg `signal`. * lisp/net/ange-ftp.el (ange-ftp-hook-function): Use single-arg `signal`. * lisp/ebuff-menu.el (electric-buffer-menu-looper): Use `error-has-type-p`. * lisp/progmodes/ebrowse.el (ebrowse-electric-list-looper): Use `error-has-type-p`. (ebrowse-electric-position-looper): Make it an alias of `ebrowse-electric-list-looper`. * lisp/ibuffer.el (ibuffer-confirm-operation-on): * lisp/ls-lisp.el (ls-lisp--insert-directory): * lisp/gnus/gnus-search.el (gnus-search-run-query): * lisp/mail/mail-extr.el (mail-extr-safe-move-sexp): * lisp/net/dbus.el (dbus-set-property): * lisp/net/eudc-export.el (eudc-bbdbify-phone): * lisp/net/imap.el (imap-fetch-safe): * lisp/vc/vc.el (vc-root-dir): Use `error-slot-value` and single-arg `signal` to re-signal.
278 lines
10 KiB
EmacsLisp
278 lines
10 KiB
EmacsLisp
;;; ebuff-menu.el --- electric-buffer-list mode -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 1985-1986, 1994, 2001-2026 Free Software Foundation,
|
|
;; Inc.
|
|
|
|
;; Author: Richard Mlynarik <mly@ai.mit.edu>
|
|
;; Maintainer: emacs-devel@gnu.org
|
|
;; Keywords: convenience
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Who says one can't have typeout windows in GNU Emacs? The entry
|
|
;; point, `electric-buffer-list' works like ^r select buffer from the
|
|
;; ITS Emacs lunar or tmacs libraries.
|
|
|
|
;;; Code:
|
|
|
|
(require 'electric)
|
|
|
|
(defvar electric-buffer-menu-mode-map
|
|
(let ((map (make-keymap)))
|
|
(fillarray (car (cdr map)) #'Electric-buffer-menu-undefined)
|
|
(define-key map "\e" nil)
|
|
(define-key map "\C-z" #'suspend-frame)
|
|
(define-key map "v" #'Electric-buffer-menu-mode-view-buffer)
|
|
(define-key map (char-to-string help-char) #'Helper-help)
|
|
(define-key map "?" #'Helper-describe-bindings)
|
|
(define-key map "\C-c" nil)
|
|
(define-key map "\C-c\C-c" #'Electric-buffer-menu-quit)
|
|
(define-key map "\C-]" #'Electric-buffer-menu-quit)
|
|
(define-key map "q" #'Electric-buffer-menu-quit)
|
|
(define-key map " " #'Electric-buffer-menu-select)
|
|
(define-key map "\C-m" #'Electric-buffer-menu-select)
|
|
(define-key map "\C-l" #'recenter)
|
|
(define-key map "s" #'Buffer-menu-save)
|
|
(define-key map "S" #'tabulated-list-sort)
|
|
(define-key map "d" #'Buffer-menu-delete)
|
|
(define-key map "k" #'Buffer-menu-delete)
|
|
(define-key map "\C-d" #'Buffer-menu-delete-backwards)
|
|
;; (define-key map "\C-k" #'Buffer-menu-delete)
|
|
(define-key map "\177" #'Buffer-menu-backup-unmark)
|
|
(define-key map "~" #'Buffer-menu-not-modified)
|
|
(define-key map "u" #'Buffer-menu-unmark)
|
|
(define-key map "\M-\177" #'Buffer-menu-unmark-all-buffers)
|
|
(define-key map "U" #'Buffer-menu-unmark-all)
|
|
(dotimes (i 10)
|
|
(define-key map (char-to-string i) #'digit-argument)
|
|
(define-key map (concat "\e" (char-to-string i)) #'digit-argument))
|
|
(define-key map "-" #'negative-argument)
|
|
(define-key map "\e-" #'negative-argument)
|
|
(define-key map "m" #'Buffer-menu-mark)
|
|
(define-key map "\C-u" #'universal-argument)
|
|
(define-key map "\C-p" #'previous-line)
|
|
(define-key map "\C-n" #'next-line)
|
|
(define-key map "p" #'previous-line)
|
|
(define-key map "n" #'next-line)
|
|
(define-key map "\C-v" #'scroll-up-command)
|
|
(define-key map "\ev" #'scroll-down-command)
|
|
(define-key map ">" #'scroll-right)
|
|
(define-key map "<" #'scroll-left)
|
|
(define-key map "\e\C-v" #'scroll-other-window)
|
|
(define-key map "\e>" #'end-of-buffer)
|
|
(define-key map "\e<" #'beginning-of-buffer)
|
|
(define-key map "\e\e" nil)
|
|
(define-key map "\e\e\e" #'Electric-buffer-menu-quit)
|
|
;; This binding prevents the "escape => ESC" function-key-map mapping from
|
|
;; kicking in!
|
|
;; (define-key map [escape escape escape] #'Electric-buffer-menu-quit)
|
|
(define-key map [mouse-2] #'Electric-buffer-menu-mouse-select)
|
|
map))
|
|
|
|
(put 'Electric-buffer-menu-quit :advertised-binding "\C-c\C-c")
|
|
(put 'Electric-buffer-menu-select :advertised-binding " ")
|
|
(put 'Helper-help :advertised-binding (char-to-string help-char))
|
|
(put 'Helper-describe-bindings :advertised-binding "?")
|
|
|
|
(defvar electric-buffer-menu-mode-hook nil
|
|
"Normal hook run by `electric-buffer-menu-mode'.")
|
|
|
|
;;;###autoload
|
|
(defun electric-buffer-list (arg)
|
|
"Pop up the Buffer Menu in an \"electric\" window.
|
|
If you type SPC or RET (`Electric-buffer-menu-select'), that
|
|
selects the buffer at point and quits the \"electric\" window.
|
|
Otherwise, you can move around in the Buffer Menu, marking
|
|
buffers to be selected, saved or deleted; these other commands
|
|
are much like those of `Buffer-menu-mode'.
|
|
|
|
Run hooks in `electric-buffer-menu-mode-hook' on entry.
|
|
|
|
\\<electric-buffer-menu-mode-map>
|
|
\\[keyboard-quit] or \\[Electric-buffer-menu-quit] -- exit buffer menu, returning to previous window and buffer
|
|
configuration. If the very first character typed is a space, it
|
|
also has this effect.
|
|
\\[Electric-buffer-menu-select] -- select buffer of line point is on.
|
|
Also show buffers marked with m in other windows,
|
|
deletes buffers marked with \"D\", and saves those marked with \"S\".
|
|
\\[Buffer-menu-mark] -- mark buffer to be displayed.
|
|
\\[Buffer-menu-not-modified] -- clear modified-flag on that buffer.
|
|
\\[Buffer-menu-save] -- mark that buffer to be saved.
|
|
\\[Buffer-menu-delete] or \\[Buffer-menu-delete-backwards] -- mark that buffer to be deleted.
|
|
\\[Buffer-menu-unmark] -- remove all kinds of marks from current line.
|
|
\\[Buffer-menu-unmark-all] -- remove all kinds of marks from all lines.
|
|
\\[Electric-buffer-menu-mode-view-buffer] -- view buffer, returning when done.
|
|
\\[Buffer-menu-backup-unmark] -- back up a line and remove marks."
|
|
(interactive "P")
|
|
(let (select buffer)
|
|
(save-window-excursion
|
|
(setq buffer (list-buffers-noselect arg))
|
|
(Electric-pop-up-window buffer)
|
|
(unwind-protect
|
|
(let ((header header-line-format))
|
|
(set-buffer buffer)
|
|
(electric-buffer-menu-mode)
|
|
(setq header-line-format header)
|
|
(goto-char (point-min))
|
|
(if (search-forward "\n." nil t)
|
|
(forward-char -1))
|
|
(electric-buffer-update-highlight)
|
|
(setq select
|
|
(catch 'electric-buffer-menu-select
|
|
(message "<<< Type SPC or RET to bury the buffer list >>>")
|
|
(push (read-event) unread-command-events)
|
|
(let ((start-point (point))
|
|
(first (progn (goto-char (point-min))
|
|
(unless Buffer-menu-use-header-line
|
|
(forward-line 2))
|
|
(point)))
|
|
(last (progn (goto-char (point-max))
|
|
(forward-line -1)
|
|
(point)))
|
|
(goal-column 0))
|
|
;; Use start-point if it is meaningful.
|
|
(goto-char (if (or (< start-point first)
|
|
(> start-point last))
|
|
first
|
|
start-point))
|
|
(Electric-command-loop 'electric-buffer-menu-select
|
|
nil
|
|
t
|
|
'electric-buffer-menu-looper
|
|
(cons first last))))))
|
|
(set-buffer buffer)
|
|
(Buffer-menu-mode)
|
|
(bury-buffer) ;Get rid of window, if dedicated.
|
|
(message "")))
|
|
(when select
|
|
(set-buffer buffer)
|
|
(goto-char select)
|
|
(let ((opoint (point-marker)))
|
|
(Buffer-menu-execute)
|
|
(goto-char (point-min))
|
|
(if (prog1 (search-forward "\n>" nil t)
|
|
(goto-char opoint)
|
|
(set-marker opoint nil))
|
|
(Buffer-menu-select)
|
|
(switch-to-buffer (Buffer-menu-buffer t)))))))
|
|
|
|
(defun electric-buffer-menu-looper (state condition)
|
|
;; NOTE: This code looks very much like `ebrowse-electric-list-looper'.
|
|
(cond ((and condition
|
|
(not (or (error-has-type-p condition 'buffer-read-only)
|
|
(error-has-type-p condition 'end-of-buffer)
|
|
(error-has-type-p condition 'beginning-of-buffer))))
|
|
(signal condition))
|
|
((< (point) (car state))
|
|
(goto-char (point-min))
|
|
(unless Buffer-menu-use-header-line
|
|
(forward-line 2)))
|
|
((> (point) (cdr state))
|
|
(goto-char (point-max))
|
|
(forward-line -1)
|
|
(if (pos-visible-in-window-p (point-max))
|
|
(recenter -1))))
|
|
(electric-buffer-update-highlight))
|
|
|
|
(defvar Helper-return-blurb)
|
|
|
|
(define-derived-mode electric-buffer-menu-mode Buffer-menu-mode
|
|
"Electric Buffer Menu"
|
|
"Toggle Electric Buffer Menu mode in this buffer.
|
|
With a prefix argument ARG, enable Long Lines mode if ARG is
|
|
positive, and disable it otherwise. If called from Lisp, enable
|
|
the mode if ARG is omitted or nil.
|
|
|
|
Electric Buffer Menu mode is a minor mode which is automatically
|
|
enabled and disabled by the \\[electric-buffer-list] command.
|
|
See the documentation of `electric-buffer-list' for details."
|
|
(setq mode-line-buffer-identification "Electric Buffer List")
|
|
(setq-local Helper-return-blurb "return to buffer editing"))
|
|
|
|
;; generally the same as Buffer-menu-mode-map
|
|
;; (except we don't indirect to global-map)
|
|
(put 'Electric-buffer-menu-undefined 'suppress-keymap t)
|
|
|
|
(defun Electric-buffer-menu-exit ()
|
|
(interactive)
|
|
(setq unread-command-events
|
|
(nconc (listify-key-sequence (this-command-keys))
|
|
unread-command-events))
|
|
;; for robustness
|
|
(condition-case ()
|
|
(throw 'electric-buffer-menu-select nil)
|
|
(error (Buffer-menu-mode)
|
|
(other-buffer))))
|
|
|
|
(defun Electric-buffer-menu-select ()
|
|
"Leave Electric Buffer Menu, selecting buffers and executing changes.
|
|
Save buffers marked \"S\". Delete buffers marked \"K\".
|
|
Select buffer at point and display buffers marked \">\" in other windows."
|
|
(interactive)
|
|
(throw 'electric-buffer-menu-select (point)))
|
|
|
|
(defun Electric-buffer-menu-mouse-select (event)
|
|
(interactive "e")
|
|
(select-window (posn-window (event-end event)))
|
|
(set-buffer (window-buffer))
|
|
(goto-char (posn-point (event-end event)))
|
|
(throw 'electric-buffer-menu-select (point)))
|
|
|
|
(defun Electric-buffer-menu-quit ()
|
|
"Leave Electric Buffer Menu, restoring previous window configuration.
|
|
Skip execution of select, save, and delete commands."
|
|
(interactive)
|
|
(throw 'electric-buffer-menu-select nil))
|
|
|
|
(defun Electric-buffer-menu-undefined ()
|
|
(interactive)
|
|
(ding)
|
|
(message "%s"
|
|
(substitute-command-keys "\
|
|
Type \\[Electric-buffer-menu-quit] to exit, \
|
|
\\[Electric-buffer-menu-select] to select, \
|
|
\\[Helper-help] for help, \\[Helper-describe-bindings] for commands."))
|
|
(sit-for 4))
|
|
|
|
(defun Electric-buffer-menu-mode-view-buffer ()
|
|
"View buffer on current line in Electric Buffer Menu.
|
|
Return to Electric Buffer Menu when done."
|
|
(interactive)
|
|
(let ((bufnam (Buffer-menu-buffer nil)))
|
|
(if bufnam
|
|
(view-buffer bufnam)
|
|
(ding)
|
|
(message "Buffer %s does not exist!" bufnam)
|
|
(sit-for 4))))
|
|
|
|
(defvar electric-buffer-overlay nil)
|
|
|
|
(defun electric-buffer-update-highlight ()
|
|
(when (derived-mode-p 'electric-buffer-menu-mode)
|
|
;; Make sure we have an overlay to use.
|
|
(or electric-buffer-overlay
|
|
(setq-local electric-buffer-overlay
|
|
(make-overlay (point) (point))))
|
|
(move-overlay electric-buffer-overlay
|
|
(line-beginning-position)
|
|
(line-end-position))
|
|
(overlay-put electric-buffer-overlay 'face 'highlight)))
|
|
|
|
(provide 'ebuff-menu)
|
|
|
|
;;; ebuff-menu.el ends here
|