Misc small custom fixes

The value of defcustom's const should not be quoted!

* lisp/desktop.el (desktop-restore-in-current-display):
* lisp/newcomment.el (comment-empty-lines):
* lisp/progmodes/idlwave.el (idlwave-scan-all-buffers-for-routine-info)
(idlwave-pad-keyword):
* lisp/progmodes/tcl.el (tcl-tab-always-indent):
* lisp/textmodes/reftex-vars.el (reftex-index-default-tag):
* lisp/elec-pair.el (electric-pair-skip-whitespace):
* lisp/progmodes/cfengine.el (cfengine-cf-promises):
* lisp/cedet/ede/linux.el (project-linux-build-directory-default)
(project-linux-architecture-default):
* lisp/erc/erc-button.el (erc-button-alist):
* lisp/gnus/auth-source.el (auth-sources):
* lisp/gnus/nnmairix.el (nnmairix-propagate-marks-upon-close):
* lisp/url/url-history.el (url-history-track):
* lisp/url/url-vars.el (url-honor-refresh-requests):
Fix custom types.

* lisp/net/tls.el (tls-certtool-program): Fix default value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58763279b5e07cd0cf88f580ae84808055d7e9b2..ec743e384a700985d3d062ced66b9d1cdc0dc27f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
+       * net/tls.el (tls-certtool-program): Fix default value.
+
+       * desktop.el (desktop-restore-in-current-display):
+       * newcomment.el (comment-empty-lines):
+       * progmodes/idlwave.el (idlwave-scan-all-buffers-for-routine-info)
+       (idlwave-pad-keyword):
+       * progmodes/tcl.el (tcl-tab-always-indent):
+       * textmodes/reftex-vars.el (reftex-index-default-tag):
+       * elec-pair.el (electric-pair-skip-whitespace):
+       * progmodes/cfengine.el (cfengine-cf-promises): Fix custom types.
+
        * emacs-lisp/authors.el (authors-ignored-files)
        (authors-valid-file-names, authors-renamed-files-alist): Additions.
 

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 5b80e79a03ecee6bacef06787913fc54fed11ca2..a00d9877206d5b55ae8366c44abc290974fb42f0 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,10 +1,14 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+       * ede/linux.el (project-linux-build-directory-default)
+       (project-linux-architecture-default): Fix custom types.
+
 2013-12-12  David Engster  <deng@randomsample.de>
 
-       * semantic/analyze.el
-       (semantic-analyze-find-tag-sequence-default): Always add scope to
-       the local miniscope for each type.  Otherwise, structure tags are
-       not analyzed correctly.  Also, always search the extended
-       miniscope even when not dealing with types.
+       * semantic/analyze.el (semantic-analyze-find-tag-sequence-default):
+       Always add scope to the local miniscope for each type.  Otherwise,
+       structure tags are not analyzed correctly.  Also, always search
+       the extended miniscope even when not dealing with types.
 
        * semantic/ctxt.el (semantic-get-local-variables-default): Also
        try to parse local variables for buffers which are currently

diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 8a2b7c6686d4642ac02ee91c4a01c1041f9faa96..0d89f0ece1806fb0c71ea16772103e9be6232640 100644 (file)
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -51,14 +51,14 @@
 (defcustom project-linux-build-directory-default 'ask
   "Build directory."
   :group 'project-linux
-  :type '(choice (const :tag "Same as source directory" 'same)
-                 (const :tag "Ask the user" 'ask)))
+  :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."
   :group 'project-linux
   :type '(choice (string :tag "Architecture name")
-                 (const :tag "Ask the user" 'ask)))
+                 (const :tag "Ask the user" ask)))
 
 
 (defcustom project-linux-compile-target-command (concat ede-make-command " -k -C %s SUBDIRS=%s")

diff --git a/lisp/desktop.el b/lisp/desktop.el
index bdb16c002622d37f58e6535f2064ceb5d44f60cd..29e658fcac57dad237e0a9e8376d6a258265e779 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -383,7 +383,7 @@ If nil, frames are restored, if possible, in their original displays.
 If `delete', frames on other displays are deleted instead of restored."
   :type '(choice (const :tag "Restore in current display" t)
                 (const :tag "Restore in original display" nil)
-                (const :tag "Delete frames in other displays" 'delete))
+                (const :tag "Delete frames in other displays" delete))
   :group 'desktop
   :version "24.4")
 

diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 130ce9f4ca21fe86b2193c61785c340502c35e7b..f38320047512419d78e9116aa5d45cd3cc765b26 100644 (file)
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -138,7 +138,7 @@ return value is considered instead."
   :group 'electricity
   :type '(choice
           (const :tag "Yes, jump over whitespace" t)
-          (const :tag "Yes, and delete whitespace" 'chomp)
+          (const :tag "Yes, and delete whitespace" chomp)
           (const :tag "No, no whitespace skipping" nil)
           function))
 

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f7a998c5e0ed9365ae664e4c32a038b8dfe29b66..9847ee49daf8f9fb9a38b954526af2533807dfd3 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+       * erc-button.el (erc-button-alist): Fix custom type.
+
 2013-11-25  Glenn Morris  <rgm@gnu.org>
 
        * erc-button.el (erc-nick-popup): Make `nick' available in the

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index a124954498ddaf3a6a719bae90cea4f21702b9f8..9b5bd50400a1da5c5946a3ed8ed9c699a4622cda 100644 (file)
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -189,7 +189,7 @@ PAR is a number of a regexp grouping whose text will be passed to
                 (choice :tag "Matches"
                         regexp
                         (variable :tag "Variable containing regexp")
-                        (const :tag "Nicknames" 'nicknames))
+                        (const :tag "Nicknames" nicknames))
                 (integer :tag "Number of the regexp section that matches")
                 (choice :tag "When to buttonize"
                         (const :tag "Always" t)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 76c1b2aebe06418024f6d3bde60d28b65ead4bb7..c38cf16e082dd8426cab2cf92f3791cebea35912 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+       * auth-source.el (auth-sources):
+       * nnmairix.el (nnmairix-propagate-marks-upon-close):
+       Fix custom types.
+
 2013-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-summary-respool-query): Special-case nnimap so that

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 54429b5cfda50cf3d219b1a055f8251314eff370..e7ba292933cedac9abd7a17bef606a95ca7fb6bb 100644 (file)
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -251,7 +251,7 @@ can get pretty complex."
   :type `(repeat :tag "Authentication Sources"
                  (choice
                   (string :tag "Just a file")
-                  (const :tag "Default Secrets API Collection" 'default)
+                  (const :tag "Default Secrets API Collection" default)
                   (const :tag "Login Secrets API Collection" "secrets:Login")
                   (const :tag "Temp Secrets API Collection" "secrets:session")
 
@@ -270,7 +270,7 @@ can get pretty complex."
                                  (const :format "" :value :secrets)
                                  (choice :tag "Collection to use"
                                          (string :tag "Collection name")
-                                         (const :tag "Default" 'default)
+                                         (const :tag "Default" default)
                                          (const :tag "Login" "Login")
                                          (const
                                           :tag "Temporary" "session")))
@@ -280,14 +280,14 @@ can get pretty complex."
                                         :value :macos-keychain-internet)
                                  (choice :tag "Collection to use"
                                          (string :tag "internet Keychain path")
-                                         (const :tag "default" 'default)))
+                                         (const :tag "default" default)))
                                 (list
                                  :tag "Mac OS generic Keychain"
                                  (const :format ""
                                         :value :macos-keychain-generic)
                                  (choice :tag "Collection to use"
                                          (string :tag "generic Keychain path")
-                                         (const :tag "default" 'default))))
+                                         (const :tag "default" default))))
                         (repeat :tag "Extra Parameters" :inline t
                                 (choice :tag "Extra parameter"
                                         (list

diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 8c73b40047f963cd355d19484e62e485d7bde228..536028a7002e30af51a91215fe364ff43305987d 100644 (file)
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -308,13 +308,13 @@ The default chooses the largest window in the current frame."
 
 (defcustom nnmairix-propagate-marks-upon-close t
   "Flag if marks should be propagated upon closing a group.
-The default of this variable is t. If set to 'ask, the
+The default of this variable is t.  If set to 'ask, the
 user will be asked if the flags should be propagated when the
 group is closed.  If set to nil, the user will have to manually
 call 'nnmairix-propagate-marks'."
   :version "23.1"
   :type '(choice (const :tag "always" t)
-                (const :tag "ask" 'ask)
+                (const :tag "ask" ask)
                 (const :tag "never" nil))
   :group 'nnmairix)
 

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 3d8d8decf47448a942ea0f8b75df55a5558bb109..540116d9961e755f4a328ef175758918aa9623dd 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -168,8 +168,8 @@ this to nil if you want to ignore host name mismatches."
   :version "23.1" ;; No Gnus
   :group 'tls)
 
-(defcustom tls-certtool-program (executable-find "certtool")
-  "Name of  GnuTLS certtool.
+(defcustom tls-certtool-program "certtool"
+  "Name of GnuTLS certtool.
 Used by `tls-certificate-information'."
   :version "22.1"
   :type 'string

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 251c1605345d806ded666a5f934ed3038f498981..76f7b12b208fe6f34e8d226127aae5e50b9d4c95 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -312,7 +312,7 @@ If `eol' it only comments out empty lines if comments are
 terminated by the end of line (i.e. `comment-end' is empty)."
   :type '(choice (const :tag "Never" nil)
          (const :tag "Always" t)
-         (const :tag "EOl-terminated" 'eol))
+         (const :tag "EOl-terminated" eol))
   :group 'comment)
 
 ;;;;

diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index ca7a4013796c1bda851b6efd6f04ba5f4bf30b97..b3720d80fd90e8245ee7223dd664a56cf0793ea0 100644 (file)
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -211,7 +211,7 @@ the number of colors, see `bubbles-colors'."
 Available modes are `shift-default' and `shift-always'."
   :type '(radio (const :tag "Default" default)
                 (const :tag "Shifter" always)
-                ;;(const :tag "Mega Shifter" 'mega)
+                ;;(const :tag "Mega Shifter" mega)
                 )
   :group 'bubbles)
 

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 8d06041f919bd74c65ea2a11f8209d01ddb63bf1..b5210ce0c74ae7eb727221373bac48ba3b4c521b 100644 (file)
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -81,10 +81,10 @@ 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."
   :group 'cfengine
-  :type 'file)
+  :type '(choice file (const nil)))
 
 (defcustom cfengine-parameters-indent '(promise pname 0)
-  "*Indentation of CFEngine3 promise parameters (hanging indent).
+  "Indentation of CFEngine3 promise parameters (hanging indent).
 
 For example, say you have this code:
 

diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index ce60e05d669a4f2d1e03e1e781a05a01e791bb9e..5f95fd761676b9549377c669bba070f0238e0c83 100644 (file)
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -381,7 +381,7 @@ current   Scan only the current buffer, but no other buffers."
   :type '(choice
          (const :tag "No buffer" nil)
          (const :tag "All buffers" t)
-         (const :tag "Current buffer only" 'current)))
+         (const :tag "Current buffer only" current)))
 
 (defcustom idlwave-query-shell-for-routine-info t
   "Non-nil means query the shell for info about compiled routines.
@@ -776,7 +776,7 @@ spaces are left unchanged."
   :type '(choice
          (const :tag "Pad like assignments" t)
          (const :tag "Remove space near `='" nil)
-         (const :tag "Keep space near `='" 'keep)))
+         (other :tag "Keep space near `='" keep)))
 
 (defcustom idlwave-show-block t
   "Non-nil means point blinks to block beginning for `idlwave-show-begin'."

diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 3e91aeba9a10032a7c2799914e0862261fe1c41f..5bbaee9038ceaccbfadd2cbb492b870dff981016 100644 (file)
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -151,7 +151,7 @@ to take place:
   6. Move backward to start of comment, indenting if necessary."
   :type '(choice (const :tag "Always" t)
                 (const :tag "Beginning only" nil)
-                (const :tag "Maybe move or make or delete comment" 'tcl))
+                (other :tag "Maybe move or make or delete comment" tcl))
   :group 'tcl)
 
 

diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index f6e8936edb58fbf741272d6237d21df7bbf86780..3d82a9f7b3148abc113e750d20cee13a7f571822 100644 (file)
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1442,7 +1442,7 @@ last      The last used index tag will be offered as default."
   :group 'reftex-index-support
   :type '(choice
           (const :tag  "no default" nil)
-          (const :tag  "last used " 'last)
+          (const :tag  "last used " last)
           (string :tag "index tag " "idx")))
 
 (defcustom reftex-index-math-format "$%s$"

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index add3df7913904012ff03cefc3adffba555a3bfd8..2e2760e740b7e2fcf4513ab63b820be58d2e26ba 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+       * url-history.el (url-history-track):
+       * url-vars.el (url-honor-refresh-requests): Fix custom types.
+
 2013-12-20  Leo Liu  <sdl.web@gmail.com>
 
        * url.el (url-retrieve-synchronously): Add optional arg SILENT and

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index d0635d3f6bbf837bcabae192127c104a0d684e14..510fb6d1df71f1f333e2911134ace1a685984a36 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -44,7 +44,7 @@ session."
                (url-history-setup-save-timer)))
   :type '(choice (const :tag "off" nil)
                 (const :tag "on" t)
-                (const :tag "within session" 'session))
+                (other :tag "within session" session))
   :group 'url-history)
 
 (defcustom url-history-file nil

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index a34111c27b7bd8d8d7b136935d631c8fd5f919f2..808063b7720184252bc2e8a54a5d4765c7c65227 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,6 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
-;; Copyright (C) 1996-1999, 2001, 2004-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1996-1999, 2001, 2004-2013 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -72,7 +71,7 @@ requests will be honored.  If t, all refresh requests will be honored.
 If non-nil and not t, the user will be asked for each refresh request."
   :type '(choice (const :tag "off" nil)
                 (const :tag "on" t)
-                (const :tag "ask" 'ask))
+                (other :tag "ask" ask))
   :group 'url-hairy)
 
 (defcustom url-automatic-caching nil