From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Christoph Scholtes <cschol2112@googlemail.com>
Cc: emacs-devel@gnu.org
Subject: Re: New function: vc-ediff
Date: Wed, 20 Apr 2011 14:39:52 -0300 [thread overview]
Message-ID: <jwvr58wq13w.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <4DAB39C0.7050307@gmail.com> (Christoph Scholtes's message of "Sun, 17 Apr 2011 13:04:32 -0600")
>> Here is a new version of the `vc-ediff' patch. No changes on the `ediff'
>> side, all new functions and refactoring in vc.el.
> Ping.
Thanks, installed, with the subsequent tweaks below.
Stefan
=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog 2011-04-20 17:33:09 +0000
+++ doc/emacs/ChangeLog 2011-04-20 17:34:11 +0000
@@ -1,7 +1,6 @@
2011-04-20 Christoph Scholtes <cschol2112@googlemail.com>
- * maintaining.texi (Old Revisions): Add paragraph on new function
- vc-ediff.
+ * maintaining.texi (Old Revisions): Mention new function vc-ediff.
2011-03-26 Chong Yidong <cyd@stupidchicken.com>
=== modified file 'doc/emacs/maintaining.texi'
--- doc/emacs/maintaining.texi 2011-04-20 17:33:09 +0000
+++ doc/emacs/maintaining.texi 2011-04-20 17:34:38 +0000
@@ -746,10 +746,10 @@
@findex vc-ediff
The function @code{vc-ediff} works like @code{vc-diff} and provides a way to
-visually compare two revisions of a file an Ediff session, @pxref{Top, Ediff,
-ediff, The Ediff Manual}. It compares the file associated with the current
-buffer with the last repository revision. To compare two arbitrary revisions
-of the current file, call @code{vc-ediff} with a prefix argument.
+visually compare two revisions of a file in an Ediff session, @pxref{Top,
+Ediff, ediff, The Ediff Manual}. It compares the file associated with the
+current buffer with the last repository revision. To compare two arbitrary
+revisions of the current file, call @code{vc-ediff} with a prefix argument.
@vindex vc-diff-switches
@vindex vc-rcs-diff-switches
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2011-04-20 17:33:09 +0000
+++ lisp/ChangeLog 2011-04-20 17:39:15 +0000
@@ -1,7 +1,12 @@
+2011-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
+ we're in VC after all.
+
2011-04-20 Christoph Scholtes <cschol2112@googlemail.com>
* vc/vc.el (vc-diff-build-argument-list-internal)
- (vc-version-ediff, vc-ediff): New functions.
+ (vc-version-ediff, vc-ediff): New commands.
(vc-version-diff): Use vc-diff-build-argument-list-internal.
2011-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
=== modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el 2011-04-20 17:33:09 +0000
+++ lisp/vc/vc.el 2011-04-20 17:37:18 +0000
@@ -1704,10 +1704,8 @@
;; We could spin off an ediff session per file in the file set.
((= (length files) 1)
(ediff-load-version-control)
- (find-file (car files))
- (funcall
- (intern (format "ediff-%S-internal" ediff-version-control-package))
- rev1 rev2 nil))
+ (find-file (car files)) ;FIXME: find-file from Elisp is bad.
+ (ediff-vc-internal rev1 rev2 nil))
(t
(error "More than one file is not supported"))))
next prev parent reply other threads:[~2011-04-20 17:39 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 4:20 New function: vc-ediff Christoph Scholtes
2011-03-10 16:00 ` Stefan Monnier
2011-03-11 4:38 ` Christoph Scholtes
2011-03-11 20:15 ` Stefan Monnier
2011-03-12 8:38 ` Eli Zaretskii
2011-03-12 15:05 ` Christoph Scholtes
2011-03-12 17:49 ` Eli Zaretskii
2011-03-12 20:44 ` Stefan Monnier
2011-03-12 20:48 ` Eli Zaretskii
2011-03-12 21:27 ` Stefan Monnier
2011-03-19 2:24 ` Christoph Scholtes
2011-03-20 2:45 ` Stefan Monnier
2011-03-22 4:46 ` Christoph Scholtes
2011-03-27 16:03 ` Christoph Scholtes
2011-03-27 20:58 ` Stefan Monnier
2011-03-29 2:42 ` Christoph Scholtes
2011-03-29 13:46 ` Stefan Monnier
2011-03-30 3:02 ` Christoph Scholtes
2011-04-08 1:16 ` Christoph Scholtes
2011-04-17 19:04 ` Christoph Scholtes
2011-04-20 17:39 ` Stefan Monnier [this message]
2011-04-20 22:20 ` Christoph Scholtes
2011-03-13 16:16 ` Uday S Reddy
2011-03-13 18:01 ` Eli Zaretskii
2011-03-13 21:35 ` Stefan Monnier
2011-03-13 22:58 ` Christoph Scholtes
2011-03-12 15:11 ` Christoph Scholtes
2011-03-12 21:25 ` Stefan Monnier
2011-03-11 4:12 ` Michael Welsh Duggan
2011-03-11 4:44 ` Christoph Scholtes
2011-03-11 7:46 ` Uday S Reddy
2011-03-11 8:16 ` martin rudalics
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvr58wq13w.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cschol2112@googlemail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.