7 files changed, 83 insertions, 37 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b1a8f67e43..431a515def5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2011-08-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buffer.c (Fbury_buffer_internal): Rename from Funrecord_buffer.
+        Change return value to nil.
+        (Frecord_buffer): Delete unused function.
+
+2011-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte
+        buffers, return left-to-right.
+        (set_cursor_from_row): Consider candidate row a win if its glyph
+        represents a newline and point is on that newline.  Fixes cursor
+        positioning on the newline at EOL of R2L text within L2R
+        paragraph, and vice versa.
+        (try_cursor_movement): Check continued rows, in addition to
+        continuation rows.  Fixes unwarranted scroll when point enters a
+        continued line of R2L text within an L2R paragraph, or vice versa.
+        (cursor_row_p): Consider the case of point being equal to
+        MATRIX_ROW_END_CHARPOS.  Prevents cursor being stuck when moving
+        from the end of a short line to the beginning of a continued line
+        of R2L text within L2R paragraph.
+        (RECORD_MAX_MIN_POS): For max_pos, use IT_CHARPOS even for
+        composed characters.
+
+        * bidi.c (bidi_check_type): Use xassert.
+        (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
+        members.
+
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_get_type): Abort if we get zero as the bidi type of
+        a character.
+
+2011-08-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsfont.m (ns_otf_to_script): Fix typo.
+
+2011-08-22  Kenichi Handa  <handa@m17n.org>
+
+        * chartab.c (Fset_char_table_extra_slot): Do not inhibit setting a
+        extra slot even if the purpose is char-code-property-table.
+
 2011-08-23  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (redisplay_window): When computing centering_position,
diff --git a/src/bidi.c b/src/bidi.c
index 7517eca5aed..425a0be9578 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -108,8 +108,12 @@ bidi_get_type (int ch, bidi_dir_t override)
     abort ();
 
   default_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch));
-  if (default_type == 0)
-    default_type = STRONG_L;
+  /* Every valid character code, even those that are unassigned by the
+     UCD, have some bidi-class property, according to
+     DerivedBidiClass.txt file.  Therefore, if we ever get UNKNOWN_BT
+     (= zero) code from CHAR_TABLE_REF, that's a bug.  */
+  if (default_type == UNKNOWN_BT)
+    abort ();
 
   if (override == NEUTRAL_DIR)
     return default_type;
@@ -142,11 +146,10 @@ bidi_get_type (int ch, bidi_dir_t override)
     }
 }
 
-static void
+static inline void
 bidi_check_type (bidi_type_t type)
 {
-  if (type < UNKNOWN_BT || type > NEUTRAL_ON)
-    abort ();
+  xassert (UNKNOWN_BT <= type && type <= NEUTRAL_ON);
 }
 
 /* Given a bidi TYPE of a character, return its category.  */
@@ -536,6 +539,8 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
       bidi_cache[idx].next_for_neutral = bidi_it->next_for_neutral;
       bidi_cache[idx].next_for_ws = bidi_it->next_for_ws;
       bidi_cache[idx].ignore_bn_limit = bidi_it->ignore_bn_limit;
+      bidi_cache[idx].disp_pos = bidi_it->disp_pos;
+      bidi_cache[idx].disp_prop_p = bidi_it->disp_prop_p;
     }
 
   bidi_cache_last_idx = idx;
diff --git a/src/buffer.c b/src/buffer.c
index 45d6fa36d04..832044ae6f4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1698,27 +1698,16 @@ record_buffer (Lisp_Object buffer)
     call1 (Vrun_hooks, Qbuffer_list_update_hook);
 }
 
-DEFUN ("record-buffer", Frecord_buffer, Srecord_buffer, 1, 1, 0,
-       doc: /* Move BUFFER to the front of the buffer list.
-Return BUFFER.  */)
-  (Lisp_Object buffer)
-{
-  CHECK_BUFFER (buffer);
-
-  record_buffer (buffer);
-
-  return buffer;
-}
 
-  /* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
-     buffer is killed.  For the selected frame's buffer list this moves
-     BUFFER to its end even if it was never shown in that frame.  If
-     this happens we have a feature, hence `unrecord-buffer' should be
-     called only when BUFFER was shown in the selected frame.  */
+/* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
+   buffer is killed.  For the selected frame's buffer list this moves
+   BUFFER to its end even if it was never shown in that frame.  If
+   this happens we have a feature, hence `unrecord-buffer' should be
+   called only when BUFFER was shown in the selected frame.  */
 
-DEFUN ("unrecord-buffer", Funrecord_buffer, Sunrecord_buffer, 1, 1, 0,
-       doc: /* Move BUFFER to the end of the buffer list.
-Return BUFFER.  */)
+DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
+       1, 1, 0,
+       doc: /* Move BUFFER to the end of the buffer list.  */)
   (Lisp_Object buffer)
 {
   Lisp_Object aelt, aelt_cons, tem;
@@ -1746,7 +1735,7 @@ Return BUFFER.  */)
   if (!NILP (Vrun_hooks))
     call1 (Vrun_hooks, Qbuffer_list_update_hook);
 
