merge trunk

44 files changed, 430 insertions, 220 deletions

diff --git a/ChangeLog b/ChangeLog
index c29a9856a02..9b6e368ec75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-17  Jan Beich  <jbeich@tormail.org>  (tiny change)
+
+        * configure.ac (PTY_OPEN): Try posix_openpt on gnu-linux,
+        gnu-kfreebsd, freebsd, and netbsd.  (Bug#12040)
+
 2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, incorporating:
diff --git a/admin/ChangeLog b/admin/ChangeLog
index c579930d2bf..ea977e80cfa 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use ASCII tests for character types.
+        * merge-gnulib (GNULIB_MODULES): Add c-ctype.  This documents a
+        new direct dependency; c-ctype was already being used indirectly
+        via other gnulib modules.
+
 2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for Emacs Lisp booleans.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index c5b9eba5ee6..63865edf3ce 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -26,7 +26,7 @@
 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alloca-opt c-strcase
+  alloca-opt c-ctype c-strcase
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ
   filemode getloadavg getopt-gnu gettime gettimeofday
diff --git a/autogen/config.in b/autogen/config.in
index 8e18d1c9206..bd10c9f4076 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -731,6 +731,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
+/* Define to 1 if you have the `posix_openpt' function. */
+#undef HAVE_POSIX_OPENPT
+
 /* Define if you have the /proc filesystem. */
 #undef HAVE_PROCFS
 
diff --git a/autogen/configure b/autogen/configure
index bfe15b6fb2a..961d1acbd38 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -13258,12 +13258,14 @@ done
 
 
 # PTY-related GNU extensions.
-for ac_func in getpt
+for ac_func in getpt posix_openpt
 do :
-  ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt"
-if test "x$ac_cv_func_getpt" = x""yes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPT 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -14883,7 +14885,7 @@ case $opsys in
 
     ;;
 
-  darwin )
+    darwin )
     $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" >>confdefs.h
 
         $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h
@@ -14896,12 +14898,12 @@ case $opsys in
 
     ;;
 
-  gnu | freebsd | netbsd | openbsd )
+  gnu | openbsd )
     $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h
 
     ;;
 
-  gnu-linux | gnu-kfreebsd )
+  gnu-linux | gnu-kfreebsd | freebsd | netbsd )
         if test "x$ac_cv_func_grantpt" = xyes; then
 
 $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
@@ -14910,7 +14912,12 @@ $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
 
                   $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); sigunblock (sigmask (SIGCHLD)); }" >>confdefs.h
 
-            if test "x$ac_cv_func_getpt" = xyes; then
+            if test "x$ac_cv_func_posix_openpt" = xyes; then
+        $as_echo "#define PTY_OPEN fd = posix_openpt (O_RDWR | O_NOCTTY)" >>confdefs.h
+
+        $as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h
+
+            elif test "x$ac_cv_func_getpt" = xyes; then
         $as_echo "#define PTY_OPEN fd = getpt ()" >>confdefs.h
 
         $as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 92fb5f8413b..2394790c455 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2773,7 +2773,7 @@ AC_FUNC_GETPGRP
 AC_CHECK_FUNCS(grantpt)
 
 # PTY-related GNU extensions.
-AC_CHECK_FUNCS(getpt)
+AC_CHECK_FUNCS(getpt posix_openpt)
 
 # Check this now, so that we will NOT find the above functions in ncurses.
 # That is because we have not set up to link ncurses in lib-src.
@@ -3397,6 +3397,7 @@ case $opsys in
     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
     ;;
 
+  dnl FIXME?  Maybe use same as freebsd - see bug#12040.
   darwin )
     AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)])
     dnl Not used, because PTY_ITERATION is defined.
@@ -3409,11 +3410,11 @@ case $opsys in
     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
     ;;
 
-  gnu | freebsd | netbsd | openbsd )
+  gnu | openbsd )
     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
     ;;
 
-  gnu-linux | gnu-kfreebsd )
+  gnu-linux | gnu-kfreebsd | freebsd | netbsd )
     dnl if HAVE_GRANTPT
     if test "x$ac_cv_func_grantpt" = xyes; then
       AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
@@ -3421,8 +3422,12 @@ case $opsys in
       dnl Note that grantpt and unlockpt may fork.  We must block SIGCHLD
       dnl to prevent sigchld_handler from intercepting the child's death.
       AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); sigunblock (sigmask (SIGCHLD)); }])
+      dnl if HAVE_POSIX_OPENPT
+      if test "x$ac_cv_func_posix_openpt" = xyes; then
+        AC_DEFINE(PTY_OPEN, [fd = posix_openpt (O_RDWR | O_NOCTTY)])
+        AC_DEFINE(PTY_NAME_SPRINTF, [])
       dnl if HAVE_GETPT
-      if test "x$ac_cv_func_getpt" = xyes; then
+      elif test "x$ac_cv_func_getpt" = xyes; then
         AC_DEFINE(PTY_OPEN, [fd = getpt ()])
         AC_DEFINE(PTY_NAME_SPRINTF, [])
       else
