* jit-lock.el (jit-lock-stealth-chunk-start): Fix typo in docstring.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a137743514795805dacabd1327322a795bb97615..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
@@ -98,7 +98,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                           "22.1")
             ;; callint.c
             (mark-even-if-inactive editing-basics boolean)
-            (shift-select-mode editing-basics boolean)
             ;; callproc.c
             (shell-file-name execute file)
             (exec-path execute
@@ -248,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
@@ -354,6 +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 "\\`ns-" (symbol-name symbol))
+                      (featurep 'ns))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (featurep 'gtk))
                      ((string-match "\\`x-" (symbol-name symbol))