commit a3d52b3057c98bce581bc94912ef3ced6fad6f14 (HEAD, refs/remotes/origin/master)
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Jan 5 09:47:14 2019 -0800

    Port to platforms where tputs is in libtinfow
    
    * configure.ac (tputs_library): Also try tinfow, ncursesw (Bug#33977).

diff --git a/configure.ac b/configure.ac
index 91fa417308..e5bd6943ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4111,7 +4111,8 @@ AC_CACHE_CHECK([for library containing tputs], [emacs_cv_tputs_lib],
   emacs_cv_tputs_lib='none required'
 else
   # curses precedes termcap because of AIX (Bug#9736#35) and OpenIndiana.
-  for tputs_library in '' tinfo ncurses terminfo curses termcap; do
+  tputs_libraries='tinfo ncurses terminfo curses termcap tinfow ncursesw'
+  for tputs_library in '' $tputs_libraries; do
     OLIBS=$LIBS
     if test -z "$tputs_library"; then
       emacs_cv_tputs_lib='none required'

commit 42c1332494220fab8a07f23f33951edbb01d1c81
Author: João Távora <joaotavora@gmail.com>
Date:   Sat Jan 5 12:12:00 2019 +0000

    New flymake-supress-zero-counters defcustom
    
    A feature suggested by Yuri Khan <yurivkhan@gmail.com>.
    
    * lisp/progmodes/flymake.el (flymake-suppress-zero-counters): New
    variable.  (flymake--mode-line-format): Use it.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 14940844a4..d7cb226773 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -220,6 +220,15 @@ Specifically, start it when the saved buffer is actually displayed."
   :version "26.1"
   :type 'boolean)
 
+(defcustom flymake-suppress-zero-counters :warning
+  "Control appearance of zero-valued diagnostic counters in mode line.
+
+If set to t, supress all zero counters.  If set to a severity
+symbol like `:warning' (the default) suppress zero counters less
+severe than that severity, according to `warning-numeric-level'.
+If set to nil, don't supress any zero counters."
+  :type 'symbol)
+
 (when (fboundp 'define-fringe-bitmap)
   (define-fringe-bitmap 'flymake-double-exclamation-mark
     (vector #b00000000
@@ -1136,6 +1145,7 @@ default) no filter is applied."
 
 (put 'flymake--mode-line-format 'risky-local-variable t)
 
+
 (defun flymake--mode-line-format ()
   "Produce a pretty minor mode indicator."
   (let* ((known (hash-table-keys flymake--backend-state))
@@ -1203,8 +1213,14 @@ default) no filter is applied."
            for face = (flymake--lookup-type-property type
                                                      'mode-line-face
                                                      'compilation-error)
-           when (or diags (>= (flymake--severity type)
-                              (warning-numeric-level :warning)))
+           when (or diags
+                    (cond ((eq flymake-suppress-zero-counters t)
+                           nil)
+                          (flymake-suppress-zero-counters
+                           (>= (flymake--severity type)
+                               (warning-numeric-level
+                                flymake-suppress-zero-counters)))
+                          (t t)))
            collect `(:propertize
                      ,(format "%d" (length diags))
                      face ,face

commit 04d3315271cd1357fbbc192505d00c760be02952
Author: João Távora <joaotavora@gmail.com>
Date:   Fri Jan 4 22:45:29 2019 +0000

    Fix Flymake tests for GCC 8.2.0
    
    Fixes: bug#33872
    
    "Now you have two problems..."
    
    * lisp/progmodes/flymake-cc.el (flymake-cc--make-diagnostics):
    Adjust regexp.

diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el
index e8069f5c17..524521d7db 100644
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -58,13 +58,13 @@ SOURCE."
   (cl-loop
    while
    (search-forward-regexp
-    "^\\(In file included from \\)?<stdin>:\\([0-9]+\\):\\([0-9]+\\):\n?\\(.*\\): \\(.*\\)$"
+    "^\\(In file included from \\)?<stdin>:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?:\n?\\(.*\\): \\(.*\\)$"
     nil t)
    for msg = (match-string 5)
    for (beg . end) = (flymake-diag-region
                       source
                       (string-to-number (match-string 2))
-                      (string-to-number (match-string 3)))
+                      (and (match-string 3) (string-to-number (match-string 3))))
    for type = (if (match-string 1)
                   :error
                 (assoc-default

commit 16e2554880381d5cef4ec209675c084bc96d09e1
Author: John Shahid <jvshahid@gmail.com>
Date:   Fri Jan 4 21:28:35 2019 +0000

    Unbreak Flymake's diagnostics buffer when revisiting source
    
    Fixes: bug#33881
    Copyright-paperwork-exempt: yes
    
    * lisp/progmodes/flymake.el (flymake-show-diagnostics-buffer):
    Set flymake--diagnostics-buffer-source before reverting.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 50a9880a14..14940844a4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1332,9 +1332,9 @@ POS can be a buffer position or a button"
          (target (or (get-buffer name)
                      (with-current-buffer (get-buffer-create name)
                        (flymake-diagnostics-buffer-mode)
-                       (setq flymake--diagnostics-buffer-source source)
                        (current-buffer)))))
     (with-current-buffer target
+      (setq flymake--diagnostics-buffer-source source)
       (revert-buffer)
       (display-buffer (current-buffer)))))