69 files changed, 1067 insertions, 468 deletions
diff --git a/src/.gdbinit b/src/.gdbinit
index df3a9cd7124..1db25324ea0 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -60,7 +60,7 @@ define xgetint
  if gdb_use_struct
    set $bugfix = $bugfix.i
  end
-  set $int = gdb_use_lsb ? $bugfix >> (gdb_gctypebits - 1) : $bugfix << gdb_gctypebits) >> gdb_gctypebits
+  set $int = gdb_use_lsb ? $bugfix >> (gdb_gctypebits - 1) : $bugfix << (gdb_gctypebits - 1) >> (gdb_gctypebits - 1)
 end
 define xgettype
@@ -1189,7 +1189,7 @@ define hookpost-backtrace
 end
 define xreload
-  set $tagmask = (((long)1 << gdb_gctypebits) - 1)
+  set $tagmask = ((1 << gdb_gctypebits) - 1)
  # The consing_since_gc business widens the 1 to EMACS_INT,
  # a symbol not directly visible to GDB.
  set $valmask = gdb_use_lsb ? ~($tagmask) : ((consing_since_gc - consing_since_gc + 1) << gdb_valbits) - 1
diff --git a/src/ChangeLog b/src/ChangeLog
index 19a9ace0728..9a239de5b99 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,183 @@
+2012-06-18  Martin Rudalics  <rudalics@gmx.at>
+        * buffer.c (Fkill_buffer): Don't throw an error when the buffer
+        gets killed during executing of this function (Bug#11665).  Try
+        to always return Qt when the buffer has been actually killed.
+        (Vkill_buffer_query_functions): In doc-string say that functions
+        run by this hook should not change the current buffer.
+2012-06-18  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix recently-introduced process.c problems found by static checking.
+        * process.c (write_queue_push, write_queue_pop, send_process):
+        Use ptrdiff_t, not int or EMACS_INT, for buffer lengths and offsets.
+        (write_queue_pop): Fix pointer signedness problem.
+        (send_process): Remove unused local.
+2012-06-17  Chong Yidong  <cyd@gnu.org>
+        * xdisp.c (redisplay_internal): No need to redisplay terminal
+        frames that are not on top.
+2012-06-17  Troels Nielsen  <bn.troels@gmail.com>
+        * process.c (make_process): Initialize write_queue.
+        (write_queue_push, write_queue_pop): New functions.
+        (send_process): Use them to maintain correct ordering of process
+        writes (Bug#10815).
+2012-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+        * lisp.h (eassert): Assume C89 or later.
+        This removes the need for CHECK.
+        (CHECK): Remove.  Its comments about always evaluating its
+        argument were confusing, as 'eassert' typically does not evaluate
+        its argument.
+        * coding.c (produce_chars): Use ptrdiff_t, not int.
+        * xterm.c (x_draw_underwave): Check for integer overflow.
+        This pacifies gcc 4.7.0 -Wunsafe-loop-optimizations on x86-64.
+2012-06-17  Jan Djärv  <jan.h.d@swipnet.se>
+        * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+        referenced (Bug#11583).
+2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
+        Implement wave-style variant of underlining.
+        * dispextern.h (face_underline_type): New enum.
+        (face): Add field for underline type.
+        * nsterm.m (ns_draw_underwave): New function.
+        (ns_draw_text_decoration): Use it.
+        * w32term.c (w32_restore_glyph_string_clip, w32_draw_underwave):
+        New functions.
+        (x_draw_glyph_string): Use them.
+        * xfaces.c (Qline, Qwave): New Lisp objects.
+        (check_lface_attrs, merge_face_ref)
+        (Finternal_set_lisp_face_attribute, realize_x_face): Handle
+        wave-style underline face attributes.
+        * xterm.c (x_draw_underwave): New function.
+        (x_draw_glyph_string): Use it.
+2012-06-16  Juanma Barranquero  <lekktu@gmail.com>
+        * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/fringe.$(O))
+        ($(BLD)/xml.$(O), $(BLD)/intervals.$(O), $(BLD)/macros.$(O))
+        ($(BLD)/minibuf.$(O), $(BLD)/regex.$(O), $(BLD)/region-cache.$(O))
+        ($(BLD)/textprop.$(O), $(BLD)/undo.$(O), $(BLD)/window.$(O))
+        ($(BLD)/w32select.$(O)): Update dependencies.
+2012-06-16  Andreas Schwab  <schwab@linux-m68k.org>
+        * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.
+        (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
+        * character.c (_fetch_multibyte_char_p): Remove.
+        * alloc.c: Include "character.h" before "buffer.h".
+        * bidi.c: Likewise.
+        * buffer.c: Likewise.
+        * bytecode.c: Likewise.
+        * callint.c: Likewise.
+        * callproc.c: Likewise.
+        * casefiddle.c: Likewise.
+        * casetab.c: Likewise.
+        * category.c: Likewise.
+        * cmds.c: Likewise.
+        * coding.c: Likewise.
+        * composite.c: Likewise.
+        * dired.c: Likewise.
+        * dispnew.c: Likewise.
+        * doc.c: Likewise.
+        * dosfns.c: Likewise.
+        * editfns.c: Likewise.
+        * emacs.c: Likewise.
+        * fileio.c: Likewise.
+        * filelock.c: Likewise.
+        * font.c: Likewise.
+        * fontset.c: Likewise.
+        * fringe.c: Likewise.
+        * indent.c: Likewise.
+        * insdel.c: Likewise.
+        * intervals.c: Likewise.
+        * keyboard.c: Likewise.
+        * keymap.c: Likewise.
+        * lread.c: Likewise.
+        * macros.c: Likewise.
+        * marker.c: Likewise.
+        * minibuf.c: Likewise.
+        * nsfns.m: Likewise.
+        * nsmenu.m: Likewise.
+        * print.c: Likewise.
+        * process.c: Likewise.
+        * regex.c: Likewise.
+        * region-cache.c: Likewise.
+        * search.c: Likewise.
+        * syntax.c: Likewise.
+        * term.c: Likewise.
+        * textprop.c: Likewise.
+        * undo.c: Likewise.
+        * unexsol.c: Likewise.
+        * w16select.c: Likewise.
+        * w32fns.c: Likewise.
+        * w32menu.c: Likewise.
+        * window.c: Likewise.
+        * xdisp.c: Likewise.
+        * xfns.c: Likewise.
+        * xmenu.c: Likewise.
+        * xml.c: Likewise.
+        * xselect.c: Likewise.
+2012-06-16  Eli Zaretskii  <eliz@gnu.org>
+        * xdisp.c (set_cursor_from_row): Don't dereference glyphs_end.  If
+        all the glyphs of the glyph row came from strings, and we have no
+        cursor positioning clues, put the cursor on the first glyph of the
+        row.
+        (handle_face_prop): Use chunk-relative overlay string index when
+        indexing into it->string_overlays array.  (Bug#11653)
+        (set_cursor_from_row): Use the leftmost glyph as GLYPH_BEFORE, not
+        the rightmost.  (Bug#11720)
+2012-06-16  Andreas Schwab  <schwab@linux-m68k.org>
+        * category.h (CHAR_HAS_CATEGORY): Define as inline.
+        (CATEGORY_MEMBER): Enforce 1/0 value.
+        * category.c (_temp_category_set): Remove.
+2012-06-16  Eli Zaretskii  <eliz@gnu.org>
+        * window.c (Fdelete_other_windows_internal)
+        (Fdelete_window_internal): Don't access frame's mouse highlight
+        info of the initial frame.  (Bug#11677)
+2012-06-14  Paul Eggert  <eggert@cs.ucla.edu>
+        * .gdbinit (xgetint): Fix recently-introduced paren typo.
+        Assume USE_2_TAGS_FOR_INTS.
+        (xreload): Adjust $tagmask width to match recent lisp.h change.
+        Simplify lisp.h in minor ways that should not affect code.
+        * lisp.h (USE_2_TAGS_FOR_INTS): Remove, as it was always defined.
+        (LISP_INT_TAG, case_Lisp_Int, LISP_STRING_TAG, LISP_INT_TAG_P)
+        (LISP_INT1_TAG, enum Lisp_Type, XINT, XUINT, make_number):
+        Simplify under the assumption that USE_2_TAGS_FOR_INTS is defined.
+        (INTTYPEBITS): New macro, for clarity.
+        (INTMASK, MOST_POSITIVE_FIXNUM): Use it.
+        (LISP_INT1_TAG, LISP_STRING_TAG, LISP_INT_TAG_P): Simplify
+        now that USE_LSB_TAG is always defined.
+        (TYPEMASK, XINT) [USE_LSB_TAG]: Remove unnecessary cast.
+        (make_number) [!USE_LSB_TAG]: Use INTMASK; that's simpler.
+2012-06-13  Juanma Barranquero  <lekktu@gmail.com>
+        * makefile.w32-in ($(BLD)/data.$(O)): Update dependencies.
+2012-06-13  Glenn Morris  <rgm@gnu.org>
+        * s/bsd-common.h (BSD4_3):
+        * s/usg5-4-common.h (USG5_4): No longer define; unused.
 2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
        * lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct
diff --git a/src/alloc.c b/src/alloc.c
index 1478ce9ae4e..5c6297faae5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -38,12 +38,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "process.h"
 #include "intervals.h"
 #include "puresize.h"
+#include "character.h"
 #include "buffer.h"
 #include "window.h"
 #include "keyboard.h"
 #include "frame.h"
 #include "blockinput.h"
-#include "character.h"
 #include "syssignal.h"
 #include "termhooks.h"          /* For struct terminal.  */
 #include <setjmp.h>
diff --git a/src/bidi.c b/src/bidi.c
index 7a716d3f0b0..675e2028d92 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -59,8 +59,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "dispextern.h"
 static int bidi_initialized = 0;
diff --git a/src/buffer.c b/src/buffer.c
index 504d477494b..e501c9b73cc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -33,8 +33,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "intervals.h"
 #include "window.h"
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "region-cache.h"
 #include "indent.h"
 #include "blockinput.h"
@@ -1434,24 +1434,26 @@ No argument or nil as argument means do this for the current buffer.  */)
  DEFVAR_LISP ("kill-buffer-hook", ..., "\
 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\
 The buffer being killed will be current while the hook is running.\n\
-See `kill-buffer'."
- */
+Functions run by this hook are supposed to not change the current
+buffer.  See `kill-buffer'."
+*/
 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
-       doc: /* Kill buffer BUFFER-OR-NAME.
+       doc: /* Kill the buffer specified by BUFFER-OR-NAME.
 The argument may be a buffer or the name of an existing buffer.
 Argument nil or omitted means kill the current buffer.  Return t if the
 buffer is actually killed, nil otherwise.
-This function calls `replace-buffer-in-windows' for cleaning up all
+The functions in `kill-buffer-query-functions' are called with the
-windows currently displaying the buffer to be killed.  The functions in
+buffer to be killed as the current buffer.  If any of them returns nil,
-`kill-buffer-query-functions' are called with the buffer to be killed as
+the buffer is not killed.  The hook `kill-buffer-hook' is run before the
-the current buffer.  If any of them returns nil, the buffer is not
+buffer is actually killed.  The buffer being killed will be current
-killed.  The hook `kill-buffer-hook' is run before the buffer is
+while the hook is running.  Functions called by any of these hooks are
-actually killed.  The buffer being killed will be current while the hook
+supposed to not change the current buffer.
-is running.
 Any processes that have this buffer as the `process-buffer' are killed
-with SIGHUP.  */)
+with SIGHUP.  This function calls `replace-buffer-in-windows' for
+cleaning up all windows currently displaying the buffer to be killed. */)
  (Lisp_Object buffer_or_name)
 {
  Lisp_Object buffer;
@@ -1505,6 +1507,10 @@ with SIGHUP.  */)
    unbind_to (count, Qnil);
  }
+  /* If the hooks have killed the buffer, exit now.  */
+  if (NILP (BVAR (b, name)))
+    return Qt;
  /* We have no more questions to ask.  Verify that it is valid
     to kill the buffer.  This must be done after the questions
     since anything can happen within do_yes_or_no_p.  */
@@ -1513,9 +1519,6 @@ with SIGHUP.  */)
  if (EQ (buffer, XWINDOW (minibuf_window)->buffer))
    return Qnil;
-  if (NILP (BVAR (b, name)))
-    return Qnil;
  /* When we kill a base buffer, kill all its indirect buffers.
     We do it at this stage so nothing terrible happens if they
     ask questions or their hooks get errors.  */
@@ -1536,6 +1539,10 @@ with SIGHUP.  */)
          }
      UNGCPRO;
+      /* Exit if we now have killed the base buffer (Bug#11665).  */
+      if (NILP (BVAR (b, name)))
+        return Qt;
    }
  /* Run replace_buffer_in_windows before making another buffer current
@@ -1544,9 +1551,12 @@ with SIGHUP.  */)
     buffer.  (Bug#10114) */
  replace_buffer_in_windows (buffer);
-     /* Make this buffer not be current.
+  /* Exit if replacing the buffer in windows has killed our buffer.  */
-     In the process, notice if this is the sole visible buffer
+  if (NILP (BVAR (b, name)))
-     and give up if so.  */
+    return Qt;
+  /* Make this buffer not be current.  Exit if it is the sole visible
+     buffer.  */
  if (b == current_buffer)
    {
      tem = Fother_buffer (buffer, Qnil, Qnil);
@@ -1555,15 +1565,12 @@ with SIGHUP.  */)
        return Qnil;
    }
