Update copyright year to 2014 by running admin/update-copyright.

[gnu-emacs] / doc / emacs / macos.texi

diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 14c5fcae0ce919991c005f8e2fa7725874e848f2..eb2d96e9af7b365625f6e5da6973718c4ceac27f 100644 (file)
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
 @c This is part of the Emacs manual.

-@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
+@c Copyright (C) 2000-2014 Free Software Foundation, Inc.

 @c See file emacs.texi for copying conditions.
 @node Mac OS / GNUstep
 @appendix Emacs and Mac OS / GNUstep
 @c See file emacs.texi for copying conditions.
 @node Mac OS / GNUstep
 @appendix Emacs and Mac OS / GNUstep


@@ -40,13 +40,16 @@ Emacs provides a set of key bindings using this modifier key that mimic
 other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}).  You
 can change these bindings in the usual way (@pxref{Key Bindings}).
 
 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?
+@vindex ns-alternate-modifier
+@vindex ns-right-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
 default).  A value of @code{control}, @code{meta}, @code{alt},
 @code{super}, or @code{hyper} makes them behave like the corresponding
   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
 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 of @code{none} tells Emacs to ignore them.
+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.

 
   @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
 
   @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


@@ -207,4 +210,10 @@ restart Emacs to access newly-available services.
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact

+@ifnothtml

 @email{emacs-devel@@gnu.org}.
 @email{emacs-devel@@gnu.org}.

+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml