mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-11 09:20:51 +00:00
c45bfd3c4a
Back in Emacs-21.1, `define-minor-mode` grew keywords arguments to replace its old positional arguments. Let's make sure we don't use the old-style any more. * lisp/org/ox-beamer.el (org-beamer-mode-map): Move initialization into declaration. (org-beamer-mode): * lisp/textmodes/tildify.el (tildify-mode): * lisp/textmodes/sgml-mode.el (html-autoview-mode): * lisp/textmodes/rst.el (rst-minor-mode): * lisp/textmodes/remember.el (remember-notes-mode): * lisp/textmodes/ispell.el (ispell-minor-mode): * lisp/tar-mode.el (tar-subfile-mode): * lisp/strokes.el (strokes-mode): * lisp/so-long.el (so-long-minor-mode): * lisp/shell.el (shell-dirtrack-mode): * lisp/scroll-all.el (scroll-all-mode): * lisp/ruler-mode.el (ruler-mode): * lisp/rect.el (rectangle-mark-mode): * lisp/progmodes/sh-script.el (sh-electric-here-document-mode): * lisp/outline.el (outline-minor-mode): * lisp/org/org.el (org-cdlatex-mode): * lisp/org/org-table.el (org-table-header-line-mode) (org-table-follow-field-mode, orgtbl-mode): * lisp/org/org-src.el (org-src-mode): * lisp/org/org-list.el (org-list-checkbox-radio-mode): * lisp/org/org-indent.el (org-indent-mode): * lisp/org/org-capture.el (org-capture-mode): * lisp/obsolete/pc-select.el (pc-selection-mode): * lisp/obsolete/iswitchb.el (iswitchb-mode): * lisp/net/rcirc.el (rcirc-omit-mode, rcirc-multiline-minor-mode) (rcirc-track-minor-mode): * lisp/net/goto-addr.el (goto-address-mode, goto-address-prog-mode): * lisp/image-mode.el (image-minor-mode): * lisp/ibuf-ext.el (ibuffer-auto-mode): * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): * lisp/font-core.el (font-lock-mode): * lisp/erc/erc.el (define-erc-module): * lisp/erc/erc-track.el (erc-track-minor-mode): * lisp/erc/erc-fill.el (erc-fill-mode): * lisp/epa-mail.el (epa-mail-mode): * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-mode): * lisp/dirtrack.el (dirtrack-mode, dirtrack-debug-mode): * lisp/dired-aux.el (dired-isearch-filenames-mode): * lisp/cedet/semantic/idle.el (semantic-idle-scheduler-mode): * lisp/cedet/semantic/decorate/mode.el (semantic-decoration-mode): * lisp/autoarg.el (autoarg-mode, autoarg-kp-mode): * lisp/vc/pcvs.el (cvs-minor-mode): Avoid old-style positional args to `define-minor-mode`.
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].
|
|
`C-u \\[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
|