mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
3f9f3ba437
* lisp/autoarg.el (autoarg-mode): * lisp/bookmark.el (bookmark-set, bookmark-set-no-overwrite) (bookmark-save): * lisp/calendar/todo-mode.el (todo-insert-item) (todo-filter-top-priorities) (todo-filter-top-priorities-multifile): * lisp/dired-x.el (dired-mark-extension, dired-mark-suffix): * lisp/eshell/eshell.el (eshell): * lisp/gnus/gnus-group.el (gnus-group-find-new-groups): * lisp/gnus/gnus-start.el (gnus-find-new-newsgroups): * lisp/gnus/gnus-sum.el (gnus-summary-show-article): * lisp/gnus/gnus.el (gnus-secondary-servers): * lisp/org/org-timer.el (org-timer-set-timer): * lisp/org/ox.el (org-export-dispatch-last-position): * lisp/printing.el (pr-ps-directory-preview) (pr-ps-directory-using-ghostscript, pr-ps-directory-print) (pr-ps-directory-ps-print, pr-ps-buffer-preview) (pr-ps-buffer-using-ghostscript, pr-ps-buffer-print) (pr-ps-buffer-ps-print, pr-despool-preview) (pr-despool-using-ghostscript, pr-despool-print) (pr-despool-ps-print, pr-ps-file-up-ps-print, pr-ps-fast-fire) (pr-txt-fast-fire): * lisp/progmodes/idlwave.el (idlwave-complete): * lisp/progmodes/sh-script.el (sh-set-shell): * lisp/replace.el (occur): * lisp/ses.el (ses--advice-yank): * lisp/simple.el (set-mark-command-repeat-pop): * lisp/sort.el (delete-duplicate-lines): * lisp/strokes.el (strokes-help): * lisp/textmodes/artist.el (artist-mode): * lisp/textmodes/reftex-cite.el (reftex-citation): * lisp/textmodes/reftex-dcr.el (reftex-view-crossref): * lisp/textmodes/reftex-index.el (reftex-index-selection-or-word) (reftex-display-index): * lisp/textmodes/reftex-ref.el (reftex-reference): * lisp/textmodes/reftex-toc.el (reftex-toc): * lisp/textmodes/reftex-vars.el (reftex-cite-prompt-optional-args) (reftex-enable-partial-scans): * lisp/textmodes/texnfo-upd.el (texinfo-master-menu): * lisp/windmove.el (windmove-display-in-direction) (windmove-delete-left, windmove-delete-up) (windmove-delete-right, windmove-delete-down): * lisp/window.el (recenter-window-group, recenter-other-window): Use command substitution for 'universal-argument' instead of raw "C-u".
146 lines
5.3 KiB
EmacsLisp
146 lines
5.3 KiB
EmacsLisp
;;; autoarg.el --- make digit keys supply prefix args -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Dave Love <fx@gnu.org>
|
|
;; Created: 1998-09-04
|
|
;; Keywords: abbrev, emulations
|
|
|
|
;; 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:
|
|
|
|
;; This provides `autoarg-mode', a global minor mode meant to emulate
|
|
;; a facility reported from Twenex Emacs whereby digit keys supplied
|
|
;; prefix args rather than self inserting, with a digit sequence
|
|
;; terminated by space acting to insert the digits.
|
|
|
|
;; The bindings of DIGIT and C-DIGIT are swapped and a command bound
|
|
;; to SPC deals with a numeric prefix arg or acts normally without
|
|
;; such an arg. (In the absence of a suitable terminal, you'd
|
|
;; probably want to swap DIGIT and M-DIGIT.) See the mode doc.
|
|
|
|
;; You probably don't really want to use this.
|
|
|
|
;; Also provides `autoarg-kp-mode' which is similar, but leaves the
|
|
;; digit keys alone and redefines the `keypad' keys, `kp-1' &c as
|
|
;; digit arguments. (Use `NumLock' if necessary to generate kp-N.)
|
|
;; You're more likely to want to use this.
|
|
|
|
;;; Code:
|
|
|
|
(defvar autoarg-mode-map
|
|
(let ((map (make-sparse-keymap)))
|
|
;; Loop over digit characters to set up keymap.
|
|
(dotimes (i 10)
|
|
(define-key map `[,(+ ?0 i)] 'digit-argument)
|
|
(define-key map `[(control ,(+ ?0 i))] 'self-insert-command))
|
|
(define-key map " " 'autoarg-terminate)
|
|
map)
|
|
"Keymap for Autoarg mode.")
|
|
|
|
;; Logical additions:
|
|
;; (define-key autoarg-mode-map [?-] 'negative-argument)
|
|
;; (define-key autoarg-mode-map [(control ?-)] 'self-insert-command)
|
|
;; A sensible/addition?
|
|
;; (define-key autoarg-mode-map [?\r] 'autoarg-terminate)
|
|
|
|
(defvar autoarg-kp-digits
|
|
(mapcar (lambda (i) (cons (intern (format "kp-%d" i)) i))
|
|
(reverse (number-sequence 0 9))))
|
|
|
|
(defun autoarg-kp-digit-argument (arg)
|
|
"Part of the numeric argument for the next command, like `digit-argument'."
|
|
(interactive "P")
|
|
(let ((digit (cdr (assq last-command-event autoarg-kp-digits))))
|
|
(cond ((integerp arg)
|
|
(setq prefix-arg (+ (* arg 10)
|
|
(if (< arg 0) (- digit) digit))))
|
|
((eq arg '-)
|
|
;; Treat -0 as just -, so that -01 will work.
|
|
(setq prefix-arg (if (zerop digit) '- (- digit))))
|
|
(t
|
|
(setq prefix-arg digit))))
|
|
(setq overriding-terminal-local-map universal-argument-map))
|
|
|
|
(defvar autoarg-kp-mode-map
|
|
(let ((map (make-sparse-keymap)))
|
|
;; Loop over digit characters to set up keymap.
|
|
(dotimes (i 10)
|
|
(let ((sym (intern (format "kp-%d" i))))
|
|
(define-key map (vector sym) 'autoarg-kp-digit-argument)))
|
|
(define-key map [kp-subtract] 'negative-argument)
|
|
map)
|
|
"Keymap for Autoarg-KP mode.")
|
|
|
|
;;;###autoload
|
|
(define-minor-mode autoarg-mode
|
|
"Toggle Autoarg mode, a global minor mode.
|
|
|
|
\\<autoarg-mode-map>
|
|
In Autoarg mode, digits are bound to `digit-argument', i.e. they
|
|
supply prefix arguments as C-DIGIT and M-DIGIT normally do.
|
|
Furthermore, C-DIGIT inserts DIGIT.
|
|
\\[autoarg-terminate] terminates the prefix sequence and inserts
|
|
the digits of the autoarg sequence into the buffer.
|
|
Without a numeric prefix arg, the normal binding of \\[autoarg-terminate]
|
|
is invoked, i.e. what it would be with Autoarg mode off.
|
|
|
|
For example:
|
|
`6 9 \\[autoarg-terminate]' inserts `69' into the buffer, as does `C-6 C-9'.
|
|
`6 9 a' inserts 69 `a's into the buffer.
|
|
`6 9 \\[autoarg-terminate] \\[autoarg-terminate]' inserts `69' into the buffer and
|
|
then invokes the normal binding of \\[autoarg-terminate].
|
|
`\\[universal-argument] \\[autoarg-terminate]' invokes the normal binding of \\[autoarg-terminate] four times.
|
|
|
|
\\{autoarg-mode-map}"
|
|
:lighter" Aarg" :global t :group 'keyboard)
|
|
|
|
;;;###autoload
|
|
(define-minor-mode autoarg-kp-mode
|
|
"Toggle Autoarg-KP mode, a global minor mode.
|
|
|
|
\\<autoarg-kp-mode-map>
|
|
This is similar to `autoarg-mode' but rebinds the keypad keys
|
|
`kp-1' etc. to supply digit arguments.
|
|
|
|
\\{autoarg-kp-mode-map}"
|
|
:lighter " Aakp" :global t :group 'keyboard
|
|
(if autoarg-kp-mode
|
|
(dotimes (i 10)
|
|
(let ((sym (intern (format "kp-%d" i))))
|
|
(define-key universal-argument-map (vector sym)
|
|
'autoarg-kp-digit-argument)))
|
|
(dotimes (i 10)
|
|
(let ((sym (intern (format "kp-%d" i))))
|
|
(define-key universal-argument-map (vector sym) nil)))))
|
|
|
|
(defun autoarg-terminate (n)
|
|
"Maybe terminate a digit prefix sequence.
|
|
With a non-negative numeric prefix arg, insert the digits comprising
|
|
the arg into the current buffer. Otherwise use the binding of the key
|
|
which invoked this function, excluding the Autoarg keymap."
|
|
(interactive "P")
|
|
(if (numberp n)
|
|
(insert (number-to-string n))
|
|
(let* ((autoarg-mode nil) ; hide the bindings
|
|
(binding (key-binding (this-single-command-keys))))
|
|
(if binding (call-interactively binding)))))
|
|
|
|
(provide 'autoarg)
|
|
|
|
;;; autoarg.el ends here
|