From 87b8ce92dbe0107d523b46276439fd19dd57c743 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 17 Mar 2008 00:48:03 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 10 ++++++++++ src/ChangeLog | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8fdbf297e1e..90800e49a0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1382,6 +1382,15 @@ * emacs-lisp/lisp.el (parens-require-spaces): Doc fix. Reported by Drew Adams . +2008-03-05 Kenichi Handa + + * 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 * 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 * nxml/rng-nxml.el (rng-preferred-prefix-alist): Add dublin core diff --git a/src/ChangeLog b/src/ChangeLog index a38335d0dc4..7bddd0a326f 100644 --- 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 + + * 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 * makefile.w32-in: Always include w32font.c in the build. -- 2.39.5