master updated (a8fe17e49a5 -> 03fce840163)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  a8fe17e49a5 Merge branch 'master' of 
git.savannah.gnu.org:/srv/git/emacs
       new  526c2621498 Check daemon is initialized before suppressing its init 
errors
       new  03fce840163 ; Fix last change in lisp.h.


Summary of changes:
 src/keyboard.c | 5 +++--
 src/lisp.h     | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)