comparison lisp/emulation/tpu-mapper.el @ 85951:88dacb884a1c

(tpu-map-key): Use unless rather than cond. Remove superfluous concats. Move final set-buffer to non-emacs-specific code.
author Glenn Morris <rgm@gnu.org>
date Wed, 07 Nov 2007 03:46:13 +0000
parents b2723afaaa59
children a7f6615bcf7f 880960b70474
comparison
equal deleted inserted replaced
85950:ba090ec72685 85951:88dacb884a1c
174 ;;; 174 ;;;
175 (defun tpu-map-key (ident descrip func gold-func) 175 (defun tpu-map-key (ident descrip func gold-func)
176 (interactive) 176 (interactive)
177 (if (featurep 'xemacs) 177 (if (featurep 'xemacs)
178 (progn 178 (progn
179 (setq tpu-key-seq (read-key-sequence (format "Press %s%s: " ident descrip))) 179 (setq tpu-key-seq (read-key-sequence
180 (setq tpu-key (concat "[" (format "%s" (event-key (aref tpu-key-seq 0))) "]")) 180 (format "Press %s%s: " ident descrip))
181 (cond ((not (equal tpu-key tpu-return)) 181 tpu-key (format "[%s]" (event-key (aref tpu-key-seq 0))))
182 (set-buffer "Keys") 182 (unless (equal tpu-key tpu-return)
183 (insert (format"(global-set-key %s %s)\n" tpu-key func)) 183 (set-buffer "Keys")
184 (set-buffer "Gold-Keys") 184 (insert (format"(global-set-key %s %s)\n" tpu-key func))
185 (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func)) 185 (set-buffer "Gold-Keys")
186 (set-buffer "Directions")))) 186 (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func))))
187 (message "Press %s%s: " ident descrip) 187 (message "Press %s%s: " ident descrip)
188 (setq tpu-key-seq (read-event)) 188 (setq tpu-key-seq (read-event)
189 (setq tpu-key (concat "[" (format "%s" tpu-key-seq) "]")) 189 tpu-key (format "[%s]" tpu-key-seq))
190 (cond ((not (equal tpu-key tpu-return)) 190 (unless (equal tpu-key tpu-return)
191 (set-buffer "Keys") 191 (set-buffer "Keys")
192 (insert (format"(define-key tpu-global-map %s %s)\n" tpu-key func)) 192 (insert (format"(define-key tpu-global-map %s %s)\n" tpu-key func))
193 (set-buffer "Gold-Keys") 193 (set-buffer "Gold-Keys")
194 (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func)) 194 (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func))))
195 (set-buffer "Directions")))) 195 (set-buffer "Directions")
196 tpu-key) 196 tpu-key)
197 197
198 (set-buffer "Keys") 198 (set-buffer "Keys")
199 (insert " 199 (insert "
200 ;; Arrows 200 ;; Arrows
201 ;; 201 ;;