aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2014-04-14 11:21:12 +0900
committerYAMAMOTO Mitsuharu2014-04-14 11:21:12 +0900
commita73b9ddac85132aa0745734ee757e234298a6c7a (patch)
tree7bbbd54292887ef3dfde59d534724808e20388ee
parent13a5993b31ad0fb483272d8269d249d78ed01dd5 (diff)
downloademacs-a73b9ddac85132aa0745734ee757e234298a6c7a.tar.gz
emacs-a73b9ddac85132aa0745734ee757e234298a6c7a.zip
Fix application of dolist to a vector (Bug#17257).
* vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): Use mapc to loop over a vector.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/ediff-diff.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6099f31d636..6c0a099119d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-04-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
4 Use mapc to loop over a vector. (Bug#17257).
5
12014-04-13 Michael Albinus <michael.albinus@gmx.de> 62014-04-13 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous 8 * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index f429eb35d70..ed248fbf835 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -822,8 +822,9 @@ one optional arguments, diff-number to refine.")
822 (ediff-get-symbol-from-alist 822 (ediff-get-symbol-from-alist
823 buf-type ediff-fine-diff-face-alist) 823 buf-type ediff-fine-diff-face-alist)
824 ))) 824 )))
825 (dolist (overl fine-diff-vector) 825 (mapc (lambda (overl)
826 (ediff-set-overlay-face overl face)))) 826 (ediff-set-overlay-face overl face))
827 fine-diff-vector)))
827 828
828;; Set overlays over the regions that denote delimiters 829;; Set overlays over the regions that denote delimiters
829(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) 830(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)