auto upstream

24 files changed, 254 insertions, 417 deletions

diff --git a/ChangeLog b/ChangeLog
index 02a0453b9ec..15b32524026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-01-16 unistd: port to recent mingw
+
 2013-01-19  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (install-arch-indep): Put back a chmod that was
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index f011b71d5f5..a870fe7b4a3 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -14,29 +14,13 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef _@GUARD_PREFIX@_UNISTD_H
+
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
 @PRAGMA_COLUMNS@
 
-/* Special invocation convention:
-   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
-     but we need to ensure that both the system <unistd.h> and <winsock2.h>
-     are completely included before we replace gethostname.  */
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
-  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
-/* <unistd.h> is being indirectly included for the first time from
-   <winsock2.h>; avoid declaring any overrides.  */
-# if @HAVE_UNISTD_H@
-#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# else
-#  error unexpected; report this to bug-gnulib@gnu.org
-# endif
-# define _GL_WINSOCK2_H_WITNESS
-
-/* Normal invocation.  */
-#elif !defined _@GUARD_PREFIX@_UNISTD_H
-
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ab64694aad..d783443f528 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-23  Bastien Guerry  <bzg@gnu.org>
+
+        * paren.el (show-paren-function): Make sure an overlay exists
+        before trying to delete it.  Also use `pos' as a position only
+        when it is an integer.
+
+2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * play/gametree.el (gametree-break-line-here): Use point-marker.
+
 2013-01-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): Mark
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 8f81182b52d..0854010e60f 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * mh-acros.el (mh-do-at-event-location): Use point-marker.
+        * mh-search.el (mh-index-create-imenu-index): Likewise.
+        * mh-xface.el (mh-x-image-url-display): Likewise.
+
 2012-11-25  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.4.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 9f7fc0df68b..7d6279e4eca 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -233,7 +233,7 @@ preserved."
               (,original-window (selected-window))
               (,original-position (progn
                                    (set-buffer (window-buffer ,event-window))
-                                   (set-marker (make-marker) (point))))
+                                   (point-marker)))
               (,modified-flag (buffer-modified-p))
               (buffer-read-only nil))
          (unwind-protect (progn
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index a8860263531..d31d0ca495a 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1434,7 +1434,7 @@ being the list of messages originally from that folder."
           (beginning-of-line)
           (push (cons (buffer-substring-no-properties
                        (point) (mh-line-end-position))
-                      (set-marker (make-marker) (point)))
+                      (point-marker))
                 alist)))
       (setq imenu--index-alist (nreverse alist)))))
 
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 7582158fefd..4340373f5c4 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -323,7 +323,7 @@ elements of the list are nil."
 If the URL isn't present in the cache then it is fetched with wget."
   (let* ((cache-filename (mh-x-image-url-cache-canonicalize url))
          (state (mh-x-image-get-download-state cache-filename))
-         (marker (set-marker (make-marker) (point))))
+         (marker (point-marker)))
     (set (make-local-variable 'mh-x-image-marker) marker)
     (cond ((not (mh-x-image-url-sane-p url)))
           ((eq state 'ok)
diff --git a/lisp/paren.el b/lisp/paren.el
index b87c8bde89a..bf2238d4907 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -243,23 +243,23 @@ matching parenthesis is highlighted in `show-paren-style' after
           ;;
           ;; Turn on highlighting for the matching paren, if found.
           ;; If it's an unmatched paren, turn off any such highlighting.
