Cleanup of TODO to prefer report-emacs-bug

* etc/TODO: Remove already completed removal of `report-calc-bug'.
* lisp/calc/calc.el: Remove any mention of `report-calc-bug'.
* lisp/epg-config.el: Redefine `epg-bug-report-address' as obsolete
variable alias for `report-emacs-bug-address'.
* lisp/expand.el: Remove any mention of `expand-submit-report'.
* lisp/obsolete/fast-lock.el: Remove commented out code for
`fast-lock-submit-bug-report'.

5 files changed, 4 insertions, 26 deletions

diff --git a/etc/TODO b/etc/TODO
index dc594a007ed..fe2e583a380 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -202,7 +202,6 @@ https://lists.gnu.org/r/emacs-devel/2007-04/msg00684.html
 Change them to use report-emacs-bug.
 *** Related functions:
 **** gnus-bug
-**** report-calc-bug
 **** org-submit-bug-report
 **** lm-report-bug
 **** tramp-bug
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 35f13f9656a..1496a741abd 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -37,13 +37,12 @@
 ;; work for the foreseeable future.
 ;;
 ;; Bug reports and suggestions are always welcome!  (Type M-x
-;; report-calc-bug to send them).
+;; report-emacs-bug to send them).
 
 ;; All functions, macros, and Lisp variables defined here begin with one
 ;; of the prefixes "math", "Math", or "calc", with the exceptions of
 ;; "full-calc", "full-calc-keypad", "another-calc", "quick-calc",
-;; "report-calc-bug", and "defmath".  User-accessible variables begin
-;; with "var-".
+;; and "defmath".  User-accessible variables begin with "var-".
 
 ;;; TODO:
 
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 4502f90874f..bb323e54fa9 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -31,8 +31,8 @@
 (defconst epg-version-number "1.0.0"
   "Version number of this package.")
 
-(defconst epg-bug-report-address "ueno@unixuser.org"
-  "Report bugs to this address.")
+(define-obsolete-variable-alias 'epg-bug-report-address
+  'report-emacs-bug-address "27.1")
 
 (defgroup epg ()
   "Interface to the GNU Privacy Guard (GnuPG)."
diff --git a/lisp/expand.el b/lisp/expand.el
index 0c4d343090c..da76effc260 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -66,9 +66,6 @@
 ;;                  Jerome Santini <santini@chambord.univ-orleans.fr>,
 ;;                  Jari Aalto <jaalto@tre.tele.nokia.fi>.
 ;;
-;;   Please send me a word to give me your feeling about this feature or
-;; to explain me how you use it (your expansions table for example) using
-;; the function expand-submit-report.
 ;;; Code:
 
 ;;; Constants:
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index b8d58fa13ca..9ae6d91bde8 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -214,23 +214,6 @@
                     (setq faces (cdr faces))))
            faces)))))
 
-;;(defun fast-lock-submit-bug-report ()
-;;  "Submit via mail a bug report on fast-lock.el."
-;;  (interactive)
-;;  (let ((reporter-prompt-for-summary-p t))
-;;    (reporter-submit-bug-report "simon@gnu.org" "fast-lock 3.14"
-;;     '(fast-lock-cache-directories fast-lock-minimum-size
-;;       fast-lock-save-others fast-lock-save-events fast-lock-save-faces
-;;       fast-lock-verbose)
-;;     nil nil
-;;     (concat "Hi Si.,
-;;
-;;I want to report a bug.  I've read the `Bugs' section of `Info' on Emacs, so I
-;;know how to make a clear and unambiguous report.  To reproduce the bug:
-;;
-;;Start a fresh editor via `" invocation-name " -no-init-file -no-site-file'.
-;;In the `*scratch*' buffer, evaluate:"))))
-
 (defgroup fast-lock nil
   "Font Lock support mode to cache fontification."
   :load 'fast-lock