(help-print-return-message): Rename from print-help-return-message.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b91a5157800..584cef20192 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * help.el (help-print-return-message): Rename from
+        print-help-return-message.
+
         * log-view.el (log-view-mode-map): Remove `q' binding, and unreliable
         cvs-mode-map parent hack.
         (log-view-mode): Derive from special-mode.
diff --git a/lisp/help.el b/lisp/help.el
index b5c778b1df4..e5c07e82439 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -42,7 +42,7 @@
 ;; invoking `with-output-to-temp-buffer'.  If and only if `help-window'
 ;; is eq to t, `help-mode-finish' (called by `temp-buffer-setup-hook')
 ;; sets `help-window' to the window selected by `display-buffer'.
-;; Exiting `with-help-window' and calling `print-help-return-message'
+;; Exiting `with-help-window' and calling `help-print-return-message'
 ;; reset `help-window' to nil.
 (defvar help-window nil
   "Window chosen for displaying help.")
@@ -137,7 +137,8 @@ This is a list
  (WINDOW . quit-window)    do quit-window, then select WINDOW.
  (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
 
-(defun print-help-return-message (&optional function)
+(define-obsolete-function-alias 'print-help-return-message 'help-print-return-message "23.2")
+(defun help-print-return-message (&optional function)
   "Display or return message saying how to restore windows after help command.
 This function assumes that `standard-output' is the help buffer.
 It computes a message, and applies the optional argument FUNCTION to it.
@@ -1073,7 +1074,7 @@ of WINDOW."
           (help-window-display-message
            (if reuse
                ;; Offer `display-buffer' for consistency with
-               ;; `print-help-return-message'.  This is hardly TRT when
+               ;; `help-print-return-message'.  This is hardly TRT when
                ;; the other window and the selected window display the
                ;; same buffer but has been handled this way ever since.
                "Type \\[display-buffer] RET to restore the other window"
@@ -1202,7 +1203,7 @@ window itself is specified by the variable `help-window'."
 ;; (4) A marker (`help-window-point-marker') to move point in the help
 ;; window to an arbitrary buffer position.
 
-;; Note: It's usually always wrong to use `print-help-return-message' in
+;; Note: It's usually always wrong to use `help-print-return-message' in
 ;; the body of `with-help-window'.
 (defmacro with-help-window (buffer-name &rest body)
   "Display buffer BUFFER-NAME in a help window evaluating BODY.