diff options
| author | Eli Zaretskii | 2018-02-04 22:15:05 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-04 22:15:05 +0200 |
| commit | f1102d2de483eac412430279ede23872d575ddf6 (patch) | |
| tree | c3a6d583f20fabe2baae4609afc7ca48cf92dc76 | |
| parent | 76b5a687d07b93dc7e292b72da6ad82001ff1fe3 (diff) | |
| download | emacs-f1102d2de483eac412430279ede23872d575ddf6.tar.gz emacs-f1102d2de483eac412430279ede23872d575ddf6.zip | |
Yet another round of fixing the Emacs manual
* doc/emacs/cmdargs.texi (Action Arguments): Rearrange text
describing what happens when Emacs is invoked with several file
arguments. Suggested by Grant Rettke <gcr@wisdomandwonder.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/xresources.texi (GTK styles):
* doc/emacs/mini.texi (Passwords):
* doc/emacs/frames.texi (Scroll Bars): Use "cannot" instead of
"can not".
* doc/emacs/macos.texi (Mac / GNUstep Basics): Clarify the effect
of ns-right-alternate-modifier when its value is 'none'.
Suggested by Wanderson Ferreira <iagwanderson@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/calendar.texi (Importing Diary, Appointments): Now
sub-sections of Diary.
* doc/emacs/emacs.texi (Top):
* doc/emacs/calendar.texi (Diary): Adjust menus to the above
change. Suggested by Isaac Carter <icarter1391@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/anti.texi (Antinews): Fix grammar.
| -rw-r--r-- | doc/emacs/anti.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/calendar.texi | 8 | ||||
| -rw-r--r-- | doc/emacs/cmdargs.texi | 14 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/macos.texi | 3 | ||||
| -rw-r--r-- | doc/emacs/mini.texi | 8 | ||||
| -rw-r--r-- | doc/emacs/xresources.texi | 2 |
8 files changed, 22 insertions, 21 deletions
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 8cef1be4e10..d4b68a2fac4 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi | |||
| @@ -95,7 +95,7 @@ happen. The variables @code{attempt-stack-overflow-recovery} and | |||
| 95 | 95 | ||
| 96 | @item | 96 | @item |
| 97 | The @code{list-timers} command was removed, as we decided timers are | 97 | The @code{list-timers} command was removed, as we decided timers are |
| 98 | no user-level feature, and therefore users should not be allowed to | 98 | not a user-level feature, and therefore users should not be allowed to |
| 99 | mess with them. Ask an Emacs Lisp guru near you for help if you have | 99 | mess with them. Ask an Emacs Lisp guru near you for help if you have |
| 100 | a runaway timer in your session. (Of course, as you move back in | 100 | a runaway timer in your session. (Of course, as you move back in |
| 101 | time, such runaway timers will become less and less frequent, and | 101 | time, such runaway timers will become less and less frequent, and |
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 9145a725e12..ed1f53fa70b 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi | |||
| @@ -41,8 +41,6 @@ For more advanced topics, | |||
| 41 | * Lunar Phases:: Displaying phases of the moon. | 41 | * Lunar Phases:: Displaying phases of the moon. |
| 42 | * Other Calendars:: Converting dates to other calendar systems. | 42 | * Other Calendars:: Converting dates to other calendar systems. |
| 43 | * Diary:: Displaying events from your diary. | 43 | * Diary:: Displaying events from your diary. |
| 44 | * Appointments:: Reminders when it's time to do something. | ||
| 45 | * Importing Diary:: Converting diary events to/from other formats. | ||
| 46 | * Daylight Saving:: How to specify when daylight saving time is active. | 44 | * Daylight Saving:: How to specify when daylight saving time is active. |
| 47 | * Time Intervals:: Keeping track of time intervals. | 45 | * Time Intervals:: Keeping track of time intervals. |
| 48 | @ifnottex | 46 | @ifnottex |
| @@ -936,6 +934,8 @@ entries. | |||
| 936 | * Date Formats:: Various ways you can specify dates. | 934 | * Date Formats:: Various ways you can specify dates. |
| 937 | * Adding to Diary:: Commands to create diary entries. | 935 | * Adding to Diary:: Commands to create diary entries. |
| 938 | * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. | 936 | * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. |
| 937 | * Appointments:: Reminders when it's time to do something. | ||
| 938 | * Importing Diary:: Converting diary events to/from other formats. | ||
| 939 | @end menu | 939 | @end menu |
| 940 | 940 | ||
| 941 | @node Format of Diary File | 941 | @node Format of Diary File |
| @@ -1363,7 +1363,7 @@ can perform arbitrary computations to determine when they apply. | |||
| 1363 | @end ifnottex | 1363 | @end ifnottex |
| 1364 | 1364 | ||
| 1365 | @node Appointments | 1365 | @node Appointments |
| 1366 | @section Appointments | 1366 | @subsection Appointments |
| 1367 | @cindex appointment notification | 1367 | @cindex appointment notification |
| 1368 | 1368 | ||
| 1369 | @vindex appt-display-format | 1369 | @vindex appt-display-format |
| @@ -1450,7 +1450,7 @@ list without affecting your diary file. You delete entries from the | |||
| 1450 | appointment list with @kbd{M-x appt-delete}. | 1450 | appointment list with @kbd{M-x appt-delete}. |
| 1451 | 1451 | ||
| 1452 | @node Importing Diary | 1452 | @node Importing Diary |
| 1453 | @section Importing and Exporting Diary Entries | 1453 | @subsection Importing and Exporting Diary Entries |
| 1454 | 1454 | ||
| 1455 | You can transfer diary entries between Emacs diary files and a | 1455 | You can transfer diary entries between Emacs diary files and a |
| 1456 | variety of other formats. | 1456 | variety of other formats. |
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 1dbc1dc735e..63db2ac765b 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi | |||
| @@ -101,13 +101,13 @@ displayed file is the last one specified on the command line; the | |||
| 101 | other files are visited but their buffers are not shown. | 101 | other files are visited but their buffers are not shown. |
| 102 | 102 | ||
| 103 | If the startup buffer is disabled (@pxref{Entering Emacs}), then | 103 | If the startup buffer is disabled (@pxref{Entering Emacs}), then |
| 104 | @var{file} is visited in a single window if one file argument was | 104 | starting Emacs with one file argument displays the buffer visiting |
| 105 | supplied; with two file arguments, Emacs displays the files in two | 105 | @var{file} in a single window. With two file arguments, Emacs |
| 106 | different windows; with more than two file argument, Emacs displays | 106 | displays the files in two different windows. With more than two file |
| 107 | the last file specified in one window, plus a Buffer Menu in a | 107 | argument, Emacs displays the last file specified in one window, plus |
| 108 | different window (@pxref{Several Buffers}). To inhibit using the | 108 | another window with a Buffer Menu showing all the other files |
| 109 | Buffer Menu for this, change the variable | 109 | (@pxref{Several Buffers}). To inhibit using the Buffer Menu for this, |
| 110 | @code{inhibit-startup-buffer-menu} to @code{t}. | 110 | change the variable @code{inhibit-startup-buffer-menu} to @code{t}. |
| 111 | 111 | ||
| 112 | @item +@var{linenum} @var{file} | 112 | @item +@var{linenum} @var{file} |
| 113 | @opindex +@var{linenum} | 113 | @opindex +@var{linenum} |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 0051868fee6..474c4e96e22 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -954,8 +954,6 @@ The Calendar and the Diary | |||
| 954 | * Lunar Phases:: Displaying phases of the moon. | 954 | * Lunar Phases:: Displaying phases of the moon. |
| 955 | * Other Calendars:: Converting dates to other calendar systems. | 955 | * Other Calendars:: Converting dates to other calendar systems. |
| 956 | * Diary:: Displaying events from your diary. | 956 | * Diary:: Displaying events from your diary. |
| 957 | * Appointments:: Reminders when it's time to do something. | ||
| 958 | * Importing Diary:: Converting diary events to/from other formats. | ||
| 959 | * Daylight Saving:: How to specify when daylight saving time is active. | 957 | * Daylight Saving:: How to specify when daylight saving time is active. |
| 960 | * Time Intervals:: Keeping track of time intervals. | 958 | * Time Intervals:: Keeping track of time intervals. |
| 961 | @ifnottex | 959 | @ifnottex |
| @@ -983,6 +981,8 @@ The Diary | |||
| 983 | * Date Formats:: Various ways you can specify dates. | 981 | * Date Formats:: Various ways you can specify dates. |
| 984 | * Adding to Diary:: Commands to create diary entries. | 982 | * Adding to Diary:: Commands to create diary entries. |
| 985 | * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. | 983 | * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. |
| 984 | * Appointments:: Reminders when it's time to do something. | ||
| 985 | * Importing Diary:: Converting diary events to/from other formats. | ||
| 986 | 986 | ||
| 987 | @ifnottex | 987 | @ifnottex |
| 988 | More advanced features of the Calendar and Diary | 988 | More advanced features of the Calendar and Diary |
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 7c1d36c720b..afdfa6c39c1 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -994,7 +994,7 @@ variable @code{scroll-bar-adjust-thumb-portion} to control | |||
| 994 | when the end of the buffer is visible. If its value is | 994 | when the end of the buffer is visible. If its value is |
| 995 | non-@code{nil}, the scroll bar can be dragged downwards even if the | 995 | non-@code{nil}, the scroll bar can be dragged downwards even if the |
| 996 | end of the buffer is shown; if @code{nil}, the thumb will be at the | 996 | end of the buffer is shown; if @code{nil}, the thumb will be at the |
| 997 | bottom when the end of the buffer is shown. You can not over-scroll | 997 | bottom when the end of the buffer is shown. You cannot over-scroll |
| 998 | when the entire buffer is visible. | 998 | when the entire buffer is visible. |
| 999 | 999 | ||
| 1000 | @cindex scroll-bar face | 1000 | @cindex scroll-bar face |
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index cf4e48bacb8..dbde2c8f824 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi | |||
| @@ -49,7 +49,8 @@ default). A value of @code{control}, @code{meta}, @code{alt}, | |||
| 49 | @code{super}, or @code{hyper} makes them behave like the corresponding | 49 | @code{super}, or @code{hyper} makes them behave like the corresponding |
| 50 | modifier keys; a value to @code{left} means be the same key as | 50 | modifier keys; a value to @code{left} means be the same key as |
| 51 | @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to | 51 | @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to |
| 52 | ignore them. | 52 | ignore them, in which case you get the default behavior of macOS |
| 53 | accentuation system from the right option key. | ||
| 53 | 54 | ||
| 54 | @kbd{S-mouse-1} adjusts the region to the click position, | 55 | @kbd{S-mouse-1} adjusts the region to the click position, |
| 55 | just like @kbd{mouse-3} (@code{mouse-save-then-kill}); it does not pop | 56 | just like @kbd{mouse-3} (@code{mouse-save-then-kill}); it does not pop |
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 35cffc1db92..de16c44720e 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi | |||
| @@ -773,10 +773,10 @@ you type the required password, press @key{RET} to submit it. To | |||
| 773 | prevent others from seeing your password, every character you type is | 773 | prevent others from seeing your password, every character you type is |
| 774 | displayed as a dot (@samp{.}) instead of its usual form. | 774 | displayed as a dot (@samp{.}) instead of its usual form. |
| 775 | 775 | ||
| 776 | Most of the features and commands associated with the minibuffer can | 776 | Most of the features and commands associated with the minibuffer |
| 777 | @emph{not} be used when entering a password. There is no history or | 777 | @emph{cannot} be used when entering a password. There is no history |
| 778 | completion, and you cannot change windows or perform any other action | 778 | or completion, and you cannot change windows or perform any other |
| 779 | with Emacs until you have submitted the password. | 779 | action with Emacs until you have submitted the password. |
| 780 | 780 | ||
| 781 | While you are typing the password, you may press @key{DEL} to delete | 781 | While you are typing the password, you may press @key{DEL} to delete |
| 782 | backwards, removing the last character entered. @kbd{C-u} deletes | 782 | backwards, removing the last character entered. @kbd{C-u} deletes |
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index f192c0d4c96..d58c6b905eb 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi | |||
| @@ -764,7 +764,7 @@ This is the state for data that has been selected by the user. It can | |||
| 764 | be selected text or items selected in a list. This state is not used | 764 | be selected text or items selected in a list. This state is not used |
| 765 | in Emacs. | 765 | in Emacs. |
| 766 | @item INSENSITIVE | 766 | @item INSENSITIVE |
| 767 | This is the state for widgets that are visible, but they can not be | 767 | This is the state for widgets that are visible, but they cannot be |
| 768 | manipulated in the usual way---for example, buttons that can't be | 768 | manipulated in the usual way---for example, buttons that can't be |
| 769 | pressed, and disabled menu items. To display disabled menu items in | 769 | pressed, and disabled menu items. To display disabled menu items in |
| 770 | yellow, use @code{fg[INSENSITIVE] = "yellow"}. | 770 | yellow, use @code{fg[INSENSITIVE] = "yellow"}. |