summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-12-27 17:24:15 -0800
committerGlenn Morris <rgm@gnu.org>2013-12-27 17:24:15 -0800
commit9c61f806fb122612fc7bc1ddb2cb5ea00e5621f1 (patch)
tree8e97921e57ec8c8f0284170a179e0a72dec02941 /lisp/url
parent254541300559122771cf4c0449a2b8ff78ab3eb7 (diff)
downloademacs-9c61f806fb122612fc7bc1ddb2cb5ea00e5621f1.tar.gz
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.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-history.el2
-rw-r--r--lisp/url/url-vars.el5
3 files changed, 8 insertions, 4 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index add3df79139..2e2760e740b 100644
--- 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 d0635d3f6bb..510fb6d1df7 100644
--- 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 a34111c27b7..808063b7720 100644
--- 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