2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index c2a913ad345..b3af959c30e 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -123,7 +123,8 @@
 
 (defvar sun-raw-prefix-hooks nil
   "List of forms to evaluate after setting `sun-raw-prefix'.")
-(make-obsolete-variable 'sun-raw-prefix-hooks 'term-setup-hook "21.1")
+;; Obsolete since 21.1, but tty-setup-hook only exists since 24.4.
+(make-obsolete-variable 'sun-raw-prefix-hooks 'tty-setup-hook "21.1")
 
 
 
@@ -149,7 +150,9 @@
   (global-set-key [f7]  'enlarge-window)
 
   (when sun-raw-prefix-hooks
-    (message "sun-raw-prefix-hooks is obsolete!  Use term-setup-hook instead!")
+    (message "sun-raw-prefix-hooks is obsolete!  Use %s instead!"
+             (or (car-safe (get 'sun-raw-prefix-hooks 'byte-obsolete-variable))
+                 "emacs-startup-hook"))
     (let ((hooks sun-raw-prefix-hooks))
       (while hooks
         (eval (car hooks))
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index a894801f985..aa9ba43d3d7 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,7 +1,6 @@
 ;;; wyse50.el --- terminal support code for Wyse 50
 
-;; Copyright (C) 1989, 1993-1994, 2001-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1989, 1993-1994, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
 ;;      Jim Blandy <jimb@occs.cs.oberlin.edu>
@@ -132,7 +131,7 @@
                          (concat "\ea23R" (1+ (frame-width)) "C\eG0"))))))
 
 (defun enable-arrow-keys ()
-  "To be called by `term-setup-hook'. Overrides 6 Emacs standard keys
+  "To be called by `tty-setup-hook'.  Overrides 6 Emacs standard keys
 whose functions are then typed as follows:
 C-a     Funct Left-arrow
 C-h     M-?