changeset 93016:14137c07214f

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Mon, 17 Mar 2008 00:46:44 +0000
parents 715070fd019a
children 3db097dde117
files lisp/ChangeLog
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Mar 16 17:47:34 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 17 00:46:44 2008 +0000
@@ -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