commit 168c80efdc3981ffbc6ee731e7681b0386eb1db2 (HEAD, refs/remotes/origin/master)
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Date:   Sat Jul 11 23:48:09 2015 +0000

    gnus-registry.el: Correct function argument order
    
    * lisp/gnus/gnus-registry.el (gnus-registry--set/remove-mark):
    Reverse the order of function arguments.

diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index f73f216..0cb5960 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -881,7 +881,7 @@ FUNCTION should take two parameters, a mark symbol and the cell value."
 
 ;; FIXME: Why not merge gnus-registry--set/remove-mark and
 ;; gnus-registry-set-article-mark-internal?
-(defun gnus-registry--set/remove-mark (remove mark articles)
+(defun gnus-registry--set/remove-mark (mark remove articles)
   "Set/remove the MARK over process-marked ARTICLES."
   ;; If this is called and the user doesn't want the
   ;; registry enabled, we'll ask anyhow.

commit d6c2b34e9e9a2e55f599e5a3d1d89ad51437d187
Author: Dmitry Gutov <dgutov@yandex.ru>
Date:   Sat Jul 11 18:56:42 2015 +0300

    Bind grep-highlight-matches to nil
    
    * lisp/progmodes/xref.el (xref-collect-matches):
    Bind grep-highlight-matches to nil (bug#20728).

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index e76f0ed..32d1215 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -762,8 +762,10 @@ tools are used, and when."
   (require 'semantic/fw)
   (grep-compute-defaults)
   (defvar grep-find-template)
+  (defvar grep-highlight-matches)
   (let* ((grep-find-template (replace-regexp-in-string "-e " "-E "
                                                        grep-find-template t t))
+         (grep-highlight-matches nil)
          (command (rgrep-default-command (xref--regexp-to-extended regexp)
                                          "*.*" dir))
          (orig-buffers (buffer-list))