diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/gnus/gnus-undo.el | |
parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus/gnus-undo.el')
-rw-r--r-- | lisp/gnus/gnus-undo.el | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el index b1c1fb832fe..64ed2bbad6b 100644 --- a/lisp/gnus/gnus-undo.el +++ b/lisp/gnus/gnus-undo.el @@ -1,4 +1,4 @@ -;;; gnus-undo.el --- minor mode for undoing in Gnus +;;; gnus-undo.el --- minor mode for undoing in Gnus -*- lexical-binding: t; -*- ;; Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -52,8 +52,7 @@ (defcustom gnus-undo-limit 2000 "The number of undoable actions recorded." - :type 'integer - :group 'gnus-undo) + :type 'integer) (defcustom gnus-undo-mode nil ;; FIXME: This is a buffer-local minor mode which requires running @@ -61,13 +60,11 @@ ;; doesn't seem very useful: setting it to non-nil via Customize ;; probably won't do the right thing. "Minor mode for undoing in Gnus buffers." - :type 'boolean - :group 'gnus-undo) + :type 'boolean) (defcustom gnus-undo-mode-hook nil "Hook called in all `gnus-undo-mode' buffers." - :type 'hook - :group 'gnus-undo) + :type 'hook) ;;; Internal variables. @@ -106,7 +103,7 @@ ;; Set up the menu. (when (gnus-visual-p 'undo-menu 'menu) (gnus-undo-make-menu-bar)) - (add-hook 'post-command-hook 'gnus-undo-boundary nil t))) + (add-hook 'post-command-hook #'gnus-undo-boundary nil t))) ;;; Interface functions. @@ -130,15 +127,10 @@ gnus-undo-boundary t)) (defun gnus-undo-register (form) - "Register FORMS as something to be performed to undo a change. -FORMS may use backtick quote syntax." + "Register FORMS as something to be performed to undo a change." (when gnus-undo-mode (gnus-undo-register-1 - `(lambda () - ,form)))) - -(put 'gnus-undo-register 'lisp-indent-function 0) -(put 'gnus-undo-register 'edebug-form-spec '(body)) + `(lambda () ,form)))) (defun gnus-undo-register-1 (function) "Register FUNCTION as something to be performed to undo a change." @@ -161,23 +153,23 @@ FORMS may use backtick quote syntax." ;; We are not at a boundary... (setq gnus-undo-boundary-inhibit t))) -(defun gnus-undo (n) +(defun gnus-undo (_n) "Undo some previous changes in Gnus buffers. -Repeat this command to undo more changes. -A numeric argument serves as a repeat count." +Repeat this command to undo more changes." + ;; FIXME: A numeric argument should serve as a repeat count. (interactive "p") (unless gnus-undo-mode (error "Undoing is not enabled in this buffer")) (message "%s" last-command) - (when (or (not (eq last-command 'gnus-undo)) - (not gnus-undo-last)) + (unless (and (eq last-command 'gnus-undo) + gnus-undo-last) (setq gnus-undo-last gnus-undo-actions)) (let ((action (pop gnus-undo-last))) (unless action (error "Nothing further to undo")) (setq gnus-undo-actions (delq action gnus-undo-actions)) (setq gnus-undo-boundary t) - (mapc 'funcall action))) + (mapc #'funcall action))) (provide 'gnus-undo) |