[Emacs-diffs] /srv/bzr/emacs/trunk r110305: * lisp/bookmark.el (bookmark-version-control): Give tags in the

[Karl Fogel]

------------------------------------------------------------
revno: 110305
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 22:32:06 -0500
message:
  * lisp/bookmark.el (bookmark-version-control): Give tags in the
    :type choices (Bug#12309), and improve doc string.
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-01 02:07:14 +0000
+++ b/lisp/ChangeLog    2012-10-01 03:32:06 +0000
@@ -1,3 +1,8 @@
+2012-10-01  Karl Fogel  <address@hidden>
+
+       * bookmark.el (bookmark-version-control): Give tags in the
+       :type choices (Bug#12309), and improve doc string.
+
 2012-10-01  Paul Eggert  <address@hidden>
 
        Revert the FOLLOW-SYMLINKS change for file-attributes.

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2012-09-25 04:13:02 +0000
+++ b/lisp/bookmark.el  2012-10-01 03:32:06 +0000
@@ -99,12 +99,14 @@
 
 (defcustom bookmark-version-control 'nospecial
   "Whether or not to make numbered backups of the bookmark file.
-It can have four values: t, nil, `never', and `nospecial'.
+It can have four values: t, nil, `never', or `nospecial'.
 The first three have the same meaning that they do for the
-variable `version-control', and the final value `nospecial' means just
-use the value of `version-control'."
-  :type '(choice (const nil) (const never) (const nospecial)
-                (other t))
+variable `version-control'; the value `nospecial' (the default) means
+just use the value of `version-control'."
+  :type '(choice (const :tag "If existing" nil)
+                 (const :tag "Never" never)
+                 (const :tag "Use the value of `version-control'" nospecial)
+                (const :tag "Always" t))
   :group 'bookmark)