aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-11-24 22:24:33 +0000
committerRichard M. Stallman1995-11-24 22:24:33 +0000
commit954080b438d53cde505a5fdb9bc3e972bd88510e (patch)
treee7bdbff2a20b82413d7cb37782102fbbcae92476
parent32168d16fffc1a6d316270589153dddfb944522a (diff)
downloademacs-954080b438d53cde505a5fdb9bc3e972bd88510e.tar.gz
emacs-954080b438d53cde505a5fdb9bc3e972bd88510e.zip
(ediff-intersect-directories): Quote symbols starting with `:'.
-rw-r--r--lisp/ediff-mult.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 1a74d9aaa9f..f8a0c0912f6 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -314,7 +314,7 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
314 (setq lis1 (delete "." lis1) 314 (setq lis1 (delete "." lis1)
315 lis1 (delete ".." lis1)) 315 lis1 (delete ".." lis1))
316 316
317 (setq common (intersection lis1 lis2 :test comparison-func)) 317 (setq common (intersection lis1 lis2 ':test comparison-func))
318 ;; get rid of files that are directories in dir1 but not dir2 318 ;; get rid of files that are directories in dir1 but not dir2
319 (mapcar (function (lambda (elt) 319 (mapcar (function (lambda (elt)
320 (if (Xor (file-directory-p (concat auxdir1 elt)) 320 (if (Xor (file-directory-p (concat auxdir1 elt))
@@ -322,7 +322,7 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
322 (setq common (delq elt common))))) 322 (setq common (delq elt common)))))
323 common) 323 common)
324 ;; intersect with the third dir 324 ;; intersect with the third dir
325 (if lis3 (setq common (intersection common lis3 :test comparison-func))) 325 (if lis3 (setq common (intersection common lis3 ':test comparison-func)))
326 (if (ediff-comparison-metajob3 jobname) 326 (if (ediff-comparison-metajob3 jobname)
327 (mapcar (function (lambda (elt) 327 (mapcar (function (lambda (elt)
328 (if (Xor (file-directory-p (concat auxdir1 elt)) 328 (if (Xor (file-directory-p (concat auxdir1 elt))
@@ -335,11 +335,11 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
335 335
336 ;; compute difference list 336 ;; compute difference list
337 (setq difflist (set-difference 337 (setq difflist (set-difference
338 (union (union lis1 lis2 :test comparison-func) 338 (union (union lis1 lis2 ':test comparison-func)
339 lis3 339 lis3
340 :test comparison-func) 340 ':test comparison-func)
341 common 341 common
342 :test comparison-func) 342 ':test comparison-func)
343 difflist (delete "." difflist) 343 difflist (delete "." difflist)
344 ;; copy-list needed because sort sorts it by side effects 344 ;; copy-list needed because sort sorts it by side effects
345 difflist (sort (copy-list (delete ".." difflist)) 'string-lessp)) 345 difflist (sort (copy-list (delete ".." difflist)) 'string-lessp))