From: Juri Linkov <juri@jurta.org>
To: kifer@cs.sunysb.edu
Cc: emacs-devel@gnu.org
Subject: Re: Ediff-patch-file with wrong default buffer
Date: Tue, 02 Feb 2010 02:31:50 +0200 [thread overview]
Message-ID: <87636gebsp.fsf@mail.jurta.org> (raw)
In-Reply-To: <87aaxmkput.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 08:54:18 +0200")
There is another problem with ediff-patch-file and bzr.
Applying a patch to a bzr tree using ediff-patch-file
asks a question:
File is under version control. Check it out? (y or n)
that makes no sense.
Maybe "Bzr" should be added to a list of backends
in `ediff-file-checked-in-p'?
=== modified file 'lisp/ediff-util.el'
--- lisp/ediff-util.el 2010-01-13 08:35:10 +0000
+++ lisp/ediff-util.el 2010-02-02 00:29:43 +0000
@@ -1127,7 +1127,7 @@ (defun ediff-file-checked-out-p (file)
(defun ediff-file-checked-in-p (file)
(and (featurep 'vc-hooks)
;; CVS files are considered not checked in
- (not (memq (vc-backend file) '(nil CVS)))
+ (not (memq (vc-backend file) '(nil CVS Bzr)))
(if (fboundp 'vc-state)
(and
(not (memq (vc-state file) '(edited needs-merge)))
--
Juri Linkov
http://www.jurta.org/emacs/
next prev parent reply other threads:[~2010-02-02 0:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-05 23:48 Fix info display of images David Kastrup
2009-12-07 17:55 ` Juri Linkov
2009-12-07 20:28 ` David Kastrup
2009-12-13 11:09 ` David Kastrup
2009-12-13 18:31 ` Juri Linkov
2009-12-14 4:16 ` Chong Yidong
2009-12-14 5:14 ` Ediff-patch-file with wrong default buffer (was: Fix info display of images) Juri Linkov
2009-12-14 5:43 ` Michael Kifer
2009-12-14 5:47 ` Ediff-patch-file with wrong default buffer Juri Linkov
2009-12-14 6:15 ` Michael Kifer
2009-12-14 6:54 ` Juri Linkov
2010-02-02 0:31 ` Juri Linkov [this message]
2010-02-02 2:34 ` Stefan Monnier
2010-02-02 22:38 ` Juri Linkov
2010-02-02 0:33 ` Juri Linkov
2009-12-14 9:35 ` Andreas Schwab
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=87636gebsp.fsf@mail.jurta.org \
--to=juri@jurta.org \
--cc=emacs-devel@gnu.org \
--cc=kifer@cs.sunysb.edu \
/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.