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, |
758 |
|
|
759 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
760 |
(progn ; xemacs |
(progn ; xemacs |
761 |
(fset 'ediff-read-event (symbol-function 'next-command-event)) |
(defalias 'ediff-read-event 'next-command-event) |
762 |
(fset 'ediff-overlayp (symbol-function 'extentp)) |
(defalias 'ediff-overlayp 'extentp) |
763 |
(fset 'ediff-make-overlay (symbol-function 'make-extent)) |
(defalias 'ediff-make-overlay 'make-extent) |
764 |
(fset 'ediff-delete-overlay (symbol-function 'delete-extent))) |
(defalias 'ediff-delete-overlay 'delete-extent)) |
765 |
(progn ; emacs |
(progn ; emacs |
766 |
(fset 'ediff-read-event (symbol-function 'read-event)) |
(defalias 'ediff-read-event 'read-event) |
767 |
(fset 'ediff-overlayp (symbol-function 'overlayp)) |
(defalias 'ediff-overlayp 'overlayp) |
768 |
(fset 'ediff-make-overlay (symbol-function 'make-overlay)) |
(defalias 'ediff-make-overlay 'make-overlay) |
769 |
(fset 'ediff-delete-overlay (symbol-function 'delete-overlay))) |
(defalias 'ediff-delete-overlay 'delete-overlay)) |
770 |
) |
) |
771 |
|
|
772 |
;; Check the current version against the major and minor version numbers |
;; Check the current version against the major and minor version numbers |
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 |
|
|
831 |
(if (ediff-window-display-p) |
(if (ediff-window-display-p) |
832 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
833 |
(progn ; xemacs |
(progn ; xemacs |
834 |
(fset 'ediff-display-pixel-width (symbol-function 'device-pixel-width)) |
(defalias 'ediff-display-pixel-width 'device-pixel-width) |
835 |
(fset 'ediff-display-pixel-height |
(defalias 'ediff-display-pixel-height 'device-pixel-height)) |
|
(symbol-function 'device-pixel-height))) |
|
836 |
(progn ; emacs |
(progn ; emacs |
837 |
(fset 'ediff-display-pixel-width |
(defalias 'ediff-display-pixel-width |
838 |
(if (fboundp 'display-pixel-width) |
(if (fboundp 'display-pixel-width) |
839 |
(symbol-function 'display-pixel-width) |
'display-pixel-width |
840 |
(symbol-function 'x-display-pixel-width))) |
'x-display-pixel-width)) |
841 |
(fset 'ediff-display-pixel-height |
(defalias 'ediff-display-pixel-height |
842 |
(if (fboundp 'display-pixel-height) |
(if (fboundp 'display-pixel-height) |
843 |
(symbol-function 'display-pixel-height) |
'display-pixel-height |
844 |
(symbol-function 'x-display-pixel-height)))) |
'x-display-pixel-height))) |
845 |
)) |
)) |
846 |
|
|
847 |
;; A-list of current-diff-overlay symbols associated with buf types |
;; A-list of current-diff-overlay symbols associated with buf types |
1373 |
(cdr (assq 'unsplittable (frame-parameters frame)))) |
(cdr (assq 'unsplittable (frame-parameters frame)))) |
1374 |
|
|
1375 |
(defsubst ediff-get-next-window (wind prev-wind) |
(defsubst ediff-get-next-window (wind prev-wind) |
1376 |
(or (window-live-p wind) |
(cond ((window-live-p wind) wind) |
1377 |
(setq wind (if prev-wind |
(prev-wind (next-window wind)) |
1378 |
(next-window wind) |
(t (selected-window)) |
1379 |
(selected-window))))) |
)) |
1380 |
|
|
1381 |
|
|
1382 |
(defsubst ediff-kill-buffer-carefully (buf) |
(defsubst ediff-kill-buffer-carefully (buf) |
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 (selected-window frame)) ; xemacs cse |
(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 |
) |
) |
1556 |
) |
) |
1737 |
|
|
1738 |
|
|
1739 |
(if (fboundp 'with-syntax-table) |
(if (fboundp 'with-syntax-table) |
1740 |
(fset 'ediff-with-syntax-table 'with-syntax-table) |
(defalias 'ediff-with-syntax-table 'with-syntax-table) |
1741 |
;; stolen from subr.el in emacs 21 |
;; stolen from subr.el in emacs 21 |
1742 |
(defmacro ediff-with-syntax-table (table &rest body) |
(defmacro ediff-with-syntax-table (table &rest body) |
1743 |
(let ((old-table (make-symbol "table")) |
(let ((old-table (make-symbol "table")) |