From: Lars Ingebrigtsen <larsi@gnus.org>
To: Robin Green <robin.green@schibsted.com>
Cc: 22733@debbugs.gnu.org
Subject: bug#22733: 24.5; smerge-keep-current incorrectly edits conflict at end of file
Date: Thu, 01 Aug 2019 14:40:33 +0200 [thread overview]
Message-ID: <87lfwdm532.fsf@mouse.gnus.org> (raw)
In-Reply-To: <56C5BD4B.3020403@schibsted.com> (Robin Green's message of "Thu, 18 Feb 2016 12:47:07 +0000")
Robin Green <robin.green@schibsted.com> writes:
> I have a conflict at the end of a file, and smerge-keep-current fails to
> complete its work. The message "smerge-keep-current: Wrong type
> argument: integer-or-marker-p, nil" below may be relevant.
[...]
> Recent messages:
> user-error: No next conflict
> is undefined
> smerge-keep-current: Wrong type argument: integer-or-marker-p, nil
(I'm going through old bug reports that have unfortunately not gotten
any responses.)
I know this happened years ago, but is this something you're still
seeing now? And if so, could you `(setq debug-on-error t)' to get a
backtrace and post the backtrace?
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2019-08-01 12:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 12:47 bug#22733: 24.5; smerge-keep-current incorrectly edits conflict at end of file Robin Green
2019-08-01 12:40 ` Lars Ingebrigtsen [this message]
2019-08-01 13:19 ` Lars Ingebrigtsen
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=87lfwdm532.fsf@mouse.gnus.org \
--to=larsi@gnus.org \
--cc=22733@debbugs.gnu.org \
--cc=robin.green@schibsted.com \
/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.