-  /* Notice if the buffer to kill is the sole visible buffer
+  /* If the buffer now current is shown in the minibuffer and our buffer
-     when we're currently in the mini-buffer, and give up if so.  */
+     is the sole other buffer give up.  */
  XSETBUFFER (tem, current_buffer);
-  if (EQ (tem, XWINDOW (minibuf_window)->buffer))
+  if (EQ (tem, XWINDOW (minibuf_window)->buffer)
-    {
+      && EQ (buffer, Fother_buffer (buffer, Qnil, Qnil)))
-      tem = Fother_buffer (buffer, Qnil, Qnil);
+    return Qnil;
-      if (EQ (buffer, tem))
-        return Qnil;
-    }
  /* Now there is no question: we can kill the buffer.  */
@@ -1576,11 +1583,10 @@ with SIGHUP.  */)
  kill_buffer_processes (buffer);
  UNGCPRO;
-  /* Killing buffer processes may run sentinels which may
+  /* Killing buffer processes may run sentinels which may have killed
-     have called kill-buffer.  */
+     our buffer.  */
  if (NILP (BVAR (b, name)))
-    return Qnil;
+    return Qt;
  /* These may run Lisp code and into infinite loops (if someone
     insisted on circular lists) so allow quitting here.  */
@@ -1592,8 +1598,7 @@ with SIGHUP.  */)
  Vinhibit_quit = Qt;
  /* Remove the buffer from the list of all buffers.  */
  Vbuffer_alist = Fdelq (Frassq (buffer, Vbuffer_alist), Vbuffer_alist);
-  /* If replace_buffer_in_windows didn't do its job correctly fix that
+  /* If replace_buffer_in_windows didn't do its job fix that now.  */
-     now.  */
  replace_buffer_in_windows_safely (buffer);
  Vinhibit_quit = tem;
@@ -1611,6 +1616,10 @@ with SIGHUP.  */)
        internal_delete_file (BVAR (b, auto_save_file_name));
    }
+  /* Deleting an auto-save file could have killed our buffer.  */
+  if (NILP (BVAR (b, name)))
+    return Qt;
  if (b->base_buffer)
    {
      /* Unchain all markers that belong to this indirect buffer.
@@ -5991,7 +6000,9 @@ Use Custom to set this variable and update the display."  */);
  DEFVAR_LISP ("kill-buffer-query-functions", Vkill_buffer_query_functions,
               doc: /* List of functions called with no args to query before killing a buffer.
 The buffer being killed will be current while the functions are running.
-If any of them returns nil, the buffer is not killed.  */);
+If any of them returns nil, the buffer is not killed.  Functions run by
+this hook are supposed to not change the current buffer.  */);
  Vkill_buffer_query_functions = Qnil;
  DEFVAR_LISP ("change-major-mode-hook", Vchange_major_mode_hook,
diff --git a/src/buffer.h b/src/buffer.h
index 3aa4b11c450..8e0604e90c2 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -355,28 +355,6 @@ while (0)
 #define FETCH_BYTE(n) *(BYTE_POS_ADDR ((n)))
-/* Variables used locally in FETCH_MULTIBYTE_CHAR.  */
-extern unsigned char *_fetch_multibyte_char_p;
-/* Return character code of multi-byte form at byte position POS.  If POS
-   doesn't point the head of valid multi-byte form, only the byte at
-   POS is returned.  No range checking.
-   WARNING: The character returned by this macro could be "unified"
-   inside STRING_CHAR, if the original character in the buffer belongs
-   to one of the Private Use Areas (PUAs) of codepoints that Emacs
-   uses to support non-unified CJK characters.  If that happens,
-   CHAR_BYTES will return a value that is different from the length of
-   the original multibyte sequence stored in the buffer.  Therefore,
-   do _not_ use FETCH_MULTIBYTE_CHAR if you need to advance through
-   the buffer to the next character after fetching this one.  Instead,
-   use either FETCH_CHAR_ADVANCE or STRING_CHAR_AND_LENGTH.  */
-#define FETCH_MULTIBYTE_CHAR(pos)                                       \
-  (_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0)        \
-                               + (pos) + BEG_ADDR - BEG_BYTE),          \
-   STRING_CHAR (_fetch_multibyte_char_p))
 /* Return character at byte position POS.  If the current buffer is unibyte
   and the character is not ASCII, make the returning character
   multibyte.  */
@@ -425,16 +403,6 @@ extern unsigned char *_fetch_multibyte_char_p;
 #define BUF_FETCH_BYTE(buf, n) \
  *(BUF_BYTE_ADDRESS ((buf), (n)))
-/* Return character code of multi-byte form at byte position POS in BUF.
-   If POS doesn't point the head of valid multi-byte form, only the byte at
-   POS is returned.  No range checking.  */
-#define BUF_FETCH_MULTIBYTE_CHAR(buf, pos)                              \
-  (_fetch_multibyte_char_p                                              \
-     = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0)          \
-        + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE),                       \
-   STRING_CHAR (_fetch_multibyte_char_p))
 /* Define the actual buffer data structures.  */
@@ -945,7 +913,41 @@ EXFUN (Fbuffer_local_value, 2);
 extern Lisp_Object Qbefore_change_functions;
 extern Lisp_Object Qafter_change_functions;
 extern Lisp_Object Qfirst_change_hook;
+/* Return character code of multi-byte form at byte position POS.  If POS
+   doesn't point the head of valid multi-byte form, only the byte at
+   POS is returned.  No range checking.
+   WARNING: The character returned by this macro could be "unified"
+   inside STRING_CHAR, if the original character in the buffer belongs
+   to one of the Private Use Areas (PUAs) of codepoints that Emacs
+   uses to support non-unified CJK characters.  If that happens,
+   CHAR_BYTES will return a value that is different from the length of
+   the original multibyte sequence stored in the buffer.  Therefore,
+   do _not_ use FETCH_MULTIBYTE_CHAR if you need to advance through
+   the buffer to the next character after fetching this one.  Instead,
+   use either FETCH_CHAR_ADVANCE or STRING_CHAR_AND_LENGTH.  */
+static inline int
+FETCH_MULTIBYTE_CHAR (ptrdiff_t pos)
+{
+  unsigned char *p = ((pos >= GPT_BYTE ? GAP_SIZE : 0)
+                      + pos + BEG_ADDR - BEG_BYTE);
+  return STRING_CHAR (p);
+}
+/* Return character code of multi-byte form at byte position POS in BUF.
+   If POS doesn't point the head of valid multi-byte form, only the byte at
+   POS is returned.  No range checking.  */
+static inline int
+BUF_FETCH_MULTIBYTE_CHAR (struct buffer *buf, ptrdiff_t pos)
+{
+  unsigned char *p
+    = ((pos >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0)
+       + pos + BUF_BEG_ADDR (buf) - BEG_BYTE);
+  return STRING_CHAR (p);
+}
 /* Overlays */
diff --git a/src/bytecode.c b/src/bytecode.c
index e2370254f36..2e6ee3d4445 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -35,8 +35,8 @@ by Hallvard:
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "syntax.h"
 #include "window.h"
diff --git a/src/callint.c b/src/callint.c
index bfa981ec65a..e5ff99714c0 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -22,12 +22,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "commands.h"
 #include "keyboard.h"
 #include "window.h"
 #include "keymap.h"
-#include "character.h"
 Lisp_Object Qminus, Qplus;
 Lisp_Object Qcall_interactively;
diff --git a/src/callproc.c b/src/callproc.c
index 976d3061c8b..804af1e9abb 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -44,8 +44,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* MSDOS */
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "ccl.h"
 #include "coding.h"
 #include "composite.h"
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 278806b3030..19fbc832288 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -21,8 +21,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "commands.h"
 #include "syntax.h"
 #include "composite.h"
diff --git a/src/casetab.c b/src/casetab.c
index c28f0c08d5e..86dbca4d026 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -21,8 +21,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 static Lisp_Object Qcase_table_p, Qcase_table;
 Lisp_Object Vascii_downcase_table;
diff --git a/src/category.c b/src/category.c
index a59ad3da53e..7d0f72d284d 100644
--- a/src/category.c
+++ b/src/category.c
@@ -32,8 +32,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <ctype.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "category.h"
 #include "keymap.h"
@@ -50,9 +50,6 @@ static int category_table_version;
 static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p;
-/* Temporary internal variable used in macro CHAR_HAS_CATEGORY.  */
-Lisp_Object _temp_category_set;
 /* Make CATEGORY_SET includes (if VAL is t) or excludes (if VAL is
   nil) CATEGORY.  */
 #define SET_CATEGORY_SET(category_set, category, val) \
