From 814b36fe093cf5d3c2a348822db57b9ba7cb0764 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 19 Dec 2005 08:28:55 +0000
Subject: [PATCH] (all): Add user options in macterm.c.  Add test for
 Mac-related built-ins.  Fix test for GTK-related built-ins.

---
 lisp/cus-start.el | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9881012d949..a7f135786b2 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,10 +393,13 @@ 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))
 		       (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))
-- 
2.39.5