[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el |
Date: |
Sun, 19 Feb 2006 03:16:48 +0000 |
Index: emacs/lisp/ediff.el
diff -u emacs/lisp/ediff.el:1.77 emacs/lisp/ediff.el:1.78
--- emacs/lisp/ediff.el:1.77 Mon Feb 6 14:33:33 2006
+++ emacs/lisp/ediff.el Sun Feb 19 03:16:44 2006
@@ -7,8 +7,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix
-(defconst ediff-version "2.80.1" "The current version of Ediff")
-(defconst ediff-date "November 25, 2005" "Date of last update")
+(defconst ediff-version "2.81" "The current version of Ediff")
+(defconst ediff-date "February 18, 2006" "Date of last update")
;; This file is part of GNU Emacs.
@@ -107,7 +107,6 @@
;;; Code:
-(provide 'ediff)
;; Compiler pacifier
(defvar cvs-cookie-handle)
@@ -121,6 +120,7 @@
(load "pcl-cvs" 'noerror)))
(eval-when-compile
(let ((load-path (cons (expand-file-name ".") load-path)))
+ (provide 'ediff) ; to break recursive load cycle
(or (featurep 'ediff-init)
(load "ediff-init.el" nil nil 'nosuffix))
(or (featurep 'ediff-mult)
@@ -1374,7 +1374,7 @@
patch-buf
(read-buffer
"Which buffer to patch? "
- (current-buffer))))
+ (ediff-other-buffer patch-buf))))
;;;###autoload
@@ -1533,6 +1533,9 @@
(run-hooks 'ediff-load-hook)
+(provide 'ediff)
+
+
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)