diff --git a/src/category.h b/src/category.h
index 423270100b3..580e516afd9 100644
--- a/src/category.h
+++ b/src/category.h
@@ -1,6 +1,6 @@
 /* Declarations having to do with Emacs category tables.
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010, 2011
+     2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
     National Institute of Advanced Industrial Science and Technology (AIST)
     Registration Number H14PRO021
   Copyright (C) 2003
@@ -69,27 +69,27 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CHECK_CATEGORY_SET(x) \
  CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
+/* Return the category set of character C in the current category table.  */
+#define CATEGORY_SET(c) char_category_set (c)
 /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
   The faster version of `!NILP (Faref (category_set, category))'.  */
 #define CATEGORY_MEMBER(category, category_set)                         \
-  (XCATEGORY_SET (category_set)->data[(category) / 8]                   \
+  ((XCATEGORY_SET (category_set)->data[(category) / 8]                  \
-   & (1 << ((category) % 8)))
+    >> ((category) % 8)) & 1)
-/* Temporary internal variable used in macro CHAR_HAS_CATEGORY.  */
-extern Lisp_Object _temp_category_set;
-/* Return 1 if category set of CH contains CATEGORY, elt return 0.  */
+/* Return 1 if category set of CH contains CATEGORY, else return 0.  */
-#define CHAR_HAS_CATEGORY(ch, category) \
+static inline int
-  (_temp_category_set = CATEGORY_SET (ch),      \
+CHAR_HAS_CATEGORY (int ch, int category)
-   CATEGORY_MEMBER (category, _temp_category_set))
+{
+  Lisp_Object category_set = CATEGORY_SET (ch);
+  return CATEGORY_MEMBER (category, category_set);
+}
 /* The standard category table is stored where it will automatically
   be used in all new buffers.  */
 #define Vstandard_category_table BVAR (&buffer_defaults, category_table)
-/* Return the category set of character C in the current category table.  */
-#define CATEGORY_SET(c) char_category_set (c)
 /* Return the doc string of CATEGORY in category table TABLE.  */
 #define CATEGORY_DOCSTRING(table, category) \
  XVECTOR (Fchar_table_extra_slot (table, make_number (0)))->contents[(category) - ' ']
diff --git a/src/character.c b/src/character.c
index b85cedad937..fbd23409d08 100644
--- a/src/character.c
+++ b/src/character.c
@@ -57,9 +57,6 @@ static Lisp_Object Qauto_fill_chars;
   Unicode character.  Mainly used by the macro MAYBE_UNIFY_CHAR.  */
 Lisp_Object Vchar_unify_table;
-/* Variable used locally in the macro FETCH_MULTIBYTE_CHAR.  */
-unsigned char *_fetch_multibyte_char_p;
 static Lisp_Object Qchar_script_table;
diff --git a/src/cmds.c b/src/cmds.c
index 225c26b082c..d617c7f81d9 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -22,8 +22,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "syntax.h"
 #include "window.h"
 #include "keyboard.h"
diff --git a/src/coding.c b/src/coding.c
index 17e342298b9..64826ae16b9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -288,8 +288,8 @@ encode_coding_XXX (struct coding_system *coding)
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "ccl.h"
 #include "composite.h"
@@ -6765,7 +6765,8 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
      while (buf < buf_end)
        {
-          int c = *buf, i;
+          int c = *buf;
+          ptrdiff_t i;
          if (c >= 0)
            {
diff --git a/src/composite.c b/src/composite.c
index 50aca156ba4..6070e4070f0 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -25,8 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "intervals.h"
 #include "window.h"
diff --git a/src/dired.c b/src/dired.c
index 38dfa23c1bf..1ce236d5674 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -71,9 +71,9 @@ extern struct direct *readdir (DIR *);
 #include "lisp.h"
 #include "systime.h"
+#include "character.h"
 #include "buffer.h"
 #include "commands.h"
-#include "character.h"
 #include "charset.h"
 #include "coding.h"
 #include "regex.h"
diff --git a/src/dispextern.h b/src/dispextern.h
index 76e98437cf1..db7a91299d0 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1520,6 +1520,13 @@ enum face_box_type
  FACE_SUNKEN_BOX
 };
+/* Underline type. */
+enum face_underline_type
+{
+  FACE_UNDER_LINE,
+  FACE_UNDER_WAVE
+};
 /* Structure describing a realized face.
@@ -1595,6 +1602,9 @@ struct face
     drawing shadows.  */
  unsigned use_box_color_for_shadows_p : 1;
+  /* Style of underlining. */
+  enum face_underline_type underline_type;
  /* Non-zero if text in this face should be underlined, overlined,
     strike-through or have a box drawn around it.  */
  unsigned underline_p : 1;
diff --git a/src/dispnew.c b/src/dispnew.c
index b8ce90bff9f..36f2c686ac0 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -29,8 +29,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* cm.h must come after dispextern.h on Windows.  */
 #include "dispextern.h"
 #include "cm.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "keyboard.h"
 #include "frame.h"
 #include "termhooks.h"
diff --git a/src/doc.c b/src/doc.c
index cd23d9266a2..223741c3bf5 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -28,9 +28,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "keyboard.h"
-#include "character.h"
 #include "keymap.h"
 #include "buildobj.h"
diff --git a/src/dosfns.c b/src/dosfns.c
index d4b96e9df90..e8c0187172d 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <dos.h>
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "termchar.h"
 #include "frame.h"
@@ -35,7 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "dosfns.h"
 #include "msdos.h"
 #include "dispextern.h"
-#include "character.h"
 #include "coding.h"
 #include "process.h"
 #include <dpmi.h>
diff --git a/src/editfns.c b/src/editfns.c
index 8f7b2aee76c..1fb20b07e70 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -52,8 +52,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <verify.h>
 #include "intervals.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "frame.h"
 #include "window.h"
diff --git a/src/emacs.c b/src/emacs.c
index 0b679c7747a..1354352abd9 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -45,6 +45,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "commands.h"
 #include "intervals.h"
+#include "character.h"
 #include "buffer.h"
 #include "window.h"
diff --git a/src/fileio.c b/src/fileio.c
index 496f9d7efa4..388ae84b6f3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -40,8 +40,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "intervals.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "window.h"
 #include "blockinput.h"
diff --git a/src/filelock.c b/src/filelock.c
index d8914c73328..a0ac154a0d2 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -40,8 +40,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "systime.h"
diff --git a/src/font.c b/src/font.c
index 16d09af01b3..dbea3a3ca3c 100644
--- a/src/font.c
+++ b/src/font.c
@@ -27,12 +27,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "frame.h"
 #include "window.h"
 #include "dispextern.h"
 #include "charset.h"
-#include "character.h"
 #include "composite.h"
 #include "fontset.h"
 #include "font.h"
diff --git a/src/fontset.c b/src/fontset.c
index b2c7249625e..1d704a5900e 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -32,8 +32,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "blockinput.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "ccl.h"
 #include "keyboard.h"
diff --git a/src/fringe.c b/src/fringe.c
index 39f7e8dbb54..0224ea73e3e 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 #include "window.h"
 #include "dispextern.h"
+#include "character.h"
 #include "buffer.h"
 #include "blockinput.h"
 #include "termhooks.h"
diff --git a/src/indent.c b/src/indent.c
index 32533438e2a..88cc0ab4798 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -22,8 +22,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "category.h"
 #include "composite.h"
 #include "indent.h"
diff --git a/src/insdel.c b/src/insdel.c
index 148ba221940..060f83f7a2f 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -25,8 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "intervals.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "window.h"
 #include "blockinput.h"
 #include "region-cache.h"
diff --git a/src/intervals.c b/src/intervals.c
index 0b332caf897..2c652cd9ad9 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -42,6 +42,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <intprops.h>
 #include "lisp.h"
 #include "intervals.h"
+#include "character.h"
 #include "buffer.h"
 #include "puresize.h"
 #include "keyboard.h"
diff --git a/src/keyboard.c b/src/keyboard.c
index ba473ac8a2b..6be81728102 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -30,8 +30,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #include "window.h"
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "disptab.h"
 #include "dispextern.h"
 #include "syntax.h"
diff --git a/src/keymap.c b/src/keymap.c
index 2f5558c171f..6c59a4a78d0 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -43,8 +43,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "keyboard.h"
 #include "frame.h"
diff --git a/src/lisp.h b/src/lisp.h
index c655413544c..991dec431cc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -106,7 +106,12 @@ typedef EMACS_UINT uprintmax_t;
 /* Extra internal type checking?  */
-#ifdef ENABLE_CHECKING
+/* Define an Emacs version of 'assert (COND)', since some
+   system-defined 'assert's are flaky.  COND should be free of side
+   effects; it may or may not be evaluated.  */
+#ifndef ENABLE_CHECKING
+# define eassert(X) ((void) (0 && (X))) /* Check that X compiles.  */
+#else /* ENABLE_CHECKING */
 extern void die (const char *, const char *, int) NO_RETURN;
@@ -114,39 +119,16 @@ extern void die (const char *, const char *, int) NO_RETURN;
   it to 1 using a debugger to temporarily disable aborting on
   detected internal inconsistencies or error conditions.
-   Testing suppress_checking after the supplied condition ensures that
-   the side effects produced by CHECK will be consistent, independent
-   of whether ENABLE_CHECKING is defined, or whether the checks are
-   suppressed at run time.
   In some cases, a good compiler may be able to optimize away the
-   CHECK macro altogether, e.g., if XSTRING (x) uses CHECK to test
+   eassert macro altogether, e.g., if XSTRING (x) uses eassert to test
   STRINGP (x), but a particular use of XSTRING is invoked only after
   testing that STRINGP (x) is true, making the test redundant.  */
 extern int suppress_checking EXTERNALLY_VISIBLE;
-#define CHECK(check,msg) (((check) || suppress_checking         \
+# define eassert(cond)                                          \
-                           ? (void) 0                           \
+   ((cond) || suppress_checking                                 \
-                           : die ((msg), __FILE__, __LINE__)),  \
+    ? (void) 0                                                  \
-                          0)
+    : die ("assertion failed: " # cond, __FILE__, __LINE__))
-#else
-/* Produce same side effects and result, but don't complain.  */
-#define CHECK(check,msg) ((check),0)
-#endif
-/* Define an Emacs version of "assert", since some system ones are
-   flaky.  */
-#ifndef ENABLE_CHECKING
-#define eassert(X) ((void) (0 && (X))) /* Check that X compiles.  */
-#else /* ENABLE_CHECKING */
-#if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__)
-#define eassert(cond) CHECK (cond, "assertion failed: " #cond)
-#else
-#define eassert(cond) CHECK (cond, "assertion failed")
-#endif
 #endif /* ENABLE_CHECKING */
 /* Use the configure flag --enable-check-lisp-object-type to make
@@ -230,31 +212,18 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 /* Define the fundamental Lisp data structures.  */
-/* If USE_2_TAGBITS_FOR_INTS is defined, then Lisp integers use
-   2 tags, to give them one extra bit, thus extending their range from
-   e.g -2^28..2^28-1 to -2^29..2^29-1.  */
-#define USE_2_TAGS_FOR_INTS
 /* This is the set of Lisp data types.  */
-#if !defined USE_2_TAGS_FOR_INTS
+/* Lisp integers use 2 tags, to give them one extra bit, thus
-# define LISP_INT_TAG Lisp_Int
+   extending their range from, e.g., -2^28..2^28-1 to -2^29..2^29-1.  */
-# define case_Lisp_Int case Lisp_Int
+#define INTTYPEBITS (GCTYPEBITS - 1)
-# define LISP_STRING_TAG 4
+#define FIXNUM_BITS (VALBITS + 1)
-# define LISP_INT_TAG_P(x) ((x) == Lisp_Int)
+#define INTMASK (EMACS_INT_MAX >> (INTTYPEBITS - 1))
-#else
+#define LISP_INT_TAG Lisp_Int0
-# define LISP_INT_TAG Lisp_Int0
+#define case_Lisp_Int case Lisp_Int0: case Lisp_Int1
-# define case_Lisp_Int case Lisp_Int0: case Lisp_Int1
+#define LISP_INT1_TAG (USE_LSB_TAG ? 1 << INTTYPEBITS : 1)
-# if USE_LSB_TAG
+#define LISP_STRING_TAG (5 - LISP_INT1_TAG)
-#  define LISP_INT1_TAG 4
+#define LISP_INT_TAG_P(x) (((x) & ~LISP_INT1_TAG) == 0)
-#  define LISP_STRING_TAG 1
-#  define LISP_INT_TAG_P(x) (((x) & 3) == 0)
-# else
-#  define LISP_INT1_TAG 1
-#  define LISP_STRING_TAG 4
-#  define LISP_INT_TAG_P(x) (((x) & 6) == 0)
-# endif
-#endif
 /* Stolen from GDB.  The only known compiler that doesn't support
   enums in bitfields is MSVC.  */
@@ -268,12 +237,8 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 enum Lisp_Type
  {
    /* Integer.  XINT (obj) is the integer value.  */
-#ifdef USE_2_TAGS_FOR_INTS
    Lisp_Int0 = 0,
    Lisp_Int1 = LISP_INT1_TAG,
-#else
-    Lisp_Int = 0,
-#endif
    /* Symbol.  XSYMBOL (object) points to a struct Lisp_Symbol.  */
    Lisp_Symbol = 2,
@@ -420,68 +385,50 @@ enum pvec_type
 XCONS (tem) is the struct Lisp_Cons * pointing to the memory for that cons.  */
 /* Return a perfect hash of the Lisp_Object representation.  */
-#define XHASH(a) XLI(a)
+#define XHASH(a) XLI (a)
 #if USE_LSB_TAG
-#define TYPEMASK ((((EMACS_INT) 1) << GCTYPEBITS) - 1)
+#define TYPEMASK ((1 << GCTYPEBITS) - 1)
-#define XTYPE(a) ((enum Lisp_Type) (XLI(a) & TYPEMASK))
+#define XTYPE(a) ((enum Lisp_Type) (XLI (a) & TYPEMASK))
-#ifdef USE_2_TAGS_FOR_INTS
+#define XINT(a) (XLI (a) >> INTTYPEBITS)
-# define XINT(a) (((EMACS_INT) XLI(a)) >> (GCTYPEBITS - 1))
+#define XUINT(a) ((EMACS_UINT) XLI (a) >> INTTYPEBITS)
-# define XUINT(a) (((EMACS_UINT) XLI(a)) >> (GCTYPEBITS - 1))
+#define make_number(N) XIL ((EMACS_INT) (N) << INTTYPEBITS)
-# define make_number(N) XIL(((EMACS_INT) (N)) << (GCTYPEBITS - 1))
-#else
-# define XINT(a) (((EMACS_INT) XLI(a)) >> GCTYPEBITS)
-# define XUINT(a) (((EMACS_UINT) XLI(a)) >> GCTYPEBITS)
-# define make_number(N) XIL(((EMACS_INT) (N)) << GCTYPEBITS)
-#endif
 #define XSET(var, type, ptr)                                               \
-  (eassert (XTYPE (XIL((intptr_t) (ptr))) == 0), /* Check alignment.  */   \
+  (eassert (XTYPE (XIL ((intptr_t) (ptr))) == 0), /* Check alignment.  */  \
-   (var) = XIL((type) | (intptr_t) (ptr)))
+   (var) = XIL ((type) | (intptr_t) (ptr)))
-#define XPNTR(a) ((intptr_t) (XLI(a) & ~TYPEMASK))
+#define XPNTR(a) ((intptr_t) (XLI (a) & ~TYPEMASK))
-#define XUNTAG(a, type) ((intptr_t) (XLI(a) - (type)))
+#define XUNTAG(a, type) ((intptr_t) (XLI (a) - (type)))
 #else  /* not USE_LSB_TAG */
 #define VALMASK VAL_MAX
-/* One need to override this if there must be high bits set in data space
+#define XTYPE(a) ((enum Lisp_Type) ((EMACS_UINT) XLI (a) >> VALBITS))
-   (doing the result of the below & ((1 << (GCTYPE + 1)) - 1) would work
-    on all machines, but would penalize machines which don't need it)
- */
-#define XTYPE(a) ((enum Lisp_Type) (((EMACS_UINT) XLI(a)) >> VALBITS))
 /* For integers known to be positive, XFASTINT provides fast retrieval
   and XSETFASTINT provides fast storage.  This takes advantage of the
-   fact that Lisp_Int is 0.  */
+   fact that Lisp integers have zero-bits in their tags.  */
-#define XFASTINT(a) (XLI(a) + 0)
+#define XFASTINT(a) (XLI (a) + 0)
-#define XSETFASTINT(a, b) ((a) = XIL(b))
+#define XSETFASTINT(a, b) ((a) = XIL (b))
 /* Extract the value of a Lisp_Object as a (un)signed integer.  */
-#ifdef USE_2_TAGS_FOR_INTS
+#define XINT(a) (XLI (a) << INTTYPEBITS >> INTTYPEBITS)
-# define XINT(a) ((((EMACS_INT) XLI(a)) << (GCTYPEBITS - 1)) >> (GCTYPEBITS - 1))
+#define XUINT(a) ((EMACS_UINT) (XLI (a) & INTMASK))
-# define XUINT(a) ((EMACS_UINT) (XLI(a) & (1 + (VALMASK << 1))))
+#define make_number(N) XIL ((EMACS_INT) (N) & INTMASK)
-# define make_number(N) XIL((((EMACS_INT) (N)) & (1 + (VALMASK << 1))))
-#else
-# define XINT(a) ((((EMACS_INT) XLI(a)) << (BITS_PER_EMACS_INT - VALBITS))    \
-                  >> (BITS_PER_EMACS_INT - VALBITS))
-# define XUINT(a) ((EMACS_UINT) (XLI(a) & VALMASK))
-# define make_number(N)         \
-  XIL((((EMACS_INT) (N)) & VALMASK) | ((EMACS_INT) Lisp_Int) << VALBITS)
-#endif
-#define XSET(var, type, ptr)                              \
+#define XSET(var, type, ptr)                                  \
-   ((var) = XIL((EMACS_INT) ((EMACS_UINT) (type) << VALBITS) \
+  ((var) = XIL ((EMACS_INT) ((EMACS_UINT) (type) << VALBITS)  \
                + ((intptr_t) (ptr) & VALMASK)))
 #ifdef DATA_SEG_BITS
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
   which were stored in a Lisp_Object */
-#define XPNTR(a) ((uintptr_t) ((XLI(a) & VALMASK)) | DATA_SEG_BITS))
+#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS))
 #else
-#define XPNTR(a) ((uintptr_t) (XLI(a) & VALMASK))
+#define XPNTR(a) ((uintptr_t) (XLI (a) & VALMASK))
 #endif
 #endif /* not USE_LSB_TAG */
@@ -503,19 +450,9 @@ enum pvec_type
 #define EQ(x, y) (XHASH (x) == XHASH (y))
-/* Number of bits in a fixnum, including the sign bit.  */
-#ifdef USE_2_TAGS_FOR_INTS
-# define FIXNUM_BITS (VALBITS + 1)
-#else
-# define FIXNUM_BITS VALBITS
-#endif
-/* Mask indicating the significant bits of a fixnum.  */
-#define INTMASK (((EMACS_INT) 1 << FIXNUM_BITS) - 1)
 /* Largest and smallest representable fixnum values.  These are the C
   values.  */
-#define MOST_POSITIVE_FIXNUM (INTMASK / 2)
+#define MOST_POSITIVE_FIXNUM (EMACS_INT_MAX >> INTTYPEBITS)
 #define MOST_NEGATIVE_FIXNUM (-1 - MOST_POSITIVE_FIXNUM)
 /* Value is non-zero if I doesn't fit into a Lisp fixnum.  It is
@@ -821,7 +758,7 @@ struct vectorlike_header
    /* When the vector is allocated from a vector block, NBYTES is used
       if the vector is not on a free list, and VECTOR is used otherwise.
       For large vector-like objects, BUFFER or VECTOR is used as a pointer
-       to the next vector-like object.  It is generally a buffer or a 
+       to the next vector-like object.  It is generally a buffer or a
       Lisp_Vector alias, so for convenience it is a union instead of a
       pointer: this way, one can write P->next.vector instead of ((struct
       Lisp_Vector *) P->next).  */
diff --git a/src/lread.c b/src/lread.c
index 8a9088b8ed2..a6d77204cf8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -28,8 +28,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "coding.h"
 #include <epaths.h>
diff --git a/src/macros.c b/src/macros.c
index 0db7e63d622..7c8bc4c13b8 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "macros.h"
 #include "commands.h"
+#include "character.h"
 #include "buffer.h"
 #include "window.h"
 #include "keyboard.h"
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 0b88f7cd06b..be9d4a3361c 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -676,6 +676,7 @@ $(BLD)/composite.$(O) : \
 $(BLD)/data.$(O) : \
        $(SRC)/data.c \
        $(SRC)/buffer.h \
+        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
        $(GNU_LIB)/intprops.h \
@@ -781,6 +782,7 @@ $(BLD)/emacs.$(O) : \
        $(NT_INC)/sys/file.h \
        $(NT_INC)/unistd.h \
        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(FRAME_H) \
        $(INTERVALS_H) \
@@ -920,6 +922,7 @@ $(BLD)/fringe.$(O) : \
        $(SRC)/fringe.c \
        $(SRC)/buffer.h \
        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(DISPEXTERN_H) \
        $(FRAME_H) \
@@ -944,6 +947,7 @@ $(BLD)/xml.$(O) : \
        $(SRC)/xml.c \
        $(SRC)/buffer.h \
        $(SRC)/w32.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(LISP_H)
@@ -1002,6 +1006,7 @@ $(BLD)/intervals.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
        $(GNU_LIB)/intprops.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(INTERVALS_H) \
        $(KEYBOARD_H) \
@@ -1081,6 +1086,7 @@ $(BLD)/macros.$(O) : \
        $(SRC)/buffer.h \
        $(SRC)/commands.h \
        $(SRC)/macros.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(KEYBOARD_H) \
        $(LISP_H) \
@@ -1113,6 +1119,7 @@ $(BLD)/minibuf.$(O) : \
        $(SRC)/commands.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(DISPEXTERN_H) \
        $(FRAME_H) \
@@ -1258,7 +1265,6 @@ $(BLD)/regex.$(O) : \
        $(SRC)/category.h \
        $(SRC)/regex.h \
        $(SRC)/syntax.h \
-        $(NT_INC)/unistd.h \
        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(LISP_H)
@@ -1267,6 +1273,7 @@ $(BLD)/region-cache.$(O) : \
        $(SRC)/region-cache.c \
        $(SRC)/buffer.h \
        $(SRC)/region-cache.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(LISP_H)
@@ -1389,6 +1396,7 @@ $(BLD)/terminal.$(O) : \
 $(BLD)/textprop.$(O) : \
        $(SRC)/textprop.c \
        $(SRC)/buffer.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(INTERVALS_H) \
        $(LISP_H) \
@@ -1404,6 +1412,7 @@ $(BLD)/undo.$(O) : \
        $(SRC)/undo.c \
        $(SRC)/buffer.h \
        $(SRC)/commands.h \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(LISP_H) \
        $(WINDOW_H)
@@ -1429,6 +1438,7 @@ $(BLD)/window.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/termchar.h \
        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
        $(CONFIG_H) \
        $(DISPEXTERN_H) \
        $(FRAME_H) \
@@ -1518,6 +1528,7 @@ $(BLD)/w32menu.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/w32heap.h \
        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
        $(CHARSET_H) \
        $(CODING_H) \
        $(CONFIG_H) \
diff --git a/src/marker.c b/src/marker.c
index 37953494459..2c09b8e19a2 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -20,8 +20,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 /* Record one cached position found recently by
   buf_charpos_to_bytepos or buf_bytepos_to_charpos.  */
diff --git a/src/minibuf.c b/src/minibuf.c
index d921e80be48..bed9bb39d31 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -25,6 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "commands.h"
+#include "character.h"
 #include "buffer.h"
 #include "dispextern.h"
 #include "keyboard.h"
diff --git a/src/nsfns.m b/src/nsfns.m
index 5cea73c39ca..113fff394c4 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -38,11 +38,11 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 #include "blockinput.h"
 #include "nsterm.h"
 #include "window.h"
+#include "character.h"
 #include "buffer.h"
 #include "keyboard.h"
 #include "termhooks.h"
 #include "fontset.h"
-#include "character.h"
 #include "font.h"
 #if 0
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 4bfe0cc003a..1f86417b53a 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -28,6 +28,7 @@ Carbon version by Yamamoto Mitsuharu. */
 #include "lisp.h"
 #include "window.h"
+#include "character.h"
 #include "buffer.h"
 #include "keymap.h"
 #include "coding.h"
diff --git a/src/nsterm.m b/src/nsterm.m
index 8bd2bb283b2..dd4969a1e2e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1155,14 +1155,14 @@ x_free_frame_resources (struct frame *f)
      hlinfo->mouse_face_mouse_frame = 0;
    }
-  xfree (f->output_data.ns);
  if (f->output_data.ns->miniimage != nil)
    [f->output_data.ns->miniimage release];
  [[view window] close];
  [view release];
+  xfree (f->output_data.ns);
  UNBLOCK_INPUT;
 }
@@ -2595,6 +2595,60 @@ ns_get_glyph_string_clip_rect (struct glyph_string *s, NativeRectangle *nr)
  return n;
 }
+/* --------------------------------------------------------------------
+   Draw a wavy line under glyph string s. The wave fills wave_height
+   pixels from y.
+                    x          wave_length = 3
+                                 --
+                y    *   *   *   *   *
+                     |* * * * * * * * *
+    wave_height = 3  | *   *   *   *
+  --------------------------------------------------------------------- */
+static void
+ns_draw_underwave (struct glyph_string *s, CGFloat width, CGFloat x)
+{
+  int wave_height = 3, wave_length = 3;
+  int y, dx, dy, odd, xmax;
+  NSPoint a, b;
+  NSRect waveClip;
+  dx = wave_length;
+  dy = wave_height - 1;
+  y =  s->ybase + 1;
+  xmax = x + width;
+  /* Find and set clipping rectangle */
+  waveClip = NSMakeRect (x, y, width, wave_height);
+  [[NSGraphicsContext currentContext] saveGraphicsState];
+  NSRectClip (waveClip);
+  /* Draw the waves */
+  a.x = x - ((int)(x) % dx);
+  b.x = a.x + dx;
+  odd = (int)(a.x/dx) % 2;
+  a.y = b.y = y;
+  if (odd)
+    a.y += dy;
+  else
+    b.y += dy;
+  while (a.x <= xmax)
+    {
+      [NSBezierPath strokeLineFromPoint:a toPoint:b];
+      a.x = b.x, a.y = b.y;
+      b.x += dx, b.y = y + odd*dy;
+      odd = !odd;
+    }
+  /* Restore previous clipping rectangle(s) */
+  [[NSGraphicsContext currentContext] restoreGraphicsState];
+}
 void
 ns_draw_text_decoration (struct glyph_string *s, struct face *face,
                         NSColor *defaultCol, CGFloat width, CGFloat x)
@@ -2608,63 +2662,75 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
  /* Do underline. */
  if (face->underline_p)
    {
-      NSRect r;
+      if (s->face->underline_type == FACE_UNDER_WAVE)
-      unsigned long thickness, position;
-      /* If the prev was underlined, match its appearance. */
-      if (s->prev && s->prev->face->underline_p
-          && s->prev->underline_thickness > 0)
        {
-          thickness = s->prev->underline_thickness;
+          if (face->underline_defaulted_p)
-          position = s->prev->underline_position;
+            [defaultCol set];
+          else
+            [ns_lookup_indexed_color (face->underline_color, s->f) set];
+          ns_draw_underwave (s, width, x);
        }
-      else
+      else if (s->face->underline_type == FACE_UNDER_LINE)
        {
-          struct font *font;
-          unsigned long descent;
-          font=s->font;
-          descent = s->y + s->height - s->ybase;
-          /* Use underline thickness of font, defaulting to 1. */
-          thickness = (font && font->underline_thickness > 0)
-            ? font->underline_thickness : 1;
-          /* Determine the offset of underlining from the baseline. */
-          if (x_underline_at_descent_line)
-            position = descent - thickness;
-          else if (x_use_underline_position_properties
-                   && font && font->underline_position >= 0)
-            position = font->underline_position;
-          else if (font)
-            position = lround (font->descent / 2);
-          else
-            position = underline_minimum_offset;
-          position = max (position, underline_minimum_offset);
+          NSRect r;
+          unsigned long thickness, position;
-          /* Ensure underlining is not cropped. */
+          /* If the prev was underlined, match its appearance. */
-          if (descent <= position)
+          if (s->prev && s->prev->face->underline_p
+              && s->prev->underline_thickness > 0)
            {
-              position = descent - 1;
+              thickness = s->prev->underline_thickness;
-              thickness = 1;
+              position = s->prev->underline_position;
            }
-          else if (descent < position + thickness)
+          else
-            thickness = 1;
+            {
-        }
+              struct font *font;
+              unsigned long descent;
+              font=s->font;
+              descent = s->y + s->height - s->ybase;
+              /* Use underline thickness of font, defaulting to 1. */
+              thickness = (font && font->underline_thickness > 0)
+                ? font->underline_thickness : 1;
+              /* Determine the offset of underlining from the baseline. */
+              if (x_underline_at_descent_line)
+                position = descent - thickness;
+              else if (x_use_underline_position_properties
+                       && font && font->underline_position >= 0)
+                position = font->underline_position;
+              else if (font)
+                position = lround (font->descent / 2);
+              else
+                position = underline_minimum_offset;
-      s->underline_thickness = thickness;
+              position = max (position, underline_minimum_offset);
-      s->underline_position = position;
-      r = NSMakeRect (x, s->ybase + position, width, thickness);
+              /* Ensure underlining is not cropped. */
+              if (descent <= position)
+                {
+                  position = descent - 1;
+                  thickness = 1;
+                }
+              else if (descent < position + thickness)
+                thickness = 1;
+            }
-      if (face->underline_defaulted_p)
+          s->underline_thickness = thickness;
-        [defaultCol set];
+          s->underline_position = position;
-      else
-        [ns_lookup_indexed_color (face->underline_color, s->f) set];
+          r = NSMakeRect (x, s->ybase + position, width, thickness);
-      NSRectFill (r);
-    }
+          if (face->underline_defaulted_p)
+            [defaultCol set];
+          else
+            [ns_lookup_indexed_color (face->underline_color, s->f) set];
+          NSRectFill (r);
+        }
+    }
  /* Do overline. We follow other terms in using a thickness of 1
     and ignoring overline_margin. */
  if (face->overline_p)
diff --git a/src/print.c b/src/print.c
index 4284a19d4df..c282c64aa89 100644
--- a/src/print.c
+++ b/src/print.c
@@ -23,8 +23,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <setjmp.h>
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "keyboard.h"
 #include "frame.h"
diff --git a/src/process.c b/src/process.c
index 4d59ff0d452..cb89cae99fe 100644
--- a/src/process.c
+++ b/src/process.c
@@ -93,8 +93,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systty.h"
 #include "window.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "process.h"
 #include "frame.h"
@@ -638,6 +638,7 @@ make_process (Lisp_Object name)
  p->status = Qrun;
  p->mark = Fmake_marker ();
  p->kill_without_query = 0;
+  p->write_queue = Qnil;
 #ifdef ADAPTIVE_READ_BUFFERING
  p->adaptive_read_buffering = 0;
@@ -5371,6 +5372,78 @@ send_process_trap (int ignore)
  longjmp (send_process_frame, 1);
 }
+/* In send_process, when a write fails temporarily,
+   wait_reading_process_output is called.  It may execute user code,
+   e.g. timers, that attempts to write new data to the same process.
+   We must ensure that data is sent in the right order, and not
+   interspersed half-completed with other writes (Bug#10815).  This is
+   handled by the write_queue element of struct process.  It is a list
+   with each entry having the form
+   (string . (offset . length))
+   where STRING is a lisp string, OFFSET is the offset into the
+   string's byte sequence from which we should begin to send, and
+   LENGTH is the number of bytes left to send.  */
+/* Create a new entry in write_queue.
+   INPUT_OBJ should be a buffer, string Qt, or Qnil.
+   BUF is a pointer to the string sequence of the input_obj or a C
+   string in case of Qt or Qnil.  */
+static void
+write_queue_push (struct Lisp_Process *p, Lisp_Object input_obj,
+                  const char *buf, ptrdiff_t len, int front)
+{
+  ptrdiff_t offset;
+  Lisp_Object entry, obj;
+  if (STRINGP (input_obj))
+    {
+      offset = buf - SSDATA (input_obj);
+      obj = input_obj;
+    }
+  else
+    {
+      offset = 0;
+      obj = make_unibyte_string (buf, len);
+    }
+  entry = Fcons (obj, Fcons (make_number (offset), make_number (len)));
+  if (front)
+    p->write_queue = Fcons (entry, p->write_queue);
+  else
+    p->write_queue = nconc2 (p->write_queue, Fcons (entry, Qnil));
+}
+/* Remove the first element in the write_queue of process P, put its
+   contents in OBJ, BUF and LEN, and return non-zero.  If the
+   write_queue is empty, return zero.  */
+static int
+write_queue_pop (struct Lisp_Process *p, Lisp_Object *obj,
+                 const char **buf, ptrdiff_t *len)
+{
+  Lisp_Object entry, offset_length;
+  ptrdiff_t offset;
+  if (NILP (p->write_queue))
+    return 0;
+  entry = XCAR (p->write_queue);
+  p->write_queue = XCDR (p->write_queue);
+  *obj = XCAR (entry);
+  offset_length = XCDR (entry);
+  *len = XINT (XCDR (offset_length));
+  offset = XINT (XCAR (offset_length));
+  *buf = SSDATA (*obj) + offset;
+  return 1;
+}
 /* Send some data to process PROC.
   BUF is the beginning of the data; LEN is the number of characters.
   OBJECT is the Lisp object that the data comes from.  If OBJECT is
@@ -5389,11 +5462,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
  struct Lisp_Process *p = XPROCESS (proc);
  ssize_t rv;
  struct coding_system *coding;
-  struct gcpro gcpro1;
  void (*volatile old_sigpipe) (int);
-  GCPRO1 (object);
  if (p->raw_status_new)
    update_status (p);
  if (! EQ (p->status, Qrun))
@@ -5505,22 +5575,37 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
  if (!setjmp (send_process_frame))
    {
      p = XPROCESS (proc);  /* Repair any setjmp clobbering.  */
      process_sent_to = proc;
-      while (len > 0)
+      /* If there is already data in the write_queue, put the new data
+         in the back of queue.  Otherwise, ignore it.  */
+      if (!NILP (p->write_queue))
+        write_queue_push (p, object, buf, len, 0);
+      do   /* while !NILP (p->write_queue) */
        {
-          ptrdiff_t this = len;
+          ptrdiff_t cur_len = -1;
+          const char *cur_buf;
+          Lisp_Object cur_object;
+          /* If write_queue is empty, ignore it.  */
+          if (!write_queue_pop (p, &cur_object, &cur_buf, &cur_len))
+            {
+              cur_len = len;
+              cur_buf = buf;
+              cur_object = object;
+            }
-          /* Send this batch, using one or more write calls.  */
+          while (cur_len > 0)
-          while (this > 0)
            {
+              /* Send this batch, using one or more write calls.  */
              ptrdiff_t written = 0;
              int outfd = p->outfd;
              old_sigpipe = (void (*) (int)) signal (SIGPIPE, send_process_trap);
 #ifdef DATAGRAM_SOCKETS
              if (DATAGRAM_CHAN_P (outfd))
                {
-                  rv = sendto (outfd, buf, this,
+                  rv = sendto (outfd, cur_buf, cur_len,
                               0, datagram_address[outfd].sa,
                               datagram_address[outfd].len);
                  if (0 <= rv)
@@ -5537,10 +5622,10 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
                {
 #ifdef HAVE_GNUTLS
                  if (p->gnutls_p)
-                    written = emacs_gnutls_write (p, buf, this);
+                    written = emacs_gnutls_write (p, cur_buf, cur_len);
                  else
 #endif
-                    written = emacs_write (outfd, buf, this);
+                    written = emacs_write (outfd, cur_buf, cur_len);
                  rv = (written ? 0 : -1);
 #ifdef ADAPTIVE_READ_BUFFERING
                  if (p->read_output_delay > 0
@@ -5568,8 +5653,6 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
                       that may allow the program
                       to finish doing output and read more.  */
                    {
-                      ptrdiff_t offset = 0;
 #ifdef BROKEN_PTY_READ_AFTER_EAGAIN
                      /* A gross hack to work around a bug in FreeBSD.
                         In the following sequence, read(2) returns
@@ -5595,35 +5678,25 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
                        }
 #endif /* BROKEN_PTY_READ_AFTER_EAGAIN */
-                      /* Running filters might relocate buffers or strings.
+                      /* Put what we should have written in wait_queue.  */
-                         Arrange to relocate BUF.  */
+                      write_queue_push (p, cur_object, cur_buf, cur_len, 1);
-                      if (BUFFERP (object))
-                        offset = BUF_PTR_BYTE_POS (XBUFFER (object),
-                                                   (unsigned char *) buf);
-                      else if (STRINGP (object))
-                        offset = buf - SSDATA (object);
 #ifdef EMACS_HAS_USECS
                      wait_reading_process_output (0, 20000, 0, 0, Qnil, NULL, 0);
 #else
                      wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
 #endif
+                      /* Reread queue, to see what is left.  */
-                      if (BUFFERP (object))
+                      break;
-                        buf = (char *) BUF_BYTE_ADDRESS (XBUFFER (object),
-                                                         offset);
-                      else if (STRINGP (object))
-                        buf = offset + SSDATA (object);
                    }
                  else
                    /* This is a real error.  */
                    report_file_error ("writing to process", Fcons (proc, Qnil));
                }
-              buf += written;
+              cur_buf += written;
-              len -= written;
+              cur_len -= written;
-              this -= written;
            }
        }
+      while (!NILP (p->write_queue));
    }
  else
    {
@@ -5636,8 +5709,6 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
      deactivate_process (proc);
      error ("SIGPIPE raised on process %s; closed it", SDATA (p->name));
    }
-  UNGCPRO;
 }
 DEFUN ("process-send-region", Fprocess_send_region, Sprocess_send_region,
diff --git a/src/process.h b/src/process.h
index edb937893b0..ae4b6b61c94 100644
--- a/src/process.h
+++ b/src/process.h
@@ -77,6 +77,8 @@ struct Lisp_Process
    Lisp_Object encode_coding_system;
    /* Working buffer for encoding.  */
    Lisp_Object encoding_buf;
+    /* Queue for storing waiting writes */
+    Lisp_Object write_queue;
 #ifdef HAVE_GNUTLS
    Lisp_Object gnutls_cred_type;
diff --git a/src/regex.c b/src/regex.c
index 0dd3a187898..7ef53c606c9 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -130,13 +130,13 @@
 # include <setjmp.h>
 # include "lisp.h"
+# include "character.h"
 # include "buffer.h"
 /* Make syntax table lookup grant data in gl_state.  */
 # define SYNTAX_ENTRY_VIA_PROPERTY
 # include "syntax.h"
-# include "character.h"
 # include "category.h"
 # ifdef malloc
diff --git a/src/region-cache.c b/src/region-cache.c
index 9f4e5921877..2642e824680 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "region-cache.h"
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index ce67dd7b9af..98391740653 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -23,9 +23,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* We give these symbols the numeric values found in <sys/param.h> to
   avoid warnings about redefined macros.  */
-#ifndef BSD4_3
-#define BSD4_3 1
+/* Nothing in Emacs uses this any more.
-#endif /* BSD4_3 */
+   ifndef BSD4_3
+   define BSD4_3 1
+   endif
+*/
 #ifndef BSD_SYSTEM
 #define BSD_SYSTEM 43
diff --git a/src/s/template.h b/src/s/template.h
index d8f811dc8aa..e3557aa191b 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -27,7 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define USG */
 /* #define HPUX */
 /* #define BSD4_2 */
-/* #define BSD4_3 */
 /* #define BSD_SYSTEM */
 /* Emacs can read input using SIGIO and buffering characters itself,
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 1502228c0d8..2676e9e5943 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -24,7 +24,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define USG                             /* System III, System V, etc */
 #define USG5
-#define USG5_4
+/* Nothing in Emacs use this any more.  */
+/* #define USG5_4 */
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
   but they will run slower.  */
diff --git a/src/search.c b/src/search.c
index 99519b839ef..71ab60d9f85 100644
--- a/src/search.c
+++ b/src/search.c
@@ -24,8 +24,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "syntax.h"
 #include "category.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "region-cache.h"
 #include "commands.h"
diff --git a/src/syntax.c b/src/syntax.c
index 71da13e7a66..0518a47f92d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -25,8 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "keymap.h"
 #include "regex.h"
diff --git a/src/term.c b/src/term.c
index 8ce2efc0929..3a41552c02e 100644
--- a/src/term.c
+++ b/src/term.c
@@ -32,8 +32,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termchar.h"
 #include "termopts.h"
 #include "tparam.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "coding.h"
 #include "composite.h"
diff --git a/src/textprop.c b/src/textprop.c
index 83d07c56f28..afeb0339d5c 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
+#include "character.h"
 #include "buffer.h"
 #include "window.h"
diff --git a/src/undo.c b/src/undo.c
index 9b763984d7f..1cb048690ba 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "commands.h"
 #include "window.h"
diff --git a/src/unexsol.c b/src/unexsol.c
index ef1e34e6f0f..336f3b4faea 100644
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -7,6 +7,7 @@
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
diff --git a/src/w16select.c b/src/w16select.c
index 03f63bedf0d..270118358b4 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -36,8 +36,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "dispextern.h" /* frame.h seems to want this */
 #include "frame.h"      /* Need this to get the X window of selected_frame */
 #include "blockinput.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "coding.h"
 #include "composite.h"
diff --git a/src/w32fns.c b/src/w32fns.c
index a8becea1b74..915114138d8 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -32,13 +32,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "w32term.h"
 #include "frame.h"
 #include "window.h"
+#include "character.h"
 #include "buffer.h"
 #include "intervals.h"
 #include "dispextern.h"
 #include "keyboard.h"
 #include "blockinput.h"
 #include "epaths.h"
-#include "character.h"
 #include "charset.h"
 #include "coding.h"
 #include "ccl.h"
diff --git a/src/w32menu.c b/src/w32menu.c
index f5f5c6656c4..b957da67567 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -31,6 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termhooks.h"
 #include "window.h"
 #include "blockinput.h"
+#include "character.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
diff --git a/src/w32term.c b/src/w32term.c
index 38120b77ac9..6a4b3ca4afb 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -313,6 +313,94 @@ w32_set_clip_rectangle (HDC hdc, RECT *rect)
    SelectClipRgn (hdc, NULL);
 }
+/* Restore clipping rectangle in S */
+static void
+w32_restore_glyph_string_clip (struct glyph_string *s)
+{
+  RECT *r = s->clip;
+  int n = s->num_clips;
+  if (n == 1)
+    w32_set_clip_rectangle (s->hdc, r);
+  else if (n > 1)
+    {
+      HRGN clip1 = CreateRectRgnIndirect (r);
+      HRGN clip2 = CreateRectRgnIndirect (r + 1);
+      if (CombineRgn (clip1, clip1, clip2, RGN_OR) != ERROR)
+        SelectClipRgn (s->hdc, clip1);
+      DeleteObject (clip1);
+      DeleteObject (clip2);
+    }
+}
+/*
+   Draw a wavy line under S. The wave fills wave_height pixels from y0.
+                    x0         wave_length = 2
+                                 --
+                y0   *   *   *   *   *
+                     |* * * * * * * * *
+    wave_height = 3  | *   *   *   *
+*/
+void
+w32_draw_underwave (struct glyph_string *s, COLORREF color)
+{
+  int wave_height = 2, wave_length = 3;
+  int dx, dy, x0, y0, width, x1, y1, x2, y2, odd, xmax;
+  XRectangle wave_clip, string_clip, final_clip;
+  RECT w32_final_clip, w32_string_clip;
+  HPEN hp, oldhp;
+  dx = wave_length;
+  dy = wave_height - 1;
+  x0 = s->x;
+  y0 = s->ybase + 1;
+  width = s->width;
+  xmax = x0 + width;
+  /* Find and set clipping rectangle */
+  wave_clip = (XRectangle){ x0, y0, width, wave_height };
+  get_glyph_string_clip_rect (s, &w32_string_clip);
+  CONVERT_TO_XRECT (string_clip, w32_string_clip);
+  if (!x_intersect_rectangles (&wave_clip, &string_clip, &final_clip))
+    return;
+  hp = CreatePen (PS_SOLID, 0, color);
+  oldhp = SelectObject (s->hdc, hp);
+  CONVERT_FROM_XRECT (final_clip, w32_final_clip);
+  w32_set_clip_rectangle (s->hdc, &w32_final_clip);
+  /* Draw the waves */
+  x1 = x0 - (x0 % dx);
+  x2 = x1 + dx;
+  odd = (x1/dx) % 2;
+  y1 = y2 = y0;
+  if (odd)
+    y1 += dy;
+  else
+    y2 += dy;
+  MoveToEx (s->hdc, x1, y1, NULL);
+  while (x1 <= xmax)
+    {
+      LineTo (s->hdc, x2, y2);
+      x1  = x2, y1 = y2;
+      x2 += dx, y2 = y0 + odd*dy;
+      odd = !odd;
+    }
+  /* Restore previous pen and clipping rectangle(s) */
+  w32_restore_glyph_string_clip (s);
+  SelectObject (s->hdc, oldhp);
+  DeleteObject (hp);
+}
 /* Draw a hollow rectangle at the specified position.  */
 void
@@ -2347,60 +2435,74 @@ x_draw_glyph_string (struct glyph_string *s)
      /* Draw underline.  */
      if (s->face->underline_p)
        {
-          unsigned long thickness, position;
+          if (s->face->underline_type == FACE_UNDER_WAVE)
-          int y;
-          if (s->prev && s->prev->face->underline_p)
            {
-              /* We use the same underline style as the previous one.  */
+              COLORREF color;
-              thickness = s->prev->underline_thickness;
-              position = s->prev->underline_position;
+              if (s->face->underline_defaulted_p)
+                color = s->gc->foreground;
+              else
+                color = s->face->underline_color;
+              w32_draw_underwave (s, color);
            }
-          else
+          else if (s->face->underline_type == FACE_UNDER_LINE)
            {
-              /* Get the underline thickness.  Default is 1 pixel.  */
+              unsigned long thickness, position;
-              if (s->font && s->font->underline_thickness > 0)
+              int y;
-                thickness = s->font->underline_thickness;
+              if (s->prev && s->prev->face->underline_p)
+                {
+                  /* We use the same underline style as the previous one.  */
+                  thickness = s->prev->underline_thickness;
+                  position = s->prev->underline_position;
+                }
              else
-                thickness = 1;
+                {
-              if (x_underline_at_descent_line)
+                  /* Get the underline thickness.  Default is 1 pixel.  */
-                position = (s->height - thickness) - (s->ybase - s->y);
+                  if (s->font && s->font->underline_thickness > 0)
+                    thickness = s->font->underline_thickness;
+                  else
+                    thickness = 1;
+                  if (x_underline_at_descent_line)
+                    position = (s->height - thickness) - (s->ybase - s->y);
+                  else
+                    {
+                      /* Get the underline position.  This is the recommended
+                         vertical offset in pixels from the baseline to the top of
+                         the underline.  This is a signed value according to the
+                         specs, and its default is
+                         ROUND ((maximum_descent) / 2), with
+                         ROUND (x) = floor (x + 0.5)  */
+                      if (x_use_underline_position_properties
+                          && s->font && s->font->underline_position >= 0)
+                        position = s->font->underline_position;
+                      else if (s->font)
+                        position = (s->font->descent + 1) / 2;
+                    }
+                  position = max (position, underline_minimum_offset);
+                }
+              /* Check the sanity of thickness and position.  We should
+                 avoid drawing underline out of the current line area.  */
+              if (s->y + s->height <= s->ybase + position)
+                position = (s->height - 1) - (s->ybase - s->y);
+              if (s->y + s->height < s->ybase + position + thickness)
+                thickness = (s->y + s->height) - (s->ybase + position);
+              s->underline_thickness = thickness;
+              s->underline_position =position;
+              y = s->ybase + position;
+              if (s->face->underline_defaulted_p)
+                {
+                  w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
+                                 y, s->width, 1);
+                }
              else
                {
-                /* Get the underline position.  This is the recommended
+                  w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
-                   vertical offset in pixels from the baseline to the top of
+                                 y, s->width, 1);
-                   the underline.  This is a signed value according to the
-                   specs, and its default is
-                   ROUND ((maximum_descent) / 2), with
-                   ROUND (x) = floor (x + 0.5)  */
-                if (x_use_underline_position_properties
-                    && s->font && s->font->underline_position >= 0)
-                  position = s->font->underline_position;
-                else if (s->font)
-                  position = (s->font->descent + 1) / 2;
                }
-              position = max (position, underline_minimum_offset);
-            }
-          /* Check the sanity of thickness and position.  We should
-             avoid drawing underline out of the current line area.  */
-          if (s->y + s->height <= s->ybase + position)
-            position = (s->height - 1) - (s->ybase - s->y);
-          if (s->y + s->height < s->ybase + position + thickness)
-            thickness = (s->y + s->height) - (s->ybase + position);
-          s->underline_thickness = thickness;
-          s->underline_position =position;
-          y = s->ybase + position;
-          if (s->face->underline_defaulted_p)
-            {
-              w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
-                             y, s->width, 1);
-            }
-          else
-            {
-              w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
-                             y, s->width, 1);
            }
        }
      /* Draw overline.  */
diff --git a/src/window.c b/src/window.c
index 2a498c43d80..f1b19390cd0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "keyboard.h"
 #include "keymap.h"
@@ -2568,7 +2569,6 @@ window-start value is reasonable when this function is called.  */)
  Lisp_Object sibling, pwindow, swindow IF_LINT (= Qnil), delta;
  ptrdiff_t startpos IF_LINT (= 0);
  int top IF_LINT (= 0), new_top, resize_failed;
-  Mouse_HLInfo *hlinfo;
  w = decode_any_window (window);
  XSETWINDOW (window, w);
@@ -2649,19 +2649,23 @@ window-start value is reasonable when this function is called.  */)
    }
  BLOCK_INPUT;
-  hlinfo = MOUSE_HL_INFO (f);
+  if (!FRAME_INITIAL_P (f))
-  /* We are going to free the glyph matrices of WINDOW, and with that
-     we might lose any information about glyph rows that have some of
-     their glyphs highlighted in mouse face.  (These rows are marked
-     with a non-zero mouse_face_p flag.)  If WINDOW indeed has some
-     glyphs highlighted in mouse face, signal to frame's up-to-date
-     hook that mouse highlight was overwritten, so that it will
-     arrange for redisplaying the highlight.  */
-  if (EQ (hlinfo->mouse_face_window, window))
    {
-      hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+        Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
-      hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
-      hlinfo->mouse_face_window = Qnil;
+      /* We are going to free the glyph matrices of WINDOW, and with
+         that we might lose any information about glyph rows that have
+         some of their glyphs highlighted in mouse face.  (These rows
+         are marked with a non-zero mouse_face_p flag.)  If WINDOW
+         indeed has some glyphs highlighted in mouse face, signal to
+         frame's up-to-date hook that mouse highlight was overwritten,
+         so that it will arrange for redisplaying the highlight.  */
+      if (EQ (hlinfo->mouse_face_window, window))
+        {
+          hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+          hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+          hlinfo->mouse_face_window = Qnil;
+        }
    }
  free_window_matrices (r);
@@ -3905,7 +3909,6 @@ Signal an error when WINDOW is the only window on its frame.  */)
      && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
    /* We can delete WINDOW now.  */
    {
-      Mouse_HLInfo *hlinfo;
      /* Block input.  */
      BLOCK_INPUT;
@@ -3916,9 +3919,13 @@ Signal an error when WINDOW is the only window on its frame.  */)
      /* If this window is referred to by the dpyinfo's mouse
         highlight, invalidate that slot to be safe (Bug#9904).  */
-      hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
+      if (!FRAME_INITIAL_P (f))
-      if (EQ (hlinfo->mouse_face_window, window))
+        {
-        hlinfo->mouse_face_window = Qnil;
+          Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
+          if (EQ (hlinfo->mouse_face_window, window))
+            hlinfo->mouse_face_window = Qnil;
+        }
      windows_or_buffers_changed++;
      Vwindow_list = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index 39059acdb85..1353b4e1184 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -281,8 +281,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "window.h"
 #include "termchar.h"
 #include "dispextern.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "indent.h"
 #include "commands.h"
@@ -3696,7 +3696,8 @@ handle_face_prop (struct it *it)
      int i;
      Lisp_Object from_overlay
        = (it->current.overlay_string_index >= 0
-           ? it->string_overlays[it->current.overlay_string_index]
+           ? it->string_overlays[it->current.overlay_string_index
+                                 % OVERLAY_STRING_CHUNK_SIZE]
           : Qnil);
      /* See if we got to this string directly or indirectly from
@@ -3710,7 +3711,8 @@ handle_face_prop (struct it *it)
          {
            if (it->stack[i].current.overlay_string_index >= 0)
              from_overlay
-                = it->string_overlays[it->stack[i].current.overlay_string_index];
+                = it->string_overlays[it->stack[i].current.overlay_string_index
+                                      % OVERLAY_STRING_CHUNK_SIZE];
            else if (! NILP (it->stack[i].from_overlay))
              from_overlay = it->stack[i].from_overlay;
@@ -13376,6 +13378,12 @@ redisplay_internal (void)
        {
          struct frame *f = XFRAME (frame);
+          /* We don't have to do anything for unselected terminal
+             frames.  */
+          if ((FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
+              && !EQ (FRAME_TTY (f)->top_frame, frame))
+            continue;
          if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
            {
              if (! EQ (frame, selected_frame))
@@ -13996,16 +14004,13 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                    break;
                  }
                /* See if we've found a better approximation to
-                   POS_BEFORE or to POS_AFTER.  Note that we want the
+                   POS_BEFORE or to POS_AFTER.  */
-                   first (leftmost) glyph of all those that are the
-                   closest from below, and the last (rightmost) of all
-                   those from above.  */
                if (0 > dpos && dpos > pos_before - pt_old)
                  {
                    pos_before = glyph->charpos;
                    glyph_before = glyph;
                  }
-                else if (0 < dpos && dpos <= pos_after - pt_old)
+                else if (0 < dpos && dpos < pos_after - pt_old)
                  {
                    pos_after = glyph->charpos;
                    glyph_after = glyph;
@@ -14089,7 +14094,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                    pos_before = glyph->charpos;
                    glyph_before = glyph;
                  }
-                else if (0 < dpos && dpos <= pos_after - pt_old)
+                else if (0 < dpos && dpos < pos_after - pt_old)
                  {
                    pos_after = glyph->charpos;
                    glyph_after = glyph;
@@ -14321,6 +14326,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
             the cursor is not on this line.  */
          if (cursor == NULL
              && (row->reversed_p ? glyph <= end : glyph >= end)
+              && (row->reversed_p ? end > glyphs_end : end < glyphs_end)
              && STRINGP (end->object)
              && row->continued_p)
            return 0;
@@ -14350,6 +14356,21 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
 compute_x:
  if (cursor != NULL)
    glyph = cursor;
+  else if (glyph == glyphs_end
+           && pos_before == pos_after
+           && STRINGP ((row->reversed_p
+                        ? row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1
+                        : row->glyphs[TEXT_AREA])->object))
+    {
+      /* If all the glyphs of this row came from strings, put the
+         cursor on the first glyph of the row.  This avoids having the
+         cursor outside of the text area in this very rare and hard
+         use case.  */
+      glyph =
+        row->reversed_p
+        ? row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1
+        : row->glyphs[TEXT_AREA];
+    }
  if (x < 0)
    {
      struct glyph *g;
diff --git a/src/xfaces.c b/src/xfaces.c
index 772d2646291..32d1499b85a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -320,6 +320,7 @@ static Lisp_Object QCfontset;
 Lisp_Object Qnormal;
 Lisp_Object Qbold;
+static Lisp_Object Qline, Qwave;
 static Lisp_Object Qultra_light, Qextra_light, Qlight;
 static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
 static Lisp_Object Qoblique, Qreverse_oblique, Qreverse_italic;
@@ -1894,7 +1895,8 @@ check_lface_attrs (Lisp_Object *attrs)
  xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX])
           || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX])
           || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX])
-           || STRINGP (attrs[LFACE_UNDERLINE_INDEX]));
+           || STRINGP (attrs[LFACE_UNDERLINE_INDEX])
+           || CONSP (attrs[LFACE_UNDERLINE_INDEX]));
  xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX])
           || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX])
           || SYMBOLP (attrs[LFACE_OVERLINE_INDEX])
@@ -2525,7 +2527,8 @@ merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to,
                {
                  if (EQ (value, Qt)
                      || NILP (value)
-                      || STRINGP (value))
+                      || STRINGP (value)
+                      || CONSP (value))
                    to[LFACE_UNDERLINE_INDEX] = value;
                  else
                    err = 1;
@@ -2948,15 +2951,54 @@ FRAME 0 means change the face on all frames, and change the default
    }
  else if (EQ (attr, QCunderline))
    {
-      if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
+      int valid_p = 0;
-        if ((SYMBOLP (value)
+      
-             && !EQ (value, Qt)
+      if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value))
-             && !EQ (value, Qnil))
+        valid_p = 1;
-            /* Underline color.  */
+      else if (NILP (value) || EQ (value, Qt))
-            || (STRINGP (value)
+        valid_p = 1;
-                && SCHARS (value) == 0))
+      else if (STRINGP (value) && SCHARS (value) > 0)
-          signal_error ("Invalid face underline", value);
+        valid_p = 1;
+      else if (CONSP (value))
+        {
+          Lisp_Object key, val, list;
+          list = value;
+          valid_p = 1;
+          while (!NILP (CAR_SAFE(list)))
+            {
+              key = CAR_SAFE (list);
+              list = CDR_SAFE (list);
+              val = CAR_SAFE (list);
+              list = CDR_SAFE (list);
+            
+              if(NILP (key) || NILP (val)) 
+                {
+                  valid_p = 0;
+                  break;
+                }
+              else if (EQ (key, QCcolor)
+                       && !(EQ (val, Qforeground_color)
+                            || (STRINGP (val) && SCHARS (val) > 0)))
+                {
+                  valid_p = 0;
+                  break;
+                }
+              
+              else if (EQ (key, QCstyle) 
+                       && !(EQ (val, Qline) || EQ (val, Qwave)))
+                {
+                  valid_p = 0;
+                  break;
+                }
+            }
+        }
+      
+      if (!valid_p)
+        signal_error ("Invalid face underline", value);
+      
      old_value = LFACE_UNDERLINE (lface);
      LFACE_UNDERLINE (lface) = value;
    }
@@ -5576,7 +5618,7 @@ realize_x_face (struct face_cache *cache, Lisp_Object *attrs)
 #ifdef HAVE_WINDOW_SYSTEM
  struct face *default_face;
  struct frame *f;
-  Lisp_Object stipple, overline, strike_through, box;
+  Lisp_Object stipple, underline, overline, strike_through, box;
  xassert (FRAME_WINDOW_P (cache->f));
@@ -5709,29 +5751,76 @@ realize_x_face (struct face_cache *cache, Lisp_Object *attrs)
  /* Text underline, overline, strike-through.  */
-  if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt))
+  underline = attrs[LFACE_UNDERLINE_INDEX];
+  if (EQ (underline, Qt))
    {
      /* Use default color (same as foreground color).  */
      face->underline_p = 1;
+      face->underline_type = FACE_UNDER_LINE;
      face->underline_defaulted_p = 1;
      face->underline_color = 0;
    }
-  else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX]))
+  else if (STRINGP (underline))
    {
      /* Use specified color.  */
      face->underline_p = 1;
+      face->underline_type = FACE_UNDER_LINE;
      face->underline_defaulted_p = 0;
      face->underline_color
-        = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX],
+        = load_color (f, face, underline,
                      LFACE_UNDERLINE_INDEX);
    }
-  else if (NILP (attrs[LFACE_UNDERLINE_INDEX]))
+  else if (NILP (underline))
    {
      face->underline_p = 0;
      face->underline_defaulted_p = 0;
      face->underline_color = 0;
    }
+  else if (CONSP (underline))
+    {
+      /* `(:color COLOR :style STYLE)'.  
+         STYLE being one of `line' or `wave'. */
+      face->underline_p = 1;
+      face->underline_color = 0;
+      face->underline_defaulted_p = 1;
+      face->underline_type = FACE_UNDER_LINE;
+      while (CONSP (underline))
+        {
+          Lisp_Object keyword, value;
+          keyword = XCAR (underline);
+          underline = XCDR (underline);
+          if (!CONSP (underline))
+            break;
+          value = XCAR (underline);
+          underline = XCDR (underline);
+          if (EQ (keyword, QCcolor))
+            {
+              if (EQ (value, Qforeground_color))
+                {
+                  face->underline_defaulted_p = 1;
+                  face->underline_color = 0;
+                }
+              else if (STRINGP (value))
+                {
+                  face->underline_defaulted_p = 0;
+                  face->underline_color = load_color (f, face, value,
+                                                      LFACE_UNDERLINE_INDEX);
+                }
+            }
+          else if (EQ (keyword, QCstyle))
+            {
+              if (EQ (value, Qline))
+                face->underline_type = FACE_UNDER_LINE;
+              else if (EQ (value, Qwave))
+                face->underline_type = FACE_UNDER_WAVE;
+            }
+        }
+    }
+  
  overline = attrs[LFACE_OVERLINE_INDEX];
  if (STRINGP (overline))
    {
@@ -6476,6 +6565,8 @@ syms_of_xfaces (void)
  DEFSYM (QCcolor, ":color");
  DEFSYM (QCline_width, ":line-width");
  DEFSYM (QCstyle, ":style");
+  DEFSYM (Qline, "line");
+  DEFSYM (Qwave, "wave");
  DEFSYM (Qreleased_button, "released-button");
  DEFSYM (Qpressed_button, "pressed-button");
  DEFSYM (Qnormal, "normal");
diff --git a/src/xfns.c b/src/xfns.c
index 43ccdfaef1a..d49f0ea1458 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -32,13 +32,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #include "frame.h"
 #include "window.h"
+#include "character.h"
 #include "buffer.h"
 #include "intervals.h"
 #include "dispextern.h"
 #include "keyboard.h"
 #include "blockinput.h"
 #include <epaths.h>
-#include "character.h"
 #include "charset.h"
 #include "coding.h"
 #include "fontset.h"
diff --git a/src/xmenu.c b/src/xmenu.c
index 79ead5f598c..dc98b980278 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -47,6 +47,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termhooks.h"
 #include "window.h"
 #include "blockinput.h"
+#include "character.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
diff --git a/src/xml.c b/src/xml.c
index e462a1adf57..7bc6130b8b1 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <libxml/HTMLparser.h>
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
diff --git a/src/xselect.c b/src/xselect.c
index 48baeb32581..f1eda5d7c85 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -35,11 +35,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "dispextern.h" /* frame.h seems to want this */
 #include "frame.h"      /* Need this to get the X window of selected_frame */
 #include "blockinput.h"
+#include "character.h"
 #include "buffer.h"
 #include "process.h"
 #include "termhooks.h"
 #include "keyboard.h"
-#include "character.h"
 #include <X11/Xproto.h>
diff --git a/src/xterm.c b/src/xterm.c
index 442b6b1b934..17279f2e6ca 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2666,6 +2666,68 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
  s->background_filled_p = 1;
 }
