Mercurial > emacs

comparison lisp/diff.el @ 807:4f28bd14272c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Eric S. Raymond <esr@snark.thyrsus.com>
date Thu, 16 Jul 1992 21:47:34 +0000
parents 4c64c671426f
children e694e0879463
comparison
equal deleted inserted replaced
806:d42e1151eed8 807:4f28bd14272c
1 ;;; diff.el --- "DIFF" mode for handling output from unix diff utility. 1 ;;; diff.el --- "DIFF" mode for handling output from unix diff utility.
2 2
3 ;; Author: Frank P. Bresz <fpb@ittc.wec.com>
4 ;; Maintainer: FSF
5 ;; Created: 27 Jan 1989
6 ;; Last-Modified: 21 Dec 1992
7
3 ;; Copyright (C) 1990 Free Software Foundation, Inc. 8 ;; Copyright (C) 1990 Free Software Foundation, Inc.
4 ;; Written fpb@ittc.wec.com 1/27/89
5 9
6 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
7 11
8 ;; GNU Emacs is free software; you can redistribute it and/or modify 12 ;; GNU Emacs is free software; you can redistribute it and/or modify
9 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by
10 ;; the Free Software Foundation; either version 1, or (at your option) 14 ;; the Free Software Foundation; either version 2, or (at your option)
11 ;; any later version. 15 ;; any later version.
12 16
13 ;; GNU Emacs is distributed in the hope that it will be useful, 17 ;; GNU Emacs is distributed in the hope that it will be useful,
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 ;; GNU General Public License for more details. 20 ;; GNU General Public License for more details.
17 21
18 ;; You should have received a copy of the GNU General Public License 22 ;; You should have received a copy of the GNU General Public License
19 ;; along with GNU Emacs; see the file COPYING. If not, write to 23 ;; along with GNU Emacs; see the file COPYING. If not, write to
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 24 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
25
26 ;;; Commentary:
21 27
22 ;; todo: diff-switches flexibility: 28 ;; todo: diff-switches flexibility:
23 ;; (defconst diff-switches-function 29 ;; (defconst diff-switches-function
24 ;; '(lambda (file) 30 ;; '(lambda (file)
25 ;; (if (string-match "\\.el$" file) 31 ;; (if (string-match "\\.el$" file)
34 ;; Added code to support sccs diffing. 40 ;; Added code to support sccs diffing.
35 ;; also fixed one minor glitch in the 41 ;; also fixed one minor glitch in the
36 ;; search for the pattern. If you only 1 addition you won't find the end 42 ;; search for the pattern. If you only 1 addition you won't find the end
37 ;; of the pattern (minor) 43 ;; of the pattern (minor)
38 44
39 ;; 45 ;;; Code:
46
40 (defvar diff-switches nil 47 (defvar diff-switches nil
41 "*A list of switches to pass to the diff program.") 48 "*A list of switches to pass to the diff program.")
42 49
43 (defvar diff-search-pattern "^\\([0-9]\\|\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\)" 50 (defvar diff-search-pattern "^\\([0-9]\\|\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\)"
44 "Regular expression that delineates difference regions in diffs.") 51 "Regular expression that delineates difference regions in diffs.")