Changeset 3945 for trunk/lisp/ediff-ptch.el

Timestamp:

11/02/05 00:34:59 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/ediff-ptch.el (modified) (2 diffs)

trunk/lisp/ediff-ptch.el

@@ -298 +298 @@
-                      (ediff-get-session-objA-name session-info))
-                     ;; base-dir1 is  the dir part of the 1st file in the patch
-
+
+
+
-                     ;; directory part of the 2nd file in the patch
-
+
+
+
-                     )
-
+
+
-                ;; these dirs lead to the actual files starting at the present
-                ;; directory. So, we don't strip these relative dirs from the
-                ;; file names. This is a heuristic intended to improve guessing
-                (unless (or (file-name-absolute-p base-dir1)
-
+
+
+
-                  (setq base-dir1 ""
-                        base-dir2 ""))
@@ -378 +385 @@
-                ))
-            ediff-patch-map)
-check for the shorter existing file in each pair and discard the other
-
+Check for the existing files in each pair and discard the nonexisting
+s. If both exist, ask the user.
-    (mapcar (lambda (session-info)
-              (let* ((file1 (car (ediff-get-session-objA-name session-info)))