[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c,v |
Date: |
Sat, 19 Apr 2008 19:30:56 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/04/19 19:30:54
Index: src/keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.954
retrieving revision 1.955
diff -u -b -r1.954 -r1.955
--- src/keyboard.c 15 Apr 2008 23:36:02 -0000 1.954
+++ src/keyboard.c 19 Apr 2008 19:30:53 -0000 1.955
@@ -157,11 +157,6 @@
Lisp_Object Vshow_help_function;
-/* If a string, the message displayed before displaying a help-echo
- in the echo area. */
-
-Lisp_Object Vpre_help_message;
-
/* Nonzero means do menu prompting. */
static int menu_prompting;
@@ -2458,37 +2453,6 @@
{
if (!NILP (Vshow_help_function))
call1 (Vshow_help_function, help);
- else if (/* Don't overwrite minibuffer contents. */
- !MINI_WINDOW_P (XWINDOW (selected_window))
- /* Don't overwrite a keystroke echo. */
- && (NILP (echo_message_buffer)
- || ok_to_overwrite_keystroke_echo)
- /* Don't overwrite a prompt. */
- && !cursor_in_echo_area)
- {
- if (STRINGP (help))
- {
- int count = SPECPDL_INDEX ();
-
- if (!help_echo_showing_p)
- Vpre_help_message = current_message ();
-
- specbind (Qmessage_truncate_lines, Qt);
- message3_nolog (help, SBYTES (help),
- STRING_MULTIBYTE (help));
- unbind_to (count, Qnil);
- }
- else if (STRINGP (Vpre_help_message))
- {
- message3_nolog (Vpre_help_message,
- SBYTES (Vpre_help_message),
- STRING_MULTIBYTE (Vpre_help_message));
- Vpre_help_message = Qnil;
- }
- else
- message (0);
- }
-
help_echo_showing_p = STRINGP (help);
}
}
@@ -11753,9 +11717,6 @@
{
pending_funcalls = Qnil;
- Vpre_help_message = Qnil;
- staticpro (&Vpre_help_message);
-
Vlispy_mouse_stem = build_string ("mouse");
staticpro (&Vlispy_mouse_stem);
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Chong Yidong, 2008/04/02
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Chong Yidong, 2008/04/02
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Stefan Monnier, 2008/04/08
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Chong Yidong, 2008/04/15
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v,
Stefan Monnier <=