comparison src/msdos.c @ 30050:ed1979c6dfb9

* xterm.c (note_mode_line_highlight, note_mouse_highlight) (note_tool_bar_highlight, XTread_socket): * msdos.c (IT_note_mode_line_highlight, IT_note_mouse_highlight) (dos_rawgetc): * w32term.c (note_mode_line_highlight, note_mouse_highlight) (note_tool_bar_highlight, w32_read_socket): Do not gratuitously ignore non-string `help-echo' properties.

30049:be64b32cd2a2

	  /* If we're on a string with `help-echo' text property,
	     arrange for the help to be displayed.  This is done by
	     setting the global variable help_echo to the help string.  */
	  help = Fget_text_property (make_number (glyph->charpos),
				     Qhelp_echo, glyph->object);
	  if (STRINGP (help))
	    help_echo = help;
	}
    }
}

	  Lisp_Object help;
	  extern Lisp_Object Qhelp_echo;

	  /* Check overlays first.  */
	  help = Qnil;
	  for (i = 0; i < noverlays && !STRINGP (help); ++i)
	    help = Foverlay_get (overlay_vec[i], Qhelp_echo); 
	    
	  /* Try text properties.  */
	  if (!STRINGP (help)
	      && ((STRINGP (glyph->object)
		   && glyph->charpos >= 0
		   && glyph->charpos < XSTRING (glyph->object)->size)
		  || (BUFFERP (glyph->object)
		      && glyph->charpos >= BEGV
		      && glyph->charpos < ZV)))
	    help = Fget_text_property (make_number (glyph->charpos),
				       Qhelp_echo, glyph->object);

	  if (STRINGP (help))
	    help_echo = help;
	}
	  
	BEGV = obegv;
	ZV = ozv;

	  help_echo = Qnil;
	  IT_note_mouse_highlight (SELECTED_FRAME(),
				   mouse_last_x, mouse_last_y);
	  /* If the contents of the global variable help_echo has
	     changed, generate a HELP_EVENT.  */
	  if (STRINGP (help_echo) || STRINGP (previous_help_echo))
	    {
	      event.kind = HELP_EVENT;
	      event.frame_or_window = Fcons (selected_frame, help_echo);
	      event.timestamp = event_timestamp ();
	      kbd_buffer_store_event (&event);

30050:ed1979c6dfb9

	  /* If we're on a string with `help-echo' text property,
	     arrange for the help to be displayed.  This is done by
	     setting the global variable help_echo to the help string.  */
	  help = Fget_text_property (make_number (glyph->charpos),
				     Qhelp_echo, glyph->object);
	  if (!NILP (help))
	    help_echo = help;
	}
    }
}

	  Lisp_Object help;
	  extern Lisp_Object Qhelp_echo;

	  /* Check overlays first.  */
	  help = Qnil;
	  for (i = 0; i < noverlays && NILP (help); ++i)
	    help = Foverlay_get (overlay_vec[i], Qhelp_echo); 
	    
	  /* Try text properties.  */
	  if (NILP (help)
	      && ((STRINGP (glyph->object)
		   && glyph->charpos >= 0
		   && glyph->charpos < XSTRING (glyph->object)->size)
		  || (BUFFERP (glyph->object)
		      && glyph->charpos >= BEGV
		      && glyph->charpos < ZV)))
	    help = Fget_text_property (make_number (glyph->charpos),
				       Qhelp_echo, glyph->object);

	  if (!NILP (help))
	    help_echo = help;
	}
	  
	BEGV = obegv;
	ZV = ozv;

	  help_echo = Qnil;
	  IT_note_mouse_highlight (SELECTED_FRAME(),
				   mouse_last_x, mouse_last_y);
	  /* If the contents of the global variable help_echo has
	     changed, generate a HELP_EVENT.  */
	  if (!NILP (help_echo) || !NILP (previous_help_echo))
	    {
	      event.kind = HELP_EVENT;
	      event.frame_or_window = Fcons (selected_frame, help_echo);
	      event.timestamp = event_timestamp ();
	      kbd_buffer_store_event (&event);