summaryrefslogtreecommitdiff
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-01-04 23:14:33 +0000
committerKarl Heuer <kwzh@gnu.org>1996-01-04 23:14:33 +0000
commite529b93dc5a3af953aadde69d4e49f336f3862f1 (patch)
tree560c28e3b4ba2ca25890db9c9d1d397354ad734f /lisp/ediff-diff.el
parentd8efd007cee74521bb6c650de70633bee1780df4 (diff)
downloademacs-e529b93dc5a3af953aadde69d4e49f336f3862f1.tar.gz
(ediff-exec-process): Fix local var misspelling.
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r--lisp/ediff-diff.el8
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)