feature/android updated (7ac8bcaacc1 -> 67db3bfdc27)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  7ac8bcaacc1 Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  96c43d398a9 Simplify soap-decode-data-time use of encode-time
      adds  a8732cb07aa Don't set background_filled_p
      adds  6234c3e0411 soap-client.el: Bump version to 3.2.3
      adds  c9cf673d505 CC Mode: Fontify function names after long stretches of 
macros.
      adds  0b39e4daee4 Handle case-insensitivity for 
safe-local-variable-directories.
      adds  cbb59267c75 Add trailing space to PROMPT in yes-or-no-p
      adds  e535494491c Merge branch 'master' of 
git.savannah.gnu.org:/srv/git/emacs
      adds  3e132b972e3 Fix files-tests broken by a recent change
       new  67db3bfdc27 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 doc/emacs/custom.texi       |  7 +++----
 doc/lispref/minibuf.texi    |  6 ++++++
 doc/lispref/variables.texi  |  8 +++-----
 lisp/files.el               |  5 ++++-
 lisp/net/soap-client.el     | 11 ++++-------
 lisp/progmodes/cc-engine.el | 21 +++++++++++++++------
 lisp/progmodes/cc-mode.el   |  2 --
 lisp/subr.el                |  4 +++-
 src/fns.c                   | 11 ++++++++++-
 src/haikufont.c             |  1 -
 test/lisp/files-tests.el    |  2 +-
 11 files changed, 49 insertions(+), 29 deletions(-)