* lisp/bookmark.el (bookmark-version-control): Give tags in the

  :type choices (Bug#12309), and improve doc string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e683650856c78395b37626c06c2016c57b93ba83..7ac0ec729905a57e4612a0da96eb74458d624d5d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-01  Karl Fogel  <kfogel@red-bean.com>
+
+       * bookmark.el (bookmark-version-control): Give tags in the
+       :type choices (Bug#12309), and improve doc string.
+
 2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        Revert the FOLLOW-SYMLINKS change for file-attributes.

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 26ba1dec00f6e42614a2befd8d2e9bbeae556f11..7470f7bd62cec51819ac760d96e00052ff693201 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -99,12 +99,14 @@ To specify the file in which to save them, modify the variable
 
 (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)