Mercurial > emacs
comparison lisp/ediff.el @ 68997:6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-state-post-command-sentinel,
viper-change-state-to-vi, viper-change-state-to-emacs):
made aware of cursor coloring in the emacs state.
(viper-special-read-and-insert-char): use read-char-exclusive.
(viper-minibuffer-trim-tail): workaround for fields in minibuffer.
* viper-init.el (viper-emacs-state-cursor-color): new variable.
* viper-util.el (viper-save-cursor-color,
viper-get-saved-cursor-color-in-replace-mode,
viper-get-saved-cursor-color-in-insert-mode,
viper-restore-cursor-color): make aware of the cursor color in emacs
state.
(viper-get-saved-cursor-color-in-emacs-mode): new function.
* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
ediff-ignore-case-option3, ediff-actual-diff-options,
ediff-actual-diff3-options): new variables to control case sensitivity.
(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
ediff-setup-diff-regions3): made aware of case-sensitivity.
(ediff-toggle-ignore-case): new function.
(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.
* ediff-help.el (ediff-long-help-message-narrow2,
ediff-long-help-message-compare2, ediff-long-help-message-compare3,
ediff-long-help-message-word-mode): add ignore-case command.
(ediff-help-for-quick-help): add ignore-case command.
* ediff-merg.el: move provide to the end.
* ediff-ptch.el: move provide to the end.
* ediff-wind.el: move provide to the end.
* ediff-mult.el: move provide to the end.
(ediff-set-meta-overlay): enable follow-link.
* ediff.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-patch-buffer): better heuristics.
* ediff-util.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
defuns.
(ediff-submit-report): pass the values of ediff-diff3-program,
ediff-diff3-options.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sun, 19 Feb 2006 03:16:45 +0000 |
parents | 3bd95f4f2941 |
children | 522ce5c1839a d1c5430c5bff |
comparison
equal
deleted
inserted
replaced
68996:ef46b6afadc4 | 68997:6169b51037af |
---|---|
5 | 5 |
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
7 ;; Created: February 2, 1994 | 7 ;; Created: February 2, 1994 |
8 ;; Keywords: comparing, merging, patching, tools, unix | 8 ;; Keywords: comparing, merging, patching, tools, unix |
9 | 9 |
10 (defconst ediff-version "2.80.1" "The current version of Ediff") | 10 (defconst ediff-version "2.81" "The current version of Ediff") |
11 (defconst ediff-date "November 25, 2005" "Date of last update") | 11 (defconst ediff-date "February 18, 2006" "Date of last update") |
12 | 12 |
13 | 13 |
14 ;; This file is part of GNU Emacs. | 14 ;; This file is part of GNU Emacs. |
15 | 15 |
16 ;; GNU Emacs is free software; you can redistribute it and/or modify | 16 ;; GNU Emacs is free software; you can redistribute it and/or modify |
105 ;; its many users. See Ediff on-line Info for the full list of those who | 105 ;; its many users. See Ediff on-line Info for the full list of those who |
106 ;; helped. Improved defaults in Ediff file-name reading commands. | 106 ;; helped. Improved defaults in Ediff file-name reading commands. |
107 | 107 |
108 ;;; Code: | 108 ;;; Code: |
109 | 109 |
110 (provide 'ediff) | |
111 | 110 |
112 ;; Compiler pacifier | 111 ;; Compiler pacifier |
113 (defvar cvs-cookie-handle) | 112 (defvar cvs-cookie-handle) |
114 (defvar ediff-last-dir-patch) | 113 (defvar ediff-last-dir-patch) |
115 (defvar ediff-patch-default-directory) | 114 (defvar ediff-patch-default-directory) |
119 (load-library "dired") | 118 (load-library "dired") |
120 (load-library "info") | 119 (load-library "info") |
121 (load "pcl-cvs" 'noerror))) | 120 (load "pcl-cvs" 'noerror))) |
122 (eval-when-compile | 121 (eval-when-compile |
123 (let ((load-path (cons (expand-file-name ".") load-path))) | 122 (let ((load-path (cons (expand-file-name ".") load-path))) |
123 (provide 'ediff) ; to break recursive load cycle | |
124 (or (featurep 'ediff-init) | 124 (or (featurep 'ediff-init) |
125 (load "ediff-init.el" nil nil 'nosuffix)) | 125 (load "ediff-init.el" nil nil 'nosuffix)) |
126 (or (featurep 'ediff-mult) | 126 (or (featurep 'ediff-mult) |
127 (load "ediff-mult.el" nil nil 'nosuffix)) | 127 (load "ediff-mult.el" nil nil 'nosuffix)) |
128 (or (featurep 'ediff-ptch) | 128 (or (featurep 'ediff-ptch) |
1372 (if arg (prefix-numeric-value arg)) patch-buf)) | 1372 (if arg (prefix-numeric-value arg)) patch-buf)) |
1373 (ediff-patch-buffer-internal | 1373 (ediff-patch-buffer-internal |
1374 patch-buf | 1374 patch-buf |
1375 (read-buffer | 1375 (read-buffer |
1376 "Which buffer to patch? " | 1376 "Which buffer to patch? " |
1377 (current-buffer)))) | 1377 (ediff-other-buffer patch-buf)))) |
1378 | 1378 |
1379 | 1379 |
1380 ;;;###autoload | 1380 ;;;###autoload |
1381 (defalias 'epatch 'ediff-patch-file) | 1381 (defalias 'epatch 'ediff-patch-file) |
1382 ;;;###autoload | 1382 ;;;###autoload |
1531 | 1531 |
1532 (require 'ediff-util) | 1532 (require 'ediff-util) |
1533 | 1533 |
1534 (run-hooks 'ediff-load-hook) | 1534 (run-hooks 'ediff-load-hook) |
1535 | 1535 |
1536 (provide 'ediff) | |
1537 | |
1538 | |
1536 ;;; Local Variables: | 1539 ;;; Local Variables: |
1537 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 1540 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
1538 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 1541 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
1539 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 1542 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
1540 ;;; End: | 1543 ;;; End: |