master updated (a496378c941 -> 7206a620af2)

[Po Lu]

oldosfan pushed a change to branch master.

      from  a496378c941 cl-preloaded.el: Improve docstrings of "kinds"
       new  2be41da38ef Improve consistency of content file name handling
       new  7206a620af2 Don't define user-ptr type when user-ptrp is not present


Summary of changes:
 java/org/gnu/emacs/EmacsService.java | 48 +++++++++++++++++++++++++++++-------
 lisp/emacs-lisp/cl-preloaded.el      |  6 +++--
 2 files changed, 43 insertions(+), 11 deletions(-)