Mercurial > emacs
diff lisp/cus-start.el @ 83423:b64b7e867d0a
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 26 Dec 2005 03:16:59 +0000 |
parents | 08b4dd6a6e87 6f662b71d7cf |
children | e5cd70e447a8 |
line wrap: on
line diff
--- a/lisp/cus-start.el Mon Dec 26 02:21:31 2005 +0000 +++ b/lisp/cus-start.el Mon Dec 26 03:16:59 2005 +0000 @@ -194,6 +194,33 @@ (suggest-key-bindings keyboard (choice (const :tag "off" nil) (integer :tag "time" 2) (other :tag "on"))) + ;; macterm.c + (mac-control-modifier mac (choice (const :tag "No modifier" nil) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "22.1") + (mac-command-modifier mac (choice (const :tag "No modifier" nil) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "22.1") + (mac-option-modifier mac (choice (const :tag "No modifier (work as option)" nil) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "22.1") + (mac-function-modifier mac + (choice (const :tag "No modifier (work as function)" nil) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "22.1") + (mac-emulate-three-button-mouse mac + (choice (const :tag "No emulation" nil) + (const :tag "Option->2, Command->3" t) + (const :tag "Command->2, Option->3" reverse)) + "22.1") + (mac-wheel-button-is-mouse-2 mac boolean "22.1") + (mac-pass-command-to-system mac boolean "22.1") + (mac-pass-control-to-system mac boolean "22.1") + (mac-allow-anti-aliasing mac boolean "22.1") ;; This is not good news because it will use the wrong ;; version-specific directories when you upgrade. We need @@ -366,6 +393,8 @@ (eq system-type 'ms-dos)) ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) + ((string-match "\\`mac-" (symbol-name symbol)) + (eq window-system 'mac)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol))