summaryrefslogtreecommitdiff
path: root/lisp/diff.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2002-05-08 21:42:32 +0000
committerRichard M. Stallman <rms@gnu.org>2002-05-08 21:42:32 +0000
commit21494aabdfc99218c1147b6fb3489991540a5523 (patch)
tree252f0503c83675dcb9b2ee48f92e45a1ef93a240 /lisp/diff.el
parent534c20b22f89ffbe99a4d6a1035b74eacc544ee5 (diff)
downloademacs-21494aabdfc99218c1147b6fb3489991540a5523.tar.gz
(diff-regexp-alist): Doc fix.
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index fb1793e627b..19ec2e599ad 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -68,11 +68,15 @@
;; -n format: {a,d,c}OLDSTART LINES-CHANGED
("^[adc]\\([0-9]+\\)\\( [0-9]+\\)?$" 1)
)
- "Alist (REGEXP OLD-IDX NEW-IDX) of regular expressions to match difference
-sections in \\[diff] output. If REGEXP matches, the OLD-IDX'th
-subexpression gives the line number in the old file, and NEW-IDX'th
-subexpression gives the line number in the new file. If OLD-IDX or NEW-IDX
-is nil, REGEXP matches only half a section.")
+ "Alist of regular expressions to match difference sections in \\[diff] output.
+Each element has the form (REGEXP OLD-IDX NEW-IDX).
+Any text that REGEXP matches identifies one difference hunk
+or the header of a hunk.
+
+The OLD-IDX'th subexpression of REGEXP gives the line number
+in the old file, and NEW-IDX'th subexpression gives the line number
+in the new file. If OLD-IDX or NEW-IDX
+is nil, REGEXP matches only half a hunk.")
(defvar diff-old-file nil
"This is the old file name in the comparison in this buffer.")