commit d707ba846902128572f420241897cbb966363ede (HEAD, refs/remotes/origin/master)
Author: Noam Postavsky <npostavs@gmail.com>
Date:   Tue Mar 28 10:10:34 2017 -0400

    Adjust some search failure errors in info.el
    
    * lisp/info.el (Info-select-node): The search for beginning of node is
    an internal detail, and is not normally expected to fail, so it should
    not be a user error.
    (Info-complete-menu-item): Failing to find a menu indicates the user
    searched for a menu when there isn't one, so change to `use-error'.

diff --git a/lisp/info.el b/lisp/info.el
index a06c868fb3..a6bab290a7 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1672,7 +1672,7 @@ escaped (\\\",\\\\)."
 	  (forward-line 2)
 	(if (looking-at "\^_")
 	    (forward-line 1)
-	  (user-error "Search failed: `\n\^_'")))
+	  (signal 'search-failed (list "\n\^_"))))
       ;; Get nodename spelled as it is in the node.
       (re-search-forward "Node:[ \t]*")
       (setq Info-current-node
@@ -2699,7 +2699,8 @@ Because of ambiguities, this should be concatenated with something like
             (orignode Info-current-node)
             nextnode)
         (goto-char (point-min))
-        (search-forward "\n* Menu:")
+        (unless (search-forward "\n* Menu:" nil t)
+          (user-error "No menu in this node"))
         (cond
          ((eq (car-safe action) 'boundaries) nil)
          ((eq action 'lambda)

commit d546e47632316ea46d48b873641e4a1291653db7
Author: Alan Mackenzie <acm@muc.de>
Date:   Tue Mar 28 20:25:34 2017 +0000

    * lisp/progmodes/cc-defs.el (c-version):  Restore c-version to 5.33

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 3fdd56124c..8dd56106af 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -94,7 +94,7 @@
 
 ;;; Variables also used at compile time.
 
-(defconst c-version "5.32.99"
+(defconst c-version "5.33"
   "CC Mode version number.")
 
 (defconst c-version-sym (intern c-version))

commit 01ffca6726be668ace0ce4267c42b7a79a02f399
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Mar 28 12:44:09 2017 -0700

    Don’t mishandle (format "%i" -1.0)
    
    * src/editfns.c (styled_format): Treat %i like %d when converting arg.

diff --git a/src/editfns.c b/src/editfns.c
index 65c0c721d1..2dafd8e7b1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4356,7 +4356,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
 		  sprintf_buf[0] = XINT (args[n]);
 		  sprintf_bytes = prec != 0;
 		}
-	      else if (conversion == 'd')
+	      else if (conversion == 'd' || conversion == 'i')
 		{
 		  /* For float, maybe we should use "%1.0f"
 		     instead so it also works for values outside

commit 7d27f5d8f48b8f184eb93f64461e01c1481c8fb4
Author: Noam Postavsky <npostavs@gmail.com>
Date:   Tue Mar 28 09:40:45 2017 -0400

    * lisp/emacs-lisp/ert.el (ert-run-tests): Make INTERACTIVE arg optional.

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 611c67311b..e7387e463c 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1236,7 +1236,7 @@ SELECTOR is the selector that was used to select TESTS."
         (funcall listener 'test-ended stats test result))
       (setf (ert--stats-current-test stats) nil))))
 
-(defun ert-run-tests (selector listener interactively)
+(defun ert-run-tests (selector listener &optional interactively)
   "Run the tests specified by SELECTOR, sending progress updates to LISTENER."
   (let* ((tests (ert-select-tests selector t))
          (stats (ert--make-stats tests selector)))

commit 969fad4068e44ae2de7632dd656c8013bb60c566
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Tue Mar 28 13:38:49 2017 +0200

    * src/inotify.c (Finotify_add_watch): aspect can also be a symbol.

diff --git a/src/inotify.c b/src/inotify.c
index cb24e82762..004689bd4b 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -396,7 +396,9 @@ IN_ONLYDIR  */)
      (Lisp_Object filename, Lisp_Object aspect, Lisp_Object callback)
 {
   Lisp_Object encoded_file_name;
-  bool dont_follow = ! NILP (Fmemq (Qdont_follow, aspect));
+  bool dont_follow = (CONSP (aspect)
+		      ? ! NILP (Fmemq (Qdont_follow, aspect))
+		      : EQ (Qdont_follow, aspect));
   int wd = -1;
   uint32_t mask = (INOTIFY_DEFAULT_MASK
                    | (dont_follow ? IN_DONT_FOLLOW : 0));