Mercurial > hg > xemacs-beta

changeset 4783:e29fcfd8df5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate most core code byte-compile warnings. 2009-12-18 Aidan Kehoe <kehoea@parhasard.net> * alist.el (modify-alist): * autoload.el (update-autoload-files, autoload-print-form): * bytecomp.el (batch-byte-compile-1) (byte-compile-multiple-value-call, byte-compile-funcall) (byte-compile-insert, byte-compile-concat, byte-compile-list) (byte-compile-normal-call, byte-compile-flush-pending): * cl-macs.el (letf): * cl.el: * disass.el (disassemble-1): * easy-mmode.el (easy-mmode-define-syntax): * faces.el (set-face-parent): * files.el (cd): * finder.el (finder-list-matches, finder-list-keywords) (finder-compile-keywords): * frame.el (frame-notice-user-settings) (frame-remove-geometry-props): * ldap.el (ldap-delete-entries, ldap-modify-entries) (ldap-add-entries): * loadhist.el (unload-feature): * map-ynp.el (map-y-or-n-p): * menubar-items.el (default-menubar): * mouse.el (default-mouse-track-next-move-rect) (default-mouse-track-next-move-rect) (default-mouse-track-cleanup-hook) (default-mouse-track-cleanup-extent): * mule/ethio-util.el (ethio-fidel-to-sera-buffer) (ethio-modify-vowel): * obsolete.el: * package-get.el (package-get-update-all): * package-ui.el (pui-list-packages) (pui-install-selected-packages, pui-install-selected-packages): * select.el (select-make-extent-for-selection) (dehilight-selection): * simple.el (clone-buffer): * term/tvi970.el: * term/wyse50.el: * unicode.el: (load-unicode-tables): * x-font-menu.el (fc-make-font-menu-entry) (x-reset-device-font-menus-xft): * x-misc.el (x-init-specifier-from-resources): Eliminate byte-compile warnings, with the exception of Stephen's various non-defined fontconfig functions, as I don't know if he plans to add them and is keeping the warnings around as a reminder. The warnings actually eliminated involve i) using mapcar instead of mapc where the result is discarded and ii) using a lambda quoted as data in a context where it is unequivocally used as a function.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 18 Dec 2009 17:49:43 +0000
parents 1523f1d28be1
children a67bfb29dd8b 8b50bee3c88c
files lisp/ChangeLog lisp/alist.el lisp/autoload.el lisp/bytecomp.el lisp/cl-macs.el lisp/cl.el lisp/disass.el lisp/easy-mmode.el lisp/faces.el lisp/files.el lisp/finder.el lisp/frame.el lisp/ldap.el lisp/loadhist.el lisp/map-ynp.el lisp/menubar-items.el lisp/mouse.el lisp/mule/ethio-util.el lisp/obsolete.el lisp/package-get.el lisp/package-ui.el lisp/select.el lisp/simple.el lisp/term/tvi970.el lisp/term/wyse50.el lisp/unicode.el lisp/x-font-menu.el lisp/x-misc.el
diffstat 28 files changed, 211 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/ChangeLog	Fri Dec 18 17:49:43 2009 +0000
@@ -1,3 +1,54 @@
+2009-12-18  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* alist.el (modify-alist): 
+	* autoload.el (update-autoload-files, autoload-print-form): 
+	* bytecomp.el (batch-byte-compile-1)
+	(byte-compile-multiple-value-call, byte-compile-funcall)
+	(byte-compile-insert, byte-compile-concat, byte-compile-list)
+	(byte-compile-normal-call, byte-compile-flush-pending): 
+	* cl-macs.el (letf): 
+	* cl.el:
+	* disass.el (disassemble-1): 
+	* easy-mmode.el (easy-mmode-define-syntax): 
+	* faces.el (set-face-parent): 
+	* files.el (cd): 
+	* finder.el (finder-list-matches, finder-list-keywords)
+	(finder-compile-keywords): 
+	* frame.el (frame-notice-user-settings)
+	(frame-remove-geometry-props): 
+	* ldap.el (ldap-delete-entries, ldap-modify-entries)
+	(ldap-add-entries): 
+	* loadhist.el (unload-feature): 
+	* map-ynp.el (map-y-or-n-p): 
+	* menubar-items.el (default-menubar): 
+	* mouse.el (default-mouse-track-next-move-rect)
+	(default-mouse-track-next-move-rect)
+	(default-mouse-track-cleanup-hook)
+	(default-mouse-track-cleanup-extent): 
+	* mule/ethio-util.el (ethio-fidel-to-sera-buffer)
+	(ethio-modify-vowel): 
+	* obsolete.el: 
+	* package-get.el (package-get-update-all): 
+	* package-ui.el (pui-list-packages)
+	(pui-install-selected-packages, pui-install-selected-packages): 
+	* select.el (select-make-extent-for-selection)
+	(dehilight-selection): 
+	* simple.el (clone-buffer): 
+	* term/tvi970.el: 
+	* term/wyse50.el: 
+	* unicode.el: 
+	(load-unicode-tables): 
+	* x-font-menu.el (fc-make-font-menu-entry)
+	(x-reset-device-font-menus-xft): 
+	* x-misc.el (x-init-specifier-from-resources): 
+	Eliminate byte-compile warnings, with the exception of Stephen's
+	various non-defined fontconfig functions, as I don't know if he
+	plans to add them and is keeping the warnings around as a
+	reminder. The warnings actually eliminated involve i) using mapcar
+	instead of mapc where the result is discarded and ii) using a
+	lambda quoted as data in a context where it is unequivocally used
+	as a function. 
+
 2009-12-17  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* mule/make-coding-system.el
