Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff.el @ 175:2d532a89d707 r20-3b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b14
author cvs
date Mon, 13 Aug 2007 09:50:14 +0200
parents 318232e2a3f0
children bfd6434d15b3
comparison
equal deleted inserted replaced
174:bb3568571b84 175:2d532a89d707
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 ;; Created: February 2, 1994 6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, version control. 7 ;; Keywords: comparing, merging, patching, version control.
8 8
9 (defconst ediff-version "2.65" "The current version of Ediff") 9 (defconst ediff-version "2.66" "The current version of Ediff")
10 (defconst ediff-date "May 1, 1997" "Date of last update") 10 (defconst ediff-date "July 9, 1997" "Date of last update")
11 11
12 12
13 ;; This file is part of GNU Emacs. 13 ;; This file is part of GNU Emacs.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify
107 ;;; Code: 107 ;;; Code:
108 108
109 (provide 'ediff) 109 (provide 'ediff)
110 110
111 ;; Compiler pacifier 111 ;; Compiler pacifier
112 (defvar cvs-cookie-handle)
113 (defvar ediff-last-dir-patch)
114 (defvar ediff-patch-default-directory)
115
112 (and noninteractive 116 (and noninteractive
113 (eval-when-compile 117 (eval-when-compile
114 (load-library "dired") 118 (load-library "dired")
115 (load-library "info") 119 (load-library "info")
116 (load "pcl-cvs" 'noerror))) 120 (load "pcl-cvs" 'noerror)))
134 "A comprehensive visual interface to diff & patch" 138 "A comprehensive visual interface to diff & patch"
135 :group 'tools) 139 :group 'tools)
136 140
137 141
138 (defcustom ediff-use-last-dir nil 142 (defcustom ediff-use-last-dir nil
139 "*If t, Ediff uses previous directory as default when reading file name." 143 "*If t, Ediff will use previous directory as default when reading file name."
140 :type 'boolean 144 :type 'boolean
141 :group 'ediff) 145 :group 'ediff)
142 146
143 (defvar ediff-last-dir-A nil 147 ;; Last directory used by an Ediff command for file-A.
144 "Last directory used by an Ediff command for file-A.") 148 (defvar ediff-last-dir-A nil)
145 (defvar ediff-last-dir-B nil 149 ;; Last directory used by an Ediff command for file-B.
146 "Last directory used by an Ediff command for file-B.") 150 (defvar ediff-last-dir-B nil)
147 (defvar ediff-last-dir-C nil 151 ;; Last directory used by an Ediff command for file-C.
148 "Last directory used by an Ediff command for file-C.") 152 (defvar ediff-last-dir-C nil)
149 (defvar ediff-last-dir-ancestor nil 153 ;; Last directory used by an Ediff command for the ancestor file.
150 "Last directory used by an Ediff command for the ancestor file.") 154 (defvar ediff-last-dir-ancestor nil)
151 (defvar ediff-last-merge-autostore-dir 155 ;; Last directory used by an Ediff command as the output directory for merge.
152 "Last directory used by an Ediff command as the output directory for merge.") 156 (defvar ediff-last-merge-autostore-dir)
153
154 ;; Some defvars to reduce the number of compiler warnings
155 (defvar cvs-cookie-handle)
156 (defvar ediff-last-dir-patch)
157 (defvar ediff-patch-default-directory)
158 ;; end of compiler pacifier
159 157
160 158
161 ;; Used as a startup hook to set `_orig' patch file read-only. 159 ;; Used as a startup hook to set `_orig' patch file read-only.
162 (defun ediff-set-read-only-in-buf-A () 160 (defun ediff-set-read-only-in-buf-A ()
163 (ediff-eval-in-buffer ediff-buffer-A 161 (ediff-eval-in-buffer ediff-buffer-A
876 ) ; save excursion 874 ) ; save excursion
877 875
878 (ediff-regions-internal 876 (ediff-regions-internal
879 (get-buffer buffer-A) reg-A-beg reg-A-end 877 (get-buffer buffer-A) reg-A-beg reg-A-end
880 (get-buffer buffer-B) reg-B-beg reg-B-end 878 (get-buffer buffer-B) reg-B-beg reg-B-end
881 startup-hooks 'ediff-regions-linewise nil))) ; no word mode 879 startup-hooks 'ediff-regions-linewise nil nil))) ; no word mode
882 880
883 ;; compare region beg-A to end-A of buffer-A 881 ;; compare region beg-A to end-A of buffer-A
884 ;; to regions beg-B -- end-B in buffer-B. 882 ;; to regions beg-B -- end-B in buffer-B.
885 (defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B 883 (defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B
886 startup-hooks job-name word-mode 884 startup-hooks job-name word-mode
1233 (ediff-load-version-control) 1231 (ediff-load-version-control)
1234 (funcall 1232 (funcall
1235 (intern (format "ediff-%S-internal" ediff-version-control-package)) 1233 (intern (format "ediff-%S-internal" ediff-version-control-package))
1236 rev1 rev2 startup-hooks) 1234 rev1 rev2 startup-hooks)
1237 )) 1235 ))
1236
1237
1238 ;;;###autoload
1239 (defalias 'erevision 'ediff-revision)
1238 1240
1239 1241
1240 ;; Test if version control package is loaded and load if not 1242 ;; Test if version control package is loaded and load if not
1241 ;; Is SILENT is non-nil, don't report error if package is not found. 1243 ;; Is SILENT is non-nil, don't report error if package is not found.
1242 (defun ediff-load-version-control (&optional silent) 1244 (defun ediff-load-version-control (&optional silent)