[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/diff.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/diff.el |
Date: |
Wed, 08 May 2002 17:42:33 -0400 |
Index: emacs/lisp/diff.el
diff -c emacs/lisp/diff.el:1.43 emacs/lisp/diff.el:1.44
*** emacs/lisp/diff.el:1.43 Wed Oct 10 21:20:16 2001
--- emacs/lisp/diff.el Wed May 8 17:42:32 2002
***************
*** 68,78 ****
;; -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.")
(defvar diff-old-file nil
"This is the old file name in the comparison in this buffer.")
--- 68,82 ----
;; -n format: {a,d,c}OLDSTART LINES-CHANGED
("^[adc]\\([0-9]+\\)\\( [0-9]+\\)?$" 1)
)
! "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.")
- [Emacs-diffs] Changes to emacs/lisp/diff.el,
Richard M. Stallman <=