[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el |
Date: |
Tue, 04 Feb 2003 06:13:21 -0500 |
Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.61 emacs/lisp/ediff-init.el:1.62
*** emacs/lisp/ediff-init.el:1.61 Sat Oct 12 03:13:59 2002
--- emacs/lisp/ediff-init.el Tue Feb 4 06:13:21 2003
***************
*** 740,746 ****
: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.
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,
--- 740,746 ----
: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.
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,817 ****
;; 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
(if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
"")
--- 811,817 ----
;; 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
(if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
"")
***************
*** 1549,1555 ****
(t nil))))
(defsubst ediff-frame-char-height (frame)
! (ediff-cond-compile-for-xemacs-or-emacs
(glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case
(frame-char-height frame) ; emacs case
)
--- 1549,1555 ----
(t nil))))
(defsubst ediff-frame-char-height (frame)
! (ediff-cond-compile-for-xemacs-or-emacs
(glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case
(frame-char-height frame) ; emacs case
)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-init.el,
Juanma Barranquero <=