diff --git a/leim/ChangeLog b/leim/ChangeLog
index fcf0e72c3f4..5c29052d98b 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-17  Daniel Bergey  <bergey@alum.mit.edu>  (tiny change)
+
+        * quail/indian.el (quail-define-inscript-package):
+        Set kbd-translate for all Inscript layouts.  It's a positional
+        layout: vowels should be on the left hand regardless of the
+        underlying characters produced by those keys.  (Bug#12072)
+
 2012-08-06  Mohsen BANAN  <libre@mohsen.1.banan.byname.net>
 
         * quail/persian.el: Add some mappings.  (Bug#11812)
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index 1c01693478b..2541e60c57d 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -309,7 +309,7 @@ Full key sequences are listed below:")
 (defun quail-define-inscript-package (char-tables key-tables pkgname lang
                                                   title docstring)
   (funcall 'quail-define-package pkgname lang title nil docstring
-           nil nil nil nil nil nil nil nil)
+           nil nil nil t nil nil nil nil)
   (let (char-table key-table char key)
     (while (and char-tables key-tables)
       (setq char-table  (car char-tables)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f3fd3751005..fe90917a70b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies.
+
 2012-08-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         * etags.c (Pascal_functions): Fix parenthesization typo.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index a03d761e7ec..64974b88b6f 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -451,6 +451,7 @@ $(BLD)/profile.$(O) : \
 $(BLD)/regex.$(O) : \
         $(SRC)/regex.c \
         $(SRC)/regex.h \
+        $(NT_INC)/stdbool.h \
         $(NT_INC)/unistd.h \
         $(CONFIG_H)
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c67bb1b5b2..6be54850414 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,36 @@
+2012-08-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-start-file-process): Eliminate
+        superfluous prompt.  (Bug#12203)
+
+2012-08-17  Chong Yidong  <cyd@gnu.org>
+
+        * mouse.el (mouse-appearance-menu): If x-select-font returns a
+        font spec, set the font directly (Bug#3228).
+
+2012-08-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (delete-window): Fix last fix.
+
 2012-08-16  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (window-valid-p): Move to window.c.
+        (window-child, window-child-count, window-last-child)
+        (window-normalize-window, window-combined-p)
+        (window-combinations, window-atom-root, window-min-size)
+        (window-sizable, window-sizable-p, window-size-fixed-p)
+        (window-min-delta, window-max-delta, window--resizable)
+        (window--resizable-p, window-resizable, window-total-size)
+        (window-full-height-p, window-full-width-p, window-body-size)
+        (window-at-side-p, adjust-window-trailing-edge, maximize-window)
+        (minimize-window, window-deletable-p, delete-window)
+        (delete-other-windows, set-window-buffer-start-and-point)
+        (next-buffer, previous-buffer, split-window, balance-windows-2)
+        (set-window-text-height, window-buffer-height)
+        (fit-window-to-buffer, shrink-window-if-larger-than-buffer)
+        (truncated-partial-width-window-p): Minor code adjustments.  In
+        doc-strings state whether the argument window has to denote a
+        live, valid or any window.
 
 2012-08-16  Phil Sainty  <psainty@orcon.net.nz>  (tiny change)
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 589bbd67b1b..4ea84288f69 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1951,12 +1951,14 @@ choose a font."
               (choice
                ;; Either choice == 'x-select-font, or choice is a
                ;; symbol whose name is a font.
-               (buffer-face-mode-invoke (font-face-attributes
-                                         (if (eq choice 'x-select-font)
-                                             (x-select-font)
-                                           (symbol-name choice)))
-                                        t
-                                        (called-interactively-p 'interactive))))))))
+               (let ((font (if (eq choice 'x-select-font)
+                               (x-select-font)
+                             (symbol-name choice))))
+                 (buffer-face-mode-invoke
+                  (if (fontp font 'font-spec)
+                      (list :font font)
+                    (font-face-attributes font))
+                  t (called-interactively-p 'interactive)))))))))
 
 
 ;;; Bindings for mouse commands.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e757247c2a2..6283188d46a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2738,51 +2738,64 @@ the result will be a local, non-Tramp, filename."
           (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
           (name1 name)
           (i 0))
-      (unwind-protect
-          (save-excursion
-            (save-restriction
-              (unless buffer
-                ;; BUFFER can be nil.  We use a temporary buffer.
-                (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
-              (while (get-process name1)
-                ;; NAME must be unique as process name.
-                (setq i (1+ i)
-                      name1 (format "%s<%d>" name i)))
-              (setq name name1)
-              ;; Set the new process properties.
-              (tramp-set-connection-property v "process-name" name)
-              (tramp-set-connection-property v "process-buffer" buffer)
-              ;; Activate narrowing in order to save BUFFER contents.
-              ;; Clear also the modification time; otherwise we might
-              ;; be interrupted by `verify-visited-file-modtime'.
-              (with-current-buffer (tramp-get-connection-buffer v)
-                (let ((buffer-undo-list t))
+
+      (unless buffer
+        ;; BUFFER can be nil.  We use a temporary buffer.
+        (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
+      (while (get-process name1)
+        ;; NAME must be unique as process name.
+        (setq i (1+ i)
+              name1 (format "%s<%d>" name i)))
+      (setq name name1)
+      ;; Set the new process properties.
+      (tramp-set-connection-property v "process-name" name)
+      (tramp-set-connection-property v "process-buffer" buffer)
+
+      (with-current-buffer (tramp-get-connection-buffer v)
+        (unwind-protect
+            (save-excursion
+              (save-restriction
+                ;; Activate narrowing in order to save BUFFER
+                ;; contents.  Clear also the modification time;
+                ;; otherwise we might be interrupted by
+                ;; `verify-visited-file-modtime'.
+                (let ((buffer-undo-list t)
+                      (buffer-read-only nil)
+                      (mark (point)))
                   (clear-visited-file-modtime)
                   (narrow-to-region (point-max) (point-max))
+                  ;; We call `tramp-maybe-open-connection', in order
+                  ;; to cleanup the prompt afterwards.
+                  (tramp-maybe-open-connection v)
+                  (widen)
+                  (delete-region mark (point))
+                  (narrow-to-region (point-max) (point-max))
+                  ;; Now do it.
                   (if command
                       ;; Send the command.
                       (tramp-send-command v command nil t) ; nooutput
                     ;; Check, whether a pty is associated.
-                    (tramp-maybe-open-connection v)
                     (unless (tramp-compat-process-get
                              (tramp-get-connection-process v) 'remote-tty)
                       (tramp-error
                        v 'file-error
-                       "pty association is not supported for `%s'" name)))))
-              (let ((p (tramp-get-connection-process v)))
-                ;; Set query flag for this process.
-                (tramp-compat-set-process-query-on-exit-flag p t)
-                ;; Return process.
-                p)))
-        ;; Save exit.
-        (with-current-buffer (tramp-get-connection-buffer v)
+                       "pty association is not supported for `%s'" name))))
+                (let ((p (tramp-get-connection-process v)))
+                  ;; Set query flag for this process.  We ignore errors,
+                  ;; because the process could have finished already.
+                  (ignore-errors
+                    (tramp-compat-set-process-query-on-exit-flag p t))
+                  ;; Return process.
+                  p)))
+
+          ;; Save exit.
           (if (string-match tramp-temp-buffer-name (buffer-name))
               (progn
                 (set-process-buffer (tramp-get-connection-process v) nil)
                 (kill-buffer (current-buffer)))
-            (set-buffer-modified-p bmp)))
-        (tramp-set-connection-property v "process-name" nil)
-        (tramp-set-connection-property v "process-buffer" nil)))))
+            (set-buffer-modified-p bmp))
+          (tramp-set-connection-property v "process-name" nil)
+          (tramp-set-connection-property v "process-buffer" nil))))))
 
 (defun tramp-sh-handle-process-file
   (program &optional infile destination display &rest args)
diff --git a/lisp/window.el b/lisp/window.el
index d7129df8585..142e80e1666 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -91,11 +91,13 @@ be any window."
   (and window (window-parent window) (window-prev-sibling window)))
 
 (defun window-child (window)
-  "Return WINDOW's first child window."
+  "Return WINDOW's first child window.
+WINDOW can be any window."
   (or (window-top-child window) (window-left-child window)))
 
 (defun window-child-count (window)
-  "Return number of WINDOW's child windows."
+  "Return number of WINDOW's child windows.
+WINDOW can be any window."
   (let ((count 0))
     (when (and (windowp window) (setq window (window-child window)))
       (while window
@@ -104,7 +106,8 @@ be any window."
     count))
 
 (defun window-last-child (window)
-  "Return last child window of WINDOW."
+  "Return last child window of WINDOW.
+WINDOW can be any window."
   (when (and (windowp window) (setq window (window-child window)))
     (while (window-next-sibling window)
       (setq window (window-next-sibling window))))
@@ -135,20 +138,22 @@ FRAME must be a live frame and defaults to the selected frame."
     (selected-frame)))
 
 (defun window-normalize-window (window &optional live-only)
-  "Return window specified by WINDOW.
-If WINDOW is nil, return `selected-window'.
-If WINDOW is a live window or internal window, return WINDOW;
- if LIVE-ONLY is non-nil, return WINDOW for a live window only.
+  "Return the window specified by WINDOW.
+If WINDOW is nil, return the selected window.  Otherwise, if
+WINDOW is a live or an internal window, return WINDOW; if
+LIVE-ONLY is non-nil, return WINDOW for a live window only.
 Otherwise, signal an error."
-  (cond ((null window)
-         (selected-window))
-        (live-only
-         (if (window-live-p window)
-             window
-           (error "%s is not a live window" window)))
-        ((if (window-valid-p window)
-             window
-           (error "%s is not a window" window)))))
+  (cond
+   ((null window)
+    (selected-window))
+   (live-only
+    (if (window-live-p window)
+        window
+      (error "%s is not a live window" window)))
+   ((window-valid-p window)
+    window)
+   (t
+    (error "%s is not a valid window" window))))
 
 (defvar ignore-window-parameters nil
   "If non-nil, standard functions ignore window parameters.
@@ -199,7 +204,7 @@ narrower, explicitly specify the SIZE argument of that function."
 
 (defun window-combined-p (&optional window horizontal)
   "Return non-nil if WINDOW has siblings in a given direction.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
 
 HORIZONTAL determines a direction for the window combination.
 If HORIZONTAL is omitted or nil, return non-nil if WINDOW is part
@@ -215,7 +220,7 @@ horizontal window combination."
 
 (defun window-combinations (window &optional horizontal)
   "Return largest number of windows vertically arranged within WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
 If HORIZONTAL is non-nil, return the largest number of
 windows horizontally arranged within WINDOW."
   (setq window (window-normalize-window window))
@@ -313,7 +318,7 @@ too."
 ;;; Atomic windows.
 (defun window-atom-root (&optional window)
   "Return root of atomic window WINDOW is a part of.
-WINDOW can be any window and defaults to the selected one.
+WINDOW must be a valid window and defaults to the selected one.
 Return nil if WINDOW is not part of an atomic window."
   (setq window (window-normalize-window window))
   (let (root)
@@ -517,10 +522,10 @@ window).")
 
 (defun window-min-size (&optional window horizontal ignore)
   "Return the minimum size of WINDOW.
-WINDOW can be an arbitrary window and defaults to the selected
-one.  Optional argument HORIZONTAL non-nil means return the
-minimum number of columns of WINDOW; otherwise return the minimum
-number of WINDOW's lines.
+WINDOW must be a valid window and defaults to the selected one.
+Optional argument HORIZONTAL non-nil means return the minimum
+number of columns of WINDOW; otherwise return the minimum number
+of WINDOW's lines.
 
 Optional argument IGNORE, if non-nil, means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
@@ -600,6 +605,7 @@ means ignore all of the above restrictions for all windows."
 
 (defun window-sizable (window delta &optional horizontal ignore)
   "Return DELTA if DELTA lines can be added to WINDOW.
+WINDOW must be a valid window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means return DELTA if DELTA
 columns can be added to WINDOW.  A return value of zero means
 that no lines (or columns) can be added to WINDOW.
@@ -641,6 +647,7 @@ ignore all of the above restrictions for all windows."
 
 (defun window-sizable-p (window delta &optional horizontal ignore)
   "Return t if WINDOW can be resized by DELTA lines.
+WINDOW must be a valid window and defaults to the selected one.
 For the meaning of the arguments of this function see the
 doc-string of `window-sizable'."
   (setq window (window-normalize-window window))
@@ -683,9 +690,9 @@ doc-string of `window-sizable'."
 
 (defun window-size-fixed-p (&optional window horizontal)
   "Return non-nil if WINDOW's height is fixed.
-WINDOW can be an arbitrary window and defaults to the selected
-window.  Optional argument HORIZONTAL non-nil means return
-non-nil if WINDOW's width is fixed.
+WINDOW must be a valid window and defaults to the selected one.
+Optional argument HORIZONTAL non-nil means return non-nil if
+WINDOW's width is fixed.
 
 If this function returns nil, this does not necessarily mean that
 WINDOW can be resized in the desired direction.  The function
@@ -733,8 +740,8 @@ WINDOW can be resized in the desired direction.  The function
 
 (defun window-min-delta (&optional window horizontal ignore trail noup nodown)
   "Return number of lines by which WINDOW can be shrunk.
-WINDOW can be an arbitrary window and defaults to the selected
-window.  Return zero if WINDOW cannot be shrunk.
+WINDOW must be a valid window and defaults to the selected one.
+Return zero if WINDOW cannot be shrunk.
 
 Optional argument HORIZONTAL non-nil means return number of
 columns by which WINDOW can be shrunk.
@@ -815,8 +822,8 @@ at least one other window can be enlarged appropriately."
 
 (defun window-max-delta (&optional window horizontal ignore trail noup nodown)
   "Return maximum number of lines by which WINDOW can be enlarged.
-WINDOW can be an arbitrary window and defaults to the selected
-window.  The return value is zero if WINDOW cannot be enlarged.
+WINDOW must be a valid window and defaults to the selected one.
+The return value is zero if WINDOW cannot be enlarged.
 
 Optional argument HORIZONTAL non-nil means return maximum number
 of columns by which WINDOW can be enlarged.
@@ -853,6 +860,7 @@ only whether other windows can be shrunk appropriately."
 ;; Make NOUP also inhibit the min-size check.
 (defun window--resizable (window delta &optional horizontal ignore trail noup nodown)
   "Return DELTA if WINDOW can be resized vertically by DELTA lines.
+WINDOW must be a valid window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means return DELTA if WINDOW
 can be resized horizontally by DELTA columns.  A return value of
 zero means that WINDOW is not resizable.
@@ -899,6 +907,7 @@ violate size restrictions of WINDOW or its child windows."
 
 (defun window--resizable-p (window delta &optional horizontal ignore trail noup nodown)
   "Return t if WINDOW can be resized vertically by DELTA lines.
+WINDOW must be a valid window and defaults to the selected one.
 For the meaning of the arguments of this function see the
 doc-string of `window--resizable'."
   (setq window (window-normalize-window window))
@@ -910,6 +919,7 @@ doc-string of `window--resizable'."
 
 (defun window-resizable (window delta &optional horizontal ignore)
   "Return DELTA if WINDOW can be resized vertically by DELTA lines.
+WINDOW must be a valid window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means return DELTA if WINDOW
 can be resized horizontally by DELTA columns.  A return value of
 zero means that WINDOW is not resizable.
@@ -936,7 +946,7 @@ means ignore all of the above restrictions for all windows."
 
 (defun window-total-size (&optional window horizontal)
   "Return the total height or width of WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
 
 If HORIZONTAL is omitted or nil, return the total height of
 WINDOW, in lines, like `window-total-height'.  Otherwise return
@@ -953,8 +963,8 @@ the total width, in columns, like `window-total-width'."
   "Return t if WINDOW is as high as its containing frame.
 More precisely, return t if and only if the total height of
 WINDOW equals the total height of the root window of WINDOW's
-frame.  WINDOW can be any window and defaults to the selected
-one."
+frame.  WINDOW must be a valid window and defaults to the
+selected one."
   (setq window (window-normalize-window window))
   (= (window-total-size window)
      (window-total-size (frame-root-window window))))
@@ -963,15 +973,14 @@ one."
   "Return t if WINDOW is as wide as its containing frame.
 More precisely, return t if and only if the total width of WINDOW
 equals the total width of the root window of WINDOW's frame.
-WINDOW can be any window and defaults to the selected one."
+WINDOW must be a valid window and defaults to the selected one."
   (setq window (window-normalize-window window))
   (= (window-total-size window t)
      (window-total-size (frame-root-window window) t)))
 
 (defun window-body-size (&optional window horizontal)
   "Return the height or width of WINDOW's text area.
-If WINDOW is omitted or nil, it defaults to the selected window.
-Signal an error if the window is not live.
+WINDOW must be a live window and defaults to the selected one.
 
 If HORIZONTAL is omitted or nil, return the height of the text
 area, like `window-body-height'.  Otherwise, return the width of
@@ -1081,9 +1090,9 @@ regardless of whether that buffer is current or not."
 
 (defun window-at-side-p (&optional window side)
   "Return t if WINDOW is at SIDE of its containing frame.
-WINDOW can be any window and defaults to the selected one.  SIDE
-can be any of the symbols `left', `top', `right' or `bottom'.
-The default value nil is handled like `bottom'."
+WINDOW must be a valid window and defaults to the selected one.
+SIDE can be any of the symbols `left', `top', `right' or
+`bottom'.  The default value nil is handled like `bottom'."
   (setq window (window-normalize-window window))
   (let ((edge
          (cond
@@ -2019,7 +2028,8 @@ any windows."
 (defun adjust-window-trailing-edge (window delta &optional horizontal)
   "Move WINDOW's bottom edge by DELTA lines.
 Optional argument HORIZONTAL non-nil means move WINDOW's right
-edge by DELTA columns.  WINDOW defaults to the selected window.
+edge by DELTA columns.  WINDOW must be a valid window and
+defaults to the selected one.
 
 If DELTA is greater than zero, move the edge downwards or to the
 right.  If DELTA is less than zero, move the edge upwards or to
@@ -2203,7 +2213,7 @@ Return nil."
 (defun maximize-window (&optional window)
   "Maximize WINDOW.
 Make WINDOW as large as possible without deleting any windows.
-WINDOW can be any window and defaults to the selected window."
+WINDOW must be a valid window and defaults to the selected one."
   (interactive)
   (setq window (window-normalize-window window))
   (window-resize window (window-max-delta window))
@@ -2212,7 +2222,7 @@ WINDOW can be any window and defaults to the selected window."
 (defun minimize-window (&optional window)
   "Minimize WINDOW.
 Make WINDOW as small as possible without deleting any windows.
-WINDOW can be any window and defaults to the selected window."
+WINDOW must be a valid window and defaults to the selected one."
   (interactive)
   (setq window (window-normalize-window window))
   (window-resize window (- (window-min-delta window)))
@@ -2368,8 +2378,8 @@ and no others."
 ;;; Deleting windows.
 (defun window-deletable-p (&optional window)
   "Return t if WINDOW can be safely deleted from its frame.
-Return `frame' if deleting WINDOW should also delete its
-frame."
+WINDOW must be a valid window and defaults to the selected one.
+Return `frame' if deleting WINDOW should also delete its frame."
   (setq window (window-normalize-window window))
 
   (unless ignore-window-parameters
@@ -2407,8 +2417,8 @@ frame."
 
 (defun delete-window (&optional window)
   "Delete WINDOW.
-WINDOW can be an arbitrary window and defaults to the selected
-one.  Return nil.
+WINDOW must be a valid window and defaults to the selected one.
+Return nil.
 
 If the variable `ignore-window-parameters' is non-nil or the
 `delete-window' parameter of WINDOW equals t, do not process any
@@ -2419,8 +2429,9 @@ function.
 
 Otherwise, if WINDOW is part of an atomic window, call
 `delete-window' with the root of the atomic window as its
-argument.  If WINDOW is the only window on its frame or the last
-non-side window, signal an error."
+argument.  Signal an error if WINDOW is either the only window on
+its frame, the last non-side window, or part of an atomic window
+that is its frame's root window."
   (interactive)
   (setq window (window-normalize-window window))
   (let* ((frame (window-frame window))
@@ -2487,7 +2498,7 @@ non-side window, signal an error."
 
 (defun delete-other-windows (&optional window)
   "Make WINDOW fill its frame.
-WINDOW may be any window and defaults to the selected one.
+WINDOW must be a valid window and defaults to the selected one.
 Return nil.
 
 If the variable `ignore-window-parameters' is non-nil or the
@@ -2630,11 +2641,13 @@ WINDOW."
 
 (defun set-window-buffer-start-and-point (window buffer &optional start point)
   "Set WINDOW's buffer to BUFFER.
+WINDOW must be a live window and defaults to the selected one.
 Optional argument START non-nil means set WINDOW's start position
 to START.  Optional argument POINT non-nil means set WINDOW's
 point to POINT.  If WINDOW is selected this also sets BUFFER's
 `point' to POINT.  If WINDOW is selected and the buffer it showed
 before was current this also makes BUFFER the current buffer."
+  (setq window (window-normalize-window window t))
   (let ((selected (eq window (selected-window)))
         (current (eq (window-buffer window) (current-buffer))))
     (set-window-buffer window buffer)
@@ -2948,16 +2961,24 @@ displayed there."
 (defun next-buffer ()
   "In selected window switch to next buffer."
   (interactive)
-  (if (window-minibuffer-p)
-      (error "Cannot switch buffers in minibuffer window"))
-  (switch-to-next-buffer))
+  (cond
+   ((window-minibuffer-p)
+    (error "Cannot switch buffers in minibuffer window"))
+   ((eq (window-dedicated-p) t)
+    (error "Window is strongly dedicated to its buffer"))
+   (t
+    (switch-to-next-buffer))))
 
 (defun previous-buffer ()
   "In selected window switch to previous buffer."
   (interactive)
-  (if (window-minibuffer-p)
-      (error "Cannot switch buffers in minibuffer window"))
-  (switch-to-prev-buffer))
+  (cond
+   ((window-minibuffer-p)
+    (error "Cannot switch buffers in minibuffer window"))
+   ((eq (window-dedicated-p) t)
+    (error "Window is strongly dedicated to its buffer"))
+   (t
+    (switch-to-prev-buffer))))
 
 (defun delete-windows-on (&optional buffer-or-name frame)
   "Delete all windows showing BUFFER-OR-NAME.
@@ -3130,7 +3151,7 @@ Optional argument HORIZONTAL non-nil means return minimum width."
 
 (defun split-window (&optional window size side)
   "Make a new window adjacent to WINDOW.
-WINDOW can be any window and defaults to the selected one.
+WINDOW must be a valid window and defaults to the selected one.
 Return the new window which is always a live window.
 
 Optional argument SIZE a positive number means make WINDOW SIZE
@@ -3451,7 +3472,7 @@ right, if any."
 (defun balance-windows-2 (window horizontal)
   "Subroutine of `balance-windows-1'.
 WINDOW must be a vertical combination (horizontal if HORIZONTAL
-is non-nil."
+is non-nil)."
   (let* ((first (window-child window))
          (sub first)
          (number-of-children 0)
@@ -5179,9 +5200,9 @@ documentation for additional customization information."
 
 (defun set-window-text-height (window height)
   "Set the height in lines of the text display area of WINDOW to HEIGHT.
-WINDOW must be a live window.  HEIGHT doesn't include the mode
-line or header line, if any, or any partial-height lines in the
-text display area.
+WINDOW must be a live window and defaults to the selected one.
+HEIGHT doesn't include the mode line or header line, if any, or
+any partial-height lines in the text display area.
 
 Note that the current implementation of this function cannot
 always set the height exactly, but attempts to be conservative,
@@ -5248,7 +5269,9 @@ in some window."
         (1+ (vertical-motion (buffer-size) window))))))
 
 (defun window-buffer-height (window)
-  "Return the height (in screen lines) of the buffer that WINDOW is displaying."
+  "Return the height (in screen lines) of the buffer that WINDOW is displaying.
+WINDOW must be a live window and defaults to the selected one."
+  (setq window (window-normalize-window window t))
   (with-current-buffer (window-buffer window)
     (max 1
          (count-screen-lines (point-min) (point-max)
@@ -5260,7 +5283,7 @@ in some window."
 ;;; Resizing buffers to fit their contents exactly.
 (defun fit-window-to-buffer (&optional window max-height min-height override)
   "Adjust height of WINDOW to display its buffer's contents exactly.
-WINDOW can be any live window and defaults to the selected one.
+WINDOW must be a live window and defaults to the selected one.
 
 Optional argument MAX-HEIGHT specifies the maximum height of
 WINDOW and defaults to the height of WINDOW's frame.  Optional
@@ -5379,7 +5402,7 @@ WINDOW defaults to the selected window."
   "Shrink height of WINDOW if its buffer doesn't need so many lines.
 More precisely, shrink WINDOW vertically to be as small as
 possible, while still showing the full contents of its buffer.
-WINDOW defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
 
 Do not shrink WINDOW to less than `window-min-height' lines.  Do
 nothing if the buffer contains more lines than the present window
@@ -5801,13 +5824,12 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
 
 (defun truncated-partial-width-window-p (&optional window)
   "Return non-nil if lines in WINDOW are specifically truncated due to its width.
-WINDOW defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
 Return nil if WINDOW is not a partial-width window
  (regardless of the value of `truncate-lines').
 Otherwise, consult the value of `truncate-partial-width-windows'
  for the buffer shown in WINDOW."
-  (unless window
-    (setq window (selected-window)))
+  (setq window (window-normalize-window window t))
   (unless (window-full-width-p window)
     (let ((t-p-w-w (buffer-local-value 'truncate-partial-width-windows
                                        (window-buffer window))))
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 8d36e2e22d7..7d49d9b531b 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use ASCII tests for character types.
+        * lwlib-Xaw.c, lwlib.c, xlwmenu.c:
+        Don't include <ctype.h>; no longer needed.
+        * lwlib-Xaw.c (openFont):
+        * xlwmenu.c (openXftFont): Test just for ASCII digits.
+
 2012-08-01  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (config_h): Add conf_post.h.
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 7f834df1aad..d37fb70fdb8 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -24,7 +24,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <stdio.h>
 #include <setjmp.h>
-#include <ctype.h>
 
 #include <lisp.h>
 
@@ -125,7 +124,7 @@ openFont (Widget widget, char *name)
   XftFont *fn;
 
   /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9.  */
-  while (i > 0 && isdigit (fname[i]))
+  while (i > 0 && '0' <= fname[i] && fname[i] <= '9')
     --i;
   if (fname[i] == ' ')
     {
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 5820be8d7a4..ad3792dd59d 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <ctype.h>
 #include "lwlib-int.h"
 #include "lwlib-utils.h"
 #include <X11/StringDefs.h>
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index e8831c37f8f..c76cb1a3f38 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA.  */
 #include <lisp.h>
 
 #include <stdio.h>
-#include <ctype.h>
 
 #include <sys/types.h>
 #if (defined __sun) && !(defined SUNOS41)
@@ -1858,7 +1857,7 @@ openXftFont (XlwMenuWidget mw)
       int screen = XScreenNumberOfScreen (mw->core.screen);
       int len = strlen (fname), i = len-1;
       /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9.  */
-      while (i > 0 && isdigit (fname[i]))
+      while (i > 0 && '0' <= fname[i] && fname[i] <= '9')
         --i;
       if (fname[i] == ' ')
         {
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4727950b9a9..12273ec7853 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (HAVE_POSIX_OPENPT): New macro.
+
 2012-08-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/config.nt b/nt/config.nt
index b07c04d92e2..5181e09e64e 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -740,6 +740,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
+/* Define to 1 if you have the `posix_openpt' function. */
+#undef HAVE_POSIX_OPENPT
+
 /* Define if you have the /proc filesystem. */
 #undef HAVE_PROCFS
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 95140401eb2..72a11c177c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,61 @@
+2012-08-17  Chong Yidong  <cyd@gnu.org>
+
+        * xfaces.c (merge_face_vectors): If the target font specfies a
+        font spec, make the font's attributes take precedence over
+        directly-specified attributes.
+        (merge_face_ref): Recognize :font.
+
+2012-08-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Do not use memcpy for copying intervals.
+        * intervals.c (reproduce_interval): New function.
+        (reproduce_tree, reproduce_tree_obj): Use it.
+        (reproduce_tree_obj): Remove prototype.
+
+2012-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lisp.h (duration_to_sec_usec): Remove unused decl.
+
+2012-08-17  Alp Aker  <alp.tekin.aker@gmail.com>
+
+        * nsfont.m (ns_ascii_average_width): Send initWithFormat selector
+        to an allocated instance of NSString, not to the class itself.
+
+2012-08-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (C_CTYPE_H): New macro.
+        (LISP_H, $(BLD)/ccl.$(O), $(BLD)/doc.$(O), $(BLD)/w32console.$(O)):
+        ($(BLD)/fontset.$(O), $(BLD)/frame.$(O), $(BLD)/composite.$(O)):
+        ($(BLD)/sysdep.$(O), $(BLD)/w32uniscribe.$(O)): Update dependencies.
+
+2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use ASCII tests for character types.
+        * category.c, dispnew.c, doprnt.c, editfns.c, syntax.c, term.c:
+        * xfns.c, xterm.c:
+        Don't include <ctype.h>; was not needed.
+        * charset.c, doc.c, fileio.c, font.c, frame.c, gtkutil.c, image.c:
+        * sysdep.c, xfaces.c:
+        Include <c-ctype.h> instead of <ctype.h>.
+        * nsterm.m: Include <c-ctype.h>.
+        * charset.c (read_hex):
+        * doc.c (Fsnarf_documentation):
+        * fileio.c (IS_DRIVE) [WINDOWSNT]:
+        (DRIVE_LETTER) [DOS_NT]:
+        (Ffile_name_directory, Fexpand_file_name)
+        (Fsubstitute_in_file_name):
+        * font.c (font_parse_xlfd, font_parse_fcname):
+        * frame.c (x_set_font_backend):
+        * gtkutil.c (xg_get_font):
+        * image.c (xbm_scan, xpm_scan, pbm_scan_number):
+        * nsimage.m (hexchar):
+        * nsterm.m (ns_xlfd_to_fontname):
+        * sysdep.c (system_process_attributes):
+        * xfaces.c (hash_string_case_insensitive):
+        Use C-locale tests instead of locale-specific tests for character
+        types, since we want the ASCII interpretation here, not the
+        interpretation suitable for whatever happens to be the current locale.
+
 2012-08-16  Martin Rudalics  <rudalics@gmx.at>
 
         Consistently check windows for validity/liveness
@@ -3411,6 +3469,7 @@
         has at least microseconds now.  All uses removed.
         (update_frame, update_single_window, update_window, update_frame_1)
         (Fsleep_for, sit_for): Port to higher-resolution time stamps.
+        (duration_to_sec_usec): Remove; no longer needed.
 
         * editfns.c (time_overflow): Now extern.
         (Fcurrent_time, Fget_internal_run_time, make_time, lisp_time_argument)
diff --git a/src/category.c b/src/category.c
index 3d5b3cff04a..246a7d35a6d 100644
--- a/src/category.c
+++ b/src/category.c
@@ -32,7 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define CATEGORY_INLINE EXTERN_INLINE
 
-#include <ctype.h>
 #include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
diff --git a/src/charset.c b/src/charset.c
index fbbcefc4915..87c16e12008 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -30,10 +30,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <unistd.h>
-#include <ctype.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <setjmp.h>
+#include <c-ctype.h>
 #include "lisp.h"
 #include "character.h"
 #include "charset.h"
@@ -446,7 +446,7 @@ read_hex (FILE *fp, int *eof, int *overflow)
       return 0;
     }
   n = 0;
-  while (isxdigit (c = getc (fp)))
+  while (c_isxdigit (c = getc (fp)))
     {
       if (UINT_MAX >> 4 < n)
         *overflow = 1;
diff --git a/src/dispnew.c b/src/dispnew.c
index b82761f8cad..3288faba61b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -23,7 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <setjmp.h>
 #include <unistd.h>
 
diff --git a/src/doc.c b/src/doc.c
index d17e90f11c0..ed311d918d7 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -22,11 +22,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <sys/file.h>   /* Must be after sys/types.h for USG*/
-#include <ctype.h>
 #include <setjmp.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <c-ctype.h>
+
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
@@ -597,9 +598,9 @@ the same file name is found in the `doc-directory'.  */)
       {
         ptrdiff_t len;
 
-        while (*beg && isspace (*beg)) ++beg;
+        while (*beg && c_isspace (*beg)) ++beg;
 
-        for (end = beg; *end && ! isspace (*end); ++end)
+        for (end = beg; *end && ! c_isspace (*end); ++end)
           if (*end == '/') beg = end+1;  /* skip directory part  */
 
         len = end - beg;
diff --git a/src/doprnt.c b/src/doprnt.c
index 63f05cb74e2..b36e946005d 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -102,7 +102,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <setjmp.h>
 #include <float.h>
 #include <unistd.h>
diff --git a/src/editfns.c b/src/editfns.c
index 5ac012c8378..b7feb733782 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -44,7 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/resource.h>
 #endif
 
-#include <ctype.h>
 #include <float.h>
 #include <limits.h>
 #include <intprops.h>
diff --git a/src/fileio.c b/src/fileio.c
index eba157ea042..5991a238ffc 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -30,7 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <pwd.h>
 #endif
 
-#include <ctype.h>
 #include <errno.h>
 
 #ifdef HAVE_LIBSELINUX
@@ -38,6 +37,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <selinux/context.h>
 #endif
 
+#include <c-ctype.h>
+
 #include "lisp.h"
 #include "intervals.h"
 #include "character.h"
@@ -67,12 +68,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
 #endif
 #ifdef WINDOWSNT
-#define IS_DRIVE(x) isalpha ((unsigned char) (x))
+#define IS_DRIVE(x) c_isalpha (x)
 #endif
 /* Need to lower-case the drive letter, or else expanded
    filenames will sometimes compare unequal, because
    `expand-file-name' doesn't always down-case the drive letter.  */
-#define DRIVE_LETTER(x) (tolower ((unsigned char) (x)))
+#define DRIVE_LETTER(x) c_tolower (x)
 #endif
 
 #include "systime.h"
@@ -364,7 +365,7 @@ Given a Unix syntax file name, returns a string ending in slash.  */)
           r += 2;
         }
 
-      if (getdefdir (toupper ((unsigned char) *beg) - 'A' + 1, r))
+      if (getdefdir (c_toupper (*beg) - 'A' + 1, r))
         {
           if (!IS_DIRECTORY_SEP (res[strlen (res) - 1]))
             strcat (res, "/");
@@ -1053,7 +1054,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
       if (!IS_DIRECTORY_SEP (nm[0]))
         {
           adir = alloca (MAXPATHLEN + 1);
-          if (!getdefdir (toupper (drive) - 'A' + 1, adir))
+          if (!getdefdir (c_toupper (drive) - 'A' + 1, adir))
             adir = NULL;
         }
       if (!adir)
@@ -1129,7 +1130,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
           adir = alloca (MAXPATHLEN + 1);
           if (drive)
             {
-              if (!getdefdir (toupper (drive) - 'A' + 1, adir))
+              if (!getdefdir (c_toupper (drive) - 'A' + 1, adir))
                 newdir = "/";
             }
           else
@@ -1635,7 +1636,7 @@ those `/' is discarded.  */)
         else
           {
             o = p;
-            while (p != endp && (isalnum (*p) || *p == '_')) p++;
+            while (p != endp && (c_isalnum (*p) || *p == '_')) p++;
             s = p;
           }
 
@@ -1698,7 +1699,7 @@ those `/' is discarded.  */)
         else
           {
             o = p;
-            while (p != endp && (isalnum (*p) || *p == '_')) p++;
+            while (p != endp && (c_isalnum (*p) || *p == '_')) p++;
             s = p;
           }
 
diff --git a/src/font.c b/src/font.c
index c3040b8aa3f..5b9e4f1cfcf 100644
--- a/src/font.c
+++ b/src/font.c
@@ -23,9 +23,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <float.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <setjmp.h>
 
+#include <c-ctype.h>
+
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
@@ -1079,7 +1080,7 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
               p = f[XLFD_POINT_INDEX];
               if (*p == '[')
                 point_size = parse_matrix (p);
-              else if (isdigit (*p))
+              else if (c_isdigit (*p))
                 point_size = atoi (p), point_size /= 10;
               if (point_size >= 0)
                 ASET (font, FONT_SIZE_INDEX, make_float (point_size));
@@ -1346,7 +1347,7 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
         {
           int decimal = 0, size_found = 1;
           for (q = p + 1; *q && *q != ':'; q++)
-            if (! isdigit (*q))
+            if (! c_isdigit (*q))
               {
                 if (*q != '.' || decimal)
                   {
@@ -1474,7 +1475,7 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
 
       /* Scan backwards from the end, looking for a size.  */
       for (p = name + len - 1; p >= name; p--)
-        if (!isdigit (*p))
+        if (!c_isdigit (*p))
           break;
 
       if ((p < name + len - 1) && ((p + 1 == name) || *p == ' '))
diff --git a/src/frame.c b/src/frame.c
index ea682835a87..9dabae55abc 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -20,10 +20,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #include <stdio.h>
-#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <setjmp.h>
+
+#include <c-ctype.h>
+
 #include "lisp.h"
 #include "character.h"
 #ifdef HAVE_X_WINDOWS
@@ -3271,7 +3273,7 @@ x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
       new_value = Qnil;
       while (*p0)
         {
-          while (*p1 && ! isspace (*p1) && *p1 != ',') p1++;
+          while (*p1 && ! c_isspace (*p1) && *p1 != ',') p1++;
           if (p0 < p1)
             new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil),
                                new_value);
@@ -3279,7 +3281,7 @@ x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
             {
               int c;
 
-              while ((c = *++p1) && isspace (c));
+              while ((c = *++p1) && c_isspace (c));
             }
           p0 = p1;
         }
diff --git a/src/gtkutil.c b/src/gtkutil.c
index a4de47f073c..2941605d448 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -24,7 +24,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 #include <stdio.h>
 #include <setjmp.h>
-#include <ctype.h>
+
+#include <c-ctype.h>
+
 #include "lisp.h"
 #include "xterm.h"
 #include "blockinput.h"
@@ -2072,7 +2074,7 @@ xg_get_font (FRAME_PTR f, const char *default_name)
       if (p)
         {
           char *ep = p+1;
-          while (isdigit (*ep))
+          while (c_isdigit (*ep))
             ++ep;
           if (*ep == '\0') *p = ' ';
         }
diff --git a/src/image.c b/src/image.c
index 8a318c2f6ec..f2778165ece 100644
--- a/src/image.c
+++ b/src/image.c
@@ -20,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <math.h>
-#include <ctype.h>
 #include <unistd.h>
 
 #ifdef HAVE_PNG
@@ -33,6 +32,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <setjmp.h>
 
+#include <c-ctype.h>
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS
@@ -2405,12 +2406,12 @@ xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
  loop:
 
   /* Skip white space.  */
-  while (*s < end && (c = *(*s)++, isspace (c)))
+  while (*s < end && (c = *(*s)++, c_isspace (c)))
     ;
 
   if (*s >= end)
     c = 0;
-  else if (isdigit (c))
+  else if (c_isdigit (c))
     {
       int value = 0, digit;
 
@@ -2422,7 +2423,7 @@ xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
               while (*s < end)
                 {
                   c = *(*s)++;
-                  if (isdigit (c))
+                  if (c_isdigit (c))
                     digit = c - '0';
                   else if (c >= 'a' && c <= 'f')
                     digit = c - 'a' + 10;
@@ -2433,11 +2434,11 @@ xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
                   value = 16 * value + digit;
                 }
             }
-          else if (isdigit (c))
+          else if (c_isdigit (c))
             {
               value = c - '0';
               while (*s < end
-                     && (c = *(*s)++, isdigit (c)))
+                     && (c = *(*s)++, c_isdigit (c)))
                 value = 8 * value + c - '0';
             }
         }
@@ -2445,7 +2446,7 @@ xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
         {
           value = c - '0';
           while (*s < end
-                 && (c = *(*s)++, isdigit (c)))
+                 && (c = *(*s)++, c_isdigit (c)))
             value = 10 * value + c - '0';
         }
 
@@ -2454,11 +2455,11 @@ xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
       *ival = value;
       c = XBM_TK_NUMBER;
     }
-  else if (isalpha (c) || c == '_')
+  else if (c_isalpha (c) || c == '_')
     {
       *sval++ = c;
       while (*s < end
-             && (c = *(*s)++, (isalnum (c) || c == '_')))
+             && (c = *(*s)++, (c_isalnum (c) || c == '_')))
         *sval++ = c;
       *sval = 0;
       if (*s < end)
@@ -3661,16 +3662,17 @@ xpm_scan (const unsigned char **s,
   while (*s < end)
     {
       /* Skip white-space.  */
-      while (*s < end && (c = *(*s)++, isspace (c)))
+      while (*s < end && (c = *(*s)++, c_isspace (c)))
         ;
 
       /* gnus-pointer.xpm uses '-' in its identifier.
          sb-dir-plus.xpm uses '+' in its identifier.  */
-      if (isalpha (c) || c == '_' || c == '-' || c == '+')
+      if (c_isalpha (c) || c == '_' || c == '-' || c == '+')
         {
           *beg = *s - 1;
           while (*s < end
-                 && (c = **s, isalnum (c) || c == '_' || c == '-' || c == '+'))
+                 && (c = **s, c_isalnum (c)
+                     || c == '_' || c == '-' || c == '+'))
               ++*s;
           *len = *s - *beg;
           return XPM_TK_IDENT;
@@ -5014,7 +5016,7 @@ pbm_scan_number (unsigned char **s, unsigned char *end)
   while (*s < end)
     {
       /* Skip white-space.  */
-      while (*s < end && (c = *(*s)++, isspace (c)))
+      while (*s < end && (c = *(*s)++, c_isspace (c)))
         ;
 
       if (c == '#')
@@ -5023,11 +5025,11 @@ pbm_scan_number (unsigned char **s, unsigned char *end)
           while (*s < end && (c = *(*s)++, c != '\n'))
             ;
         }
-      else if (isdigit (c))
+      else if (c_isdigit (c))
         {
           /* Read decimal number.  */
           val = c - '0';
-          while (*s < end && (c = *(*s)++, isdigit (c)))
+          while (*s < end && (c = *(*s)++, c_isdigit (c)))
             val = 10 * val + c - '0';
           break;
         }
@@ -8554,7 +8556,7 @@ gs_load (struct frame *f, struct image *img)
      don't either.  Let the Lisp loader use `unwind-protect' instead.  */
   printnum1 = FRAME_X_WINDOW (f);
   printnum2 = img->pixmap;
-  window_and_pixmap_id 
+  window_and_pixmap_id
     = make_formatted_string (buffer, "%"pMu" %"pMu, printnum1, printnum2);
 
   printnum1 = FRAME_FOREGROUND_PIXEL (f);
diff --git a/src/intervals.c b/src/intervals.c
index 09949bbbd45..b0ef7c8d3b9 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -59,7 +59,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static Lisp_Object merge_properties_sticky (Lisp_Object, Lisp_Object);
 static INTERVAL merge_interval_right (INTERVAL);
 static INTERVAL reproduce_tree (INTERVAL, INTERVAL);
-static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object);
 
 /* Utility functions for intervals.  */
 
@@ -1498,6 +1497,26 @@ merge_interval_left (register INTERVAL i)
   abort ();
 }
 
+/* Create a copy of SOURCE but with the default value of UP.  */
+
+static INTERVAL
+reproduce_interval (INTERVAL source)
+{
+  register INTERVAL target = make_interval ();
+
+  target->total_length = source->total_length;
+  target->position = source->position;
+
+  copy_properties (source, target);
+
+  if (! NULL_LEFT_CHILD (source))
+    interval_set_left (target, reproduce_tree (source->left, target));
+  if (! NULL_RIGHT_CHILD (source))
+    interval_set_right (target, reproduce_tree (source->right, target));
+
+  return target;
+}
+
 /* Make an exact copy of interval tree SOURCE which descends from
    PARENT.  This is done by recursing through SOURCE, copying
    the current interval and its properties, and then adjusting
@@ -1506,33 +1525,19 @@ merge_interval_left (register INTERVAL i)
 static INTERVAL
 reproduce_tree (INTERVAL source, INTERVAL parent)
 {
-  register INTERVAL t = make_interval ();
-
-  memcpy (t, source, sizeof *t);
-  copy_properties (source, t);
-  interval_set_parent (t, parent);
-  if (! NULL_LEFT_CHILD (source))
-    interval_set_left (t, reproduce_tree (source->left, t));
-  if (! NULL_RIGHT_CHILD (source))
-    interval_set_right (t, reproduce_tree (source->right, t));
+  register INTERVAL target = reproduce_interval (source);
 
-  return t;
+  interval_set_parent (target, parent);
+  return target;
 }
 
 static INTERVAL
 reproduce_tree_obj (INTERVAL source, Lisp_Object parent)
 {
-  register INTERVAL t = make_interval ();
-
-  memcpy (t, source, sizeof *t);
-  copy_properties (source, t);
-  interval_set_object (t, parent);
-  if (! NULL_LEFT_CHILD (source))
-    interval_set_left (t, reproduce_tree (source->left, t));
-  if (! NULL_RIGHT_CHILD (source))
-    interval_set_right (t, reproduce_tree (source->right, t));
+  register INTERVAL target = reproduce_interval (source);
 
-  return t;
+  interval_set_object (target, parent);
+  return target;
 }
 
 /* Insert the intervals of SOURCE into BUFFER at POSITION.
diff --git a/src/lisp.h b/src/lisp.h
index fb0e44520d6..8ac01211a1f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2682,7 +2682,6 @@ _Noreturn void __executable_start (void);
 #endif
 extern Lisp_Object selected_frame;
 extern Lisp_Object Vwindow_system;
-void duration_to_sec_usec (double, int *, int *);
 extern Lisp_Object sit_for (Lisp_Object, int, int);
 extern void init_display (void);
 extern void syms_of_display (void);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 31dc94f7964..9c13f561a04 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -395,6 +395,8 @@ BLOCKINPUT_H   = $(SRC)/blockinput.h \
                  $(ATIMER_H)
 BUFFER_H       = $(SRC)/buffer.h \
                  $(SYSTIME_H)
+C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
+                 $(NT_INC)/stdbool.h
 CAREADLINKAT_H = $(GNU_LIB)/careadlinkat.h \
                  $(NT_INC)/unistd.h
 CHARACTER_H    = $(SRC)/character.h \
@@ -441,7 +443,8 @@ LISP_H         = $(SRC)/lisp.h \
                  $(SRC)/globals.h \
                  $(GNU_LIB)/intprops.h \
                  $(INTTYPES_H) \
-                 $(NT_INC)/stdalign.h
+                 $(NT_INC)/stdalign.h \
+                 $(NT_INC)/stdbool.h
 MD5_H          = $(GNU_LIB)/md5.h \
                  $(NT_INC)/stdint.h
 MENU_H         = $(SRC)/menu.h \
@@ -626,6 +629,7 @@ $(BLD)/charset.$(O) : \
         $(CHARSET_H) \
         $(CODING_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(LISP_H)
 
 $(BLD)/chartab.$(O) : \
@@ -747,6 +751,7 @@ $(BLD)/doc.$(O) : \
         $(BUFFER_H) \
         $(CHARACTER_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(KEYBOARD_H) \
         $(LISP_H)
 
@@ -820,6 +825,7 @@ $(BLD)/fileio.$(O) : \
         $(CHARACTER_H) \
         $(CODING_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FRAME_H) \
         $(INTERVALS_H) \
@@ -881,6 +887,7 @@ $(BLD)/font.$(O) : \
         $(CHARACTER_H) \
         $(CHARSET_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FONT_H) \
         $(FRAME_H) \
@@ -916,6 +923,7 @@ $(BLD)/frame.$(O) : \
         $(BUFFER_H) \
         $(CHARACTER_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FONT_H) \
         $(FRAME_H) \
@@ -967,6 +975,7 @@ $(BLD)/image.$(O) : \
         $(CHARACTER_H) \
         $(CODING_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FONT_H) \
         $(FRAME_H) \
@@ -1354,6 +1363,7 @@ $(BLD)/sysdep.$(O) : \
         $(BLOCKINPUT_H) \
         $(CAREADLINKAT_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FRAME_H) \
         $(GRP_H) \
@@ -1499,6 +1509,7 @@ $(BLD)/xfaces.$(O) : \
         $(CHARACTER_H) \
         $(CHARSET_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FONT_H) \
         $(FRAME_H) \
diff --git a/src/nsfont.m b/src/nsfont.m
index fdb6e0c33c1..1f8d28cd238 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -275,7 +275,7 @@ ns_ascii_average_width (NSFont *sfont)
       for (ch = 0; ch < 95; ch++)
         chars[ch] = ' ' + ch;
 
-      ascii_printable = [NSString initWithFormat: @"%s", chars];
+      ascii_printable = [[NSString alloc] initWithFormat: @"%s", chars];
     }
 
 #ifdef NS_IMPL_COCOA
diff --git a/src/nsimage.m b/src/nsimage.m
index 1479294948b..8a8a3ddaae4 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -302,7 +302,7 @@ static EmacsImage *ImageList = nil;
                   [bmRep release];
                   return nil;
                 }
-#define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
+#define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10)
               s1 = *s++;
               s2 = *s++;
               c = hexchar (s1) * 0x10 + hexchar (s2);
@@ -501,4 +501,3 @@ static EmacsImage *ImageList = nil;
 }
 
 @end
-
diff --git a/src/nsterm.m b/src/nsterm.m
index 76e6ee8fb40..a628a248c77 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -36,6 +36,8 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 #include <signal.h>
 #include <unistd.h>
 #include <setjmp.h>
+
+#include <c-ctype.h>
 #include <c-strcase.h>
 #include <ftoastr.h>
 
@@ -6785,20 +6787,20 @@ ns_xlfd_to_fontname (const char *xlfd)
 
   /* undo hack in ns_fontname_to_xlfd, converting '$' to '-', '_' to ' '
      also uppercase after '-' or ' ' */
-  name[0] = toupper (name[0]);
+  name[0] = c_toupper (name[0]);
   for (len =strlen (name), i =0; i<len; i++)
     {
       if (name[i] == '$')
         {
           name[i] = '-';
           if (i+1<len)
-            name[i+1] = toupper (name[i+1]);
+            name[i+1] = c_toupper (name[i+1]);
         }
       else if (name[i] == '_')
         {
           name[i] = ' ';
           if (i+1<len)
-            name[i+1] = toupper (name[i+1]);
+            name[i+1] = c_toupper (name[i+1]);
         }
     }
 /*fprintf (stderr, "converted '%s' to '%s'\n",xlfd,name);  */
diff --git a/src/syntax.c b/src/syntax.c
index 1cbad1ae0a4..69965d1d824 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -20,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
-#include <ctype.h>
 #include <sys/types.h>
 #include <setjmp.h>
 #include "lisp.h"
diff --git a/src/sysdep.c b/src/sysdep.c
index 01ca905a987..1dbe8938e46 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -21,7 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SYSTIME_INLINE EXTERN_INLINE
 
-#include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
 #include <setjmp.h>
@@ -33,6 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 
 #include <allocator.h>
+#include <c-ctype.h>
 #include <careadlinkat.h>
 #include <ignore-value.h>
 #include <utimens.h>
@@ -2733,7 +2733,7 @@ system_process_attributes (Lisp_Object pid)
           if (emacs_read (fd, &ch, 1) != 1)
             break;
           c = ch;
-          if (isspace (c) || c == '\\')
+          if (c_isspace (c) || c == '\\')
             cmdline_size++;     /* for later quoting, see below */
         }
       if (cmdline_size)
@@ -2757,7 +2757,7 @@ system_process_attributes (Lisp_Object pid)
           for (p = cmdline; p < cmdline + nread; p++)
             {
               /* Escape-quote whitespace and backslashes.  */
-              if (isspace (*p) || *p == '\\')
+              if (c_isspace (*p) || *p == '\\')
                 {
                   memmove (p + 1, p, nread - (p - cmdline));
                   nread++;
diff --git a/src/term.c b/src/term.c
index 514c7ad11ec..c5cec3062e3 100644
--- a/src/term.c
+++ b/src/term.c
@@ -21,7 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <errno.h>
 #include <sys/file.h>
 #include <sys/time.h>
diff --git a/src/xfaces.c b/src/xfaces.c
index ed372c6b419..8c6542ee725 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -279,7 +279,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #endif /* HAVE_X_WINDOWS */
 
-#include <ctype.h>
+#include <c-ctype.h>
 
 /* Number of pt per inch (from the TeXbook).  */
 
@@ -2281,6 +2281,7 @@ merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to,
                     struct named_merge_point *named_merge_points)
 {
   int i;
+  Lisp_Object font = Qnil;
 
   /* If FROM inherits from some other faces, merge their attributes into
      TO before merging FROM's direct attributes.  Note that an :inherit
@@ -2291,24 +2292,13 @@ merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to,
       && !NILP (from[LFACE_INHERIT_INDEX]))
     merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points);
 
-  i = LFACE_FONT_INDEX;
-  if (!UNSPECIFIEDP (from[i]))
+  if (FONT_SPEC_P (from[LFACE_FONT_INDEX]))
     {
-      if (!UNSPECIFIEDP (to[i]))
-        to[i] = merge_font_spec (from[i], to[i]);
+      if (!UNSPECIFIEDP (to[LFACE_FONT_INDEX]))
+        font = merge_font_spec (from[LFACE_FONT_INDEX], to[LFACE_FONT_INDEX]);
       else
-        to[i] = copy_font_spec (from[i]);
-      if (! NILP (AREF (to[i], FONT_FOUNDRY_INDEX)))
-        to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FOUNDRY_INDEX));
-      if (! NILP (AREF (to[i], FONT_FAMILY_INDEX)))
-        to[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FAMILY_INDEX));
-      if (! NILP (AREF (to[i], FONT_WEIGHT_INDEX)))
-        to[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (to[i]);
-      if (! NILP (AREF (to[i], FONT_SLANT_INDEX)))
-        to[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (to[i]);
-      if (! NILP (AREF (to[i], FONT_WIDTH_INDEX)))
-        to[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (to[i]);
-      ASET (to[i], FONT_SIZE_INDEX, Qnil);
+        font = copy_font_spec (from[LFACE_FONT_INDEX]);
+      to[LFACE_FONT_INDEX] = font;
     }
 
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
@@ -2319,8 +2309,7 @@ merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to,
             to[i] = merge_face_heights (from[i], to[i], to[i]);
             font_clear_prop (to, FONT_SIZE_INDEX);
           }
-        else if (i != LFACE_FONT_INDEX
-                 && ! EQ (to[i], from[i]))
+        else if (i != LFACE_FONT_INDEX && ! EQ (to[i], from[i]))
           {
             to[i] = from[i];
             if (i >= LFACE_FAMILY_INDEX && i <=LFACE_SLANT_INDEX)
@@ -2334,6 +2323,25 @@ merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to,
           }
       }
 
+  /* If FROM specifies a font spec, make its contents take precedence
+     over :family and other attributes.  This is needed for face
+     remapping using :font to work.  */
+
+  if (!NILP (font))
+    {
+      if (! NILP (AREF (font, FONT_FOUNDRY_INDEX)))
+        to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (font, FONT_FOUNDRY_INDEX));
+      if (! NILP (AREF (font, FONT_FAMILY_INDEX)))
+        to[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (font, FONT_FAMILY_INDEX));
+      if (! NILP (AREF (font, FONT_WEIGHT_INDEX)))
+        to[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (font);
+      if (! NILP (AREF (font, FONT_SLANT_INDEX)))
+        to[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (font);
+      if (! NILP (AREF (font, FONT_WIDTH_INDEX)))
+        to[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (font);
+      ASET (font, FONT_SIZE_INDEX, Qnil);
+    }
+
   /* TO is always an absolute face, which should inherit from nothing.
      We blindly copy the :inherit attribute above and fix it up here.  */
   to[LFACE_INHERIT_INDEX] = Qnil;
@@ -2575,6 +2583,13 @@ merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to,
                   else
                     err = 1;
                 }
+              else if (EQ (keyword, QCfont))
+                {
+                  if (FONTP (value))
+                    to[LFACE_FONT_INDEX] = value;
+                  else
+                    err = 1;
+                }
               else if (EQ (keyword, QCinherit))
                 {
                   /* This is not really very useful; it's just like a
@@ -4059,7 +4074,7 @@ hash_string_case_insensitive (Lisp_Object string)
   unsigned hash = 0;
   eassert (STRINGP (string));
   for (s = SDATA (string); *s; ++s)
-    hash = (hash << 1) ^ tolower (*s);
+    hash = (hash << 1) ^ c_tolower (*s);
   return hash;
 }
 
diff --git a/src/xfns.c b/src/xfns.c
index 2e7334b7d71..a9d22e7d3c6 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -49,7 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_X_WINDOWS
 
-#include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/xterm.c b/src/xterm.c
index 1b746f87d53..b1a73d07998 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -50,7 +50,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systime.h"
 
 #include <fcntl.h>
-#include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>