[elpa] scratch/add-vdiff 9b3ffb0 150/258: Don't distiguish exit code 0 from 1

[Justin Burkett]

branch: scratch/add-vdiff
commit 9b3ffb01ac141a528968497f60b2e18b35147374
Author: justbur <address@hidden>
Commit: justbur <address@hidden>

    Don't distiguish exit code 0 from 1
    
    The manual says 1 indicates changes but I'm sometimes getting 0 from
    diff3 when there are changes
---
 vdiff.el | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 6327cd3..697d765 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -495,22 +495,22 @@ because those are handled differently.")
   "This is the sentinel for `vdiff-refresh'. It does the job of
 parsing the diff output and triggering the overlay updates."
   (unless vdiff--inhibit-diff-update
-    (let ((parse-func (if vdiff--3way
+    (let ((parse-func (if (process-get proc 'vdiff-3way)
                           'vdiff--parse-diff3
                         'vdiff--parse-diff))
           finished)
-      (cond ((string= "finished\n" event)
-             ;; means no difference between files
-             (setq vdiff--diff-data nil)
-             (setq finished t))
-            ((string= "exited abnormally with code 1\n" event)
-             (setq vdiff--diff-data
-                   (funcall parse-func (process-buffer proc)))
-             (setq finished t))
-            ((string-match-p "exited abnormally with code" event)
-             (setq vdiff--diff-data nil)
-             (setq finished t)
-             (message "vdiff process error: %s" event)))
+      (cond
+       ;; Was getting different exit code conventions depending on the
+       ;; version of diff used
+       ((or (string= "finished\n" event)
+            (string= "exited abnormally with code 1\n" event))
+        (setq vdiff--diff-data
+              (funcall parse-func (process-buffer proc)))
+        (setq finished t))
+       ((string-match-p "exited abnormally with code" event)
+        (setq vdiff--diff-data nil)
+        (setq finished t)
+        (message "vdiff process error: %s" event)))
       (when finished
         (vdiff--refresh-overlays)
         (vdiff--refresh-line-maps)