17 files changed, 47 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec743e384a7..37ab0c8b5c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,17 @@
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp/smie.el (smie-config): Add type, version, initialize.
+        * bookmark.el (bookmark-bmenu-use-header-line):
+        * doc-view.el (doc-view-scale-internally):
+        * pcmpl-x.el (pcmpl-x-tlmgr-program, pcmpl-x-ack-program):
+        * register.el (register-preview-delay):
+        * net/shr.el (shr-bullet):
+        * progmodes/cfengine.el (cfengine-cf-promises)
+        (cfengine-parameters-indent):
+        * progmodes/octave.el (inferior-octave-error-regexp-alist):
+        * textmodes/reftex-vars.el (reftex-label-regexps):
+        * vc/log-edit.el (log-edit-setup-add-author): Add version.
+
         * net/tls.el (tls-certtool-program): Fix default value.
 
         * desktop.el (desktop-restore-in-current-display):
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index ce0d6831a3a..6e319dfe3a4 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -130,8 +130,9 @@ recently set ones come first, oldest ones come last)."
   :group 'bookmark)
 
 (defcustom bookmark-bmenu-use-header-line t
-  "Non-nil means to use an immovable header line, as opposed to inline
-text at the top of the buffer."
+  "Non-nil means to use an immovable header line.
+This is as opposed to inline text at the top of the buffer."
+  :version "24.4"
   :type 'boolean
   :group 'bookmark)
 
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index a00d9877206..e11c8b8770e 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,7 +1,7 @@
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
         * ede/linux.el (project-linux-build-directory-default)
-        (project-linux-architecture-default): Fix custom types.
+        (project-linux-architecture-default): Fix custom types.  Add version.
 
 2013-12-12  David Engster  <deng@randomsample.de>
 
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 0d89f0ece18..9e80f466baa 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -50,12 +50,14 @@
 
 (defcustom project-linux-build-directory-default 'ask
   "Build directory."
+  :version "24.4"
   :group 'project-linux
   :type '(choice (const :tag "Same as source directory" same)
                  (const :tag "Ask the user" ask)))
 
 (defcustom project-linux-architecture-default 'ask
   "Target architecture to assume when not auto-detected."
+  :version "24.4"
   :group 'project-linux
   :type '(choice (string :tag "Architecture name")
                  (const :tag "Ask the user" ask)))
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 71a865a7a49..c01eb190ac6 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -198,6 +198,7 @@ Higher values result in larger images."
 If nil, the document is re-rendered every time the scaling factor is modified.
 This only has an effect if the image libraries linked with Emacs support
 scaling."
