Mercurial > emacs
comparison lisp/ediff-init.el @ 33019:6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-preserve-cursor-color): new test that avoids
rewrawing the screen when changing cursor color.
(viper-insert-state-pre-command-sentinel,
viper-replace-state-pre-command-sentinel,
viper-replace-state-post-command-sentinel): use
viper-preserve-cursor-color.
Many functions changed to use viper= instead of = when comparing
characters.
* viper-util.el (viper-memq-char,viper=): new functions for
working with characters.
(viper-change-cursor-color): fixed buglet.
Many functions changed to use viper= instead of = when comparing
characters.
* viper.el (viper-insert-state-mode-list): added eshell.
* ediff-init.el (ediff-before-setup-hook): new hook.
Several typos fixed in various docstrings.
* ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
* ediff-nult.el (ediff-before-session-group-setup-hooks): new
hook.
(ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
* ediff-util.el (ediff-setup): run ediff-before-setup-hook.
(ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
(ediff-get-selected-buffers): new function.
* ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
ediff-vc-merge-internal,ediff-rcs-merge-internal): use
save-window-excursion.
* ediff-wind.el (ediff-skip-unsuitable-frames): more robust
termination check in while loop.
* ediff.el (ediff-get-default-file-name): better defaults when in
dired buffer.
(ediff-files,ediff-merge-files,ediff-files3,
ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 29 Oct 2000 04:56:45 +0000 |
| parents | 557b7595fdcc |
| children | 5049026c97b1 |
comparison
equal
deleted
inserted
replaced
| 33018:d9abb0441663 | 33019:6306740f6938 |
|---|---|
| 374 :prefix "ediff-" | 374 :prefix "ediff-" |
| 375 :group 'ediff) | 375 :group 'ediff) |
| 376 | 376 |
| 377 ;; Hook variables | 377 ;; Hook variables |
| 378 | 378 |
| 379 (defcustom ediff-before-setup-hook nil | |
| 380 "*Hooks to run before Ediff begins to set up windows and buffers. | |
| 381 This hook can be used to save the previous window config, which can be restored | |
| 382 on ediff-quit or ediff-suspend." | |
| 383 :type 'hook | |
| 384 :group 'ediff-hook) | |
| 379 (defcustom ediff-before-setup-windows-hook nil | 385 (defcustom ediff-before-setup-windows-hook nil |
| 380 "*Hooks to run before Ediff sets its window configuration. | 386 "*Hooks to run before Ediff sets its window configuration. |
| 381 This can be used to save the previous window config, which can be restored | 387 This hook is called every time when Ediff arranges its windows. |
| 382 on ediff-quit or ediff-suspend." | 388 This happens each time Ediff detects that the windows were messed up by the |
| 389 user." | |
| 383 :type 'hook | 390 :type 'hook |
| 384 :group 'ediff-hook) | 391 :group 'ediff-hook) |
| 385 (defcustom ediff-after-setup-windows-hook nil | 392 (defcustom ediff-after-setup-windows-hook nil |
| 386 "*Hooks to run after Ediff sets its window configuration. | 393 "*Hooks to run after Ediff sets its window configuration. |
| 387 This can be used to set up control window or icon in a desired place." | 394 This can be used to set up control window or icon in a desired place." |
| 397 "*Hooks run after setting up the frame to display Ediff Control Panel. | 404 "*Hooks run after setting up the frame to display Ediff Control Panel. |
| 398 Can be used to move the frame where it is desired." | 405 Can be used to move the frame where it is desired." |
| 399 :type 'hook | 406 :type 'hook |
| 400 :group 'ediff-hook) | 407 :group 'ediff-hook) |
| 401 (defcustom ediff-startup-hook nil | 408 (defcustom ediff-startup-hook nil |
| 402 "*Hooks to run in the control buffer after Ediff has been set up." | 409 "*Hooks to run in the control buffer after Ediff has been set up and is ready for the job." |
| 403 :type 'hook | 410 :type 'hook |
| 404 :group 'ediff-hook) | 411 :group 'ediff-hook) |
| 405 (defcustom ediff-select-hook nil | 412 (defcustom ediff-select-hook nil |
| 406 "*Hooks to run after a difference has been selected." | 413 "*Hooks to run after a difference has been selected." |
| 407 :type 'hook | 414 :type 'hook |
| 775 (fset 'ediff-display-pixel-height (symbol-function | 782 (fset 'ediff-display-pixel-height (symbol-function |
| 776 (if (fboundp 'display-pixel-height) | 783 (if (fboundp 'display-pixel-height) |
| 777 'display-pixel-height | 784 'display-pixel-height |
| 778 'x-display-pixel-height))))) | 785 'x-display-pixel-height))))) |
| 779 | 786 |
| 780 ;; A-list of current-diff-overlay symbols asssociated with buf types | 787 ;; A-list of current-diff-overlay symbols associated with buf types |
| 781 (defconst ediff-current-diff-overlay-alist | 788 (defconst ediff-current-diff-overlay-alist |
| 782 '((A . ediff-current-diff-overlay-A) | 789 '((A . ediff-current-diff-overlay-A) |
| 783 (B . ediff-current-diff-overlay-B) | 790 (B . ediff-current-diff-overlay-B) |
| 784 (C . ediff-current-diff-overlay-C) | 791 (C . ediff-current-diff-overlay-C) |
| 785 (Ancestor . ediff-current-diff-overlay-Ancestor))) | 792 (Ancestor . ediff-current-diff-overlay-Ancestor))) |
| 786 | 793 |
| 787 ;; A-list of current-diff-face-* symbols asssociated with buf types | 794 ;; A-list of current-diff-face-* symbols associated with buf types |
| 788 (defconst ediff-current-diff-face-alist | 795 (defconst ediff-current-diff-face-alist |
| 789 '((A . ediff-current-diff-face-A) | 796 '((A . ediff-current-diff-face-A) |
| 790 (B . ediff-current-diff-face-B) | 797 (B . ediff-current-diff-face-B) |
| 791 (C . ediff-current-diff-face-C) | 798 (C . ediff-current-diff-face-C) |
| 792 (Ancestor . ediff-current-diff-face-Ancestor))) | 799 (Ancestor . ediff-current-diff-face-Ancestor))) |