--- a/lisp/alist.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/alist.el	Fri Dec 18 17:49:43 2009 +0000
@@ -89,11 +89,11 @@
 ;;;###autoload
 (defun modify-alist (modifier default)
   "Modify alist DEFAULT into alist MODIFIER."
-  (mapcar (function
-	   (lambda (as)
-	     (setq default (put-alist (car as)(cdr as) default))
-	     ))
-	  modifier)
+  (mapc
+   (function
+    (lambda (as)
+      (setq default (put-alist (car as)(cdr as) default))))
+   modifier)
   default)
 
 ;;;###autoload
--- a/lisp/autoload.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/autoload.el	Fri Dec 18 17:49:43 2009 +0000
@@ -767,10 +767,10 @@
 		  ;;#### FSF 21.2 (print-escape-nonascii t)
 		  (p (point outbuf))
 		  p2)
-	      (mapcar #'(lambda (elt)
-			  (prin1 elt outbuf)
-			  (princ " " outbuf))
-		      form)
+	      (mapc #'(lambda (elt)
+                        (prin1 elt outbuf)
+                        (princ " " outbuf))
+                    form)
 	      (with-current-buffer outbuf
 		(setq p2 (point-marker))
 		(goto-char p)
@@ -1021,8 +1021,8 @@
 		  (search-forward generate-autoload-section-trailer)
 		  (delete-region begin (point)))))
 	    ;; Update or create autoload sections for existing files.
