From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Ivan Shmakov <ivan@siamics.net>
Cc: control@debbugs.gnu.org, 18850@debbugs.gnu.org
Subject: bug#18850: smerge-mode: use diff-check-labels
Date: Mon, 27 Oct 2014 09:32:26 -0400 [thread overview]
Message-ID: <jwvr3xtfxlk.fsf-monnier+emacsbugs@gnu.org> (raw)
In-Reply-To: <874mupdcpm.fsf@violet.siamics.net> (Ivan Shmakov's message of "Mon, 27 Oct 2014 10:33:09 +0000")
> @@ -1163,9 +1164,12 @@ repeating the command will highlight other two parts."
> (let ((status
> (apply 'call-process diff-command nil t nil
> (append smerge-diff-switches
> - (list "-L" (concat name1 "/" file)
> - "-L" (concat name2 "/" file)
> - file1 file2)))))
> + (and (diff-check-labels)
> + (list "--label"
> + (concat name1 "/" file)
> + "--label"
> + (concat name2 "/" file)))
> + (list file1 file2)))))
> (if (eq status 0) (insert "No differences found.\n"))))
> (goto-char (point-min))
> (diff-mode)
That looks OK, yes. Tho you don't need to change -L to --label.
Stefan
next prev parent reply other threads:[~2014-10-27 13:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 9:17 bug#18824: split diff-check-labels off diff-no-select Ivan Shmakov
2014-10-26 2:41 ` Stefan Monnier
2014-10-27 10:25 ` bug#18850: smerge-mode: use diff-check-labels Ivan Shmakov
2014-10-27 10:33 ` Ivan Shmakov
2014-10-27 13:32 ` Stefan Monnier [this message]
2014-10-27 13:36 ` Ivan Shmakov
2014-10-27 17:12 ` Stefan Monnier
2014-10-28 9:19 ` Ivan Shmakov
2014-10-28 13:44 ` Stefan Monnier
2016-02-23 12:03 ` Lars Ingebrigtsen
2019-06-25 21:22 ` Lars Ingebrigtsen
2014-11-21 10:57 ` bug#18850: (ping) Emacs bugs with patches? Ivan Shmakov
2016-02-23 12:05 ` bug#18824: split diff-check-labels off diff-no-select Lars Ingebrigtsen
2019-06-25 21:18 ` 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
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=jwvr3xtfxlk.fsf-monnier+emacsbugs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=18850@debbugs.gnu.org \
--cc=control@debbugs.gnu.org \
--cc=ivan@siamics.net \
/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).