diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 22 | ||||
| -rw-r--r-- | doc/emacs/buffers.texi | 27 | ||||
| -rw-r--r-- | doc/emacs/cmdargs.texi | 13 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/entering.texi | 17 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 8 | ||||
| -rw-r--r-- | doc/emacs/help.texi | 20 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 7 | ||||
| -rw-r--r-- | doc/emacs/rmail.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/screen.texi | 9 |
12 files changed, 83 insertions, 60 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index daccb5a2682..5d85687bd00 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,27 @@ 2014-06-08 Glenn Morris <rgm@gnu.org> + * entering.texi (Entering Emacs): Small fix re initial-buffer-choice. + * misc.texi (emacsclient Options): Copyedit. + + * buffers.texi (Uniquify): Copyedits. + * files.texi (Visiting): Update for uniquify changes. + + * dired.texi (Marks vs Flags): + * rmail.texi (Rmail Scrolling): Markup fixes re SPC. + + * help.texi (Help, Misc Help): Copyedits. + + * screen.texi (Menu Bar): Copyedits. + * msdog.texi (Windows Keyboard): F10 menus are now a general feature. + + * frames.texi (Frame Commands): Copyedits re M-F10, F11. + * cmdargs.texi (Window Size X): Copyedits. + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Updates. + +2014-06-08 Glenn Morris <rgm@gnu.org> + * ack.texi (Acknowledgments): * emacs.texi (Acknowledgments): Updates. diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 89b56da7723..54a84989e2e 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -608,20 +608,16 @@ convenient to switch between buffers. @cindex unique buffer names @cindex directories in buffer names When several buffers visit identically-named files, Emacs must give -the buffers distinct names. The default method -(@code{uniquify-buffer-name-style} set to -@code{post-forward-angle-brackets}) for making buffer names unique -adds @samp{<dir1>}, @samp{<dir2>}, etc.@: to the end of the buffer -names, where @file{dir1} and @file{dir2} are the minimal parts of the -leading directories needed to make the buffer name unique. For -example, if you have files @file{/foo/bar/mumble/name} and -@file{/baz/quux/mumble/name} visited, their buffers will be named -@samp{name<bar/mumble>} and @samp{name<quux/mumble>} correspondingly. +the buffers distinct names. The default method adds a suffix based on +the names of the directories that contain the files. For example, if +you visit files @file{/foo/bar/mumble/name} and +@file{/baz/quux/mumble/name} at the same time, their buffers will be +named @samp{name<bar/mumble>} and @samp{name<quux/mumble>}, respectively. +Emacs adds as many directory parts as are needed to make a unique name. @vindex uniquify-buffer-name-style - There are several styles to make buffer names unique. To select -one, customize the variable @code{uniquify-buffer-name-style} -(@pxref{Easy Customization}). + You can choose from several different styles for constructing unique +buffer names, by customizing the option @code{uniquify-buffer-name-style}. The @code{forward} naming method includes part of the file's directory name at the beginning of the buffer name; using this method, @@ -631,8 +627,8 @@ buffers visiting the files @file{/u/rms/tmp/Makefile} and In contrast, the @code{post-forward} naming method would call the buffers @samp{Makefile|tmp} and @samp{Makefile|zaphod}. The default -method @code{post-forward-angle-brackets} is like @code{post-forward} -except that it prepends the unique path in angle brackets. The +method @code{post-forward-angle-brackets} is like @code{post-forward}, +except that it encloses the unique path in angle brackets. The @code{reverse} naming method would call them @samp{Makefile\tmp} and @samp{Makefile\zaphod}. The nontrivial difference between @code{post-forward} and @code{reverse} occurs when just one directory @@ -641,8 +637,7 @@ the directory names in reverse order, so that @file{/top/middle/file} becomes @samp{file\middle\top}, while @code{post-forward} puts them in forward order after the file name, as in @samp{file|top/middle}. If @code{uniquify-buffer-name-style} is set to @code{nil}, the buffer -names simply get a @samp{<2>} etc. prepended. This used to be the -default behavior in Emacs versions up to 24.4. +names simply get @samp{<2>}, @samp{<3>}, etc. appended. Which rule to follow for putting the directory names in the buffer name is not very important if you are going to @emph{look} at the diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index ce7af79076e..8b3654dae68 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -901,30 +901,33 @@ the initial frame. @itemx --fullscreen @opindex --fullscreen @cindex fullscreen, command-line argument -Specify that width and height shall be the size of the screen. Normally -no window manager decorations are shown. +Specify that width and height should be that of the screen. Normally +no window manager decorations are shown. (After starting Emacs, +you can toggle this state using @key{F11}, @code{toggle-frame-fullscreen}.) @item -mm @opindex -mm @itemx --maximized @opindex --maximized @cindex maximized, command-line argument -Specify that the Emacs frame shall be maximized. This normally +Specify that the Emacs frame should be maximized. This normally means that the frame has window manager decorations. +(After starting Emacs, you can toggle this state using @kbd{M-F10}, +@code{toggle-frame-maximized}.) @item -fh @opindex -fh @itemx --fullheight @opindex --fullheight @cindex fullheight, command-line argument -Specify that the height shall be the height of the screen. +Specify that the height should be the height of the screen. @item -fw @opindex -fw @itemx --fullwidth @opindex --fullwidth @cindex fullwidth, command-line argument -Specify that the width shall be the width of the screen. +Specify that the width should be the width of the screen. @end table @noindent diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 4e9dfd5d12a..c7dace619e9 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -522,7 +522,7 @@ flags on all the files that have no marks, while unflagging all those that already have @samp{D} flags: @example -* c D t * c SPC D * c t SPC +* c D t * c @key{SPC} D * c t @key{SPC} @end example This assumes that no files were already marked with @samp{t}. diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 71b1fc839ac..f8ab4eb971a 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -76,12 +76,17 @@ information about @file{site-start.el}.} You can also force Emacs to display a file or directory at startup by setting the variable @code{initial-buffer-choice} to a string naming that file or directory. The value of -@code{initial-buffer-choice} may also be a function which should -return a buffer which is then displayed. @code{initial-buffer-choice} -may also be @code{t} in which case the @file{*scratch*} buffer will be -shown. In any case, even if you specify one or more files on the -command line, Emacs opens but does not display them if -@code{initial-buffer-choice} is non-nil. +@code{initial-buffer-choice} may also be a function (of no arguments) +that should return a buffer which is then displayed. +@ignore +@c I do not think this should be mentioned. AFAICS it is just a dodge +@c around inhibit-startup-screen not being settable on a site-wide basis. +@code{initial-buffer-choice} may also be @code{t} in which case the +@file{*scratch*} buffer will be shown. +@end ignore +If @code{initial-buffer-choice} is non-@code{nil}, then if you specify +any files on the command line, Emacs still visits them, but does not +display them initially. @node Exiting @section Exiting Emacs diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 894e61d0f04..ee80c49af0b 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -171,9 +171,9 @@ the mode line (@pxref{Mode Line}). Emacs normally constructs the buffer name from the file name, omitting the directory name. For example, a file named @file{/usr/rms/emacs.tex} is visited in a buffer named @samp{emacs.tex}. If there is already a buffer with that name, -Emacs constructs a unique name; the normal method is to append -@samp{<2>}, @samp{<3>}, and so on, but you can select other methods. -@xref{Uniquify}. +Emacs constructs a unique name; the normal method is to add a suffix +based on the directory name (e.g., @samp{<rms>}, @samp{<tmp>}, +and so on), but you can select other methods. @xref{Uniquify}. @cindex creating files To create a new file, just visit it using the same command, @kbd{C-x diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index cd8347369d3..036e8cf65eb 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -457,12 +457,16 @@ Delete all frames on the current terminal, except the selected one. @item M-<F10> @kindex M-<F10> @findex toggle-frame-maximized -Toggle maximization state of the current frame. +Toggle the maximization state of the current frame. When a frame is +maximized, it fills the screen. @item <F11> @kindex <F11> @findex toggle-frame-fullscreen -Toggle fullscreen mode of the current frame. +Toggle fullscreen mode for the current frame. (The difference +between ``fullscreen'' and ``maximized'' is normally that the former +hides window manager decorations, giving slightly more screen space to +Emacs itself.) @end table The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index e6cf46acbe5..f47600d97ec 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -55,12 +55,12 @@ This displays the available Emacs packages based on keywords. @xref{Package Keywords}. @end table - @kbd{C-h}, @key{F1}, or @kbd{?} means ``help'' in various other -contexts as well. For instance, you can type them after a prefix key -to view a list of the keys that can follow the prefix key. (A few -prefix keys don't support @kbd{C-h} or @kbd{?} in this way, because -they define other meanings for it, but they all support @key{F1} for -help.) + @kbd{C-h} or @key{F1} mean ``help'' in various other contexts as +well. For instance, you can type them after a prefix key to view a +list of the keys that can follow the prefix key. (You can also use +@kbd{?} in this context. A few prefix keys don't support @kbd{C-h} +or @kbd{?} in this way, because they define other meanings for those +inputs, but they all support @key{F1}.) @menu * Help Summary:: Brief list of all Help commands. @@ -556,10 +556,10 @@ Emacs Lisp Reference Manual}). typing @kbd{C-h}, @kbd{?}, or @key{F1} (@code{describe-prefix-bindings}) after the prefix key. (There are a few prefix keys for which not all of these keys work---those that -provide their own bindings for one of them. One of these prefix keys -is @key{ESC} in combination with @kbd{C-h}, because @kbd{@key{ESC} C-h} is -actually @kbd{C-M-h}, which marks a defun. However, @kbd{@key{ESC} @key{F1}} -and @kbd{@key{ESC} ?} work fine.) +provide their own bindings for that key. One of these prefix keys +is @key{ESC}, because @kbd{@key{ESC} C-h} is actually @kbd{C-M-h}, +which marks a defun. However, @kbd{@key{ESC} @key{F1}} and +@kbd{@key{ESC} ?} work fine.) @node Help Files @section Help Files diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 8a8da2789d4..ae1aefcee76 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1560,9 +1560,9 @@ option, like the @samp{-t} option, creates a new frame in the server's current text terminal. @xref{Windows Startup}. If you omit a filename argument while supplying the @samp{-c} option, -the new frame displays the @file{*scratch*} buffer by default. This -behavior can be customized using the variable -@code{initial-buffer-choice} (@pxref{Entering Emacs}). +the new frame displays the @file{*scratch*} buffer by default. You +can customize this behavior with the variable @code{initial-buffer-choice} +(@pxref{Entering Emacs}). @item -F @var{alist} @itemx --frame-parameters=@var{alist} diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 4787f98c7ed..7c5b3600728 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -458,13 +458,6 @@ before Microsoft was founded.) Examples of conflicts include You can redefine some of them with meanings more like the MS-Windows meanings by enabling CUA Mode (@pxref{CUA Bindings}). -@kindex F10 @r{(MS-Windows)} -@cindex menu bar access using keyboard @r{(MS-Windows)} - The @key{F10} key on Windows activates the menu bar in a way that -makes it possible to use the menus without a mouse. In this mode, the -arrow keys traverse the menus, @key{RET} selects a highlighted menu -item, and @key{ESC} closes the menu. - @iftex @inforef{Windows Keyboard, , emacs}, for information about additional Windows-specific variables in this category. diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 6ba252393f6..6fab25a187d 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -114,7 +114,7 @@ Scroll to end of message (@code{rmail-end-of-message}). @kindex S-SPC @r{(Rmail)} Since the most common thing to do while reading a message is to scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL} -(or @key{S-SPC}) do the same as @kbd{C-v} (@code{scroll-up-command}) +(or @kbd{S-@key{SPC}}) do the same as @kbd{C-v} (@code{scroll-up-command}) and @kbd{M-v} (@code{scroll-down-command}) respectively. @kindex . @r{(Rmail)} @@ -753,7 +753,7 @@ in replies, using the variable @code{mail-dont-reply-to-names}. Its value should be a regular expression; any recipients that match are excluded from the @samp{CC} field. They are also excluded from the @samp{To} field, unless this would leave the field empty. If this -variable is nil, then the first time you compose a reply it is +variable is @code{nil}, then the first time you compose a reply it is initialized to a default value that matches your own address. To omit the @samp{CC} field completely for a particular reply, enter @@ -962,7 +962,7 @@ making any kind of summary discards any previous summary. use for the summary window. The variable @code{rmail-summary-line-count-flag} controls whether the summary line for a message should include the line count of the message. Setting -this option to nil might speed up the generation of summaries. +this option to @code{nil} might speed up the generation of summaries. @node Rmail Summary Edit @subsection Editing in Summaries diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index d26b3bb49ff..3c254268ed2 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -285,10 +285,7 @@ performs various commands. @xref{Mode Line Mouse}. can use to perform common operations. There's no need to list them here, as you can more easily see them yourself. -@kindex M-` -@kindex F10 -@findex menu-bar-open - On a display that support a mouse, you can use the mouse to choose a + On a display that supports a mouse, you can use the mouse to choose a command from the menu bar. An arrow on the right edge of a menu item means it leads to a subsidiary menu, or @dfn{submenu}. A @samp{...} at the end of a menu item means that the command will prompt you for @@ -300,12 +297,16 @@ itself. To view the full command name and documentation for a menu item, type @kbd{C-h k}, and then select the menu bar with the mouse in the usual way (@pxref{Key Help}). +@kindex F10 +@findex menu-bar-open +@cindex menu bar access using keyboard Instead of using the mouse, you can also invoke the first menu bar item by pressing @key{F10} (to run the command @code{menu-bar-open}). You can then navigate the menus with the arrow keys. To activate a selected menu item, press @key{RET}; to cancel menu navigation, press @kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}. +@kindex M-` @findex tmm-menubar @vindex tty-menu-open-use-tmm On a text terminal, you can optionally access the menu-bar menus in |