Mercurial > emacs
changeset 84861:a2b33caadccd
(ediff-setup-fine-diff-regions): Use `mapc' rather than `mapcar'.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 25 Sep 2007 10:45:50 +0000 |
| parents | a853167e2059 |
| children | d0ab195e58b1 |
| files | lisp/ediff-diff.el |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Tue Sep 25 10:45:04 2007 +0000 +++ b/lisp/ediff-diff.el Tue Sep 25 10:45:50 2007 +0000 @@ -138,7 +138,7 @@ toggled interactively using \\[ediff-toggle-ignore-case]. This variable is not for customizing the look of the differences produced by -the command \\[ediff-show-diff-output]. Use the variable +the command \\[ediff-show-diff-output]. Use the variable `ediff-custom-diff-options' for that." :set 'ediff-reset-diff-options :type 'string @@ -348,20 +348,20 @@ ;; fixup diff-list (if diff3-job (cond ((not file-A) - (mapcar (lambda (elt) - (aset elt 0 nil) - (aset elt 1 nil)) - (cdr diff-list))) + (mapc (lambda (elt) + (aset elt 0 nil) + (aset elt 1 nil)) + (cdr diff-list))) ((not file-B) - (mapcar (lambda (elt) - (aset elt 2 nil) - (aset elt 3 nil)) - (cdr diff-list))) + (mapc (lambda (elt) + (aset elt 2 nil) + (aset elt 3 nil)) + (cdr diff-list))) ((not file-C) - (mapcar (lambda (elt) - (aset elt 4 nil) - (aset elt 5 nil)) - (cdr diff-list))) + (mapc (lambda (elt) + (aset elt 4 nil) + (aset elt 5 nil)) + (cdr diff-list))) )) (ediff-convert-fine-diffs-to-overlays diff-list reg-num) @@ -1533,7 +1533,7 @@ (defun ediff-set-actual-diff-options () (if ediff-ignore-case - (setq ediff-actual-diff-options + (setq ediff-actual-diff-options (concat ediff-diff-options " " ediff-ignore-case-option) ediff-actual-diff3-options (concat ediff-diff3-options " " ediff-ignore-case-option3))