(tpu-map-key): Use unless rather than cond.

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

diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index 3e5af7a38bdee8ce3fc49b17ffc87e867f04fcda..b3ad67ec4df097b0497571762c5f6e5aa3ea9a5a 100644 (file)
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -77,13 +77,6 @@
   (error "tpu-mapper requires running in Emacs 19, with an X display")))
 
 
-;;;
-;;;  Decide whether we're running Lucid Emacs or Emacs itself.
-;;;
-(defconst tpu-lucid-emacs19-p (string-match "Lucid" emacs-version)
-  "Non-nil if we are running Lucid Emacs version 19.")
-
-
 ;;;
 ;;;  Key variables
 ;;;
@@ -100,7 +93,7 @@
 ;;;
 ;;;  Make sure the window is big enough to display the instructions
 ;;;
-(if tpu-lucid-emacs19-p (set-screen-size (selected-screen) 80 36)
+(if (featurep 'xemacs) (set-screen-size (selected-screen) 80 36)
   (set-frame-size (selected-frame) 80 36))
 
 
@@ -167,7 +160,7 @@
 ;;;  Save <CR> for future reference
 ;;;
 (cond
- (tpu-lucid-emacs19-p
+ ((featurep 'xemacs)
   (setq tpu-return-seq (read-key-sequence "Hit carriage-return <CR> to continue "))
   (setq tpu-return (concat "[" (format "%s" (event-key (aref tpu-return-seq 0))) "]")))
  (t
@@ -179,42 +172,29 @@
 ;;;
 ;;;  Key mapping functions
 ;;;
-(defun tpu-lucid-map-key (ident descrip func gold-func)
+(defun tpu-map-key (ident descrip func gold-func)
   (interactive)
-  (setq tpu-key-seq (read-key-sequence (format "Press %s%s: " ident descrip)))
-  (setq tpu-key (concat "[" (format "%s" (event-key (aref tpu-key-seq 0))) "]"))
-  (cond ((not (equal tpu-key tpu-return))
-        (set-buffer "Keys")
-        (insert (format"(global-set-key %s %s)\n" tpu-key func))
-        (set-buffer "Gold-Keys")
-        (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func))
-        (set-buffer "Directions"))
-       ;; bogosity to get next prompt to come up, if the user hits <CR>!
-       ;; check periodically to see if this is still needed...
-       (t
-        (format "%s" tpu-key)))
+  (if (featurep 'xemacs)
+      (progn
+       (setq tpu-key-seq (read-key-sequence
+                           (format "Press %s%s: " ident descrip))
+              tpu-key (format "[%s]" (event-key (aref tpu-key-seq 0))))
+       (unless (equal tpu-key tpu-return)
+          (set-buffer "Keys")
+          (insert (format"(global-set-key %s %s)\n" tpu-key func))
+          (set-buffer "Gold-Keys")
+          (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func))))
+    (message "Press %s%s: " ident descrip)
+    (setq tpu-key-seq (read-event)
+          tpu-key (format "[%s]" tpu-key-seq))
+    (unless (equal tpu-key tpu-return)
+      (set-buffer "Keys")
+      (insert (format"(define-key tpu-global-map %s %s)\n" tpu-key func))
+      (set-buffer "Gold-Keys")
+      (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func))))
+  (set-buffer "Directions")
   tpu-key)
 
-(defun tpu-emacs-map-key (ident descrip func gold-func)
-  (interactive)
-  (message "Press %s%s: " ident descrip)
-  (setq tpu-key-seq (read-event))
-  (setq tpu-key (concat "[" (format "%s" tpu-key-seq) "]"))
-  (cond ((not (equal tpu-key tpu-return))
-        (set-buffer "Keys")
-        (insert (format"(define-key tpu-global-map %s %s)\n" tpu-key func))
-        (set-buffer "Gold-Keys")
-        (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func))
-        (set-buffer "Directions"))
-       ;; bogosity to get next prompt to come up, if the user hits <CR>!
-       ;; check periodically to see if this is still needed...
-       (t
-        (format "%s" tpu-key)))
-  tpu-key)
-
-(fset 'tpu-map-key (if tpu-lucid-emacs19-p 'tpu-lucid-map-key 'tpu-emacs-map-key))
-
-
 (set-buffer "Keys")
 (insert "
 ;;  Arrows
@@ -350,7 +330,7 @@
 ;;
 ")
 
-(cond (tpu-lucid-emacs19-p
+(cond ((featurep 'xemacs)
        (insert (format "(setq tpu-help-enter \"%s\")\n" tpu-enter-seq))
        (insert (format "(setq tpu-help-return \"%s\")\n" tpu-return-seq))
        (insert "(setq tpu-help-N \"[#<keypress-event N>]\")\n")
@@ -368,7 +348,7 @@
 ;;;
 (let ((file
        (convert-standard-filename
-       (if tpu-lucid-emacs19-p "~/.tpu-lucid-keys" "~/.tpu-keys"))))
+       (if (featurep 'xemacs) "~/.tpu-lucid-keys" "~/.tpu-keys"))))
   (set-visited-file-name
    (read-file-name (format "Save key mapping to file (default %s): " file) "" file)))
 (save-buffer)