from trunk

8 files changed, 23 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e18591b345b..72552a34d30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-15  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.
+
+2010-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsterm.m (Qnone): Define.
+
+        * nsfns.m (Qnone): Move definition to nsterm.m.
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cf5dbd53697..fbe3f752aed 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -4776,7 +4776,7 @@
         New struct face with associated typedef FACE declared, along with
         accessing macros.
 
-        * scroll.c (do_scrolling): Don't bcopy non-existant `nruns' or
+        * scroll.c (do_scrolling): Don't bcopy non-existent `nruns' or
         `face_list' elements.  Do copy new `max_ascent' frame element.
 
         * dispnew.c (scroll_frame_lines): All references to frame elements
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index fcdf3b9bf34..de162cb39bc 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -11848,7 +11848,7 @@
 
         * w32fns.c (w32_strict_fontnames): New variable.
         (Fx_create_frame): Formatting fix.
-        (w32_load_system_font): Keep trying to load non-existant font
+        (w32_load_system_font): Keep trying to load non-existent font
         if w32_strict_fontnames is nil.  Formatting fix.
         (syms_of_w32fns): Add w32-strict-fontnames.
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index e4bf486aaff..b161a21eb72 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -834,7 +834,7 @@
 2001-10-02  Miles Bader  <miles@gnu.org>
 
         * textprop.c (Fnext_char_property_change)
-        (Fprevious_char_property_change): Remove reference to non-existant
+        (Fprevious_char_property_change): Remove reference to non-existent
         argument OBJECT from doc-string.
 
 2001-10-01  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/nsfns.m b/src/nsfns.m
index 9fdcaa47c8c..357222bb18a 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -80,8 +80,8 @@ extern Lisp_Object Qface_set_after_frame_default;
 extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
+extern Lisp_Object Qnone;
 
-Lisp_Object Qnone;
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
 
@@ -2606,8 +2606,6 @@ syms_of_nsfns ()
 {
   int i;
 
-  Qnone = intern ("none");
-  staticpro (&Qnone);
   Qfontsize = intern ("fontsize");
   staticpro (&Qfontsize);
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 69cece47b0e..a102267920c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -141,8 +141,7 @@ Lisp_Object ns_input_color, ns_input_text, ns_working_text;
 Lisp_Object ns_input_spi_name, ns_input_spi_arg;
 Lisp_Object Vx_toolkit_scroll_bars;
 static Lisp_Object Qmodifier_value;
-/* TODO: unsure why these defined in term files, anyway we need in keymap.c */
-Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
+Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
 extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
 
 /* Specifies which emacs modifier should be generated when NS receives
@@ -6151,6 +6150,7 @@ syms_of_nsterm ()
   DEFSYM (Qmeta, "meta");
   DEFSYM (Qsuper, "super");
   DEFSYM (Qcontrol, "control");
+  DEFSYM (Qnone, "none");
   Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
   Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
   Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index cb05cd49807..f2bd0f44b50 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Windows 2000, though most users of older systems will have it
    since it installs with Internet Explorer 5.0 and other software.
    We only enable the feature if it is available, so there is no chance
-   of calling non-existant functions.  */
+   of calling non-existent functions.  */
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x500
 #include <windows.h>
diff --git a/src/xdisp.c b/src/xdisp.c
index b20061b6b3b..ef9c7453d75 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5638,11 +5638,11 @@ static int (* get_next_element[NUM_IT_METHODS]) P_ ((struct it *it)) =
 /* Return 1 iff a character at CHARPOS (and BYTEPOS) is composed
    (possibly with the following characters).  */
 
-#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS)                             \
+#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS,END_CHARPOS)                 \
   ((IT)->cmp_it.id >= 0                                                 \
    || ((IT)->cmp_it.stop_pos == (CHARPOS)                               \
        && composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS,       \
-                                 (IT)->end_charpos, (IT)->w,            \
+                                 END_CHARPOS, (IT)->w,                  \
                                  FACE_FROM_ID ((IT)->f, (IT)->face_id), \
                                  (IT)->string)))
 
@@ -6300,7 +6300,7 @@ next_element_from_string (it)
           return 0;
         }
       else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-                                IT_STRING_BYTEPOS (*it))
+                                IT_STRING_BYTEPOS (*it), SCHARS (it->string))
                && next_element_from_composition (it))
         {
           return 1;
@@ -6336,7 +6336,7 @@ next_element_from_string (it)
           CHARPOS (position) = BYTEPOS (position) = -1;
         }
       else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-                                IT_STRING_BYTEPOS (*it))
+                                IT_STRING_BYTEPOS (*it), it->string_nchars)
                && next_element_from_composition (it))
         {
           return 1;
@@ -6523,7 +6523,8 @@ next_element_from_buffer (it)
           && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
         run_redisplay_end_trigger_hook (it);
 
-      if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it))
+      if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it),
+                           it->end_charpos)
           && next_element_from_composition (it))
         {
           return 1;