Changeset 4161 for trunk/lisp/cus-start.el

Timestamp:

2006年09月09日 16時30分10秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/cus-start.el (modified) (3 diffs)

trunk/lisp/cus-start.el

@@ -345 +345 @@
-             (scroll-conservatively windows integer)
-             (scroll-margin windows integer)
-1.3
-1.3
+2.1
+2.1
-             (truncate-partial-width-windows display boolean)
-             (mode-line-inverse-video modeline boolean)
-1.3
+2.1
-             (line-number-display-limit display
-                                        (choice integer
@@ -361 +361 @@
-             (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)
@@ -370 +376 @@
-             (x-gtk-whole-detached-tool-bar x boolean "22.1")
-             ;; xterm.c
-             (mouse-autoselect-window display boolean "21.3
-se-underline-position-properties display boolean "21.3
+            (x-use-underline-position-properties display boolean "22.1
+nderline-at-descent-line display boolean "22.1
-             (x-stretch-cursor display boolean "21.1")))
-      this symbol group type standard version native-p