Update copyright year to 2016

[gnu-emacs] / lisp / term / sun.el

diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index d375656569c757c493be6c4d1ecdc44e8f76854c..7fb8e7ed98426c102d42ceae744ddfe9212e1883 100644 (file)
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,6 +1,6 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
-;; Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
@@ -38,7 +38,7 @@
   (scroll-up n))
 
 (defun kill-region-and-unmark (beg end)
-  "Like kill-region, but pops the mark [which equals point, anyway.]"
+  "Like `kill-region', but pops the mark [which equals point, anyway.]"
   (interactive "r")
   (kill-region beg end)
   (setq this-command 'kill-region-and-unmark)
@@ -122,7 +122,9 @@
 ;; for you to put your own bindings in.
 
 (defvar sun-raw-prefix-hooks nil
-  "List of forms to evaluate after setting sun-raw-prefix.")
+  "List of forms to evaluate after setting `sun-raw-prefix'.")
+;; 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")
 
 \f
 
@@ -133,10 +135,10 @@
   (global-set-key [r3] 'backward-page)
   (global-set-key [r6] 'forward-page)
   (global-set-key [r7] 'beginning-of-buffer)
-  (global-set-key [r9] 'scroll-down)
+  (global-set-key [r9] 'scroll-down-command)
   (global-set-key [r11]        'recenter)
   (global-set-key [r13]        'end-of-buffer)
-  (global-set-key [r15]        'scroll-up)
+  (global-set-key [r15]        'scroll-up-command)
   (global-set-key [redo]       'redraw-display) ;FIXME: collides with default.
   (global-set-key [props]      'list-buffers)
   (global-set-key [put]        'sun-select-region)
@@ -148,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))