From f165bc5770427943b03f1a33e906122389c26c5b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 11 Mar 2025 21:18:24 +0100 Subject: [PATCH] Don't recommend legacy keymap functions in documentation * doc/emacs/mule.texi (Input Methods): * doc/lispintro/emacs-lisp-intro.texi (Miscellaneous): * doc/lispref/text.texi (Clickable Text): * doc/misc/calc.texi (Defining Functions, Defining Simple Commands) (Customizing Calc): * doc/misc/efaq.texi (Matching parentheses, Modifying pull-down menus) (Deleting menus and menu options, Binding keys to commands) (Invalid prefix characters) (Terminal setup code works after Emacs has begun) (Backspace invokes help, Swapping keys, No Escape key) (Binding combinations of modifiers and function keys) (Replying to the sender of a message): * doc/misc/eudc.texi (Installation, Emacs-only Configuration) (External Configuration): * doc/misc/gnus.texi (Group Parameters, Misc Group Stuff) (Summary Buffer, Generic Marking Commands, RSS) (nnmairix tips and tricks, Oort Gnus): * doc/misc/ido.texi (Customization): * doc/misc/mairix-el.texi (Using): * doc/misc/mh-e.texi (HTML, Miscellaneous Commands and Options) (Folders, Composing): * doc/misc/octave-mode.texi (Running Octave from Within Emacs): * doc/misc/reftex.texi (Citations Outside LaTeX): * doc/misc/remember.texi (Quick Start): * doc/misc/sem-user.texi (Smart Jump): * doc/misc/viper.texi (Key Bindings, Vi Macros): * doc/misc/widget.texi (Defining New Widgets): * doc/misc/woman.texi (Word at point): Recommend 'keymap-set', 'keymap-global-set', 'keymap-global-unset', 'keymap-local-set', and 'key-translate', instead of their legacy equivalents. (Bug#55647) (cherry picked from commit 96a704346a282fc2783e54de3d9c30cd8f9ce955) --- doc/emacs/mule.texi | 2 +- doc/lispintro/emacs-lisp-intro.texi | 4 +- doc/lispref/text.texi | 2 +- doc/misc/calc.texi | 10 ++-- doc/misc/efaq.texi | 89 ++++++++++++++--------------- doc/misc/eudc.texi | 10 ++-- doc/misc/gnus.texi | 18 +++--- doc/misc/ido.texi | 2 +- doc/misc/mairix-el.texi | 18 +++--- doc/misc/octave-mode.texi | 4 +- doc/misc/reftex.texi | 2 +- doc/misc/remember.texi | 4 +- doc/misc/viper.texi | 8 +-- doc/misc/widget.texi | 4 +- doc/misc/woman.texi | 10 ++-- 15 files changed, 92 insertions(+), 95 deletions(-) diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 397315867e4..61734bd09d6 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -573,7 +573,7 @@ not when you are in the minibuffer). function that you add to the hook variable @code{quail-activate-hook}. @xref{Hooks}. For example, you can redefine some of the input method's keys by defining key bindings in the keymap returned by the -function @code{quail-translation-keymap}, using @code{define-key}. +function @code{quail-translation-keymap}, using @code{keymap-set}. @xref{Init Rebinding}. Input methods are inhibited when the text in the buffer is read-only diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index fe008d5c594..1f07a79394f 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -17871,10 +17871,10 @@ problem recently.) @smallexample @group ;; Translate 'C-h' to . -; (keyboard-translate ?\C-h ?\C-?) +; (key-translate "C-h" "C-?") ;; Translate to 'C-h'. -(keyboard-translate ?\C-? ?\C-h) +(key-translate "C-?" "C-h") @end group @end smallexample diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index de09cb01d60..a9a3d8c1e1a 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4293,7 +4293,7 @@ bind it within the link text, using the @code{keymap} text property @example (let ((map (make-sparse-keymap))) - (define-key map [mouse-2] 'operate-this-button) + (keymap-set map "" 'operate-this-button) (put-text-property link-start link-end 'keymap map)) @end example diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 57bd16cc87d..61466b55201 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -32370,7 +32370,7 @@ has the advantage that it is quietly ignored if @code{calc-check-defines} is not yet defined because Calc has not yet been loaded. Examples of things that ought to be enclosed in a @code{calc-define} -property are @code{defmath} calls, @code{define-key} calls that modify +property are @code{defmath} calls, @code{keymap-set} calls that modify the Calc key map, and any calls that redefine things defined inside Calc. Ordinary @code{defun}s need not be enclosed with @code{calc-define}. @@ -32478,7 +32478,7 @@ there. @vindex calc-Y-help-msgs Calc reserves a special prefix key, shift-@kbd{Y}, for user-written extensions to Calc. There are no built-in commands that work with -this prefix key; you must call @code{define-key} from Lisp (probably +this prefix key; you must call @code{keymap-set} from Lisp (probably from inside a @code{calc-define} property) to add to it. Initially only @kbd{Y ?} is defined; it takes help messages from a list of strings (initially @code{nil}) in the variable @code{calc-Y-help-msgs}. All @@ -32512,9 +32512,9 @@ decreases the precision. (put 'calc-define 'inc-prec '(progn -(define-key calc-mode-map (format "Y%sI" inc-prec-base-key) +(keymap-set calc-mode-map (format "Y %s I" inc-prec-base-key) 'calc-increase-precision) -(define-key calc-mode-map (format "Y%sD" inc-prec-base-key) +(keymap-set calc-mode-map (format "Y %s D" inc-prec-base-key) 'calc-decrease-precision) (setq calc-Y-help-msgs @@ -35297,7 +35297,7 @@ The usual prefix for Calc is the key sequence @kbd{C-x *}. If you wish to use a different prefix, you can put @example -(global-set-key "NEWPREFIX" 'calc-dispatch) +(keymap-global-set "NEWPREFIX" 'calc-dispatch) @end example @noindent diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 16f2a7f5e3a..24aa22f71c5 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -2612,7 +2612,7 @@ parenthesis, it simply inserts a % like normal. @lisp ;; By an unknown contributor -(global-set-key "%" 'match-paren) +(keymap-global-set "%" 'match-paren) (defun match-paren (arg) "Go to the matching paren if on a paren; otherwise insert %." @@ -3003,8 +3003,8 @@ new definition to the appropriate keymap. Adding a @samp{Forward Word} item to the @samp{Edit} menu thus requires the following Lisp code: @lisp -(define-key global-map - [menu-bar edit forward] +(keymap-set global-map + " " '("Forward word" . forward-word)) @end lisp @@ -3026,7 +3026,7 @@ To add a new menu, rather than a new option to an existing menu, we must define an entirely new keymap: @lisp -(define-key global-map [menu-bar words] +(keymap-set global-map " " (cons "Words" (make-sparse-keymap "Words"))) @end lisp @@ -3036,8 +3036,8 @@ The above code creates a new sparse keymap, gives it the name following code: @lisp -(define-key global-map - [menu-bar words forward] +(keymap-set global-map + " " '("Forward word" . forward-word)) @end lisp @@ -3048,26 +3048,26 @@ define menu options @samp{foo}, @samp{bar}, and @samp{baz} (in that order), the menu option @samp{baz} would appear at the top, and @samp{foo} would be at the bottom. -One way to avoid this problem is to use the function @code{define-key-after}, -which works the same as @code{define-key}, but lets you modify where items +One way to avoid this problem is to use the function @code{keymap-set-after}, +which works the same as @code{keymap-set}, but lets you modify where items appear. The following Lisp code would insert the @samp{Forward Word} item in the @samp{Edit} menu immediately following the @samp{Undo} item: @lisp -(define-key-after - (lookup-key global-map [menu-bar edit]) - [forward] +(keymap-set-after + (keymap-lookup global-map " ") + "" '("Forward word" . forward-word) 'undo) @end lisp -Note how the second and third arguments to @code{define-key-after} are -different from those of @code{define-key}, and that we have added a new +Note how the second and third arguments to @code{keymap-set-after} are +different from those of @code{keymap-set}, and that we have added a new (final) argument, the function after which our new key should be defined. To move a menu option from one position to another, simply evaluate -@code{define-key-after} with the appropriate final argument. +@code{keymap-set-after} with the appropriate final argument. More detailed information---and more examples of how to create and modify menu options---are in the @cite{Emacs Lisp Reference Manual}, under @@ -3084,7 +3084,7 @@ For example, to delete the @samp{Words} menu (@pxref{Modifying pull-down menus}), use: @lisp -(define-key global-map [menu-bar words] nil) +(keymap-set global-map " " nil) @end lisp Similarly, removing a menu option requires redefining a keymap entry to @@ -3093,7 +3093,7 @@ from the @samp{Edit} menu (we added it in @ref{Modifying pull-down menus}), use: @lisp -(define-key global-map [menu-bar edit forward] nil) +(keymap-set global-map " " nil) @end lisp @node Turning on syntax highlighting @@ -4074,11 +4074,11 @@ information is available from Keys can be bound to commands either interactively or in your init file (@pxref{Setting up a customization file}). To interactively bind -keys for all modes, type @kbd{M-x global-set-key @key{RET} @var{key} +keys for all modes, type @kbd{M-x keymap-global-set @key{RET} @var{key} @var{cmd} @key{RET}}. To bind a key just in the current major mode, type @kbd{M-x -local-set-key @key{RET} @var{key} @var{cmd} @key{RET}}. +keymap-local-set @key{RET} @var{key} @var{cmd} @key{RET}}. @xref{Key Bindings,,, emacs, The GNU Emacs Manual}. @@ -4090,7 +4090,7 @@ init file. If the key binding is global, no changes to the command are required. For example, @lisp -(global-set-key [f1] 'help-for-help) +(keymap-global-set "" 'help-for-help) @end lisp @noindent @@ -4101,7 +4101,7 @@ function. For example, in TeX mode, a local binding might be @lisp (add-hook 'tex-mode-hook (lambda () - (local-set-key [f1] 'help-for-help))) + (keymap-local-set "" 'help-for-help))) @end lisp @@ -4119,8 +4119,8 @@ bound as a complete key, then you must unbind it before the new binding. For example, if @kbd{ESC @{} is previously bound: @lisp -(global-unset-key [?\e ?@{]) ;; or -(local-unset-key [?\e ?@{]) +(keymap-global-unset "M-@{") ;; or +(keymap-local-unset "M-@{") @end lisp @item @@ -4128,8 +4128,8 @@ Aside from commands and ``lambda lists,'' a vector or string also can be bound to a key and thus treated as a macro. For example: @lisp -(global-set-key [f10] [?\C-x?\e?\e?\C-a?\C-k?\C-g]) ;; or -(global-set-key [f10] "\C-x\e\e\C-a\C-k\C-g") +(keymap-global-set "" [?\C-x?\e?\e?\C-a?\C-k?\C-g]) ;; or +(keymap-global-set "" "\C-x\e\e\C-a\C-k\C-g") @end lisp @end itemize @@ -4145,12 +4145,11 @@ character in the key sequence has been misspecified (e.g., @samp{C-f} used instead of @samp{\C-f} within a Lisp expression). In the other case, a @dfn{prefix key} in the keystroke sequence you were trying to bind was already bound as a @dfn{complete key}. Historically, the @samp{ESC [} -prefix was usually the problem, in which case you should evaluate either -of these forms before attempting to bind the key sequence: +prefix was usually the problem, in which case you should evaluate this +form before attempting to bind the key sequence: @lisp -(global-unset-key [?\e ?[]) ;; or -(global-unset-key "\e[") +(keymap-global-unset "M-[") @end lisp @node Terminal setup code works after Emacs has begun @@ -4174,7 +4173,7 @@ newer). For example, (lambda () (when (string-match "\\`vt220" (or (getenv "TERM") "")) ;; Make vt220's "Do" key behave like M-x: - (global-set-key [do] 'execute-extended-command)))) + (keymap-global-set "" 'execute-extended-command)))) @end lisp For information on what Emacs does every time it is started, see the @@ -4271,7 +4270,7 @@ It is possible to swap the @key{Backspace} and @key{DEL} keys inside Emacs: @lisp -(keyboard-translate ?\C-h ?\C-?) +(key-translate "C-h" "C-?") @end lisp @noindent @@ -4283,20 +4282,20 @@ Similarly, you could remap @key{DEL} to act as @kbd{C-d}, which by default deletes forward: @lisp -(keyboard-translate ?\C-? ?\C-d) +(key-translate "C-?" "C-d") @end lisp -@xref{Swapping keys}, for further details about @code{keyboard-translate}. +@xref{Swapping keys}, for further details about @code{key-translate}. @item Another approach is to switch key bindings and put help on @kbd{C-x h} instead: @lisp -(global-set-key "\C-h" 'delete-backward-char) +(keymap-global-set "C-h" 'delete-backward-char) ;; overrides mark-whole-buffer -(global-set-key "\C-xh" 'help-command) +(keymap-global-set "C-x h" 'help-command) @end lisp @noindent @@ -4304,7 +4303,7 @@ This method is not recommended, though: it only solves the problem for those modes which bind @key{DEL} to @code{delete-backward-char}. Modes which bind @key{DEL} to something else, such as @code{view-mode}, will not work as you expect when you press the @key{Backspace} key. For this -reason, we recommend the @code{keyboard-translate} method, shown +reason, we recommend the @code{key-translate} method, shown above. Other popular key bindings for help are @kbd{M-?} and @kbd{C-x ?}. @@ -4327,15 +4326,15 @@ Manual}. @section How do I swap two keys? @cindex Swapping keys @cindex Keys, swapping -@cindex @code{keyboard-translate} +@cindex @code{key-translate} You can swap two keys (or key sequences) by using the -@code{keyboard-translate} function. For example, to turn @kbd{C-h} +@code{key-translate} function. For example, to turn @kbd{C-h} into @key{DEL} and @key{DEL} to @kbd{C-h}, use @lisp -(keyboard-translate ?\C-h ?\C-?) ; translate 'C-h' to DEL -(keyboard-translate ?\C-? ?\C-h) ; translate DEL to 'C-h'. +(key-translate "C-h" "C-?") ; translate 'C-h' to DEL +(key-translate "C-?" "C-h") ; translate DEL to 'C-h'. @end lisp @noindent @@ -4345,7 +4344,7 @@ keymaps. However, in the specific case of @kbd{C-h} and @key{DEL}, you should toggle @code{normal-erase-is-backspace-mode} instead of calling -@code{keyboard-translate}. +@code{key-translate}. @xref{DEL Does Not Delete,,, emacs, The GNU Emacs Manual}. Keyboard translations are not the same as key bindings in keymaps. @@ -4417,7 +4416,7 @@ generates @key{ESC}. If not, the following form can be used to bind it: @lisp ;; F11 is the documented ESC replacement on DEC terminals. -(define-key function-key-map [f11] [?\e]) +(keymap-set function-key-map "" [?\e]) @end lisp @node Compose Character @@ -4441,7 +4440,7 @@ prefixes to the function key symbol. For example (from the Emacs documentation): @lisp -(global-set-key [?\C-x right] 'forward-page) +(keymap-global-set "C-x " 'forward-page) @end lisp @noindent @@ -4454,7 +4453,7 @@ represent these modifiers, prepend the strings @samp{C-}, @samp{M-}, is how to make @kbd{H-M-RIGHT} move forward a word: @lisp -(global-set-key [H-M-right] 'forward-word) +(keymap-global-set "H-M-" 'forward-word) @end lisp @itemize @bullet @@ -4812,8 +4811,8 @@ best fix I've been able to come up with: (add-hook 'rmail-mode-hook (lambda () - (define-key rmail-mode-map "r" 'rmail-reply-t) - (define-key rmail-mode-map "R" 'rmail-reply))) + (keymap-set rmail-mode-map "r" 'rmail-reply-t) + (keymap-set rmail-mode-map "R" 'rmail-reply))) @end lisp @node Automatically starting a mail or news reader diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index 892c4ca605b..d7a31bf7b09 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -257,9 +257,9 @@ email composition buffers (@pxref{Inline Query Expansion}) @lisp (with-eval-after-load "message" - (define-key message-mode-map [(control ?c) (tab)] 'eudc-expand-try-all)) + (keymap-set message-mode-map "C-c " 'eudc-expand-try-all)) (with-eval-after-load "sendmail" - (define-key mail-mode-map [(control ?c) (tab)] 'eudc-expand-try-all)) + (keymap-set mail-mode-map "C-c " 'eudc-expand-try-all)) @end lisp @menu @@ -355,7 +355,7 @@ LDAP: @vindex ldap-host-parameters-alist @lisp (with-eval-after-load "message" - (define-key message-mode-map (kbd "TAB") 'eudc-expand-try-all)) + (keymap-set message-mode-map "TAB" 'eudc-expand-try-all)) (setopt eudc-server-hotlist '(("" . bbdb) ("ldaps://ldap.gnu.org" . ldap))) @@ -412,7 +412,7 @@ configure EUDC for LDAP: @vindex ldap-host-parameters-alist @lisp (with-eval-after-load "message" - (define-key message-mode-map (kbd "TAB") 'eudc-expand-try-all)) + (keymap-set message-mode-map "TAB" 'eudc-expand-try-all)) (setopt eudc-server-hotlist '(("" . bbdb) ("ldaps://ldap.gnu.org" . ldap))) @@ -442,7 +442,7 @@ and the @file{.emacs} expressions become: @vindex ldap-host-parameters-alist @lisp (with-eval-after-load "message" - (define-key message-mode-map (kbd "TAB") 'eudc-expand-try-all)) + (keymap-set message-mode-map "TAB" 'eudc-expand-try-all)) (setopt eudc-server-hotlist '(("" . bbdb) ("" . ldap))) (setopt ldap-host-parameters-alist diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 5bfd6e2ef9c..e9cfb163172 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -3311,7 +3311,7 @@ following is added to a group parameter @lisp (gnus-summary-prepared-hook - (lambda nil (local-set-key "d" (local-key-binding "n")))) + (lambda nil (keymap-local-set "d" (local-key-binding "n")))) @end lisp when the group is entered, the 'd' key will not mark the article as @@ -4529,7 +4529,7 @@ The key @kbd{v} is reserved for users. You can bind it to some command or better use it as a prefix key. For example: @lisp -(define-key gnus-group-mode-map (kbd "v j d") +(keymap-set gnus-group-mode-map "v j d" (lambda () (interactive) (gnus-group-jump-to-group "nndraft:drafts"))) @@ -4882,7 +4882,7 @@ customize-apropos @key{RET} gnus-summary-tool-bar}. The key @kbd{v} is reserved for users. You can bind it to some command or better use it as a prefix key. For example: @lisp -(define-key gnus-summary-mode-map (kbd "v -") "LrS") ;; lower subthread +(keymap-set gnus-summary-mode-map "v -" "LrS") ;; lower subthread @end lisp @menu @@ -6654,7 +6654,7 @@ article, you could say something like: @group (add-hook 'gnus-summary-mode-hook 'my-alter-summary-map) (defun my-alter-summary-map () - (local-set-key "!" 'gnus-summary-put-mark-as-ticked-next)) + (keymap-local-set "!" 'gnus-summary-put-mark-as-ticked-next)) @end group @end lisp @@ -6663,7 +6663,7 @@ or @lisp (defun my-alter-summary-map () - (local-set-key "!" "MM!n")) + (keymap-local-set "!" "MM!n")) @end lisp @@ -17485,8 +17485,7 @@ summary buffer. (gnus-summary-scroll-up arg)))) (with-eval-after-load "gnus" - (define-key gnus-summary-mode-map - (kbd "") 'browse-nnrss-url)) + (keymap-set gnus-summary-mode-map "RET" 'browse-nnrss-url)) (add-to-list 'nnmail-extra-headers nnrss-url-field) @end lisp @@ -22494,7 +22493,7 @@ I use the following to check for mails: (nnmairix-update-groups "mairixsearch" t t) (gnus-group-list-groups)) -(define-key gnus-group-mode-map "g" 'my-check-mail-mairix-update) +(keymap-set gnus-group-mode-map "g" 'my-check-mail-mairix-update) @end lisp Instead of @samp{"mairixsearch"} use the name of your @code{nnmairix} @@ -28520,8 +28519,7 @@ enjoy the power of @acronym{MML}. The line below enables BBDB in resending a message: @lisp -(define-key message-minibuffer-local-map [(tab)] - 'bbdb-complete-name) +(keymap-set message-minibuffer-local-map "TAB" 'bbdb-complete-name) @end lisp @item diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi index 62f1cff847e..ee9f933aace 100644 --- a/doc/misc/ido.texi +++ b/doc/misc/ido.texi @@ -483,7 +483,7 @@ To modify the key bindings, use the @code{ido-setup-hook}. For example: (defun ido-my-keys () "Add my key bindings for Ido." - (define-key ido-completion-map " " 'ido-next-match)) + (keymap-set ido-completion-map "SPC" 'ido-next-match)) @end example @c @defopt ido-setup-hook diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index 0cdd014902d..286511a7283 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -199,15 +199,15 @@ might or might not collide with some other modes. Simply include them in your @file{.emacs} and adapt to your needs: @lisp -(global-set-key (kbd "C-c C-o m") 'mairix-search) -(global-set-key (kbd "C-c C-o w") 'mairix-widget-search) -(global-set-key (kbd "C-c C-o u") 'mairix-update-database) -(global-set-key (kbd "C-c C-o f") 'mairix-search-from-this-article) -(global-set-key (kbd "C-c C-o t") 'mairix-search-thread-this-article) -(global-set-key (kbd "C-c C-o b") 'mairix-widget-search-based-on-article) -(global-set-key (kbd "C-c C-o s") 'mairix-save-search) -(global-set-key (kbd "C-c C-o i") 'mairix-use-saved-search) -(global-set-key (kbd "C-c C-o e") 'mairix-edit-saved-searches) +(keymap-global-set "C-c C-o m" 'mairix-search) +(keymap-global-set "C-c C-o w" 'mairix-widget-search) +(keymap-global-set "C-c C-o u" 'mairix-update-database) +(keymap-global-set "C-c C-o f" 'mairix-search-from-this-article) +(keymap-global-set "C-c C-o t" 'mairix-search-thread-this-article) +(keymap-global-set "C-c C-o b" 'mairix-widget-search-based-on-article) +(keymap-global-set "C-c C-o s" 'mairix-save-search) +(keymap-global-set "C-c C-o i" 'mairix-use-saved-search) +(keymap-global-set "C-c C-o e" 'mairix-edit-saved-searches) @end lisp Here's a description of the available interactive functions: diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi index 9c3462d93f1..6d9472c7b1b 100644 --- a/doc/misc/octave-mode.texi +++ b/doc/misc/octave-mode.texi @@ -374,9 +374,9 @@ add @lisp (add-hook 'inferior-octave-mode-hook (lambda () - (define-key inferior-octave-mode-map [up] + (keymap-set inferior-octave-mode-map "" 'comint-previous-input) - (define-key inferior-octave-mode-map [down] + (keymap-set inferior-octave-mode-map "" 'comint-next-input))) @end lisp @noindent diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 56d3bbb655f..8c7739b00f2 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -2050,7 +2050,7 @@ binding for @code{reftex-cite-format}. @lisp (add-hook 'mail-setup-hook - (lambda () (define-key mail-mode-map "\C-c[" + (lambda () (keymap-set mail-mode-map "C-c [" (lambda () (interactive) (let ((reftex-cite-format 'locally)) diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index e9f9d3c7fc4..a9fcf6e6d48 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -211,8 +211,8 @@ Here is one way to map the remember functions in your init file Manual}) to very accessible keystrokes facilities using the mode: @lisp -(define-key global-map (kbd " r") 'remember) -(define-key global-map (kbd " R") 'remember-region) +(keymap-set global-map " r" 'remember) +(keymap-set global-map " R" 'remember-region) @end lisp @cindex annotation diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 8079d1d0472..6932d29c296 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -1968,8 +1968,8 @@ Under the X Window System, every keyboard key emits its preferred form, so you can just type @lisp -(global-set-key [f11] 'calendar) ; L1, Stop -(global-set-key [f14] 'undo) ; L4, Undo +(keymap-global-set "" 'calendar) ; L1, Stop +(keymap-global-set "" 'undo) ; L4, Undo @end lisp @noindent @@ -2885,7 +2885,7 @@ the standard Emacs mechanism for binding function keys to commands. For instance, @example -(global-set-key [f13] 'repeat-complex-command) +(keymap-global-set "" 'repeat-complex-command) @end example @noindent @@ -2932,7 +2932,7 @@ say, @kbd{f12 \3} like this: Note that even though the macro uses the function key @kbd{f12}, the key is actually free and can still be bound to some Emacs function via -@code{define-key} or @code{global-set-key}. +@code{define-key} or @code{keymap-global-set}. Viper allows the user to define macro names that are prefixes of other macros. diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index f84e81bce77..864489726c8 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -3088,8 +3088,8 @@ Example: @group (defvar widget-ranged-integer-map (let ((map (copy-keymap widget-keymap))) - (define-key map [up] #'widget-ranged-integer-increase) - (define-key map [down] #'widget-ranged-integer-decrease) + (keymap-set map "" #'widget-ranged-integer-increase) + (keymap-set map "" #'widget-ranged-integer-decrease) map)) @end group diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index ce0949793d7..a0af654d002 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -473,11 +473,11 @@ e.g., this key binding for @kbd{C-c w} runs WoMan on the topic at point without seeking confirmation: @lisp -(global-set-key "\C-cw" - (lambda () - (interactive) - (let ((woman-use-topic-at-point t)) - (woman)))) +(keymap-global-set "C-c w" + (lambda () + (interactive) + (let ((woman-use-topic-at-point t)) + (woman)))) @end lisp -- 2.39.5