From: Glenn Morris <rgm@gnu.org>
Date: Sat, 13 Oct 2007 02:58:33 +0000 (+0000)
Subject: (idlwave-indent-line)
X-Git-Tag: emacs-pretest-23.0.90~10381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ffcfb276222faba1f0e6f2eff3d57fd1344e411;p=emacs.git

(idlwave-indent-line)
(idlwave-sintern-keyword-list, idlwave-scan-user-lib-files)
(idlwave-write-paths, idlwave-all-method-classes)
(idlwave-all-method-keyword-classes, idlwave-entry-keywords)
(idlwave-fix-keywords, idlwave-display-calling-sequence):
Use mapc rather than mapcar.
---

diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 1e600d6c456..646f6a80d8e 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -2827,10 +2827,10 @@ If the optional argument EXPAND is non-nil then the actions in
         ;; Before indenting, run action routines.
         ;;
         (if (and expand idlwave-do-actions)
-            (mapcar 'idlwave-do-action idlwave-indent-expand-table))
+            (mapc 'idlwave-do-action idlwave-indent-expand-table))
         ;;
         (if idlwave-do-actions
-            (mapcar 'idlwave-do-action idlwave-indent-action-table))
+            (mapc 'idlwave-do-action idlwave-indent-action-table))
         ;;
         ;; No longer expand abbrevs on the line.  The user can do this
         ;; manually using expand-region-abbrevs.
@@ -4242,9 +4242,9 @@ blank lines."
 
 (defun idlwave-sintern-keyword-list (kwd-list &optional set)
   "Sintern a set of keywords (file (key . link) (key2 . link2) ...)"
-  (mapcar (lambda(x)
-	    (setcar x (idlwave-sintern-keyword (car x) set)))
-	  (cdr kwd-list))
+  (mapc (lambda(x)
+	  (setcar x (idlwave-sintern-keyword (car x) set)))
+	(cdr kwd-list))
   kwd-list)
 
 (defun idlwave-sintern-rinfo-list (list &optional set default-dir)
@@ -5560,11 +5560,11 @@ directories and save the routine info.
     ;; Define the routine info list
     (insert "\n(setq idlwave-user-catalog-routines\n    '(")
     (let ((standard-output (current-buffer)))
-      (mapcar (lambda (x)
-		(insert "\n    ")
-		(prin1 x)
-		(goto-char (point-max)))
-	      idlwave-user-catalog-routines))
+      (mapc (lambda (x)
+	      (insert "\n    ")
+	      (prin1 x)
+	      (goto-char (point-max)))
+	    idlwave-user-catalog-routines))
     (insert (format "))\n\n;;; %s ends here\n"
 		    (file-name-nondirectory idlwave-user-catalog-file)))
     (goto-char (point-min))
@@ -5604,11 +5604,11 @@ directories and save the routine info.
     ;; Define the variable which contains a list of all scanned directories
     (insert "\n(setq idlwave-path-alist\n    '(")
     (let ((standard-output (current-buffer)))
-      (mapcar (lambda (x)
-		(insert "\n      ")
-		(prin1 x)
-		(goto-char (point-max)))
-	      idlwave-path-alist))
+      (mapc (lambda (x)
+	      (insert "\n      ")
+	      (prin1 x)
+	      (goto-char (point-max)))
+	    idlwave-path-alist))
     (insert "))\n")
     (save-buffer 0)
     (kill-buffer (current-buffer))))
@@ -6319,12 +6319,12 @@ When TYPE is not specified, both procedures and functions will be considered."
   (if (null method)
       (mapcar 'car (idlwave-class-alist))
     (let (rtn)
-      (mapcar (lambda (x)
-		(and (nth 2 x)
-		     (or (not type)
-			 (eq type (nth 1 x)))
-		     (push (nth 2 x) rtn)))
-	      (idlwave-all-assq method (idlwave-routines)))
+      (mapc (lambda (x)
+	      (and (nth 2 x)
+		   (or (not type)
+		       (eq type (nth 1 x)))
+		   (push (nth 2 x) rtn)))
+	    (idlwave-all-assq method (idlwave-routines)))
       (idlwave-uniquify rtn))))
 
 (defun idlwave-all-method-keyword-classes (method keyword &optional type)
@@ -6335,13 +6335,13 @@ When TYPE is not specified, both procedures and functions will be considered."
 	  (null keyword))
       nil
     (let (rtn)
-      (mapcar (lambda (x)
-		(and (nth 2 x)           ; non-nil class
-		     (or (not type)      ; correct or unspecified type
-			 (eq type (nth 1 x)))
-		     (assoc keyword (idlwave-entry-keywords x))
-		     (push (nth 2 x) rtn)))
-	      (idlwave-all-assq method (idlwave-routines)))
+      (mapc (lambda (x)
+	      (and (nth 2 x)		; non-nil class
+		   (or (not type)	; correct or unspecified type
+		       (eq type (nth 1 x)))
+		   (assoc keyword (idlwave-entry-keywords x))
+		   (push (nth 2 x) rtn)))
+	    (idlwave-all-assq method (idlwave-routines)))
       (idlwave-uniquify rtn))))
 
 (defun idlwave-members-only (list club)
@@ -7551,7 +7551,7 @@ The list is cached in `idlwave-class-info' for faster access."
 If RECORD-LINK is non-nil, the keyword text is copied and a text
 property indicating the link is added."
   (let (kwds)
-    (mapcar
+    (mapc
      (lambda (key-list)
        (let ((file (car key-list)))
 	 (mapcar (lambda (key-cons)
@@ -8277,8 +8277,8 @@ demand _EXTRA in the keyword list."
 		 (memq (nth 2 entry) super-classes)      ; an inherited class
 		 (eq (nth 1 entry) type)                 ; correct type
 		 (eq (car entry) name)                   ; correct name
-		 (mapcar (lambda (k) (add-to-list 'keywords k))
-			 (idlwave-entry-keywords entry 'do-link))))
+		 (mapc (lambda (k) (add-to-list 'keywords k))
+		       (idlwave-entry-keywords entry 'do-link))))
       (setq keywords (idlwave-uniquify keywords)))
 
     ;; Return the final list
@@ -8437,7 +8437,7 @@ If we do not know about MODULE, just return KEYWORD literally."
 	(if (null keywords)
 	    (insert " No keywords accepted.")
 	  (setq col 9)
-	  (mapcar
+	  (mapc
 	   (lambda (x)
 	     (if (>= (+ col 1 (length (car x)))
 		     (window-width))