Mercurial > emacs

diff lisp/ediff-vers.el @ 26585:3ec5a485d0ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Kifer <kifer@cs.stonybrook.edu>
date Thu, 25 Nov 1999 04:34:23 +0000
parents 4f315ca65976
children 6306740f6938
line wrap: on
line diff
--- a/lisp/ediff-vers.el	Wed Nov 24 20:44:56 1999 +0000
+++ b/lisp/ediff-vers.el	Thu Nov 25 04:34:23 1999 +0000
@@ -57,10 +57,9 @@
       (setq rev2buf (current-buffer)
 	    file2 (buffer-file-name)))
     (setq startup-hooks
-	  (cons (` (lambda ()
-		     (delete-file (, file1))
-		     (or (, (string= rev2 "")) (delete-file (, file2)))
-		     ))
+	  (cons `(lambda ()
+		   (delete-file ,file1)
+		   (or ,(string= rev2 "") (delete-file ,file2)))
 		startup-hooks))
     (ediff-buffers
      rev1buf rev2buf
@@ -165,14 +164,14 @@
 	  (setq ancestor-buf (current-buffer))))
     (setq startup-hooks 
 	  (cons 
-	   (` (lambda () 
-		(delete-file (, (buffer-file-name buf1)))
-		(or (, (string= rev2 ""))
-		    (delete-file (, (buffer-file-name buf2))))
-		(or (, (string= ancestor-rev ""))
-		    (, (not ancestor-rev))
-		    (delete-file (, (buffer-file-name ancestor-buf))))
-		))
+	   `(lambda () 
+	      (delete-file ,(buffer-file-name buf1))
+	      (or ,(string= rev2 "")
+		  (delete-file ,(buffer-file-name buf2)))
+	      (or ,(string= ancestor-rev "")
+		  ,(not ancestor-rev)
+		  (delete-file ,(buffer-file-name ancestor-buf)))
+	      )
 	   startup-hooks))
     (if ancestor-rev
 	(ediff-merge-buffers-with-ancestor