From: hi-angel@yandex.ru
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: 34420@debbugs.gnu.org
Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
Date: Tue, 19 Feb 2019 00:12:06 +0300 [thread overview]
Message-ID: <1550524327.8160.0@yandex.ru> (raw)
In-Reply-To: <jwvzhqtdm2e.fsf-monnier+emacs@gnu.org>
В Пн, 18 фев. 2019 в 8:49 ПП (PM), Stefan Monnier
<monnier@IRO.UMontreal.CA> написал:
>> I'll install your code as a first step,
>
> Done, as well as a subsequent patch which makes it save the buffer and
> request confirmation. Try it out and let me know of any
> remaining problems.
>
>
> Stefan
Ok, thanks, so, I'm trying the latest smerge-mode.el out, and two
issues I see:
1. On the first call of the function I get "smerge-vc-next-conflict:
Symbol’s function definition is void: vc-find-conflicted-file". This
starts working once I execute (require 'vc)
2. Although I didn't set smerge-change-buffer-confirm to nil, there's
no confirmation before going to another buffer.
next prev parent reply other threads:[~2019-02-18 21:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-10 21:14 bug#34421: [PATCH 1/2] smerge-mode: factor out going to next conflict Konstantin Kharlamov
2019-02-10 21:14 ` bug#34420: [PATCH 2/2] smerge-mode: new function to go " Konstantin Kharlamov
2019-02-10 22:30 ` bug#34420: [PATCH v2 " Konstantin Kharlamov
2019-02-13 21:44 ` bug#34420: [PATCH " Konstantin Kharlamov
2019-02-16 7:32 ` Eli Zaretskii
2019-02-16 7:32 ` Eli Zaretskii
2019-02-16 13:41 ` Stefan Monnier
2019-02-17 9:18 ` Konstantin Kharlamov
2019-02-17 15:37 ` Eli Zaretskii
2019-02-17 15:59 ` Konstantin Kharlamov
2019-02-18 3:22 ` Stefan Monnier
2019-02-18 17:49 ` Stefan Monnier
2019-02-18 21:12 ` hi-angel [this message]
2019-02-18 21:51 ` Stefan Monnier
2019-02-18 22:01 ` hi-angel
2019-02-18 23:28 ` Stefan Monnier
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1550524327.8160.0@yandex.ru \
--to=hi-angel@yandex.ru \
--cc=34420@debbugs.gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).