diff options
author | Karl Heuer <kwzh@gnu.org> | 1996-01-04 23:14:33 +0000 |
---|---|---|
committer | Karl Heuer <kwzh@gnu.org> | 1996-01-04 23:14:33 +0000 |
commit | 9b82abcce549e17a3b076986e326c5c4fdb632b1 (patch) | |
tree | f73da514f420ab3363d2877e8e5998b434fc100a /lisp/ediff-diff.el | |
parent | 163d1767689eaa2f8ecff6cf3f3912c809ed100c (diff) | |
download | emacs-9b82abcce549e17a3b076986e326c5c4fdb632b1.tar.gz |
(ediff-exec-process): Fix local var misspelling.
Diffstat (limited to 'lisp/ediff-diff.el')
-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.") )) -;; Execute PROGRAM asynchronously, unless OS/2 or unless SYNCH is non-nil. +;; Execute PROGRAM asynchronously, unless OS/2 or unless SYNC 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) +(defun ediff-exec-process (program buffer sync &rest args) (let ((data (match-data))) (if (string-match "^[ \t]*$" (car args)) ; delete blank string (setq args (cdr args))) @@ -1001,11 +1001,11 @@ one optional arguments, diff-number to refine.") (set-buffer buffer) (erase-buffer) (setq default-directory directory) - (if (or (eq system-type 'emx) synch) + (if (or (eq system-type 'emx) sync) ;; In OS/2 do it synchronously, since OS/2 doesn't let us ;; delete files used by other processes. Thus, in ediff-buffers ;; and similar functions, we can't delete temp files because - ;; they might be used by the asynch process that computes + ;; they might be used by the async process that computes ;; custom diffs. So, we have to wait till custom diff ;; subprocess is done. (apply 'call-process program nil buffer nil args) |