[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v |
Date: |
Fri, 04 Apr 2008 07:51:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/04/04 07:51:30
Index: ediff-ptch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ediff-ptch.el 8 Jan 2008 20:44:46 -0000 1.39
+++ ediff-ptch.el 4 Apr 2008 07:51:26 -0000 1.40
@@ -27,6 +27,8 @@
;;; Code:
+(provide 'ediff-ptch)
+
(defgroup ediff-ptch nil
"Ediff patch support."
:tag "Patch"
@@ -41,14 +43,11 @@
(defvar ediff-shell)
(eval-when-compile
- (let ((load-path (cons (expand-file-name ".") load-path)))
- (or (featurep 'ediff-init)
- (load "ediff-init.el" nil t 'nosuffix))
- (or (featurep 'ediff-mult)
- (load "ediff-mult.el" nil t 'nosuffix))
- (or (featurep 'ediff)
- (load "ediff.el" nil t 'nosuffix))
- ))
+ (require 'ediff-init)
+ (if (not (featurep 'ediff-mult))
+ (require 'ediff-mult))
+ (require 'ediff)
+ )
;; end pacifier
(require 'ediff-init)
@@ -846,8 +845,6 @@
-(provide 'ediff-ptch)
-
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
- [Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v,
Michael Kifer <=