Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-diff.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
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23 23
24 ;;; Code: 24 ;;; Code:
25
26 (provide 'ediff-diff)
27
28 ;; compiler pacifier
29 (defvar ediff-default-variant)
30
31 (eval-when-compile
32 (let ((load-path (cons "." load-path)))
33 (or (featurep 'ediff-init)
34 (load "ediff-init.el" nil nil 'nosuffix))
35 (or (featurep 'ediff-util)
36 (load "ediff-util.el" nil nil 'nosuffix))
37 ))
38 ;; end pacifier
25 39
26 (require 'ediff-init) 40 (require 'ediff-init)
27 41
28 42
29 (defvar ediff-shell 43 (defvar ediff-shell
1202 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 1216 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1203 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) 1217 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
1204 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) 1218 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
1205 ;;; End: 1219 ;;; End:
1206 1220
1207 (provide 'ediff-diff)
1208
1209 1221
1210 ;; ediff-diff.el ends here 1222 ;; ediff-diff.el ends here