-          (unless (integerp pos)
-            (delete-overlay show-paren-overlay))
-          (let ((to (if (or (eq show-paren-style 'expression)
-                            (and (eq show-paren-style 'mixed)
-                                 (not (pos-visible-in-window-p pos))))
-                        (point)
-                      pos))
-                (from (if (or (eq show-paren-style 'expression)
+          (if (not (integerp pos))
+              (when show-paren-overlay (delete-overlay show-paren-overlay))
+            (let ((to (if (or (eq show-paren-style 'expression)
                               (and (eq show-paren-style 'mixed)
                                    (not (pos-visible-in-window-p pos))))
-                          pos
-                        (save-excursion
-                          (goto-char pos)
-                          (- (point) dir)))))
-            (if show-paren-overlay
-                (move-overlay show-paren-overlay from to (current-buffer))
-              (setq show-paren-overlay (make-overlay from to nil t))))
+                          (point)
+                        pos))
+                  (from (if (or (eq show-paren-style 'expression)
+                                (and (eq show-paren-style 'mixed)
+                                     (not (pos-visible-in-window-p pos))))
+                            pos
+                          (save-excursion
+                            (goto-char pos)
+                            (- (point) dir)))))
+              (if show-paren-overlay
+                  (move-overlay show-paren-overlay from to (current-buffer))
+                (setq show-paren-overlay (make-overlay from to nil t)))))
           ;;
           ;; Always set the overlay face, since it varies.
           (overlay-put show-paren-overlay 'priority show-paren-priority)
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 5cd39d535c8..3daf9d5f784 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -435,7 +435,7 @@ only work of Black's moves are explicitly numbered, for instance
                 gametree-half-ply-regexp)) limit))
           (goto-char (match-beginning 0))))
   (gametree-transpose-following-leaves)
-  (let* ((pt (set-marker (make-marker) (point)))
+  (let* ((pt (point-marker))
          (plys (gametree-current-branch-ply))
          (depth (gametree-current-branch-depth))
          (old-depth depth))
diff --git a/src/ChangeLog b/src/ChangeLog
index 7dc7b25f85a..7a2ff184c0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,42 @@
+2013-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (message2, message2_nolog): Remove functions.
+        (message3, message3_nolog): Extract nbytes and multibyteness directly
+        from the string.  Change all callers.
+        (message3_nolog): Don't set message_enable_multibyte since set_message
+        will reset it anyway.
+        (message1, message1_nolog): Use message3.
+        (vmessage): Use a stack allocated buffer rather than f->message_buf.
+        (with_echo_area_buffer): Remove last two arguments.  Update all callers.
+        (set_message): Drop all but the second arg, which has to be a string.
+        (set_message_1): Simplify now that we know that a1 is NULL and the
+        second arg is a string.
+        * frame.h (struct frame): Remove `message_buf' field.
+        Use glyphs_initialized_p instead.
+        (FRAME_MESSAGE_BUF): Remove macro.
+        * w16select.c (Fw16_set_clipboard_data): Prefer message3 to message2.
+        * lisp.h (message2, message2_nolog): Remove declarations.
+        (message3, message3_nolog): Update declarations.
+        * keyboard.c (read_char_minibuf_menu_text)
+        (read_char_minibuf_menu_width): Remove vars.
+        (read_char_minibuf_menu_prompt): Rewrite the menu's construction so as
+        to correctly handle multibyte strings.
+        * frame.c (delete_frame): Don't free message_buf any more.
+        * editfns.c (message_text, message_length): Remove vars.
+        (Fmessage_box): Don't copy the Lisp string's bytes any longer.
+        * fileio.c (auto_save_error): Use message3 instead of message2.
+        * dispnew.c (adjust_frame_message_buffer): Remove function.
+
+2013-01-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32fullscreen_hook): Account correctly for the screen
+        real estate used for the tool bar and the menu bar.
+
+2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * insdel.c (prepare_to_modify_buffer): Force redisplay if
+        hidden buffer is prepared to modification (Bug#13164).
+
 2013-01-22  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * window.h (struct window): Change window_end_valid member from
diff --git a/src/alloc.c b/src/alloc.c
index a2e7282bb60..2624650ed2c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -26,7 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <limits.h>             /* For CHAR_BIT.  */
 
 #ifdef ENABLE_CHECKING
-#include <signal.h>             /* For SIGABRT. */
+#include <signal.h>             /* For SIGABRT.  */
 #endif
 
 #ifdef HAVE_PTHREAD
@@ -1684,7 +1684,7 @@ allocate_string_data (struct Lisp_String *s,
       b = lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP);
 
 #ifdef DOUG_LEA_MALLOC
-      /* Back to a reasonable maximum of mmap'ed areas. */
+      /* Back to a reasonable maximum of mmap'ed areas.  */
       mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
 #endif
 
@@ -1901,7 +1901,7 @@ compact_small_strings (void)
 
 #ifdef GC_CHECK_STRING_BYTES
           /* Check that the string size recorded in the string is the
-             same as the one recorded in the sdata structure. */
+             same as the one recorded in the sdata structure.  */
           if (s && string_bytes (s) != SDATA_NBYTES (from))
             emacs_abort ();
 #endif /* GC_CHECK_STRING_BYTES */
@@ -6564,7 +6564,7 @@ die (const char *msg, const char *file, int line)
 }
 #endif
 
-/* Initialization */
+/* Initialization.  */
 
 void
 init_alloc_once (void)
@@ -6579,9 +6579,9 @@ init_alloc_once (void)
 #endif
 
 #ifdef DOUG_LEA_MALLOC
-  mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */
-  mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */
-  mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); /* max. number of mmap'ed areas */
+  mallopt (M_TRIM_THRESHOLD, 128 * 1024); /* Trim threshold.  */
+  mallopt (M_MMAP_THRESHOLD, 64 * 1024);  /* Mmap threshold.  */
+  mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);   /* Max. number of mmap'ed areas.  */
 #endif
   init_strings ();
   init_vectors ();
diff --git a/src/callint.c b/src/callint.c
index cd303908f69..1a125d3e865 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -497,47 +497,47 @@ invoke it.  If KEYS is omitted or nil, the return value of
 
       switch (*tem)
         {
-        case 'a':               /* Symbol defined as a function */
+        case 'a':               /* Symbol defined as a function.  */
           visargs[i] = Fcompleting_read (callint_message,
                                          Vobarray, Qfboundp, Qt,
                                          Qnil, Qnil, Qnil, Qnil);
-          /* Passing args[i] directly stimulates compiler bug */
+          /* Passing args[i] directly stimulates compiler bug.  */
           teml = visargs[i];
           args[i] = Fintern (teml, Qnil);
           break;
 
-        case 'b':               /* Name of existing buffer */
+        case 'b':               /* Name of existing buffer.  */
           args[i] = Fcurrent_buffer ();
           if (EQ (selected_window, minibuf_window))
             args[i] = Fother_buffer (args[i], Qnil, Qnil);
           args[i] = Fread_buffer (callint_message, args[i], Qt);
           break;
 
-        case 'B':               /* Name of buffer, possibly nonexistent */
+        case 'B':               /* Name of buffer, possibly nonexistent.  */
           args[i] = Fread_buffer (callint_message,
                                   Fother_buffer (Fcurrent_buffer (), Qnil, Qnil),
                                   Qnil);
           break;
 
-        case 'c':               /* Character */
+        case 'c':               /* Character.  */
           /* Prompt in `minibuffer-prompt' face.  */
           Fput_text_property (make_number (0),
                               make_number (SCHARS (callint_message)),
                               Qface, Qminibuffer_prompt, callint_message);
           args[i] = Fread_char (callint_message, Qnil, Qnil);
           message1_nolog ((char *) 0);
-          /* Passing args[i] directly stimulates compiler bug */
+          /* Passing args[i] directly stimulates compiler bug.  */
           teml = args[i];
           /* See bug#8479.  */
           if (! CHARACTERP (teml)) error ("Non-character input-event");
           visargs[i] = Fchar_to_string (teml);
           break;
 
-        case 'C':               /* Command: symbol with interactive function */
+        case 'C':             /* Command: symbol with interactive function.  */
           visargs[i] = Fcompleting_read (callint_message,
                                          Vobarray, Qcommandp,
                                          Qt, Qnil, Qnil, Qnil, Qnil);
-          /* Passing args[i] directly stimulates compiler bug */
+          /* Passing args[i] directly stimulates compiler bug.  */
           teml = visargs[i];
           args[i] = Fintern (teml, Qnil);
           break;
@@ -549,33 +549,33 @@ invoke it.  If KEYS is omitted or nil, the return value of
           varies[i] = 1;
           break;
 
-        case 'D':               /* Directory name. */
+        case 'D':               /* Directory name.  */
           args[i] = Fread_file_name (callint_message, Qnil,
                                      BVAR (current_buffer, directory), Qlambda, Qnil,
                                      Qfile_directory_p);
           break;
 
-        case 'f':               /* Existing file name. */
+        case 'f':               /* Existing file name.  */
           args[i] = Fread_file_name (callint_message,
                                      Qnil, Qnil, Qlambda, Qnil, Qnil);
           break;
 
-        case 'F':               /* Possibly nonexistent file name. */
+        case 'F':               /* Possibly nonexistent file name.  */
           args[i] = Fread_file_name (callint_message,
                                      Qnil, Qnil, Qnil, Qnil, Qnil);
           break;
 
         case 'G':               /* Possibly nonexistent file name,
-                                   default to directory alone. */
+                                   default to directory alone.  */
           args[i] = Fread_file_name (callint_message,
                                      Qnil, Qnil, Qnil, empty_unibyte_string, Qnil);
           break;
 
-        case 'i':               /* Ignore an argument -- Does not do I/O */
+        case 'i':               /* Ignore an argument -- Does not do I/O.  */
           varies[i] = -1;
           break;
 
-        case 'k':               /* Key sequence. */
+        case 'k':               /* Key sequence.  */
           {
             ptrdiff_t speccount1 = SPECPDL_INDEX ();
             specbind (Qcursor_in_echo_area, Qt);
@@ -607,7 +607,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
           }
           break;
 
-        case 'K':               /* Key sequence to be defined. */
+        case 'K':               /* Key sequence to be defined.  */
           {
             ptrdiff_t speccount1 = SPECPDL_INDEX ();
             specbind (Qcursor_in_echo_area, Qt);
@@ -639,7 +639,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
           }
           break;
 
-        case 'U':               /* Up event from last k or K */
+        case 'U':               /* Up event from last k or K.  */
           if (!NILP (up_event))
             {
               args[i] = Fmake_vector (make_number (1), up_event);
@@ -679,7 +679,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
                                   Qnil, Qnil, Qnil, Qt);
           break;
 
-        case 'N':               /* Prefix arg as number, else number from minibuffer */
+        case 'N':     /* Prefix arg as number, else number from minibuffer.  */
           if (!NILP (prefix_arg))
             goto have_prefix_arg;
         case 'n':               /* Read number from minibuffer.  */
@@ -714,14 +714,14 @@ invoke it.  If KEYS is omitted or nil, the return value of
           varies[i] = -1;
           break;
 
-        case 'p':               /* Prefix arg converted to number.  No I/O. */
+        case 'p':               /* Prefix arg converted to number.  No I/O.  */
         have_prefix_arg:
           args[i] = Fprefix_numeric_value (prefix_arg);
           /* visargs[i] = Qnil; */
           varies[i] = -1;
           break;
 
-        case 'r':               /* Region, point and mark as 2 args. */
+        case 'r':               /* Region, point and mark as 2 args.  */
           check_mark (1);
           set_marker_both (point_marker, Qnil, PT, PT_BYTE);
           /* visargs[i+1] = Qnil; */
@@ -742,29 +742,29 @@ invoke it.  If KEYS is omitted or nil, the return value of
         case 'S':               /* Any symbol.  */
           visargs[i] = Fread_string (callint_message,
                                      Qnil, Qnil, Qnil, Qnil);
-          /* Passing args[i] directly stimulates compiler bug */
+          /* Passing args[i] directly stimulates compiler bug.  */
           teml = visargs[i];
           args[i] = Fintern (teml, Qnil);
           break;
 
         case 'v':               /* Variable name: symbol that is
-                                   custom-variable-p. */
+                                   custom-variable-p.  */
           args[i] = Fread_variable (callint_message, Qnil);
           visargs[i] = last_minibuf_string;
           break;
 
-        case 'x':               /* Lisp expression read but not evaluated */
+        case 'x':               /* Lisp expression read but not evaluated.  */
           args[i] = Fread_minibuffer (callint_message, Qnil);
           visargs[i] = last_minibuf_string;
           break;
 
-        case 'X':               /* Lisp expression read and evaluated */
+        case 'X':               /* Lisp expression read and evaluated.  */
           args[i] = Feval_minibuffer (callint_message, Qnil);
           visargs[i] = last_minibuf_string;
           break;
 
         case 'Z':               /* Coding-system symbol, or ignore the
-                                   argument if no prefix */
+                                   argument if no prefix.  */
           if (NILP (prefix_arg))
             {
               args[i] = Qnil;
@@ -778,7 +778,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
             }
           break;
 
-        case 'z':               /* Coding-system symbol or nil */
+        case 'z':               /* Coding-system symbol or nil.  */
           args[i] = Fread_coding_system (callint_message, Qnil);
           visargs[i] = last_minibuf_string;
           break;
diff --git a/src/dispnew.c b/src/dispnew.c
index 32ac606b84e..a680ca0e03a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -90,7 +90,6 @@ static void build_frame_matrix_from_window_tree (struct glyph_matrix *,
                                                  struct window *);
 static void build_frame_matrix_from_leaf_window (struct glyph_matrix *,
                                                  struct window *);
-static void adjust_frame_message_buffer (struct frame *);
 static void adjust_decode_mode_spec_buffer (struct frame *);
 static void fill_up_glyph_row_with_spaces (struct glyph_row *);
 static void clear_window_matrices (struct window *, bool);
@@ -1859,9 +1858,7 @@ adjust_frame_glyphs (struct frame *f)
   else
     adjust_frame_glyphs_for_frame_redisplay (f);
 
-  /* Don't forget the message buffer and the buffer for
-     decode_mode_spec.  */
-  adjust_frame_message_buffer (f);
+  /* Don't forget the buffer for decode_mode_spec.  */
   adjust_decode_mode_spec_buffer (f);
 
   f->glyphs_initialized_p = 1;
@@ -2161,23 +2158,6 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
 }
 
 
-/* Adjust/ allocate message buffer of frame F.
-
-   Note that the message buffer is never freed.  Since I could not
-   find a free in 19.34, I assume that freeing it would be
-   problematic in some way and don't do it either.
-
-   (Implementation note: It should be checked if we can free it
-   eventually without causing trouble).  */
-
-static void
-adjust_frame_message_buffer (struct frame *f)
-{
-  FRAME_MESSAGE_BUF (f) = xrealloc (FRAME_MESSAGE_BUF (f),
-                                    FRAME_MESSAGE_BUF_SIZE (f) + 1);
-}
-
-
 /* Re-allocate buffer for decode_mode_spec on frame F.  */
 
 static void
diff --git a/src/editfns.c b/src/editfns.c
index 020285cf4ec..0f88a781b88 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3429,12 +3429,6 @@ usage: (save-restriction &rest BODY)  */)
   return unbind_to (count, val);
 }
 
-/* Buffer for the most recent text displayed by Fmessage_box.  */
-static char *message_text;
-
-/* Allocated length of that buffer.  */
-static ptrdiff_t message_length;
-
 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
        doc: /* Display a message at the bottom of the screen.
 The message also goes into the `*Messages*' buffer, if `message-log-max'
@@ -3465,7 +3459,7 @@ usage: (message FORMAT-STRING &rest ARGS)  */)
     {
       register Lisp_Object val;
       val = Fformat (nargs, args);
-      message3 (val, SBYTES (val), STRING_MULTIBYTE (val));
+      message3 (val);
       return val;
     }
 }
@@ -3489,8 +3483,7 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
     }
   else
     {
-      register Lisp_Object val;
-      val = Fformat (nargs, args);
+      Lisp_Object val = Fformat (nargs, args);
 #ifdef HAVE_MENUS
       /* The MS-DOS frames support popup menus even though they are
          not FRAME_WINDOW_P.  */
@@ -3507,16 +3500,7 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
         return val;
       }
 #endif /* HAVE_MENUS */
