From: Eli Zaretskii Date: Sun, 4 Feb 2018 20:15:05 +0000 (+0200) Subject: Yet another round of fixing the Emacs manual X-Git-Tag: emacs-26.1-rc1~253 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1102d2de483eac412430279ede23872d575ddf6;p=emacs.git 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 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 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 in emacs-manual-bugs@gnu.org. * doc/emacs/anti.texi (Antinews): Fix grammar. --- 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 @item The @code{list-timers} command was removed, as we decided timers are -no user-level feature, and therefore users should not be allowed to +not a user-level feature, and therefore users should not be allowed to mess with them. Ask an Emacs Lisp guru near you for help if you have a runaway timer in your session. (Of course, as you move back in 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, * Lunar Phases:: Displaying phases of the moon. * Other Calendars:: Converting dates to other calendar systems. * Diary:: Displaying events from your diary. -* Appointments:: Reminders when it's time to do something. -* Importing Diary:: Converting diary events to/from other formats. * Daylight Saving:: How to specify when daylight saving time is active. * Time Intervals:: Keeping track of time intervals. @ifnottex @@ -936,6 +934,8 @@ entries. * Date Formats:: Various ways you can specify dates. * Adding to Diary:: Commands to create diary entries. * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. +* Appointments:: Reminders when it's time to do something. +* Importing Diary:: Converting diary events to/from other formats. @end menu @node Format of Diary File @@ -1363,7 +1363,7 @@ can perform arbitrary computations to determine when they apply. @end ifnottex @node Appointments -@section Appointments +@subsection Appointments @cindex appointment notification @vindex appt-display-format @@ -1450,7 +1450,7 @@ list without affecting your diary file. You delete entries from the appointment list with @kbd{M-x appt-delete}. @node Importing Diary -@section Importing and Exporting Diary Entries +@subsection Importing and Exporting Diary Entries You can transfer diary entries between Emacs diary files and a 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 other files are visited but their buffers are not shown. If the startup buffer is disabled (@pxref{Entering Emacs}), then -@var{file} is visited in a single window if one file argument was -supplied; with two file arguments, Emacs displays the files in two -different windows; with more than two file argument, Emacs displays -the last file specified in one window, plus a Buffer Menu in a -different window (@pxref{Several Buffers}). To inhibit using the -Buffer Menu for this, change the variable -@code{inhibit-startup-buffer-menu} to @code{t}. +starting Emacs with one file argument displays the buffer visiting +@var{file} in a single window. With two file arguments, Emacs +displays the files in two different windows. With more than two file +argument, Emacs displays the last file specified in one window, plus +another window with a Buffer Menu showing all the other files +(@pxref{Several Buffers}). To inhibit using the Buffer Menu for this, +change the variable @code{inhibit-startup-buffer-menu} to @code{t}. @item +@var{linenum} @var{file} @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 * Lunar Phases:: Displaying phases of the moon. * Other Calendars:: Converting dates to other calendar systems. * Diary:: Displaying events from your diary. -* Appointments:: Reminders when it's time to do something. -* Importing Diary:: Converting diary events to/from other formats. * Daylight Saving:: How to specify when daylight saving time is active. * Time Intervals:: Keeping track of time intervals. @ifnottex @@ -983,6 +981,8 @@ The Diary * Date Formats:: Various ways you can specify dates. * Adding to Diary:: Commands to create diary entries. * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. +* Appointments:: Reminders when it's time to do something. +* Importing Diary:: Converting diary events to/from other formats. @ifnottex 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 when the end of the buffer is visible. If its value is non-@code{nil}, the scroll bar can be dragged downwards even if the end of the buffer is shown; if @code{nil}, the thumb will be at the -bottom when the end of the buffer is shown. You can not over-scroll +bottom when the end of the buffer is shown. You cannot over-scroll when the entire buffer is visible. @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}, @code{super}, or @code{hyper} makes them behave like the corresponding modifier keys; a value to @code{left} means be the same key as @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to -ignore them. +ignore them, in which case you get the default behavior of macOS +accentuation system from the right option key. @kbd{S-mouse-1} adjusts the region to the click position, 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 prevent others from seeing your password, every character you type is displayed as a dot (@samp{.}) instead of its usual form. - Most of the features and commands associated with the minibuffer can -@emph{not} be used when entering a password. There is no history or -completion, and you cannot change windows or perform any other action -with Emacs until you have submitted the password. + Most of the features and commands associated with the minibuffer +@emph{cannot} be used when entering a password. There is no history +or completion, and you cannot change windows or perform any other +action with Emacs until you have submitted the password. While you are typing the password, you may press @key{DEL} to delete 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 be selected text or items selected in a list. This state is not used in Emacs. @item INSENSITIVE -This is the state for widgets that are visible, but they can not be +This is the state for widgets that are visible, but they cannot be manipulated in the usual way---for example, buttons that can't be pressed, and disabled menu items. To display disabled menu items in yellow, use @code{fg[INSENSITIVE] = "yellow"}.