* xdisp.c (next_element_from_buffer): Remove bogus xassert condition.

bbeb4e99 · Juanma Barranquero · 5be6c7a2 · bbeb4e99 · bbeb4e99
Commit bbeb4e99 authored Oct 22, 2008 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

src/ChangeLog src/ChangeLog +5 -4

src/xdisp.c src/xdisp.c +1 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
-2008-10-02  Adrian Robert  <Adrian.B.Robert@gmail.com>
+2008-10-22  Juanma Barranquero  <lekktu@gmail.com>
+
+	* xdisp.c (next_element_from_buffer): Remove bogus xassert condition.
+
+2008-10-22  Adrian Robert  <Adrian.B.Robert@gmail.com>

 	* nsfns.m (ns_appkit_version): New function.
 	(x-server-version): Use it.
@@ -6178,7 +6182,6 @@
 	* lisp.h (Fbuffer_list): Declare.

 2008-03-17  Jan Djärv  <jan.h.d@swipnet.se>
-
 	* gtkutil.c (free_frame_tool_bar): Only call gtk_container_remove if
 	handlebox_widget is != 0.

@@ -6649,7 +6652,6 @@

 	* intervals.h (INT_LISPLIKE): Remove.  It may misfire.
 	(NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.
-
 2008-02-18  Jason Rumney  <jasonr@gnu.org>

 	* w32fns.c (Fw32_shell_execute): Encode parameters.
@@ -12979,7 +12981,6 @@
 	* xdisp.c (load_overlay_strings): Fix copy&paste typo.

 2007-11-09  Jason Rumney  <jasonr@gnu.org>
-
 	* s/ms-w32.c (USE_TOOLKIT_SCROLL_BARS): Define.

 	* w32term.c (w32_scroll_bar_handle_click): Use SCROLL_BAR_CLICK_EVENT.

--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6444,10 +6444,7 @@ next_element_from_buffer (it)
 {
  int success_p = 1;

-  /* Check this assumption, otherwise, we would never enter the
-     if-statement, below.  */
-  xassert (IT_CHARPOS (*it) >= BEGV
-	   && IT_CHARPOS (*it) <= it->stop_charpos);
+  xassert (IT_CHARPOS (*it) >= BEGV);

  if (IT_CHARPOS (*it) >= it->stop_charpos)
    {