; Merge from origin/emacs-25

[gnu-emacs] / lisp / url / url-history.el

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index c0649db57ce2eaa69c823779339f39a603177923..a88fef5acfe4746ca1fd2865f93f03e9c74f3b72 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,6 @@
 ;;; url-history.el --- Global history tracking for URL package
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
-;;   2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2016 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -45,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