[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: pcvs and smerge-ediff autoload.
From: |
Stefan Monnier |
Subject: |
Re: pcvs and smerge-ediff autoload. |
Date: |
Mon, 14 Mar 2005 14:20:42 -0500 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
> With emacs -Q, smerge-ediff is fully documented, and can be invoked
> interactively.
> After loading pcvs, it is undocumented, and cannot be invoked
> interactively. This is a minor irritation, since smerge-mode now has
> to be loaded by hand before interactive use of smerge-ediff.
Duh! Thank you.
The patch below I just installed should fix this problem,
Stefan
--- pcvs.el 21 fév 2005 13:35:02 -0500 1.75
+++ pcvs.el 14 mar 2005 14:18:38 -0500
@@ -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.