upstream

4 files changed, 66 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7eb18593993..ceed28a7a7f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2011-08-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (parse_image_spec): Check for nonnegative, not for positive,
+        when checking :margin (Bug#9390).
+        (IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR):
+        Renamed from IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
+        so that the name doesn't mislead.  All uses changed.
+
+2011-08-28  Johan Bockgård  <bojohan@gnu.org>
+
+        * term.c (init_tty) [HAVE_GPM]: Move mouse settings after
+        set_tty_hooks.
+
+2011-08-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_to): Don't bail out early when reaching
+        position beyond to_charpos, if we are scanning backwards.
+        (move_it_vertically_backward): When DY == 0, make sure we get to
+        the first character in the line after the newline.
+
 2011-08-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         * ccl.c: Improve and simplify overflow checking (Bug#9196).
diff --git a/src/image.c b/src/image.c
index d0d28bea582..d6bfc4050ca 100644
--- a/src/image.c
+++ b/src/image.c
@@ -691,7 +691,7 @@ enum image_value_type
   IMAGE_STRING_OR_NIL_VALUE,
   IMAGE_SYMBOL_VALUE,
   IMAGE_POSITIVE_INTEGER_VALUE,
-  IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
+  IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR,
   IMAGE_NON_NEGATIVE_INTEGER_VALUE,
   IMAGE_ASCENT_VALUE,
   IMAGE_INTEGER_VALUE,
@@ -798,12 +798,12 @@ parse_image_spec (Lisp_Object spec, struct image_keyword *keywords,
             return 0;
           break;
 
-        case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR:
-          if (RANGED_INTEGERP (1, value, INT_MAX))
+        case IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR:
+          if (RANGED_INTEGERP (0, value, INT_MAX))
             break;
           if (CONSP (value)
-              && RANGED_INTEGERP (1, XCAR (value), INT_MAX)
-              && RANGED_INTEGERP (1, XCDR (value), INT_MAX))
+              && RANGED_INTEGERP (0, XCAR (value), INT_MAX)
+              && RANGED_INTEGERP (0, XCDR (value), INT_MAX))
             break;
           return 0;
 
@@ -2256,7 +2256,7 @@ static const struct image_keyword xbm_format[XBM_LAST] =
   {":foreground",       IMAGE_STRING_OR_NIL_VALUE,              0},
   {":background",       IMAGE_STRING_OR_NIL_VALUE,              0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -3051,7 +3051,7 @@ static const struct image_keyword xpm_format[XPM_LAST] =
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -4980,7 +4980,7 @@ static const struct image_keyword pbm_format[PBM_LAST] =
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -5395,7 +5395,7 @@ static const struct image_keyword png_format[PNG_LAST] =
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -6015,7 +6015,7 @@ static const struct image_keyword jpeg_format[JPEG_LAST] =
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversions",      IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -6565,7 +6565,7 @@ static const struct image_keyword tiff_format[TIFF_LAST] =
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversions",      IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -7002,7 +7002,7 @@ static const struct image_keyword gif_format[GIF_LAST] =
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -7487,7 +7487,7 @@ static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] =
     {":data",           IMAGE_STRING_VALUE,                     0},
     {":file",           IMAGE_STRING_VALUE,                     0},
     {":ascent",         IMAGE_ASCENT_VALUE,                     0},
-    {":margin",         IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+    {":margin",         IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
     {":relief",         IMAGE_INTEGER_VALUE,                    0},
     {":conversion",     IMAGE_DONT_CHECK_VALUE_TYPE,            0},
     {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -8010,7 +8010,7 @@ static const struct image_keyword svg_format[SVG_LAST] =
   {":data",             IMAGE_STRING_VALUE,                     0},
   {":file",             IMAGE_STRING_VALUE,                     0},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
@@ -8405,7 +8405,7 @@ static const struct image_keyword gs_format[GS_LAST] =
   {":loader",           IMAGE_FUNCTION_VALUE,                   0},
   {":bounding-box",     IMAGE_DONT_CHECK_VALUE_TYPE,            1},
   {":ascent",           IMAGE_ASCENT_VALUE,                     0},
-  {":margin",           IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,   0},
+  {":margin",           IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR, 0},
   {":relief",           IMAGE_INTEGER_VALUE,                    0},
   {":conversion",       IMAGE_DONT_CHECK_VALUE_TYPE,            0},
   {":heuristic-mask",   IMAGE_DONT_CHECK_VALUE_TYPE,            0},
diff --git a/src/term.c b/src/term.c
index f3bf3a947cb..8672a2417c8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3138,11 +3138,6 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
   encode_terminal_src_size = 0;
   encode_terminal_dst_size = 0;
 
-#ifdef HAVE_GPM
-  terminal->mouse_position_hook = term_mouse_position;
-  tty->mouse_highlight.mouse_face_window = Qnil;
-#endif
-
 
 #ifndef DOS_NT
   set_tty_hooks (terminal);
@@ -3402,6 +3397,11 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
   tty->TN_max_colors = 16;  /* Required to be non-zero for tty-display-color-p */
 #endif  /* DOS_NT */
 
+#ifdef HAVE_GPM
+  terminal->mouse_position_hook = term_mouse_position;
+  tty->mouse_highlight.mouse_face_window = Qnil;
+#endif
+
   terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
   init_kboard (terminal->kboard);
   KVAR (terminal->kboard, Vwindow_system) = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index 7e06938b3d3..8261291f8cc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8414,7 +8414,14 @@ move_it_to (struct it *it, EMACS_INT to_charpos, int to_x, int to_y, int to_vpos
       else if (BUFFERP (it->object)
                && (it->method == GET_FROM_BUFFER
                    || it->method == GET_FROM_STRETCH)
-               && IT_CHARPOS (*it) >= to_charpos)
+               && IT_CHARPOS (*it) >= to_charpos
+               /* Under bidi iteration, a call to set_iterator_to_next
+                  can scan far beyond to_charpos if the initial
+                  portion of the next line needs to be reordered.  In
+                  that case, give move_it_in_display_line_to another
+                  chance below.  */
+               && !(it->bidi_p
+                    && it->bidi_it.scan_dir == -1))
         skip = MOVE_POS_MATCH_OR_ZV;
       else
         skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS);
@@ -8549,7 +8556,8 @@ move_it_vertically_backward (struct it *it, int dy)
   reseat_1 (it, it->current.pos, 1);
 
   /* We are now surely at a line start.  */
-  it->current_x = it->hpos = 0;
+  it->current_x = it->hpos = 0; /* FIXME: this is incorrect when bidi
+                                   reordering is in effect.  */
   it->continuation_lines_width = 0;
 
   /* Move forward and see what y-distance we moved.  First move to the
@@ -8583,10 +8591,25 @@ move_it_vertically_backward (struct it *it, int dy)
   if (dy == 0)
     {
       /* DY == 0 means move to the start of the screen line.  The
-         value of nlines is > 0 if continuation lines were involved.  */
+         value of nlines is > 0 if continuation lines were involved,
+         or if the original IT position was at start of a line.  */
       RESTORE_IT (it, it, it2data);
       if (nlines > 0)
         move_it_by_lines (it, nlines);
+      /* The above code moves us to some position NLINES down,
+         usually to its first glyph (leftmost in an L2R line), but
+         that's not necessarily the start of the line, under bidi
+         reordering.  We want to get to the character position
+         that is immediately after the newline of the previous
+         line.  */
+      if (it->bidi_p && IT_CHARPOS (*it) > BEGV
+          && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
+        {
+          EMACS_INT nl_pos =
+            find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1);
+
+          move_it_to (it, nl_pos, -1, -1, -1, MOVE_TO_POS);
+        }
       bidi_unshelve_cache (it3data, 1);
     }
   else