# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1134980935 0
# Node ID 6f662b71d7cfde4a3222b0e019fc556990d21517
# Parent  ae5e8c21dbf160082a017cc97dc7a1cd95aafd3c
(all): Add user options in macterm.c.  Add test for
Mac-related built-ins.  Fix test for GTK-related built-ins.

diff -r ae5e8c21dbf1 -r 6f662b71d7cf lisp/cus-start.el
--- a/lisp/cus-start.el	Mon Dec 19 08:28:38 2005 +0000
+++ b/lisp/cus-start.el	Mon Dec 19 08:28:55 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,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))