Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff.el @ 80:1ce6082ce73f r20-0b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b90
author cvs
date Mon, 13 Aug 2007 09:06:37 +0200
parents c7528f8e288d
children 6a378aca36af
comparison
equal deleted inserted replaced
79:5b0a5bbffab6 80:1ce6082ce73f
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.63" "The current version of Ediff") 9 (defconst ediff-version "2.64" "The current version of Ediff")
10 (defconst ediff-date "September 12, 1996" "Date of last update") 10 (defconst ediff-date "January 3, 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
104 ;; its many users. See Ediff on-line Info for the full list of those who 104 ;; its many users. See Ediff on-line Info for the full list of those who
105 ;; helped. Improved defaults in Ediff file-name reading commands. 105 ;; helped. Improved defaults in Ediff file-name reading commands.
106 106
107 ;;; Code: 107 ;;; Code:
108 108
109 (provide 'ediff)
110
111 ;; Compiler pacifier
112 (eval-when-compile
113 (let ((load-path (cons "." load-path)))
114 (load "dired")
115 (or (featurep 'ediff-init)
116 (load "ediff-init.el" nil nil 'nosuffix))
117 (or (featurep 'ediff-mult)
118 (load "ediff-mult.el" nil nil 'nosuffix))
119 (or (featurep 'ediff-ptch)
120 (load "ediff-ptch.el" nil nil 'nosuffix))
121 (or (featurep 'ediff-vers)
122 (load "ediff-vers.el" nil nil 'nosuffix))
123 (load "pcl-cvs" 'noerror)
124 ))
125 ;; end pacifier
126
109 (require 'ediff-init) 127 (require 'ediff-init)
110 ;; ediff-mult is always required, because of the registry stuff 128 (require 'ediff-mult) ; required because of the registry stuff
111 (require 'ediff-mult)
112
113 (and noninteractive
114 (eval-when-compile
115 (let ((load-path (cons (expand-file-name ".") load-path)))
116 (load-library "dired")
117 (load-file "ediff-ptch.el")
118 (load-file "ediff-vers.el")
119 (load "pcl-cvs" 'noerror))))
120 129
121 (defvar ediff-use-last-dir nil 130 (defvar ediff-use-last-dir nil
122 "*If t, Ediff uses previous directory as default when reading file name.") 131 "*If t, Ediff uses previous directory as default when reading file name.")
123 132
124 (defvar ediff-last-dir-A nil 133 (defvar ediff-last-dir-A nil
691 (stringp dir1) 700 (stringp dir1)
692 (string= merge-autostore-dir dir1)) 701 (string= merge-autostore-dir dir1))
693 (or (y-or-n-p 702 (or (y-or-n-p
694 "Directory for saving merges is the same as directory A. Sure? ") 703 "Directory for saving merges is the same as directory A. Sure? ")
695 (error "Merge of directory revisions aborted"))) 704 (error "Merge of directory revisions aborted")))
696 705
697 (setq file-list 706 (setq file-list
698 (ediff-get-directory-files-under-revision 707 (ediff-get-directory-files-under-revision
699 jobname regexp dir1 merge-autostore-dir)) 708 jobname regexp dir1 merge-autostore-dir))
700 (setq startup-hooks 709 (setq startup-hooks
701 ;; this sets various vars in the meta buffer inside 710 ;; this sets various vars in the meta buffer inside
1099 1108
1100 1109
1101 ;;;###autoload 1110 ;;;###autoload
1102 (defun ediff-merge-revisions-with-ancestor (&optional file startup-hooks) 1111 (defun ediff-merge-revisions-with-ancestor (&optional file startup-hooks)
1103 "Run Ediff by merging two revisions of a file with a common ancestor. 1112 "Run Ediff by merging two revisions of a file with a common ancestor.
1104 The file is the optional FILE argument or the file visited by the current 1113 The file is the the optional FILE argument or the file visited by the current
1105 buffer." 1114 buffer."
1106 (interactive) 1115 (interactive)
1107 (if (stringp file) (find-file file)) 1116 (if (stringp file) (find-file file))
1108 (let (rev1 rev2 ancestor-rev) 1117 (let (rev1 rev2 ancestor-rev)
1109 (setq rev1 1118 (setq rev1
1271 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 1280 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1272 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) 1281 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
1273 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) 1282 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
1274 ;;; End: 1283 ;;; End:
1275 1284
1276 (provide 'ediff)
1277 (require 'ediff-util) 1285 (require 'ediff-util)
1278 1286
1279 ;;; ediff.el ends here 1287 ;;; ediff.el ends here