diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 11:26:42 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 11:26:42 +0000 |
| commit | 1c7199ef585175719a35f2e0dc8e8c04f281708a (patch) | |
| tree | c34d479037d9b411ba266d8229e6f3de32f2bbe1 /lisp/ediff-init.el | |
| parent | 58e4c52f54f7003efbe3e1f30d71b3cfa5e1a8d5 (diff) | |
| download | emacs-1c7199ef585175719a35f2e0dc8e8c04f281708a.tar.gz | |
Trailing whitespace deleted.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 58a37e2566d..0ce7e4323ec 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -740,7 +740,7 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." :group 'ediff) (defcustom ediff-coding-system-for-read 'raw-text - "*The coding system for read to use when running the diff program as a subprocess. + "*The coding system for read to use when running the diff program as a subprocess. In most cases, the default will do. However, under certain circumstances in Windows NT/98/95 you might need to use something like 'raw-text-dos here. So, if the output that your diff program sends to Emacs contains extra ^M's, @@ -811,7 +811,7 @@ to temp files when Ediff needs to find fine differences." ;; A var local to each control panel buffer. Indicates highlighting style ;; in effect for this buffer: `face', `ascii', ;; `off' -- turned off \(on a dumb terminal only\). -(ediff-defvar-local ediff-highlighting-style +(ediff-defvar-local ediff-highlighting-style (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) "") @@ -1549,7 +1549,7 @@ This default should work without changes." (t nil)))) (defsubst ediff-frame-char-height (frame) - (ediff-cond-compile-for-xemacs-or-emacs + (ediff-cond-compile-for-xemacs-or-emacs (glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case (frame-char-height frame) ; emacs case ) |