8 files changed, 88 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d4f6321faf7..25732ac9f5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2014-07-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (applicationDidFinishLaunching:): Call
+        antialiasThresholdDidChange, register for antialias changes (Bug#17534).
+        (antialiasThresholdDidChange:): New method for EmacsApp.
+
+        * nsterm.h (EmacsApp): Add antialiasThresholdDidChange.
+
+        * macfont.m (macfont_update_antialias_threshold): Remove static.
+
+        * macfont.h (macfont_update_antialias_threshold): Declare.
+
+2014-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32select.c (setup_windows_coding_system): Apply
+        CODING_ANNOTATION_MASK to the common_flags member of struct
+        coding_system.  Reported by martin rudalics <rudalics@gmx.at>.
+
+        * w16select.c (Fw16_get_clipboard_data): Apply
+        CODING_ANNOTATION_MASK to the common_flags member of struct
+        coding_system.
+
+        * xdisp.c (init_iterator): Initialize it->stop_charpos to the
+        buffer position where we are to start the iteration.
+        (handle_invisible_prop): Record in it->stop_charpos the position
+        where the invisible text ends.  (Bug#18035)
+        (hscroll_window_tree): Don't try hscrolling windows whose cursor
+        row has zero buffer position as their start position.  Reported by
+        martin rudalics <rudalics@gmx.at>.
+
+        * xdisp.c (move_it_vertically_backward, move_it_by_lines): Prevent
+        infinite looping in redisplay when display lines don't have enough
+        space to display even a single character.  (Bug#18036)
+
 2014-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * frame.h (struct frame) [USE_X_TOOLKIT]: New member shell_position.
diff --git a/src/macfont.h b/src/macfont.h
index 8b451357e42..7421cd63a79 100644
--- a/src/macfont.h
+++ b/src/macfont.h
@@ -144,4 +144,5 @@ typedef const struct _EmacsScreenFont *ScreenFontRef; /* opaque */
 
 extern void mac_register_font_driver (struct frame *f);
 extern void *macfont_get_nsctfont (struct font *font);
+extern void macfont_update_antialias_threshold (void);
 
diff --git a/src/macfont.m b/src/macfont.m
index 60f261d5549..0d702873220 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -728,7 +728,7 @@ static const struct
 
 static CGFloat macfont_antialias_threshold;
 
-static void
+void
 macfont_update_antialias_threshold (void)
 {
   int threshold;
diff --git a/src/nsterm.h b/src/nsterm.h
index 2619b710073..7ed23f583f6 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -111,6 +111,7 @@ typedef float EmacsCGFloat;
 #endif
 }
 - (void)logNotification: (NSNotification *)notification;
+- (void)antialiasThresholdDidChange:(NSNotification *)notification;
 - (void)sendEvent: (NSEvent *)theEvent;
 - (void)showPreferencesWindow: (id)sender;
 - (BOOL) openFile: (NSString *)fileName;
diff --git a/src/nsterm.m b/src/nsterm.m
index 9420031645d..64f3be6cc06 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4670,9 +4670,30 @@ ns_term_shutdown (int sig)
   ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES;
 #endif
   [NSApp setServicesProvider: NSApp];
+
+  [self antialiasThresholdDidChange:nil];
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+  [[NSNotificationCenter defaultCenter]
+    addObserver:self
+       selector:@selector(antialiasThresholdDidChange:)
+           name:NSAntialiasThresholdChangedNotification
+         object:nil];
+#endif
+#endif
+
   ns_send_appdefined (-2);
 }
 
+- (void)antialiasThresholdDidChange:(NSNotification *)notification
+{
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+  macfont_update_antialias_threshold ();
+#endif
+#endif
+}
+
 
 /* Termination sequences:
     C-x C-c:
diff --git a/src/w16select.c b/src/w16select.c
index 1e4d35b721b..c229ba5816a 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -600,7 +600,7 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
       coding.mode |= CODING_MODE_LAST_BLOCK;
       /* We explicitly disable composition handling because selection
          data should not contain any composition sequence.  */
-      coding.mode &= CODING_ANNOTATION_MASK;
+      coding.common_flags &= ~CODING_ANNOTATION_MASK;
       decode_coding_object (&coding, Qnil, 0, 0, truelen, truelen, Qt);
       ret = coding.dst_object;
       Vlast_coding_system_used = CODING_ID_NAME (coding.id);
diff --git a/src/w32select.c b/src/w32select.c
index 2ae25858bd2..7c21dde01a5 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -670,7 +670,7 @@ setup_windows_coding_system (Lisp_Object coding_system,
      which both apply to ISO6429 only.  We don't know if these really
      need to be unset on Windows, but it probably doesn't hurt
      either.  */
-  coding->mode &= ~CODING_ANNOTATION_MASK;
+  coding->common_flags &= ~CODING_ANNOTATION_MASK;
   coding->mode |= CODING_MODE_LAST_BLOCK | CODING_MODE_SAFE_ENCODING;
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index f1e01146e9f..a340c6e00dd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3034,6 +3034,7 @@ init_iterator (struct it *it, struct window *w,
      getting overlays and face properties from that position.  */
   if (charpos >= BUF_BEG (current_buffer))
     {
+      it->stop_charpos = charpos;
       it->end_charpos = ZV;
       eassert (charpos == BYTE_TO_CHAR (bytepos));
       IT_CHARPOS (*it) = charpos;
@@ -4546,7 +4547,24 @@ handle_invisible_prop (struct it *it)
               && get_overlay_strings (it, it->stop_charpos))
             {
               handled = HANDLED_RECOMPUTE_PROPS;
-              it->stack[it->sp - 1].display_ellipsis_p = display_ellipsis_p;
+              if (it->sp > 0)
+                {
+                  it->stack[it->sp - 1].display_ellipsis_p = display_ellipsis_p;
+                  /* The call to get_overlay_strings above recomputes
+                     it->stop_charpos, but it only considers changes
+                     in properties and overlays beyond iterator's
+                     current position.  This causes us to miss changes
+                     that happen exactly where the invisible property
+                     ended.  So we play it safe here and force the
+                     iterator to check for potential stop positions
+                     immediately after the invisible text.  Note that
+                     if get_overlay_strings returns non-zero, it
+                     normally also pushed the iterator stack, so we
+                     need to update the stop position in the slot
+                     below the current one.  */
+                  it->stack[it->sp - 1].stop_charpos
+                    = CHARPOS (it->stack[it->sp - 1].current.pos);
+                }
             }
           else if (display_ellipsis_p)
             {
@@ -9351,7 +9369,7 @@ move_it_vertically_backward (struct it *it, int dy)
 
   /* Estimate how many newlines we must move back.  */
   nlines = max (1, dy / default_line_pixel_height (it->w));
-  if (it->line_wrap == TRUNCATE)
+  if (it->line_wrap == TRUNCATE || nchars_per_row == 0)
     pos_limit = BEGV;
   else
     pos_limit = max (start_pos - nlines * nchars_per_row, BEGV);
@@ -9606,7 +9624,7 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
       /* Go back -DVPOS buffer lines, but no farther than -DVPOS full
          screen lines, and reseat the iterator there.  */
       start_charpos = IT_CHARPOS (*it);
-      if (it->line_wrap == TRUNCATE)
+      if (it->line_wrap == TRUNCATE || nchars_per_row == 0)
         pos_limit = BEGV;
       else
         pos_limit = max (start_charpos + dvpos * nchars_per_row, BEGV);
@@ -12847,6 +12865,13 @@ hscroll_window_tree (Lisp_Object window)
           h_margin = hscroll_margin * WINDOW_FRAME_COLUMN_WIDTH (w);
 
           if (!NILP (Fbuffer_local_value (Qauto_hscroll_mode, w->contents))
+              /* In some pathological cases, like restoring a window
+                 configuration into a frame that is much smaller than
+                 the one from which the configuration was saved, we
+                 get glyph rows whose start and end have zero buffer
+                 positions, which we cannot handle below.  Just skip
+                 such windows.  */
+              && CHARPOS (cursor_row->start.pos) >= BUF_BEG (w->contents)
               /* For left-to-right rows, hscroll when cursor is either
                  (i) inside the right hscroll margin, or (ii) if it is
                  inside the left margin and the window is already