(skkdic-convert): Insert a relative

[bpt/emacs.git] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9bb26ec..da2f0a5 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 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -52,7 +52,7 @@
             (ctl-arrow display boolean)
             (truncate-lines display boolean)
             (selective-display-ellipses display boolean)
-            (indicate-empty-lines fringe boolean "21.1")
+            (indicate-empty-lines fringe boolean)
             (indicate-buffer-boundaries
              fringe
              (choice
@@ -91,8 +91,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                            (const :tag "Do not show" (down . nil))
                            (const :tag "On the left" (down . left))
                            (const :tag "On the right" (down . right))))
-              (other :tag "On left, no arrows" t))
-             "22.1")
+              (other :tag "On left, no arrows" t)))
             (scroll-up-aggressively windows
                                     (choice (const :tag "off" nil) number)
                                     "21.1")
@@ -174,9 +173,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                            (const :tag "always shown" t)
                                            (other :tag "hidden by keypress" 1)))
             ;; fringe.c
-            (overflow-newline-into-fringe fringe boolean "22.1")
+            (overflow-newline-into-fringe fringe boolean)
             ;; indent.c
-            (indent-tabs-mode fill boolean)
+            (indent-tabs-mode indent boolean)
             ;; keyboard.c
             (meta-prefix-char keyboard character)
             (auto-save-interval auto-save integer)
@@ -194,6 +193,8 @@ 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)
@@ -221,6 +222,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (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
@@ -274,6 +282,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (words-include-escapes editing-basics boolean)
             (open-paren-in-column-0-is-defun-start editing-basics boolean
                                                    "21.1")
+             ;; term.c
+             (visible-cursor cursor boolean "22.1")
             ;; undo.c
             (undo-limit undo integer)
             (undo-strong-limit undo integer)
@@ -334,11 +344,11 @@ since it could result in memory overflow and make Emacs crash."
             (scroll-step windows integer)
             (scroll-conservatively windows integer)
             (scroll-margin windows integer)
-            (hscroll-margin windows integer "21.3")
-            (hscroll-step windows number "21.3")
+            (hscroll-margin windows integer "22.1")
+            (hscroll-step windows number "22.1")
             (truncate-partial-width-windows display boolean)
             (mode-line-inverse-video modeline boolean)
-            (mode-line-in-non-selected-windows modeline boolean "21.3")
+            (mode-line-in-non-selected-windows modeline boolean "22.1")
             (line-number-display-limit display
                                        (choice integer
                                                (const :tag "No limit" nil)))
@@ -350,16 +360,24 @@ since it could result in memory overflow and make Emacs crash."
                                            (other :tag "Unlimited" t)))
             (unibyte-display-via-language-environment mule boolean)
             (blink-cursor-alist cursor alist "22.1")
+            (overline-margin display integer "22.1")
+             (mouse-autoselect-window
+             display (choice
+                      (const :tag "Off (nil)" :value nil)
+                      (const :tag "Immediate" :value t)
+                      (number :tag "Delay by secs" :value 0.5)) "22.1")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean)
             ;; xfns.c
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))
-            (x-use-old-gtk-file-dialog menu boolean "22.1")
+            (x-gtk-use-old-file-dialog menu boolean "22.1")
             (x-gtk-show-hidden-files menu boolean "22.1")
+            (x-gtk-file-dialog-help-text menu boolean "22.1")
+            (x-gtk-whole-detached-tool-bar x boolean "22.1")
             ;; xterm.c
-             (mouse-autoselect-window display boolean "21.3")
-            (x-use-underline-position-properties display boolean "21.3")
+            (x-use-underline-position-properties display boolean "22.1")
+            (x-underline-at-descent-line display boolean "22.1")
             (x-stretch-cursor display boolean "21.1")))
       this symbol group type standard version native-p
       ;; This function turns a value