merge trunk

1 files changed, 70 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a248bacc03..d62215e4eef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,69 @@
         * ftfont.c (ftfont_check_otf): Fix the case of checking just
         existence of GSUB or GPOS.
 
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (parse_buffer): Renamed to parse_string(), since that's
+        what it does.
+        (parse_string): Return nil when the document can't be parsed.
+
+2010-09-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (get_current_vm_state): New function.
+        (do_ewmh_fullscreen): Call get_current_vm_state and compare with
+        want_fullscreen so set_wm_state calls are few (Bug#7013).
+        (x_handle_net_wm_state): Move code to get_current_vm_state and
+        call that function.
+
+2010-09-14  Courtney Bane  <emacs-bugs-7626@cbane.org>  (tiny change)
+
+        * term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
+
+2010-09-14  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (encode_coding_iso_2022): Don't optimize for ASCII if
+        we may use designation or locking-shift.
+
+2010-09-14  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (detect_coding_emacs_mule): Fix checking of multibyte
+        sequence when the source is multibyte.
+
+2010-09-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
+        Don't make first argument optional.  Doc fix.
+
+2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
+
+        * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
+        parameters for the doc string.
+
+2010-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
+
+2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fns.c (Fy_or_n_p): Move to lisp/subr.el.
+        (syms_of_fns): Don't defsubr Sy_or_n_p.
+        * lisp.h: Don't declare Fy_or_n_p.
+        * fileio.c (barf_or_query_if_file_exists): Fy_or_n_p -> y-or-n-p.
+
+2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (Fxml_parse_buffer): New function to parse XML files.
+
+2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c: New file.
+        (Fhtml_parse_buffer): New function to interface to the libxml2
+        html parsing function.
+
 2010-09-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * biditype.h: Regenerate.
@@ -65,8 +128,8 @@
         characters.
 
         * term.c (encode_terminal_code): Fix the previous change.
-        (produce_glyphs): Don't set it->char_to_display here.  Don't
-        handle unibyte-display-via-language-environment here.
+        (produce_glyphs): Don't set it->char_to_display here.
+        Don't handle unibyte-display-via-language-environment here.
         (produce_special_glyphs): Set temp_it.char_to_display before
         calling produce_glyphs.
 
@@ -85,9 +148,9 @@
         (produce_stretch_glyph): Set it2.char_to_display too before
         calling x_produce_glyphs.
         (x_produce_glyphs): Simplify by using the same code for ASCII and
-        non-ASCII characters.  Don't set it->char_to_display here.  Don't
-        handle unibyte-display-via-language-environment here. For a
-        charater of no glyph, use font->space_width instead of FONT_WIDTH.
+        non-ASCII characters.  Don't set it->char_to_display here.
+        Don't handle unibyte-display-via-language-environment here.  For a
+        character of no glyph, use font->space_width instead of FONT_WIDTH.
 
 2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -109,7 +172,7 @@
 2010-08-29  Kenichi Handa  <handa@m17n.org>
 
         * term.c (encode_terminal_code): Encode byte chars to the
-        correspnding bytes.
+        corresponding bytes.
 
 2010-08-29  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -20249,7 +20312,7 @@
 
         * search.c (search_buffer): Give up BM search on case-fold-search
         if one of a target character has a case-equivalence of different
-        byte length even if that target charcter is an ASCII.
+        byte length even if that target character is an ASCII.
         (simple_search): Fix calculation of byte length of matched text.
         (boyer_moore): Fix handling of case-equivalent multibyte characters.