-      /* Copy the data so that it won't move when we GC.  */
-      if (SBYTES (val) > message_length)
-        {
-          ptrdiff_t new_length = SBYTES (val) + 80;
-          message_text = xrealloc (message_text, new_length);
-          message_length = new_length;
-        }
-      memcpy (message_text, SDATA (val), SBYTES (val));
-      message2 (message_text, SBYTES (val),
-                STRING_MULTIBYTE (val));
+      message3 (val);
       return val;
     }
 }
diff --git a/src/fileio.c b/src/fileio.c
index a826ac1f94a..e788bebab61 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5444,10 +5444,8 @@ static Lisp_Object
 auto_save_error (Lisp_Object error_val)
 {
   Lisp_Object args[3], msg;
-  int i, nbytes;
+  int i;
   struct gcpro gcpro1;
-  char *msgbuf;
-  USE_SAFE_ALLOCA;
 
   auto_save_error_occurred = 1;
 
@@ -5458,20 +5456,16 @@ auto_save_error (Lisp_Object error_val)
   args[2] = Ferror_message_string (error_val);
   msg = Fformat (3, args);
   GCPRO1 (msg);
-  nbytes = SBYTES (msg);
-  msgbuf = SAFE_ALLOCA (nbytes);
-  memcpy (msgbuf, SDATA (msg), nbytes);
 
   for (i = 0; i < 3; ++i)
     {
       if (i == 0)
-        message2 (msgbuf, nbytes, STRING_MULTIBYTE (msg));
+        message3 (msg);
       else
-        message2_nolog (msgbuf, nbytes, STRING_MULTIBYTE (msg));
+        message3_nolog (msg);
       Fsleep_for (make_number (1), Qnil);
     }
 
-  SAFE_FREE ();
   UNGCPRO;
   return Qnil;
 }
