[Emacs-diffs] /srv/bzr/emacs/trunk r112699: * which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.

[Glenn Morris]

------------------------------------------------------------
revno: 112699
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-23 20:49:17 -0700
message:
  * which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.
modified:
  lisp/ChangeLog
  lisp/progmodes/which-func.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-24 03:47:23 +0000
+++ b/lisp/ChangeLog    2013-05-24 03:49:17 +0000
@@ -1,5 +1,8 @@
 2013-05-24  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2013-01-15 04:20:13 +0000
+++ b/lisp/progmodes/which-func.el      2013-05-24 03:49:17 +0000
@@ -343,6 +343,10 @@
 
 ;;; 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'."