------------------------------------------------------------
revno: 107374
committer: Glenn Morris <rgm@xxxxxxx>
branch nick: trunk
timestamp: Wed 2012-02-22 00:16:48 -0800
message:
Checked macos.texi (somewhat)

* doc/emacs/macos.texi: Copyedits. Fix @key/@kbd usage.
(Mac / GNUstep Basics): Don't mention the panels, since the next
section covers them.
(Mac / GNUstep Customization): Merge some panel info from previous.
* admin/FOR-RELEASE: Related markup.
modified:
admin/FOR-RELEASE
doc/emacs/ChangeLog
doc/emacs/macos.texi
=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2012-02-21 21:43:51 +0000
+++ b/admin/FOR-RELEASE 2012-02-22 08:16:48 +0000
@@ -148,7 +148,7 @@
indent.texi cyd
killing.texi cyd
kmacro.texi cyd
-macos.texi
+macos.texi rgm (can't actually test any of it though)
maintaining.texi cyd
mark.texi cyd
mini.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-02-21 21:43:51 +0000
+++ b/doc/emacs/ChangeLog 2012-02-22 08:16:48 +0000
@@ -1,3 +1,10 @@
+2012-02-22 Glenn Morris <rgm@xxxxxxx>
+
+ * macos.texi: Copyedits. Fix @key/@kbd usage.
+ (Mac / GNUstep Basics): Don't mention the panels, since the next
+ section covers them.
+ (Mac / GNUstep Customization): Merge some panel info from previous.
+
2012-02-21 Glenn Morris <rgm@xxxxxxx>

* emerge-xtra.texi (Emerge, Submodes of Emerge, Combining in Emerge):

=== modified file 'doc/emacs/macos.texi'
--- a/doc/emacs/macos.texi 2012-02-04 21:48:04 +0000
+++ b/doc/emacs/macos.texi 2012-02-22 08:16:48 +0000
@@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
-@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
+@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mac OS / GNUstep, Microsoft Windows, Antinews, Top
@appendix Emacs and Mac OS / GNUstep
@@ -11,8 +11,8 @@
the GNUstep libraries on GNU/Linux or other operating systems, or on
Mac OS X with native window system support. On Mac OS X, Emacs can be
built either without window system support, with X11, or with the
-Cocoa interface; this section only applies to the Cocoa build. Emacs
-does not support earlier versions of Mac OS.
+Cocoa interface; this section only applies to the Cocoa build. This
+does not support versions of Mac OS X earlier than 10.4.

For various historical and technical reasons, Emacs uses the term
@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
@@ -21,7 +21,7 @@
was an application interface released by NeXT Inc during the 1980s, of
which Cocoa is a direct descendant. Apart from Cocoa, there is
another NeXTstep-style system: GNUstep, which is free software. As of
-this writing, the GNUstep support is alpha status (@pxref{GNUstep
+this writing, Emacs GNUstep support is alpha status (@pxref{GNUstep
Support}), but we hope to improve it in the future.

@menu
@@ -40,6 +40,7 @@
other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You
can change these bindings in the usual way (@pxref{Key Bindings}).

+@c FIXME mention ns-alternate-modifier?
The variable @code{ns-right-alternate-modifier} controls the
behavior of the right @key{alt} and @key{option} keys. These keys
behave like the left-hand keys if the value is @code{left} (the
@@ -47,30 +48,22 @@
@code{super}, or @code{hyper} makes them behave like the corresponding
modifier keys; a value of @code{none} tells Emacs to ignore them.

- The standard Mac / GNUstep font and color panels are accessible via
-Lisp commands. To use the color panel, drag from it to an Emacs frame
-to change the foreground color of the face at that position (if the
-@key{shift} key is held down, it changes the background color
-instead). To discard the settings, create a new frame and close the
-altered one.
-
- @key{S-Mouse-1} (i.e., clicking the left mouse button while holding
-down the @key{Shift} key) adjusts the region to the click position,
-just like @key{Mouse-3} (@code{mouse-save-then-kill}); it does not pop
-up a menu for changing the default face, as @key{S-Mouse-1} normally
+ @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
+up a menu for changing the default face, as @kbd{S-Mouse-1} normally
does (@pxref{Text Scale}). This change makes Emacs behave more like
other Mac / GNUstep applications.

When you open or save files using the menus, or using the
-@key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file
+@kbd{Cmd-o} and @kbd{Cmd-S} bindings, Emacs uses graphical file
dialogs to read file names. However, if you use the regular Emacs key
-sequences, such as @key{C-x C-f}, Emacs uses the minibuffer to read
+sequences, such as @kbd{C-x C-f}, Emacs uses the minibuffer to read
file names.

- On GNUstep, in an X-windows environment you need to use @key{Cmd-c}
-instead of one of the @key{C-w} or @key{M-w} commands to transfer text
+ On GNUstep, in an X-windows environment you need to use @kbd{Cmd-c}
+instead of one of the @kbd{C-w} or @kbd{M-w} commands to transfer text
to the X primary selection; otherwise, Emacs will use the
-``clipboard'' selection. Likewise, @key{Cmd-y} (instead of @key{C-y})
+``clipboard'' selection. Likewise, @kbd{Cmd-y} (instead of @kbd{C-y})
yanks from the X primary selection instead of the kill-ring or
clipboard.

@@ -100,23 +93,25 @@

@subsection Font and Color Panels

-The Font Panel may be accessed with M-x ns-popup-font-panel. It
-will set the default font in the frame most recently used or clicked
-on.
+The standard Mac / GNUstep font and color panels are accessible via
+Lisp commands. The Font Panel may be accessed with @kbd{M-x
+ns-popup-font-panel}. It will set the default font in the frame most
+recently used or clicked on.

@c To make the setting permanent, use @samp{Save Options} in the
@c Options menu, or run @code{menu-bar-options-save}.

-You can bring up a color panel with M-x ns-popup-color-panel. and
-drag the color you want over the emacs face you want to change. Normal
+You can bring up a color panel with @kbd{M-x ns-popup-color-panel} and
+drag the color you want over the Emacs face you want to change. Normal
dragging will alter the foreground color. Shift dragging will alter the
-background color.
+background color. To discard the settings, create a new frame and
+close the altered one.

@c To make the changes permanent select the "Save Options"
@c item in the "Options" menu, or run @code{menu-bar-options-save}.

-Useful in this context is the listing of all faces obtained by @key{M-x}
-@code{list-faces-display}.
+Useful in this context is the listing of all faces obtained by
+@kbd{M-x list-faces-display}.

@subsection Open files by dragging to an Emacs window

@@ -137,7 +132,7 @@
@table @code
@item ns-auto-hide-menu-bar
Non-nil means the menu-bar is hidden by default, but appears if you
-move the mouse pointer over it. (Requires OS X 10.6 or later.)
+move the mouse pointer over it. (Requires Mac OS X 10.6 or later.)

@end table

@@ -162,9 +157,9 @@
buffer is the @samp{*scratch*} buffer, Emacs visits the file in the
selected frame.

-You can change how Emacs responds to @key{ns-open-file} by changing
-the variable @code{ns-pop-up-frames}. Its default value,
-@code{'fresh}, is what we have just described. A value of @code{t}
+You can change how Emacs responds to a @code{ns-open-file} event by
+changing the variable @code{ns-pop-up-frames}. Its default value,
+@samp{fresh}, is what we have just described. A value of @code{t}
means to always visit the file in a new frame. A value of @code{nil}
means to always visit the file in an existing frame.

@@ -211,7 +206,7 @@

Emacs also allows users to make use of Nextstep services, via a set
of commands whose names begin with @samp{ns-service-} and end with the
-name of the service. Type @kbd{M-x ns-service-@key{TAB}@key{TAB}} to
+name of the service. Type @kbd{M-x ns-service-@key{TAB}} to
see a list of these commands. These functions either operate on
marked text (replacing it with the result) or take a string argument
and return the result as a string. You can also use the Lisp function
@@ -222,6 +217,6 @@
@node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep
@section GNUstep Support

-Emacs can be built and run under GNUstep, but there are still some
+Emacs can be built and run under GNUstep, but there are still
issues to be addressed. Interested developers should contact
@email{emacs-devel@@gnu.org}.

_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@xxxxxxx
https://lists.gnu.org/mailman/listinfo/emacs-diffs