diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-23 20:49:17 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-23 20:49:17 -0700 |
| commit | 36b9d0851b10a67438f633734569e30adcc7cac1 (patch) | |
| tree | 083f0b4b6b21137ee70ca5f819df504559e0307b | |
| parent | e354ae76cf348ce78f3e179a605d6da1e76a6d58 (diff) | |
| download | emacs-36b9d0851b10a67438f633734569e30adcc7cac1.tar.gz | |
* which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/which-func.el | 4 |
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'." |