[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el |
Date: |
Sun, 19 Feb 2006 03:16:46 +0000 |
Index: emacs/lisp/ediff-merg.el
diff -u emacs/lisp/ediff-merg.el:1.29 emacs/lisp/ediff-merg.el:1.30
--- emacs/lisp/ediff-merg.el:1.29 Mon Feb 6 14:33:33 2006
+++ emacs/lisp/ediff-merg.el Sun Feb 19 03:16:44 2006
@@ -26,7 +26,6 @@
;;; Code:
-(provide 'ediff-merg)
;; compiler pacifier
(defvar ediff-window-A)
@@ -390,6 +389,9 @@
)))
+(provide 'ediff-merg)
+
+
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)