Mercurial > emacs

comparison lisp/diff.el @ 91073:4bc33ffdda1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents 424b655804ca a55a536ce0db
children 606f2d163a64
comparison
equal deleted inserted replaced
91072:74ab3ea909f9 91073:4bc33ffdda1a
70 (goto-char (point-max)) 70 (goto-char (point-max))
71 (let ((inhibit-read-only t)) 71 (let ((inhibit-read-only t))
72 (insert (format "\nDiff finished%s. %s\n" 72 (insert (format "\nDiff finished%s. %s\n"
73 (if (equal 0 code) " (no differences)" "") 73 (if (equal 0 code) " (no differences)" "")
74 (current-time-string)))))) 74 (current-time-string))))))
75
76 (defvar diff-old-file nil)
77 (defvar diff-new-file nil)
78 (defvar diff-extra-args nil)
75 79
76 ;;;###autoload 80 ;;;###autoload
77 (defun diff (old new &optional switches no-async) 81 (defun diff (old new &optional switches no-async)
78 "Find and display the differences between OLD and NEW files. 82 "Find and display the differences between OLD and NEW files.
79 Interactively the current buffer's file name is the default for NEW 83 Interactively the current buffer's file name is the default for NEW