+  :version "24.4"
   :type 'boolean)
 
 (defcustom doc-view-image-width 850
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 08bf7348aa9..27ac5df80a1 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1923,6 +1923,11 @@ Each RULE element should be of the form (NEW KIND TOKEN NORMAL),
 where KIND and TOKEN are the elements passed to `smie-rules-function',
 NORMAL is the value returned by `smie-rules-function' and NEW is the
 value with which to replace it."
+  :version "24.4"
+  ;; FIXME improve value-type.
+  :type '(choice (const nil)
+                 (alist :key-type symbol))
+  :initialize 'custom-initialize-default
   :set #'smie-config--setter)
 
 (defun smie-config-local (rules)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c38cf16e082..bb944c14351 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
+        * gnus-icalendar.el (gnus-icalendar-org, gnus-icalendar):
+        * gnus-sum.el (gnus-subthread-sort-functions): Add version.
+        * gnus-sync.el (gnus-sync-file-encrypt-to): Add type and version.
+
         * auth-source.el (auth-sources):
         * nnmairix.el (nnmairix-propagate-marks-upon-close):
         Fix custom types.
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 1abcb6e27e4..4ceec60ed6e 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -1,6 +1,6 @@
 ;;; gnus-icalendar.el --- reply to iCalendar meeting requests
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
 ;; Author: Jan Tatarik <Jan.Tatarik@gmail.com>
 ;; Keywords: mail, icalendar, org
@@ -344,6 +344,7 @@ on the IDENTITIES list."
 
 (defgroup gnus-icalendar-org nil
   "Settings for Calendar Event gnus/org integration."
+  :version "24.4"
   :group 'gnus-icalendar
   :prefix "gnus-icalendar-org-")
 
@@ -644,6 +645,7 @@ is searched."
 
 (defgroup gnus-icalendar nil
   "Settings for inline display of iCalendar invitations."
+  :version "24.4"
   :group 'gnus-article
   :prefix "gnus-icalendar-")
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 49e5aa7fabf..f6caf8a8120 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -897,6 +897,7 @@ subthreads, customize `gnus-subthread-sort-functions'."
   "*List of functions used for sorting subthreads in the summary buffer.
 By default, subthreads are sorted the same as threads, i.e.,
 according to the value of `gnus-thread-sort-functions'."
+  :version "24.4"
   :group 'gnus-summary-sort
   :type '(choice
           (const :tag "Sort subthreads like threads" gnus-thread-sort-functions)
diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el
index 8cf92df5b91..0b63e519695 100644
--- a/lisp/gnus/gnus-sync.el
+++ b/lisp/gnus/gnus-sync.el
@@ -139,8 +139,9 @@ and `gnus-topic-alist'.  Also see `gnus-variable-list'."
   "Carrier for newsrc data")
 
 (defcustom gnus-sync-file-encrypt-to nil
-  "If non-nil, `epa-file-encrypt-to' is set from this for encrypting the Sync
-  file."
+  "If non-nil, set `epa-file-encrypt-to' from this for encrypting the Sync file."
+  :version "24.4"
+  :type '(choice string (repeat string))
   :group 'gnus-sync)
 
 (defcustom gnus-sync-lesync-name (system-name)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index b29ae6ce848..1604ebbd7e2 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -90,6 +90,7 @@ used."
 Alternative suggestions are:
 - \"  \"
 - \"  \""
+  :version "24.4"
   :type 'string
   :group 'shr)
 
diff --git a/lisp/pcmpl-x.el b/lisp/pcmpl-x.el
index 8e09c660301..23fa0836ecd 100644
--- a/lisp/pcmpl-x.el
+++ b/lisp/pcmpl-x.el
@@ -31,6 +31,7 @@
 
 (defcustom pcmpl-x-tlmgr-program "tlmgr"
   "Name of the tlmgr program."
+  :version "24.4"
   :type 'file
   :group 'pcomplete)
 
@@ -154,6 +155,7 @@
                               (executable-find "ack")
                               "ack"))
   "Name of the ack program."
+  :version "24.4"
   :type 'file
   :group 'pcomplete)
 
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index b5210ce0c74..06265d31a9e 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -80,6 +80,7 @@
 Used for syntax discovery and checking.  Set to nil to disable
 the `compile-command' override.  In that case, the ElDoc support
 will use a fallback syntax definition."
+  :version "24.4"
   :group 'cfengine
   :type '(choice file (const nil)))
 
@@ -138,7 +139,7 @@ bundle agent rcfiles
                 perms => mog(\"600\", \"tzz\", \"tzz\");
 }
 "
-
+  :version "24.4"
   :group 'cfengine
   :type '(list
           (choice (const :tag "Anchor at beginning of promise" promise)
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index ace4ef343db..f3ad8de6014 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -651,6 +651,7 @@ mode, include \"-q\" and \"--traditional\"."
     ("warning:\\s-*\\([^:\n]+\\):.*at line \\([0-9]+\\), column \\([0-9]+\\)"
      1 2 3 1 1))
   "Value for `compilation-error-regexp-alist' in inferior octave."
+  :version "24.4"
   :type '(repeat (choice (symbol :tag "Predefined symbol")
                          (sexp :tag "Error specification")))
   :group 'octave)
diff --git a/lisp/register.el b/lisp/register.el
index cad26124fdd..945fb28bffe 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -1,7 +1,6 @@
 ;;; register.el --- register commands for Emacs      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1985, 1993-1994, 2001-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985, 1993-1994, 2001-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -91,6 +90,7 @@ text."
 
 (defcustom register-preview-delay 1
   "If non-nil delay in seconds to pop up the preview window."
+  :version "24.4"
   :type '(choice number (const :tag "Indefinitely" nil))
   :group 'register)
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 3d82a9f7b31..842d9680d93 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -878,6 +878,7 @@ have to define it using \\(?1:...\\) when adding new regexps.
 When changed from Lisp, make sure to call
 `reftex-compile-variables' afterwards to make the change
 effective."
+  :version "24.4"
   :set (lambda (symbol value)
          (set symbol value)
          (when (fboundp 'reftex-compile-variables)
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 791215b8000..f324f248094 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -120,8 +120,9 @@ If SETUP is 'force, this variable has no effect."
   :type 'boolean)
 
 (defcustom log-edit-setup-add-author nil
-  "Non-nil means `log-edit' should add the `Author:' header when
-its SETUP argument is non-nil."
+  "Non-nil means `log-edit' may add the `Author:' header.
+This applies when its SETUP argument is non-nil."
+  :version "24.4"
   :group 'log-edit
   :type 'boolean
   :safe 'booleanp)