mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Merge remote-tracking branch 'savannah/master' into HEAD
This commit is contained in:
commit
cf1e8e792f
100 changed files with 1798 additions and 807 deletions
12
lisp/subr.el
12
lisp/subr.el
|
|
@ -378,10 +378,18 @@ PREFIX is a string, and defaults to \"g\"."
|
|||
|
||||
(defun ignore (&rest _arguments)
|
||||
"Do nothing and return nil.
|
||||
This function accepts any number of ARGUMENTS, but ignores them."
|
||||
This function accepts any number of ARGUMENTS, but ignores them.
|
||||
Also see `always'."
|
||||
(declare (completion #'ignore))
|
||||
(interactive)
|
||||
nil)
|
||||
|
||||
(defun always (&rest _arguments)
|
||||
"Do nothing and return t.
|
||||
This function accepts any number of ARGUMENTS, but ignores them.
|
||||
Also see `ignore'."
|
||||
t)
|
||||
|
||||
;; Signal a compile-error if the first arg is missing.
|
||||
(defun error (&rest args)
|
||||
"Signal an error, making a message by passing ARGS to `format-message'.
|
||||
|
|
@ -920,6 +928,7 @@ For an approximate inverse of this, see `key-description'."
|
|||
|
||||
(defun undefined ()
|
||||
"Beep to tell the user this binding is undefined."
|
||||
(declare (completion #'ignore))
|
||||
(interactive)
|
||||
(ding)
|
||||
(if defining-kbd-macro
|
||||
|
|
@ -1303,6 +1312,7 @@ in a cleaner way with command remapping, like this:
|
|||
(define-key map "l" #'downcase-word)
|
||||
(define-key map "c" #'capitalize-word)
|
||||
(define-key map "x" #'execute-extended-command)
|
||||
(define-key map "X" #'execute-extended-command-for-buffer)
|
||||
map)
|
||||
"Default keymap for ESC (meta) commands.
|
||||
The normal global definition of the character ESC indirects to this keymap.")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue