*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fdbf297e1eb5c7c2e1ae09891c4b7b367802066..90800e49a0a6e2f4ffca93e7e5c042f50cb3dc1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1382,6 +1382,15 @@
        * emacs-lisp/lisp.el (parens-require-spaces): Doc fix.
        Reported by Drew Adams <drew.adams@oracle.com>.
 
+2008-03-05  Kenichi Handa  <handa@ni.aist.go.jp>
+
+       * subr.el (read-quoted-char): Resolve modifers of the character
+       event.
+
+       * comint.el (comint-exec-1): Don't change the coding-system for
+       decoding to dos-like EOL.
+       (comint-carriage-motion): Fully rewrite.
+
 2008-03-05  Juanma Barranquero  <lekktu@gmail.com>
 
        * epg.el (epg-context-include-certs): Reflow docstring.
@@ -1471,6 +1480,7 @@
        * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
        doc-string, "c-old-LEN" -> "c-old-END".
 
+>>>>>>> 1.13100
 2008-03-04  Jason Rumney  <jasonr@gnu.org>
 
        * nxml/rng-nxml.el (rng-preferred-prefix-alist): Add dublin core

diff --git a/src/ChangeLog b/src/ChangeLog
index a38335d0dc4c2e0fdffce74f6ba3bade04a8908f..7bddd0a326fbfd91131f3baad53940b82f7ed23a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -120,6 +120,17 @@
        (w32font_coverage_ok): New function.
        (add_font_entity_to_list): Use it to filter unsuitable fonts.
 
+2008-03-05  Kenichi Handa  <handa@ni.aist.go.jp>
+
+       * lread.c (Fread_char): Resolve modifiers.
+       (Fread_char_exclusive): Likewise.
+
+       * character.c (char_resolve_modifier_mask): New function.
+       (char_string): Use char_resolve_modifier_mask.
+       (Fchar_resolve_modifiers): New function.
+       (syms_of_character): Declare Fchar_resolve_modifiers as Lisp
+       function.
+
 2008-03-04  Jason Rumney  <jasonr@gnu.org>
 
        * makefile.w32-in: Always include w32font.c in the build.