master updated (396355f -> 894dd18)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  396355f   Re-fix charset issues when yanking non-plain-text elements
       new  0a93fb4   Set `minibuffer-completion-*` variables locally in more 
places
       new  894dd18   Options to automatically stop the Emacs server


Summary of changes:
 doc/emacs/misc.texi         |  31 ++++++++++++
 etc/NEWS                    |   6 +++
 lisp/calc/calc-store.el     |  15 +++---
 lisp/emacs-lisp/crm.el      |  47 +++++++++--------
 lisp/progmodes/cc-styles.el |  12 +++--
 lisp/server.el              | 119 ++++++++++++++++++++++++++++++++++++--------
 lisp/window.el              |   2 +-
 7 files changed, 175 insertions(+), 57 deletions(-)