summaryrefslogtreecommitdiff
path: root/test/lisp/vc/diff-mode-resources/git.patch
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2025-03-03 18:37:43 +0100
committerStefan Kangas <stefankangas@gmail.com>2025-03-03 18:57:17 +0100
commit10abb87f0519b3d53d6b7078703d3a0120e3aaa8 (patch)
tree183ea373683714b48b7ee19e173a04b9218a1b6a /test/lisp/vc/diff-mode-resources/git.patch
parenteeda2a8ab1f06da5b51dc98e57ae8b4a4faa1f72 (diff)
downloademacs-10abb87f0519b3d53d6b7078703d3a0120e3aaa8.tar.gz
emacs-10abb87f0519b3d53d6b7078703d3a0120e3aaa8.tar.bz2
emacs-10abb87f0519b3d53d6b7078703d3a0120e3aaa8.zip
Fix fontification outside hunks in Git patches
* lisp/vc/diff-mode.el (diff-font-lock-keywords): Don't fontify lines in Git patches starting with + or - as added/removed, if they are either before the first hunk, or in the email signature. (Bug#75884) (diff-buffer-type): Move definition up. (diff--indicator-added-re, diff--indicator-removed-re): New variables. (diff--git-preamble-end, diff--git-footer-start) (diff--indicator-matcher-helper, diff--indicator-added-matcher) (diff--indicator-removed-matcher): New functions. * test/lisp/vc/diff-mode-tests.el (diff-mode-test-git-patch) (diff-mode-test-git-patch/before-first-hunk) (diff-mode-test-git-patch/signature): New tests. * test/lisp/vc/diff-mode-resources/git.patch: New file.
Diffstat (limited to 'test/lisp/vc/diff-mode-resources/git.patch')
-rw-r--r--test/lisp/vc/diff-mode-resources/git.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/test/lisp/vc/diff-mode-resources/git.patch b/test/lisp/vc/diff-mode-resources/git.patch
new file mode 100644
index 00000000000..05ec90d105c
--- /dev/null
+++ b/test/lisp/vc/diff-mode-resources/git.patch
@@ -0,0 +1,51 @@
+From 1234567890abcdef1234567890abcdef12345678 Mon Sep 17 00:00:00 2001
+From: Alyssa P. Hacker <alyssa.p.hacker@example.com>
+Date: Sun, 3 Mar 2025 10:30:00 -0400
+Subject: [PATCH] Subtle bug fixes and slight improvements
+
+- This is not a removed line
++ This is not an added line
+
+---
+ src/main.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/main.py b/src/main.py
+index 9f6c5fe43e47eab441232e54456c5c2b06297b65..7b3f91a8b4ed923c8f43183276e3ab36fe04f6c9 100644
+--- a/src/main.py
++++ b/src/main.py
+@@ -2,25 +2,24 @@
+
+ def main():
+ # Initialize the magic number generator
+- magic_number = 42
+- print("Magic number: ", magic_number)
+
+- # TODO: Fix the infinite loop
+- while True:
+- print("This loop will never end")
++ magic_number = 73 # After reconsidering, 73 seems more appropriate
++ print("Updated magic number: ", magic_number)
+
++ # The infinite loop was probably not the best approach
++ # while True:
++ # print("This loop will never end.")
+
+ # This part of the code handles other important tasks
+ print("Processing other tasks...")
+
+ # Error handling has been updated for clarity
+- if not fixed_it_yet:
+- print("ERROR: Still broken!")
++ if not fixed_it_yet: # This should be fine now
++ print("ERROR: No longer an issue.")
+
+ # Exiting the function on a positive note
+- print("Goodbye, cruel world!")
++ print("Goodbye, world!")
+
+ if __name__ == "__main__":
+ main()
+
+--
+2.40.0