merge emacs-23

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0c9f55..dd29de7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-21  Kenichi Handa  <handa@m17n.org>
+
+       * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
+       header components.
+
 2011-02-19  Kenichi Handa  <handa@m17n.org>
 
        * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index fc4b642..5e9baed 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3449,6 +3449,16 @@ does not pop any summary buffer."
        (setq yank-action (list 'insert-buffer replybuffer)))
     (setq others (cons (cons "cc" cc) others))
     (setq others (cons (cons "in-reply-to" in-reply-to) others))
+    (setq others
+         (mapcar #'(lambda (elt)
+                     (cons (car elt) (if (stringp (cdr elt))
+                                         (rfc2047-decode-string (cdr elt)))))
+                 others))
+    (if (stringp to) (setq to (rfc2047-decode-string to)))
+    (if (stringp in-reply-to)
+       (setq in-reply-to (rfc2047-decode-string in-reply-to)))
+    (if (stringp cc) (setq cc (rfc2047-decode-string cc)))
+    (if (stringp subject) (setq subject (rfc2047-decode-string subject)))
     (if same-window
        (compose-mail to subject others
                      noerase nil

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a356bb..26da194 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,12 @@
 
        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
 
+2011-02-17  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
+       integer.
+
 2011-02-13  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected

diff --git a/src/font.c b/src/font.c
index ebf0b54..08309d3 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3042,7 +3042,7 @@ font_open_entity (f, entity, pixel_size)
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   int min_width, height;
-  int scaled_pixel_size;
+  int scaled_pixel_size = pixel_size;
 
   font_assert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
@@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, c)
   XSETFRAME (frame, f);
   size = AREF (spec, FONT_SIZE_INDEX);
   pixel_size = font_pixel_size (f, spec);
-  if (pixel_size == 0)
+  if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);