master updated (b3d315e -> f2bd536)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  b3d315e   Prefer setq-local in erc
       new  f352c57   Clarify icomplete-show-matches-on-no-input doc string
       new  1052707   Allow viper-save-setting to save numerical settings
       new  f2bd536   Make custom-data saving atomic


Summary of changes:
 lisp/cus-edit.el             | 5 +++--
 lisp/emulation/viper-util.el | 2 +-
 lisp/icomplete.el            | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)