diff options
author | Jack Duthen <duthen.mac.01@gmail.com> | 2012-06-03 19:10:44 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-06-03 19:10:44 +0800 |
commit | 757ee65741cc9400314f0a2cc3f83f87c21c79e6 (patch) | |
tree | 448caf7b8d784b48218430336040233b7dd0395a /lisp/progmodes/which-func.el | |
parent | cbe46e5fae3879facf5db395afd73ca2600f8a41 (diff) | |
download | emacs-757ee65741cc9400314f0a2cc3f83f87c21c79e6.tar.gz |
Improve ediff and which-func integration.
* lisp/progmodes/which-func.el (which-func-update-ediff-windows): New
function. Use it in ediff-select-hook.
Fixes: debbugs:11478
Diffstat (limited to 'lisp/progmodes/which-func.el')
-rw-r--r-- | lisp/progmodes/which-func.el | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 1c3c6a95774..d5c8a1c6792 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -337,6 +337,22 @@ If no function name is found, return nil." (funcall which-func-cleanup-function name) name)))) + +;;; Integration with other packages + +(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'." + (when (eq major-mode 'ediff-mode) + (when ediff-window-A + (which-func-update-1 ediff-window-A)) + (when ediff-window-B + (which-func-update-1 ediff-window-B)) + (when ediff-window-C + (which-func-update-1 ediff-window-C)))) + +(add-hook 'ediff-select-hook 'which-func-update-ediff-windows) + (provide 'which-func) ;;; which-func.el ends here |