diff --git a/src/fns.c b/src/fns.c
index e066d3cbb8f..860d295d5a0 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2745,7 +2745,7 @@ ARGS are passed as extra arguments to the function.
 usage: (widget-apply WIDGET PROPERTY &rest ARGS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
-  /* This function can GC. */
+  /* This function can GC.  */
   Lisp_Object newargs[3];
   struct gcpro gcpro1, gcpro2;
   Lisp_Object result;
diff --git a/src/frame.c b/src/frame.c
index 514b338df5b..11886783e4c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1251,7 +1251,6 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
   xfree (FRAME_DELETEN_COST (f));
   xfree (FRAME_INSERTN_COST (f));
   xfree (FRAME_DELETE_COST (f));
-  xfree (FRAME_MESSAGE_BUF (f));
 
   /* Since some events are handled at the interrupt level, we may get
      an event for f at any time; if we zero out the frame's terminal
@@ -1266,10 +1265,10 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
   {
     struct terminal *terminal = FRAME_TERMINAL (f);
     f->output_data.nothing = 0;
-    f->terminal = 0;             /* Now the frame is dead. */
+    f->terminal = 0;             /* Now the frame is dead.  */
 
     /* If needed, delete the terminal that this frame was on.
-       (This must be done after the frame is killed.) */
+       (This must be done after the frame is killed.)  */
     terminal->reference_count--;
 #ifdef USE_GTK
     /* FIXME: Deleting the terminal crashes emacs because of a GTK
diff --git a/src/frame.h b/src/frame.h
index ec535d4448f..c2821066c82 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -18,7 +18,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Don't multiply include: dispextern.h includes macterm.h which
    includes frame.h some emacs source includes both dispextern.h and
-   frame.h */
+   frame.h.  */
 
 #ifndef EMACS_FRAME_H
 #define EMACS_FRAME_H
@@ -33,7 +33,7 @@ INLINE_HEADER_BEGIN
 
 /* Miscellanea.  */
 
-/* Nonzero means there is at least one garbaged frame. */
+/* Nonzero means there is at least one garbaged frame.  */
 extern bool frame_garbaged;
 
 
@@ -200,7 +200,7 @@ struct frame
      string's pointer (`name', above) because it might get relocated.  */
   char *namebuf;
 
-  /* Glyph pool and matrix. */
+  /* Glyph pool and matrix.  */
   struct glyph_pool *current_pool;
   struct glyph_pool *desired_pool;
   struct glyph_matrix *desired_matrix;
@@ -444,9 +444,6 @@ struct frame
   /* Width of bar cursor (if we are using that) for blink-off state.  */
   int blink_off_cursor_width;
 
-  /* Storage for messages to this frame. */
-  char *message_buf;
-
   /* Nonnegative if current redisplay should not do scroll computation
      for lines beyond a certain vpos.  This is the vpos.  */
   int scroll_bottom_vpos;
@@ -751,7 +748,6 @@ typedef struct frame *FRAME_PTR;
 #define FRAME_DELETE_COST(f) (f)->delete_line_cost
 #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost
 #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost
-#define FRAME_MESSAGE_BUF(f) (f)->message_buf
 #define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos
 #define FRAME_FOCUS_FRAME(f) f->focus_frame
 
diff --git a/src/insdel.c b/src/insdel.c
index 303247816ca..98dd97bdd08 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1804,9 +1804,12 @@ prepare_to_modify_buffer (ptrdiff_t start, ptrdiff_t end,
     Fbarf_if_buffer_read_only ();
 
   /* If we're modifying the buffer other than shown in a selected window,
-     let redisplay consider other windows if this buffer is visible.  */
+     let redisplay consider other windows if this buffer is visible or
+     hidden (although hidden buffers have zero window counts, their state
+     may affect the display too, e.g. via mode lines of other buffers).  */
   if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer
-      && buffer_window_count (current_buffer))
+      && (buffer_window_count (current_buffer)
+          || BUFFER_HIDDEN_P (current_buffer)))
     ++windows_or_buffers_changed;
 
   if (buffer_intervals (current_buffer))
diff --git a/src/keyboard.c b/src/keyboard.c
index baa69a089b3..f5728009cf7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -678,9 +678,8 @@ echo_now (void)
     }
 
   echoing = 1;
-  message3_nolog (KVAR (current_kboard, echo_string),
-                  SBYTES (KVAR (current_kboard, echo_string)),
-                  STRING_MULTIBYTE (KVAR (current_kboard, echo_string)));
+  /* FIXME: Use call (Qmessage) so it can be advised (e.g. emacspeak).  */
+  message3_nolog (KVAR (current_kboard, echo_string));
   echoing = 0;
 
   /* Record in what buffer we echoed, and from which kboard.  */
@@ -1432,7 +1431,7 @@ command_loop_1 (void)
           sit_for (Vminibuffer_message_timeout, 0, 2);
 
           /* Clear the echo area.  */
-          message2 (0, 0, 0);
+          message1 (0);
           safe_run_hooks (Qecho_area_clear_hook);
 
           unbind_to (count, Qnil);
@@ -8453,12 +8452,6 @@ read_char_x_menu_prompt (ptrdiff_t nmaps, Lisp_Object *maps,
   return Qnil ;
 }
 
-/* Buffer in use so far for the minibuf prompts for menu keymaps.
-   We make this bigger when necessary, and never free it.  */
-static char *read_char_minibuf_menu_text;
-/* Size of that buffer.  */
-static ptrdiff_t read_char_minibuf_menu_width;
-
 static Lisp_Object
 read_char_minibuf_menu_prompt (int commandflag,
                                ptrdiff_t nmaps, Lisp_Object *maps)
