[Emacs-diffs] trunk r115787: Add missing custom :versions, plus small fixes

[Glenn Morris]

------------------------------------------------------------
revno: 115787
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 18:16:05 -0800
message:
  Add missing custom :versions, plus small fixes
  
  * 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.
  
  * cedet/ede/linux.el (project-linux-build-directory-default)
  (project-linux-architecture-default): Fix custom types.  Add version.
  
  * gnus/gnus-icalendar.el (gnus-icalendar-org, gnus-icalendar):
  * gnus/gnus-sum.el (gnus-subthread-sort-functions): Add version.
  * gnus/gnus-sync.el (gnus-sync-file-encrypt-to): Add type and version.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/bookmark.el               bookmark.el-20091113204419-o5vbwnq5f7feedwu-621
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/ede/linux.el        linux.el-20091113204419-o5vbwnq5f7feedwu-11210
  lisp/doc-view.el               docview.el-20091113204419-o5vbwnq5f7feedwu-6334
  lisp/emacs-lisp/smie.el        smie.el-20100517192034-xap3ihmey43772vj-1
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-icalendar.el    
gnusicalendar.el-20130801225830-k3bdrwt8427ren1n-1
  lisp/gnus/gnus-sum.el          gnussum.el-20091113204419-o5vbwnq5f7feedwu-1137
  lisp/gnus/gnus-sync.el         gnussync.el-20100813104807-li6cvhfz3hlu797x-1
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1
  lisp/pcmpl-x.el                pcmplx.el-20130407071226-4la30myd0pef85ok-1
  lisp/progmodes/cfengine.el     
cfengine.el-20091113204419-o5vbwnq5f7feedwu-2944
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028
  lisp/register.el               register.el-20091113204419-o5vbwnq5f7feedwu-104
  lisp/textmodes/reftex-vars.el  
reftexvars.el-20091113204419-o5vbwnq5f7feedwu-1338
  lisp/vc/log-edit.el            logedit.el-20091113204419-o5vbwnq5f7feedwu-1776

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-28 01:24:15 +0000
+++ b/lisp/ChangeLog    2013-12-28 02:16:05 +0000
@@ -1,5 +1,17 @@
 2013-12-28  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2013-09-11 03:31:56 +0000
+++ b/lisp/bookmark.el  2013-12-28 02:16:05 +0000
@@ -130,8 +130,9 @@
   :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)
 

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-12-28 01:24:15 +0000
+++ b/lisp/cedet/ChangeLog      2013-12-28 02:16:05 +0000
@@ -1,7 +1,7 @@
 2013-12-28  Glenn Morris  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/cedet/ede/linux.el'
--- a/lisp/cedet/ede/linux.el   2013-12-28 01:24:15 +0000
+++ b/lisp/cedet/ede/linux.el   2013-12-28 02:16:05 +0000
@@ -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)))

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2013-11-28 22:43:09 +0000
+++ b/lisp/doc-view.el  2013-12-28 02:16:05 +0000
@@ -198,6 +198,7 @@
 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

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2013-12-17 01:31:55 +0000
+++ b/lisp/emacs-lisp/smie.el   2013-12-28 02:16:05 +0000
@@ -1923,6 +1923,11 @@
 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)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-12-28 01:24:15 +0000
+++ b/lisp/gnus/ChangeLog       2013-12-28 02:16:05 +0000
@@ -1,5 +1,9 @@
 2013-12-28  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/gnus-icalendar.el'
--- a/lisp/gnus/gnus-icalendar.el       2013-12-18 22:11:40 +0000
+++ b/lisp/gnus/gnus-icalendar.el       2013-12-28 02:16:05 +0000
@@ -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 <address@hidden>
 ;; Keywords: mail, icalendar, org
@@ -344,6 +344,7 @@
 
 (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 @@
 
 (defgroup gnus-icalendar nil
   "Settings for inline display of iCalendar invitations."
+  :version "24.4"
   :group 'gnus-article
   :prefix "gnus-icalendar-")
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2013-12-26 22:13:28 +0000
+++ b/lisp/gnus/gnus-sum.el     2013-12-28 02:16:05 +0000
@@ -897,6 +897,7 @@
   "*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)

=== modified file 'lisp/gnus/gnus-sync.el'
--- a/lisp/gnus/gnus-sync.el    2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/gnus-sync.el    2013-12-28 02:16:05 +0000
@@ -139,8 +139,9 @@
   "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)

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-12-27 15:43:54 +0000
+++ b/lisp/net/shr.el   2013-12-28 02:16:05 +0000
@@ -90,6 +90,7 @@
 Alternative suggestions are:
 - \"  \"
 - \"  \""
+  :version "24.4"
   :type 'string
   :group 'shr)
 

=== modified file 'lisp/pcmpl-x.el'
--- a/lisp/pcmpl-x.el   2013-11-21 16:30:14 +0000
+++ b/lisp/pcmpl-x.el   2013-12-28 02:16:05 +0000
@@ -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)
 

=== modified file 'lisp/progmodes/cfengine.el'
--- a/lisp/progmodes/cfengine.el        2013-12-28 01:24:15 +0000
+++ b/lisp/progmodes/cfengine.el        2013-12-28 02:16:05 +0000
@@ -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 @@
                 perms => mog(\"600\", \"tzz\", \"tzz\");
 }
 "
-
+  :version "24.4"
   :group 'cfengine
   :type '(list
           (choice (const :tag "Anchor at beginning of promise" promise)

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-12-20 01:50:46 +0000
+++ b/lisp/progmodes/octave.el  2013-12-28 02:16:05 +0000
@@ -651,6 +651,7 @@
     ("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)

=== modified file 'lisp/register.el'
--- a/lisp/register.el  2013-12-17 17:29:11 +0000
+++ b/lisp/register.el  2013-12-28 02:16:05 +0000
@@ -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 @@
 
 (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)
 

=== modified file 'lisp/textmodes/reftex-vars.el'
--- a/lisp/textmodes/reftex-vars.el     2013-12-28 01:24:15 +0000
+++ b/lisp/textmodes/reftex-vars.el     2013-12-28 02:16:05 +0000
@@ -878,6 +878,7 @@
 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)

=== modified file 'lisp/vc/log-edit.el'
--- a/lisp/vc/log-edit.el       2013-12-19 21:10:41 +0000
+++ b/lisp/vc/log-edit.el       2013-12-28 02:16:05 +0000
@@ -120,8 +120,9 @@
   :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)