feature/android updated (b7de14b56fa -> ce63f592f57)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  b7de14b56fa Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  89558533683 Don't signal error when locking a file from non 
file-visiting buffer
      adds  f6e4e77d23d ; Minor documentation fixes
      adds  142007b747e Don't suggest to revert buffer from non-existing file
      adds  65834b8f8d5 Avoid crashes under 'which-key-mode'
       new  ce63f592f57 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 doc/emacs/trouble.texi |  2 +-
 lisp/files-x.el        |  5 ++++-
 lisp/userlock.el       | 17 ++++++++++++-----
 src/character.c        |  2 +-
 src/keyboard.c         |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)