* which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.

2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bda6a218b0..16dc5bf581b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-05-24  Glenn Morris  <rgm@gnu.org>
 
+        * progmodes/which-func.el (ediff-window-A, ediff-window-B)
+        (ediff-window-C): Declare.
+
         * obsolete/pgg-gpg.el, obsolete/pgg-pgp.el, obsolete/pgg-pgp5.el:
         Tweak requires to silence compiler.
 
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index edfe368479c..c8044f407fc 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -343,6 +343,10 @@ If no function name is found, return nil."
 
 ;;; Integration with other packages
 
+(defvar ediff-window-A)
+(defvar ediff-window-B)
+(defvar ediff-window-C)
+
 (defun which-func-update-ediff-windows ()
   "Update Which-Function mode display for Ediff windows.
 This function is meant to be called from `ediff-select-hook'."