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

More fixes in the Emacs manual

Browse source 
* doc/emacs/screen.texi (Mode Line): Fix markup and
cross-references.
(Menu Bar): Correct inaccurate description.
* doc/emacs/macos.texi (Mac OS / GNUstep, Mac / GNUstep Events):
* doc/emacs/frames.texi (Scroll Bars):
* doc/emacs/emacs.texi (Top):
* doc/emacs/ack.texi (Acknowledgments): Fix spelling of "macOS".
* doc/emacs/misc.texi (Invoking emacsclient)
(emacsclient Options): Fix markup of 'emacsclient'.  Suggested by
Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.
This commit is contained in:
Eli Zaretskii 2018-01-30 18:09:28 +02:00
parent bc8dc37f1c
commit 55a2b769a1
6 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/ack.texi
View file

@ -209,8 +209,8 @@ for Korean Hanja.
@item @item
Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used
prior to Emacs 23 for Mac OS@. Yamamoto Mitsuharu continued to prior to Emacs 23 for macOS@. Yamamoto Mitsuharu continued to
contribute to Mac OS support in the newer Nextstep port; and also contribute to macOS support in the newer Nextstep port; and also
improved support for multi-monitor displays. improved support for multi-monitor displays.
@item @item

8
doc/emacs/emacs.texi
View file

@ -221,7 +221,7 @@ Appendices
* Emacs Invocation:: Hairy startup options. * Emacs Invocation:: Hairy startup options.
* X Resources:: X resources for customizing Emacs. * X Resources:: X resources for customizing Emacs.
* Antinews:: Information about Emacs version 25. * Antinews:: Information about Emacs version 25.
* Mac OS / GNUstep:: Using Emacs under Mac OS and GNUstep. * Mac OS / GNUstep:: Using Emacs under macOS and GNUstep.
* Microsoft Windows:: Using Emacs on Microsoft Windows and MS-DOS. * Microsoft Windows:: Using Emacs on Microsoft Windows and MS-DOS.
* Manifesto:: What's GNU? Gnu's Not Unix! * Manifesto:: What's GNU? Gnu's Not Unix!
@ -1226,10 +1226,10 @@ GTK resources
* GTK Names in Emacs:: GTK widgets used by Emacs. * GTK Names in Emacs:: GTK widgets used by Emacs.
* GTK styles:: What can be customized in a GTK widget. * GTK styles:: What can be customized in a GTK widget.
Emacs and Mac OS / GNUstep Emacs and macOS / GNUstep
* Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or Mac OS. * Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or macOS.
* Mac / GNUstep Customization:: Customizations under GNUstep or Mac OS. * Mac / GNUstep Customization:: Customizations under GNUstep or macOS.
* Mac / GNUstep Events:: How window system events are handled. * Mac / GNUstep Events:: How window system events are handled.
* GNUstep Support:: Details on status of GNUstep support. * GNUstep Support:: Details on status of GNUstep support.

2
doc/emacs/frames.texi
View file

@ -975,7 +975,7 @@ variable @code{scroll-bar-mode}. Its value should be either
@code{right} (put scroll bars on the right side of windows), @code{left} @code{right} (put scroll bars on the right side of windows), @code{left}
(put them on the left), or @code{nil} (disable vertical scroll bars). (put them on the left), or @code{nil} (disable vertical scroll bars).
By default, Emacs puts scroll bars on the right if it was compiled with By default, Emacs puts scroll bars on the right if it was compiled with
GTK+ support on the X Window System, and on MS-Windows or Mac OS; Emacs GTK+ support on the X Window System, and on MS-Windows or macOS; Emacs
puts scroll bars on the left if compiled on the X Window System without puts scroll bars on the left if compiled on the X Window System without
GTK+ support (following the old convention for X applications). GTK+ support (following the old convention for X applications).

