# HG changeset patch # User Dave Love # Date 969219853 0 # Node ID a8e0d20f00433c9e98be574b5ec8b8925fa68005 # Parent 7661306a5b4e9b3dc6e62b5813c9f0cbf726f2b1 Replace mapcar with mapc in several places. diff -r 7661306a5b4e -r a8e0d20f0043 lisp/tmm.el --- a/lisp/tmm.el Sun Sep 17 19:29:19 2000 +0000 +++ b/lisp/tmm.el Sun Sep 17 19:44:13 2000 +0000 @@ -164,10 +164,10 @@ ;; tmm-km-list is an alist of (STRING . MEANING). ;; It has no other elements. ;; The order of elements in tmm-km-list is the order of the menu bar. - (mapcar (function (lambda (elt) - (if (stringp elt) - (setq gl-str elt) - (and (listp elt) (tmm-get-keymap elt not-menu))))) + (mapc (lambda (elt) + (if (stringp elt) + (setq gl-str elt) + (and (listp elt) (tmm-get-keymap elt not-menu)))) menu) ;; Choose an element of tmm-km-list; put it in choice. (if (and not-menu (= 1 (length tmm-km-list))) @@ -299,15 +299,14 @@ (defun tmm-define-keys (minibuffer) (let ((map (make-sparse-keymap))) (suppress-keymap map t) - (mapcar - (function - (lambda (c) - (if (listp tmm-shortcut-style) - (define-key map (char-to-string c) 'tmm-shortcut) - ;; only one kind of letters are shortcuts, so map both upcase and - ;; downcase input to the same - (define-key map (char-to-string (downcase c)) 'tmm-shortcut) - (define-key map (char-to-string (upcase c)) 'tmm-shortcut)))) + (mapc + (lambda (c) + (if (listp tmm-shortcut-style) + (define-key map (char-to-string c) 'tmm-shortcut) + ;; only one kind of letters are shortcuts, so map both upcase and + ;; downcase input to the same + (define-key map (char-to-string (downcase c)) 'tmm-shortcut) + (define-key map (char-to-string (upcase c)) 'tmm-shortcut))) tmm-short-cuts) (if minibuffer (progn @@ -375,13 +374,13 @@ (choose-completion)) ;; In minibuffer (delete-region (minibuffer-prompt-end) (point-max)) - (mapcar (lambda (elt) - (if (string= - (substring (car elt) 0 - (min (1+ (length tmm-mid-prompt)) - (length (car elt)))) - (concat (char-to-string c) tmm-mid-prompt)) - (setq s (car elt)))) + (mapc (lambda (elt) + (if (string= + (substring (car elt) 0 + (min (1+ (length tmm-mid-prompt)) + (length (car elt)))) + (concat (char-to-string c) tmm-mid-prompt)) + (setq s (car elt)))) tmm-km-list) (insert s) (exit-minibuffer))))) @@ -489,13 +488,13 @@ (setq allbind (cons (local-key-binding keyseq) allbind)) (setq allbind (cons (global-key-binding keyseq) allbind)) ;; Merge all the elements of ALLBIND into one keymap. - (mapcar (lambda (in) - (if (and (symbolp in) (keymapp in)) - (setq in (symbol-function in))) - (and in (keymapp in) - (if (keymapp bind) - (setq bind (nconc bind (copy-sequence (cdr in)))) - (setq bind (copy-sequence in))))) + (mapc (lambda (in) + (if (and (symbolp in) (keymapp in)) + (setq in (symbol-function in))) + (and in (keymapp in) + (if (keymapp bind) + (setq bind (nconc bind (copy-sequence (cdr in)))) + (setq bind (copy-sequence in))))) allbind) ;; Return that keymap. bind))))