[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#18850: smerge-mode: use diff-check-labels
From: |
Ivan Shmakov |
Subject: |
bug#18850: smerge-mode: use diff-check-labels |
Date: |
Mon, 27 Oct 2014 10:33:09 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
block 18850 by 18824
thanks
Another try.
--
FSF associate member #7257 http://boycottsystemd.org/ … 3013 B6A0 230E 334A
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -44,6 +44,7 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
+(require 'diff) ; for diff-check-labels
(require 'diff-mode) ;For diff-auto-refine-mode.
(require 'newcomment)
@@ -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)
- bug#18824: split diff-check-labels off diff-no-select, Ivan Shmakov, 2014/10/25
- bug#18824: split diff-check-labels off diff-no-select, Stefan Monnier, 2014/10/25
- bug#18850: smerge-mode: use diff-check-labels, Ivan Shmakov, 2014/10/27
- bug#18850: smerge-mode: use diff-check-labels,
Ivan Shmakov <=
- bug#18850: smerge-mode: use diff-check-labels, Stefan Monnier, 2014/10/27
- bug#18850: smerge-mode: use diff-check-labels, Ivan Shmakov, 2014/10/27
- bug#18850: smerge-mode: use diff-check-labels, Stefan Monnier, 2014/10/27
- bug#18850: smerge-mode: use diff-check-labels, Ivan Shmakov, 2014/10/28
- bug#18850: smerge-mode: use diff-check-labels, Stefan Monnier, 2014/10/28