Mercurial > emacs
changeset 112066:4c862bc17cdb
merge emacs-23
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 24 Dec 2010 20:18:12 +0900 |
| parents | 34341d09c440 (current diff) 95ad5a35063d (diff) |
| children | 5834722132ce |
| files | |
| diffstat | 3 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/rmail.el Fri Dec 24 13:38:22 2010 +0900 +++ b/lisp/mail/rmail.el Fri Dec 24 20:18:12 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" "\
--- a/src/ChangeLog Fri Dec 24 13:38:22 2010 +0900 +++ b/src/ChangeLog Fri Dec 24 20:18:12 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.
--- a/src/xterm.c Fri Dec 24 13:38:22 2010 +0900 +++ b/src/xterm.c Fri Dec 24 20:18:12 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); } }