Changeset 4098 for trunk/lisp/ediff-diff.el

Timestamp:

07/01/06 08:27:06 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/ediff-diff.el (modified) (13 diffs)

trunk/lisp/ediff-diff.el

@@ -66 +66 @@
-;; test if diff supports the --binary option
-(defsubst ediff-test-utility (diff-util option &optional files)
-
-
+
+
+
+
+
-
-(defun ediff-diff-mandatory-option (diff-util)
@@ -76 +79 @@
-                 (ediff-test-utility
-                  ediff-diff-program "--binary" (list file file)))
-
+ 
-           ((and (string= diff-util ediff-diff3-program)
-                 (ediff-test-utility
-                  ediff-diff3-program "--binary" (list file file file)))
-
+ 
-           (t ""))))
+
+
+;; must be before ediff-reset-diff-options to avoid compiler errors
+(fset 'ediff-set-actual-diff-options '(lambda () nil))
-
-;; make sure that mandatory options are added even if the user changes
@@ -90 +97 @@
-              ediff-diff-program
-            ediff-diff3-program))
-
-
-
-
-
-
+
+
+
-    ))
-
@@ -129 +133 @@
-(defcustom ediff-diff-options ""
-  "*Options to pass to `ediff-diff-program'.
- then a useful option is
-`-w', to ignore space, and `-i', to ignore case of letters
- toggled
-interactively using [ediff-toggle-ignore-case]
+
+ then a useful option is `-w', to ignore space
+
+ toggled interactively using \\[ediff-toggle-ignore-case].
-  :set 'ediff-reset-diff-options
-  :type 'string
@@ -154 +158 @@
-
-;; the actual options used in comparison
-""
+ediff-diff-options
-
-(defcustom ediff-custom-diff-program ediff-diff-program
@@ -177 +181 @@
-
-;; the actual options used in comparison
-""
+ediff-diff3-options
-
-(defcustom ediff-diff3-ok-lines-regexp
@@ -400 +404 @@
-        diff-list shift-A shift-B
-        )
-
+
-    ;; diff list contains word numbers, unless changed later
-    (setq diff-list (cons (if word-mode 'words 'points)
@@ -412 +416 @@
-              (ediff-overlay-start
-               (ediff-get-value-according-to-buffer-type 'B bounds))))
-
+
-    ;; reset point in buffers A/B/C
-    (ediff-with-current-buffer A-buffer
@@ -1271 +1275 @@
-                ;; In DOS, must synchronize because DOS doesn't have
-                ;; asynchronous processes.
-
+
+
+
-              ;; On other systems, do it asynchronously.
-              (setq proc (get-buffer-process buffer))
@@ -1327 +1333 @@
-(make-variable-buffer-local 'ediff-forward-word-function)
-
-
+
+
-  "*Characters constituting white space.
-These characters are ignored when differing regions are split into words.")
@@ -1441 +1448 @@
-  (if (and (not (file-directory-p f1))
-           (not (file-directory-p f2)))
-
-
-
-
-
+
+
+
+
+
+
+
-
-
@@ -1520 +1529 @@
-    (reverse result)))
-
+
+(defun ediff-set-actual-diff-options ()
+  (if ediff-ignore-case
+      (setq ediff-actual-diff-options 
+            (concat ediff-diff-options " " ediff-ignore-case-option)
+            ediff-actual-diff3-options
+            (concat ediff-diff3-options " " ediff-ignore-case-option3))
+    (setq ediff-actual-diff-options ediff-diff-options
+          ediff-actual-diff3-options ediff-diff3-options)
+    )
+  (setq-default ediff-actual-diff-options ediff-actual-diff-options
+                ediff-actual-diff3-options ediff-actual-diff3-options)
+  )
+
+
-;; Ignore case handling - some ideas from drew.adams@@oracle.com
-(defun ediff-toggle-ignore-case ()
@@ -1525 +1549 @@
-  (ediff-barf-if-not-control-buffer)
-  (setq ediff-ignore-case (not ediff-ignore-case))
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  (cond (ediff-merge-job
-         (message "Ignoring letter case is too dangerous in merge jobs"))