Mercurial > emacs
comparison lisp/diff.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | b67d7273ec18 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; diff.el --- run `diff' in compilation-mode | 1 ;;; diff.el --- run `diff' in compilation-mode |
2 | 2 |
3 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006, | 3 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006, |
4 ;; 2007, 2008, 2009 Free Software Foundation, Inc. | 4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Frank Bresz | 6 ;; Author: Frank Bresz |
7 ;; (according to authors.el) | 7 ;; (according to authors.el) |
8 ;; Maintainer: FSF | 8 ;; Maintainer: FSF |
9 ;; Keywords: unix, tools | 9 ;; Keywords: unix, tools |