* net/tramp.el (tramp-default-file-modes) New defun. Replace all

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 302d6689186bddcdb5fd5fbf394dae83f14dc972..d8d3cc5d3ac85b6d0e1c5bdd2ed788da9e703c37 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,7 +1,7 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
 ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -46,6 +46,7 @@
             (tab-width editing-basics integer)
             (ctl-arrow display boolean)
             (truncate-lines display boolean)
+            (word-wrap display boolean)
             (selective-display-ellipses display boolean)
             (indicate-empty-lines fringe boolean)
             (indicate-buffer-boundaries
@@ -162,6 +163,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                            :value (nil)
                                            (symbol :format "%v"))
                                    (const :tag "always" t)))
+             ;; fileio.c
+             (delete-by-moving-to-trash auto-save boolean "23.1")
+            (auto-save-visited-file-name auto-save boolean)
             ;; fns.c
             (use-dialog-box menu boolean "21.1")
             (use-file-dialog menu boolean "22.1")
@@ -196,42 +200,6 @@ 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")))
-            ;; macselect.c
-            (mac-dnd-known-types mac (repeat string) "22.1")
-            ;; 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")
-            (mac-ts-script-language-on-focus mac
-                                             (choice (const :tag "System default behavior" nil)
-                                                     (const :tag "Restore to script/language used in the last focus frame" t)
-                                                     (cons :tag "Specify script/language"
-                                                           (integer :tag "Script code")
-                                                           (integer :tag "Language code")))
-                                             "22.1")
 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need
@@ -248,6 +216,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             (choice (const :tag "Infinite" t) integer)
                             "22.1")
             (history-delete-duplicates minibuffer boolean "22.1")
+            (read-buffer-completion-ignore-case minibuffer boolean "23.1")
+
             (minibuffer-prompt-properties
              minibuffer
              (list
@@ -277,6 +247,33 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                           function))
             ;; msdos.c
             (dos-unsupported-char-glyph display integer)
+            ;; nsterm.m
+            (ns-control-modifier
+             ns
+             (choice (const :tag "No modifier" nil)
+                     (const control) (const meta)
+                     (const alt) (const hyper)
+                     (const super)) "23.1")
+            (ns-command-modifier
+             ns
+             (choice (const :tag "No modifier" nil)
+                     (const control) (const meta)
+                     (const alt) (const hyper)
+                     (const super)) "23.1")
+            (ns-alternate-modifier
+             ns
+             (choice (const :tag "No modifier (work as alternate/option)" none)
+                     (const control) (const meta)
+                     (const alt) (const hyper)
+                     (const super)) "23.1")
+            (ns-function-modifier
+             ns
+             (choice (const :tag "No modifier (work as function)" none)
+                     (const control) (const meta)
+                     (const alt) (const hyper)
+                     (const super)) "23.1")
+            (ns-antialias-text ns boolean "23.1")
+            (ns-use-qd-smoothing ns boolean "23.1")
             ;; process.c
             (delete-exited-processes processes-basics boolean)
             ;; syntax.c
@@ -316,7 +313,7 @@ since it could result in memory overflow and make Emacs crash."
             (scroll-margin windows integer)
             (hscroll-margin windows integer "22.1")
             (hscroll-step windows number "22.1")
-            (truncate-partial-width-windows display boolean)
+            (truncate-partial-width-windows display boolean "23.1")
             (mode-line-inverse-video mode-line boolean)
             (mode-line-in-non-selected-windows mode-line boolean "22.1")
             (line-number-display-limit display
@@ -383,8 +380,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))
-                      (featurep 'mac-carbon))
+                     ((string-match "\\`ns-" (symbol-name symbol))
+                      (featurep 'ns))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (featurep 'gtk))
                      ((string-match "\\`x-" (symbol-name symbol))