aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-08-03 18:39:37 +0200
committerJuanma Barranquero2010-08-03 18:39:37 +0200
commit9ebc731b45fea0b4d7d547cb37ca2675d5940106 (patch)
tree889b3f7a7e9860c4fd1f47b4ee814c56e946b1b8
parentd5b8058fb09545686338769edf92a4f73c166520 (diff)
downloademacs-9ebc731b45fea0b4d7d547cb37ca2675d5940106.tar.gz
emacs-9ebc731b45fea0b4d7d547cb37ca2675d5940106.zip
which-func.el (which-func-format): Split help-echo text into lines.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/which-func.el4
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0650ea89e2..00f6fcfac02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12010-08-03 Juanma Barranquero <lekktu@gmail.com> 12010-08-03 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * progmodes/which-func.el (which-func-format): Split help-echo text
4 into lines, like other mode-line tooltips.
5
3 * server.el (server-start): When using TCP sockets, force IPv4 6 * server.el (server-start): When using TCP sockets, force IPv4
4 and use a literal 127.0.0.1 for localhost. (Related to bug#6781.) 7 and use a literal 127.0.0.1 for localhost. (Related to bug#6781.)
5 8
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 6a72c161429..469786e04dd 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -145,7 +145,9 @@ Zero means compute the Imenu menu regardless of size."
145 local-map ,which-func-keymap 145 local-map ,which-func-keymap
146 face which-func 146 face which-func
147 ;;mouse-face highlight ; currently not evaluated :-( 147 ;;mouse-face highlight ; currently not evaluated :-(
148 help-echo "mouse-1: go to beginning, mouse-2: toggle rest visibility, mouse-3: go to end") 148 help-echo "mouse-1: go to beginning\n\
149mouse-2: toggle rest visibility\n\
150mouse-3: go to end")
149 "]") 151 "]")
150 "Format for displaying the function in the mode line." 152 "Format for displaying the function in the mode line."
151 :group 'which-func 153 :group 'which-func