master updated (92bec37 -> 7d927fa)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  92bec37   ; Minor touchups to recent D-Bus changes
       new  d5c399b   Make C-h S in Customize buffers work more reliably
       new  7d927fa   Use `format-prompt' when prompting with default values


Summary of changes:
 lisp/abbrev.el                  |   3 +-
 lisp/bookmark.el                |   2 +-
 lisp/calc/calc-bin.el           |   4 +-
 lisp/calc/calc-store.el         |  10 ++--
 lisp/calc/calcalg3.el           |  24 +++++-----
 lisp/calendar/timeclock.el      |   6 +--
 lisp/completion.el              |   6 +--
 lisp/cus-edit.el                |  16 +++----
 lisp/dired-aux.el               |   6 +--
 lisp/dired-x.el                 |  16 +++----
 lisp/emacs-lisp/advice.el       |  14 +++---
 lisp/emacs-lisp/debug.el        |   7 +--
 lisp/emacs-lisp/disass.el       |   5 +-
 lisp/emacs-lisp/ert.el          |   8 +---
 lisp/emacs-lisp/find-func.el    |  10 ++--
 lisp/emacs-lisp/package.el      |   5 +-
 lisp/emacs-lisp/re-builder.el   |   2 +-
 lisp/emacs-lisp/smie.el         |   7 ++-
 lisp/emacs-lisp/trace.el        |  17 ++-----
 lisp/emulation/edt-mapper.el    |   3 +-
 lisp/erc/erc-dcc.el             |   4 +-
 lisp/facemenu.el                |   2 +-
 lisp/faces.el                   |   5 +-
 lisp/ffap.el                    |   2 +-
 lisp/files-x.el                 |  19 ++------
 lisp/files.el                   |   8 ++--
 lisp/format.el                  |   8 ++--
 lisp/frame.el                   |   6 +--
 lisp/gnus/gnus-group.el         |  10 ++--
 lisp/gnus/gnus-sum.el           |   8 ++--
 lisp/gnus/mm-decode.el          |   5 +-
 lisp/help-fns.el                |  13 ++----
 lisp/help.el                    |  11 ++---
 lisp/hi-lock.el                 |   8 +---
 lisp/ibuf-ext.el                |  26 ++++-------
 lisp/imenu.el                   |  11 +++--
 lisp/info-look.el               |  11 +++--
 lisp/info.el                    |  23 +++------
 lisp/international/mule-cmds.el |  14 ++----
 lisp/international/mule.el      |  17 +++----
 lisp/international/ogonek.el    |   8 ++--
 lisp/isearch.el                 |   2 +-
 lisp/locate.el                  |   4 +-
 lisp/mail/mailabbrev.el         |   5 +-
 lisp/mail/mailalias.el          |   6 +--
 lisp/mail/sendmail.el           |   2 +-
 lisp/man.el                     |   7 ++-
 lisp/net/browse-url.el          |   2 +-
 lisp/net/eww.el                 |   9 ++--
 lisp/net/rcirc.el               |   2 +-
 lisp/progmodes/compile.el       |   7 +--
 lisp/progmodes/cperl-mode.el    |   8 +---
 lisp/progmodes/inf-lisp.el      |   5 +-
 lisp/progmodes/octave.el        |  14 ++----
 lisp/progmodes/python.el        |   4 +-
 lisp/progmodes/sh-script.el     |   3 +-
 lisp/progmodes/tcl.el           |   5 +-
 lisp/rect.el                    |   9 ++--
 lisp/replace.el                 |  15 +++---
 lisp/ses.el                     |  12 ++---
 lisp/simple.el                  |  10 ++--
 lisp/speedbar.el                |   5 +-
 lisp/term.el                    |   8 ++--
 lisp/textmodes/css-mode.el      |   9 ++--
 lisp/textmodes/refer.el         |   6 +--
 lisp/textmodes/reftex-ref.el    |   4 +-
 lisp/textmodes/sgml-mode.el     |   6 +--
 lisp/textmodes/table.el         |  31 ++++++------
 lisp/vc/add-log.el              |   2 +-
 lisp/vc/ediff-mult.el           |   8 ++--
 lisp/vc/ediff-util.el           |  29 ++++++------
 lisp/vc/ediff.el                | 101 +++++++++++++++++++---------------------
 lisp/vc/emerge.el               |   5 +-
 lisp/vc/vc-annotate.el          |   2 +-
 lisp/vc/vc.el                   |   7 +--
 lisp/w32-fns.el                 |   3 +-
 lisp/wid-edit.el                |   9 ++--
 lisp/woman.el                   |  13 ++----
 78 files changed, 316 insertions(+), 453 deletions(-)