(Fbyte_code): Harmonize arguments with documentation.

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index dbedca2a8179a72c6d2addecd9f6617c7443e450..e9978749e2a47966702b591e32a94010656db85e 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -29,13 +29,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "termchar.h"
 #include "termopts.h"
 #include "termhooks.h"
-#ifdef HAVE_NTGUI
+/* cm.h must come after dispextern.h on Windows.  */
 #include "dispextern.h"
 #include "cm.h"
-#else
-#include "cm.h"
-#include "dispextern.h"
-#endif /* HAVE_NTGUI */
 #include "buffer.h"
 #include "frame.h"
 #include "window.h"
@@ -1613,7 +1609,7 @@ update_line (frame, vpos)
       if (! current_frame->highlight[vpos])
        {
          if (!must_write_spaces)
-           while (obody[olen - 1] == SPACEGLYPH && olen > 0)
+           while (olen > 0 && obody[olen - 1] == SPACEGLYPH)
              olen--;
        }
       else