12
doc/emacs/macos.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 2000-2018 Free Software Foundation, Inc. @c Copyright (C) 2000-2018 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions. @c See file emacs.texi for copying conditions.
@node Mac OS / GNUstep @node Mac OS / GNUstep
@appendix Emacs and Mac OS / GNUstep @appendix Emacs and macOS / GNUstep
@cindex macOS @cindex macOS
@cindex Macintosh @cindex Macintosh
@cindex GNUstep @cindex GNUstep
@ -12,7 +12,7 @@ the GNUstep libraries on GNU/Linux or other operating systems, or on
macOS with native window system support. On macOS, Emacs can be macOS with native window system support. On macOS, Emacs can be
built either without window system support, with X11, or with the built either without window system support, with X11, or with the
Cocoa interface; this section only applies to the Cocoa build. This Cocoa interface; this section only applies to the Cocoa build. This
does not support versions before Mac OS X 10.6. does not support versions before macOS 10.6.
For various historical and technical reasons, Emacs uses the term For various historical and technical reasons, Emacs uses the term
@samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for @samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for
@ -25,14 +25,14 @@ this writing, Emacs GNUstep support is alpha status (@pxref{GNUstep
Support}), but we hope to improve it in the future. Support}), but we hope to improve it in the future.
@menu @menu
* Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or Mac OS. * Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or macOS.
* Mac / GNUstep Customization:: Customizations under GNUstep or Mac OS. * Mac / GNUstep Customization:: Customizations under GNUstep or macOS.
* Mac / GNUstep Events:: How window system events are handled. * Mac / GNUstep Events:: How window system events are handled.
* GNUstep Support:: Details on status of GNUstep support. * GNUstep Support:: Details on status of GNUstep support.
@end menu @end menu
@node Mac / GNUstep Basics @node Mac / GNUstep Basics
@section Basic Emacs usage under Mac OS and GNUstep @section Basic Emacs usage under macOS and GNUstep
By default, the @key{alt} and @key{option} keys are the same as By default, the @key{alt} and @key{option} keys are the same as
@key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and @key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and
@ -128,7 +128,7 @@ at the command-line before starting Emacs:
@node Mac / GNUstep Events @node Mac / GNUstep Events
@section Windowing System Events under Mac OS / GNUstep @section Windowing System Events under macOS / GNUstep
Nextstep applications receive a number of special events which have Nextstep applications receive a number of special events which have
no X equivalent. These are sent as specially defined key events, which no X equivalent. These are sent as specially defined key events, which

12
doc/emacs/misc.texi
View file

@ -1729,7 +1729,7 @@ different virtual terminals, and switch to the Emacs server's virtual
terminal after calling @command{emacsclient}; or (ii) call terminal after calling @command{emacsclient}; or (ii) call
@command{emacsclient} from within the Emacs server itself, using Shell @command{emacsclient} from within the Emacs server itself, using Shell
mode (@pxref{Interactive Shell}) or Term mode (@pxref{Term Mode}); mode (@pxref{Interactive Shell}) or Term mode (@pxref{Term Mode});
@code{emacsclient} blocks only the subshell under Emacs, and you can @command{emacsclient} blocks only the subshell under Emacs, and you can
still use Emacs to edit the file. still use Emacs to edit the file.
@kindex C-x # @kindex C-x #
@ -1794,13 +1794,13 @@ listed below:
@table @samp @table @samp
@item -a @var{command} @item -a @var{command}
@itemx --alternate-editor=@var{command} @itemx --alternate-editor=@var{command}
Specify a shell command to run if @code{emacsclient} fails to contact Emacs. Specify a shell command to run if @command{emacsclient} fails to
This is useful when running @code{emacsclient} in a script. contact Emacs. This is useful when running @code{emacsclient} in a
The command may include arguments, which may be quoted "like this". script. The command may include arguments, which may be quoted "like
Currently, escaping of quotes is not supported. this". Currently, escaping of quotes is not supported.
As a special exception, if @var{command} is the empty string, then As a special exception, if @var{command} is the empty string, then
@code{emacsclient} starts Emacs in daemon mode (as @command{emacs @command{emacsclient} starts Emacs in daemon mode (as @samp{emacs
--daemon}) and then tries connecting again. --daemon}) and then tries connecting again.
@cindex @env{ALTERNATE_EDITOR} environment variable @cindex @env{ALTERNATE_EDITOR} environment variable

12
doc/emacs/screen.texi
View file

@ -228,8 +228,8 @@ modified, it shows two stars (@samp{**}). For a read-only buffer, it
shows @samp{%*} if the buffer is modified, and @samp{%%} otherwise. shows @samp{%*} if the buffer is modified, and @samp{%%} otherwise.
The character after @var{ch} is normally a dash (@samp{-}). The character after @var{ch} is normally a dash (@samp{-}).
However, if the default-directory for the current buffer is on a However, if @code{default-directory} (@pxref{File Names}) for the
remote machine (@pxref{File Names}), @samp{@@} is displayed instead. current buffer is on a remote machine, @samp{@@} is displayed instead.
@var{fr} gives the selected frame name (@pxref{Frames}). It appears @var{fr} gives the selected frame name (@pxref{Frames}). It appears
only on text terminals. The initial frame's name is @samp{F1}. only on text terminals. The initial frame's name is @samp{F1}.
@ -296,10 +296,10 @@ at the end of a menu item means that the command will prompt you for
further input before it actually does anything. further input before it actually does anything.
Some of the commands in the menu bar have ordinary key bindings as Some of the commands in the menu bar have ordinary key bindings as
well; if so, a key binding is shown in parentheses after the item well; if so, a key binding is shown after the item itself. To view
itself. To view the full command name and documentation for a menu the full command name and documentation for a menu item, type
item, type @kbd{C-h k}, and then select the menu bar with the mouse in @kbd{C-h k}, and then select the menu bar with the mouse in the usual
the usual way (@pxref{Key Help}). way (@pxref{Key Help}).
@kindex F10 @kindex F10
@findex menu-bar-open @findex menu-bar-open