* lisp/url/url-vars.el (url-bug-address): Make into an obsolete alias.

* lisp/url/url-http.el (url-http-handle-authentication):
* lisp/url/url-news.el (url-news-fetch-message-id):
Use M-x report-emacs-bug in help messages.  [Backport]

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 36f76fded69210bf16818e716fc6b84b28f890b7..c2085a851a8eaa1988724dbcf0824e958765f47b 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * url-vars.el (url-bug-address): Make into an obsolete alias.
+       * url-http.el (url-http-handle-authentication):
+       * url-news.el (url-news-fetch-message-id):
+       Use M-x report-emacs-bug in help messages.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.4 released.

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b0a3b688a55d751bd568f30134ed0e98b2bbdae0..d839d977fd2f1c9bd7d55b0a913731451e19dd42 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -413,7 +413,7 @@ Return the number of characters removed."
          (goto-char (point-max))
          (insert "<hr>Sorry, but I do not know how to handle " type
                  " authentication.  If you'd like to write it,"
-                 " send it to " url-bug-address ".<hr>")
+                 " please use M-x report-emacs-bug RET.<hr>")
           ;; We used to set a `status' var (declared "special") but I can't
           ;; find the corresponding let-binding, so it's probably an error.
           ;; FIXME: Maybe it was supposed to set `success', i.e. to return t?

diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 105fb67737463438a4fdcf23f989506f7a593069..0ce6d2e6cd1c356537428b6190f728c8e1b255f4 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -70,8 +70,7 @@
                "    </xmp>\n"
                "   </p>\n"
                "   <p>\n"
-               "    If you If you feel this is an error, <a href=\""
-               "mailto:" url-bug-address "\">send mail</a>\n"
+               "    If you feel this is an error, M-x report-emacs-bug RET.\n"
                "   </p>\n"
                "  </div>\n"
                " </body>\n"

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 4cdb59deb27808055097c54879680e9415fd6b8c..62b7b855533cfe5d1af36e4118639e6b72b5ba0d 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-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1996-1999, 2001, 2004-2014 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -82,8 +81,8 @@ If non-nil and not t, the user will be asked for each refresh request."
   :type 'boolean
   :group 'url-cache)
 
-(defconst url-bug-address "bug-gnu-emacs@gnu.org"
-  "Where to send bug reports.")
+(define-obsolete-variable-alias 'url-bug-address
+  'report-emacs-bug-address "24.5")
 
 (defcustom url-personal-mail-address nil
   "Your full email address.