-  return buffer;
+  return Qnil;
 }
 
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
@@ -6034,8 +6023,7 @@ Functions running this hook are `get-buffer-create',
   defsubr (&Sother_buffer);
   defsubr (&Sbuffer_enable_undo);
   defsubr (&Skill_buffer);
-  defsubr (&Srecord_buffer);
-  defsubr (&Sunrecord_buffer);
+  defsubr (&Sbury_buffer_internal);
   defsubr (&Sset_buffer_major_mode);
   defsubr (&Scurrent_buffer);
   defsubr (&Sset_buffer);
diff --git a/src/chartab.c b/src/chartab.c
index 0cabaac4cf5..1d4ac04312a 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -589,8 +589,6 @@ DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
   (Lisp_Object char_table, Lisp_Object n, Lisp_Object value)
 {
   CHECK_CHAR_TABLE (char_table);
-  if (EQ (XCHAR_TABLE (char_table)->purpose, Qchar_code_property_table))
-    error ("Can't change extra-slot of char-code-property-table");
   CHECK_NUMBER (n);
   if (XINT (n) < 0
       || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
diff --git a/src/nsfont.m b/src/nsfont.m
index 60f8c5321aa..c4d9123faef 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -303,7 +303,7 @@ static NSString
 {
     Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist);
     return CONSP (script)
-        ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME XCDR ((script)))]
+        ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME (XCDR ((script))))]
         : @"";
 }
 
diff --git a/src/process.c b/src/process.c
index 2125478907f..977cfb964e2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5186,6 +5186,9 @@ read_process_output (Lisp_Object proc, register int channel)
           p->decoding_carryover = coding->carryover_bytes;
         }
       if (SBYTES (text) > 0)
+        /* FIXME: It's wrong to wrap or not based on debug-on-error, and
+           sometimes it's simply wrong to wrap (e.g. when called from
+           accept-process-output).  */
         internal_condition_case_1 (read_process_output_call,
                                    Fcons (outstream,
                                           Fcons (proc, Fcons (text, Qnil))),
diff --git a/src/xdisp.c b/src/xdisp.c
index f38c2828b8e..580bd59908b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13857,7 +13857,14 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                           && glyph->charpos != pt_old)))))
         return 0;
       /* If this candidate gives an exact match, use that.  */
-      if (!(BUFFERP (glyph->object) && glyph->charpos == pt_old)
+      if (!((BUFFERP (glyph->object) && glyph->charpos == pt_old)
+            /* If this candidate is a glyph created for the
+               terminating newline of a line, and point is on that
+               newline, it wins because it's an exact match.  */
+            || (!row->continued_p
+                && INTEGERP (glyph->object)
+                && glyph->charpos == 0
+                && pt_old == MATRIX_ROW_END_CHARPOS (row) - 1))
           /* Otherwise, keep the candidate that comes from a row
              spanning less buffer positions.  This may win when one or
              both candidate positions are on glyphs that came from
@@ -14639,7 +14646,8 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                     }
                   ++row;
                 }
-              while ((MATRIX_ROW_CONTINUATION_LINE_P (row)
+              while (((MATRIX_ROW_CONTINUATION_LINE_P (row)
+                       || row->continued_p)
                       && MATRIX_ROW_BOTTOM_Y (row) <= last_y)
                      || (MATRIX_ROW_START_CHARPOS (row) == PT
                          && MATRIX_ROW_BOTTOM_Y (row) < last_y));
@@ -18114,7 +18122,8 @@ cursor_row_p (struct glyph_row *row)
 {
   int result = 1;
 
-  if (PT == CHARPOS (row->end.pos))
+  if (PT == CHARPOS (row->end.pos)
+      || PT == MATRIX_ROW_END_CHARPOS (row))
     {
       /* Suppose the row ends on a string.
          Unless the row is continued, that means it ends on a newline
@@ -18509,10 +18518,10 @@ display_line (struct it *it)
           min_pos = current_pos;                                \
           min_bpos = current_bpos;                              \
         }                                                       \
-      if (current_pos > max_pos)                                \
+      if (IT_CHARPOS (*it) > max_pos)                           \
         {                                                       \
-          max_pos = current_pos;                                \
-          max_bpos = current_bpos;                              \
+          max_pos = IT_CHARPOS (*it);                           \
+          max_bpos = IT_BYTEPOS (*it);                          \
         }                                                       \
     }                                                           \
   while (0)
@@ -19119,7 +19128,8 @@ See also `bidi-paragraph-direction'.  */)
       buf = XBUFFER (buffer);
     }
 
-  if (NILP (BVAR (buf, bidi_display_reordering)))
+  if (NILP (BVAR (buf, bidi_display_reordering))
+      || NILP (BVAR (buf, enable_multibyte_characters)))
     return Qleft_to_right;
   else if (!NILP (BVAR (buf, bidi_paragraph_direction)))
     return BVAR (buf, bidi_paragraph_direction);