-	    (mapcar 'update-file-autoloads
-		    (directory-files arg t "^[^=].*\\.\\(el\\|c\\)$")))))
+	    (mapc 'update-file-autoloads
+                  (directory-files arg t "^[^=].*\\.\\(el\\|c\\)$")))))
        ((file-exists-p arg)
 	(setq generated-autoload-file
 	      (or into-file (expand-file-name autoload-file-name
--- a/lisp/bytecomp.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/bytecomp.el	Fri Dec 18 17:49:43 2009 +0000
@@ -2071,7 +2071,7 @@
   (if byte-compile-output
       (let ((form (byte-compile-out-toplevel t 'file)))
 	(cond ((eq (car-safe form) 'progn)
-	       (mapcar 'byte-compile-output-file-form (cdr form)))
+	       (mapc 'byte-compile-output-file-form (cdr form)))
 	      (form
 	       (byte-compile-output-file-form form)))
 	(setq byte-compile-constants nil
@@ -2862,7 +2862,7 @@
   (if byte-compile-generate-call-tree
       (byte-compile-annotate-call-tree form))
   (byte-compile-push-constant (car form))
-  (mapcar 'byte-compile-form (cdr form)) ; wasteful, but faster.
+  (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster.
   (byte-compile-out 'byte-call (length (cdr form))))
 
 ;; kludge added to XEmacs to work around the bogosities of a nonlexical lisp.
@@ -3392,12 +3392,12 @@
      ((= nargs 0)
       (byte-compile-constant nil))
      ((< nargs 5)
-      (mapcar 'byte-compile-form args)
+      (mapc 'byte-compile-form args)
       (byte-compile-out
        (aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- nargs))
        0))
      ((< nargs 256)
-      (mapcar 'byte-compile-form args)
+      (mapc 'byte-compile-form args)
       (byte-compile-out 'byte-listN nargs))
      (t (byte-compile-normal-call form)))))
 
@@ -3407,14 +3407,14 @@
     ;; Concat of one arg is not a no-op if arg is not a string.
     (cond
      ((memq nargs '(2 3 4))
-      (mapcar 'byte-compile-form args)
+      (mapc 'byte-compile-form args)
       (byte-compile-out
        (aref [byte-concat2 byte-concat3 byte-concat4] (- nargs 2))
        0))
      ((eq nargs 0)
       (byte-compile-form ""))
      ((< nargs 256)
-      (mapcar 'byte-compile-form args)
+      (mapc 'byte-compile-form args)
       (byte-compile-out 'byte-concatN nargs))
      ((byte-compile-normal-call form)))))
 
@@ -3588,7 +3588,7 @@
   (cond ((null (cdr form))
 	 (byte-compile-constant nil))
 	((<= (length form) 256)
-	 (mapcar 'byte-compile-form (cdr form))
+	 (mapc 'byte-compile-form (cdr form))
 	 (if (cdr (cdr form))
 	     (byte-compile-out 'byte-insertN (length (cdr form)))
 	   (byte-compile-out 'byte-insert 0)))
@@ -3945,7 +3945,7 @@
     (setq for-effect nil)))
 
 (defun byte-compile-funcall (form)
-  (mapcar 'byte-compile-form (cdr form))
+  (mapc 'byte-compile-form (cdr form))
   (byte-compile-out 'byte-call (length (cdr (cdr form)))))
 
 
@@ -4148,7 +4148,7 @@
     ;; and pushes a new value, the specpdl_depth() at the time it was
     ;; called.
     (byte-compile-out 'byte-bind-multiple-value-limits 0)
-    (mapcar 'byte-compile-form (cdr form))
+    (mapc 'byte-compile-form (cdr form))
     ;; Most of the other code puts this sort of value in the program stream,
     ;; not pushing it on the stack.
     (byte-compile-push-constant (+ 3 (length form)))
@@ -4580,7 +4580,7 @@
      (if (fboundp 'display-error) ; XEmacs 19.8+
 	 (display-error err nil)
        (princ (or (get (car err) 'error-message) (car err)))
-       (mapcar #'(lambda (x) (princ " ") (prin1 x)) (cdr err)))
+       (mapc #'(lambda (x) (princ " ") (prin1 x)) (cdr err)))
      (princ "\n")
      nil)))
 
--- a/lisp/cl-macs.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/cl-macs.el	Fri Dec 18 17:49:43 2009 +0000
@@ -2637,8 +2637,7 @@
 			  (gensym "--letf-val--")))
                (syms (and (eq 'values (car place))
                           (gensym "--letf-syms--")))
-               (cursor (and syms (gensym "--letf-cursor--")))
-               (sym (and syms (gensym "--letf-sym--"))))
+               (cursor (and syms (gensym "--letf-cursor--"))))
 	  (setq lets (nconc (car method)
                             (cond
                              (syms
--- a/lisp/cl.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/cl.el	Fri Dec 18 17:49:43 2009 +0000
@@ -644,9 +644,9 @@
 ;; XEmacs change: omit the autoload rules; we handle those a different way
 
 ;;; Define data for indentation and edebug.
-(mapcar
+(mapc-internal
  #'(lambda (entry)
-     (mapcar
+     (mapc-internal
       #'(lambda (func)
 	  (put func 'lisp-indent-function (nth 1 entry))
 	  (put func 'lisp-indent-hook (nth 1 entry))
--- a/lisp/disass.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/disass.el	Fri Dec 18 17:49:43 2009 +0000
@@ -247,7 +247,7 @@
 			 (+ indent disassemble-recursive-indent)))
 		       ((eq (car-safe (car-safe arg)) 'byte-code)
 			(insert "(<byte code>...)\n")
-			(mapcar		;recurse on list of byte-code objects
+			(mapc		;recurse on list of byte-code objects
 			 #'(lambda (obj)
 			     (disassemble-1
 			      obj
--- a/lisp/easy-mmode.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/easy-mmode.el	Fri Dec 18 17:49:43 2009 +0000
@@ -525,7 +525,7 @@
       (let ((char (car cs))
 	    (syntax (cdr cs)))
 	(if (sequencep char)
-	    (mapcar (lambda (c) (modify-syntax-entry c syntax st)) char)
+	    (mapc (lambda (c) (modify-syntax-entry c syntax st)) char)
 	  (modify-syntax-entry char syntax st))))
     ;; XEmacs change: we do not have set-char-table-parent
     (if parent (derived-mode-merge-syntax-tables
--- a/lisp/faces.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/faces.el	Fri Dec 18 17:49:43 2009 +0000
@@ -407,11 +407,11 @@
   "Set the parent of FACE to PARENT, for all properties.
 This makes all properties of FACE inherit from PARENT."
   (setq parent (get-face parent))
-  (mapcar (lambda (x)
-	    (set-face-property face x (vector parent) locale tag-set
-			       how-to-add))
-	  (set-difference built-in-face-specifiers
-			  '(display-table background-pixmap inherit)))
+  (mapc (lambda (x)
+          (set-face-property face x (vector parent) locale tag-set
+                             how-to-add))
+        (set-difference built-in-face-specifiers
+                        '(display-table background-pixmap inherit)))
   (set-face-background-pixmap face (vector 'inherit ':face parent)
 			      locale tag-set how-to-add)
   nil)
--- a/lisp/files.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/files.el	Fri Dec 18 17:49:43 2009 +0000
@@ -607,13 +607,13 @@
 			       (mapcar #'file-name-as-directory trypath))
 			  (list (file-name-as-directory "")))))
       (or (catch 'found
-	    (mapcar #'(lambda (x)
-			(let ((f (expand-file-name (concat x dir))))
-			  (if (file-directory-p f)
-			      (progn
-				(cd-absolute f)
-				(throw 'found t)))))
-		    cd-path)
+	    (mapc #'(lambda (x)
+                      (let ((f (expand-file-name (concat x dir))))
+                        (if (file-directory-p f)
+                            (progn
+                              (cd-absolute f)
+                              (throw 'found t)))))
+                  cd-path)
 	    nil)
 	  ;; jwz: give a better error message to those of us with the
 	  ;; good taste not to use a kludge like $CDPATH.
--- a/lisp/finder.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/finder.el	Fri Dec 18 17:49:43 2009 +0000
@@ -172,7 +172,7 @@
       (insert ";; Don't edit this file.  It's generated by finder.el\n\n")
       (insert ";;; Code:\n")
       (insert "\n(defconst finder-package-info '(\n")
-      (mapcar
+      (mapc
        (lambda (d)
 	 (mapcar
 	  (lambda (f) 
@@ -243,7 +243,7 @@
   (interactive)
   (setq buffer-read-only nil)
   (erase-buffer)
-  (mapcar
+  (mapc
    (lambda (assoc)
      (let ((keyword (car assoc)))
        (insert (symbol-name keyword))
@@ -266,7 +266,7 @@
     (insert
      "The following packages match the keyword `" key "':\n\n")
     (setq finder-headmark (point))
-    (mapcar
+    (mapc
      (lambda (x)
        (if (memq id (car (cdr (cdr x))))
 	   (progn
--- a/lisp/frame.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/frame.el	Fri Dec 18 17:49:43 2009 +0000
@@ -499,7 +499,7 @@
 
 		      ;; Wean the frames using frame-initial-frame as
 		      ;; their minibuffer frame.
-		      (mapcar
+		      (mapc
 		       #'(lambda (frame)
 			   (set-frame-property frame 'minibuffer
 					       new-minibuffer))
@@ -750,15 +750,15 @@
 Emacs uses this to avoid overriding explicit moves and resizings from
 the user during startup."
   (setq plist (canonicalize-lax-plist (copy-sequence plist)))
-  (mapcar #'(lambda (property)
-	      (if (lax-plist-member plist property)
-		  (progn
-		    (setq frame-initial-geometry-arguments
-			  (cons property
-				(cons (lax-plist-get plist property)
-				      frame-initial-geometry-arguments)))
-		    (setq plist (lax-plist-remprop plist property)))))
-	  '(height width top left user-size user-position))
+  (mapc #'(lambda (property)
+            (if (lax-plist-member plist property)
+                (progn
+                  (setq frame-initial-geometry-arguments
+                        (cons property
+                              (cons (lax-plist-get plist property)
+                                    frame-initial-geometry-arguments)))
+                  (setq plist (lax-plist-remprop plist property)))))
+        '(height width top left user-size user-position))
   plist)
 
 ;; XEmacs change: Emacs has focus-follows-mouse here, which lets them
--- a/lisp/ldap.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/ldap.el	Fri Dec 18 17:49:43 2009 +0000
@@ -533,13 +533,13 @@
     (setq ldap (ldap-open host host-plist))
     (if ldap-verbose
 	(message "Adding LDAP entries..."))
-    (mapcar (function
-	     (lambda (thisentry)
-	       (ldap-add ldap (car thisentry) (cdr thisentry))
-	       (if ldap-verbose
-		   (message "%d added" i))
-	       (setq i (1+ i))))
-	    entries)
+    (mapc (function
+           (lambda (thisentry)
+             (ldap-add ldap (car thisentry) (cdr thisentry))
+             (if ldap-verbose
+                 (message "%d added" i))
+             (setq i (1+ i))))
+          entries)
     (ldap-close ldap)))
 
 
@@ -549,7 +549,7 @@
   (DN MOD-SPEC1 MOD-SPEC2 ...) where DN is the distinguished name of
 the entry to modify, the following are modification specifications.
 A modification specification is itself a list of the form
-(MOD-OP ATTR VALUE1 VALUE2 ...) MOD-OP and ATTR are mandatory,
+\(MOD-OP ATTR VALUE1 VALUE2 ...) MOD-OP and ATTR are mandatory,
 VALUEs are optional depending on MOD-OP.
 MOD-OP is the type of modification, one of the symbols `add', `delete'
 or `replace'. ATTR is the LDAP attribute type to modify.
@@ -573,13 +573,13 @@
     (setq ldap (ldap-open host host-plist))
     (if ldap-verbose
 	(message "Modifying LDAP entries..."))
-    (mapcar (function
-	     (lambda (thisentry)
-	       (ldap-modify ldap (car thisentry) (cdr thisentry))
-	       (if ldap-verbose
-		   (message "%d modified" i))
-	       (setq i (1+ i))))
-	    entry-mods)
+    (mapc (function
+           (lambda (thisentry)
+             (ldap-modify ldap (car thisentry) (cdr thisentry))
+             (if ldap-verbose
+                 (message "%d modified" i))
+             (setq i (1+ i))))
+          entry-mods)
     (ldap-close ldap)))
 
 
@@ -608,13 +608,13 @@
 	(let ((i 1))
 	  (if ldap-verbose
 	      (message "Deleting LDAP entries..."))
-	  (mapcar (function
-		   (lambda (thisdn)
-		     (ldap-delete ldap thisdn)
-		     (if ldap-verbose
-			 (message "%d deleted" i))
-		     (setq i (1+ i))))
-		  dn))
+	  (mapc (function
+                 (lambda (thisdn)
+                   (ldap-delete ldap thisdn)
+                   (if ldap-verbose
+                       (message "%d deleted" i))
+                   (setq i (1+ i))))
+                dn))
       (if ldap-verbose
 	  (message "Deleting LDAP entry..."))
       (ldap-delete ldap dn))
--- a/lisp/loadhist.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/loadhist.el	Fri Dec 18 17:49:43 2009 +0000
@@ -177,7 +177,7 @@
     (flet ((reset-aload (x)
 	     (let ((aload (get x 'autoload)))
 	       (if aload (fset x (cons 'autoload aload))))))
-    (mapcar
+    (mapc
      #'(lambda (x)
 	 (cond ((stringp x) nil)
 	       ((consp x)
--- a/lisp/map-ynp.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/map-ynp.el	Fri Dec 18 17:49:43 2009 +0000
@@ -141,14 +141,14 @@
 	    ;; its definition.
 	    ;; XEmacs
 	    map (let ((foomap (make-sparse-keymap)))
-		  (mapcar #'(lambda (elt)
-			      (define-key
-				foomap
-				(if (characterp (car elt))
-				    (char-to-string (car elt))
-				  (car elt))
-				(vector (nth 1 elt))))
-			  action-alist)
+		  (mapc #'(lambda (elt)
+                            (define-key
+                              foomap
+                              (if (characterp (car elt))
+                                  (char-to-string (car elt))
+                                (car elt))
+                              (vector (nth 1 elt))))
+                        action-alist)
 		  (set-keymap-parents foomap (list query-replace-map))
 		  foomap)))
     (unwind-protect
--- a/lisp/menubar-items.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/menubar-items.el	Fri Dec 18 17:49:43 2009 +0000
@@ -247,7 +247,7 @@
 		      (submenu-generate-accelerator-spec
 		       (mapcar #'(lambda (bmk)
 				   `[,bmk (bookmark-jump ',bmk)])
-			       (bookmark-all-names)))))
+			       (declare-fboundp (bookmark-all-names))))))
 		 (append menu '("---") items)))))
       "---"
       ["Insert %_Contents" bookmark-menu-insert
--- a/lisp/mouse.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/mouse.el	Fri Dec 18 17:49:43 2009 +0000
@@ -1003,7 +1003,7 @@
       (let ((tmp start)) (setq start end end tmp)))
   (cond
    ((= start end)		; never delete the last remaining extent
-    (mapcar 'delete-extent (cdr extents))
+    (mapc 'delete-extent (cdr extents))
     (setcdr extents nil)
     (set-extent-endpoints (car extents) start start))
    (t
@@ -1049,7 +1049,7 @@
 	    (setq last rest
 		  rest (cdr rest)))
 	  (cond (rest
-		 (mapcar 'delete-extent rest)
+		 (mapc 'delete-extent rest)
 		 (setcdr last nil))
 		((not (eobp))
 		 (while (not (eobp))
@@ -1320,7 +1320,7 @@
 			 (set-extent-face e 'primary-selection)))))
       (add-hook 'pre-command-hook 'default-mouse-track-cleanup-extents-hook)
       (if (consp extent)		; rectangle-p
-	  (mapcar func extent)
+	  (mapc func extent)
 	(if extent
 	    (funcall func extent)))))
   t)
@@ -1334,10 +1334,10 @@
     (if (consp extent)
 	(if (funcall dead-func extent)
 	    (let (newval)
-	      (mapcar (function (lambda (x)
-				  (if (not (funcall dead-func x))
-				      (setq newval (cons x newval)))))
-		      extent)
+	      (mapc (function (lambda (x)
+                                (if (not (funcall dead-func x))
+                                    (setq newval (cons x newval)))))
+                    extent)
 	      (setq default-mouse-track-extent (nreverse newval))))
       (if (funcall dead-func extent)
 	  (setq default-mouse-track-extent nil)))))
--- a/lisp/mule/ethio-util.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/mule/ethio-util.el	Fri Dec 18 17:49:43 2009 +0000
@@ -1055,7 +1055,7 @@
       (aset ethio-fidel-to-sera-map 359 "`?")
       (aset ethio-fidel-to-sera-map 463 "?"))
 
-    (mapcar
+    (mapc
      #'(lambda (x)
          (aset (aref ethio-fidel-to-sera-map x)
                2
@@ -1300,7 +1300,10 @@
 
     (cond
      ;; in case of gemination
-     ((eq (char-charset ch) 'composition)
+     ;; XEmacs change; the (and nil ...) eliminates a warning about using
+     ;; decompose-composite-char. The name of the composite charset is
+     ;; composite, anyway, not composition; and it has never worked. 
+     ((and nil (eq (char-charset ch) 'composition))
       (setq ch (string-to-char (decompose-composite-char ch))
 	    composite t))
      ;; neither gemination nor fidel
--- a/lisp/obsolete.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/obsolete.el	Fri Dec 18 17:49:43 2009 +0000
@@ -243,7 +243,7 @@
   ;; Don't provide the last three functions unless the menubar feature is
   ;; available. This approach (with #'unintern) avoids warnings about lost
   ;; docstrings since make-docfile doesn't parse bytecode.
-  (mapcar #'unintern '(add-menu-item add-menu package-get-download-menu)))
+  (mapc #'unintern '(add-menu-item add-menu package-get-download-menu)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; minibuffer
 
--- a/lisp/package-get.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/package-get.el	Fri Dec 18 17:49:43 2009 +0000
@@ -667,10 +667,10 @@
   (package-get-require-base t)
   ;; Load a fresh copy
   (catch 'exit
-    (mapcar (lambda (pkg)
-	      (if (not (package-get (car pkg) nil 'never))
-		  (throw 'exit nil)))		;; Bail out if error detected
-	    packages-package-list))
+    (mapc (lambda (pkg)
+            (if (not (package-get (car pkg) nil 'never))
+                (throw 'exit nil)))		;; Bail out if error detected
+          packages-package-list))
   (package-net-update-installed-db))
 
 ;;;###autoload
--- a/lisp/package-ui.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/package-ui.el	Fri Dec 18 17:49:43 2009 +0000
@@ -350,10 +350,10 @@
 	(kill-buffer tmpbuf))	    
       (when do-delete
 	(message "Deleting selected packages ...") (sit-for 0)
-	(mapcar (lambda (pkg)
-		  (package-admin-delete-binary-package
-		   pkg (package-admin-get-install-dir pkg)))
-		(nreverse pui-deleted-packages))
+	(mapc (lambda (pkg)
+                (package-admin-delete-binary-package
+                 pkg (package-admin-get-install-dir pkg)))
+              (nreverse pui-deleted-packages))
 	(message "Packages deleted"))))
 	 
   (let ((tmpbuf "*Packages-To-Install*") 
@@ -385,11 +385,11 @@
 		  (erase-buffer package-admin-temp-buffer))
 		(message "Installing selected packages ...") (sit-for 0)
 		(if (catch 'done
-		      (mapcar (lambda (pkg)
-				(if (not (package-get pkg nil nil
-                                                      pui-package-install-dest-dir))
-				    (throw 'done nil)))
-			      (nreverse pui-selected-packages))
+		      (mapc (lambda (pkg)
+                              (if (not (package-get pkg nil nil
+                                                    pui-package-install-dest-dir))
+                                  (throw 'done nil)))
+                            (nreverse pui-selected-packages))
 		      t)
 		    (progn
 		      (pui-list-packages)
@@ -615,7 +615,7 @@
 "))
     (insert sep-string)
     (setq start (point))
-    (mapcar
+    (mapc
      #'(lambda (pkg)
 	 (let (pkg-sym info version desc
 		       b e extent current-vers disp)
--- a/lisp/select.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/select.el	Fri Dec 18 17:49:43 2009 +0000
@@ -231,7 +231,7 @@
 	 (if primary-selection-extent
 	     (let ((inhibit-quit t))
 	       (if (consp primary-selection-extent)
-		   (mapcar 'delete-extent primary-selection-extent)
+		   (mapc 'delete-extent primary-selection-extent)
 		 (delete-extent primary-selection-extent))
 	       (setq primary-selection-extent nil)))
 	 (if zmacs-regions (zmacs-deactivate-region)))
@@ -239,7 +239,7 @@
 	 (if secondary-selection-extent
 	     (let ((inhibit-quit t))
 	       (if (consp secondary-selection-extent)
-		   (mapcar 'delete-extent secondary-selection-extent)
+		   (mapc 'delete-extent secondary-selection-extent)
 		 (delete-extent secondary-selection-extent))
 	       (setq secondary-selection-extent nil)))))
   nil)
@@ -324,7 +324,7 @@
 	nil
       (condition-case ()
 	  (if (listp previous-extent)
-	      (mapcar 'delete-extent previous-extent)
+	      (mapc 'delete-extent previous-extent)
 	    (delete-extent previous-extent))
 	(error nil)))
 
--- a/lisp/simple.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/simple.el	Fri Dec 18 17:49:43 2009 +0000
@@ -3716,13 +3716,13 @@
       (funcall mode)
 
       ;; Set up other local variables.
-      (mapcar (lambda (v)
-		(condition-case ()	;in case var is read-only
-		    (if (symbolp v)
-			(makunbound v)
-		      (set (make-local-variable (car v)) (cdr v)))
-		  (error nil)))
-	      lvars)
+      (mapc (lambda (v)
+              (condition-case ()	;in case var is read-only
+                  (if (symbolp v)
+                      (makunbound v)
+                    (set (make-local-variable (car v)) (cdr v)))
+                (error nil)))
+            lvars)
 
       ;; Run any hooks (typically set up by the major mode
       ;; for cloning to work properly).
--- a/lisp/term/tvi970.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/term/tvi970.el	Fri Dec 18 17:49:43 2009 +0000
@@ -34,7 +34,7 @@
 ;;    (define-key function-key-map "\eO" (make-keymap)))
 
 ;; Miscellaneous keys
-(mapcar (function (lambda (key-binding)
+(mapc   (function (lambda (key-binding)
 		    (define-key function-key-map
 		      (car key-binding) (nth 1 key-binding))))
 	'(
--- a/lisp/term/wyse50.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/term/wyse50.el	Fri Dec 18 17:49:43 2009 +0000
@@ -37,7 +37,7 @@
 ;;; Code:
 
 (define-key function-key-map "\C-a" (make-keymap))
-(mapcar (function (lambda (key-definition)
+(mapc   (function (lambda (key-definition)
 		    (define-key function-key-map
 		      (car key-definition) (nth 1 key-definition))))
 	'(
@@ -116,7 +116,7 @@
 M-r	M-x move-to-window-line, Funct up-arrow or down-arrow are similar
 "
   (interactive)
-  (mapcar (function (lambda (key-definition)
+  (mapc   (function (lambda (key-definition)
 		      (global-set-key (car key-definition)
 				      (nth 1 key-definition))))
 	  ;; By unsetting C-a and then binding it to a prefix, we
--- a/lisp/unicode.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/unicode.el	Fri Dec 18 17:49:43 2009 +0000
@@ -135,14 +135,14 @@
 	    ("lao.txt" lao)
 	    )
 	   )))
-    (mapcar #'(lambda (tables)
-		(let ((undir
-		       (expand-file-name (car tables) data-directory)))
-		  (mapcar #'(lambda (args)
-			      (apply 'load-unicode-mapping-table
-				     (expand-file-name (car args) undir)
-				     (cdr args)))
-			  (cdr tables))))
+    (mapc #'(lambda (tables)
+              (let ((undir
+                     (expand-file-name (car tables) data-directory)))
+                (mapc #'(lambda (args)
+                          (apply 'load-unicode-mapping-table
+                                 (expand-file-name (car args) undir)
+                                 (cdr args)))
+                      (cdr tables))))
 	    parse-args)
     ;; The default-unicode-precedence-list. We set this here to default to
     ;; *not* mapping various European characters to East Asian characters;
@@ -619,11 +619,11 @@
   ;; make-docfile.c pick up symbol and function documentation correctly. An
   ;; alternative approach would be to fix make-docfile.c to be able to read
   ;; Lisp.
-  (mapcar #'unintern
-          '(ccl-encode-to-ucs-2 unicode-error-default-translation-table
-            unicode-invalid-regexp-range frob-unicode-errors-region
-            unicode-error-translate-region unicode-query-coding-region
-            unicode-query-coding-skip-chars-arg)))
+  (mapc #'unintern
+        '(ccl-encode-to-ucs-2 unicode-error-default-translation-table
+          unicode-invalid-regexp-range frob-unicode-errors-region
+          unicode-error-translate-region unicode-query-coding-region
+          unicode-query-coding-skip-chars-arg)))
 
 ;; #### UTF-7 is not yet implemented, and it's tricky to do.  There's
 ;; an implementation in appendix A.1 of the Unicode Standard, Version
--- a/lisp/x-font-menu.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/x-font-menu.el	Fri Dec 18 17:49:43 2009 +0000
@@ -119,14 +119,14 @@
     (vector
      family
      (mapcar 
-      '(lambda (weight-symbol) 
-	 (let ((pair (assoc weight-symbol
-			    '((:light "Light")
-			      (:medium "Medium")
-			      (:demibold "Demibold")
-			      (:bold "Bold")
-			      (:black "Black")))))
-	   (if pair (cadr pair))))
+      (lambda (weight-symbol) 
+        (let ((pair (assoc weight-symbol
+                           '((:light "Light")
+                             (:medium "Medium")
+                             (:demibold "Demibold")
+                             (:bold "Bold")
+                             (:black "Black")))))
+          (if pair (cadr pair))))
       weights)
      '(0)
      nil)))
@@ -140,24 +140,24 @@
 	  (vector
 	   (mapcar 'fc-make-font-menu-entry families)
 	   (mapcar 
-	    '(lambda (family)
-	       (vector family `(font-menu-set-font ,family nil nil)
-		       :style 'radio :active nil :selected nil))
+            (lambda (family)
+              (vector family `(font-menu-set-font ,family nil nil)
+                      :style 'radio :active nil :selected nil))
 	    families)
 	   (mapcar
-	    '(lambda (size)
-	       (vector
-		(number-to-string size)
-		`(font-menu-set-font nil nil ,size)
-		:style 'radio :active nil :selected nil))
+	    (lambda (size)
+              (vector
+               (number-to-string size)
+               `(font-menu-set-font nil nil ,size)
+               :style 'radio :active nil :selected nil))
 	    ;; common size list in decipoints, fontconfig wants points
 	    (mapcar (lambda (x) (/ x 10)) font-menu-common-sizes))
 	   (mapcar
-	    '(lambda (weight)
-	       (vector
-		weight
-		`(font-menu-set-font nil ,weight nil)
-		:style 'radio :active nil :selected nil))
+	    (lambda (weight)
+              (vector
+               weight
+               `(font-menu-set-font nil ,weight nil)
+               :style 'radio :active nil :selected nil))
 	    '("Light" "Medium" "Demibold" "Bold" "Black"))))
 	 ;; get or initialize the entry for device
 	 (dev-cache (or (assq device device-fonts-cache)
--- a/lisp/x-misc.el	Fri Dec 18 10:09:54 2009 -0700
+++ b/lisp/x-misc.el	Fri Dec 18 17:49:43 2009 +0000
@@ -60,9 +60,9 @@
 has a spec in LOCALE, nothing is done.) Finally, if LOCALE is 'global,
 a check is done for bogus resource specifications."
   (if (eq locale 'global)
-      (mapcar #'(lambda (x)
-		  (x-bogosity-check-resource (car x) (cdr x) type))
-	      resource-list))
+      (mapc #'(lambda (x)
+                (x-bogosity-check-resource (car x) (cdr x) type))
+            resource-list))
   (if (not (specifier-spec-list specifier locale))
       (catch 'done
 	(while resource-list