[Emacs-diffs] trunk r115786: Misc small custom fixes

[Glenn Morris]

------------------------------------------------------------
revno: 115786
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 17:24:15 -0800
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/ede/linux.el        linux.el-20091113204419-o5vbwnq5f7feedwu-11210
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591
  lisp/elec-pair.el              elecpair.el-20131227124533-yaq8recs0j0ggt67-1
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc-button.el         
ercbutton.el-20091113204419-o5vbwnq5f7feedwu-4314
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/auth-source.el       
authsource.el-20091113204419-o5vbwnq5f7feedwu-8608
  lisp/gnus/nnmairix.el          
nnmairix.el-20091113204419-o5vbwnq5f7feedwu-8585
  lisp/net/tls.el                tls.el-20091113204419-o5vbwnq5f7feedwu-2563
  lisp/newcomment.el             
newcomment.el-20091113204419-o5vbwnq5f7feedwu-1719
  lisp/play/bubbles.el           bubbles.el-20091113204419-o5vbwnq5f7feedwu-5217
  lisp/progmodes/cfengine.el     
cfengine.el-20091113204419-o5vbwnq5f7feedwu-2944
  lisp/progmodes/idlwave.el      idlwave.el-20091113204419-o5vbwnq5f7feedwu-1731
  lisp/progmodes/tcl.el          tcl.el-20091113204419-o5vbwnq5f7feedwu-757
  lisp/textmodes/reftex-vars.el  
reftexvars.el-20091113204419-o5vbwnq5f7feedwu-1338
  lisp/url/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-3116
  lisp/url/url-history.el        
urlhistory.el-20091113204419-o5vbwnq5f7feedwu-2988
  lisp/url/url-vars.el           urlvars.el-20091113204419-o5vbwnq5f7feedwu-3004

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

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-12-12 21:33:06 +0000
+++ b/lisp/cedet/ChangeLog      2013-12-28 01:24:15 +0000
@@ -1,10 +1,14 @@
+2013-12-28  Glenn Morris  <address@hidden>
+
+       * ede/linux.el (project-linux-build-directory-default)
+       (project-linux-architecture-default): Fix custom types.
+
 2013-12-12  David Engster  <address@hidden>
 
-       * 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

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

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2013-12-16 21:48:51 +0000
+++ b/lisp/desktop.el   2013-12-28 01:24:15 +0000
@@ -383,7 +383,7 @@
 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")
 

=== modified file 'lisp/elec-pair.el'
--- a/lisp/elec-pair.el 2013-12-27 12:53:57 +0000
+++ b/lisp/elec-pair.el 2013-12-28 01:24:15 +0000
@@ -138,7 +138,7 @@
   :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))
 

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2013-11-25 03:25:13 +0000
+++ b/lisp/erc/ChangeLog        2013-12-28 01:24:15 +0000
@@ -1,3 +1,7 @@
+2013-12-28  Glenn Morris  <address@hidden>
+
+       * erc-button.el (erc-button-alist): Fix custom type.
+
 2013-11-25  Glenn Morris  <address@hidden>
 
        * erc-button.el (erc-nick-popup): Make `nick' available in the

=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el    2013-11-25 03:25:13 +0000
+++ b/lisp/erc/erc-button.el    2013-12-28 01:24:15 +0000
@@ -189,7 +189,7 @@
                 (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)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-12-26 22:13:28 +0000
+++ b/lisp/gnus/ChangeLog       2013-12-28 01:24:15 +0000
@@ -1,3 +1,9 @@
+2013-12-28  Glenn Morris  <address@hidden>
+
+       * auth-source.el (auth-sources):
+       * nnmairix.el (nnmairix-propagate-marks-upon-close):
+       Fix custom types.
+
 2013-12-26  Lars Ingebrigtsen  <address@hidden>
 
        * gnus-sum.el (gnus-summary-respool-query): Special-case nnimap so that

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2013-07-06 12:49:38 +0000
+++ b/lisp/gnus/auth-source.el  2013-12-28 01:24:15 +0000
@@ -251,7 +251,7 @@
   :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 @@
                                  (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 @@
                                         :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

=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el     2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/nnmairix.el     2013-12-28 01:24:15 +0000
@@ -308,13 +308,13 @@
 
 (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)
 

=== modified file 'lisp/net/tls.el'
--- a/lisp/net/tls.el   2013-06-05 15:03:37 +0000
+++ b/lisp/net/tls.el   2013-12-28 01:24:15 +0000
@@ -168,8 +168,8 @@
   :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

=== modified file 'lisp/newcomment.el'
--- a/lisp/newcomment.el        2013-10-05 23:40:16 +0000
+++ b/lisp/newcomment.el        2013-12-28 01:24:15 +0000
@@ -312,7 +312,7 @@
 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)
 
 ;;;;

=== modified file 'lisp/play/bubbles.el'
--- a/lisp/play/bubbles.el      2013-09-12 05:32:57 +0000
+++ b/lisp/play/bubbles.el      2013-12-28 01:24:15 +0000
@@ -211,7 +211,7 @@
 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)
 

=== modified file 'lisp/progmodes/cfengine.el'
--- a/lisp/progmodes/cfengine.el        2013-12-16 15:49:25 +0000
+++ b/lisp/progmodes/cfengine.el        2013-12-28 01:24:15 +0000
@@ -81,10 +81,10 @@
 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:
 

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2013-06-19 07:21:59 +0000
+++ b/lisp/progmodes/idlwave.el 2013-12-28 01:24:15 +0000
@@ -381,7 +381,7 @@
   :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 @@
   :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'."

=== modified file 'lisp/progmodes/tcl.el'
--- a/lisp/progmodes/tcl.el     2013-05-30 03:20:56 +0000
+++ b/lisp/progmodes/tcl.el     2013-12-28 01:24:15 +0000
@@ -151,7 +151,7 @@
   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)
 
 

=== modified file 'lisp/textmodes/reftex-vars.el'
--- a/lisp/textmodes/reftex-vars.el     2013-12-18 11:52:49 +0000
+++ b/lisp/textmodes/reftex-vars.el     2013-12-28 01:24:15 +0000
@@ -1442,7 +1442,7 @@
   :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$"

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2013-12-20 10:12:17 +0000
+++ b/lisp/url/ChangeLog        2013-12-28 01:24:15 +0000
@@ -1,3 +1,8 @@
+2013-12-28  Glenn Morris  <address@hidden>
+
+       * url-history.el (url-history-track):
+       * url-vars.el (url-honor-refresh-requests): Fix custom types.
+
 2013-12-20  Leo Liu  <address@hidden>
 
        * url.el (url-retrieve-synchronously): Add optional arg SILENT and

=== modified file 'lisp/url/url-history.el'
--- a/lisp/url/url-history.el   2013-01-01 09:11:05 +0000
+++ b/lisp/url/url-history.el   2013-12-28 01:24:15 +0000
@@ -44,7 +44,7 @@
                (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

=== modified file 'lisp/url/url-vars.el'
--- a/lisp/url/url-vars.el      2013-09-13 07:01:55 +0000
+++ b/lisp/url/url-vars.el      2013-12-28 01:24:15 +0000
@@ -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 @@
 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