diff options
| author | Karl Heuer | 1996-01-04 23:14:33 +0000 |
|---|---|---|
| committer | Karl Heuer | 1996-01-04 23:14:33 +0000 |
| commit | 9b82abcce549e17a3b076986e326c5c4fdb632b1 (patch) | |
| tree | f73da514f420ab3363d2877e8e5998b434fc100a | |
| parent | 163d1767689eaa2f8ecff6cf3f3912c809ed100c (diff) | |
| download | emacs-9b82abcce549e17a3b076986e326c5c4fdb632b1.tar.gz emacs-9b82abcce549e17a3b076986e326c5c4fdb632b1.zip | |
(ediff-exec-process): Fix local var misspelling.
| -rw-r--r-- | lisp/ediff-diff.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 20a0d9f5ef7..9e64d2b23eb 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el | |||
| @@ -984,11 +984,11 @@ one optional arguments, diff-number to refine.") | |||
| 984 | )) | 984 | )) |
| 985 | 985 | ||
| 986 | 986 | ||
| 987 | ;; Execute PROGRAM asynchronously, unless OS/2 or unless SYNCH is non-nil. | 987 | ;; Execute PROGRAM asynchronously, unless OS/2 or unless SYNC is non-nil. |
| 988 | ;; BUFFER must be a buffer object, and must be alive. | 988 | ;; BUFFER must be a buffer object, and must be alive. |
| 989 | ;; All arguments in ARGS must be strings. The first arg may be a blank string, | 989 | ;; All arguments in ARGS must be strings. The first arg may be a blank string, |
| 990 | ;; in which case we delete it from ARGS list. We also delete nil from args. | 990 | ;; in which case we delete it from ARGS list. We also delete nil from args. |
| 991 | (defun ediff-exec-process (program buffer synch &rest args) | 991 | (defun ediff-exec-process (program buffer sync &rest args) |
| 992 | (let ((data (match-data))) | 992 | (let ((data (match-data))) |
| 993 | (if (string-match "^[ \t]*$" (car args)) ; delete blank string | 993 | (if (string-match "^[ \t]*$" (car args)) ; delete blank string |
| 994 | (setq args (cdr args))) | 994 | (setq args (cdr args))) |
| @@ -1001,11 +1001,11 @@ one optional arguments, diff-number to refine.") | |||
| 1001 | (set-buffer buffer) | 1001 | (set-buffer buffer) |
| 1002 | (erase-buffer) | 1002 | (erase-buffer) |
| 1003 | (setq default-directory directory) | 1003 | (setq default-directory directory) |
| 1004 | (if (or (eq system-type 'emx) synch) | 1004 | (if (or (eq system-type 'emx) sync) |
| 1005 | ;; In OS/2 do it synchronously, since OS/2 doesn't let us | 1005 | ;; In OS/2 do it synchronously, since OS/2 doesn't let us |
| 1006 | ;; delete files used by other processes. Thus, in ediff-buffers | 1006 | ;; delete files used by other processes. Thus, in ediff-buffers |
| 1007 | ;; and similar functions, we can't delete temp files because | 1007 | ;; and similar functions, we can't delete temp files because |
| 1008 | ;; they might be used by the asynch process that computes | 1008 | ;; they might be used by the async process that computes |
| 1009 | ;; custom diffs. So, we have to wait till custom diff | 1009 | ;; custom diffs. So, we have to wait till custom diff |
| 1010 | ;; subprocess is done. | 1010 | ;; subprocess is done. |
| 1011 | (apply 'call-process program nil buffer nil args) | 1011 | (apply 'call-process program nil buffer nil args) |