diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 03:16:59 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 03:16:59 +0000 |
| commit | feba0cd6405ebb80af743e2f978442d9c837bcd2 (patch) | |
| tree | 1cb964aa641bee514d9cda2eafe27a0a97e65ad1 /lisp/cus-start.el | |
| parent | 30663b475e57197c9896a252e1d4ca31c579fa2b (diff) | |
| parent | 7a32e81fb608282314e27db21a00138aaa91f29a (diff) | |
| download | emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.gz | |
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
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 73e1dff5a44..65f9c0812fd 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -194,6 +194,33 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (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 @@ since it could result in memory overflow and make Emacs crash." (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)) |