Update copyright year to 2015

[gnu-emacs] / lisp / emulation / edt-mapper.el

diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 87b6bcf0aa9747c54540a7ce7b0b1c4a9f2f98a0..9e3667e7a8ff34c387ce73734f34cc2a379a2cb2 100644 (file)
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -1,6 +1,6 @@
 ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
 
-;; Copyright (C) 1994-1995, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2000-2015 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
@@ -96,6 +96,10 @@
 
 ;;; Code:
 
+;; Otherwise it just hangs.  This seems preferable.
+(if noninteractive
+    (error "edt-mapper cannot be loaded in batch mode"))
+
 ;;;
 ;;;  Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs).
 ;;;  Determine Window System, and X Server Vendor (if appropriate).
@@ -293,26 +297,26 @@
 
     Here's a picture of the standard LK-201 keypad for reference:
 
-          _______________________    _______________________________
-         | HELP  |      DO       |  |  F17  |  F18  |  F19  |  F20  |
-         |       |               |  |       |       |       |       |
-         |_______|_______________|  |_______|_______|_______|_______|
-          _______________________    _______________________________
-         | FIND  |INSERT |REMOVE |  |  PF1  |  PF2  |  PF3  |  PF4  |
-         |       |       |       |  |       |       |       |       |
-         |_______|_______|_______|  |_______|_______|_______|_______|
-         |SELECT |PREVIOU| NEXT  |  |  KP7  |  KP8  |  KP9  |  KP-  |
-         |       |       |       |  |       |       |       |       |
-         |_______|_______|_______|  |_______|_______|_______|_______|
-                 |   UP  |          |  KP4  |  KP5  |  KP6  |  KP,  |
-                 |       |          |       |       |       |       |
-          _______|_______|_______   |_______|_______|_______|_______|
-         |  LEFT |  DOWN | RIGHT |  |  KP1  |  KP2  |  KP3  |       |
-         |       |       |       |  |       |       |       |       |
-         |_______|_______|_______|  |_______|_______|_______|  KPE  |
-                                    |      KP0      |  KPP  |       |
-                                    |               |       |       |
-                                    |_______________|_______|_______|
+          ________________________    _______________________________
+         | HELP  |      DO        |  |  F17  |  F18  |  F19  |  F20  |
+         |       |                |  |       |       |       |       |
+         |_______|________________|  |_______|_______|_______|_______|
+          ________________________   _______________________________
+         | FIND  |INSERT  |REMOVE |  |  PF1  |  PF2  |  PF3  |  PF4  |
+         |       |        |       |  |       |       |       |       |
+         |_______|________|_______|  |_______|_______|_______|_______|
+         |SELECT |PREVIOUS|NEXT   |  |  KP7  |  KP8  |  KP9  |  KP-  |
+         |       |        |       |  |       |       |       |       |
+         |_______|________|_______|  |_______|_______|_______|_______|
+                 |   UP   |          |  KP4  |  KP5  |  KP6  |  KP,  |
+                 |        |          |       |       |       |       |
+          _______|________|_______   |_______|_______|_______|_______|
+         |  LEFT |  DOWN  | RIGHT |  |  KP1  |  KP2  |  KP3  |       |
+         |       |        |       |  |       |       |       |       |
+         |_______|________|_______|  |_______|_______|_______|  KPE  |
+                                     |      KP0      |  KPP  |       |
+                                     |               |       |       |
+                                     |_______________|_______|_______|
 
          REMEMBER:  JUST PRESS RETURN TO SKIP MAPPING A KEY.
 
@@ -325,20 +329,20 @@
 
           PRESS THE KEY SPECIFIED IN THE MINIBUFFER BELOW.
 
-          _______________________    _______________________________
-         | HELP  |      DO       |  |  F17  |  F18  |  F19  |  F20  |
-         |_______|_______________|  |_______|_______|_______|_______|
-          _______________________    _______________________________
-         | FIND  |INSERT |REMOVE |  |  PF1  |  PF2  |  PF3  |  PF4  |
-         |_______|_______|_______|  |_______|_______|_______|_______|
-         |SELECT |PREVIOU| NEXT  |  |  KP7  |  KP8  |  KP9  |  KP-  |
-         |_______|_______|_______|  |_______|_______|_______|_______|
-                 |   UP  |          |  KP4  |  KP5  |  KP6  |  KP,  |
-          _______|_______|_______   |_______|_______|_______|_______|
-         |  LEFT |  DOWN | RIGHT |  |  KP1  |  KP2  |  KP3  |       |
-         |_______|_______|_______|  |_______|_______|_______|  KPE  |
-                                    |      KP0      |  KPP  |       |
-                                    |_______________|_______|_______|
+          ________________________    _______________________________
+         | HELP  |       DO       |  |  F17  |  F18  |  F19  |  F20  |
+         |_______|________________|  |_______|_______|_______|_______|
+          ________________________    _______________________________
+         | FIND  |INSERT  |REMOVE |  |  PF1  |  PF2  |  PF3  |  PF4  |
+         |_______|________|_______|  |_______|_______|_______|_______|
+         |SELECT |PREVIOUS| NEXT  |  |  KP7  |  KP8  |  KP9  |  KP-  |
+         |_______|________|_______|  |_______|_______|_______|_______|
+                 |   UP   |          |  KP4  |  KP5  |  KP6  |  KP,  |
+          _______|________|_______   |_______|_______|_______|_______|
+         |  LEFT |  DOWN  | RIGHT |  |  KP1  |  KP2  |  KP3  |       |
+         |_______|________|_______|  |_______|_______|_______|  KPE  |
+                                     |      KP0      |  KPP  |       |
+                                     |_______________|_______|_______|
 
          REMEMBER:  JUST PRESS RETURN TO SKIP MAPPING A KEY.")))
 
@@ -349,7 +353,7 @@
 (defun edt-map-key (ident descrip)
   (interactive)
   (if (featurep 'xemacs)
-      (progn 
+      (progn
        (setq edt-key-seq (read-key-sequence (format "Press %s%s: " ident descrip)))
        (setq edt-key (concat "[" (format "%s" (event-key (aref edt-key-seq 0))) "]"))
        (cond ((not (equal edt-key edt-return))