diff options
| author | Xue Fuqiao | 2013-07-31 20:04:25 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-31 20:04:25 +0800 |
| commit | 8fd6e60a445dd7c83a99fb4cef9952c3d3e5f92a (patch) | |
| tree | d6e1bfd4d201a198387f80f53a2b4aff4c99eed0 | |
| parent | 65b36413e6b448ae689ff7477e7d2d45ef60c76a (diff) | |
| download | emacs-8fd6e60a445dd7c83a99fb4cef9952c3d3e5f92a.tar.gz emacs-8fd6e60a445dd7c83a99fb4cef9952c3d3e5f92a.zip | |
* doc/emacs/macos.texi (Mac / GNUstep Basics): Mention `ns-alternate-modifier'.
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/macos.texi | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b8d78425cae..775bb9fc26b 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-07-31 Xue Fuqiao <xfq.free@gmail.com> | 1 | 2013-07-31 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 2 | ||
| 3 | * macos.texi (Mac / GNUstep Basics): Mention `ns-alternate-modifier'. | ||
| 4 | |||
| 3 | * cal-xtra.texi (Advanced Calendar/Diary Usage): Update menu. | 5 | * cal-xtra.texi (Advanced Calendar/Diary Usage): Update menu. |
| 4 | (Mayan Calendar): Move here from calendar.texi. | 6 | (Mayan Calendar): Move here from calendar.texi. |
| 5 | * emacs.texi (Top): Update menu. | 7 | * emacs.texi (Top): Update menu. |
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 4483c91802d..61c056ceb4b 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi | |||
| @@ -40,13 +40,16 @@ Emacs provides a set of key bindings using this modifier key that mimic | |||
| 40 | other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You | 40 | other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You |
| 41 | can change these bindings in the usual way (@pxref{Key Bindings}). | 41 | can change these bindings in the usual way (@pxref{Key Bindings}). |
| 42 | 42 | ||
| 43 | @c FIXME mention ns-alternate-modifier? | 43 | @vindex ns-alternate-modifier |
| 44 | @vindex ns-right-alternate-modifier | ||
| 44 | The variable @code{ns-right-alternate-modifier} controls the | 45 | The variable @code{ns-right-alternate-modifier} controls the |
| 45 | behavior of the right @key{alt} and @key{option} keys. These keys | 46 | behavior of the right @key{alt} and @key{option} keys. These keys |
| 46 | behave like the left-hand keys if the value is @code{left} (the | 47 | behave like the left-hand keys if the value is @code{left} (the |
| 47 | default). A value of @code{control}, @code{meta}, @code{alt}, | 48 | default). A value of @code{control}, @code{meta}, @code{alt}, |
| 48 | @code{super}, or @code{hyper} makes them behave like the corresponding | 49 | @code{super}, or @code{hyper} makes them behave like the corresponding |
| 49 | modifier keys; a value of @code{none} tells Emacs to ignore them. | 50 | modifier keys; a value to @code{left} means be the same key as |
| 51 | @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to | ||
| 52 | ignore them. | ||
| 50 | 53 | ||
| 51 | @kbd{S-Mouse-1} adjusts the region to the click position, | 54 | @kbd{S-Mouse-1} adjusts the region to the click position, |
| 52 | just like @kbd{Mouse-3} (@code{mouse-save-then-kill}); it does not pop | 55 | just like @kbd{Mouse-3} (@code{mouse-save-then-kill}); it does not pop |