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

diff --git a/src/ChangeLog b/src/ChangeLog
index d853d5b55a73918ed62a0f3953d823663633affe..f7e4b81928645366b560d717873e4cdd126f1fa4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,8 @@
-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.

diff --git a/src/xdisp.c b/src/xdisp.c
index 47ba85f7503f2bd7c2b76e550785e02a7c063cbe..1794a6d3c02a5dcdf9ec0e89096a638d822db122 100644 (file)
--- 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)
     {