upstream

23 files changed, 281 insertions, 114 deletions

diff --git a/ChangeLog b/ChangeLog
index 500c85d2350..d245f6e2f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (HAVE_XKBGETKEYBOARD): Remove.
+        Subsumed by HAVE_XKB.  All uses changed.
+
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz
 
         * lisp/eshell/em-unix.el: Moved su and sudo to...
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c11c3c3b489..a89d1764f7b 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
diff --git a/autogen/config.in b/autogen/config.in
index f68efed389a..25f060b9bb9 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1109,9 +1109,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the Xkb extension. */
 #undef HAVE_XKB
 
-/* Define to 1 if you have the XkbGetKeyboard function. */
-#undef HAVE_XKBGETKEYBOARD
-
 /* Define to 1 if you have the Xpm library (-lXpm). */
 #undef HAVE_XPM
 
diff --git a/autogen/configure b/autogen/configure
index e519edaa39d..126248beced 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -10634,9 +10634,6 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo "$emacs_xkb" >&6; }
   if test $emacs_xkb = yes; then
 
-$as_echo "#define HAVE_XKBGETKEYBOARD 1" >>confdefs.h
-
-
 $as_echo "#define HAVE_XKB 1" >>confdefs.h
 
   fi
diff --git a/configure.ac b/configure.ac
index 3feb6479271..4a27099ab4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1823,7 +1823,6 @@ if test "${HAVE_X11}" = "yes"; then
         emacs_xkb=yes, emacs_xkb=no)
   AC_MSG_RESULT($emacs_xkb)
   if test $emacs_xkb = yes; then
-    AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.])
     AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
   fi
 
diff --git a/etc/NEWS b/etc/NEWS
index 1947797bd34..74badc6bbef 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -254,6 +254,11 @@ has not been relevant for some time.
 
 
 * New Modes and Packages in Emacs 24.4
+** New `superword-mode' in subword.el
+`superword-mode' overrides the default word motion commands to treat
+symbol_words as a single word, similar to what `subword-mode' does and
+using the same internal functions.
+
 ** New nadvice.el package offering lighter-weight advice facilities.
 It is layered as:
 - add-function/remove-function which can be used to add/remove code on any
@@ -297,6 +302,8 @@ file using `set-file-extended-attributes'.
 
 ** `dont-compile' is declared obsolete.
 
+** `get-upcase-table' is obsoleted by the new `case-table-get-table'.
+
 ** Support for filesystem notifications.
 Emacs now supports notifications of filesystem changes, such as
 creation, modification, and deletion of files.  This requires the
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e86bc7f0a96..00a105b5142 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * facemenu.el (list-colors-callback): New defvar.
+        (list-colors-redisplay): New function.
+        (list-colors-display): Install list-colors-redisplay as the
+        revert-buffer-function.  (Bug#14063)
+
+2013-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-pcm--merge-completions): Make sure prefixes
+        and suffixes don't overlap (bug#14061).
+
+        * case-table.el: Use lexical-binding.
+        (case-table-get-table): New function.
+        (get-upcase-table): Use it.  Mark as obsolete.  Adjust callers.
+
+2013-03-27  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/subword.el: Add `superword-mode' to do word motion
+        over symbol_words (parallels and leverages `subword-mode' which
+        does word motion inside MixedCaseWords).
+
 2013-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * desktop.el (desktop--v2s): Rename from desktop-internal-v2s.
diff --git a/lisp/case-table.el b/lisp/case-table.el
index 711d4e4ec8c..7d4aa27de1c 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,4 +1,4 @@
-;;; case-table.el --- code to extend the character set and support case tables
+;;; case-table.el --- code to extend the character set and support case tables  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1988, 1994, 2001-2013 Free Software Foundation, Inc.
 
@@ -65,18 +65,26 @@
        (describe-vector description)
        (help-mode)))))
 
