Commit 757ee657 authored by Jack Duthen's avatar Jack Duthen Committed by Chong Yidong
Browse files

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
parent cbe46e5f
2012-06-03 Jack Duthen <> (tiny change)
* progmodes/which-func.el (which-func-update-ediff-windows): New
function. Use it in ediff-select-hook (Bug#11478).
2012-06-03 Chong Yidong <>
* bindings.el: Remove explicit help text from format-mode-line.
......@@ -337,6 +337,22 @@ If no function name is found, return nil."
(funcall which-func-cleanup-function 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment