From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Dec 2010 03:47:49 +0000 (-0800)
Subject: * lisp/files.el (diff-no-select): Declare.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66f782de2eb1eb3fad467d76a46e847092e2aa5a;p=emacs.git

* lisp/files.el (diff-no-select): Declare.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32060096aa7..4043498c2e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-12-10  Glenn Morris  <rgm@gnu.org>
 
+	* files.el (diff-no-select): Declare.
+
 	* mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
 	(report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
 
diff --git a/lisp/files.el b/lisp/files.el
index 43ba34f8bef..09e2a4e0725 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4500,6 +4500,9 @@ Before and after saving the buffer, this function runs
 		   (setq buffer-backed-up nil))))))
     setmodes))
 
+(declare-function diff-no-select "diff"
+		  (old new &optional switches no-async buf))
+
 (defvar save-some-buffers-action-alist
   `((?\C-r
      ,(lambda (buf)