+(defun case-table-get-table (case-table table)
+  "Return the TABLE of CASE-TABLE.
+TABLE can be `down', `up', `eqv' or `canon'."
+  (let ((slot-nb (cdr (assq table '((up . 0) (canon . 1) (eqv . 2))))))
+    (or (if (eq table 'down) case-table)
+        (char-table-extra-slot case-table slot-nb)
+        ;; Setup all extra slots of CASE-TABLE by temporarily selecting
+        ;; it as the standard case table.
+        (let ((old (standard-case-table)))
+          (unwind-protect
+              (progn
+                (set-standard-case-table case-table)
+                (char-table-extra-slot case-table slot-nb))
+            (or (eq case-table old)
+                (set-standard-case-table old)))))))
+
 (defun get-upcase-table (case-table)
   "Return the upcase table of CASE-TABLE."
-  (or (char-table-extra-slot case-table 0)
-      ;; Setup all extra slots of CASE-TABLE by temporarily selecting
-      ;; it as the standard case table.
-      (let ((old (standard-case-table)))
-        (unwind-protect
-            (progn
-              (set-standard-case-table case-table)
-              (char-table-extra-slot case-table 0))
-          (or (eq case-table old)
-              (set-standard-case-table old))))))
+  (case-table-get-table case-table 'up))
+(make-obsolete 'get-upcase-table 'case-table-get-table "24.4")
 
 (defun copy-case-table (case-table)
   (let ((copy (copy-sequence case-table))
@@ -97,7 +105,7 @@ It also modifies `standard-syntax-table' to
 indicate left and right delimiters."
   (aset table l l)
   (aset table r r)
-  (let ((up (get-upcase-table table)))
+  (let ((up (case-table-get-table table 'up)))
     (aset up l l)
     (aset up r r))
   ;; Clear out the extra slots so that they will be
@@ -117,7 +125,7 @@ It also modifies `standard-syntax-table' to give them the syntax of
 word constituents."
   (aset table uc lc)
   (aset table lc lc)
-  (let ((up (get-upcase-table table)))
+  (let ((up (case-table-get-table table 'up)))
     (aset up uc uc)
     (aset up lc uc))
   ;; Clear out the extra slots so that they will be
@@ -132,7 +140,7 @@ word constituents."
 It also modifies `standard-syntax-table' to give them the syntax of
 word constituents."
   (aset table lc lc)
-  (let ((up (get-upcase-table table)))
+  (let ((up (case-table-get-table table 'up)))
     (aset up uc uc)
     (aset up lc uc))
   ;; Clear out the extra slots so that they will be
@@ -148,7 +156,7 @@ It also modifies `standard-syntax-table' to give them the syntax of
 word constituents."
   (aset table uc lc)
   (aset table lc lc)
-  (let ((up (get-upcase-table table)))
+  (let ((up (case-table-get-table table 'up)))
     (aset up uc uc))
   ;; Clear out the extra slots so that they will be
   ;; recomputed from the main (downcase) table and upcase table.
@@ -164,7 +172,7 @@ that will be used as the downcase part of a case table.
 It also modifies `standard-syntax-table'.
 SYNTAX should be \" \", \"w\", \".\" or \"_\"."
   (aset table c c)
-  (let ((up (get-upcase-table table)))
+  (let ((up (case-table-get-table table 'up)))
     (aset up c c))
   ;; Clear out the extra slots so that they will be
   ;; recomputed from the main (downcase) table and upcase table.
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index e86c1c23d66..9a66edd28fc 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -513,12 +513,23 @@ filter out the color from the output."
          (* (nth 1 c-rgb) 0.7151522)
          (* (nth 2 c-rgb) 0.0721750))))))
 
+(defvar list-colors-callback nil
+  "Value of CALLBACK arg passed to `list-colors-display'; internal use.")
+
+(defun list-colors-redisplay (_ignore-auto _noconfirm)
+  "Redisplay the colors using `list-colors-sort'.
+
+This is installed as a `revert-buffer-function' in the *Colors* buffer."
+  (list-colors-display nil (buffer-name) list-colors-callback))
+
 (defun list-colors-display (&optional list buffer-name callback)
   "Display names of defined colors, and show what they look like.
 If the optional argument LIST is non-nil, it should be a list of
 colors to display.  Otherwise, this command computes a list of
 colors that the current display can handle.  Customize
 `list-colors-sort' to change the order in which colors are shown.
+Type `g' or \\[revert-buffer] after customizing `list-colors-sort'
+to redisplay colors in the new order.
 
 If the optional argument BUFFER-NAME is nil, it defaults to *Colors*.
 
@@ -566,7 +577,9 @@ color.  The function should accept a single argument, the color name."
       (erase-buffer)
       (list-colors-print list callback)
       (set-buffer-modified-p nil)
-      (setq truncate-lines t)))
+      (setq truncate-lines t)
+      (setq-local list-colors-callback callback)
+      (setq revert-buffer-function 'list-colors-redisplay)))
   (when callback
     (pop-to-buffer buffer-name)
     (message "Click on a color to select it.")))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9fffc4f1a45..cbfb0109aec 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-27  Andrew Cohen  <cohen@bu.edu>
+
+        * gnus-msg.el (gnus-setup-message): When replying from an nnir summary
+        buffer use the posting-style and gcc of the original article group.
+        (gnus-inews-insert-gcc): Don't set gcc-self for virtual groups.
+
+        * nnir.el: Fix byte-compile warning. nnoo-define-skeleton should come
+        after other deffoos.
+
 2013-03-26  Andrew Cohen  <cohen@bu.edu>
 
         * nnir.el: Major rewrite. Cleaner separation between searches and group
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index f7b2d8b99d9..067465b0e6f 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -426,15 +426,24 @@ Thank you for your help in stamping out bugs.
     `(let ((,winconf (current-window-configuration))
            (,winconf-name gnus-current-window-configuration)
            (,buffer (buffer-name (current-buffer)))
-           (,article gnus-article-reply)
+           (,article (or  (when (and
+                                 (string-match "^nnir:" gnus-newsgroup-name)
+                                 gnus-article-reply)
+                            (nnir-article-number gnus-article-reply))
+                           gnus-article-reply))
            (,yanked gnus-article-yanked-articles)
-           (,group gnus-newsgroup-name)
+           (,group (or (when (and
+                              (string-match "^nnir:" gnus-newsgroup-name)
+                              gnus-article-reply)
+                         (nnir-article-group gnus-article-reply))
+                       gnus-newsgroup-name))
            (message-header-setup-hook
             (copy-sequence message-header-setup-hook))
            (mbl mml-buffer-list)
            (message-mode-hook (copy-sequence message-mode-hook)))
        (setq mml-buffer-list nil)
-       (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
+       (add-hook 'message-header-setup-hook (lambda ()
+                                              (gnus-inews-insert-gcc ,group)))
        ;; message-newsreader and message-mailer were formerly set in
        ;; gnus-inews-add-send-actions, but this is too late when
        ;; message-generate-headers-first is used. --ansel
@@ -1706,7 +1715,8 @@ this is a reply."
          (group (when group (gnus-group-decoded-name group)))
          (var (or gnus-outgoing-message-group gnus-message-archive-group))
          (gcc-self-val
-          (and group (gnus-group-find-parameter group 'gcc-self)))
+          (and group (gnus-group-find-parameter group 'gcc-self)
+               (not (gnus-virtual-group-p group))))
          result
          (groups
           (cond
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index cabd08b0653..a48c6043e82 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -886,7 +886,7 @@ skips all prompting."
 ;;  (car (assoc  '(nnir "nnir-ephemeral" (nnir-address "nnir"))
 ;;              gnus-opened-servers))))
 
-(nnoo-define-skeleton nnir)
+
 
 
 (defmacro nnir-add-result (dirnam artno score prefix server artlist)
@@ -1880,6 +1880,11 @@ article came from is also searched."
         (nnir-request-update-info pgroup (gnus-get-info pgroup)))
     t))
 
+(deffoo nnir-request-close ()
+  t)
+
+
+(nnoo-define-skeleton nnir)
 
 ;; The end.
 (provide 'nnir)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index ec237f0f664..016b16d0740 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2997,12 +2997,21 @@ the same set of elements."
                 ;; here any more.
                 (unless unique
                   (push elem res)
-                  (when (memq elem '(star point prefix))
-                    ;; Extract common suffix additionally to common prefix.
-                    ;; Only do it for `point', `star', and `prefix' since for
-                    ;; `any' it could lead to a merged completion that
-                    ;; doesn't itself match the candidates.
-                    (let ((suffix (completion--common-suffix comps)))
+                  ;; Extract common suffix additionally to common prefix.
+                  ;; Don't do it for `any' since it could lead to a merged
+                  ;; completion that doesn't itself match the candidates.
+                  (when (and (memq elem '(star point prefix))
+                             ;; If prefix is one of the completions, there's no
+                             ;; suffix left to find.
+                             (not (assoc-string prefix comps t)))
+                    (let ((suffix
+                           (completion--common-suffix
+                            (if (zerop (length prefix)) comps
+                              ;; Ignore the chars in the common prefix, so we
+                              ;; don't merge '("abc" "abbc") as "ab*bc".
+                              (let ((skip (length prefix)))
+                                (mapcar (lambda (str) (substring str skip))
+                                        comps))))))
                       (cl-assert (stringp suffix))
                       (unless (equal suffix "")
                         (push suffix res)))))
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 80e632c6ef6..24abfa8a053 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -26,7 +26,8 @@
 
 ;; This package provides `subword' oriented commands and a minor mode
 ;; (`subword-mode') that substitutes the common word handling
-;; functions with them.
+;; functions with them.  It also provides the `superword-mode' minor
+;; mode that treats symbols as words, the opposite of `subword-mode'.
 
 ;; In spite of GNU Coding Standards, it is popular to name a symbol by
 ;; mixing uppercase and lowercase letters, e.g. "GtkWidget",
@@ -43,12 +44,13 @@
 
 ;; The subword oriented commands defined in this package recognize
 ;; subwords in a nomenclature to move between them and to edit them as
-;; words.
+;; words.  You also get a mode to treat symbols as words instead,
+;; called `superword-mode' (the opposite of `subword-mode').
 
 ;; In the minor mode, all common key bindings for word oriented
 ;; commands are overridden by the subword oriented commands:
 
-;; Key     Word oriented command      Subword oriented command
+;; Key     Word oriented command      Subword oriented command (also superword)
 ;; ============================================================
 ;; M-f     `forward-word'             `subword-forward'
 ;; M-b     `backward-word'            `subword-backward'
@@ -67,8 +69,13 @@
 ;; To make the mode turn on automatically, put the following code in
 ;; your .emacs:
 ;;
-;; (add-hook 'c-mode-common-hook
-;;        (lambda () (subword-mode 1)))
+;; (add-hook 'c-mode-common-hook 'subword-mode)
+;;
+
+;; To make the mode turn `superword-mode' on automatically for
+;; only some modes, put the following code in your .emacs:
+;;
+;; (add-hook 'c-mode-common-hook 'superword-mode)
 ;;
 
 ;; Acknowledgment:
@@ -98,7 +105,8 @@
   (let ((map (make-sparse-keymap)))
     (dolist (cmd '(forward-word backward-word mark-word kill-word
                                 backward-kill-word transpose-words
-                                capitalize-word upcase-word downcase-word))
+                                capitalize-word upcase-word downcase-word
+                                left-word right-word))
       (let ((othercmd (let ((name (symbol-name cmd)))
                         (string-match "\\([[:alpha:]-]+\\)-word[s]?" name)
                         (intern (concat "subword-" (match-string 1 name))))))
@@ -133,9 +141,8 @@ subwords in a nomenclature to move between subwords and to edit them
 as words.
 
 \\{subword-mode-map}"
-    nil
-    nil
-    subword-mode-map)
+    :lighter " ,"
+    (when subword-mode (superword-mode -1)))
 
 (define-obsolete-function-alias 'c-subword-mode 'subword-mode "23.2")
 
@@ -161,6 +168,8 @@ Optional argument ARG is the same as for `forward-word'."
 
 (put 'subword-forward 'CUA 'move)
 
+(defalias 'subword-right 'subword-forward)
+
 (defun subword-backward (&optional arg)
   "Do the same as `backward-word' but on subwords.
 See the command `subword-mode' for a description of subwords.
@@ -168,6 +177,8 @@ Optional argument ARG is the same as for `backward-word'."
   (interactive "p")
   (subword-forward (- (or arg 1))))
 
+(defalias 'subword-left 'subword-backward)
+
 (defun subword-mark (arg)
   "Do the same as `mark-word' but on subwords.
 See the command `subword-mode' for a description of subwords.
@@ -254,41 +265,73 @@ Optional argument ARG is the same as for `capitalize-word'."
     (unless advance
       (goto-char start))))
 
+
+
+(defvar superword-mode-map subword-mode-map
+  "Keymap used in `superword-mode' minor mode.")
+
+;;;###autoload
+(define-minor-mode superword-mode
+  "Toggle superword movement and editing (Superword mode).
+With a prefix argument ARG, enable Superword mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+
+Superword mode is a buffer-local minor mode.  Enabling it remaps
+word-based editing commands to superword-based commands that
+treat symbols as words, e.g. \"this_is_a_symbol\".
+
+The superword oriented commands activated in this minor mode
+recognize symbols as superwords to move between superwords and to
+edit them as words.
+
+\\{superword-mode-map}"
+    :lighter " ²"
+    (when superword-mode (subword-mode -1)))
+
+;;;###autoload
+(define-global-minor-mode global-superword-mode superword-mode
+  (lambda () (superword-mode 1)))
 
 
 ;;
 ;; Internal functions
 ;;
 (defun subword-forward-internal ()
-  (if (and
-       (save-excursion
-         (let ((case-fold-search nil))
-           (re-search-forward subword-forward-regexp nil t)))
-       (> (match-end 0) (point)))
-      (goto-char
-       (cond
-        ((< 1 (- (match-end 2) (match-beginning 2)))
-         (1- (match-end 2)))
-        (t
-         (match-end 0))))
-    (forward-word 1)))
-
+  (if superword-mode
+      (forward-symbol 1)
+    (if (and
+         (save-excursion
+           (let ((case-fold-search nil))
+             (re-search-forward subword-forward-regexp nil t)))
+         (> (match-end 0) (point)))
+        (goto-char
+         (cond
+          ((< 1 (- (match-end 2) (match-beginning 2)))
+           (1- (match-end 2)))
+          (t
+           (match-end 0))))
+      (forward-word 1))))
 
 (defun subword-backward-internal ()
-  (if (save-excursion
-        (let ((case-fold-search nil))
-          (re-search-backward subword-backward-regexp nil t)))
-      (goto-char
-       (cond
-        ((and (match-end 3)
-              (< 1 (- (match-end 3) (match-beginning 3)))
-              (not (eq (point) (match-end 3))))
-         (1- (match-end 3)))
-        (t
-         (1+ (match-beginning 0)))))
-    (backward-word 1)))
+  (if superword-mode
+      (forward-symbol -1)
+    (if (save-excursion
+          (let ((case-fold-search nil))
+            (re-search-backward subword-backward-regexp nil t)))
+        (goto-char
+         (cond
+          ((and (match-end 3)
+                (< 1 (- (match-end 3) (match-beginning 3)))
+                (not (eq (point) (match-end 3))))
+           (1- (match-end 3)))
+          (t
+           (1+ (match-beginning 0)))))
+      (backward-word 1))))
 
 
+
 (provide 'subword)
+(provide 'superword)
 
 ;;; subword.el ends here
diff --git a/nt/ChangeLog b/nt/ChangeLog
index f851004f605..03bd86a3216 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,22 @@
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
+        (bootstrap, bootstrap-nmake, bootstrap-gmake, install-addpm):
+        Depend on .exe files.
+
+        * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
+        avoid MinGW64 compiler warnings in editfns.c.
+
+        Fix rules for parallel builds.
+        * makefile.w32-in (ALL): Depend on *.exe files, not on phony names
+        without the .exe suffix.
+        (addpm, ddeclient, cmdproxy, addsection, preprep): Remove phony
+        targets.
+        (.PHONY): Remove.
+
+        * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
+        headers, since that's where _W64 is declared by MinGW64.
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.
diff --git a/nt/addpm.c b/nt/addpm.c
index 8079d51dd64..688e0167334 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -34,6 +34,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    installed, then the DDE fallback for creating icons the Windows 3.1
    progman way will be used instead, but that is prone to lockups
    caused by other applications not servicing their message queues.  */
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+
 /* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
    below 0x500.  */
 #ifndef _W64
@@ -45,9 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <windows.h>
 #include <shlobj.h>
 #include <ddeml.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <malloc.h>
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index a2111da6f3e..cd183c917c4 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -161,6 +161,10 @@ extern char *getenv ();
 /* Make sure 'struct timespec' and 'struct timezone' are defined.  */
 #include <sys/types.h>
 #include <time.h>
+/* This prototype avoids MinGW64 compiler warnings due to the fact
+   that time.h is included before localtime is redirected to
+   sys_localtime below.  */
+extern struct tm * sys_localtime (const time_t *);
 /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to
    supply the 2nd arg correctly, so don't use _setjmp directly in that
    case. */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 9336ddb5002..d3e1c8e2228 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -31,33 +31,26 @@ CLIENTRES	= $(BLD)/emacsclient.res
 
 XMFLAGS         =
 
-ALL             = addpm ddeclient runemacs cmdproxy addsection preprep
+ALL             = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
+                  $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
 
-.PHONY: $(ALL)
-
-
-addpm:            stamp_BLD $(BLD)/addpm.exe
 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \
                   $(USER32) $(OLE32) $(UUID) $(SHELL32)
 
-ddeclient:        stamp_BLD $(BLD)/ddeclient.exe
 $(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
 
-cmdproxy:         stamp_BLD $(BLD)/cmdproxy.exe
 $(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-addsection:       stamp_BLD $(BLD)/addsection.exe
 $(BLD)/addsection.exe: $(BLD)/addsection.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-preprep:          stamp_BLD $(BLD)/preprep.exe
 $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -72,7 +65,6 @@ $(TRES):	emacs.rc icons/emacs.ico $(EMACS_MANIFEST) stamp_BLD
 $(CLIENTRES):   emacsclient.rc stamp_BLD
                 $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
 
-runemacs:         stamp_BLD $(BLD)/runemacs.exe
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
                   $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
@@ -93,7 +85,7 @@ all:	which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
 
 all-other-dirs-$(MAKETYPE): maybe-bootstrap
 
-all-other-dirs-nmake: addsection
+all-other-dirs-nmake: $(BLD)/addsection.exe
         cd ..\lib
         $(MAKE) $(MFLAGS) all
         cd ..\lib-src
@@ -106,7 +98,7 @@ all-other-dirs-nmake: addsection
         $(MAKE) $(MFLAGS) all
         cd ..\nt
 
-all-other-dirs-gmake: addsection
+all-other-dirs-gmake: $(BLD)/addsection.exe
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
@@ -153,10 +145,10 @@ maybe-bootstrap-SH: doit
 
 # Bootstrap depends on cmdproxy because some Lisp functions
 # loaded during bootstrap may need to run shell commands.
-bootstrap:      addsection cmdproxy bootstrap-$(MAKETYPE)
+bootstrap:      $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
         $(MAKE) $(MFLAGS) $(XMFLAGS) all
 
-bootstrap-nmake: addsection cmdproxy
+bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
         cd ..\lisp
         $(MAKE) $(MFLAGS) bootstrap-clean
         cd ..\src
@@ -176,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy
         $(MAKE) $(MFLAGS) DOC
         cd ..\nt
 
-bootstrap-gmake: addsection cmdproxy
+bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
@@ -257,7 +249,7 @@ install-other-dirs-gmake: all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
-install-addpm: $(INSTALL_DIR)/bin addpm
+install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
         - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
 
 install-shortcuts: install-addpm
diff --git a/src/ChangeLog b/src/ChangeLog
index 94eef08b5f8..6698cfe0fcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2013-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * casetab.c (init_casetab_once): Don't abuse the ascii eqv table for
+        the upcase table.
+
+2013-03-27  rzl24ozi  <rzl24ozi@gmail.com>  (tiny changes)
+
+        * image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function.
+
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (IsValidLocale) [__GNUC__]: Don't declare prototype,
+        since MinGW's w32api headers do.  This avoids compiler warnings.
+
+        * w32.c (FSCTL_GET_REPARSE_POINT) [_MSC_VER || _W64]: Don't define
+        if already defined.
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
diff --git a/src/casetab.c b/src/casetab.c
index 76f72b26db3..13bed64e4b2 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -246,7 +246,7 @@ void
 init_casetab_once (void)
 {
   register int i;
-  Lisp_Object down, up;
+  Lisp_Object down, up, eqv;
   DEFSYM (Qcase_table, "case-table");
 
   /* Intern this now in case it isn't already done.
@@ -275,13 +275,21 @@ init_casetab_once (void)
 
   for (i = 0; i < 128; i++)
     {
+      int c = (i >= 'a' && i <= 'z') ? i + ('A' - 'a') : i;
+      CHAR_TABLE_SET (up, i, make_number (c));
+    }
+
+  eqv = Fmake_char_table (Qcase_table, Qnil);
+
+   for (i = 0; i < 128; i++)
+     {
       int c = ((i >= 'A' && i <= 'Z') ? i + ('a' - 'A')
                : ((i >= 'a' && i <= 'z') ? i + ('A' - 'a')
                   : i));
       CHAR_TABLE_SET (up, i, make_number (c));
     }
 
-  set_char_table_extras (down, 2, Fcopy_sequence (up));
+  set_char_table_extras (down, 2, eqv);
 
   /* Fill in what isn't filled in.  */
   set_case_table (down, 1);
diff --git a/src/image.c b/src/image.c
index 21f486176df..6da430bee73 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8120,24 +8120,24 @@ svg_image_p (Lisp_Object object)
 #ifdef WINDOWSNT
 
 /* SVG library functions.  */
-DEF_IMGLIB_FN (RsvgHandle *, rsvg_handle_new);
-DEF_IMGLIB_FN (void, rsvg_handle_get_dimensions);
-DEF_IMGLIB_FN (gboolean, rsvg_handle_write);
-DEF_IMGLIB_FN (gboolean, rsvg_handle_close);
-DEF_IMGLIB_FN (GdkPixbuf *, rsvg_handle_get_pixbuf);
-
-DEF_IMGLIB_FN (int, gdk_pixbuf_get_width);
-DEF_IMGLIB_FN (int, gdk_pixbuf_get_height);
-DEF_IMGLIB_FN (guchar *, gdk_pixbuf_get_pixels);
-DEF_IMGLIB_FN (int, gdk_pixbuf_get_rowstride);
-DEF_IMGLIB_FN (GdkColorspace, gdk_pixbuf_get_colorspace);
-DEF_IMGLIB_FN (int, gdk_pixbuf_get_n_channels);
-DEF_IMGLIB_FN (gboolean, gdk_pixbuf_get_has_alpha);
-DEF_IMGLIB_FN (int, gdk_pixbuf_get_bits_per_sample);
-
-DEF_IMGLIB_FN (void, g_type_init);
-DEF_IMGLIB_FN (void, g_object_unref);
-DEF_IMGLIB_FN (void, g_error_free);
+DEF_IMGLIB_FN (RsvgHandle *, rsvg_handle_new, (void));
+DEF_IMGLIB_FN (void, rsvg_handle_get_dimensions, (RsvgHandle *, RsvgDimensionData *));
+DEF_IMGLIB_FN (gboolean, rsvg_handle_write, (RsvgHandle *, const guchar *, gsize, GError **));
+DEF_IMGLIB_FN (gboolean, rsvg_handle_close, (RsvgHandle *, GError **));
+DEF_IMGLIB_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *));
+DEF_IMGLIB_FN (void *, rsvg_handle_set_size_callback, (RsvgHandle *, RsvgSizeFunc, gpointer, GDestroyNotify));
+
+DEF_IMGLIB_FN (int, gdk_pixbuf_get_width, (const GdkPixbuf *));
+DEF_IMGLIB_FN (int, gdk_pixbuf_get_height, (const GdkPixbuf *));
+DEF_IMGLIB_FN (guchar *, gdk_pixbuf_get_pixels, (const GdkPixbuf *));
+DEF_IMGLIB_FN (int, gdk_pixbuf_get_rowstride, (const GdkPixbuf *));
+DEF_IMGLIB_FN (GdkColorspace, gdk_pixbuf_get_colorspace, (const GdkPixbuf *));
+DEF_IMGLIB_FN (int, gdk_pixbuf_get_n_channels, (const GdkPixbuf *));
+DEF_IMGLIB_FN (gboolean, gdk_pixbuf_get_has_alpha, (const GdkPixbuf *));
+DEF_IMGLIB_FN (int, gdk_pixbuf_get_bits_per_sample, (const GdkPixbuf *));
+
+DEF_IMGLIB_FN (void, g_type_init, (void));
+DEF_IMGLIB_FN (void, g_object_unref, (gpointer));
 
 Lisp_Object Qgdk_pixbuf, Qglib, Qgobject;
 
diff --git a/src/w32.c b/src/w32.c
index 93a4ce1a8c1..431826c4b82 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -174,9 +174,12 @@ typedef struct _REPARSE_DATA_BUFFER {
 #ifndef CTL_CODE
 #define CTL_CODE(t,f,m,a)       (((t)<<16)|((a)<<14)|((f)<<2)|(m))
 #endif
+/* MinGW64 defines FSCTL_GET_REPARSE_POINT on winioctl.h.  */
+#ifndef FSCTL_GET_REPARSE_POINT
 #define FSCTL_GET_REPARSE_POINT \
   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif
+#endif
 
 /* TCP connection support.  */
 #include <sys/socket.h>
diff --git a/src/xfns.c b/src/xfns.c
index a6a179be97d..e24d3981a09 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5591,7 +5591,7 @@ nil, it defaults to the selected frame. */)
                                Keyboard
  ***********************************************************************/
 
-#ifdef HAVE_XKBGETKEYBOARD
+#ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #include <X11/keysym.h>
 #endif
@@ -5605,7 +5605,9 @@ usual X keysyms.  Value is `lambda' if we cannot determine if both keys are
 present and mapped to the usual X keysyms.  */)
   (Lisp_Object frame)
 {
-#ifdef HAVE_XKBGETKEYBOARD
+#ifndef HAVE_XKB
+  return Qlambda;
+#else
   XkbDescPtr kb;
   struct frame *f = check_x_frame (frame);
   Display *dpy = FRAME_X_DISPLAY (f);
@@ -5683,9 +5685,7 @@ present and mapped to the usual X keysyms.  */)
     }
   unblock_input ();
   return have_keys;
-#else /* not HAVE_XKBGETKEYBOARD */
-  return Qlambda;
-#endif /* not HAVE_XKBGETKEYBOARD */
+#endif
 }