[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v |
Date: |
Fri, 04 Apr 2008 07:51:34 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/04/04 07:51:30
Index: ediff-mult.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- ediff-mult.el 5 Mar 2008 08:50:20 -0000 1.58
+++ ediff-mult.el 4 Apr 2008 07:51:26 -0000 1.59
@@ -105,6 +105,8 @@
;;; Code:
+(provide 'ediff-mult)
+
(defgroup ediff-mult nil
"Multi-file and multi-buffer processing in Ediff."
:prefix "ediff-"
@@ -113,12 +115,13 @@
;; compiler pacifier
(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-util)
- (load "ediff-util.el" nil t 'nosuffix))
- ))
+ (require 'ediff-init)
+ (if (not (featurep 'ediff-util))
+ (require 'ediff-util))
+ (if (not (featurep 'ediff-ptch))
+ (require 'ediff-ptch))
+ (require 'ediff)
+ )
;; end pacifier
(require 'ediff-init)
@@ -2237,7 +2240,7 @@
overl (car overl-list)))
overl)))
-(defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
+(defun ediff-get-session-number-at-pos (point &optional meta-buffer)
(setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
meta-buffer
(current-buffer)))
@@ -2399,8 +2402,6 @@
))
-(provide 'ediff-mult)
-
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
- [Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v,
Michael Kifer <=