master updated (69b68099ec -> 99adfafdfc)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  69b68099ec Simplify and speed up string-to-multibyte
       new  da3f3dd091 Prefer :risky defcustom keyword
       new  99adfafdfc Re-add comment on autoloading cookies in preloaded files


Summary of changes:
 lisp/align.el                   | 14 +++++---------
 lisp/bindings.el                |  6 +++---
 lisp/filesets.el                | 14 +++++++-------
 lisp/font-core.el               |  2 ++
 lisp/format.el                  |  1 +
 lisp/hi-lock.el                 |  5 ++---
 lisp/international/mule-cmds.el |  1 +
 lisp/mail/mailalias.el          |  8 ++++----
 lisp/mail/rmail.el              |  2 +-
 lisp/mail/sendmail.el           |  4 ++--
 lisp/mail/supercite.el          | 16 ++++++++--------
 lisp/progmodes/make-mode.el     |  4 ++--
 lisp/so-long.el                 |  2 +-
 lisp/textmodes/sgml-mode.el     |  4 ++--
 14 files changed, 41 insertions(+), 42 deletions(-)