Mercurial > emacs
comparison src/keyboard.c @ 61163:d4aefe343943
(Qmouse_fixup_help_message): New var.
(syms_of_keyboard): Intern and staticpro it.
(show_help_echo): Apply mouse-fixup-help-message to help string.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Thu, 31 Mar 2005 10:11:14 +0000 |
parents | bbeddd423eb1 |
children | 662ca833c8e0 360860a0006f 7a3341d65a12 |
comparison
equal
deleted
inserted
replaced
61162:a7d2fa456335 | 61163:d4aefe343943 |
---|---|
520 Lisp_Object Qdelete_frame; | 520 Lisp_Object Qdelete_frame; |
521 Lisp_Object Qiconify_frame; | 521 Lisp_Object Qiconify_frame; |
522 Lisp_Object Qmake_frame_visible; | 522 Lisp_Object Qmake_frame_visible; |
523 Lisp_Object Qselect_window; | 523 Lisp_Object Qselect_window; |
524 Lisp_Object Qhelp_echo; | 524 Lisp_Object Qhelp_echo; |
525 | |
526 #ifdef HAVE_MOUSE | |
527 Lisp_Object Qmouse_fixup_help_message; | |
528 #endif | |
525 | 529 |
526 /* Symbols to denote kinds of events. */ | 530 /* Symbols to denote kinds of events. */ |
527 Lisp_Object Qfunction_key; | 531 Lisp_Object Qfunction_key; |
528 Lisp_Object Qmouse_click; | 532 Lisp_Object Qmouse_click; |
529 #ifdef WINDOWSNT | 533 #ifdef WINDOWSNT |
2302 | 2306 |
2303 if (!STRINGP (help)) | 2307 if (!STRINGP (help)) |
2304 return; | 2308 return; |
2305 } | 2309 } |
2306 | 2310 |
2311 #ifdef HAVE_MOUSE | |
2312 if (!noninteractive && STRINGP (help)) | |
2313 help = call1 (Qmouse_fixup_help_message, help); | |
2314 #endif | |
2315 | |
2307 if (STRINGP (help) || NILP (help)) | 2316 if (STRINGP (help) || NILP (help)) |
2308 { | 2317 { |
2309 if (!NILP (Vshow_help_function)) | 2318 if (!NILP (Vshow_help_function)) |
2310 call1 (Vshow_help_function, help); | 2319 call1 (Vshow_help_function, help); |
2311 else if (/* Don't overwrite minibuffer contents. */ | 2320 else if (/* Don't overwrite minibuffer contents. */ |
10873 Qvertical_scroll_bar = intern ("vertical-scroll-bar"); | 10882 Qvertical_scroll_bar = intern ("vertical-scroll-bar"); |
10874 staticpro (&Qvertical_scroll_bar); | 10883 staticpro (&Qvertical_scroll_bar); |
10875 Qmenu_bar = intern ("menu-bar"); | 10884 Qmenu_bar = intern ("menu-bar"); |
10876 staticpro (&Qmenu_bar); | 10885 staticpro (&Qmenu_bar); |
10877 | 10886 |
10887 #ifdef HAVE_MOUSE | |
10888 Qmouse_fixup_help_message = intern ("mouse-fixup-help-message"); | |
10889 staticpro (&Qmouse_fixup_help_message); | |
10890 #endif | |
10891 | |
10878 Qabove_handle = intern ("above-handle"); | 10892 Qabove_handle = intern ("above-handle"); |
10879 staticpro (&Qabove_handle); | 10893 staticpro (&Qabove_handle); |
10880 Qhandle = intern ("handle"); | 10894 Qhandle = intern ("handle"); |
10881 staticpro (&Qhandle); | 10895 staticpro (&Qhandle); |
10882 Qbelow_handle = intern ("below-handle"); | 10896 Qbelow_handle = intern ("below-handle"); |