Documentation string of diary-modify-entry-list-string-function improved.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 694eb96e22d63d7385fa01c1978214fd5b71a3a4..2f3cd5d0e07c88c12009fca3fd6d7dd52b65398f 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,7 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -40,20 +41,6 @@
             ;; alloc.c
             (gc-cons-threshold alloc integer)
             (garbage-collection-messages alloc boolean)
-            ;; undo.c
-            (undo-limit undo integer)
-            (undo-strong-limit undo integer)
-            (undo-outer-limit undo
-                              (choice integer
-                                      (const :tag "No limit"
-                                             :format "%t\n%d"
-                                             :doc
-                                             "With this choice, \
-the undo info for the current command never gets discarded.
-This should only be chosen under exceptional circumstances,
-since it could result in memory overflow and make Emacs crash."
-                                             nil))
-                              "22.1")
             ;; buffer.c
             (mode-line-format modeline sexp) ;Hard to do right.
             (default-major-mode internal function)
@@ -72,34 +59,38 @@ since it could result in memory overflow and make Emacs crash."
               (const :tag "No indicators" nil)
               (const :tag "On left, with arrows" left)
               (const :tag "On right, with arrows" right)
-              (list :tag "Pick your own design"
-                    :value ((t . nil))
-                    (choice :tag "Default"
-                            (const :tag "Do not show" (t . nil))
-                            (const :tag "On the left" (t . left))
-                            (const :tag "On the right" (t . right)))
-                    (set :inline t
-                         :tag "Override default for"
-                         (choice :tag "Top"
-                                 :value (top . left)
-                                 (const :tag "Do not show" (top . nil))
-                                 (const :tag "On the left" (top . left))
-                                 (const :tag "On the right" (top . right)))
-                         (choice :tag "Bottom"
-                                 :value (bottom . left)
-                                 (const :tag "Do not show" (bottom . nil))
-                                 (const :tag "On the left" (bottom . left))
-                                 (const :tag "On the right" (bottom . right)))
-                         (choice :tag "Up arrow"
-                                 :value (up . left)
-                                 (const :tag "Do not show" (up . nil))
-                                 (const :tag "On the left" (up . left))
-                                 (const :tag "On the right" (up . right)))
-                         (choice :tag "Down arrow"
-                                 :value (down . left)
-                                 (const :tag "Do not show" (down . nil))
-                                 (const :tag "On the left" (down . left))
-                                 (const :tag "On the right" (down . right)))))
+              (set :tag "Pick your own design"
+                   :value ((t . nil))
+                   :format "%{%t%}:\n%v\n%d"
+                   :doc "You can specify a default and then override it \
+for individual indicators.
+Leaving \"Default\" unchecked is equivalent with specifying a default of
+\"Do not show\"."
+                   (choice :tag "Default"
+                           :value (t . nil)
+                           (const :tag "Do not show" (t . nil))
+                           (const :tag "On the left" (t . left))
+                           (const :tag "On the right" (t . right)))
+                   (choice :tag "Top"
+                           :value (top . left)
+                           (const :tag "Do not show" (top . nil))
+                           (const :tag "On the left" (top . left))
+                           (const :tag "On the right" (top . right)))
+                   (choice :tag "Bottom"
+                           :value (bottom . left)
+                           (const :tag "Do not show" (bottom . nil))
+                           (const :tag "On the left" (bottom . left))
+                           (const :tag "On the right" (bottom . right)))
+                   (choice :tag "Up arrow"
+                           :value (up . left)
+                           (const :tag "Do not show" (up . nil))
+                           (const :tag "On the left" (up . left))
+                           (const :tag "On the right" (up . right)))
+                   (choice :tag "Down arrow"
+                           :value (down . left)
+                           (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")
             (scroll-up-aggressively windows
@@ -181,6 +172,8 @@ since it could result in memory overflow and make Emacs crash."
             (mouse-highlight mouse (choice (const :tag "disabled" nil)
                                            (const :tag "always shown" t)
                                            (other :tag "hidden by keypress" 1)))
+            ;; fringe.c
+            (overflow-newline-into-fringe fringe boolean "22.1")
             ;; indent.c
             (indent-tabs-mode fill boolean)
             ;; keyboard.c
@@ -226,7 +219,7 @@ since it could result in memory overflow and make Emacs crash."
                                 :format "%t%n%h"
                                 :inline t
                                 (read-only t))
-                         (const :tag "Inviolable"
+                         (const :tag "Don't Enter"
                                 :doc "Prevent point from ever entering prompt"
                                 :format "%t%n%h"
                                 :inline t
@@ -253,6 +246,20 @@ since it could result in memory overflow and make Emacs crash."
             (words-include-escapes editing-basics boolean)
             (open-paren-in-column-0-is-defun-start editing-basics boolean
                                                    "21.1")
+            ;; undo.c
+            (undo-limit undo integer)
+            (undo-strong-limit undo integer)
+            (undo-outer-limit undo
+                              (choice integer
+                                      (const :tag "No limit"
+                                             :format "%t\n%d"
+                                             :doc
+                                             "With this choice, \
+the undo info for the current command never gets discarded.
+This should only be chosen under exceptional circumstances,
+since it could result in memory overflow and make Emacs crash."
+                                             nil))
+                              "22.1")
             ;; window.c
             (temp-buffer-show-function windows (choice (const nil) function))
             (display-buffer-function windows (choice (const nil) function))