(smerge-ediff): Remove bogus autoload.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61c32c37b09ba805899083f7455b7c5a022353c6..48a11e452025c0103a2cef388dbe92125b79abac 100644 (file)
--- 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 2c0016dcc4777cc6db347addd50c083fcd4e05a4..b00de07e50f10a44bcfb964a274fbebe1c98844b 100644 (file)
--- 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.