diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-24 23:14:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-24 23:14:48 -0800 |
| commit | e4920bc99dfcee02c3bb83b46a761b0893f76626 (patch) | |
| tree | a6165f7a6c45f0b4924bad97b21ab179d3e7707e /lisp/vc | |
| parent | fa4fdb5ca559f8aae4137f8d3b974c14c760360d (diff) | |
| download | emacs-e4920bc99dfcee02c3bb83b46a761b0893f76626.tar.gz | |
Spelling fixes.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-util.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 30df073df12..b1c6e367ef7 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3811,7 +3811,7 @@ Ediff Control Panel to restore highlighting." ;; later, and nconc above will break it. Either this or use slow ;; append instead of nconc (selected-buffers (ediff-get-selected-buffers)) - (prefered-buffer (car all-buffers)) + (preferred-buffer (car all-buffers)) visible-dired-buffers (excl-buff-name-list (mapcar @@ -3841,7 +3841,7 @@ Ediff Control Panel to restore highlighting." (cond ((member (buffer-name x) excl-buff-name-list) nil) ((memq x selected-buffers) x) ((not (ediff-get-visible-buffer-window x)) nil) - ((eq x prefered-buffer) x) + ((eq x preferred-buffer) x) ;; if prev selected buffer is dired, look only at ;; dired. ((eq use-dired-major-mode 'yes) |