# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1293197784 -32400
# Node ID 60c81b6836dcd645777db4ee772f49b4431e8c44
# Parent  108420a304c27d837a964420f3d95e86b8b51ad9# Parent  72501dc91d7c255d2a96739d4367da532a789d35
merge emacs-23

diff -r 108420a304c2 -r 60c81b6836dc etc/ChangeLog
--- a/etc/ChangeLog	Fri Dec 24 17:49:24 2010 +0900
+++ b/etc/ChangeLog	Fri Dec 24 22:36:24 2010 +0900
@@ -1,3 +1,7 @@
+2010-12-24  Kenichi Handa  <handa@m17n.org>
+
+	* NEWS: Describe the changes for rmail's MIME handling.
+
 2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
 
 	* schema/schemas.xml: Add DocBook (Bug#7491).
diff -r 108420a304c2 -r 60c81b6836dc etc/NEWS
--- a/etc/NEWS	Fri Dec 24 17:49:24 2010 +0900
+++ b/etc/NEWS	Fri Dec 24 22:36:24 2010 +0900
@@ -74,23 +74,23 @@
 
 ** Rmail
 
-** The default value of `rmail-enable-mime' is now t.  Rmail decodes
+*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
 MIME contents automatically.  You can customize the variable
 `rmail-enable-mime' back to `nil' to disable this automatic MIME
 decoding.
 
-** The command `rmail-mime' change the displaying of a MIME message
+*** The command `rmail-mime' change the displaying of a MIME message
 between decoded presentation form and raw data if `rmail-enable-mime'
 is non-nil.  And, with prefix argument, it change only the displaying
 of the MIME entity at point.
 
-** The new command TAB (rmail-mime-next-item) moves point to the next
-item of MIME message.
-
-** The new command backtab (rmail-mime-previous-item) moves point to
-the previous item of MIME message.
-
-** The new command RET (rmail-mime-toggle-hidden) hide or show the
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
 body of the MIME entity at point.
 
 ** Obsolete packages
diff -r 108420a304c2 -r 60c81b6836dc lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Fri Dec 24 17:49:24 2010 +0900
+++ b/lisp/mail/rmail.el	Fri Dec 24 22:36:24 2010 +0900
@@ -4287,7 +4287,7 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "faa9e26c7781c426785e671a040128ad")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6c12c2d0563ae855f1069d7a80b8244a")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff -r 108420a304c2 -r 60c81b6836dc src/ChangeLog
--- a/src/ChangeLog	Fri Dec 24 17:49:24 2010 +0900
+++ b/src/ChangeLog	Fri Dec 24 22:36:24 2010 +0900
@@ -1,3 +1,7 @@
+2010-12-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_check_fullscreen): Fix pixel/character mixup.
+
 2010-12-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (Fformat_mode_line): Fix last change.
diff -r 108420a304c2 -r 60c81b6836dc src/xterm.c
--- a/src/xterm.c	Fri Dec 24 17:49:24 2010 +0900
+++ b/src/xterm.c	Fri Dec 24 22:36:24 2010 +0900
@@ -8764,9 +8764,13 @@
   if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
     return; /* Only fullscreen without WM or with EWM hints (above). */
 
+  /* Setting fullscreen to nil doesn't do anything.  We could save the
+     last non-fullscreen size and restore it, but it seems like a
+     lot of work for this unusual case (no window manager running).  */
+
   if (f->want_fullscreen != FULLSCREEN_NONE)
     {
-      int width = FRAME_COLS (f), height = FRAME_LINES (f);
+      int width = FRAME_PIXEL_WIDTH (f), height = FRAME_PIXEL_HEIGHT (f);
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 
       switch (f->want_fullscreen)
@@ -8783,13 +8787,9 @@
         case FULLSCREEN_HEIGHT:
           height = x_display_pixel_height (dpyinfo);
         }
-      
-      if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
-        {
-          change_frame_size (f, height, width, 0, 1, 0);
-          SET_FRAME_GARBAGED (f);
-          cancel_mouse_face (f);
-        }
+
+      XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                     width, height);
     }
 }