commit 4fff58dd1ec11543e2b0195f10cefc1746748499 (HEAD, refs/remotes/origin/master)
Author: Daniel Colascione <dancol@dancol.org>
Date:   Sat Jul 4 17:10:55 2015 -0700

    Factor isearch word description into new function
    
    * lisp/isearch.el (isearch--describe-word-mode): New function.
    (isearch-message-prefix, isearch-query-replace): Use it.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index a103c5a..8d4bf24 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1766,16 +1766,8 @@ replacements from Isearch is `M-s w ... M-%'."
      (query-replace-read-to
       isearch-string
       (concat "Query replace"
-	      (if (or delimited isearch-word)
-		  (let* ((symbol (or delimited isearch-word))
-			 (string (and symbol (symbolp symbol)
-				      (get symbol 'isearch-message-prefix))))
-		    (if (stringp string)
-			;; Move space from the end to the beginning.
-			(replace-regexp-in-string "\\(.*\\) \\'" " \\1" string)
-		      " word"))
-		"")
-	      (if isearch-regexp " regexp" "")
+              (isearch--describe-word-mode (or delimited isearch-word) t)
+              (if isearch-regexp " regexp" "")
 	      (if backward " backward" "")
 	      (if (and transient-mark-mode mark-active) " in region" ""))
       isearch-regexp)
@@ -2521,6 +2513,21 @@ If there is no completion possible, say so and continue searching."
 	     (isearch-message-suffix c-q-hack)))
     (if c-q-hack m (let ((message-log-max nil)) (message "%s" m)))))
 
+(defun isearch--describe-word-mode (word-mode &optional space-before)
+  "Make a string for describing WORD-MODE.
+If SPACE-BEFORE is non-nil,  put a space before, instead of after,
+the word mode."
+  (let ((description
+         (cond ((and (symbolp word-mode)
+                     (get word-mode 'isearch-message-prefix))
+                (get word-mode 'isearch-message-prefix))
+               (word-mode "word ")
+               (t ""))))
+    (if space-before
+        ;; Move space from the end to the beginning.
+        (replace-regexp-in-string "\\(.*\\) \\'" " \\1" description)
+      description)))
+
 (defun isearch-message-prefix (&optional ellipsis nonincremental)
   ;; If about to search, and previous search regexp was invalid,
   ;; check that it still is.  If it is valid now,
@@ -2547,13 +2554,9 @@ If there is no completion possible, say so and continue searching."
                         (let ((np (cdr (assq 'isearch-message-prefix props))))
                           (if np (setq prefix (concat np prefix)))))
                       isearch-filter-predicate)
-		     prefix)
-		   (if isearch-word
-		       (or (and (symbolp isearch-word)
-				(get isearch-word 'isearch-message-prefix))
-			   "word ")
-		     "")
-		   (if isearch-regexp "regexp " "")
+                     prefix)
+                   (isearch--describe-word-mode isearch-word)
+                   (if isearch-regexp "regexp " "")
 		   (cond
 		    (multi-isearch-file-list "multi-file ")
 		    (multi-isearch-buffer-list "multi-buffer ")

commit 65571b37ed5300546ea75da7888f73941011d0d0
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Jul 4 14:23:27 2015 +0300

    Fix mouse pointer on w32 when a menu is active
    
    * src/w32fns.c (w32_wnd_proc): Don't change the mouse pointer
    shape while a menu is in use.  This started happening since we now
    send WM_EMACS_SHOWCURSOR messages when the mouse moves.

diff --git a/src/w32fns.c b/src/w32fns.c
index fa26e67..6982eca 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4015,7 +4015,9 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	if (f && cursor)
 	  {
 	    f->output_data.w32->current_cursor = cursor;
-	    if (!f->output_data.w32->hourglass_p)
+	    /* Don't change the cursor while menu-bar menu is in use.  */
+	    if (!f->output_data.w32->menubar_active
+		&& !f->output_data.w32->hourglass_p)
 	      {
 		if (f->pointer_invisible)
 		  SetCursor (NULL);

commit cdd5e86967e0a3d23da3079dc5b17ace699e66b3
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Sat Jul 4 10:42:25 2015 +0200

    Fix processing of alpha parameter for Windows tip frames  (Bug#17344)
    
    * src/w32fns.c (x_create_tip_frame): Fix processing alpha
    parameter.  (Bug#17344)

diff --git a/src/w32fns.c b/src/w32fns.c
index 836dc10..fa26e67 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5836,8 +5836,6 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
 		       "cursorColor", "Foreground", RES_TYPE_STRING);
   x_default_parameter (f, parms, Qborder_color, build_string ("black"),
 		       "borderColor", "BorderColor", RES_TYPE_STRING);
-  x_default_parameter (f, parms, Qalpha, Qnil,
-                       "alpha", "Alpha", RES_TYPE_NUMBER);
 
   /* Init faces before x_default_parameter is called for the
      scroll-bar-width parameter because otherwise we end up in
@@ -5866,6 +5864,9 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
 		       "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN);
   x_default_parameter (f, parms, Qcursor_type, Qbox,
 		       "cursorType", "CursorType", RES_TYPE_SYMBOL);
+  /* Process alpha here (Bug#17344).  */
+  x_default_parameter (f, parms, Qalpha, Qnil,
+                       "alpha", "Alpha", RES_TYPE_NUMBER);
 
   /* Dimensions, especially FRAME_LINES (f), must be done via
      change_frame_size.  Change will not be effected unless different