# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1110829157 0
# Node ID 2dbd4bc756fc08ce99556f5881092f27cff61eda
# Parent  8f0fcece519db44c4efc0ded345a46bb20a6ce38
(smerge-ediff): Remove bogus autoload.

diff -r 8f0fcece519d -r 2dbd4bc756fc lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 14 17:46:09 2005 +0000
+++ b/lisp/ChangeLog	Mon Mar 14 19:39:17 2005 +0000
@@ -1,10 +1,13 @@
+2005-03-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* pcvs.el (smerge-ediff): Remove bogus autoload.
+
 2005-03-14  Lute Kamstra  <lute@gnu.org>
 
 	* emacs-lisp/debug.el (debugger-make-xrefs): Docstring fix.
 	Ignore a `*' at the beginning of a line.
 
-	* subr.el (macro-declaration-function): Move to
-	emacs-lisp/byte-run.el.
+	* subr.el (macro-declaration-function): Move to emacs-lisp/byte-run.el.
 	* emacs-lisp/byte-run.el (macro-declaration-function): Move from
 	subr.el.
 	(dont-compile, eval-when-compile, eval-and-compile): Use declare
diff -r 8f0fcece519d -r 2dbd4bc756fc lisp/pcvs.el
--- a/lisp/pcvs.el	Mon Mar 14 17:46:09 2005 +0000
+++ b/lisp/pcvs.el	Mon Mar 14 19:39:17 2005 +0000
@@ -1704,8 +1704,6 @@
 	    (message "Retrieving revision %s... Done" rev)
 	    (current-buffer))))))
 
-(eval-and-compile (autoload 'smerge-ediff "smerge-mode"))
-
 ;; FIXME: The user should be able to specify ancestor/head/backup and we should
 ;; provide sensible defaults when merge info is unavailable (rather than rely
 ;; on smerge-ediff).  Also provide sane defaults for need-merge files.