all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: hi-angel@yandex.ru
Cc: 34420@debbugs.gnu.org
Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
Date: Mon, 18 Feb 2019 16:51:05 -0500	[thread overview]
Message-ID: <jwv5ztg3gys.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <1550524327.8160.0@yandex.ru> (hi-angel@yandex.ru's message of "Tue, 19 Feb 2019 00:12:06 +0300")

> 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)

Did you take only smerge-mode.el ?

I changed vc.el so vc-find-conflicted-file is now autoloaded in the
`master` branch, so you'll only see it if you use the `master` branch.

> 2. Although I didn't set smerge-change-buffer-confirm to nil, there's no
> confirmation before going to another buffer.

I assume it's because you run it via `M-x`.
The confirmation only kicks in if you run it via a keybinding.


        Stefan





  reply	other threads:[~2019-02-18 21:51 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
2019-02-18 21:51                 ` Stefan Monnier [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwv5ztg3gys.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=34420@debbugs.gnu.org \
    --cc=hi-angel@yandex.ru \
    /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.