Mercurial > emacs
comparison lisp/term/ns-win.el @ 111662:1303259207a9
Add separate key mappings for left/right control/command on Nextstep (Bug#7458).
* lisp/cus-start.el (all): Add ns-right-control-modifier and
ns-right-command-modifier.
* lisp/term/ns-win.el (ns-right-control-modifier)
(ns-right-command-modifier): Defvar them.
* src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
Define (Bug#7458).
(NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458).
(EV_MODIFIERS): Check for NSRightCommandKeyMask and
NSRightControlKeyMask also (Bug#7458).
(keyDown): Ditto (Bug#7458).
(syms_of_nsterm): Defvar ns-right-command-modifier and
ns-right-control-modifier (Bug#7458).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 21 Nov 2010 14:09:34 +0100 |
| parents | 99e2b63fd6dd |
| children | 8f6857157cb5 |
comparison
equal
deleted
inserted
replaced
| 111661:c07eb42b870c | 111662:1303259207a9 |
|---|---|
| 177 ;; Set up a number of aliases and other layers to pretend we're using | 177 ;; Set up a number of aliases and other layers to pretend we're using |
| 178 ;; the Choi/Mitsuharu Carbon port. | 178 ;; the Choi/Mitsuharu Carbon port. |
| 179 | 179 |
| 180 (defvaralias 'mac-allow-anti-aliasing 'ns-antialias-text) | 180 (defvaralias 'mac-allow-anti-aliasing 'ns-antialias-text) |
| 181 (defvaralias 'mac-command-modifier 'ns-command-modifier) | 181 (defvaralias 'mac-command-modifier 'ns-command-modifier) |
| 182 (defvaralias 'mac-right-command-modifier 'ns-right-command-modifier) | |
| 182 (defvaralias 'mac-control-modifier 'ns-control-modifier) | 183 (defvaralias 'mac-control-modifier 'ns-control-modifier) |
| 184 (defvaralias 'mac-right-control-modifier 'ns-right-control-modifier) | |
| 183 (defvaralias 'mac-option-modifier 'ns-option-modifier) | 185 (defvaralias 'mac-option-modifier 'ns-option-modifier) |
| 184 (defvaralias 'mac-right-option-modifier 'ns-right-option-modifier) | 186 (defvaralias 'mac-right-option-modifier 'ns-right-option-modifier) |
| 185 (defvaralias 'mac-function-modifier 'ns-function-modifier) | 187 (defvaralias 'mac-function-modifier 'ns-function-modifier) |
| 186 (declare-function ns-do-applescript "nsfns.m" (script)) | 188 (declare-function ns-do-applescript "nsfns.m" (script)) |
| 187 (defalias 'do-applescript 'ns-do-applescript) | 189 (defalias 'do-applescript 'ns-do-applescript) |
| 512 (setq-default mode-line-frame-identification '(" ")) | 514 (setq-default mode-line-frame-identification '(" ")) |
| 513 | 515 |
| 514 ;; nsterm.m | 516 ;; nsterm.m |
| 515 (defvar ns-alternate-modifier) | 517 (defvar ns-alternate-modifier) |
| 516 (defvar ns-right-alternate-modifier) | 518 (defvar ns-right-alternate-modifier) |
| 519 (defvar ns-right-command-modifier) | |
| 520 (defvar ns-right-control-modifier) | |
| 517 | 521 |
| 518 ;; You say tomAYto, I say tomAHto.. | 522 ;; You say tomAYto, I say tomAHto.. |
| 519 (defvaralias 'ns-option-modifier 'ns-alternate-modifier) | 523 (defvaralias 'ns-option-modifier 'ns-alternate-modifier) |
| 520 (defvaralias 'ns-right-option-modifier 'ns-right-alternate-modifier) | 524 (defvaralias 'ns-right-option-modifier 'ns-right-alternate-modifier) |
| 521 | 525 |