mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-07 13:46:57 +00:00
Code Issues Releases Activity

Improve ediff and which-func integration.

Browse Source 
* lisp/progmodes/which-func.el (which-func-update-ediff-windows): New
function.  Use it in ediff-select-hook.

Fixes: debbugs:11478
This commit is contained in:
Jack Duthen 2012-06-03 19:10:44 +08:00 committed by Chong Yidong
parent cbe46e5fae
commit 757ee65741
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-03 Jack Duthen <duthen.mac.01@gmail.com> (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 <cyd@gnu.org>
* bindings.el: Remove explicit help text from format-mode-line.

16
lisp/progmodes/which-func.el
View File

@ -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