[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/cus-start.el
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/cus-start.el |
Date: |
Mon, 19 Dec 2005 08:28:55 +0000 |
Index: emacs/lisp/cus-start.el
diff -u emacs/lisp/cus-start.el:1.84 emacs/lisp/cus-start.el:1.85
--- emacs/lisp/cus-start.el:1.84 Sun Oct 9 15:40:00 2005
+++ emacs/lisp/cus-start.el Mon Dec 19 08:28:55 2005
@@ -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,10 +393,13 @@
(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))
(or (boundp 'gtk)
(and window-system
(not (eq window-system 'pc))
+ (not (eq window-system 'mac))
(not (eq system-type 'windows-nt)))))
((string-match "\\`x-" (symbol-name symbol))
(fboundp 'x-create-frame))
- [Emacs-diffs] Changes to emacs/lisp/cus-start.el,
YAMAMOTO Mitsuharu <=