[Emacs-diffs] Changes to emacs/lisp/emulation/tpu-mapper.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/11/07 03:46:13

Index: tpu-mapper.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/tpu-mapper.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- tpu-mapper.el       7 Nov 2007 03:39:09 -0000       1.25
+++ tpu-mapper.el       7 Nov 2007 03:46:13 -0000       1.26
@@ -176,23 +176,23 @@
   (interactive)
   (if (featurep 'xemacs)
       (progn
-       (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))
+       (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))
-              (set-buffer "Directions"))))
+          (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))
-    (setq tpu-key (concat "[" (format "%s" tpu-key-seq) "]"))
-    (cond ((not (equal tpu-key tpu-return))
+    (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"))))
+      (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func))))
+  (set-buffer "Directions")
     tpu-key)
 
 (set-buffer "Keys")