X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ddc90f39b06e390109df09d7c0a76d42fa7c6e26..f96467d8f24a690daea65b8850f47e67c17af118:/lisp/ediff-diff.el diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index fc288bf933..1ba2b8df80 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -44,6 +44,54 @@ :prefix "ediff-" :group 'ediff) +;; these two must be here to prevent ediff-test-utility from barking +(defcustom ediff-diff-program "diff" + "*Program to use for generating the differential of the two files." + :type 'string + :group 'ediff-diff) +(defcustom ediff-diff3-program "diff3" + "*Program to be used for three-way comparison. +Must produce output compatible with Unix's diff3 program." + :type 'string + :group 'ediff-diff) + +;; The following functions must precede all defcustom-defined variables. + +;; The following functions needed for setting diff/diff3 options +;; test if diff supports the --binary option +(defsubst ediff-test-utility (diff-util option &optional files) + (zerop (apply 'call-process + (append (list diff-util nil nil nil option) files)))) + +(defun ediff-diff-mandatory-option (diff-util) + (let ((file (if (boundp 'null-device) null-device "/dev/null"))) + (cond ((not (memq system-type '(ms-dos windows-nt windows-95))) + "") + ((and (string= diff-util ediff-diff-program) + (ediff-test-utility + ediff-diff-program "--binary" (list file file))) + "--binary") + ((and (string= diff-util ediff-diff3-program) + (ediff-test-utility + ediff-diff3-program "--binary" (list file file file))) + "--binary") + (t "")))) + +;; make sure that mandatory options are added even if the user changes +;; ediff-diff-options or ediff-diff3-options in the customization widget +(defun ediff-reset-diff-options (symb val) + (let* ((diff-program + (if (eq symb 'ediff-diff-options) + ediff-diff-program + ediff-diff3-program)) + (mandatory-option (ediff-diff-mandatory-option diff-program)) + (spacer (if (string-equal mandatory-option "") "" " "))) + (set symb + (if (string-match mandatory-option val) + val + (concat mandatory-option spacer val))) + )) + (defcustom ediff-shell (cond ((eq system-type 'emx) "cmd") ; OS/2 @@ -59,17 +107,25 @@ to a shell that you are not using or, better, fix your shell's startup file." :type 'string :group 'ediff-diff) - -(defcustom ediff-diff-program "diff" - "*Program to use for generating the differential of the two files." +(defcustom ediff-cmp-program "cmp" + "*Utility to use to determine if two files are identical. +It must return code 0, if its arguments are identical files." :type 'string :group 'ediff-diff) -(defcustom ediff-diff-options "" + +(defcustom ediff-cmp-options nil + "*Options to pass to `ediff-cmp-program'. If GNUS diff is used as +`ediff-cmp-program', then the most useful options are `-I' RE, to +ignore changes whose lines all match RE." + :type '(repeat string) + :group 'ediff-diff) + +(defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. If diff\(1\) is used as `ediff-diff-program', then the most useful options are `-w', to ignore space, and `-i', to ignore case of letters. -At present, the option `-c' is ignored, since Ediff doesn't understand this -type of output." +At present, the option `-c' is not allowed." + :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) @@ -87,13 +143,9 @@ This output is not used by Ediff internally." (defvar ediff-match-diff3-line "^====\\(.?\\)$" "Pattern to match lines produced by diff3 that describe differences.") -(defcustom ediff-diff3-program "diff3" - "*Program to be used for three-way comparison. -Must produce output compatible with Unix's diff3 program." - :type 'string - :group 'ediff-diff) (defcustom ediff-diff3-options "" "*Options to pass to `ediff-diff3-program'." + :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) (defcustom ediff-diff3-ok-lines-regexp @@ -129,14 +181,24 @@ Use `setq-default' if setting it in .emacs") ;;; General (defvar ediff-diff-ok-lines-regexp - "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\|.*Warning *:\\|.*No +newline\\|.*missing +newline\\|^\C-m$\\)" + (concat + "^\\(" + "[0-9,]+[acd][0-9,]+\C-m?$" + "\\|[<>] " + "\\|---" + "\\|.*Warning *:" + "\\|.*No +newline" + "\\|.*missing +newline" + "\\|^\C-m?$" + "\\)") "Regexp that matches normal output lines from `ediff-diff-program'. This is mostly lifted from Emerge, except that Ediff also considers warnings and `Missing newline'-type messages to be normal output. Lines that do not match are assumed to be error messages.") -(defvar ediff-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) - (concat "^" x "\\([acd]\\)" x "$")) +(defvar ediff-match-diff-line + (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) + (concat "^" x "\\([acd]\\)" x "\C-m?$")) "Pattern to match lines produced by diff that describe differences.") (ediff-defvar-local ediff-setup-diff-regions-function nil @@ -158,9 +220,8 @@ one optional arguments, diff-number to refine.") ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) -;;; ;; Force all minibuffers to display ediff's messages. -;;; ;; When xemacs implements minibufferless frames, this won't be necessary -;;; (if ediff-xemacs-p (setq synchronize-minibuffers t)) + (if (string-match "c" ediff-diff-options) + (error "Option `-c' is not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist (or (ediff-buffer-live-p ediff-diff-buffer) @@ -210,9 +271,8 @@ one optional arguments, diff-number to refine.") diff-buffer 'synchronize ediff-diff-options file1 file2) - ;;(message "Computing differences ... done") (message "") - (ediff-eval-in-buffer diff-buffer + (ediff-with-current-buffer diff-buffer (buffer-size)))))) @@ -258,19 +318,19 @@ one optional arguments, diff-number to refine.") ;; fixup diff-list (if diff3-job (cond ((not file-A) - (mapcar (function (lambda (elt) - (aset elt 0 nil) - (aset elt 1 nil))) + (mapcar (lambda (elt) + (aset elt 0 nil) + (aset elt 1 nil)) (cdr diff-list))) ((not file-B) - (mapcar (function (lambda (elt) - (aset elt 2 nil) - (aset elt 3 nil))) + (mapcar (lambda (elt) + (aset elt 2 nil) + (aset elt 3 nil)) (cdr diff-list))) ((not file-C) - (mapcar (function (lambda (elt) - (aset elt 4 nil) - (aset elt 5 nil))) + (mapcar (lambda (elt) + (aset elt 4 nil) + (aset elt 5 nil)) (cdr diff-list))) )) @@ -283,15 +343,15 @@ one optional arguments, diff-number to refine.") (setq ediff-error-buffer (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))) - (ediff-eval-in-buffer ediff-error-buffer + (ediff-with-current-buffer ediff-error-buffer (erase-buffer) - (insert (ediff-eval-in-buffer diff-buff (buffer-string))) + (insert (ediff-with-current-buffer diff-buff (buffer-string))) (goto-char (point-min)) (delete-matching-lines ok-regexp) (if (memq system-type '(vax-vms axp-vms)) (delete-matching-lines "^$"))) ;; If diff reports errors, show them then quit. - (if (/= 0 (ediff-eval-in-buffer ediff-error-buffer (buffer-size))) + (if (/= 0 (ediff-with-current-buffer ediff-error-buffer (buffer-size))) (let ((ctl-buf ediff-control-buffer) (error-buf ediff-error-buffer)) (ediff-skip-unsuitable-frames) @@ -328,15 +388,15 @@ one optional arguments, diff-number to refine.") (ediff-get-value-according-to-buffer-type 'B bounds)))) ;; reset point in buffers A/B/C - (ediff-eval-in-buffer A-buffer + (ediff-with-current-buffer A-buffer (goto-char (if shift-A shift-A (point-min)))) - (ediff-eval-in-buffer B-buffer + (ediff-with-current-buffer B-buffer (goto-char (if shift-B shift-B (point-min)))) (if (ediff-buffer-live-p C-buffer) - (ediff-eval-in-buffer C-buffer + (ediff-with-current-buffer C-buffer (goto-char (point-min)))) - (ediff-eval-in-buffer diff-buffer + (ediff-with-current-buffer diff-buffer (goto-char (point-min)) (while (re-search-forward ediff-match-diff-line nil t) (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1) @@ -404,20 +464,20 @@ one optional arguments, diff-number to refine.") b-prev b-end c-prev c-end) ;; else convert lines to points - (ediff-eval-in-buffer A-buffer + (ediff-with-current-buffer A-buffer (forward-line (- a-begin a-prev)) (setq a-begin-pt (point)) (forward-line (- a-end a-begin)) (setq a-end-pt (point) a-prev a-end)) - (ediff-eval-in-buffer B-buffer + (ediff-with-current-buffer B-buffer (forward-line (- b-begin b-prev)) (setq b-begin-pt (point)) (forward-line (- b-end b-begin)) (setq b-end-pt (point) b-prev b-end)) (if (ediff-buffer-live-p C-buffer) - (ediff-eval-in-buffer C-buffer + (ediff-with-current-buffer C-buffer (forward-line (- c-begin c-prev)) (setq c-begin-pt (point)) (forward-line (- c-end c-begin)) @@ -447,7 +507,7 @@ one optional arguments, diff-number to refine.") ))) ))) - ))) ; end ediff-eval-in-buffer + ))) ; end ediff-with-current-buffer diff-list )) @@ -463,13 +523,14 @@ one optional arguments, diff-number to refine.") (if ediff-merge-job (setq ediff-state-of-merge (vconcat - (mapcar (function - (lambda (elt) - (let ((state-of-merge (aref elt 9)) - (state-of-ancestor (aref elt 10))) - (vector - (if state-of-merge (format "%S" state-of-merge)) - state-of-ancestor)))) + (mapcar (lambda (elt) + (let ((state-of-merge (aref elt 9)) + (state-of-ancestor (aref elt 10))) + (vector + ;; state of merge: prefers/default-A/B or combined + (if state-of-merge (format "%S" state-of-merge)) + ;; whether the ancestor region is empty + state-of-ancestor))) ;; the first elt designates type of list (cdr diff-list)) ))) @@ -495,7 +556,7 @@ one optional arguments, diff-number to refine.") (setq total-diffs (length diff-list)) ;; shift, if necessary - (ediff-eval-in-buffer buff (setq pt-saved shift)) + (ediff-with-current-buffer buff (setq pt-saved shift)) (while diff-list (setq current-diff (1+ current-diff) @@ -524,12 +585,12 @@ one optional arguments, diff-number to refine.") ;; convert word numbers to points, if necessary (if (eq diff-list-type 'words) (progn - (ediff-eval-in-buffer buff (goto-char pt-saved)) + (ediff-with-current-buffer buff (goto-char pt-saved)) (setq begin (ediff-goto-word (1+ begin) buff) end (ediff-goto-word end buff 'end)) (if (> end limit) (setq end limit)) (if (> begin end) (setq begin end)) - (setq pt-saved (ediff-eval-in-buffer buff (point))))) + (setq pt-saved (ediff-with-current-buffer buff (point))))) (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) @@ -542,9 +603,11 @@ one optional arguments, diff-number to refine.") (if (= 0 (mod current-diff 10)) (message "Buffer %S: Processing difference region %d of %d" buf-type current-diff total-diffs)) - ;; record all overlays for this difference - ;; the second elt, nil, is a place holder for the fine diff vector. - ;; the third elt, nil, is a place holder for no-fine-diffs flag. + ;; Record all overlays for this difference. + ;; The 2-d elt, nil, is a place holder for the fine diff vector. + ;; The 3-d elt, nil, is a place holder for no-fine-diffs flag. + ;; The 4-th elt says which diff region is different from the other two + ;; (3-way jobs only). (setq diff-overlay-list (nconc diff-overlay-list @@ -553,7 +616,7 @@ one optional arguments, diff-number to refine.") (cdr diff-list)) ) ; while - (set (intern (format "ediff-difference-vector-%S" buf-type)) + (set (ediff-get-symbol-from-alist buf-type ediff-difference-vector-alist) (vconcat diff-overlay-list)) )) @@ -634,7 +697,7 @@ one optional arguments, diff-number to refine.") (or (ediff-get-fine-diff-vector n 'A) (memq ediff-auto-refine '(off nix)) (ediff-message-if-verbose - "Region %d exceeds auto-refine limit. Type `%s' to refine" + "Region %d exceeds the auto-refinement limit. Type `%s' to refine" (1+ n) (substitute-command-keys "\\[ediff-make-or-kill-fine-diffs]") @@ -761,36 +824,40 @@ one optional arguments, diff-number to refine.") (face (if default 'default (face-name - (intern (format "ediff-fine-diff-face-%S" buf-type))))) + (ediff-get-symbol-from-alist + buf-type ediff-fine-diff-face-alist)))) (priority (if default 0 (1+ (or (ediff-overlay-get (symbol-value - (intern - (format - "ediff-current-diff-overlay-%S" buf-type))) + (ediff-get-symbol-from-alist + buf-type + ediff-current-diff-overlay-alist)) 'priority) 0))))) - (mapcar - (function (lambda (overl) - (ediff-set-overlay-face overl face) - (ediff-overlay-put overl 'priority priority))) - fine-diff-vector))) + (mapcar (lambda (overl) + (ediff-set-overlay-face overl face) + (ediff-overlay-put overl 'priority priority)) + fine-diff-vector))) -;; This assumes buffer C and that the region looks like a combination of -;; regions in buffer A and C. +;; Set overlays over the regions that denote delimiters (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) - (let (overlay1 overlay2 overlay3) - (setq overlay1 (ediff-make-bullet-proof-overlay (nth 0 diff-list) - (nth 1 diff-list) - ediff-buffer-C) - overlay2 (ediff-make-bullet-proof-overlay (nth 2 diff-list) - (nth 3 diff-list) - ediff-buffer-C) - overlay3 (ediff-make-bullet-proof-overlay (nth 4 diff-list) - (nth 5 diff-list) - ediff-buffer-C)) - (ediff-set-fine-diff-vector reg-num 'C (vector overlay1 overlay2 overlay3)) + (let (overlay overlay-list) + (while diff-list + (condition-case nil + (setq overlay + (ediff-make-bullet-proof-overlay + (nth 0 diff-list) (nth 1 diff-list) ediff-buffer-C)) + (error "")) + (setq overlay-list (cons overlay overlay-list)) + (if (> (length diff-list) 1) + (setq diff-list (cdr (cdr diff-list))) + (error "ediff-set-fine-overlays-for-combined-merge: corrupt list of +delimiter regions")) + ) + (setq overlay-list (reverse overlay-list)) + (ediff-set-fine-diff-vector + reg-num 'C (apply 'vector overlay-list)) )) @@ -806,7 +873,7 @@ one optional arguments, diff-number to refine.") (ediff-clear-fine-differences-in-one-buffer region-num buf-type) (setq diff-list (cdr diff-list)) ; discard list type (words or points) - (ediff-eval-in-buffer buff (goto-char reg-start)) + (ediff-with-current-buffer buff (goto-char reg-start)) ;; if it is a combined merge then set overlays in buff C specially (if (and ediff-merge-job (eq buf-type 'C) @@ -909,18 +976,18 @@ one optional arguments, diff-number to refine.") (ediff-get-value-according-to-buffer-type 'C bounds))))) ;; reset point in buffers A, B, C - (ediff-eval-in-buffer A-buffer + (ediff-with-current-buffer A-buffer (goto-char (if shift-A shift-A (point-min)))) - (ediff-eval-in-buffer B-buffer + (ediff-with-current-buffer B-buffer (goto-char (if shift-B shift-B (point-min)))) (if three-way-comp - (ediff-eval-in-buffer C-buffer + (ediff-with-current-buffer C-buffer (goto-char (if shift-C shift-C (point-min))))) (if (ediff-buffer-live-p anc-buffer) - (ediff-eval-in-buffer anc-buffer + (ediff-with-current-buffer anc-buffer (goto-char (point-min)))) - (ediff-eval-in-buffer diff-buffer + (ediff-with-current-buffer diff-buffer (goto-char (point-min)) (while (re-search-forward ediff-match-diff3-line nil t) ;; leave point after matched line @@ -983,26 +1050,26 @@ one optional arguments, diff-number to refine.") b-prev b-end c-prev c-end) ;; else convert lines to points - (ediff-eval-in-buffer A-buffer + (ediff-with-current-buffer A-buffer (forward-line (- a-begin a-prev)) (setq a-begin-pt (point)) (forward-line (- a-end a-begin)) (setq a-end-pt (point) a-prev a-end)) - (ediff-eval-in-buffer B-buffer + (ediff-with-current-buffer B-buffer (forward-line (- b-begin b-prev)) (setq b-begin-pt (point)) (forward-line (- b-end b-begin)) (setq b-end-pt (point) b-prev b-end)) - (ediff-eval-in-buffer C-buffer + (ediff-with-current-buffer C-buffer (forward-line (- c-begin c-prev)) (setq c-begin-pt (point)) (forward-line (- c-end c-begin)) (setq c-end-pt (point) c-prev c-end)) (if (ediff-buffer-live-p anc-buffer) - (ediff-eval-in-buffer anc-buffer + (ediff-with-current-buffer anc-buffer (forward-line (- c-or-anc-begin anc-prev)) (setq anc-begin-pt (point)) (forward-line (- c-or-anc-end c-or-anc-begin)) @@ -1034,7 +1101,7 @@ one optional arguments, diff-number to refine.") ))) )) - ))) ; end ediff-eval-in-buffer + ))) ; end ediff-with-current-buffer diff-list )) @@ -1042,11 +1109,6 @@ one optional arguments, diff-number to refine.") ;; File-C is either the third file to compare (in case of 3-way comparison) ;; or it is the ancestor file. (defun ediff-setup-diff-regions3 (file-A file-B file-C) - -;;; ;; force all minibuffers to display ediff's messages. -;;; ;; when xemacs implements minibufferless frames, this won't be necessary -;;; (if ediff-xemacs-p (setq synchronize-minibuffers t)) - (or (ediff-buffer-live-p ediff-diff-buffer) (setq ediff-diff-buffer (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) @@ -1065,15 +1127,21 @@ one optional arguments, diff-number to refine.") ;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless -;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. All -;; arguments in ARGS must be strings. The first arg may be a blank string, in -;; which case we delete it from ARGS list. We also delete nil from args. -(defun ediff-exec-process (program buffer synch &rest args) - (let ((data (match-data))) - (if (string-match "^[ \t]*$" (car args)) ; delete blank string - (setq args (cdr args))) - (setq args (delq nil args)) ; delete nil from arguments - (setq args (ediff-split-string (mapconcat 'identity args " "))) +;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The +;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank +;; string. All elements in FILES must be strings. We also delete nil from +;; args. +(defun ediff-exec-process (program buffer synch options &rest files) + (let ((data (match-data)) + (coding-system-for-read 'no-conversion) + args) + (setq args (append (split-string options) files)) + (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments + ;; the --binary option, if present, should be used only for buffer jobs + ;; or for refining the differences + (or (string-match "buffer" (symbol-name ediff-job-name)) + (eq buffer ediff-fine-diff-buffer) + (setq args (delete "--binary" args))) (unwind-protect (let ((directory default-directory) proc) @@ -1104,7 +1172,7 @@ one optional arguments, diff-number to refine.") ))) (store-match-data data)))) -;; This is shell-command-filter from simple.el in FSF Emacs. +;; This is shell-command-filter from simple.el in Emacs. ;; Copied here because XEmacs doesn't have it. (defun ediff-process-filter (proc string) ;; Do save-excursion by hand so that we can leave point numerically unchanged @@ -1151,7 +1219,6 @@ Used for splitting difference regions into individual words.") "*Characters constituting white space. These characters are ignored when differing regions are split into words.") -;;(defvar ediff-word-1 "a-zA-Z---_`'.?!:" (defvar ediff-word-1 "a-zA-Z---_" "*Characters that constitute words of type 1. More precisely, [ediff-word-1] is a regexp that matches type 1 words. @@ -1179,21 +1246,29 @@ See `ediff-forward-word' for more details.") "Move point one word forward. There are four types of words, each of which consists entirely of characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or -`ediff-word-4'. Words are recognized by passing these in turn as the -argument to `skip-chars-forward'." - (or (> (skip-chars-forward ediff-word-1) 0) +`ediff-word-4'. Words are recognized by passing these one after another as +arguments to `skip-chars-forward'." + (or (> (+ (skip-chars-forward ediff-word-1) + (skip-syntax-forward "w")) + 0) (> (skip-chars-forward ediff-word-2) 0) (> (skip-chars-forward ediff-word-3) 0) (> (skip-chars-forward ediff-word-4) 0) )) + (defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf) - (let (sv-point string) + (let (inbuf-syntax-tbl sv-point string) (save-excursion (set-buffer in-buffer) - (setq string (buffer-substring beg end)) + (setq inbuf-syntax-tbl (syntax-table)) + (setq string (buffer-substring-no-properties beg end)) (set-buffer out-buffer) + ;; Make sure that temp buff syntax table is the same a the original buf + ;; syntax tbl, because we use ediff-forward-word in both and + ;; ediff-forward-word depends on the syntax classes of characters. + (set-syntax-table inbuf-syntax-tbl) (erase-buffer) (insert string) (goto-char (point-min)) @@ -1205,7 +1280,8 @@ argument to `skip-chars-forward'." ;; different invocations (if control-buf (funcall - (ediff-eval-in-buffer control-buf ediff-forward-word-function)) + (ediff-with-current-buffer + control-buf ediff-forward-word-function)) (funcall ediff-forward-word-function)) (setq sv-point (point)) (skip-chars-forward ediff-whitespace) @@ -1232,7 +1308,7 @@ argument to `skip-chars-forward'." (defun ediff-goto-word (n buf &optional flag) ;; remember val ediff-forward-word-function has in ctl buf (let ((fwd-word-fun ediff-forward-word-function)) - (ediff-eval-in-buffer buf + (ediff-with-current-buffer buf (skip-chars-forward ediff-whitespace) (while (> n 1) (funcall fwd-word-fun) @@ -1242,11 +1318,18 @@ argument to `skip-chars-forward'." (funcall fwd-word-fun)) (point)))) +(defun ediff-same-file-contents (f1 f2) + "T if F1 and F2 have identical contents." + (let ((res + (apply 'call-process ediff-cmp-program nil nil nil + (append ediff-cmp-options (list f1 f2))))) + (and (numberp res) (eq res 0)))) + ;;; Local Variables: ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) -;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) -;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) +;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) +;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) ;;; End: