Mercurial > emacs
diff lisp/pcvs.el @ 83269:48ba3f89c89f
Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-162
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-163
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-164
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-165
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-166
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-167
Tweak obsolete function/variable warning message
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-168
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-169
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-172
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-173
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-174
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-175
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-176
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-177
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-178
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-179
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-180
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-181
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-182
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-37
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-38
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-309
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 16 Mar 2005 16:06:15 +0000 |
| parents | 2dbd4bc756fc |
| children | 7178fdb70eff 30ad2795fdab |
line wrap: on
line diff
--- a/lisp/pcvs.el Wed Mar 16 16:03:44 2005 +0000 +++ b/lisp/pcvs.el Wed Mar 16 16:06:15 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.