Mercurial > emacs
comparison lisp/ediff-init.el @ 16766:beb94a5271e2
*** empty log message ***
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sat, 28 Dec 1996 02:53:04 +0000 |
| parents | b2fae8abc5b0 |
| children | 0b9d9cbf3cd4 |
comparison
equal
deleted
inserted
replaced
| 16765:b06dea50c67a | 16766:beb94a5271e2 |
|---|---|
| 60 (defun ediff-has-face-support-p () | 60 (defun ediff-has-face-support-p () |
| 61 (cond ((ediff-window-display-p)) | 61 (cond ((ediff-window-display-p)) |
| 62 (ediff-force-faces) | 62 (ediff-force-faces) |
| 63 (ediff-emacs-p (memq (ediff-device-type) '(pc))) | 63 (ediff-emacs-p (memq (ediff-device-type) '(pc))) |
| 64 (ediff-xemacs-p (memq (ediff-device-type) '(tty pc))))) | 64 (ediff-xemacs-p (memq (ediff-device-type) '(tty pc))))) |
| 65 | 65 |
| 66 | 66 |
| 67 ;; Defines SYMBOL as an advertised local variable. | 67 ;; Defines SYMBOL as an advertised local variable. |
| 68 ;; Performs a defvar, then executes `make-variable-buffer-local' on | 68 ;; Performs a defvar, then executes `make-variable-buffer-local' on |
| 69 ;; the variable. Also sets the `permanent-local' property, | 69 ;; the variable. Also sets the `permanent-local' property, |
| 70 ;; so that `kill-all-local-variables' (called by major-mode setting | 70 ;; so that `kill-all-local-variables' (called by major-mode setting |
| 300 ediff-filegroups3))) | 300 ediff-filegroups3))) |
| 301 (defsubst ediff-comparison-metajob3 (&optional metajob) | 301 (defsubst ediff-comparison-metajob3 (&optional metajob) |
| 302 (memq (or metajob ediff-metajob-name) | 302 (memq (or metajob ediff-metajob-name) |
| 303 '(ediff-directories3 ediff-filegroups3))) | 303 '(ediff-directories3 ediff-filegroups3))) |
| 304 | 304 |
| 305 (defsubst ediff-barf-if-not-control-buffer (&optional meta-buf) | 305 ;; with no argument, checks if we are in ediff-control-buffer |
| 306 (or (eq (if meta-buf ediff-meta-buffer ediff-control-buffer) | 306 ;; with argument, checks if we are in ediff-meta-buffer |
| 307 (current-buffer)) | 307 (defun ediff-in-control-buffer-p (&optional meta-buf-p) |
| 308 (and (boundp 'ediff-control-buffer) | |
| 309 (eq (if meta-buf-p ediff-meta-buffer ediff-control-buffer) | |
| 310 (current-buffer)))) | |
| 311 | |
| 312 (defsubst ediff-barf-if-not-control-buffer (&optional meta-buf-p) | |
| 313 (or (ediff-in-control-buffer-p meta-buf-p) | |
| 308 (error "%S: This command runs in Ediff Control Buffer only!" | 314 (error "%S: This command runs in Ediff Control Buffer only!" |
| 309 this-command))) | 315 this-command))) |
| 310 | |
| 311 | 316 |
| 312 ;; Hook variables | 317 ;; Hook variables |
| 313 | 318 |
| 314 (defvar ediff-before-setup-windows-hook nil | 319 (defvar ediff-before-setup-windows-hook nil |
| 315 "*Hooks to run before Ediff sets its window configuration. | 320 "*Hooks to run before Ediff sets its window configuration. |
| 585 (fset 'ediff-read-event (symbol-function 'next-command-event)) | 590 (fset 'ediff-read-event (symbol-function 'next-command-event)) |
| 586 (fset 'ediff-overlayp (symbol-function 'extentp)) | 591 (fset 'ediff-overlayp (symbol-function 'extentp)) |
| 587 (fset 'ediff-make-overlay (symbol-function 'make-extent)) | 592 (fset 'ediff-make-overlay (symbol-function 'make-extent)) |
| 588 (fset 'ediff-delete-overlay (symbol-function 'delete-extent))) | 593 (fset 'ediff-delete-overlay (symbol-function 'delete-extent))) |
| 589 (fset 'ediff-read-event (symbol-function 'read-event)) | 594 (fset 'ediff-read-event (symbol-function 'read-event)) |
| 590 (fset 'ediff-overlayp (symbol-function 'overlayp)) | |
| 591 (fset 'ediff-overlayp (symbol-function 'overlayp)) | 595 (fset 'ediff-overlayp (symbol-function 'overlayp)) |
| 592 (fset 'ediff-make-overlay (symbol-function 'make-overlay)) | 596 (fset 'ediff-make-overlay (symbol-function 'make-overlay)) |
| 593 (fset 'ediff-delete-overlay (symbol-function 'delete-overlay))) | 597 (fset 'ediff-delete-overlay (symbol-function 'delete-overlay))) |
| 594 | 598 |
| 595 ;; Check the current version against the major and minor version numbers | 599 ;; Check the current version against the major and minor version numbers |
| 829 (progn | 833 (progn |
| 830 (make-face 'ediff-current-diff-face-Ancestor) | 834 (make-face 'ediff-current-diff-face-Ancestor) |
| 831 (ediff-hide-face 'ediff-current-diff-face-Ancestor) | 835 (ediff-hide-face 'ediff-current-diff-face-Ancestor) |
| 832 (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor) | 836 (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor) |
| 833 (copy-face | 837 (copy-face |
| 834 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor)))) | 838 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor)) |
| 839 'ediff-current-diff-face-Ancestor)) | |
| 835 "Face for highlighting the selected difference in the ancestor buffer.") | 840 "Face for highlighting the selected difference in the ancestor buffer.") |
| 836 | 841 |
| 837 (defvar ediff-fine-diff-pixmap "gray3" | 842 (defvar ediff-fine-diff-pixmap "gray3" |
| 838 "Pixmap to use for highlighting fine differences.") | 843 "Pixmap to use for highlighting fine differences.") |
| 839 (defvar ediff-odd-diff-pixmap "gray1" | 844 (defvar ediff-odd-diff-pixmap "gray1" |