Mercurial > emacs
comparison lisp/ediff-init.el @ 49588:37645a051842
Trailing whitespace deleted.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 04 Feb 2003 11:26:42 +0000 |
parents | 8e6ed5c1f142 |
children | 695cf19ef79e d7ddb3e565de |
comparison
equal
deleted
inserted
replaced
49587:e82b3fe06d4c | 49588:37645a051842 |
---|---|
738 appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." | 738 appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." |
739 :type 'symbol | 739 :type 'symbol |
740 :group 'ediff) | 740 :group 'ediff) |
741 | 741 |
742 (defcustom ediff-coding-system-for-read 'raw-text | 742 (defcustom ediff-coding-system-for-read 'raw-text |
743 "*The coding system for read to use when running the diff program as a subprocess. | 743 "*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 | 744 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. | 745 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, | 746 So, if the output that your diff program sends to Emacs contains extra ^M's, |
747 you might need to experiment here, if the default or 'raw-text-dos doesn't | 747 you might need to experiment here, if the default or 'raw-text-dos doesn't |
748 work." | 748 work." |
809 | 809 |
810 | 810 |
811 ;; A var local to each control panel buffer. Indicates highlighting style | 811 ;; A var local to each control panel buffer. Indicates highlighting style |
812 ;; in effect for this buffer: `face', `ascii', | 812 ;; in effect for this buffer: `face', `ascii', |
813 ;; `off' -- turned off \(on a dumb terminal only\). | 813 ;; `off' -- turned off \(on a dumb terminal only\). |
814 (ediff-defvar-local ediff-highlighting-style | 814 (ediff-defvar-local ediff-highlighting-style |
815 (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) | 815 (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) |
816 "") | 816 "") |
817 | 817 |
818 | 818 |
819 (if (ediff-has-face-support-p) | 819 (if (ediff-has-face-support-p) |
1547 (cdr (cdr (mouse-pixel-position))))) | 1547 (cdr (cdr (mouse-pixel-position))))) |
1548 ediff-mouse-pixel-threshold)))) | 1548 ediff-mouse-pixel-threshold)))) |
1549 (t nil)))) | 1549 (t nil)))) |
1550 | 1550 |
1551 (defsubst ediff-frame-char-height (frame) | 1551 (defsubst ediff-frame-char-height (frame) |
1552 (ediff-cond-compile-for-xemacs-or-emacs | 1552 (ediff-cond-compile-for-xemacs-or-emacs |
1553 (glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case | 1553 (glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case |
1554 (frame-char-height frame) ; emacs case | 1554 (frame-char-height frame) ; emacs case |
1555 ) | 1555 ) |
1556 ) | 1556 ) |
1557 | 1557 |