[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v |
Date: |
Tue, 25 Sep 2007 10:46:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 07/09/25 10:46:46
Index: ediff-mult.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- ediff-mult.el 26 Jul 2007 05:26:21 -0000 1.53
+++ ediff-mult.el 25 Sep 2007 10:46:46 -0000 1.54
@@ -641,7 +641,7 @@
;; If file belongs to dir 1 only, the membership code is 2.
;; If it is in dir1 and dir3, then the membership code is 2*5=10;
;; if it is in dir1 and dir2, then the membership code is 2*3=6, etc.
- (mapcar (lambda (elt)
+ (mapc (lambda (elt)
(if (member (car elt) lis1)
(setcdr elt (* (cdr elt) ediff-membership-code1)))
(if (member (car elt) lis2)
@@ -941,7 +941,7 @@
;; was redrawn
(ediff-cond-compile-for-xemacs-or-emacs
(map-extents 'delete-extent) ; xemacs
- (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
+ (mapc 'delete-overlay (overlays-in 1 1)) ; emacs
)
(setq regexp (ediff-get-group-regexp meta-list)
@@ -1329,7 +1329,7 @@
;; copy file to directories where it doesn't exist, update
;; ediff-dir-difference-list and redisplay
- (mapcar
+ (mapc
(lambda (otherfile-struct)
(let ((otherfile (car otherfile-struct))
(file-mem-code (cdr otherfile-struct)))
@@ -1390,7 +1390,7 @@
;; was redrawn
(ediff-cond-compile-for-xemacs-or-emacs
(map-extents 'delete-extent) ; xemacs
- (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
+ (mapc 'delete-overlay (overlays-in 1 1)) ; emacs
)
(insert "This is a registry of all active Ediff sessions.
@@ -1410,7 +1410,7 @@
")
;; purge registry list from dead buffers
- (mapcar (lambda (elt)
+ (mapc (lambda (elt)
(if (not (ediff-buffer-live-p elt))
(setq ediff-session-registry
(delq elt ediff-session-registry))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v,
Juanma Barranquero <=