*** empty log message ***

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

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.