+/*
+   Draw a wavy line under S. The wave fills wave_height pixels from y0.
+                    x0         wave_length = 2
+                                 --
+                y0   *   *   *   *   *
+                     |* * * * * * * * *
+    wave_height = 3  | *   *   *   *
+*/
+static void
+x_draw_underwave (struct glyph_string *s)
+{
+  int wave_height = 2, wave_length = 3;
+  int dx, dy, x0, y0, width, x1, y1, x2, y2, odd, xmax;
+  XRectangle wave_clip, string_clip, final_clip;
+  dx = wave_length;
+  dy = wave_height - 1;
+  x0 = s->x;
+  y0 = s->ybase + 1;
+  width = s->width;
+  xmax = x0 + width;
+  /* Find and set clipping rectangle */
+  wave_clip = (XRectangle){ x0, y0, width, wave_height };
+  get_glyph_string_clip_rect (s, &string_clip);
+  if (!x_intersect_rectangles (&wave_clip, &string_clip, &final_clip))
+    return;
+  XSetClipRectangles (s->display, s->gc, 0, 0, &final_clip, 1, Unsorted);
+  /* Draw the waves */
+  x1 = x0 - (x0 % dx);
+  x2 = x1 + dx;
+  odd = (x1/dx) % 2;
+  y1 = y2 = y0;
+  if (odd)
+    y1 += dy;
+  else
+    y2 += dy;
+  if (INT_MAX - dx < xmax)
+    abort ();
+  while (x1 <= xmax)
+    {
+      XDrawLine (s->display, s->window, s->gc, x1, y1, x2, y2);
+      x1  = x2, y1 = y2;
+      x2 += dx, y2 = y0 + odd*dy;
+      odd = !odd;
+    }
+  /* Restore previous clipping rectangle(s) */
+  XSetClipRectangles (s->display, s->gc, 0, 0, s->clip, s->num_clips, Unsorted);
+}
 /* Draw glyph string S.  */