@@ -8471,7 +8464,7 @@ read_char_minibuf_menu_prompt (int commandflag,
   ptrdiff_t idx = -1;
   bool nobindings = 1;
   Lisp_Object rest, vector;
-  char *menu;
+  Lisp_Object prompt_strings = Qnil;
 
   vector = Qnil;
   name = Qnil;
@@ -8491,24 +8484,13 @@ read_char_minibuf_menu_prompt (int commandflag,
   if (!STRINGP (name))
     return Qnil;
 
-  /* Make sure we have a big enough buffer for the menu text.  */
-  width = max (width, SBYTES (name));
-  if (STRING_BYTES_BOUND - 4 < width)
-    memory_full (SIZE_MAX);
-  if (width + 4 > read_char_minibuf_menu_width)
-    {
-      read_char_minibuf_menu_text
-        = xrealloc (read_char_minibuf_menu_text, width + 4);
-      read_char_minibuf_menu_width = width + 4;
-    }
-  menu = read_char_minibuf_menu_text;
-
+#define PUSH_C_STR(str, listvar) \
+  listvar = Fcons (make_unibyte_string (str, strlen (str)), listvar)
+  
   /* Prompt string always starts with map's prompt, and a space.  */
-  strcpy (menu, SSDATA (name));
-  nlength = SBYTES (name);
-  menu[nlength++] = ':';
-  menu[nlength++] = ' ';
-  menu[nlength] = 0;
+  prompt_strings = Fcons (name, prompt_strings);
+  PUSH_C_STR (": ", prompt_strings);
+  nlength = SCHARS (name) + 2;
 
   /* Start prompting at start of first map.  */
   mapno = 0;
@@ -8518,6 +8500,7 @@ read_char_minibuf_menu_prompt (int commandflag,
   while (1)
     {
       bool notfirst = 0;
+      Lisp_Object menu_strings = prompt_strings;
       ptrdiff_t i = nlength;
       Lisp_Object obj;
       Lisp_Object orig_defn_macro;
@@ -8527,6 +8510,8 @@ read_char_minibuf_menu_prompt (int commandflag,
         {
           Lisp_Object elt;
 
+          /* FIXME: Use map_keymap to handle new keymap formats.  */
+
           /* If reached end of map, start at beginning of next map.  */
           if (NILP (rest))
             {
@@ -8622,7 +8607,7 @@ read_char_minibuf_menu_prompt (int commandflag,
                       /* Punctuate between strings.  */
                       if (notfirst)
                         {
-                          strcpy (menu + i, ", ");
+                          PUSH_C_STR (", ", menu_strings);
                           i += 2;
                         }
                       notfirst = 1;
@@ -8634,23 +8619,28 @@ read_char_minibuf_menu_prompt (int commandflag,
                         {
                           /* Add as much of string as fits.  */
                           thiswidth = min (SCHARS (desc), width - i);
-                          memcpy (menu + i, SDATA (desc), thiswidth);
+                          menu_strings
+                            = Fcons (Fsubstring (desc, make_number (0),
+                                                 make_number (thiswidth)),
+                                     menu_strings);
                           i += thiswidth;
-                          strcpy (menu + i, " = ");
+                          PUSH_C_STR (" = ", menu_strings);
                           i += 3;
                         }
 
                       /* Add as much of string as fits.  */
                       thiswidth = min (SCHARS (s), width - i);
-                      memcpy (menu + i, SDATA (s), thiswidth);
+                      menu_strings
+                        = Fcons (Fsubstring (s, make_number (0),
+                                             make_number (thiswidth)),
+                                 menu_strings);
                       i += thiswidth;
-                      menu[i] = 0;
                     }
                   else
                     {
                       /* If this element does not fit, end the line now,
                          and save the element for the next line.  */
-                      strcpy (menu + i, "...");
+                      PUSH_C_STR ("...", menu_strings);
                       break;
                     }
                 }
@@ -8667,13 +8657,11 @@ read_char_minibuf_menu_prompt (int commandflag,
         }
 
       /* Prompt with that and read response.  */
-      message2_nolog (menu, strlen (menu),
-                      ! NILP (BVAR (current_buffer, enable_multibyte_characters)));
+      message3_nolog (apply1 (intern ("concat"), menu_strings));
 
-      /* Make believe its not a keyboard macro in case the help char
+      /* Make believe it's not a keyboard macro in case the help char
          is pressed.  Help characters are not recorded because menu prompting
-         is not used on replay.
-         */
+         is not used on replay.  */
       orig_defn_macro = KVAR (current_kboard, defining_kbd_macro);
       kset_defining_kbd_macro (current_kboard, Qnil);
       do
@@ -8681,9 +8669,7 @@ read_char_minibuf_menu_prompt (int commandflag,
       while (BUFFERP (obj));
       kset_defining_kbd_macro (current_kboard, orig_defn_macro);
 
-      if (!INTEGERP (obj))
-        return obj;
-      else if (XINT (obj) == -2)
+      if (!INTEGERP (obj) || XINT (obj) == -2)
         return obj;
 
       if (! EQ (obj, menu_prompt_more_char)
@@ -8694,7 +8680,7 @@ read_char_minibuf_menu_prompt (int commandflag,
             store_kbd_macro_char (obj);
           return obj;
         }
-      /* Help char - go round again */
+      /* Help char - go round again.  */
     }
 }
 
@@ -10110,7 +10096,7 @@ will read just one key sequence.  */)
     cancel_hourglass ();
 #endif
 
-  i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])),
+  i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])),
                          prompt, ! NILP (dont_downcase_last),
                          ! NILP (can_return_switch_frame), 0);
 
diff --git a/src/lisp.h b/src/lisp.h
index ca5fa6c3454..718c970006c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2953,10 +2953,8 @@ extern void clear_message (int, int);
 extern void message (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2);
 extern void message1 (const char *);
 extern void message1_nolog (const char *);
-extern void message2 (const char *, ptrdiff_t, int);
-extern void message2_nolog (const char *, ptrdiff_t, int);
-extern void message3 (Lisp_Object, ptrdiff_t, int);
-extern void message3_nolog (Lisp_Object, ptrdiff_t, int);
+extern void message3 (Lisp_Object);
+extern void message3_nolog (Lisp_Object);
 extern void message_dolog (const char *, ptrdiff_t, int, int);
 extern void message_with_string (const char *, Lisp_Object, int);
 extern void message_log_maybe_newline (void);
diff --git a/src/w16select.c b/src/w16select.c
index c92276b1d29..3bcc663e565 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -532,13 +532,13 @@ DEFUN ("w16-set-clipboard-data", Fw16_set_clipboard_data, Sw16_set_clipboard_dat
       switch (put_status)
         {
           case 1:
-            message2 (no_mem_msg, sizeof (no_mem_msg) - 1, 0);
+            message3 (make_unibyte_string (no_mem_msg, sizeof (no_mem_msg) - 1));
             break;
           case 2:
-            message2 (binary_msg, sizeof (binary_msg) - 1, 0);
+            message3 (make_unibyte_string (binary_msg, sizeof (binary_msg) - 1));
             break;
           case 3:
-            message2 (system_error_msg, sizeof (system_error_msg) - 1, 0);
+            message3 (make_unibyte_string (system_error_msg, sizeof (system_error_msg) - 1));
             break;
         }
       sit_for (make_number (2), 0, 2);
diff --git a/src/w32term.c b/src/w32term.c
index 16c7bd415a5..0cb2effcda1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5674,24 +5674,33 @@ w32fullscreen_hook (FRAME_PTR f)
 
       switch (f->want_fullscreen)
         {
-          /* No difference between these two when there is no WM */
         case FULLSCREEN_MAXIMIZED:
-          PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, 0xf030, 0);
+          PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0);
           break;
         case FULLSCREEN_BOTH:
-          height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height) - 2;
-          width  = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width);
+          height =
+            FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
+            - XINT (Ftool_bar_lines_needed (selected_frame))
+            + (NILP (Vmenu_bar_mode) ? 1 : 0);
+          width  =
+            FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width)
+            - FRAME_SCROLL_BAR_COLS (f);
           left_pos = workarea_rect.left;
           top_pos = workarea_rect.top;
           break;
         case FULLSCREEN_WIDTH:
-          width  = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width);
+          width  =
+            FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width)
+            - FRAME_SCROLL_BAR_COLS (f);
           if (normal_height > 0)
             height = normal_height;
           left_pos = workarea_rect.left;
           break;
         case FULLSCREEN_HEIGHT:
-          height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height) - 2;
+          height =
+            FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
+            - XINT (Ftool_bar_lines_needed (selected_frame))
+            + (NILP (Vmenu_bar_mode) ? 1 : 0);
           if (normal_width > 0)
             width = normal_width;
           top_pos = workarea_rect.top;
