[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog keyboard.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog keyboard.c |
Date: |
Sun, 25 Oct 2009 00:40:18 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/25 00:40:17
Modified files:
src : ChangeLog keyboard.c
Log message:
* keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
string in menu maps (Bug#4471).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7824&r2=1.7825
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.1015&r2=1.1016
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7824
retrieving revision 1.7825
diff -u -b -r1.7824 -r1.7825
--- ChangeLog 24 Oct 2009 18:58:50 -0000 1.7824
+++ ChangeLog 25 Oct 2009 00:40:13 -0000 1.7825
@@ -1,3 +1,8 @@
+2009-10-25 Chong Yidong <address@hidden>
+
+ * keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
+ string in menu maps (Bug#4471).
+
2009-10-24 Chong Yidong <address@hidden>
* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call
Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -b -r1.1015 -r1.1016
--- keyboard.c 19 Oct 2009 04:27:16 -0000 1.1015
+++ keyboard.c 25 Oct 2009 00:40:16 -0000 1.1016
@@ -8561,7 +8561,6 @@
int *used_mouse_menu;
{
int mapno;
- register Lisp_Object name = Qnil;
if (used_mouse_menu)
*used_mouse_menu = 0;
@@ -8578,18 +8577,6 @@
nmaps = 1;
}
- /* Get the menu name from the first map that has one (a prompt string). */
- for (mapno = 0; mapno < nmaps; mapno++)
- {
- name = Fkeymap_prompt (maps[mapno]);
- if (!NILP (name))
- break;
- }
-
- /* If we don't have any menus, just read a character normally. */
- if (!STRINGP (name))
- return Qnil;
-
#ifdef HAVE_MENUS
/* If we got to this point via a mouse click,
use a real menu for mouse selection. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog keyboard.c,
Chong Yidong <=