summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2010-10-11 21:18:08 +0200
committerJan Djärv <jan.h.d@swipnet.se>2010-10-11 21:18:08 +0200
commita2e35ef5d52031e0fa184d1863fe7cb7043ef637 (patch)
tree0e4178b0a917a2ed632776bb769b07482af2ab9a /lisp/cus-start.el
parent9386ae128af79d61278bd3686d56f3624f9cc5bd (diff)
downloademacs-a2e35ef5d52031e0fa184d1863fe7cb7043ef637.tar.gz
Bug#7150: Distinguishing between left and right Alt keys on NextStep/OSX.
* lisp/cus-start.el (all): ns-right-alternate-modifier is new. * lisp/term/ns-win.el (ns-right-alternate-modifier): New defvar. (ns-right-option-modifier): New alias for ns-right-alternate-modifier. (mac-right-option-modifier): New alias for ns-right-option-modifier. * src/nsterm.m (Qleft): Declare. (ns_right_alternate_modifier): New variable (NSRightAlternateKeyMask): New define. (EV_MODIFIERS): Parse NSRightAlternateKeyMask if ns_right_alternate_modifier isn't Qleft. (keyDown): If ns_right_alternate_modifier isn't Qleft, use it as emacs modifier for NSRightAlternateKeyMask. (syms_of_nsterm): DEFVAR_LISP ns-right-alternate-modifier.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 30678a09bb8..0f686a434e0 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -266,6 +266,14 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(const control) (const meta)
(const alt) (const hyper)
(const super)) "23.1")
+ (ns-right-alternate-modifier
+ ns
+ (choice (const :tag "No modifier (work as alternate/option)" none)
+ (const :tag "Use the value of ns-alternate-modifier"
+ left)
+ (const control) (const meta)
+ (const alt) (const hyper)
+ (const super)) "23.3")
(ns-function-modifier
ns
(choice (const :tag "No modifier (work as function)" none)