master updated (d2ba4538cb -> 690f7ac86a)

[Po Lu]

oldosfan pushed a change to branch master.

      from  d2ba4538cb ; * lisp/subr.el (match-buffers): Fix typo
       new  0600065ff2 Fix error trapping in x_focus_frame
       new  690f7ac86a Fix calculation of tab bar lines during automatic height 
adjustment


Summary of changes:
 src/haikufns.c | 17 +++++++++++++----
 src/nsfns.m    | 17 +++++++++++++----
 src/pgtkfns.c  | 17 +++++++++++++----
 src/w32fns.c   | 17 +++++++++++++----
 src/xfns.c     | 17 +++++++++++++----
 src/xterm.c    | 21 ++++++++++++++-------
 6 files changed, 79 insertions(+), 27 deletions(-)