@@ -2774,68 +2836,83 @@ x_draw_glyph_string (struct glyph_string *s)
    {
      /* Draw underline.  */
      if (s->face->underline_p)
-        {
+        {
-          unsigned long thickness, position;
+          if (s->face->underline_type == FACE_UNDER_WAVE)
-          int y;
+            {
+              if (s->face->underline_defaulted_p)
-          if (s->prev && s->prev->face->underline_p)
+                x_draw_underwave (s);
-            {
+              else
-              /* We use the same underline style as the previous one.  */
+                {
-              thickness = s->prev->underline_thickness;
+                  XGCValues xgcv;
-              position = s->prev->underline_position;
+                  XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
-            }
+                  XSetForeground (s->display, s->gc, s->face->underline_color);
-          else
+                  x_draw_underwave (s);
-            {
+                  XSetForeground (s->display, s->gc, xgcv.foreground);
-              /* Get the underline thickness.  Default is 1 pixel.  */
+                }
-              if (s->font && s->font->underline_thickness > 0)
+            }
-                thickness = s->font->underline_thickness;
+          else if (s->face->underline_type == FACE_UNDER_LINE)
-              else
+            {
-                thickness = 1;
+              unsigned long thickness, position;
-              if (x_underline_at_descent_line)
+              int y;
-                position = (s->height - thickness) - (s->ybase - s->y);
-              else
-                {
-                  /* Get the underline position.  This is the recommended
-                     vertical offset in pixels from the baseline to the top of
-                     the underline.  This is a signed value according to the
-                     specs, and its default is
-                     ROUND ((maximum descent) / 2), with
-                     ROUND(x) = floor (x + 0.5)  */
-                  if (x_use_underline_position_properties
-                      && s->font && s->font->underline_position >= 0)
-                    position = s->font->underline_position;
-                  else if (s->font)
-                    position = (s->font->descent + 1) / 2;
-                  else
-                    position = underline_minimum_offset;
-                }
-              position = max (position, underline_minimum_offset);
-            }
-          /* Check the sanity of thickness and position.  We should
-             avoid drawing underline out of the current line area.  */
-          if (s->y + s->height <= s->ybase + position)
-            position = (s->height - 1) - (s->ybase - s->y);
-          if (s->y + s->height < s->ybase + position + thickness)
-            thickness = (s->y + s->height) - (s->ybase + position);
-          s->underline_thickness = thickness;
-          s->underline_position = position;
-          y = s->ybase + position;
-          if (s->face->underline_defaulted_p)
-            XFillRectangle (s->display, s->window, s->gc,
-                            s->x, y, s->width, thickness);
-          else
-            {
-              XGCValues xgcv;
-              XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
-              XSetForeground (s->display, s->gc, s->face->underline_color);
-              XFillRectangle (s->display, s->window, s->gc,
-                              s->x, y, s->width, thickness);
-              XSetForeground (s->display, s->gc, xgcv.foreground);
-            }
-        }
+              if (s->prev && s->prev->face->underline_p)
+                {
+                  /* We use the same underline style as the previous one.  */
+                  thickness = s->prev->underline_thickness;
+                  position = s->prev->underline_position;
+                }
+              else
+                {
+                  /* Get the underline thickness.  Default is 1 pixel.  */
+                  if (s->font && s->font->underline_thickness > 0)
+                    thickness = s->font->underline_thickness;
+                  else
+                    thickness = 1;
+                  if (x_underline_at_descent_line)
+                    position = (s->height - thickness) - (s->ybase - s->y);
+                  else
+                    {
+                      /* Get the underline position.  This is the recommended
+                         vertical offset in pixels from the baseline to the top of
+                         the underline.  This is a signed value according to the
+                         specs, and its default is
+                         ROUND ((maximum descent) / 2), with
+                         ROUND(x) = floor (x + 0.5)  */
+                      if (x_use_underline_position_properties
+                          && s->font && s->font->underline_position >= 0)
+                        position = s->font->underline_position;
+                      else if (s->font)
+                        position = (s->font->descent + 1) / 2;
+                      else
+                        position = underline_minimum_offset;
+                    }
+                  position = max (position, underline_minimum_offset);
+                }
+              /* Check the sanity of thickness and position.  We should
+                 avoid drawing underline out of the current line area.  */
+              if (s->y + s->height <= s->ybase + position)
+                position = (s->height - 1) - (s->ybase - s->y);
+              if (s->y + s->height < s->ybase + position + thickness)
+                thickness = (s->y + s->height) - (s->ybase + position);
+              s->underline_thickness = thickness;
+              s->underline_position = position;
+              y = s->ybase + position;
+              if (s->face->underline_defaulted_p)
+                XFillRectangle (s->display, s->window, s->gc,
+                                s->x, y, s->width, thickness);
+              else
+                {
+                  XGCValues xgcv;
+                  XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
+                  XSetForeground (s->display, s->gc, s->face->underline_color);
+                  XFillRectangle (s->display, s->window, s->gc,
+                                  s->x, y, s->width, thickness);
+                  XSetForeground (s->display, s->gc, xgcv.foreground);
+                }
+            }
+        }
      /* Draw overline.  */
      if (s->face->overline_p)
        {