procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve keystrokes in doc strings in some find-file functions

Browse source 
* lisp/files.el (find-file):
(find-file-other-window):
(find-file-other-frame): Include the correct keymap so that
keystrokes are displayed better (bug#55761).

Copyright-paperwork-exempt: yes
This commit is contained in:
Ikumi Keita 2022-06-02 14:29:38 +02:00 • committed by Lars Ingebrigtsen
parent ef5651cc77
commit 672f9f787f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/files.el
View file

@ -1706,7 +1706,7 @@ rather than FUN itself, to `minibuffer-setup-hook'."
(defun find-file (filename &optional wildcards) (defun find-file (filename &optional wildcards)
"Edit file FILENAME. "Edit file FILENAME.
Switch to a buffer visiting file FILENAME, \\<minibuffer-local-map>Switch to a buffer visiting file FILENAME,
creating one if none already exists. creating one if none already exists.
Interactively, the default if you just type RET is the current directory, Interactively, the default if you just type RET is the current directory,
but the visited file name is available through the minibuffer history: but the visited file name is available through the minibuffer history:
@ -1731,7 +1731,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp,
expand wildcards (if any) and visit multiple files. You can expand wildcards (if any) and visit multiple files. You can
suppress wildcard expansion by setting `find-file-wildcards' to nil. suppress wildcard expansion by setting `find-file-wildcards' to nil.
To visit a file without any kind of conversion and without \\<global-map>To visit a file without any kind of conversion and without
automatically choosing a major mode, use \\[find-file-literally]." automatically choosing a major mode, use \\[find-file-literally]."
(interactive (interactive
(find-file-read-args "Find file: " (find-file-read-args "Find file: "
@ -1747,6 +1747,7 @@ automatically choosing a major mode, use \\[find-file-literally]."
Like \\[find-file] (which see), but creates a new window or reuses Like \\[find-file] (which see), but creates a new window or reuses
an existing one. See the function `display-buffer'. an existing one. See the function `display-buffer'.
\\<minibuffer-local-map>\
Interactively, the default if you just type RET is the current directory, Interactively, the default if you just type RET is the current directory,
but the visited file name is available through the minibuffer history: but the visited file name is available through the minibuffer history:
type \\[next-history-element] to pull it into the minibuffer. type \\[next-history-element] to pull it into the minibuffer.
@ -1779,6 +1780,7 @@ expand wildcards (if any) and visit multiple files."
Like \\[find-file] (which see), but creates a new frame or reuses Like \\[find-file] (which see), but creates a new frame or reuses
an existing one. See the function `display-buffer'. an existing one. See the function `display-buffer'.
\\<minibuffer-local-map>\
Interactively, the default if you just type RET is the current directory, Interactively, the default if you just type RET is the current directory,
but the visited file name is available through the minibuffer history: but the visited file name is available through the minibuffer history:
type \\[next-history-element] to pull it into the minibuffer. type \\[next-history-element] to pull it into the minibuffer.