1 files changed, 52 insertions, 36 deletions

diff --git a/lisp/term/news.el b/lisp/term/news.el
index 57896652b02..448dfd82850 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,4 +1,8 @@
-;; keypad and function key bindings for the Sony NEWS keyboard.
+;; news.el --- keypad and function key bindings for the Sony NEWS keyboard
+
+;; Author: FSF
+;; Keywords: terminals
+
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -18,38 +22,50 @@
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
 
-;; This file places entries in function-key-map for the raw escape
-;; sequences of various keypad and function keys, binding them to
-;; their symbolic forms.
-
-(define-prefix-command 'news-fkey-prefix)
-(define-key function-key-map "\eO" 'news-fkey-prefix)
-
-(define-key news-fkey-prefix "P" [f1])
-(define-key news-fkey-prefix "Q" [f2])
-(define-key news-fkey-prefix "R" [f3])
-(define-key news-fkey-prefix "S" [f4])
-(define-key news-fkey-prefix "T" [f5])
-(define-key news-fkey-prefix "U" [f6])
-(define-key news-fkey-prefix "V" [f7])
-(define-key news-fkey-prefix "W" [f8])
-(define-key news-fkey-prefix "X" [f9])
-(define-key news-fkey-prefix "Y" [f10])
-(define-key news-fkey-prefix "m" [kp-subtract])
-(define-key news-fkey-prefix "k" [kp-add])
-(define-key news-fkey-prefix "l" [kp-separator])
-(define-key news-fkey-prefix "n" [kp-period])
-(define-key news-fkey-prefix "M" [kp-enter])
-(define-key news-fkey-prefix "p" [kp-0])
-(define-key news-fkey-prefix "q" [kp-1])
-(define-key news-fkey-prefix "r" [kp-2])
-(define-key news-fkey-prefix "s" [kp-3])
-(define-key news-fkey-prefix "t" [kp-4])
-(define-key news-fkey-prefix "u" [kp-5])
-(define-key news-fkey-prefix "v" [kp-6])
-(define-key news-fkey-prefix "w" [kp-7])
-(define-key news-fkey-prefix "x" [kp-8])
-(define-key news-fkey-prefix "y" [kp-9])
-(define-key news-fkey-prefix "a" [execute])
-(define-key news-fkey-prefix "b" [select])
-(define-key news-fkey-prefix "c" [cancel])
+;;; Commentary:
+
+;;; Uses the Emacs 19 terminal initialization features --- won't work with 18.
+
+;;; Code:
+
+(if (boundp 'news-fkey-prefix)
+    nil
+  (setq news-fkey-prefix (make-keymap)) ; "<ESC>O" commands
+  (define-key function-key-map "\eO" news-fkey-prefix)
+
+  ;; Termcap or terminfo will set these
+  ;; (define-key news-fkey-prefix "P" [f1])
+  ;; (define-key news-fkey-prefix "Q" [f2])
+  ;; (define-key news-fkey-prefix "R" [f3])
+  ;; (define-key news-fkey-prefix "S" [f4])
+  ;; (define-key news-fkey-prefix "T" [f5])
+  ;; (define-key news-fkey-prefix "U" [f6])
+  ;; (define-key news-fkey-prefix "V" [f7])
+  ;; (define-key news-fkey-prefix "W" [f8])
+  ;; (define-key news-fkey-prefix "X" [f9])
+  ;; (define-key news-fkey-prefix "Y" [f10])
+
+  ;; Terminfo will set these
+  (define-key news-fkey-prefix "a" [execute])
+  (define-key news-fkey-prefix "b" [select])
+  (define-key news-fkey-prefix "c" [cancel])
+  (define-key news-fkey-prefix "M" [kp-enter])
+  (define-key news-fkey-prefix "q" [kp-1])
+  (define-key news-fkey-prefix "s" [kp-3])
+  (define-key news-fkey-prefix "u" [kp-5])
+  (define-key news-fkey-prefix "w" [kp-7])
+  (define-key news-fkey-prefix "y" [kp-9])
+
+  ;; These aren't in either termcap or terminfo's repertoire
+  (define-key news-fkey-prefix "m" [kp-subtract])
+  (define-key news-fkey-prefix "k" [kp-add])
+  (define-key news-fkey-prefix "l" [kp-separator])
+  (define-key news-fkey-prefix "n" [kp-period])
+  (define-key news-fkey-prefix "p" [kp-0])
+  (define-key news-fkey-prefix "r" [kp-2])
+  (define-key news-fkey-prefix "t" [kp-4])
+  (define-key news-fkey-prefix "v" [kp-6])
+  (define-key news-fkey-prefix "x" [kp-8])
+  )
+
+;;; news.el ends here