diff --git a/src/xdisp.c b/src/xdisp.c
index 12efe3c5396..c550a7db02c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -842,17 +842,17 @@ static void ensure_echo_area_buffers (void);
 static Lisp_Object unwind_with_echo_area_buffer (Lisp_Object);
 static Lisp_Object with_echo_area_buffer_unwind_data (struct window *);
 static int with_echo_area_buffer (struct window *, int,
-                                  int (*) (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t),
-                                  ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
+                                  int (*) (ptrdiff_t, Lisp_Object),
+                                  ptrdiff_t, Lisp_Object);
 static void clear_garbaged_frames (void);
-static int current_message_1 (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
+static int current_message_1 (ptrdiff_t, Lisp_Object);
 static void pop_message (void);
-static int truncate_message_1 (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
-static void set_message (const char *, Lisp_Object, ptrdiff_t, int);
-static int set_message_1 (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
+static int truncate_message_1 (ptrdiff_t, Lisp_Object);
+static void set_message (Lisp_Object);
+static int set_message_1 (ptrdiff_t, Lisp_Object);
 static int display_echo_area (struct window *);
-static int display_echo_area_1 (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
-static int resize_mini_window_1 (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t);
+static int display_echo_area_1 (ptrdiff_t, Lisp_Object);
+static int resize_mini_window_1 (ptrdiff_t, Lisp_Object);
 static Lisp_Object unwind_redisplay (Lisp_Object);
 static int string_char_and_length (const unsigned char *, int *);
 static struct text_pos display_prop_end (struct it *, Lisp_Object,
@@ -9621,7 +9621,7 @@ message_log_check_duplicate (ptrdiff_t prev_bol_byte, ptrdiff_t this_bol_byte)
 
   for (i = 0; i < len; i++)
     {
-      if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.')
+      if (i >= 3 && p1[i - 3] == '.' && p1[i - 2] == '.' && p1[i - 1] == '.')
         seen_dots = 1;
       if (p1[i] != p2[i])
         return seen_dots;
@@ -9634,88 +9634,13 @@ message_log_check_duplicate (ptrdiff_t prev_bol_byte, ptrdiff_t this_bol_byte)
       char *pend;
       intmax_t n = strtoimax ((char *) p1, &pend, 10);
       if (0 < n && n < INTMAX_MAX && strncmp (pend, " times]\n", 8) == 0)
-        return n+1;
+        return n + 1;
     }
   return 0;
 }
 
 
 /* Display an echo area message M with a specified length of NBYTES
-   bytes.  The string may include null characters.  If M is 0, clear
-   out any existing message, and let the mini-buffer text show
-   through.
-
-   This may GC, so the buffer M must NOT point to a Lisp string.  */
-
-void
-message2 (const char *m, ptrdiff_t nbytes, int multibyte)
-{
-  /* First flush out any partial line written with print.  */
-  message_log_maybe_newline ();
-  if (m)
-    message_dolog (m, nbytes, 1, multibyte);
-  message2_nolog (m, nbytes, multibyte);
-}
-
-
-/* The non-logging counterpart of message2.  */
-
-void
-message2_nolog (const char *m, ptrdiff_t nbytes, int multibyte)
-{
-  struct frame *sf = SELECTED_FRAME ();
-  message_enable_multibyte = multibyte;
-
-  if (FRAME_INITIAL_P (sf))
-    {
-      if (noninteractive_need_newline)
-        putc ('\n', stderr);
-      noninteractive_need_newline = 0;
-      if (m)
-        fwrite (m, nbytes, 1, stderr);
-      if (cursor_in_echo_area == 0)
-        fprintf (stderr, "\n");
-      fflush (stderr);
-    }
-  /* A null message buffer means that the frame hasn't really been
-     initialized yet.  Error messages get reported properly by
-     cmd_error, so this must be just an informative message; toss it.  */
-  else if (INTERACTIVE
-           && sf->glyphs_initialized_p
-           && FRAME_MESSAGE_BUF (sf))
-    {
-      Lisp_Object mini_window;
-      struct frame *f;
-
-      /* Get the frame containing the mini-buffer
-         that the selected frame is using.  */
-      mini_window = FRAME_MINIBUF_WINDOW (sf);
-      f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
-
-      FRAME_SAMPLE_VISIBILITY (f);
-      if (FRAME_VISIBLE_P (sf)
-          && ! FRAME_VISIBLE_P (f))
-        Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window)));
-
-      if (m)
-        {
-          set_message (m, Qnil, nbytes, multibyte);
-          if (minibuffer_auto_raise)
-            Fraise_frame  (WINDOW_FRAME (XWINDOW (mini_window)));
-        }
-      else
-        clear_message (1, 1);
-
-      do_pending_window_change (0);
-      echo_area_display (1);
-      do_pending_window_change (0);
-      if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
-        (*FRAME_TERMINAL (f)->frame_up_to_date_hook) (f);
-    }
-}
-
-
-/* Display an echo area message M with a specified length of NBYTES
    bytes.  The string may include null characters.  If M is not a
    string, clear out any existing message, and let the mini-buffer
    text show through.
@@ -9723,7 +9648,7 @@ message2_nolog (const char *m, ptrdiff_t nbytes, int multibyte)
    This function cancels echoing.  */
 
 void
-message3 (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
+message3 (Lisp_Object m)
 {
   struct gcpro gcpro1;
 
@@ -9735,13 +9660,15 @@ message3 (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
   message_log_maybe_newline ();
   if (STRINGP (m))
     {
+      ptrdiff_t nbytes = SBYTES (m);
+      int multibyte = STRING_MULTIBYTE (m);
       USE_SAFE_ALLOCA;
       char *buffer = SAFE_ALLOCA (nbytes);
       memcpy (buffer, SDATA (m), nbytes);
       message_dolog (buffer, nbytes, 1, multibyte);
       SAFE_FREE ();
     }
-  message3_nolog (m, nbytes, multibyte);
+  message3_nolog (m);
 
   UNGCPRO;
 }
@@ -9753,10 +9680,9 @@ message3 (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
    and make this cancel echoing.  */
 
 void
-message3_nolog (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
+message3_nolog (Lisp_Object m)
 {
   struct frame *sf = SELECTED_FRAME ();
-  message_enable_multibyte = multibyte;
 
   if (FRAME_INITIAL_P (sf))
     {
@@ -9764,27 +9690,22 @@ message3_nolog (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
         putc ('\n', stderr);
       noninteractive_need_newline = 0;
       if (STRINGP (m))
-        fwrite (SDATA (m), nbytes, 1, stderr);
+        fwrite (SDATA (m), SBYTES (m), 1, stderr);
       if (cursor_in_echo_area == 0)
         fprintf (stderr, "\n");
       fflush (stderr);
     }
-  /* A null message buffer means that the frame hasn't really been
-     initialized yet.  Error messages get reported properly by
-     cmd_error, so this must be just an informative message; toss it.  */
+  /* Error messages get reported properly by cmd_error, so this must be just an
+     informative message; if the frame hasn't really been initialized yet, just
+     toss it.  */
   else if (INTERACTIVE
-           && sf->glyphs_initialized_p
-           && FRAME_MESSAGE_BUF (sf))
+           && sf->glyphs_initialized_p)
     {
-      Lisp_Object mini_window;
-      Lisp_Object frame;
-      struct frame *f;
-
       /* Get the frame containing the mini-buffer
          that the selected frame is using.  */
-      mini_window = FRAME_MINIBUF_WINDOW (sf);
-      frame = XWINDOW (mini_window)->frame;
-      f = XFRAME (frame);
+      Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
+      Lisp_Object frame = XWINDOW (mini_window)->frame;
+      struct frame *f = XFRAME (frame);
 
       FRAME_SAMPLE_VISIBILITY (f);
       if (FRAME_VISIBLE_P (sf)
@@ -9793,7 +9714,7 @@ message3_nolog (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
 
       if (STRINGP (m) && SCHARS (m) > 0)
         {
-          set_message (NULL, m, nbytes, multibyte);
+          set_message (m);
           if (minibuffer_auto_raise)
             Fraise_frame (frame);
           /* Assume we are not echoing.
@@ -9823,7 +9744,7 @@ message3_nolog (Lisp_Object m, ptrdiff_t nbytes, int multibyte)
 void
 message1 (const char *m)
 {
-  message2 (m, (m ? strlen (m) : 0), 0);
+  message3 (m ? make_unibyte_string (m, strlen (m)) : Qnil);
 }
 
 
@@ -9832,7 +9753,7 @@ message1 (const char *m)
 void
 message1_nolog (const char *m)
 {
-  message2_nolog (m, (m ? strlen (m) : 0), 0);
+  message3_nolog (m ? make_unibyte_string (m, strlen (m)) : Qnil);
 }
 
 /* Display a message M which contains a single %s
@@ -9869,10 +9790,10 @@ message_with_string (const char *m, Lisp_Object string, int log)
       mini_window = FRAME_MINIBUF_WINDOW (sf);
       f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
 
-      /* A null message buffer means that the frame hasn't really been
-         initialized yet.  Error messages get reported properly by
-         cmd_error, so this must be just an informative message; toss it.  */
-      if (FRAME_MESSAGE_BUF (f))
+      /* Error messages get reported properly by cmd_error, so this must be
+         just an informative message; if the frame hasn't really been
+         initialized yet, just toss it.  */
+      if (f->glyphs_initialized_p)
         {
           Lisp_Object args[2], msg;
           struct gcpro gcpro1, gcpro2;
@@ -9885,9 +9806,9 @@ message_with_string (const char *m, Lisp_Object string, int log)
           msg = Fformat (2, args);
 
           if (log)
-            message3 (msg, SBYTES (msg), STRING_MULTIBYTE (msg));
+            message3 (msg);
           else
-            message3_nolog (msg, SBYTES (msg), STRING_MULTIBYTE (msg));
+            message3_nolog (msg);
 
           UNGCPRO;
 
@@ -9931,20 +9852,20 @@ vmessage (const char *m, va_list ap)
       mini_window = FRAME_MINIBUF_WINDOW (sf);
       f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
 
-      /* A null message buffer means that the frame hasn't really been
-         initialized yet.  Error messages get reported properly by
-         cmd_error, so this must be just an informative message; toss
-         it.  */
-      if (FRAME_MESSAGE_BUF (f))
+      /* Error messages get reported properly by cmd_error, so this must be
+         just an informative message; if the frame hasn't really been
+         initialized yet, just toss it.  */
+      if (f->glyphs_initialized_p)
         {
           if (m)
             {
               ptrdiff_t len;
+              ptrdiff_t maxsize = FRAME_MESSAGE_BUF_SIZE (f);
+              char *message_buf = alloca (maxsize + 1);
 
-              len = doprnt (FRAME_MESSAGE_BUF (f),
-                            FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, ap);
+              len = doprnt (message_buf, maxsize, m, (char *)0, ap);
 
-              message2 (FRAME_MESSAGE_BUF (f), len, 1);
+              message3 (make_string (message_buf, len));
             }
           else
             message1 (0);
@@ -9995,8 +9916,7 @@ update_echo_area (void)
     {
       Lisp_Object string;
       string = Fcurrent_message ();
-      message3 (string, SBYTES (string),
-                !NILP (BVAR (current_buffer, enable_multibyte_characters)));
+      message3 (string);
     }
 }
 
@@ -10032,7 +9952,7 @@ ensure_echo_area_buffers (void)
 }
 
 
-/* Call FN with args A1..A4 with either the current or last displayed
+/* Call FN with args A1..A2 with either the current or last displayed
    echo_area_buffer as current buffer.
 
    WHICH zero means use the current message buffer
@@ -10050,8 +9970,8 @@ ensure_echo_area_buffers (void)
 
 static int
 with_echo_area_buffer (struct window *w, int which,
-                       int (*fn) (ptrdiff_t, Lisp_Object, ptrdiff_t, ptrdiff_t),
-                       ptrdiff_t a1, Lisp_Object a2, ptrdiff_t a3, ptrdiff_t a4)
+                       int (*fn) (ptrdiff_t, Lisp_Object),
+                       ptrdiff_t a1, Lisp_Object a2)
 {
   Lisp_Object buffer;
   int this_one, the_other, clear_buffer_p, rc;
@@ -10124,7 +10044,7 @@ with_echo_area_buffer (struct window *w, int which,
   eassert (BEGV >= BEG);
   eassert (ZV <= Z && ZV >= BEGV);
 
-  rc = fn (a1, a2, a3, a4);
+  rc = fn (a1, a2);
 
   eassert (BEGV >= BEG);
   eassert (ZV <= Z && ZV >= BEGV);
@@ -10303,7 +10223,7 @@ display_echo_area (struct window *w)
   window_height_changed_p
     = with_echo_area_buffer (w, display_last_displayed_message_p,
                              display_echo_area_1,
-                             (intptr_t) w, Qnil, 0, 0);
+                             (intptr_t) w, Qnil);
 
   if (no_message_p)
     echo_area_buffer[i] = Qnil;
@@ -10320,7 +10240,7 @@ display_echo_area (struct window *w)
    Value is non-zero if height of W was changed.  */
 
 static int
-display_echo_area_1 (ptrdiff_t a1, Lisp_Object a2, ptrdiff_t a3, ptrdiff_t a4)
+display_echo_area_1 (ptrdiff_t a1, Lisp_Object a2)
 {
   intptr_t i1 = a1;
   struct window *w = (struct window *) i1;
@@ -10365,8 +10285,7 @@ resize_echo_area_exactly (void)
         resize_exactly = Qnil;
 
       resized_p = with_echo_area_buffer (w, 0, resize_mini_window_1,
-                                         (intptr_t) w, resize_exactly,
-                                         0, 0);
+                                         (intptr_t) w, resize_exactly);
       if (resized_p)
         {
           ++windows_or_buffers_changed;
@@ -10384,7 +10303,7 @@ resize_echo_area_exactly (void)
    resize_mini_window returns.  */
 
 static int
-resize_mini_window_1 (ptrdiff_t a1, Lisp_Object exactly, ptrdiff_t a3, ptrdiff_t a4)
+resize_mini_window_1 (ptrdiff_t a1, Lisp_Object exactly)
 {
   intptr_t i1 = a1;
   return resize_mini_window ((struct window *) i1, !NILP (exactly));
@@ -10553,7 +10472,7 @@ current_message (void)
   else
     {
       with_echo_area_buffer (0, 0, current_message_1,
-                             (intptr_t) &msg, Qnil, 0, 0);
+                             (intptr_t) &msg, Qnil);
       if (NILP (msg))
         echo_area_buffer[0] = Qnil;
     }
@@ -10563,7 +10482,7 @@ current_message (void)
 
 
 static int
-current_message_1 (ptrdiff_t a1, Lisp_Object a2, ptrdiff_t a3, ptrdiff_t a4)
+current_message_1 (ptrdiff_t a1, Lisp_Object a2)
 {
   intptr_t i1 = a1;
   Lisp_Object *msg = (Lisp_Object *) i1;
@@ -10595,14 +10514,8 @@ push_message (void)
 void
 restore_message (void)
 {
-  Lisp_Object msg;
-
   eassert (CONSP (Vmessage_stack));
-  msg = XCAR (Vmessage_stack);
-  if (STRINGP (msg))
-    message3_nolog (msg, SBYTES (msg), STRING_MULTIBYTE (msg));
-  else
-    message3_nolog (msg, 0, 0);
+  message3_nolog (XCAR (Vmessage_stack));
 }
 
 
@@ -10645,16 +10558,16 @@ truncate_echo_area (ptrdiff_t nchars)
 {
   if (nchars == 0)
     echo_area_buffer[0] = Qnil;
-  /* A null message buffer means that the frame hasn't really been
-     initialized yet.  Error messages get reported properly by
-     cmd_error, so this must be just an informative message; toss it.  */
   else if (!noninteractive
            && INTERACTIVE
            && !NILP (echo_area_buffer[0]))
     {
       struct frame *sf = SELECTED_FRAME ();
-      if (FRAME_MESSAGE_BUF (sf))
-        with_echo_area_buffer (0, 0, truncate_message_1, nchars, Qnil, 0, 0);
+      /* Error messages get reported properly by cmd_error, so this must be
+         just an informative message; if the frame hasn't really been
+         initialized yet, just toss it.  */
+      if (sf->glyphs_initialized_p)
+        with_echo_area_buffer (0, 0, truncate_message_1, nchars, Qnil);
     }
 }
 
@@ -10663,7 +10576,7 @@ truncate_echo_area (ptrdiff_t nchars)
    message to at most NCHARS characters.  */
 
 static int
-truncate_message_1 (ptrdiff_t nchars, Lisp_Object a2, ptrdiff_t a3, ptrdiff_t a4)
+truncate_message_1 (ptrdiff_t nchars, Lisp_Object a2)
 {
   if (BEG + nchars < Z)
     del_range (BEG + nchars, Z);
@@ -10672,30 +10585,16 @@ truncate_message_1 (ptrdiff_t nchars, Lisp_Object a2, ptrdiff_t a3, ptrdiff_t a4
   return 0;
 }
 
-/* Set the current message to a substring of S or STRING.
-
-   If STRING is a Lisp string, set the message to the first NBYTES
-   bytes from STRING.  NBYTES zero means use the whole string.  If
-   STRING is multibyte, the message will be displayed multibyte.
-
-   If S is not null, set the message to the first LEN bytes of S.  LEN
-   zero means use the whole string.  MULTIBYTE_P non-zero means S is
-   multibyte.  Display the message multibyte in that case.
-
-   Doesn't GC, as with_echo_area_buffer binds Qinhibit_modification_hooks
-   to t before calling set_message_1 (which calls insert).
-  */
+/* Set the current message to STRING.  */
 
 static void
-set_message (const char *s, Lisp_Object string,
-             ptrdiff_t nbytes, int multibyte_p)
+set_message (Lisp_Object string)
 {
-  message_enable_multibyte
-    = ((s && multibyte_p)
-       || (STRINGP (string) && STRING_MULTIBYTE (string)));
+  eassert (STRINGP (string));
 
-  with_echo_area_buffer (0, -1, set_message_1,
-                         (intptr_t) s, string, nbytes, multibyte_p);
+  message_enable_multibyte = STRING_MULTIBYTE (string);
+
+  with_echo_area_buffer (0, -1, set_message_1, 0, string);
   message_buf_print = 0;
   help_echo_showing_p = 0;
 
@@ -10705,18 +10604,14 @@ set_message (const char *s, Lisp_Object string,
 }
 
 
-/* Helper function for set_message.  Arguments have the same meaning
-   as there, with A1 corresponding to S and A2 corresponding to STRING
-   This function is called with the echo area buffer being
-   current.  */
+/* Helper function for set_message.  First argument is ignored and second
+   argument has the same meaning as for set_message.
+   This function is called with the echo area buffer being current.  */
 
 static int
-set_message_1 (ptrdiff_t a1, Lisp_Object a2, ptrdiff_t nbytes, ptrdiff_t multibyte_p)
+set_message_1 (ptrdiff_t a1, Lisp_Object string)
 {
-  intptr_t i1 = a1;
-  const char *s = (const char *) i1;
-  const unsigned char *msg = (const unsigned char *) s;
-  Lisp_Object string = a2;
+  eassert (STRINGP (string));
 
   /* Change multibyteness of the echo buffer appropriately.  */
   if (message_enable_multibyte
@@ -10730,61 +10625,10 @@ set_message_1 (ptrdiff_t a1, Lisp_Object a2, ptrdiff_t nbytes, ptrdiff_t multiby
   /* Insert new message at BEG.  */
   TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
 
-  if (STRINGP (string))
-    {
-      ptrdiff_t nchars;
-
-      if (nbytes == 0)
-        nbytes = SBYTES (string);
-      nchars = string_byte_to_char (string, nbytes);
-
-      /* This function takes care of single/multibyte conversion.  We
-         just have to ensure that the echo area buffer has the right
-         setting of enable_multibyte_characters.  */
-      insert_from_string (string, 0, 0, nchars, nbytes, 1);
-    }
-  else if (s)
-    {
-      if (nbytes == 0)
-        nbytes = strlen (s);
-
-      if (multibyte_p && NILP (BVAR (current_buffer, enable_multibyte_characters)))
-        {
-          /* Convert from multi-byte to single-byte.  */
-          ptrdiff_t i;
-          int c, n;
-          char work[1];
-
-          /* Convert a multibyte string to single-byte.  */
-          for (i = 0; i < nbytes; i += n)
-            {
-              c = string_char_and_length (msg + i, &n);
-              work[0] = (ASCII_CHAR_P (c)
-                         ? c
-                         : multibyte_char_to_unibyte (c));
-              insert_1_both (work, 1, 1, 1, 0, 0);
-            }
-        }
-      else if (!multibyte_p
-               && !NILP (BVAR (current_buffer, enable_multibyte_characters)))
-        {
-          /* Convert from single-byte to multi-byte.  */
-          ptrdiff_t i;
-          int c, n;
-          unsigned char str[MAX_MULTIBYTE_LENGTH];
-
-          /* Convert a single-byte string to multibyte.  */
-          for (i = 0; i < nbytes; i++)
-            {
-              c = msg[i];
-              MAKE_CHAR_MULTIBYTE (c);
-              n = CHAR_STRING (c, str);
-              insert_1_both ((char *) str, 1, n, 1, 0, 0);
-            }
-        }
-      else
-        insert_1 (s, nbytes, 1, 0, 0);
-    }
+  /* This function takes care of single/multibyte conversion.
+     We just have to ensure that the echo area buffer has the right
+     setting of enable_multibyte_characters.  */
+  insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 1);
 
   return 0;
 }