procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc small custom fixes

Browse source 
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.
This commit is contained in:
Glenn Morris 2013-12-27 17:24:15 -08:00
parent 2545413005
commit 9c61f806fb
20 changed files with 60 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ChangeLog
View file

@ -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.

14
lisp/cedet/ChangeLog
View file

@ -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

6
lisp/cedet/ede/linux.el
View file

@ -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")

2
lisp/desktop.el
View file

@ -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")

2
lisp/elec-pair.el
View file

@ -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))

4
lisp/erc/ChangeLog
View file

@ -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

2
lisp/erc/erc-button.el
View file

@ -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)

6
lisp/gnus/ChangeLog
View file

@ -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

8
lisp/gnus/auth-source.el
View file

@ -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

4
lisp/gnus/nnmairix.el
View file

@ -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)

4
lisp/net/tls.el
View file

@ -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

2
lisp/newcomment.el
View file

@ -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)
;;;;

2
lisp/play/bubbles.el
View file

@ -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)

4
lisp/progmodes/cfengine.el
View file

@ -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:

4
lisp/progmodes/idlwave.el
View file

@ -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'."

2
lisp/progmodes/tcl.el
View file

@ -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)

2
lisp/textmodes/reftex-vars.el
View file

@ -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$"

5
lisp/url/ChangeLog
View file

@ -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

2
lisp/url/url-history.el
View file

@ -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

5
lisp/url/url-vars.el
View file

@ -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