/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.61 by kifer, Sat Oct 12 07:13:59 2002 UTC revision 1.62 by lektu, Tue Feb 4 11:13:21 2003 UTC
# Line 740  appropriate symbol: `rcs', `pcl-cvs', or Line 740  appropriate symbol: `rcs', `pcl-cvs', or
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,
# Line 811  to temp files when Ediff needs to find f Line 811  to temp files when Ediff needs to find f
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    
# Line 1549  This default should work without changes Line 1549  This default should work without changes
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     )     )

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.62

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26