commit 1ee91bf89176251f6e399c8436dca0248cdd6f6b (HEAD, refs/remotes/origin/master)
Author: Ken Brown <kbrown@cornell.edu>
Date:   Tue May 24 16:12:03 2016 -0400

    Allow network-stream-tests to work for out-of-tree builds
    
    * test/lisp/net/network-stream-tests.el
    (network-stream-tests--datadir): New defconst.
    (make-tls-server): Use it.

diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index f30c92a..9e21420 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -156,11 +156,16 @@
       (should (equal (buffer-string) "foo\n")))
     (delete-process server)))
 
+(defconst network-stream-tests--datadir
+  (expand-file-name "test/data/net" source-directory))
+
 (defun make-tls-server (port)
   (start-process "gnutls" (generate-new-buffer "*tls*")
                  "gnutls-serv" "--http"
-                 "--x509keyfile" "data/net/key.pem"
-                 "--x509certfile" "data/net/cert.pem"
+                 "--x509keyfile"
+                 (concat network-stream-tests--datadir "/key.pem")
+                 "--x509certfile"
+                 (concat network-stream-tests--datadir "/cert.pem")
                  "--port" (format "%s" port)))
 
 (ert-deftest connect-to-tls-ipv4-wait ()

commit 6a28fa85a106cad64fdc157b375c9b448785fb31
Author: Ken Brown <kbrown@cornell.edu>
Date:   Tue May 24 15:52:41 2016 -0400

    Fix failing echo-server-nowait test
    
    * test/lisp/net/network-stream-tests.el (echo-server-nowait):
    Specify IPv4 for the client, to match the family of the server.
    (Bug#23606)

diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index c9b7cc7..f30c92a 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -145,6 +145,7 @@
                                      :buffer (generate-new-buffer "*foo*")
                                      :host "localhost"
                                      :nowait t
+                                     :family 'ipv4
                                      :service port)))
     (should (eq (process-status proc) 'connect))
     (while (eq (process-status proc) 'connect)

commit e882e7a35673204397c295b6e92e66e3207a901e
Author: Ken Brown <kbrown@cornell.edu>
Date:   Tue May 24 11:33:24 2016 -0400

    Allow shr-tests to work for out-of-tree builds
    
    * test/lisp/net/shr-tests.el (shr-tests--datadir): New defconst.
    (shr-test, rendering): Use it.

diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index ab6fc93..501916f 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -25,9 +25,12 @@
 
 (require 'shr)
 
+(defconst shr-tests--datadir
+  (expand-file-name "test/data/shr" source-directory))
+
 (defun shr-test (name)
   (with-temp-buffer
-    (insert-file-contents (format "data/shr/%s.html" name))
+    (insert-file-contents (format (concat shr-tests--datadir "/%s.html") name))
     (let ((dom (libxml-parse-html-region (point-min) (point-max)))
           (shr-width 80)
           (shr-use-fonts nil))
@@ -35,7 +38,8 @@
       (shr-insert-document dom)
       (cons (buffer-substring-no-properties (point-min) (point-max))
             (with-temp-buffer
-              (insert-file-contents (format "data/shr/%s.txt" name))
+              (insert-file-contents
+               (format (concat shr-tests--datadir "/%s.txt") name))
               (while (re-search-forward "%\\([0-9A-F][0-9A-F]\\)" nil t)
                 (replace-match (string (string-to-number (match-string 1) 16))
                                t t))
@@ -43,7 +47,7 @@
 
 (ert-deftest rendering ()
   (skip-unless (fboundp 'libxml-parse-html-region))
-  (dolist (file (directory-files "data/shr" nil "\\.html\\'"))
+  (dolist (file (directory-files shr-tests--datadir nil "\\.html\\'"))
     (let* ((name (replace-regexp-in-string "\\.html\\'" "" file))
            (result (shr-test name)))
       (unless (equal (car result) (cdr result))

commit 4aa55338ff3af1cd4e87802e02156e636d212241
Author: Ken Brown <kbrown@cornell.edu>
Date:   Tue May 24 11:05:09 2016 -0400

    Update allowable arguments for open-network-stream
    
    * src/coding.c (Ffind_operation_coding_system): Allow t as a
    target for open-network-stream.  (Bug #23540)

diff --git a/src/coding.c b/src/coding.c
index 17cb77e..7d19956 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9843,7 +9843,8 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...)  */)
   if (!(STRINGP (target)
 	|| (EQ (operation, Qinsert_file_contents) && CONSP (target)
 	    && STRINGP (XCAR (target)) && BUFFERP (XCDR (target)))
-	|| (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
+	|| (EQ (operation, Qopen_network_stream)
+	    && (INTEGERP (target) || EQ (target, Qt)))))
     error ("Invalid argument %"pI"d of operation `%s'",
 	   XFASTINT (target_idx) + 1, SDATA (SYMBOL_NAME (operation)));
   if (CONSP (target))

commit 8af79702fcdbee4e3151a48c1d194c8b014c3815
Author: Dmitry Gutov <dgutov@yandex.ru>
Date:   Tue May 24 13:09:32 2016 +0300

    Make js-mode's syntax highlighting work again
    
    * lisp/progmodes/js.el (js-mode): Fix the assigned
    font-lock-defaults value (bug#23603).

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 5081959..a35c4a3 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3723,7 +3723,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
   (setq-local beginning-of-defun-function #'js-beginning-of-defun)
   (setq-local end-of-defun-function #'js-end-of-defun)
   (setq-local open-paren-in-column-0-is-defun-start nil)
-  (setq-local font-lock-defaults '(js--font-lock-keywords))
+  (setq-local font-lock-defaults (list js--font-lock-keywords))
   (setq-local syntax-propertize-function #'js-syntax-propertize)
   (setq-local prettify-symbols-alist js--prettify-symbols-alist)