diff options
| author | Glenn Morris | 2020-01-24 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-01-24 07:50:22 -0800 |
| commit | a76e7d592f428e04b868724c9dfe57d35eb3744e (patch) | |
| tree | fb1dac934a6024ba1bea0910ec2778f4b1b5c1ae /doc | |
| parent | c7d870db893fac3cbb5c49ee3c687e686acbd1d5 (diff) | |
| parent | 0bed550e210b2dfe898a0755592db5747fb3da37 (diff) | |
| download | emacs-a76e7d592f428e04b868724c9dfe57d35eb3744e.tar.gz emacs-a76e7d592f428e04b868724c9dfe57d35eb3744e.zip | |
Merge from origin/emacs-27
0bed550e21 (origin/emacs-27) Remove EmacsOpenPanel and EmacsSavePanel...
a0336029db * doc/emacs/files.texi (Auto Save Files): Improve indexing...
57fb8b10c1 Fix inaccurate wording in the Emacs manual
1c487747ab Update ERC module URLs
7d1e9c943f Minor doc string clarification in use-hard-newlines
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/basic.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 10 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index ac953e1907b..abb385f53d5 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi | |||
| @@ -117,9 +117,9 @@ which is Unicode code-point U+2018 @sc{left single quotation mark}, | |||
| 117 | sometimes called a left single ``curved quote'' or ``curly quote''. | 117 | sometimes called a left single ``curved quote'' or ``curly quote''. |
| 118 | Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the | 118 | Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the |
| 119 | curved quotes @t{’}, @t{“} and @t{”}, respectively. Also, a working | 119 | curved quotes @t{’}, @t{“} and @t{”}, respectively. Also, a working |
| 120 | Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [} | 120 | @key{Alt} key acts like @kbd{C-x 8} (unless followed by @key{RET}); |
| 121 | and inserts @t{‘}. To see which characters have @kbd{C-x 8} | 121 | e.g., @kbd{A-[} acts like @kbd{C-x 8 [} and inserts @t{‘}. To see |
| 122 | shorthands, type @kbd{C-x 8 C-h}. | 122 | which characters have @kbd{C-x 8} shorthands, type @kbd{C-x 8 C-h}. |
| 123 | 123 | ||
| 124 | Alternatively, you can use the command @kbd{C-x 8 @key{RET}} | 124 | Alternatively, you can use the command @kbd{C-x 8 @key{RET}} |
| 125 | (@code{insert-char}). This prompts for the Unicode name or code-point | 125 | (@code{insert-char}). This prompts for the Unicode name or code-point |
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 4fe7bbb275d..f39ce40931c 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -1930,10 +1930,12 @@ commonly used, Emacs supports three other modifier keys. These are | |||
| 1930 | called @key{Super}, @key{Hyper}, and @key{Alt}. Few terminals provide | 1930 | called @key{Super}, @key{Hyper}, and @key{Alt}. Few terminals provide |
| 1931 | ways to use these modifiers; the key labeled @key{Alt} on most | 1931 | ways to use these modifiers; the key labeled @key{Alt} on most |
| 1932 | keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The | 1932 | keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The |
| 1933 | standard key bindings in Emacs do not include any characters with | 1933 | standard key bindings in Emacs do not include any characters with the |
| 1934 | these modifiers. However, you can customize Emacs to assign meanings | 1934 | @key{Super} and @key{Hyper} modifiers, and only a small number of |
| 1935 | to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and | 1935 | standard key bindings use @key{Alt}. However, you can customize Emacs |
| 1936 | @samp{A-} respectively. | 1936 | to assign meanings to key bindings that use these modifiers. The |
| 1937 | modifier bits are labeled as @samp{s-}, @samp{H-} and @samp{A-} | ||
| 1938 | respectively. | ||
| 1937 | 1939 | ||
| 1938 | Even if your keyboard lacks these additional modifier keys, you can | 1940 | Even if your keyboard lacks these additional modifier keys, you can |
| 1939 | enter it using @kbd{C-x @@}: @kbd{C-x @@ h} adds the Hyper flag to | 1941 | enter it using @kbd{C-x @@}: @kbd{C-x @@ h} adds the Hyper flag to |
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 0af3ac24eb1..a89b16b3f6d 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi | |||
| @@ -1079,6 +1079,7 @@ want to make permanent. Instead, auto-saving is done in a different | |||
| 1079 | file called the @dfn{auto-save file}, and the visited file is changed | 1079 | file called the @dfn{auto-save file}, and the visited file is changed |
| 1080 | only when you request saving explicitly (such as with @kbd{C-x C-s}). | 1080 | only when you request saving explicitly (such as with @kbd{C-x C-s}). |
| 1081 | 1081 | ||
| 1082 | @cindex @file{#}, in auto-save file names | ||
| 1082 | Normally, the auto-save file name is made by appending @samp{#} to the | 1083 | Normally, the auto-save file name is made by appending @samp{#} to the |
| 1083 | front and rear of the visited file name. Thus, a buffer visiting file | 1084 | front and rear of the visited file name. Thus, a buffer visiting file |
| 1084 | @file{foo.c} is auto-saved in a file @file{#foo.c#}. Most buffers that | 1085 | @file{foo.c} is auto-saved in a file @file{#foo.c#}. Most buffers that |