[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#37395: [PATCH v3] diff-mode.el: take into account patch separators
From: |
Konstantin Kharlamov |
Subject: |
bug#37395: [PATCH v3] diff-mode.el: take into account patch separators |
Date: |
Mon, 16 Sep 2019 23:26:43 +0300 |
* lisp/vc/diff-mode.el (diff-prev-line-if-patch-separator):
An inline function to return prev. line if it has
git-format-patch separator.
(diff-end-of-hunk): Make use of
diff-prev-line-if-patch-separator
diff-buffer-type: whether a buffer is a git-diff
(define-derived-mode): set diff-buffer-type to appropriate
value
---
v3: detect whether buffer has git-diff format.
lisp/vc/diff-mode.el | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 19f9c802d4..5e74dbc18c 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -511,6 +511,20 @@ diff-hunk-style
(goto-char (match-end 0)))
style)
+(defsubst diff-prev-line-if-patch-separator ()
+ "Return previous line if it has patch separator produced by
+git-format-patch."
+ (pcase diff-buffer-type
+ ('git
+ (save-excursion
+ (let ((old-point (point)))
+ (previous-line)
+ (beginning-of-line)
+ (if (looking-at "^-- $")
+ (point)
+ old-point))))
+ (_ (point))))
+
(defun diff-end-of-hunk (&optional style donttrustheader)
"Advance to the end of the current hunk, and return its position."
(let (end)
@@ -561,7 +575,8 @@ diff-end-of-hunk
(goto-char (or end (point-max)))
(while (eq ?\n (char-before (1- (point))))
(forward-char -1)
- (setq end (point)))))
+ (setq end (point))))
+ (setq end (diff-prev-line-if-patch-separator)))
;; The return value is used by easy-mmode-define-navigation.
(goto-char (or end (point-max)))))
@@ -1426,6 +1441,8 @@ diff--font-lock-cleanup
(defvar whitespace-style)
(defvar whitespace-trailing-regexp)
+(setq-local diff-buffer-type nil)
+
;;;###autoload
(define-derived-mode diff-mode fundamental-mode "Diff"
"Major mode for viewing/editing context diffs.
@@ -1491,7 +1508,11 @@ diff-mode
(add-function :filter-return (local 'filter-buffer-substring-function)
#'diff--filter-substring)
(unless buffer-file-name
- (hack-dir-local-variables-non-file-buffer)))
+ (hack-dir-local-variables-non-file-buffer))
+ (save-excursion
+ (if (re-search-forward "^diff --git" nil t)
+ (setq diff-buffer-type 'git)
+ (setq diff-buffer-type nil))))
;;;###autoload
(define-minor-mode diff-minor-mode
--
2.23.0