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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bda6a218b08248aa792ded01500c235791a6059..16dc5bf581b97b9c2ebd98092098a35931c8453f 100644 (file)
--- 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 edfe368479ca315bc8c57a9a9b9a1d5efaa9c568..c8044f407fc876ad41dafd2c72a1275e39cc0b47 100644 (file)
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -343,6 +343,10 @@ If no function name is found, return nil."
 \f
 ;;; 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'."