740 |
:group 'ediff) |
:group 'ediff) |
741 |
|
|
742 |
(defcustom ediff-coding-system-for-read 'raw-text |
(defcustom ediff-coding-system-for-read 'raw-text |
743 |
"*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. |
744 |
In most cases, the default will do. However, under certain circumstances in |
In most cases, the default will do. However, under certain circumstances in |
745 |
Windows NT/98/95 you might need to use something like 'raw-text-dos here. |
Windows NT/98/95 you might need to use something like 'raw-text-dos here. |
746 |
So, if the output that your diff program sends to Emacs contains extra ^M's, |
So, if the output that your diff program sends to Emacs contains extra ^M's, |
811 |
;; A var local to each control panel buffer. Indicates highlighting style |
;; A var local to each control panel buffer. Indicates highlighting style |
812 |
;; in effect for this buffer: `face', `ascii', |
;; in effect for this buffer: `face', `ascii', |
813 |
;; `off' -- turned off \(on a dumb terminal only\). |
;; `off' -- turned off \(on a dumb terminal only\). |
814 |
(ediff-defvar-local ediff-highlighting-style |
(ediff-defvar-local ediff-highlighting-style |
815 |
(if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) |
(if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) |
816 |
"") |
"") |
817 |
|
|
1549 |
(t nil)))) |
(t nil)))) |
1550 |
|
|
1551 |
(defsubst ediff-frame-char-height (frame) |
(defsubst ediff-frame-char-height (frame) |
1552 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
1553 |
(glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case |
(glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case |
1554 |
(frame-char-height frame) ; emacs case |
(frame-char-height frame) ; emacs case |
1555 |
) |
) |