aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-09-25 10:45:50 +0000
committerJuanma Barranquero2007-09-25 10:45:50 +0000
commit36ba07ae121da11a65fde4c218bfe0660c4d952e (patch)
treee70c83da34d98e83f22e41f6a3c31c3a93879139
parent6ba03ad99393fee3826c5e7bd9de1de426df2d88 (diff)
downloademacs-36ba07ae121da11a65fde4c218bfe0660c4d952e.tar.gz
emacs-36ba07ae121da11a65fde4c218bfe0660c4d952e.zip
(ediff-setup-fine-diff-regions): Use `mapc' rather than `mapcar'.
-rw-r--r--lisp/ediff-diff.el28
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index ec153fde625..451f87e142d 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -138,7 +138,7 @@ Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be
138toggled interactively using \\[ediff-toggle-ignore-case]. 138toggled interactively using \\[ediff-toggle-ignore-case].
139 139
140This variable is not for customizing the look of the differences produced by 140This variable is not for customizing the look of the differences produced by
141the command \\[ediff-show-diff-output]. Use the variable 141the command \\[ediff-show-diff-output]. Use the variable
142`ediff-custom-diff-options' for that." 142`ediff-custom-diff-options' for that."
143 :set 'ediff-reset-diff-options 143 :set 'ediff-reset-diff-options
144 :type 'string 144 :type 'string
@@ -348,20 +348,20 @@ one optional arguments, diff-number to refine.")
348 ;; fixup diff-list 348 ;; fixup diff-list
349 (if diff3-job 349 (if diff3-job
350 (cond ((not file-A) 350 (cond ((not file-A)
351 (mapcar (lambda (elt) 351 (mapc (lambda (elt)
352 (aset elt 0 nil) 352 (aset elt 0 nil)
353 (aset elt 1 nil)) 353 (aset elt 1 nil))
354 (cdr diff-list))) 354 (cdr diff-list)))
355 ((not file-B) 355 ((not file-B)
356 (mapcar (lambda (elt) 356 (mapc (lambda (elt)
357 (aset elt 2 nil) 357 (aset elt 2 nil)
358 (aset elt 3 nil)) 358 (aset elt 3 nil))
359 (cdr diff-list))) 359 (cdr diff-list)))
360 ((not file-C) 360 ((not file-C)
361 (mapcar (lambda (elt) 361 (mapc (lambda (elt)
362 (aset elt 4 nil) 362 (aset elt 4 nil)
363 (aset elt 5 nil)) 363 (aset elt 5 nil))
364 (cdr diff-list))) 364 (cdr diff-list)))
365 )) 365 ))
366 366
367 (ediff-convert-fine-diffs-to-overlays diff-list reg-num) 367 (ediff-convert-fine-diffs-to-overlays diff-list reg-num)
@@ -1533,7 +1533,7 @@ affects only files whose names match the expression."
1533 1533
1534(defun ediff-set-actual-diff-options () 1534(defun ediff-set-actual-diff-options ()
1535 (if ediff-ignore-case 1535 (if ediff-ignore-case
1536 (setq ediff-actual-diff-options 1536 (setq ediff-actual-diff-options
1537 (concat ediff-diff-options " " ediff-ignore-case-option) 1537 (concat ediff-diff-options " " ediff-ignore-case-option)
1538 ediff-actual-diff3-options 1538 ediff-actual-diff3-options
1539 (concat ediff-diff3-options " " ediff-ignore-case-option3)) 1539 (concat ediff-diff3-options " " ediff-ignore-case-option3))