(smerge-ediff): Remove bogus autoload.

2 files changed, 5 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61c32c37b09..48a11e45202 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/pcvs.el b/lisp/pcvs.el
index 2c0016dcc47..b00de07e50f 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1704,8 +1704,6 @@ Signal an error if there is no backup file."
             (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.