Mercurial > hg > xemacs-beta
diff lisp/packages/diff.el @ 26:441bb1e64a06 r19-15b96
Import from CVS: tag r19-15b96
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:51:32 +0200 |
parents | 4103f0995bd7 |
children | e04119814345 |
line wrap: on
line diff
--- a/lisp/packages/diff.el Mon Aug 13 08:51:05 2007 +0200 +++ b/lisp/packages/diff.el Mon Aug 13 08:51:32 2007 +0200 @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; File: diff.el -;; Version: $Revision: 1.2 $ +;; Version: $Revision: 1.3 $ ;; Author: This file is based on diff.el by ;; sunpitt!wpmstr!fbresz@Sun.COM 1/27/89. ;; It has been completely rewritten in July 1994 by @@ -40,6 +40,7 @@ ;;; User Variables ;; should be in to loaddefs.el now. +;;;###autoload (defvar diff-switches nil "*A list of switches (strings) to pass to the diff program.") @@ -479,6 +480,7 @@ ;;; The main command. +;;;###autoload (defun diff (old new &optional switches) "Find and display the differences between OLD and NEW files. Interactively you are prompted with the current buffer's file name for NEW @@ -570,6 +572,7 @@ (error nil)) (set-buffer curr-buff)))) +;;;###autoload (defun diff-backup (file &optional switches) "Diff this file with its backup file or vice versa. Uses the latest backup, if there are several numerical backups.