diff options
| author | Philipp Stephani <phst@google.com> | 2016-03-30 19:22:56 +0200 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2018-02-04 20:44:45 +0100 |
| commit | 8fbf28536ee1169f59206523e2af050916befbf6 (patch) | |
| tree | 3bb3e08efc13ba21fbedb4bafe17b8023fb48ca7 /lisp/cus-start.el | |
| parent | d2630e456923d2bd70fdd59267fe6e3d8eeb69ca (diff) | |
| download | emacs-8fbf28536ee1169f59206523e2af050916befbf6.tar.gz | |
Fix handling of modifier keys on macOS
* src/nsterm.m (keyDown:): Distinguish between shift-like and
control-like modifier keys. Allow treating ⌘ as shift-like
modifier (e.g. for the Gujarati – QUERTY input method, where ⌘
switches to QUERTY.)
* lisp/cus-start.el (standard): Change nil to none for
ns-command-modifier; update description.
* etc/NEWS: Add NEWS entry.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 4529fa1ac92..9ba1e105a1b 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -413,6 +413,10 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; msdos.c (dos-unsupported-char-glyph display integer) ;; nsterm.m + ;; + ;; FIXME: Why does ⌃ use nil instead of none? Also the + ;; description is confusing; setting it to nil disables ⌃ + ;; entirely. (ns-control-modifier ns (choice (const :tag "No modifier" nil) @@ -429,13 +433,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const super)) "24.1") (ns-command-modifier ns - (choice (const :tag "No modifier" nil) + (choice (const :tag "No modifier (work as layout switch)" none) (const control) (const meta) (const alt) (const hyper) (const super)) "23.1") (ns-right-command-modifier ns - (choice (const :tag "No modifier (work as command)" none) + (choice (const :tag "No modifier (work as layout switch)" none) (const :tag "Use the value of ns-command-modifier" left) (const control) (const meta) |