Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 556-561)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 122-124)

   - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
   - Update from CVS

110 files changed, 1544 insertions, 804 deletions

diff --git a/lisp/.gitignore b/lisp/.gitignore
index 48c6dafa2e6..00add3a5726 100644
--- a/lisp/.gitignore
+++ b/lisp/.gitignore
@@ -1,6 +1,8 @@
 *.elc
 MANIFEST
 Makefile
+Makefile.unix
+makefile
 elc.tar.gz
 cus-load.el
 finder-inf.el
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39cd7f0835c..efd66d87d3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,192 +1,397 @@
-2005-09-19  Miles Bader  <miles@gnu.org>
+2005-09-24  Andreas Schwab  <schwab@suse.de>
 
-        * net/newsticker.el: Get rid of CVS keyword.
+        * term/rxvt.el (rxvt-register-default-colors): Delete redundant
+        condition. 
+        
+2005-09-25  Romain Francoise  <romain@orebokech.com>
 
-2005-09-19  Johan Bockg,Ae(Brd  <bojohan+sf@dd.chalmers.se>
+        * dired-aux.el (dired-copy-file-recursive):
+        * dired.el (dired-delete-file):
+        * ediff-mult.el (ediff-dir-diff-copy-file):
+        * ediff-util.el (ediff-test-save-region):
+        * forms.el (forms-mode):
+        * ido.el (ido-file-internal, ido-delete-file-at-head):
+        * log-edit.el (log-edit-done):
+        * ses.el (ses-yank-resize):
+        * play/gomoku.el (gomoku-human-plays, gomoku)
+        (gomoku-human-resigns, gomoku-prompt-for-other-game)
+        (gomoku-offer-a-draw):
+        * play/landmark.el (lm-human-resigns, lm):
+        * net/eudcb-ldap.el (eudc-ldap-check-base):
+        * play/mpuz.el (mpuz-offer-abort, mpuz-try-letter, mpuz-close-game):
+        * progmodes/ebrowse.el (ebrowse-find-pattern):
+        * progmodes/idlw-shell.el (idlwave-shell-set-bp-check):
+        * textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer): 
+        End `yes-or-no-p' and `y-or-n-p' prompts with question mark and
+        space.
+
+        * vc.el (vc-delete-file):
+        * play/gomoku.el (gomoku-terminate-game, gomoku)
+        (gomoku-prompt-for-move, gomoku-human-takes-back):
+        * play/landmark.el (lm-human-takes-back, lm-prompt-for-move)
+        (lm-start-robot, lm-human-plays): Remove extraneous spaces in
+        messages.
 
-        * dired-aux.el (dired-handle-overwrite): Don't use `format' here.
-        The prompt is formatted later.
+2005-09-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
-2005-09-19  David Ponce  <david@dponce.com>
+        * term/rxvt.el (rxvt-register-default-colors): Add support for 255
+        color rxvt terminals by using the code xterm.el used to use before
+        2005-04-09 in order to match the colors used by rxvt.
 
-        * tree-widget.el (tree-widget-value-create): Save the converted
-        tree :node widget.
+2005-09-24  Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
 
-2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
+        * term/rxvt.el (rxvt-register-default-colors): Add support for 88
+        colors rxvt-unicode terminals by using the same code as xterm.el.
 
-        * progmodes/sh-script.el (sh-blink): Fix spurious reference to
-        variable `message'.
+2005-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-2005-09-18  Michael Albinus  <michael.albinus@gmx.de>
+        * textmodes/tex-mode.el (tex-font-lock-append-prop)
+        (tex-font-lock-suscript, tex-insert-quote, latex-indent): Adjust to the
+        new symbol used for the tex-verbatim face.
 
-        * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
-        to cover prompts like "login as:".  Reported by Slawomir Nowaczyk
-        <slawomir.nowaczyk.847@student.lu.se>.
+2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
 
-2005-09-18  Chong Yidong  <cyd@stupidchicken.com>
+        * woman.el (woman-file-name):
+        * wid-edit.el (widget-file-prompt-value)
+        (widget-coding-system-prompt-value):
+        * w32-fns.el (set-w32-system-coding-system):
+        * vc.el (vc-version-diff, vc-annotate):
+        * textmodes/reftex-auc.el (reftex-arg-cite)
+        (reftex-arg-index-tag):
+        * textmodes/refer.el (refer-get-bib-files):
+        * textmodes/artist.el (artist-figlet-choose-font):
+        * terminal.el (terminal-emulator):
+        * replace.el (occur-read-primary-args):
+        * rect.el (string-rectangle, string-insert-rectangle):
+        * ps-print.el (ps-print-preprint):
+        * progmodes/pascal.el (pascal-goto-defun):
+        * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
+        * progmodes/compile.el (compilation-find-file):
+        * printing.el (pr-interactive-n-up):
+        * play/animate.el (animate-birthday-present):
+        * net/rcompile.el (remote-compile):
+        * man.el (man, Man-goto-section, Man-follow-manual-reference):
+        * mail/rmailsum.el (rmail-summary-search-backward)
+        (rmail-summary-search):
+        * mail/rmailout.el (rmail-output-read-rmail-file-name)
+        (rmail-output-read-file-name):
+        * mail/rmail.el (rmail-search, rmail-search-backwards):
+        * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
+        * locate.el (locate):
+        * international/quail.el (quail-show-keyboard-layout):
+        * international/mule.el (set-buffer-file-coding-system)
+        (revert-buffer-with-coding-system, set-file-name-coding-system)
+        (set-terminal-coding-system, set-keyboard-coding-system)
+        (set-next-selection-coding-system):
+        * international/mule-diag.el (describe-coding-system)
+        (describe-font, describe-fontset):
+        * international/mule-cmds.el (universal-coding-system-argument)
+        (search-unencodable-char, describe-input-method)
+        (set-language-environment, describe-language-environment):
+        * international/codepage.el (codepage-setup):
+        * international/code-pages.el (codepage-setup):
+        * info.el (Info-search, Info-follow-reference)
+        (Info-search-backward):
+        * emacs-lisp/advice.el (ad-read-advised-function)
+        (ad-read-advice-class, ad-clear-cache, ad-activate)
+        (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
+        (ad-enable-advice, ad-disable-advice, ad-remove-advice)
+        (ad-read-regexp):
+        * ediff-util.el (ediff-toggle-regexp-match):
+        * ediff-ptch.el (ediff-prompt-for-patch-file):
+        * dired-aux.el (dired-diff):
+        * diff.el (diff):
+        * cus-edit.el (custom-variable-prompt):
+        * calendar/timeclock.el (timeclock-ask-for-project):
+        * calc/calcalg3.el (calc-get-fit-variables):
+        * calc/calc-store.el (calc-edit-variable)
+        (calc-permanent-variable):
+        * vc-mcvs.el (vc-mcvs-register):
+        * shadowfile.el (shadow-define-literal-group):
+        * woman.el (woman-file-name):
+        * vc.el (vc-version-diff, vc-merge):
+        * textmodes/reftex-index.el (reftex-index-complete-tag):
+        * format.el (format-decode-buffer, format-decode-region):
+        * emulation/viper-cmd.el (viper-read-string-with-history):
+        * emacs-lisp/debug.el (cancel-debug-on-entry):
+        * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+        * ediff.el (ediff-merge-revisions)
+        (ediff-merge-revisions-with-ancestor, ediff-revision):
+        * completion.el (interactive-completion-string-reader):
+        * calc/calc-prog.el (calc-user-define-formula):
+        Follow convention for reading with the minibuffer.
 
-        * image.el (image-load-path): Use symbol `data-directory' instead
-        of its value, for backward compatibility with packages that bind
-        it during `find-image'.  Suggested by Katsumi Yamaoka.
-        (image-search-load-path): Handle symbols whose values are strings.
+2005-09-24  Steven Huwig  <steven_h@acm.org>  (tiny change)
 
-2005-09-18  Romain Francoise  <romain@orebokech.com>
+        * progmodes/python.el (python-describe-symbol): Add globals() and
+        locals() to the arguments of emacs.ehelp.
 
-        * calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap
-        with-current-buffer form in save-excursion.
+2005-09-24  Magnus Henoch  <mange@freemail.hu>
 
-2005-09-18  D Goel  <deego@gnufans.org>
+        * textmodes/ispell.el (ispell-maybe-find-aspell-dictionaries):
+        New function, code extracted from ispell-valid-dictionary-list.
+        (ispell-valid-dictionary-list, ispell-accept-buffer-local-defs):
+        Call it.
 
-        * apropos.el (apropos-command): Fix `message' call: first arg
-        should be a format spec.  In this and all other cases that appear
-        below and elsewhere in the source code, I made a change only when
-        two conditions were satisfied: [1] I can think of a possibility
-        that the arguments would cause an error, for example, the code in
-        question relies on external variables such as filenames.  [2] I
-        was sure that the arg to `message' could not have been nil in the
-        code.
+2005-09-24  Eli Zaretskii  <eliz@gnu.org>
 
-        * textmodes/tildify.el (tildify-region): Ditto.
+        * subr.el (version-regexp-alist): Extend valid syntax for version
+        strings: allow any of the characters -,_,+ to separate the
+        alpha/beta/rc part from the version part.  Doc fix.
+        (version-to-list): Doc fix.  Bind case-fold-search to t, as advertised.
 
-        * textmodes/reftex-index.el (reftex-index-change-entry)
-        (reftex-index-phrase-selection-or-word)
-        (reftex-query-index-phrase): Ditto.
+2005-09-23  David Reitter  <david.reitter@gmail.com>
 
-        * textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite): Ditto.
+        * mail/mailclient.el: New file.
 
-        * textmodes/org.el (org-complete, org-deadline, org-schedule)
-        (org-priority, org-table-sum): Ditto.
+2005-09-23  Richard M. Stallman  <rms@gnu.org>
 
-        * textmodes/ispell.el (ispell-check-version)
-        (ispell-parse-output): Ditto.
+        * textmodes/flyspell.el (flyspell-highlight-incorrect-region)
+        (flyspell-incorrect-hook, flyspell-highlight-duplicate-region):
+        Doc fixes.
 
-        * textmodes/flyspell.el (flyspell-mode-on)
-        (flyspell-notify-misspell, flyspell-word)
-        (flyspell-display-next-corrections): Ditto.
+        * progmodes/cc-mode.el (c-font-lock-init):
+        Specify font-lock-lines-before.
 
-        * textmodes/bibtex.el (bibtex-print-help-message): Ditto.
+2005-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * textmodes/artist.el (artist-key-set-point-poly): Ditto.
+        * smerge-mode.el (smerge-remove-props): Cause re-highlighting of the
+        whole conflict.
 
-        * term/mac-win.el (mac-services-insert-text): Ditto.
+2005-09-23  Carsten Dominik  <dominik@science.uva.nl>
 
-        * progmodes/vhdl-mode.el (vhdl-warning, vhdl-print-warnings)
-        (vhdl-hooked-abbrev, vhdl-template-insert-fun)
-        (vhdl-port-paste-testbench, vhdl-compose-new-component)
-        (vhdl-compose-configuration): Ditto.
+        * textmodes/org.el (org-mode-map, orgtbl-mode-map):
+        Move keybindings with `C-c C-h' prefix to `C-c C-x' prefix.  Make use
+        of `remap' feature when available.  Additional key bindings for
+        better tty support.
+        (org-mode-restart, org-force-self-insert): New commands.
+        (org-time-stamp-inactive): New command.
+        (org-remap): New function.
+        (org-table-auto-blank-field, org-level-color-stars-only): New options.
+        (org-enable-fixed-width-editor): Move to `org-structure'
+        customization group.
+        (org-self-insert-command, orgtbl-self-insert-command): Modify to
+        blank field after field motion commands.
 
-        * progmodes/sh-script.el (sh-blink, sh-show-indent)
-        (sh-set-indent, sh-learn-line-indent): Ditto.
+2005-09-23  Kenichi Handa  <handa@m17n.org>
 
-        * progmodes/ps-mode.el (ps-mode-target-column): Ditto.
+        * international/mule-cmds.el (set-language-environment):
+        Don't check utf-translate-cjk-lang-env is nil or not on deciding if we
+        have to call utf-translate-cjk-load-tables.
 
-        * progmodes/idlwave.el (idlwave-make-tags)
-        (idlwave-scan-library-catalogs): Ditto.
+2005-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * progmodes/idlw-shell.el (idlwave-shell-parse-stack-and-display): Ditto.
+        * mouse.el (mouse-move-drag-overlay): Fix last change.
 
-        * progmodes/gud.el (gud-jdb-analyze-source): Ditto.
+2005-09-22  David Ponce  <david@dponce.com>
 
-        * progmodes/flymake.el (flymake-log): Ditto.
+        * tree-widget.el (tree-widget-value-create): Fix previous change.
 
-        * progmodes/ebnf2ps.el (ebnf-generate-region): Ditto.
+2005-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * progmodes/cmacexp.el (c-macro-expansion): Ditto.
+        * term/xterm.el (terminal-init-xterm): Fix loading rxvt at run time.
 
-        * progmodes/ada-xref.el (ada-treat-cmd-string): Ditto.
+2005-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * progmodes/ada-mode.el (ada-create-case-exception-substring)
-        (ada-justified-indent-current, ada-batch-reformat): Ditto.
+        * mouse.el (mouse-move-drag-overlay): New function.
+        (mouse-drag-region-1): Use it.
+        Try to simplify a bit the state handling.  Handle clicks on links
+        inside intangible areas.
+        (mouse-save-then-kill): Minor simplification.
+        (mouse-secondary-overlay): Make it always non-nil instead of
+        recreating it each time.
+        (mouse-start-secondary, mouse-set-secondary, mouse-drag-secondary)
+        (mouse-kill-secondary, mouse-secondary-save-then-kill):
+        Simplify accordingly.
 
-        * play/zone.el (zone): Ditto.
+2005-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * play/landmark.el (lm-move): Ditto.
+        * term/rxvt.el (rxvt-standard-colors): Fix some colors.
 
-        * play/decipher.el (decipher-show-alphabet): Ditto.
+2005-09-20  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * net/newsticker.el (newsticker--display-jump)
-        (newsticker--display-scroll): Ditto.
+        * ediff-ptch.el (ediff-prompt-for-patch-file): More intuitive prompt.
+        (ediff-file-name-sans-prefix): Treat nil as an empty string.
+        (ediff-fixup-patch-map): Better heuristic for intuiting the file names
+        to patch.
 
-        * mail/rmail-spam-filter.el (rsf-add-subject-to-spam-list)
-        (rsf-add-sender-to-spam-list, rsf-add-region-to-spam-list): Ditto.
+        * ediff-util.el: Use insert-buffer-substring.
 
-        * mail/feedmail.el (feedmail-dump-message-to-queue): Ditto.
+        * ediff-vers.el (cvs-run-ediff-on-file-descriptor): Bug fix.
 
-        * eshell/esh-proc.el (eshell-remove-process-entry): Ditto.
+        * emulation/viper-cmd.el (viper-change-state): Don't move over the
+        field boundaries in the minibuffer.
+        (viper-set-minibuffer-style): Add viper-minibuffer-post-command-hook.
+        (viper-minibuffer-post-command-hook): New hook.
+        (viper-line): Don't move cursor at bolp.
 
-        * emulation/ws-mode.el (ws-last-error): Ditto.
+        * emulation/viper-ex.el (ex-pwd, viper-info-on-file): Fix message.
 
-        * emulation/viper-macs.el (ex-map-read-args, ex-unmap-read-args)
-        (viper-record-kbd-macro): Ditto.
+        * emulation/viper-init.el: Add alias to make-variable-buffer-local to
+        avoid compiler warnings.
 
-        * emulation/viper-ex.el (ex-pwd, viper-info-on-file): Ditto.
+        * emulation/viper-macs.el (ex-map): Better messages.
 
-        * emacs-lisp/lisp-mnt.el (lm-report-bug): Ditto.
+        * emulation/viper-utils.el (viper-beginning-of-field): New function.
 
-        * emacs-lisp/find-func.el (find-function-noselect): Ditto.
+        * emulation/viper.el: Replace make-variable-buffer-local with
+        viper-make-variable-buffer-local everywhere, to avoid warnings.
 
-        * calendar/timeclock.el (timeclock-status-string)
-        (timeclock-workday-remaining-string)
-        (timeclock-workday-elapsed-string)
-        (timeclock-when-to-leave-string): Ditto.
+2005-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * calendar/icalendar.el (icalendar--convert-ical-to-diary): Ditto.
+        * mouse.el (mouse-drag-mode-line-1, mouse-drag-vertical-line):
+        Delete unused var `old-selected-window'.
+        (mouse-drag-region-1): Delete unused vars `start-frame', `end-of-range'.
+        (mouse-drag-secondary): Delete unused var `start-frame'.
 
-        * calc/calc-units.el (calc-enter-units-table): Ditto.
+2005-09-19  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
 
-        * calc/calc-mode.el (calc-mode-record-mode): Ditto.
+        * term/rxvt.el (terminal-init-rxvt): Add entry for [end].
 
-        * woman.el (woman-mini-help): Ditto.
+2005-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * wdired.el (wdired-change-to-wdired-mode): Ditto.
+        * calendar/calendar.el (mark-visible-calendar-date): Save excursion.
+        Re-indent within 80 columns.  Use inhibit-read-only.
 
-        * vc.el (vc-retrieve-snapshot): Ditto.
+2005-09-19  Romain Francoise  <romain@orebokech.com>
 
-        * strokes.el (strokes-read-stroke, strokes-read-complex-stroke): Ditto.
+        * calendar/diary-lib.el (mark-diary-entries): Revert last change.
 
-        * startup.el (display-startup-echo-area-message): Ditto.
+2005-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * simple.el (set-goal-column): Ditto.
+        * font-lock.el (font-lock-default-fontify-region): Don't add a line
+        unconditionally, since the after-change-function already did it.
 
-        * ses.el (ses-command-hook, ses-recalculate-cell): Ditto.
+2005-09-19  Miles Bader  <miles@gnu.org>
 
-        * server.el (server-process-filter): Ditto.
+        * net/newsticker.el: Get rid of CVS keyword.
 
-        * printing.el (pr-interface-txt-print, pr-interface-printify)
-        (pr-interface-ps): Ditto.
+2005-09-19  Johan Bockg,Ae(Brd  <bojohan+sf@dd.chalmers.se>
 
-        * pcvs.el (cvs-help): Ditto.
+        * dired-aux.el (dired-handle-overwrite): Don't use `format' here.
+        The prompt is formatted later.
 
-        * log-edit.el (log-edit, log-edit-mode-help): Ditto.
+2005-09-19  David Ponce  <david@dponce.com>
 
-        * iswitchb.el (iswitchb-possible-new-buffer): Ditto.
+        * tree-widget.el (tree-widget-value-create): Save the converted
+        tree :node widget.
 
-        * isearch.el (isearch-edit-string): Ditto.
+2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
 
-        * image-mode.el (image-mode, image-minor-mode): Ditto.
+        * progmodes/sh-script.el (sh-blink): Fix spurious reference to
+        variable `message'.
 
-        * ibuf-macs.el (define-ibuffer-filter): Ditto.
+2005-09-18  Michael Albinus  <michael.albinus@gmx.de>
 
-        * hi-lock.el (hi-lock-find-patterns): Ditto.
+        * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
+        to cover prompts like "login as:".  Reported by Slawomir Nowaczyk
+        <slawomir.nowaczyk.847@student.lu.se>.
 
-        * files.el (toggle-read-only): Ditto.
+2005-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
-        * ediff-util.el (ediff-copy-diff)
-        (ediff-write-merge-buffer-and-maybe-kill): Ditto.
+        * image.el (image-load-path): Use symbol `data-directory' instead
+        of its value, for backward compatibility with packages that bind
+        it during `find-image'.  Suggested by Katsumi Yamaoka.
+        (image-search-load-path): Handle symbols whose values are strings.
 
-        * echistory.el (Electric-history-undefined): Ditto.
+2005-09-18  Romain Francoise  <romain@orebokech.com>
 
-        * dnd.el (dnd-insert-text): Ditto.
+        * calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap
+        with-current-buffer form in save-excursion.
 
-        * dired-aux.el (dired-query): Ditto.
+2005-09-18  D Goel  <deego@gnufans.org>
 
-        * desktop.el (desktop-restore-file-buffer)
-        (desktop-lazy-create-buffer): Ditto.
+        * apropos.el (apropos-command): Fix `message' call: first arg
+        should be a format spec.  In this and all other cases that appear
+        below and elsewhere in the source code, I made a change only when
+        two conditions were satisfied: [1] I can think of a possibility
+        that the arguments would cause an error, for example, the code in
+        question relies on external variables such as filenames.  [2] I
+        was sure that the arg to `message' could not have been nil in the code.
 
-        * bookmark.el (bookmark-bmenu-locate): Ditto.
+        * textmodes/tildify.el (tildify-region): Ditto.
 
-        * obsolete/fast-lock.el (@top-level): Ditto in the macro
-        definition of `with-temp-message'.
+        * textmodes/reftex-index.el (reftex-index-change-entry)
+        (reftex-index-phrase-selection-or-word, reftex-query-index-phrase):
+        * textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite):
+        * textmodes/org.el (org-complete, org-deadline, org-schedule)
+        (org-priority, org-table-sum):
+        * textmodes/ispell.el (ispell-check-version, ispell-parse-output):
+        * textmodes/flyspell.el (flyspell-mode-on, flyspell-notify-misspell)
+        (flyspell-word, flyspell-display-next-corrections):
+        * textmodes/bibtex.el (bibtex-print-help-message):
+        * textmodes/artist.el (artist-key-set-point-poly):
+        * term/mac-win.el (mac-services-insert-text):
+        * progmodes/vhdl-mode.el (vhdl-warning, vhdl-print-warnings)
+        (vhdl-hooked-abbrev, vhdl-template-insert-fun)
+        (vhdl-port-paste-testbench, vhdl-compose-new-component)
+        (vhdl-compose-configuration):
+        * progmodes/sh-script.el (sh-blink, sh-show-indent)
+        (sh-set-indent, sh-learn-line-indent):
+        * progmodes/ps-mode.el (ps-mode-target-column):
+        * progmodes/idlwave.el (idlwave-make-tags)
+        (idlwave-scan-library-catalogs):
+        * progmodes/idlw-shell.el (idlwave-shell-parse-stack-and-display):
+        * progmodes/gud.el (gud-jdb-analyze-source):
+        * progmodes/flymake.el (flymake-log):
+        * progmodes/ebnf2ps.el (ebnf-generate-region):
+        * progmodes/cmacexp.el (c-macro-expansion):
+        * progmodes/ada-xref.el (ada-treat-cmd-string):
+        * progmodes/ada-mode.el (ada-create-case-exception-substring)
+        (ada-justified-indent-current, ada-batch-reformat):
+        * play/zone.el (zone):
+        * play/landmark.el (lm-move):
+        * play/decipher.el (decipher-show-alphabet):
+        * net/newsticker.el (newsticker--display-jump)
+        (newsticker--display-scroll):
+        * mail/rmail-spam-filter.el (rsf-add-subject-to-spam-list)
+        (rsf-add-sender-to-spam-list, rsf-add-region-to-spam-list):
+        * mail/feedmail.el (feedmail-dump-message-to-queue):
+        * eshell/esh-proc.el (eshell-remove-process-entry):
+        * emulation/ws-mode.el (ws-last-error):
+        * emulation/viper-macs.el (ex-map-read-args, ex-unmap-read-args)
+        (viper-record-kbd-macro):
+        * emulation/viper-ex.el (ex-pwd, viper-info-on-file):
+        * emacs-lisp/lisp-mnt.el (lm-report-bug):
+        * emacs-lisp/find-func.el (find-function-noselect):
+        * calendar/timeclock.el (timeclock-status-string)
+        (timeclock-workday-remaining-string, timeclock-workday-elapsed-string)
+        (timeclock-when-to-leave-string):
+        * calendar/icalendar.el (icalendar--convert-ical-to-diary):
+        * calc/calc-units.el (calc-enter-units-table):
+        * calc/calc-mode.el (calc-mode-record-mode):
+        * woman.el (woman-mini-help):
+        * wdired.el (wdired-change-to-wdired-mode):
+        * vc.el (vc-retrieve-snapshot):
+        * strokes.el (strokes-read-stroke, strokes-read-complex-stroke):
+        * startup.el (display-startup-echo-area-message):
+        * simple.el (set-goal-column):
+        * ses.el (ses-command-hook, ses-recalculate-cell):
+        * server.el (server-process-filter):
+        * printing.el (pr-interface-txt-print, pr-interface-printify)
+        (pr-interface-ps):
+        * pcvs.el (cvs-help):
+        * log-edit.el (log-edit, log-edit-mode-help):
+        * iswitchb.el (iswitchb-possible-new-buffer):
+        * isearch.el (isearch-edit-string):
+        * image-mode.el (image-mode, image-minor-mode):
+        * ibuf-macs.el (define-ibuffer-filter):
+        * hi-lock.el (hi-lock-find-patterns):
+        * files.el (toggle-read-only):
+        * ediff-util.el (ediff-copy-diff)
+        (ediff-write-merge-buffer-and-maybe-kill):
+        * echistory.el (Electric-history-undefined):
+        * dnd.el (dnd-insert-text):
+        * dired-aux.el (dired-query):
+        * desktop.el (desktop-restore-file-buffer, desktop-lazy-create-buffer):
+        * bookmark.el (bookmark-bmenu-locate):
+        * obsolete/fast-lock.el (@top-level) <with-temp-message macro>:
+        Fix `message' calls to ensure first arg is a format string.
+        The change was made only when these two conditions were satisfied:
+        [1] when there is a possibility that the arguments would cause an error
+        for example, if the code in question relies on external variables
+        such as filenames, and
+        [2] if the arg to `message' could not have been nil in the code.
 
         * pcomplete.el (pcomplete--help): Fix `message' format spec.
         Not having a %s would be weird, though not technically wrong.
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index b44d8d256a5..2bbbbcceee5 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -197,7 +197,7 @@
          (progn
            (setq cmd-base-default (concat "User-" keyname))
            (setq cmd (completing-read 
-                      (concat "Define M-x command name (default: calc-"
+                      (concat "Define M-x command name (default calc-"
                               cmd-base-default
                               "): ")
                       obarray 'commandp nil
@@ -233,7 +233,7 @@
            (setq func 
                  (concat "calcFunc-"
                          (completing-read 
-                          (concat "Define algebraic function name (default: "
+                          (concat "Define algebraic function name (default "
                                   cmd-base-default "): ")
                           (mapcar (lambda (x) (substring x 9))
                                   (all-completions "calcFunc-"
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 1410b7d6651..82c7077ba91 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -430,7 +430,7 @@
   (calc-wrapper
    (or var (setq var (calc-read-var-name
                       (if calc-last-edited-variable
-                          (format "Edit: (default %s) "
+                          (format "Edit (default %s): "
                                   (calc-var-name calc-last-edited-variable))
                         "Edit: "))))
    (or var (setq var calc-last-edited-variable))
@@ -587,7 +587,7 @@
 (defun calc-permanent-variable (&optional var)
   (interactive)
   (calc-wrapper
-   (or var (setq var (calc-read-var-name "Save variable (default=all): ")))
+   (or var (setq var (calc-read-var-name "Save variable (default all): ")))
    (let (calc-pv-pos)
      (and var (or (and (boundp var) (symbol-value var))
                   (error "No such variable")))
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index 0aef3ba55af..d5ef567866f 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -370,7 +370,7 @@
       (setq defv (calc-invent-independent-variables nv)))
   (or defc
       (setq defc (calc-invent-parameter-variables nc defv)))
-  (let ((vars (read-string (format "Fitting variables: (default %s; %s) "
+  (let ((vars (read-string (format "Fitting variables (default %s; %s): "
                                    (mapconcat 'symbol-name
                                               (mapcar (function (lambda (v)
                                                                   (nth 1 v)))
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 2d2e5256977..ec70c8c6c35 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2900,43 +2900,50 @@ interpreted as BC; -1 being 1 BC, and so on."
 MARK is a single-character string, a list of face attributes/values, or a face.
 MARK defaults to `diary-entry-marker'."
   (if (calendar-date-is-legal-p date)
-      (save-excursion
-        (set-buffer calendar-buffer)
-        (calendar-cursor-to-visible-date date)
-        (let ((mark (or (and (stringp mark) (= (length mark) 1) mark) ; single-char
-                        (and (listp mark) (> (length mark) 0) mark) ; attr list
-                        (and (facep mark) mark) ; face-name
-                        diary-entry-marker)))
-          (if (facep mark)
-              (progn      ; face or an attr-list that contained a face
-                (overlay-put
-                 (make-overlay (1- (point)) (1+ (point))) 'face mark))
-            (if (and (stringp mark)
-                     (= (length mark) 1)) ; single-char
-                (let ((buffer-read-only nil))
-                  (forward-char 1)
-                  (delete-char 1)
-                  (insert mark)
-                  (forward-char -2))
-              (let                      ; attr list
-                  ((temp-face
-                    (make-symbol (apply 'concat "temp-"
-                                        (mapcar '(lambda (sym)
-                                                   (cond ((symbolp sym) (symbol-name sym))
-                                                         ((numberp sym) (int-to-string sym))
-                                                         (t sym))) mark))))
-                   (faceinfo mark))
-                (make-face temp-face)
-                ;; Remove :face info from the mark, copy the face info into temp-face
-                (while (setq faceinfo (memq :face faceinfo))
-                  (copy-face (read (nth 1 faceinfo)) temp-face)
-                  (setcar faceinfo nil)
-                  (setcar (cdr faceinfo) nil))
-                (setq mark (delq nil mark))
-                ;; Apply the font aspects
-                (apply 'set-face-attribute temp-face nil mark)
-                (overlay-put
-                 (make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
+      (with-current-buffer calendar-buffer
+        (save-excursion
+          (calendar-cursor-to-visible-date date)
+          (setq mark
+                (or (and (stringp mark) (= (length mark) 1) mark) ; single-char
+                    (and (listp mark) (> (length mark) 0) mark)   ; attr list
+                    (and (facep mark) mark)                       ; face-name
+                    diary-entry-marker))
+          (cond
+           ;; face or an attr-list that contained a face
+           ((facep mark)
+            (overlay-put
+             (make-overlay (1- (point)) (1+ (point))) 'face mark))
+           ;; single-char
+           ((and (stringp mark) (= (length mark) 1))
+            (let ((inhibit-read-only t))
+              (forward-char 1)
+              ;; Insert before delete so as to better preserve markers.
+              (insert mark)
+              (delete-char 1)
+              (forward-char -2)))
+           (t ;; attr list
+            (let ((temp-face
+                   (make-symbol
+                    (apply 'concat "temp-"
+                           (mapcar (lambda (sym)
+                                     (cond
+                                      ((symbolp sym) (symbol-name sym))
+                                      ((numberp sym) (number-to-string sym))
+                                      (t sym)))
+                                   mark))))
+                  (faceinfo mark))
+              (make-face temp-face)
+              ;; Remove :face info from the mark, copy the face info into
+              ;; temp-face
+              (while (setq faceinfo (memq :face faceinfo))
+                (copy-face (read (nth 1 faceinfo)) temp-face)
+                (setcar faceinfo nil)
+                (setcar (cdr faceinfo) nil))
+              (setq mark (delq nil mark))
+              ;; Apply the font aspects
+              (apply 'set-face-attribute temp-face nil mark)
+              (overlay-put
+               (make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
 
 (defun calendar-star-date ()
   "Replace the date under the cursor in the calendar window with asterisks.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index b748d15e41c..3b634caaa9c 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -864,8 +864,8 @@ diary entries."
     (redraw-calendar))
   (let ((marking-diary-entries t)
         file-glob-attrs marks)
-    (save-excursion
-      (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
+    (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
+      (save-excursion
         (setq mark-diary-entries-in-calendar t)
         (message "Marking diary entries...")
         (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index afa7b0e87d9..f2ee3f3a048 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -599,7 +599,7 @@ relative only to the time worked today, and not to past time."
 (defun timeclock-ask-for-project ()
   "Ask the user for the project they are clocking into."
   (timeclock-completing-read
-   (format "Clock into which project (default \"%s\"): "
+   (format "Clock into which project (default %s): "
            (or timeclock-last-project
                (car timeclock-project-list)))
    (mapcar 'list timeclock-project-list)
diff --git a/lisp/completion.el b/lisp/completion.el
index 4b0f6cac9a6..12df9a52714 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1343,7 +1343,7 @@ String must be longer than `completion-prefix-min-length'."
   (let* ((default (symbol-under-or-before-point))
          (new-prompt
           (if default
-              (format "%s: (default: %s) " prompt default)
+              (format "%s (default %s): " prompt default)
               (format "%s: " prompt)))
          (read (completing-read new-prompt cmpl-obarray)))
     (if (zerop (length read)) (setq read (or default "")))
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 9827ab7d594..eb6656a426d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -495,7 +495,7 @@ Return a list suitable for use in `interactive'."
          val)
      (setq val (completing-read
                 (if (and (symbolp v) (custom-variable-p v))
-                    (format "Customize option: (default %s) " v)
+                    (format "Customize option (default %s): " v)
                   "Customize option: ")
                 obarray 'custom-variable-p t))
      (list (if (equal val "")
@@ -967,7 +967,7 @@ then prompt for the MODE to customize."
 (defun customize-group (group)
   "Customize GROUP, which must be a customization group."
   (interactive (list (let ((completion-ignore-case t))
-                       (completing-read "Customize group: (default emacs) "
+                       (completing-read "Customize group (default emacs): "
                                         obarray
                                         (lambda (symbol)
                                           (or (get symbol 'custom-loads)
@@ -990,7 +990,7 @@ then prompt for the MODE to customize."
 (defun customize-group-other-window (group)
   "Customize GROUP, which must be a customization group."
   (interactive (list (let ((completion-ignore-case t))
-                       (completing-read "Customize group: (default emacs) "
+                       (completing-read "Customize group (default emacs): "
                                         obarray
                                         (lambda (symbol)
                                           (or (get symbol 'custom-loads)
diff --git a/lisp/diff.el b/lisp/diff.el
index 7602ecb0e37..8c4332b2da2 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -83,15 +83,15 @@ With prefix arg, prompt for diff switches."
      (setq newf (buffer-file-name)
            newf (if (and newf (file-exists-p newf))
                     (read-file-name
-                     (concat "Diff new file: (default "
-                             (file-name-nondirectory newf) ") ")
+                     (concat "Diff new file (default "
+                             (file-name-nondirectory newf) "): ")
                      nil newf t)
                   (read-file-name "Diff new file: " nil nil t)))
      (setq oldf (file-newest-backup newf)
            oldf (if (and oldf (file-exists-p oldf))
                     (read-file-name
-                     (concat "Diff original file: (default "
-                             (file-name-nondirectory oldf) ") ")
+                     (concat "Diff original file (default "
+                             (file-name-nondirectory oldf) "): ")
                      (file-name-directory oldf) oldf t)
                   (read-file-name "Diff original file: "
                                   (file-name-directory newf) nil t)))
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 6426c6daf58..f946199bbd6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -59,10 +59,10 @@ With prefix arg, prompt for second argument SWITCHES,
                       (save-excursion (goto-char (mark t))
                                       (dired-get-filename t t)))))
      (require 'diff)
-     (list (read-file-name (format "Diff %s with: %s"
+     (list (read-file-name (format "Diff %s with%s: "
                                    (dired-get-filename t)
                                    (if default
-                                       (concat "(default " default ") ")
+                                       (concat " (default " default ")")
                                      ""))
                            (if default
                                (dired-current-directory)
@@ -1147,7 +1147,7 @@ Special value `always' suppresses confirmation."
     (if (and recursive
              (eq t (car attrs))
              (or (eq recursive 'always)
-                 (yes-or-no-p (format "Recursive copies of %s " from))))
+                 (yes-or-no-p (format "Recursive copies of %s? " from))))
         ;; This is a directory.
         (let ((files (directory-files from nil dired-re-no-dot)))
           (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask any more.
diff --git a/lisp/dired.el b/lisp/dired.el
index e06e808e1ae..3934fe4e433 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2379,7 +2379,7 @@ Anything else, ask for each sub-directory."
                (setq files
                      (directory-files file t dired-re-no-dot)) ; Not empty.
                (or (eq recursive 'always)
-                   (yes-or-no-p (format "Recursive delete of %s "
+                   (yes-or-no-p (format "Recursive delete of %s? "
                                         (dired-make-relative file)))))
         (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask again.
         (while files            ; Recursively delete (possibly asking).
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 2c192c133e2..436c1817edf 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1314,7 +1314,7 @@ Useful commands:
          (if otherfile
              (or (file-exists-p otherfile)
                  (if (y-or-n-p
-                      (format "Copy %s to %s ? " file-abs otherfile))
+                      (format "Copy %s to %s? " file-abs otherfile))
                      (let* ((file-diff-record (assoc file-tail dir-diff-list))
                             (new-mem-code
                              (* (cdr file-diff-record) file-mem-code)))
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index df781e92b5b..ec0e26e7d5c 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -163,10 +163,16 @@ program."
 ;; strip prefix from filename
 ;; returns /dev/null, if can't strip prefix
 (defsubst ediff-file-name-sans-prefix (filename prefix)
-  (save-match-data
-    (if (string-match (concat "^" (regexp-quote prefix)) filename)
-        (substring filename (match-end 0))
-      (concat "/null/" filename))))
+  (if prefix
+      (save-match-data
+        (if (string-match (concat "^" (if (stringp prefix)
+                                          (regexp-quote prefix)
+                                        ""))
+                          filename)
+            (substring filename (match-end 0))
+          (concat "/null/" filename)))
+    filename)
+  )
 
 
 
@@ -260,11 +266,14 @@ program."
       count)))
 
 ;; Fix up the file names in the list using the argument FILENAME
-;; Algorithm: find the first file's directory and cut it out from each file
-;; name in the patch.  Prepend the directory of FILENAME to each file in the
-;; patch.  In addition, the first file in the patch is replaced by FILENAME.
-;; Each file is actually a file-pair of files found in the context diff header
-;; In the end, for each pair, we select the shortest existing file.
+;; Algorithm: find the files' directories in the patch and, if a directory is
+;; absolute, cut it out from the corresponding file name in the patch.
+;; Relative directories are not cut out.
+;; Prepend the directory of FILENAME to each resulting file (which came
+;; originally from the patch).
+;; In addition, the first file in the patch document is replaced by FILENAME.
+;; Each file is actually a pair of files found in the context diff header
+;; In the end, for each pair, we ask the user which file to patch.
 ;; Note: Ediff doesn't recognize multi-file patches that are separated
 ;; with the `Index:' line.  It treats them as a single-file patch.
 ;;
@@ -275,30 +284,41 @@ program."
                         ;; directory part of filename
                         (file-name-as-directory filename)
                       (file-name-directory filename)))
-        ;; Filename-spec is objA; at this point it is represented as
-        ;; (file1 . file2). We get it using ediff-get-session-objA
-        ;; directory part of the first file in the patch
-        (base-dir1 (file-name-directory
-                    (car (ediff-get-session-objA-name (car ediff-patch-map)))))
-        ;; directory part of the 2nd file in the patch
-        (base-dir2 (file-name-directory
-                    (cdr (ediff-get-session-objA-name (car ediff-patch-map)))))
+        ;; In case 2 files are possible patch targets, the user will be offered
+        ;; to choose file1 or file2.  In a multifile patch, if the user chooses
+        ;; 1 or 2, this choice is preserved to decide future alternatives.
+        chosen-alternative
         )
 
     ;; chop off base-dirs
     (mapcar (lambda (session-info)
-              (let ((proposed-file-names
-                     (ediff-get-session-objA-name session-info)))
+              (let* ((proposed-file-names
+                      ;; Filename-spec is objA; it is represented as
+                      ;; (file1 . file2). Get it using ediff-get-session-objA.
+                      (ediff-get-session-objA-name session-info))
+                     ;; base-dir1 is  the dir part of the 1st file in the patch
+                     (base-dir1 (file-name-directory (car proposed-file-names)))
+                     ;; directory part of the 2nd file in the patch
+                     (base-dir2 (file-name-directory (cdr proposed-file-names)))
+                     )
+                ;; If both base-dir1 and base-dir2 are relative, assume that
+                ;; these dirs lead to the actual files starting at the present
+                ;; directory. So, we don't strip these relative dirs from the
+                ;; file names. This is a heuristic intended to improve guessing
+                (unless (or (file-name-absolute-p base-dir1)
+                            (file-name-absolute-p base-dir2))
+                  (setq base-dir1 ""
+                        base-dir2 ""))
                 (or (string= (car proposed-file-names) "/dev/null")
                     (setcar proposed-file-names
                             (ediff-file-name-sans-prefix
                              (car proposed-file-names) base-dir1)))
-              (or (string=
-                   (cdr proposed-file-names) "/dev/null")
-                  (setcdr proposed-file-names
-                          (ediff-file-name-sans-prefix
-                           (cdr proposed-file-names) base-dir2)))
-              ))
+                (or (string=
+                     (cdr proposed-file-names) "/dev/null")
+                    (setcdr proposed-file-names
+                            (ediff-file-name-sans-prefix
+                             (cdr proposed-file-names) base-dir2)))
+                ))
             ediff-patch-map)
 
     ;; take the given file name into account
@@ -314,8 +334,8 @@ program."
                      (ediff-get-session-objA-name session-info)))
                 (if (and (string-match "^/null/" (car proposed-file-names))
                          (string-match "^/null/" (cdr proposed-file-names)))
-                    ;; couldn't strip base-dir1 and base-dir2
-                    ;; hence, something is wrong
+                    ;; couldn't intuit the file name to patch, so
+                    ;; something is amiss
                     (progn
                       (with-output-to-temp-buffer ediff-msg-buffer
                         (ediff-with-current-buffer standard-output
@@ -367,17 +387,29 @@ other files, enter /dev/null
                      (f1-exists (file-exists-p file1))
                      (f2-exists (file-exists-p file2)))
                 (cond
-                 ((and (< (length file2) (length file1))
-                       f2-exists)
+                 ((and
+                   ;; The patch program prefers the shortest file as the patch
+                   ;; target. However, this is a questionable heuristic. In an
+                   ;; interactive program, like ediff, we can offer the user a
+                   ;; choice.
+                   ;; (< (length file2) (length file1))
+                   (not f1-exists)
+                   f2-exists)
                   ;; replace file-pair with the winning file2
                   (setcar session-file-object file2))
-                 ((and (< (length file1) (length file2))
-                       f1-exists)
+                 ((and
+                   ;; (< (length file1) (length file2))
+                   (not f2-exists)
+                   f1-exists)
                   ;; replace file-pair with the winning file1
                   (setcar session-file-object file1))
                  ((and f1-exists f2-exists
                        (string= file1 file2))
                   (setcar session-file-object file1))
+                 ((and f1-exists f2-exists (eq chosen-alternative 1))
+                  (setcar session-file-object file1))
+                 ((and f1-exists f2-exists (eq chosen-alternative 2))
+                  (setcar session-file-object file2))
                  ((and f1-exists f2-exists)
                   (with-output-to-temp-buffer ediff-msg-buffer
                     (ediff-with-current-buffer standard-output
@@ -393,10 +425,15 @@ Please advice:
     Type `y' to use %s as the target;
     Type `n' to use %s as the target.
 "
-                                   file1 file2 file2 file1)))
+                                   file1 file2 file1 file2)))
                   (setcar session-file-object
-                          (if (y-or-n-p (format "Use %s ? " file2))
-                              file2 file1)))
+                          (if (y-or-n-p (format "Use %s ? " file1))
+                              (progn
+                                (setq chosen-alternative 1)
+                                file1)
+                            (setq chosen-alternative 2)
+                            file2))
+                  )
                  (f2-exists (setcar session-file-object file2))
                  (f1-exists (setcar session-file-object file1))
                  (t
@@ -407,7 +444,7 @@ Please advice:
                     (if (string= file1 file2)
                         (princ (format "
         %s
-is the target for this patch.  However, this file does not exist."
+is assumed to be the target for this patch.  However, this file does not exist."
                                        file1))
                       (princ (format "
         %s
@@ -441,22 +478,26 @@ are two possible targets for this patch.  However, these files do not exist."
 
 ;; prompt for file, get the buffer
 (defun ediff-prompt-for-patch-file ()
-  (let ((dir (cond (ediff-patch-default-directory) ; try patch default dir
-                   (ediff-use-last-dir ediff-last-dir-patch)
+  (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch)
+                   (ediff-patch-default-directory) ; try patch default dir
                    (t default-directory)))
-        (coding-system-for-read ediff-coding-system-for-read))
-    (find-file-noselect
-     (read-file-name
-      (format "Patch is in file:%s "
-              (cond ((and buffer-file-name
-                          (equal (expand-file-name dir)
-                                 (file-name-directory buffer-file-name)))
-                     (concat
-                      " (default "
-                      (file-name-nondirectory buffer-file-name)
-                      ")"))
-                    (t "")))
-      dir buffer-file-name 'must-match))
+        (coding-system-for-read ediff-coding-system-for-read)
+        patch-file-name)
+    (setq patch-file-name
+          (read-file-name
+           (format "Patch is in file%s: "
+                   (cond ((and buffer-file-name
+                               (equal (expand-file-name dir)
+                                      (file-name-directory buffer-file-name)))
+                          (concat
+                           " (default "
+                           (file-name-nondirectory buffer-file-name)
+                           ")"))
+                         (t "")))
+           dir buffer-file-name 'must-match))
+    (if (file-directory-p patch-file-name)
+        (error "Patch file cannot be a directory: %s" patch-file-name)
+      (find-file-noselect patch-file-name))
     ))
 
 
@@ -647,7 +688,7 @@ optional argument, then use it."
     (ediff-maybe-checkout buf-to-patch)
 
     (ediff-with-current-buffer patch-diagnostics
-      (insert-buffer patch-buf)
+      (insert-buffer-substring patch-buf)
       (message "Applying patch ... ")
       ;; fix environment for gnu patch, so it won't make numbered extensions
       (setq backup-style (getenv "VERSION_CONTROL"))
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index a28f9d459ff..9ab24ce5f64 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -367,7 +367,7 @@ to invocation.")
                    (ediff-unique-buffer-name "*ediff-merge" "*")))
             (save-excursion
               (set-buffer buffer-C)
-              (insert-buffer buf)
+              (insert-buffer-substring buf)
               (funcall (ediff-with-current-buffer buf major-mode))
               (widen) ; merge buffer is always widened
               (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
@@ -2111,7 +2111,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
     (if this-buf-n-th-diff-saved
         (if (yes-or-no-p
              (format
-              "You've previously copied diff region %d to buffer %S.  Confirm "
+              "You've previously copied diff region %d to buffer %S.  Confirm? "
               (1+ n) buf-type))
             t
           (error "Quit"))
@@ -2219,18 +2219,18 @@ a regular expression typed in by the user."
             regexp-A
             (read-string
              (format
-              "Ignore A-regions matching this regexp (default \"%s\"): "
+              "Ignore A-regions matching this regexp (default %s): "
               ediff-regexp-hide-A))
             regexp-B
             (read-string
              (format
-              "Ignore B-regions matching this regexp (default \"%s\"): "
+              "Ignore B-regions matching this regexp (default %s): "
               ediff-regexp-hide-B)))
       (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
                  (format
-                  "Ignore C-regions matching this regexp (default \"%s\"): "
+                  "Ignore C-regions matching this regexp (default %s): "
                   ediff-regexp-hide-C))))
       (if (eq ediff-hide-regexp-connective 'and)
           (setq msg-connective "BOTH"
@@ -2258,18 +2258,18 @@ a regular expression typed in by the user."
             regexp-A
             (read-string
              (format
-              "Focus on A-regions matching this regexp (default \"%s\"): "
+              "Focus on A-regions matching this regexp (default %s): "
               ediff-regexp-focus-A))
             regexp-B
             (read-string
              (format
-              "Focus on B-regions matching this regexp (default \"%s\"): "
+              "Focus on B-regions matching this regexp (default %s): "
               ediff-regexp-focus-B)))
       (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
                  (format
-                  "Focus on C-regions matching this regexp (default \"%s\"): "
+                  "Focus on C-regions matching this regexp (default %s): "
                   ediff-regexp-focus-C))))
       (if (eq ediff-focus-regexp-connective 'and)
           (setq msg-connective "BOTH"
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 9ae720e9bc3..f1f2305de81 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -299,7 +299,10 @@
           ((eq type 'MODIFIED)
            (ediff-buffers
             (find-file-noselect tmp-file)
-            (find-file-noselect (cvs-fileinfo->full-path fileinfo))
+            (if (featurep 'xemacs)
+                ;; XEmacs doesn't seem to have cvs-fileinfo->full-name
+                (find-file-noselect (cvs-fileinfo->full-path fileinfo))
+              (find-file-noselect (cvs-fileinfo->full-name fileinfo)))
             nil ; startup-hooks
             'ediff-revisions)))
     (if (stringp tmp-file) (delete-file tmp-file))
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 35b28a3e550..8d4bb4d86fe 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.80" "The current version of Ediff")
-(defconst ediff-date "July 8, 2005" "Date of last update")
+(defconst ediff-version "2.80.1" "The current version of Ediff")
+(defconst ediff-date "September 19, 2005" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -1261,13 +1261,13 @@ buffer."
     (setq rev1
           (read-string
            (format
-            "Version 1 to merge (default: %s's working version): "
+            "Version 1 to merge (default %s's working version): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer")))
           rev2
           (read-string
            (format
-            "Version 2 to merge (default: %s): "
+            "Version 2 to merge (default %s): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer"))))
     (ediff-load-version-control)
@@ -1293,19 +1293,19 @@ buffer."
     (setq rev1
           (read-string
            (format
-            "Version 1 to merge (default: %s's working version): "
+            "Version 1 to merge (default %s's working version): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer")))
           rev2
           (read-string
            (format
-            "Version 2 to merge (default: %s): "
+            "Version 2 to merge (default %s): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer")))
           ancestor-rev
           (read-string
            (format
-            "Ancestor version (default: %s's base revision): "
+            "Ancestor version (default %s's base revision): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer"))))
     (ediff-load-version-control)
@@ -1411,11 +1411,11 @@ Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
   (let (rev1 rev2)
     (setq rev1
           (read-string
-           (format "Revision 1 to compare (default: %s's latest revision): "
+           (format "Revision 1 to compare (default %s's latest revision): "
                    (file-name-nondirectory file)))
           rev2
           (read-string
-           (format "Revision 2 to compare (default: %s's current state): "
+           (format "Revision 2 to compare (default %s's current state): "
                    (file-name-nondirectory file))))
     (ediff-load-version-control)
     (funcall
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 480c838b878..ce727c30d14 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2218,7 +2218,7 @@ which PREDICATE returns non-nil)."
   (let* ((ad-pReDiCaTe predicate)
          (function
           (completing-read
-           (format "%s(default %s) " (or prompt "Function: ") default)
+           (format "%s (default %s): " (or prompt "Function") default)
            ad-advised-functions
            (if predicate
                (function
@@ -2250,7 +2250,7 @@ class of FUNCTION)."
                   (ad-do-return class)))
             (error "ad-read-advice-class: `%s' has no advices" function)))
   (let ((class (completing-read
-                (format "%s(default %s) " (or prompt "Class: ") default)
+                (format "%s (default %s): " (or prompt "Class") default)
                 ad-advice-class-completion-table nil t)))
     (if (equal class "")
         default
@@ -2268,7 +2268,7 @@ An optional PROMPT is used to prompt for the name."
                (error "ad-read-advice-name: `%s' has no %s advice"
                       function class)
              (car (car name-completion-table))))
-         (prompt (format "%s(default %s) " (or prompt "Name: ") default))
+         (prompt (format "%s (default %s): " (or prompt "Name") default))
          (name (completing-read prompt name-completion-table nil t)))
     (if (equal name "")
         (intern default)
@@ -2289,9 +2289,9 @@ be used to prompt for the function."
 (defun ad-read-regexp (&optional prompt)
   "Read a regular expression from the minibuffer."
   (let ((regexp (read-from-minibuffer
-                 (concat (or prompt "Regular expression: ")
-                         (if (equal ad-last-regexp "") ""
-                           (format "(default \"%s\") " ad-last-regexp))))))
+                 (concat (or prompt "Regular expression")
+                         (if (equal ad-last-regexp "") ": "
+                           (format " (default %s): " ad-last-regexp))))))
     (setq ad-last-regexp
           (if (equal regexp "") ad-last-regexp regexp))))
 
@@ -2352,7 +2352,7 @@ FUNCTION was not advised)."
 
 (defun ad-enable-advice (function class name)
   "Enables the advice of FUNCTION with CLASS and NAME."
-  (interactive (ad-read-advice-specification "Enable advice of: "))
+  (interactive (ad-read-advice-specification "Enable advice of"))
   (if (ad-is-advised function)
       (if (eq (ad-enable-advice-internal function class name t) 0)
           (error "ad-enable-advice: `%s' has no %s advice matching `%s'"
@@ -2361,7 +2361,7 @@ FUNCTION was not advised)."
 
 (defun ad-disable-advice (function class name)
   "Disable the advice of FUNCTION with CLASS and NAME."
-  (interactive (ad-read-advice-specification "Disable advice of: "))
+  (interactive (ad-read-advice-specification "Disable advice of"))
   (if (ad-is-advised function)
       (if (eq (ad-enable-advice-internal function class name nil) 0)
           (error "ad-disable-advice: `%s' has no %s advice matching `%s'"
@@ -2385,7 +2385,7 @@ affected advices will be returned."
   "Enables all advices with names that contain a match for REGEXP.
 All currently advised functions will be considered."
   (interactive
-   (list (ad-read-regexp "Enable advices via regexp: ")))
+   (list (ad-read-regexp "Enable advices via regexp")))
   (let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
     (if (interactive-p)
         (message "%d matching advices enabled" matched-advices))
@@ -2395,7 +2395,7 @@ All currently advised functions will be considered."
   "Disable all advices with names that contain a match for REGEXP.
 All currently advised functions will be considered."
   (interactive
-   (list (ad-read-regexp "Disable advices via regexp: ")))
+   (list (ad-read-regexp "Disable advices via regexp")))
   (let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
     (if (interactive-p)
         (message "%d matching advices disabled" matched-advices))
@@ -2405,7 +2405,7 @@ All currently advised functions will be considered."
   "Remove FUNCTION's advice with NAME from its advices in CLASS.
 If such an advice was found it will be removed from the list of advices
 in that CLASS."
-  (interactive (ad-read-advice-specification "Remove advice of: "))
+  (interactive (ad-read-advice-specification "Remove advice of"))
   (if (ad-is-advised function)
       (let* ((advice-to-remove (ad-find-advice function class name)))
         (if advice-to-remove
@@ -3285,7 +3285,7 @@ should be modified.  The assembled function will be returned."
 Clear the cache if you want to force `ad-activate' to construct a new
 advised definition from scratch."
   (interactive
-   (list (ad-read-advised-function "Clear cached definition of: ")))
+   (list (ad-read-advised-function "Clear cached definition of")))
   (ad-set-advice-info-field function 'cache nil))
 
 (defun ad-make-cache-id (function)
@@ -3602,7 +3602,7 @@ an advised function that has actual pieces of advice but none of them are
 enabled is equivalent to a call to `ad-deactivate'.  The current advised
 definition will always be cached for later usage."
   (interactive
-   (list (ad-read-advised-function "Activate advice of: ")
+   (list (ad-read-advised-function "Activate advice of")
          current-prefix-arg))
   (if ad-activate-on-top-level
       ;; avoid recursive calls to `ad-activate':
@@ -3632,7 +3632,7 @@ definition of FUNCTION will be replaced with it.  All the advice
 information will still be available so it can be activated again with
 a call to `ad-activate'."
   (interactive
-   (list (ad-read-advised-function "Deactivate advice of: " 'ad-is-active)))
+   (list (ad-read-advised-function "Deactivate advice of" 'ad-is-active)))
   (if (not (ad-is-advised function))
       (error "ad-deactivate: `%s' is not advised" function)
     (cond ((ad-is-active function)
@@ -3650,7 +3650,7 @@ a call to `ad-activate'."
 See `ad-activate' for documentation on the optional COMPILE argument."
   (interactive
    (list (ad-read-advised-function
-          "Update advised definition of: " 'ad-is-active)))
+          "Update advised definition of" 'ad-is-active)))
   (if (ad-is-active function)
       (ad-activate function compile)))
 
@@ -3658,7 +3658,7 @@ See `ad-activate' for documentation on the optional COMPILE argument."
   "Deactivate FUNCTION and then remove all its advice information.
 If FUNCTION was not advised this will be a noop."
   (interactive
-   (list (ad-read-advised-function "Unadvise function: ")))
+   (list (ad-read-advised-function "Unadvise function")))
   (cond ((ad-is-advised function)
          (if (ad-is-active function)
              (ad-deactivate function))
@@ -3689,7 +3689,7 @@ This activates the advice for each function
 that has at least one piece of advice whose name includes a match for REGEXP.
 See `ad-activate' for documentation on the optional COMPILE argument."
   (interactive
-   (list (ad-read-regexp "Activate via advice regexp: ")
+   (list (ad-read-regexp "Activate via advice regexp")
          current-prefix-arg))
   (ad-do-advised-functions (function)
     (if (ad-find-some-advice function 'any regexp)
@@ -3700,7 +3700,7 @@ See `ad-activate' for documentation on the optional COMPILE argument."
 This deactivates the advice for each function
 that has at least one piece of advice whose name includes a match for REGEXP."
   (interactive
-   (list (ad-read-regexp "Deactivate via advice regexp: ")))
+   (list (ad-read-regexp "Deactivate via advice regexp")))
   (ad-do-advised-functions (function)
     (if (ad-find-some-advice function 'any regexp)
         (ad-deactivate function))))
@@ -3711,7 +3711,7 @@ This reactivates the advice for each function
 that has at least one piece of advice whose name includes a match for REGEXP.
 See `ad-activate' for documentation on the optional COMPILE argument."
   (interactive
-   (list (ad-read-regexp "Update via advice regexp: ")
+   (list (ad-read-regexp "Update via advice regexp")
          current-prefix-arg))
   (ad-do-advised-functions (function)
     (if (ad-find-some-advice function 'any regexp)
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 913ffcf1941..bab50a1c822 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1585,7 +1585,7 @@ mouse-[0-3]\\)\\)\\>"))
                      ;; a prefix.
                      (let ((disambiguate
                             (completing-read
-                             "Disambiguating Keyword (default: variable): "
+                             "Disambiguating Keyword (default variable): "
                              '(("function") ("command") ("variable")
                                ("option") ("symbol"))
                              nil t nil nil "variable")))
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 58b12376b05..2b47b139759 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -754,7 +754,7 @@ To specify a nil argument interactively, exit with an empty minibuffer."
   (interactive
    (list (let ((name
                 (completing-read
-                 "Cancel debug on entry to function (default: all functions): "
+                 "Cancel debug on entry to function (default all functions): "
                  (mapcar 'symbol-name debug-function-list) nil t)))
            (when name
              (unless (string= name "")
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 51fbdb6b8c4..b07c634d9b4 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -893,7 +893,7 @@ is the name of the register for COM."
 each line in the region."
   (setq vip-quote-string
         (let ((str
-               (vip-read-string (format "quote string \(default \"%s\"\): "
+               (vip-read-string (format "quote string (default %s): "
                                         vip-quote-string))))
           (if (string= str "") vip-quote-string str)))
   (vip-enlarge-region (point) (mark))
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 99a130e7f1d..398c47d4784 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -358,7 +358,7 @@
                                           'viper-insertion-ring))
 
                 (if viper-ESC-moves-cursor-back
-                    (or (bolp) (backward-char 1))))
+                    (or (bolp) (viper-beginning-of-field) (backward-char 1))))
                ))
 
         ;; insert or replace
@@ -1996,7 +1996,8 @@ Undo previous insertion and inserts new."
 ;;; Minibuffer business
 
 (defsubst viper-set-minibuffer-style ()
-  (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel))
+  (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)
+  (add-hook 'post-command-hook 'viper-minibuffer-post-command-hook))
 
 
 (defun viper-minibuffer-setup-sentinel ()
@@ -2039,6 +2040,11 @@ Undo previous insertion and inserts new."
       (minibuffer-prompt-end)
     (point-min)))
 
+(defun viper-minibuffer-post-command-hook()
+  (when (active-minibuffer-window)
+    (when (< (point) (viper-minibuffer-real-start))
+      (goto-char (viper-minibuffer-real-start)))))
+
 
 ;; Interpret last event in the local map first; if fails, use exit-minibuffer.
 ;; Run viper-minibuffer-exit-hook before exiting.
@@ -2154,7 +2160,7 @@ problems."
     (setq keymap (or keymap minibuffer-local-map)
           initial (or initial "")
           temp-msg (if default
-                       (format "(default: %s) " default)
+                       (format "(default %s) " default)
                      ""))
 
     (setq viper-incomplete-ex-cmd nil)
@@ -2570,7 +2576,7 @@ These keys are ESC, RET, and LineFeed"
     ;; last line of buffer when this line has no \n.
     (viper-add-newline-at-eob-if-necessary)
     (viper-execute-com 'viper-line val com))
-  (if (and (eobp) (not (bobp))) (forward-line -1))
+  (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
   )
 
 (defun viper-yank-line (arg)
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 9c1df1b0ad5..8aa7e4649d4 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -115,6 +115,11 @@ In all likelihood, you don't need to bother with this setting."
 
 ;;; Macros
 
+;; Fool the compiler to avoid warnings.
+;; Viper calls make-variable-buffer-local from within other functions, which
+;; triggers compiler warnings.
+(defalias 'viper-make-variable-buffer-local 'make-variable-buffer-local)
+
 (defmacro viper-deflocalvar (var default-value &optional documentation)
   `(progn
     (defvar ,var ,default-value
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 9349a950e97..d401c148ad6 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -118,7 +118,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
       (define-key viper-vi-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
       (define-key viper-insert-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
       (define-key viper-emacs-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
-      (message "Mapping %S in %s state.  Hit `C-x )' to complete the mapping"
+      (message "Mapping %S in %s state.  Type macro definition followed by `C-x )'"
                (viper-display-macro macro-name)
                (if ins "Insert" "Vi")))
     ))
@@ -170,7 +170,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
               ((stringp macro-name)
                (setq macro-name (vconcat macro-name)))
               (t (setq macro-name (vconcat (prin1-to-string macro-name)))))
-      (message ":map%s <Name>" variant)(sit-for 2)
+      (message ":map%s <Macro Name>" variant)(sit-for 2)
       (while
           (not (member key
                        '(?\C-m ?\n (control m) (control j) return linefeed)))
@@ -442,10 +442,6 @@ If SCOPE is nil, the user is asked to specify the scope."
                        scope)
                viper-custom-file-name))
 
-          ;; 2005-09-18 T06:41:22-0400 (Sunday)    D. Goel
-          ;; From careful parsing of the above code, it looks like msg
-          ;; couldn't be nil when we reach here. Since it is a string,
-          ;; and a complicated one too, we might as well provide it a "%s"
           (message "%s" msg)
           ))
 
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index cc9f42b9800..d0b9b34e4d6 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1405,6 +1405,7 @@ This option is appropriate if you like Emacs-style words."
                        viper-SEP-char-class
                        (or within-line "\n")
                        (if within-line (viper-line-pos 'end)))))
+
 (defsubst viper-skip-all-separators-backward (&optional within-line)
   (if (eq viper-syntax-preference 'strict-vi)
       (if within-line
@@ -1433,6 +1434,7 @@ This option is appropriate if you like Emacs-style words."
      ;; Emacs may consider some of these as words, but we don't want them
      viper-non-word-characters
      (viper-line-pos 'end))))
+
 (defun viper-skip-nonalphasep-backward ()
   (if (eq viper-syntax-preference 'strict-vi)
       (skip-chars-backward
@@ -1502,6 +1504,12 @@ This option is appropriate if you like Emacs-style words."
     total
     ))
 
+;; tells when point is at the beginning of field
+(defun viper-beginning-of-field ()
+  (or (bobp)
+      (not (eq (get-char-property (point) 'field)
+               (get-char-property (1- (point)) 'field)))))
+
 
 ;; this is copied from cl-extra.el
 ;; Return the subsequence of SEQ from START to END.
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index bfa730cc434..b3fd6d139c0 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.11.5 of August 6, 2005"
+(defconst viper-version "3.11.5 of September 19, 2005"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -606,7 +606,7 @@ This startup message appears whenever you load Viper, unless you type `y' now."
               (viper-set-expert-level 'dont-change-unless)))
 
         (if viper-xemacs-p
-            (make-variable-buffer-local 'bar-cursor))
+            (viper-make-variable-buffer-local 'bar-cursor))
         (if (eq major-mode 'viper-mode)
             (setq major-mode 'fundamental-mode))
 
@@ -769,6 +769,7 @@ It also can't undo some Viper settings."
   (remove-hook 'comint-mode-hook 'viper-comint-mode-hook)
   (remove-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)
   (remove-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel)
+  (remove-hook 'post-command-hook 'viper-minibuffer-post-command-hook)
 
   ;; unbind Viper mouse bindings
   (viper-unbind-mouse-search-key)
@@ -1008,7 +1009,7 @@ It also can't undo some Viper settings."
   ;; ***This is needed only in case emulation-mode-map-alists is not defined
   (unless
       (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
-    (make-variable-buffer-local 'minor-mode-map-alist))
+    (viper-make-variable-buffer-local 'minor-mode-map-alist))
 
   ;; Viper changes the default mode-line-buffer-identification
   (setq-default mode-line-buffer-identification '(" %b"))
@@ -1017,7 +1018,7 @@ It also can't undo some Viper settings."
   (setq next-line-add-newlines nil
         require-final-newline t)
 
-  (make-variable-buffer-local 'require-final-newline)
+  (viper-make-variable-buffer-local 'require-final-newline)
 
   ;; don't bark when mark is inactive
   (if viper-emacs-p
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d8529fc1fb6..1604e130e3d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1061,7 +1061,8 @@ a very meaningful entity to highlight.")
                                              'font-lock-multiline nil)
                           (point-max))))
           (goto-char end)
-          (setq end (line-beginning-position 2))
+          ;; Round up to a whole line.
+          (unless (bolp) (setq end (line-beginning-position 2)))
           ;; Now do the fontification.
           (font-lock-unfontify-region beg end)
           (when font-lock-syntactic-keywords
@@ -1073,12 +1074,12 @@ a very meaningful entity to highlight.")
       (set-syntax-table old-syntax-table))))
 
 ;; The following must be rethought, since keywords can override fontification.
-;      ;; Now scan for keywords, but not if we are inside a comment now.
-;      (or (and (not font-lock-keywords-only)
-;              (let ((state (parse-partial-sexp beg end nil nil
-;                                               font-lock-cache-state)))
-;                (or (nth 4 state) (nth 7 state))))
-;         (font-lock-fontify-keywords-region beg end))
+;;    ;; Now scan for keywords, but not if we are inside a comment now.
+;;    (or (and (not font-lock-keywords-only)
+;;             (let ((state (parse-partial-sexp beg end nil nil
+;;                                              font-lock-cache-state)))
+;;               (or (nth 4 state) (nth 7 state))))
+;;        (font-lock-fontify-keywords-region beg end))
 
 (defvar font-lock-extra-managed-props nil
   "Additional text properties managed by font-lock.
diff --git a/lisp/format.el b/lisp/format.el
index dd6b2d215ce..fb242b9a143 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -307,7 +307,7 @@ If the format is not specified, this function attempts to guess.
 `buffer-file-format' is set to the format used, and any mode-functions
 for the format are called."
   (interactive
-   (list (format-read "Translate buffer from format (default: guess): ")))
+   (list (format-read "Translate buffer from format (default guess): ")))
   (save-excursion
     (goto-char (point-min))
     (format-decode format (buffer-size) t)))
@@ -318,7 +318,7 @@ Arg FORMAT is optional; if omitted the format will be determined by looking
 for identifying regular expressions at the beginning of the region."
   (interactive
    (list (region-beginning) (region-end)
-         (format-read "Translate region from format (default: guess): ")))
+         (format-read "Translate region from format (default guess): ")))
   (save-excursion
     (goto-char from)
     (format-decode format (- to from) nil)))
diff --git a/lisp/forms.el b/lisp/forms.el
index 419a6fa3778..e7282ee0ea5 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -519,7 +519,7 @@ Commands:                        Equivalent keys in read-only mode:
         (if (or (eq enable-local-eval t)
                 (yes-or-no-p
                  (concat "Evaluate lisp code in buffer "
-                         (buffer-name) " to display forms ")))
+                         (buffer-name) " to display forms? ")))
             (eval-buffer)
           (error "`enable-local-eval' inhibits buffer evaluation"))
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 08fd723cf1f..44675cdacd0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,49 @@
+2005-09-25  Romain Francoise  <romain@orebokech.com>
+
+        * gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire):
+        * gnus-start.el (gnus-subscribe-interactively):
+        * gnus-uu.el (gnus-uu-grab-articles):
+        End `yes-or-no-p' and `y-or-n-p' prompts with question mark and
+        space.
+
+2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
+
+        * smime.el (smime-sign-buffer, smime-decrypt-buffer):
+        * mm-view.el (mm-view-pkcs7-decrypt):
+        * gnus-sum.el (gnus-summary-limit-to-extra)
+        (gnus-summary-respool-article, gnus-read-move-group-name):
+        * gnus-score.el (gnus-summary-increase-score):
+        * gnus-util.el (gnus-completing-read-with-default):
+        * gnus-art.el (gnus-read-save-file-name)
+        (gnus-summary-save-in-rmail, gnus-summary-save-in-mail)
+        (gnus-summary-save-in-file, gnus-summary-save-body-in-file):
+        * message.el (message-check-news-header-syntax):
+        Follow convention for reading with the minibuffer.
+
+2005-09-22  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam-report.el (spam-report-url-ping-plain): Use
+        gnus-extended-version as User-Agent.
+
+        * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the
+        default value is nil.
+
+2005-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-agent.el (gnus-agent-synchronize-flags): Switch the
+        default to nil, to be able to use Gnus at all.  If the default
+        switches to something else, then the function should be fixed not
+        be exceedingly slow.
+
+2005-09-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mm-url.el (mm-url-decode-entities): Fix regexp.
+
 2005-09-18  D Goel  <deego@gnufans.org>
 
         * sieve.el (sieve-help): Fix `message' call: first arg should be a
         format spec.
-        
+
 2005-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.el (gnus-group-startup-message): Bind image-load-path.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 47d1dfd7364..0357ddd18cb 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -118,6 +118,8 @@ If nil, only read articles will be expired."
 (defcustom gnus-agent-synchronize-flags t
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
+  ;; If the default switches to something else than nil, then the function
+  ;; should be fixed not be exceedingly slow.  See 2005-09-20 ChangeLog entry.
   :version "21.1"
   :type '(choice (const :tag "Always" t)
                  (const :tag "Never" nil)
@@ -2934,7 +2936,7 @@ FORCE is equivalent to setting the expiration predicates to true."
       (if (or (not (eq articles t))
               (yes-or-no-p
                (concat "Are you sure that you want to "
-                       "expire all articles in " group ".")))
+                       "expire all articles in " group "? ")))
           (let ((gnus-command-method (gnus-find-method-for-group group))
                 (overview (gnus-get-buffer-create " *expire overview*"))
                 orig)
@@ -3308,7 +3310,7 @@ FORCE is equivalent to setting the expiration predicates to true."
       (gnus-agent-expire-group group articles force)
     (if (or (not (eq articles t))
             (yes-or-no-p "Are you sure that you want to expire all \
-articles in every agentized group."))
+articles in every agentized group? "))
         (let ((methods (gnus-agent-covered-methods))
               ;; Bind gnus-agent-expire-current-dirs to enable tracking
               ;; of agent directories.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 3821f9ecf18..4957d3ae98b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3255,7 +3255,7 @@ This format is defined by the `gnus-article-time-format' variable."
                       ((null split-name)
                        (read-file-name
                         (concat prompt " (default "
-                                (file-name-nondirectory default-name) ") ")
+                                (file-name-nondirectory default-name) "): ")
                         (file-name-directory default-name)
                         default-name))
                       ;; A single group name is returned.
@@ -3265,7 +3265,7 @@ This format is defined by the `gnus-article-time-format' variable."
                                       (symbol-value variable)))
                        (read-file-name
                         (concat prompt " (default "
-                                (file-name-nondirectory default-name) ") ")
+                                (file-name-nondirectory default-name) "): ")
                         (file-name-directory default-name)
                         default-name))
                       ;; A single split name was found
@@ -3278,7 +3278,7 @@ This format is defined by the `gnus-article-time-format' variable."
                                          ((file-exists-p name) name)
                                          (t gnus-article-save-directory))))
                          (read-file-name
-                          (concat prompt " (default " name ") ")
+                          (concat prompt " (default " name "): ")
                           dir name)))
                       ;; A list of splits was found.
                       (t
@@ -3289,7 +3289,7 @@ This format is defined by the `gnus-article-time-format' variable."
                            (setq result
                                  (expand-file-name
                                   (read-file-name
-                                   (concat prompt " (`M-p' for defaults) ")
+                                   (concat prompt " (`M-p' for defaults): ")
                                    gnus-article-save-directory
                                    (car split-name))
                                   gnus-article-save-directory)))
@@ -3323,7 +3323,7 @@ This format is defined by the `gnus-article-time-format' variable."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in rmail file:" filename
+                  "Save %s in rmail file" filename
                   gnus-rmail-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-rmail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3338,7 +3338,7 @@ Directory to save to is default to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in Unix mail file:" filename
+                  "Save %s in Unix mail file" filename
                   gnus-mail-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-mail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3357,7 +3357,7 @@ Directory to save to is default to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in file:" filename
+                  "Save %s in file" filename
                   gnus-file-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3381,7 +3381,7 @@ The directory to save in defaults to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 The directory to save in defaults to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s body in file:" filename
+                  "Save %s body in file" filename
                   gnus-file-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index e866f7f32fc..22a579c3d69 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -652,7 +652,7 @@ file for the command instead of the current score file."
                (intern                  ; need symbol
                 (gnus-completing-read-with-default
                  (symbol-name (car gnus-extra-headers)) ; default response
-                 "Score extra header:"  ; prompt
+                 "Score extra header"   ; prompt
                  (mapcar (lambda (x)    ; completion list
                            (cons (symbol-name x) x))
                          gnus-extra-headers)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index e30faa85c7f..0eb66bb824e 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -608,7 +608,7 @@ Can be used to turn version control on or off."
   "Subscribe the new GROUP interactively.
 It is inserted in hierarchical newsgroup order if subscribed.  If not,
 it is killed."
-  (if (gnus-y-or-n-p (format "Subscribe new newsgroup: %s " group))
+  (if (gnus-y-or-n-p (format "Subscribe new newsgroup %s? " group))
       (gnus-subscribe-hierarchically group)
     (push group gnus-killed-list)))
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 88fe21fd5a2..c9e93d19f42 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7696,8 +7696,8 @@ articles that are younger than AGE days."
            (gnus-completing-read-with-default
             (symbol-name (car gnus-extra-headers))
             (if current-prefix-arg
-                "Exclude extra header:"
-              "Limit extra header:")
+                "Exclude extra header"
+              "Limit extra header")
             (mapcar (lambda (x)
                       (cons (symbol-name x) x))
                     gnus-extra-headers)
@@ -9218,7 +9218,7 @@ latter case, they will be copied into the relevant groups."
                                         gnus-newsgroup-name)))))
                 (method
                  (gnus-completing-read-with-default
-                  methname "What backend do you want to use when respooling?"
+                  methname "Backend to use when respooling"
                   methods nil t nil 'gnus-mail-method-history))
                 ms)
            (cond
@@ -11044,7 +11044,7 @@ save those articles instead."
   (let* ((split-name (gnus-get-split-value gnus-move-split-methods))
          (minibuffer-confirm-incomplete nil) ; XEmacs
          (prom
-          (format "%s %s to:"
+          (format "%s %s to"
                   prompt
                   (if (> (length articles) 1)
                       (format "these %d articles" (length articles))
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 4c1721029be..5556a815d2a 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -335,8 +335,8 @@ is slower."
 (defun gnus-completing-read-with-default (default prompt &rest args)
   ;; Like `completing-read', except that DEFAULT is the default argument.
   (let* ((prompt (if default
-                     (concat prompt " (default " default ") ")
-                   (concat prompt " ")))
+                     (concat prompt " (default " default "): ")
+                   (concat prompt ": ")))
          (answer (apply 'completing-read prompt args)))
     (if (or (null answer) (zerop (length answer)))
         default
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index a2f3f353a05..01f21887aee 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -1294,7 +1294,7 @@ When called interactively, prompt for REGEXP."
                        (not gnus-uu-be-dangerous)
                        (or (eq gnus-uu-be-dangerous t)
                            (gnus-y-or-n-p
-                            (format "Delete unsuccessfully decoded file %s"
+                            (format "Delete unsuccessfully decoded file %s? "
                                     result-file))))
               (delete-file result-file)))
           (when (memq 'begin process-state)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 75554a6079c..943e272867a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4197,7 +4197,7 @@ Otherwise, generate and save a value for `canlock-password' first."
                    (zerop
                     (length
                      (setq to (completing-read
-                               "Followups to (default: no Followup-To header) "
+                               "Followups to (default no Followup-To header): "
                                (mapcar #'list
                                        (cons "poster"
                                              (message-tokenize-header
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 961ee0ea4fb..4fd39e477f6 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -365,7 +365,7 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
 (defun mm-url-decode-entities ()
   "Decode all HTML entities."
   (goto-char (point-min))
-  (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
+  (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+[0-9]*\\);" nil t)
     (let ((elem (if (eq (aref (match-string 1) 0) ?\#)
                         (let ((c
                                (string-to-number (substring
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index ac408aa179f..dec03bf0b9c 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -576,9 +576,10 @@
        (cadar smime-keys)
      (smime-get-key-by-email
       (gnus-completing-read-maybe-default
-       (concat "Decipher using which key? "
-               (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                 ""))
+       (concat "Decipher using key"
+               (if smime-keys
+                   (concat " (default " (caar smime-keys) "): ")
+                 ": "))
        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 485cf177154..22489affa89 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -341,9 +341,10 @@ KEYFILE should contain a PEM encoded key and certificate."
                  keyfile
                (smime-get-key-with-certs-by-email
                 (completing-read
-                 (concat "Sign using which key? "
-                         (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                           ""))
+                 (concat "Sign using key"
+                         (if smime-keys
+                             (concat " (default " (caar smime-keys) "): ")
+                           ": "))
                  smime-keys nil nil (car-safe (car-safe smime-keys))))))
       (error "Signing failed"))))
 
@@ -472,9 +473,9 @@ in the buffer specified by `smime-details-buffer'."
       (or keyfile
           (smime-get-key-by-email
            (completing-read
-            (concat "Decipher using which key? "
-                    (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                      ""))
+            (concat "Decipher using key"
+                    (if smime-keys (concat " (default " (caar smime-keys) "): ")
+                      ": "))
             smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 173306ec55e..293a41d7b60 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -150,7 +150,7 @@ the function specified by `spam-report-url-ping-function'."
       (process-send-string
        tcp-connection
        (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n"
-               report (gnus-emacs-version) host)))))
+               report (gnus-extended-version) host)))))
 
 ;;;###autoload
 (defun spam-report-process-queue (&optional file keep)
diff --git a/lisp/ido.el b/lisp/ido.el
index 7c9d269417a..2d62f6c74ef 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2138,7 +2138,7 @@ If INITIAL is non-nil, it specifies the initial input string."
               (ido-record-command method dirname)
               (ido-record-work-directory)
               (funcall method dirname))
-             ((y-or-n-p (format "Directory %s does not exist. Create it " filename))
+             ((y-or-n-p (format "Directory %s does not exist. Create it? " filename))
               (ido-record-command method dirname)
               (ido-record-work-directory dirname)
               (make-directory-internal dirname)
@@ -3529,7 +3529,7 @@ for first matching file."
                (file-exists-p file)
                (not (file-directory-p file))
                (file-writable-p ido-current-directory)
-               (yes-or-no-p (concat "Delete " file " ")))
+               (yes-or-no-p (concat "Delete " file "? ")))
       (delete-file file)
       ;; Check if file still exists.
       (if (file-exists-p file)
diff --git a/lisp/info.el b/lisp/info.el
index 4c40e187c03..7868125b9b0 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1569,11 +1569,11 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
 If DIRECTION is `backward', search in the reverse direction."
   (interactive (list (read-string
                       (if Info-search-history
-                          (format "Regexp search%s (default `%s'): "
-                                  (if case-fold-search "" " case-sensitively")
+                          (format "Regexp search%s (default %s): "
+                                  (if case-fold-search "" " case-sensitively")
                                   (car Info-search-history))
                         (format "Regexp search%s: "
-                                (if case-fold-search "" " case-sensitively")))
+                                (if case-fold-search "" " case-sensitively")))
                       nil 'Info-search-history)))
   (when transient-mark-mode
     (deactivate-mark))
@@ -1757,11 +1757,11 @@ If DIRECTION is `backward', search in the reverse direction."
   "Search for REGEXP in the reverse direction."
   (interactive (list (read-string
                       (if Info-search-history
-                          (format "Regexp search%s backward (default `%s'): "
-                                  (if case-fold-search "" " case-sensitively")
+                          (format "Regexp search%s backward (default %s): "
+                                  (if case-fold-search "" " case-sensitively")
                                   (car Info-search-history))
                         (format "Regexp search%s backward: "
-                                (if case-fold-search "" " case-sensitively")))
+                                (if case-fold-search "" " case-sensitively")))
                       nil 'Info-search-history)))
   (Info-search regexp bound noerror count 'backward))
 
@@ -2107,8 +2107,8 @@ new buffer."
      (if completions
          (let ((input (completing-read (if default
                                            (concat
-                                            "Follow reference named: (default "
-                                            default ") ")
+                                            "Follow reference named (default "
+                                            default "): ")
                                          "Follow reference named: ")
                                        completions nil t)))
            (list (if (equal input "")
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index c297ce5e27b..b42ac755347 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -281,7 +281,7 @@ wrong, use this command again to toggle back to the right mode."
                        buffer-file-coding-system)))
      (list (read-coding-system
             (if default
-                (format "Coding system for following command (default, %s): " default)
+                (format "Coding system for following command (default %s): " default)
               "Coding system for following command: ")
             default))))
   (let* ((keyseq (read-key-sequence
@@ -596,7 +596,7 @@ or nil if all characters are encodable."
   (interactive
    (list (let ((default (or buffer-file-coding-system 'us-ascii)))
            (read-coding-system
-            (format "Coding-system (default, %s): " default)
+            (format "Coding-system (default %s): " default)
             default))))
   (let ((pos (unencodable-char-position (point) (point-max) coding-system)))
     (if pos
@@ -1452,7 +1452,7 @@ which marks the variable `default-input-method' as set for Custom buffers."
   "Describe input method INPUT-METHOD."
   (interactive
    (list (read-input-method-name
-          "Describe input method (default, current choice): ")))
+          "Describe input method (default current choice): ")))
   (if (and input-method (symbolp input-method))
       (setq input-method (symbol-name input-method)))
   (help-setup-xref (list #'describe-input-method
@@ -1740,7 +1740,7 @@ which is the name of a language environment.  For example, \"Latin-1\"
 specifies the character set for the major languages of Western Europe."
   (interactive (list (read-language-name
                       nil
-                      "Set language environment (default, English): ")))
+                      "Set language environment (default English): ")))
   (if language-name
       (if (symbolp language-name)
           (setq language-name (symbol-name language-name)))
@@ -1938,7 +1938,7 @@ of `buffer-file-coding-system' set by this function."
   (interactive
    (list (read-language-name
           'documentation
-          "Describe language environment (default, current choice): ")))
+          "Describe language environment (default current choice): ")))
   (if (null language-name)
       (setq language-name current-language-environment))
   (if (or (null language-name)
@@ -1966,7 +1966,7 @@ of `buffer-file-coding-system' set by this function."
               (l (copy-sequence input-method-alist)))
           (insert "Input methods")
           (when input-method
-            (insert " (default, " input-method ")")
+            (insert " (default " input-method ")")
             (setq input-method (assoc input-method input-method-alist))
             (setq l (cons input-method (delete input-method l))))
           (insert ":\n")
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index b26629ec551..8b0a25dbae0 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -419,7 +419,7 @@ detailed meanings of these arguments."
 ;;;###autoload
 (defun describe-coding-system (coding-system)
   "Display information about CODING-SYSTEM."
-  (interactive "zDescribe coding system (default, current choices): ")
+  (interactive "zDescribe coding system (default current choices): ")
   (if (null coding-system)
       (describe-current-coding-system)
     (help-setup-xref (list #'describe-coding-system coding-system)
@@ -831,7 +831,7 @@ but still contains full information about each coding system."
 ;;;###autoload
 (defun describe-font (fontname)
   "Display information about fonts which partially match FONTNAME."
-  (interactive "sFontname (default, current choice for ASCII chars): ")
+  (interactive "sFontname (default current choice for ASCII chars): ")
   (or (and window-system (fboundp 'fontset-list))
       (error "No fontsets being used"))
   (when (or (not fontname) (= (length fontname) 0))
@@ -921,7 +921,7 @@ This shows which font is used for which character(s)."
                           (mapcar 'cdr fontset-alias-alist)))
            (completion-ignore-case t))
        (list (completing-read
-              "Fontset (default, used by the current frame): "
+              "Fontset (default used by the current frame): "
               fontset-list nil t)))))
   (if (= (length fontset) 0)
       (setq fontset (frame-parameter nil 'font)))
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 52a98145534..322f432d8dc 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1139,7 +1139,7 @@ surely saves the buffer with CODING-SYSTEM.  From a program, if you
 don't want to mark the buffer modified, specify t for NOMODIFY.
 If you know exactly what coding system you want to use,
 just set the variable `buffer-file-coding-system' directly."
-  (interactive "zCoding system for saving file (default, nil): \nP")
+  (interactive "zCoding system for saving file (default nil): \nP")
   (check-coding-system coding-system)
   (if (and coding-system buffer-file-coding-system (null force))
       (setq coding-system
@@ -1163,7 +1163,7 @@ do.  If FORCE is nil, get the unspecified aspect (or aspects) from the
 buffer's previous `buffer-file-coding-system' value (if it is
 specified there).  Otherwise, determine it from the file contents as
 usual for visiting a file."
-  (interactive "zCoding system for visited file (default, nil): \nP")
+  (interactive "zCoding system for visited file (default nil): \nP")
   (check-coding-system coding-system)
   (if (and coding-system buffer-file-coding-system (null force))
       (setq coding-system
@@ -1175,7 +1175,7 @@ usual for visiting a file."
   "Set coding system for decoding and encoding file names to CODING-SYSTEM.
 It actually just set the variable `file-name-coding-system' (which
 see) to CODING-SYSTEM."
-  (interactive "zCoding system for file names (default, nil): ")
+  (interactive "zCoding system for file names (default nil): ")
   (check-coding-system coding-system)
   (if (and coding-system
            (not (coding-system-get coding-system :ascii-compatible-p))
@@ -1200,7 +1200,7 @@ or by the previous use of this command."
                                  default-terminal-coding-system)
                             default-terminal-coding-system)))
            (read-coding-system
-            (format "Coding system for terminal display (default, %s): "
+            (format "Coding system for terminal display (default %s): "
                     default)
             default))))
   (if (and (not coding-system)
@@ -1229,7 +1229,7 @@ or by the previous use of this command."
                                  default-keyboard-coding-system)
                             default-keyboard-coding-system)))
            (read-coding-system
-            (format "Coding system for keyboard input (default, %s): "
+            (format "Coding system for keyboard input (default %s): "
                     default)
             default))))
   (if (and (not coding-system)
@@ -1303,7 +1303,7 @@ This setting is effective for the next communication only."
   (interactive
    (list (read-coding-system
           (if last-next-selection-coding-system
-              (format "Coding system for the next selection (default, %S): "
+              (format "Coding system for the next selection (default %S): "
                       last-next-selection-coding-system)
             "Coding system for the next selection: ")
           last-next-selection-coding-system)))
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index ec797cbff15..ea22cd7fe38 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -897,7 +897,7 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
 The variable `quail-keyboard-layout-type' holds the currently selected
 keyboard type."
   (interactive
-   (list (completing-read "Keyboard type (default, current choice): "
+   (list (completing-read "Keyboard type (default current choice): "
                           quail-keyboard-layout-alist
                           nil t)))
   (or (and keyboard-type (> (length keyboard-type) 0))
diff --git a/lisp/locate.el b/lisp/locate.el
index cbf2e4866ab..390e0ec72b3 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -209,7 +209,7 @@ With prefix arg, prompt for the locate command to run."
                (input
                 (read-from-minibuffer
                  (if  (> (length default) 0)
-                     (format "Locate (default `%s'): " default)
+                     (format "Locate (default %s): " default)
                    (format "Locate: "))
                  nil nil nil 'locate-history-list default t)))
                (and (equal input "") default
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 4e179ef8bad..54249eb52e3 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -383,7 +383,7 @@ If you want to abort the commit, simply delete the buffer."
                        (equal (log-edit-files) log-edit-initial-files)))
              (progn
                (log-edit-show-files)
-               (not (y-or-n-p "Really commit ? "))))
+               (not (y-or-n-p "Really commit? "))))
         (progn (when (not win) (log-edit-hide-buf))
                (message "Oh, well!  Later maybe?"))
       (run-hooks 'log-edit-done-hook)
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 270d2cd6385..06af543b4da 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -528,7 +528,7 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
                       (default-directory (expand-file-name "~/"))
                       (def mail-personal-alias-file))
                   (read-file-name
-                    (format "Read additional aliases from file: (default %s) "
+                   (format "Read additional aliases from file (default %s): "
                             def)
                     default-directory
                     (expand-file-name def default-directory)
@@ -542,7 +542,7 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
                       (default-directory (expand-file-name "~/"))
                       (def mail-personal-alias-file))
                   (read-file-name
-                   (format "Read mail aliases from file: (default %s) " def)
+                   (format "Read mail aliases from file (default %s): " def)
                    default-directory
                    (expand-file-name def default-directory)
                    t))))
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
new file mode 100644
index 00000000000..eb12d97f576
--- /dev/null
+++ b/lisp/mail/mailclient.el
@@ -0,0 +1,174 @@
+;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
+
+;; Copyright (C) 2005 Free Software Foundation
+
+;; Author: David Reitter <david.reitter@gmail.com>
+;; Keywords: mail
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This package allows to hand over a buffer to be sent off 
+;; via the system's designated e-mail client. 
+;; Note that the e-mail client will display the contents of the buffer
+;; again for editing.
+;; The e-mail client is taken to be whoever handles a mailto: URL
+;; via `browse-url'. 
+;; Mailto: URLs are composed according to RFC2368.
+
+;; MIME bodies are not supported - we rather expect the mail client
+;; to encode the body and add, for example, a digital signature.
+;; The mailto URL RFC calls for "short text messages that are
+;; actually the content of automatic processing." 
+;; So mailclient.el is ideal for situations where an e-mail is
+;; generated automatically, and the user can edit it in the 
+;; mail client (e.g. bug-reports). 
+
+;; To activate:
+;; (setq send-mail-function 'mailclient-send-it) ; if you use `mail'
+
+;;; Code:
+
+
+(require 'sendmail)   ;; for mail-sendmail-undelimit-header
+(require 'mail-utils) ;; for mail-fetch-field
+
+(defcustom mailclient-place-body-on-clipboard-flag  
+  (fboundp 'w32-set-clipboard-data)
+  "If non-nil, put the e-mail body on the clipboard in mailclient.
+This is useful on systems where only short mailto:// URLs are 
+supported. Defaults to non-nil on Windows, nil otherwise."
+  :type 'boolean
+  :group 'mail)
+
+(defun mailclient-encode-string-as-url (string)
+  "Convert STRING to a URL, using utf-8 as encoding."
+  (apply (function concat)
+         (mapcar
+          (lambda (char)
+            (cond
+             ((eq char ?\x20) "%20")   ;; space
+             ((eq char ?\n) "%0D%0A")  ;; newline 
+             ((string-match "[-a-zA-Z0-9_:/.@]" (char-to-string char))
+              (char-to-string char))   ;; printable
+             (t                        ;; everything else
+              (format "%%%02x" char)))) ;; escape
+          ;; Convert string to list of chars
+          (append (encode-coding-string string 'utf-8)))))
+
+(defvar mailclient-delim-static "?")
+(defun mailclient-url-delim ()
+  (let ((current mailclient-delim-static))
+    (setq mailclient-delim-static "&") 
+    current))
+
+(defun mailclient-gather-addresses (str &optional drop-first-name)
+  (let ((field (mail-fetch-field str nil t)))
+    (if field
+        (save-excursion
+          (let ((first t) 
+                (result ""))
+            (mapc
+             (lambda (recp)
+               (setq result 
+                     (concat 
+                      result
+                      (if (and drop-first-name
+                               first)
+                          ""
+                        (concat (mailclient-url-delim) str "="))
+                      (mailclient-encode-string-as-url 
+                       recp)))
+               (setq first nil))
+             (split-string 
+              (mail-strip-quoted-names field) "\, *"))
+            result)))))
+
+;;;###autoload
+(defun mailclient-send-it () 
+  "Pass current buffer on to the system's mail client.
+Suitable value for `send-mail-function'.
+The mail client is taken to be the handler of mailto URLs."
+  (require 'mail-utils)
+  (let ((case-fold-search nil)
+        delimline
+        (mailbuf (current-buffer)))
+    (unwind-protect
+        (with-temp-buffer
+          (insert-buffer-substring mailbuf)
+          ;; Move to header delimiter
+          (mail-sendmail-undelimit-header)
+          (setq delimline (point-marker))
+          (if mail-aliases
+              (expand-mail-aliases (point-min) delimline))
+          (goto-char (point-min))
+          ;; ignore any blank lines in the header
+          (while (and (re-search-forward "\n\n\n*" delimline t)
+                      (< (point) delimline))
+            (replace-match "\n"))
+          (let ((case-fold-search t))  
+            ;; initialize limiter
+            (setq mailclient-delim-static "?")
+            ;; construct and call up mailto URL
+            (browse-url 
+             (concat 
+              (save-excursion
+                (narrow-to-region (point-min) delimline)
+                (concat 
+                 "mailto:"
+                 ;; some of the headers according to RFC822
+                 (mailclient-gather-addresses "To"   
+                                              'drop-first-name)          
+                 (mailclient-gather-addresses "cc"  )
+                 (mailclient-gather-addresses "bcc"  )
+                 (mailclient-gather-addresses "Resent-To"  )
+                 (mailclient-gather-addresses "Resent-cc"  )
+                 (mailclient-gather-addresses "Resent-bcc"  )
+                 (mailclient-gather-addresses "Reply-To"  )
+                 ;; The From field is not honored for now: it's
+                 ;; not necessarily configured. The mail client
+                 ;; knows the user's address(es)
+                 ;; (mailclient-gather-addresses "From"  )
+                 ;; subject line
+                 (let ((subj (mail-fetch-field "Subject" nil t)))
+                   (widen) ;; so we can read the body later on
+                   (if subj ;; if non-blank
+                       ;; the mail client will deal with
+                       ;; warning the user etc.
+                       (concat (mailclient-url-delim) "subject=" 
+                               (mailclient-encode-string-as-url subj))
+                     ""))))
+              ;; body
+              (concat 
+               (mailclient-url-delim) "body=" 
+               (mailclient-encode-string-as-url
+                (if mailclient-place-body-on-clipboard-flag
+                    (progn
+                      (clipboard-kill-ring-save  
+                       (+ 1 delimline) (point-max))
+                      (concat
+                       "*** E-Mail body has been placed on clipboard, "
+                       "please paste them here! ***"))
+                  ;; else
+                  (buffer-substring (+ 1 delimline) (point-max))))))))))))
+
+(provide 'mailclient)
+
+;; arch-tag: 35d10fc8-a1bc-4f29-a4e6-c288e53578ef
+;;; mailclient.el ends here
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9c4fe335828..1016b1ed1e6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3038,13 +3038,14 @@ Interactively, empty argument means use same regexp used last time."
   (interactive
     (let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
            (prompt
-            (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+            (concat (if reversep "Reverse " "") "Rmail search (regexp"))
            regexp)
-      (if rmail-search-last-regexp
-          (setq prompt (concat prompt
-                               "(default "
-                               rmail-search-last-regexp
-                               ") ")))
+      (setq prompt
+            (concat prompt
+                    (if rmail-search-last-regexp
+                        (concat ", default "
+                                rmail-search-last-regexp "): ")
+                      "): ")))
       (setq regexp (read-string prompt))
       (cond ((not (equal regexp ""))
              (setq rmail-search-last-regexp regexp))
@@ -3109,13 +3110,14 @@ Interactively, empty argument means use same regexp used last time."
   (interactive
     (let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
            (prompt
-            (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+            (concat (if reversep "Reverse " "") "Rmail search (regexp"))
            regexp)
-      (if rmail-search-last-regexp
-          (setq prompt (concat prompt
-                               "(default "
-                               rmail-search-last-regexp
-                               ") ")))
+      (setq prompt
+            (concat prompt
+                    (if rmail-search-last-regexp
+                        (concat ", default "
+                                rmail-search-last-regexp "): ")
+                      "): ")))
       (setq regexp (read-string prompt))
       (cond ((not (equal regexp ""))
              (setq rmail-search-last-regexp regexp))
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index a3b46ddaedf..d97c181eb81 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -63,9 +63,9 @@ Set `rmail-default-rmail-file' to this name as well as returning it."
     (let ((read-file
            (expand-file-name
             (read-file-name
-             (concat "Output message to Rmail file: (default "
+             (concat "Output message to Rmail file (default "
                      (file-name-nondirectory default-file)
-                     ") ")
+                     "): ")
              (file-name-directory default-file)
              (abbreviate-file-name default-file))
             (file-name-directory default-file))))
@@ -95,9 +95,9 @@ Set `rmail-default-file' to this name as well as returning it."
     (let ((read-file
            (expand-file-name
             (read-file-name
-             (concat "Output message to Unix mail file: (default "
+             (concat "Output message to Unix mail file (default "
                      (file-name-nondirectory default-file)
-                     ") ")
+                     "): ")
              (file-name-directory default-file)
              (abbreviate-file-name default-file))
             (file-name-directory default-file))))
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index ad2c275a679..497f2f75301 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1346,13 +1346,14 @@ Interactively, empty argument means use same regexp used last time."
   (interactive
     (let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
            (prompt
-            (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+            (concat (if reversep "Reverse " "") "Rmail search (regexp"))
            regexp)
-      (if rmail-search-last-regexp
-          (setq prompt (concat prompt
-                               "(default "
-                               rmail-search-last-regexp
-                               ") ")))
+      (setq prompt
+            (concat prompt
+                    (if rmail-search-last-regexp
+                        (concat ", default "
+                                rmail-search-last-regexp "): ")
+                      "): ")))
       (setq regexp (read-string prompt))
       (cond ((not (equal regexp ""))
              (setq rmail-search-last-regexp regexp))
@@ -1377,13 +1378,14 @@ Interactively, empty argument means use same regexp used last time."
   (interactive
     (let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
            (prompt
-            (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+            (concat (if reversep "Reverse " "") "Rmail search (regexp"))
            regexp)
-      (if rmail-search-last-regexp
-          (setq prompt (concat prompt
-                               "(default "
-                               rmail-search-last-regexp
-                               ") ")))
+      (setq prompt
+            (concat prompt
+                    (if rmail-search-last-regexp
+                        (concat ", default "
+                                rmail-search-last-regexp "): ")
+                      "): ")))
       (setq regexp (read-string prompt))
       (cond ((not (equal regexp ""))
              (setq rmail-search-last-regexp regexp))
diff --git a/lisp/man.el b/lisp/man.el
index 60fc7c009e1..6c8a5a18b44 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -663,10 +663,10 @@ all sections related to a subject, put something appropriate into the
   (interactive
    (list (let* ((default-entry (Man-default-man-entry))
                 (input (read-string
-                        (format "Manual entry%s: "
+                        (format "Manual entry%s"
                                 (if (string= default-entry "")
-                                    ""
-                                  (format " (default %s)" default-entry)))
+                                    ": "
+                                  (format " (default %s): " default-entry)))
                         nil nil default-entry)))
            (if (string= input "")
                (error "No man args given")
@@ -1273,7 +1273,7 @@ Returns t if section is found, nil otherwise."
         (let* ((default (aheadsym Man-sections-alist))
                (completion-ignore-case t)
                chosen
-               (prompt (concat "Go to section: (default " default ") ")))
+               (prompt (concat "Go to section (default " default "): ")))
           (setq chosen (completing-read prompt Man-sections-alist))
           (if (or (not chosen)
                   (string= chosen ""))
@@ -1328,7 +1328,7 @@ Specify which REFERENCE to use; default is based on word at point."
                                   Man-refpages-alist))
                             (aheadsym Man-refpages-alist)))
                    chosen
-                   (prompt (concat "Refer to: (default " default ") ")))
+                   (prompt (concat "Refer to (default " default "): ")))
               (setq chosen (completing-read prompt Man-refpages-alist))
               (if (or (not chosen)
                       (string= chosen ""))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 631bc5cb6a3..e851b399ce0 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
+
+        * mh-mime.el (mh-compose-forward, mh-mhn-compose-forw):
+        * mh-comp.el (mh-insert-letter):
+        * mh-utils.el (mh-prompt-for-folder):
+        Follow convention for reading with the minibuffer.
+
 2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * mh-print.el (mh-ps-print-msg-show): Fix misplaced parenthesis in
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 59111098bf1..a99c05debea 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1424,10 +1424,10 @@ not indent and do not delete headers.  Leaves the mark before the letter
 and point after it."
   (interactive
    (list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
-         (read-input (format "Message number%s: "
+         (read-input (concat "Message number"
                              (if (numberp mh-sent-from-msg)
-                                 (format " [%d]" mh-sent-from-msg)
-                               "")))
+                                 (format " (default %d): " mh-sent-from-msg)
+                               ": ")))
          current-prefix-arg))
   (save-restriction
     (narrow-to-region (point) (point))
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 980942a0f47..527d322c48a 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -81,10 +81,10 @@ If any of the optional arguments are absent, they are prompted for."
   (interactive (list
                 (read-string "Forw Content-description: ")
                 (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
-                (read-string (format "Messages%s: "
+                (read-string (concat "Messages"
                                      (if (numberp mh-sent-from-msg)
-                                         (format " [%d]" mh-sent-from-msg)
-                                       "")))))
+                                         (format " (default %d): " mh-sent-from-msg)
+                                       ": ")))))
   (if (equal mh-compose-insertion 'gnus)
       (mh-mml-forward-message description folder message)
     (mh-mhn-compose-forw description folder message)))
@@ -374,10 +374,10 @@ See also \\[mh-edit-mhn]."
   (interactive (list
                 (read-string "Forw Content-description: ")
                 (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
-                (read-string (format "Messages%s: "
+                (read-string (concat "Messages"
                                      (if (numberp mh-sent-from-msg)
-                                         (format " [%d]" mh-sent-from-msg)
-                                       "")))))
+                                         (format " (default %d): " mh-sent-from-msg)
+                                       ": ")))))
   (beginning-of-line)
   (insert "#forw [")
   (and description
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 522ccda088c..0e608e52062 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -2315,10 +2315,10 @@ non-nil then the function will accept the folder +, which means all folders
 when used in searching."
   (if (null default)
       (setq default ""))
-  (let* ((default-string (cond (default-string (format "[%s] " default-string))
+  (let* ((default-string (cond (default-string (format " (default %s)" default-string))
                                ((equal "" default) "")
-                               (t (format "[%s] " default))))
-         (prompt (format "%s folder: %s" prompt default-string))
+                               (t (format " (default %s)" default))))
+         (prompt (format "%s folder%s: " prompt default-string))
          (mh-current-folder-name mh-current-folder)
          read-name folder-name)
     (while (and (setq read-name (mh-folder-completing-read
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 3b591694cfe..5390abacb5c 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -405,7 +405,6 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
          (start-event-window (posn-window start))
          (start-event-frame (window-frame start-event-window))
          (start-nwindows (count-windows t))
-         (old-selected-window (selected-window))
          (minibuffer (frame-parameter nil 'minibuffer))
          should-enlarge-minibuffer event mouse y top bot edges wconfig growth)
     (track-mouse
@@ -553,7 +552,6 @@ resized by dragging their header-line."
          (start-event-frame (window-frame (car (car (cdr start-event)))))
          (start-event-window (car (car (cdr start-event))))
          (start-nwindows (count-windows t))
-         (old-selected-window (selected-window))
          event mouse x left right edges wconfig growth
          (which-side
           (or (cdr (assq 'vertical-scroll-bars (frame-parameters start-event-frame)))
@@ -745,9 +743,11 @@ Upon exit, point is at the far edge of the newly visible text."
         (goto-char opoint))))
 
 ;; Create an overlay and immediately delete it, to get "overlay in no buffer".
-(defvar mouse-drag-overlay (make-overlay 1 1))
-(delete-overlay mouse-drag-overlay)
-(overlay-put mouse-drag-overlay 'face 'region)
+(defconst mouse-drag-overlay
+  (let ((ol (make-overlay (point-min) (point-min))))
+    (delete-overlay ol)
+    (overlay-put ol 'face 'region)
+    ol))
 
 (defvar mouse-selection-click-count 0)
 
@@ -858,14 +858,34 @@ at the same position."
                     "mouse-1" (substring msg 7)))))))
   msg)
 
+(defun mouse-move-drag-overlay (ol start end mode)
+  (unless (= start end)
+    ;; Go to START first, so that when we move to END, if it's in the middle
+    ;; of intangible text, point jumps in the direction away from START.
+    ;; Don't do it if START=END otherwise a single click risks selecting
+    ;; a region if it's on intangible text.  This exception was originally
+    ;; only applied on entry to mouse-drag-region, which had the problem
+    ;; that a tiny move during a single-click would cause the intangible
+    ;; text to be selected.
+    (goto-char start)
+    (goto-char end)
+    (setq end (point)))
+  (let ((range (mouse-start-end start end mode)))
+    (move-overlay ol (car range) (nth 1 range))))
+
 (defun mouse-drag-region-1 (start-event)
   (mouse-minibuffer-check start-event)
-  (let* ((echo-keystrokes 0)
+  (setq mouse-selection-click-count-buffer (current-buffer))
+  (let* ((original-window (selected-window))
+         ;; We've recorded what we needed from the current buffer and
+         ;; window, now let's jump to the place of the event, where things
+         ;; are happening.
+         (_ (mouse-set-point start-event))
+         (echo-keystrokes 0)
          (start-posn (event-start start-event))
          (start-point (posn-point start-posn))
          (start-window (posn-window start-posn))
          (start-window-start (window-start start-window))
-         (start-frame (window-frame start-window))
          (start-hscroll (window-hscroll start-window))
          (bounds (window-edges start-window))
          (make-cursor-line-fully-visible nil)
@@ -876,39 +896,34 @@ at the same position."
                    (1- (nth 3 bounds))))
          (on-link (and mouse-1-click-follows-link
                        (or mouse-1-click-in-non-selected-windows
-                           (eq start-window (selected-window)))))
-         remap-double-click
-         (click-count (1- (event-click-count start-event))))
+                           (eq start-window original-window))
+                       ;; Use start-point before the intangibility
+                       ;; treatment, in case we click on a link inside an
+                       ;; intangible text.
+                       (mouse-on-link-p start-point)))
+         (click-count (1- (event-click-count start-event)))
+         (remap-double-click (and on-link
+                                  (eq mouse-1-click-follows-link 'double)
+                                  (= click-count 1))))
     (setq mouse-selection-click-count click-count)
-    (setq mouse-selection-click-count-buffer (current-buffer))
-    (mouse-set-point start-event)
     ;; In case the down click is in the middle of some intangible text,
     ;; use the end of that text, and put it in START-POINT.
     (if (< (point) start-point)
         (goto-char start-point))
     (setq start-point (point))
-    (setq on-link (and on-link
-                       (mouse-on-link-p start-point)))
-    (setq remap-double-click (and on-link
-                                  (eq mouse-1-click-follows-link 'double)
-                                  (= click-count 1)))
-    (if remap-double-click  ;; Don't expand mouse overlay in links
+    (if remap-double-click ;; Don't expand mouse overlay in links
         (setq click-count 0))
-    (let ((range (mouse-start-end start-point start-point click-count)))
-      (move-overlay mouse-drag-overlay (car range) (nth 1 range)
-                    (window-buffer start-window))
-      (overlay-put mouse-drag-overlay 'window (selected-window)))
+    (mouse-move-drag-overlay mouse-drag-overlay start-point start-point
+                             click-count)
+    (overlay-put mouse-drag-overlay 'window start-window)
     (deactivate-mark)
-    ;; end-of-range is used only in the single-click case.
-    ;; It is the place where the drag has reached so far
-    ;; (but not outside the window where the drag started).
-    (let (event end end-point last-end-point (end-of-range (point)))
+    (let (event end end-point last-end-point)
       (track-mouse
         (while (progn
                  (setq event (read-event))
-                 (or (mouse-movement-p event)
-                     (memq (car-safe event) '(switch-frame select-window))))
-          (if (memq (car-safe event) '(switch-frame select-window))
+                 (or (mouse-movement-p event)
+                     (memq (car-safe event) '(switch-frame select-window))))
+          (if (memq (car-safe event) '(switch-frame select-window))
               nil
             (setq end (event-end event)
                   end-point (posn-point end))
@@ -919,53 +934,33 @@ at the same position."
              ;; Are we moving within the original window?
              ((and (eq (posn-window end) start-window)
                    (integer-or-marker-p end-point))
-              ;; Go to START-POINT first, so that when we move to END-POINT,
-              ;; if it's in the middle of intangible text,
-              ;; point jumps in the direction away from START-POINT.
-              (goto-char start-point)
-              (goto-char end-point)
-              (if (zerop (% click-count 3))
-                  (setq end-of-range (point)))
-              (let ((range (mouse-start-end start-point (point) click-count)))
-                (move-overlay mouse-drag-overlay (car range) (nth 1 range))))
+              (mouse-move-drag-overlay mouse-drag-overlay start-point end-point click-count))
 
              (t
               (let ((mouse-row (cdr (cdr (mouse-position)))))
-                (cond
-                 ((null mouse-row))
-                 ((< mouse-row top)
-                  (mouse-scroll-subr start-window (- mouse-row top)
-                                     mouse-drag-overlay start-point)
-                  ;; Without this, point tends to jump back to the starting
-                  ;; position where the mouse button was pressed down.
-                  (setq end-of-range (overlay-start mouse-drag-overlay)))
-                 ((>= mouse-row bottom)
-                  (mouse-scroll-subr start-window (1+ (- mouse-row bottom))
-                                     mouse-drag-overlay start-point)
-                  (setq end-of-range (overlay-end mouse-drag-overlay))))))))))
+                (cond
+                 ((null mouse-row))
+                 ((< mouse-row top)
+                  (mouse-scroll-subr start-window (- mouse-row top)
+                                     mouse-drag-overlay start-point))
+                 ((>= mouse-row bottom)
+                  (mouse-scroll-subr start-window (1+ (- mouse-row bottom))
+                                     mouse-drag-overlay start-point)))))))))
 
       ;; In case we did not get a mouse-motion event
       ;; for the final move of the mouse before a drag event
       ;; pretend that we did get one.
       (when (and (memq 'drag (event-modifiers (car-safe event)))
-                 (setq end (event-end event)
+                 (setq end (event-end event)
                        end-point (posn-point end))
                  (eq (posn-window end) start-window)
                  (integer-or-marker-p end-point))
-        ;; Go to START-POINT first, so that when we move to END-POINT,
-        ;; if it's in the middle of intangible text,
-        ;; point jumps in the direction away from START-POINT.
-        (goto-char start-point)
-        (goto-char end-point)
-        (if (zerop (% click-count 3))
-            (setq end-of-range (point)))
-        (let ((range (mouse-start-end start-point (point) click-count)))
-          (move-overlay mouse-drag-overlay (car range) (nth 1 range))))
+        (mouse-move-drag-overlay mouse-drag-overlay start-point end-point click-count))
 
       (if (consp event)
           (let ((fun (key-binding (vector (car event)))))
-            ;; Run the binding of the terminating up-event, if possible.
-            ;; In the case of a multiple click, it gives the wrong results,
+            ;; Run the binding of the terminating up-event, if possible.
+            ;; In the case of a multiple click, it gives the wrong results,
             ;; because it would fail to set up a region.
             (if (not (= (overlay-start mouse-drag-overlay)
                         (overlay-end mouse-drag-overlay)))
@@ -976,74 +971,75 @@ at the same position."
                        ;; The end that comes from where we ended the drag.
                        ;; Point goes here.
                        (region-termination
-                        (if (and stop-point (< stop-point start-point))
-                            (overlay-start mouse-drag-overlay)
-                          (overlay-end mouse-drag-overlay)))
-                       ;; The end that comes from where we started the drag.
-                       ;; Mark goes there.
-                       (region-commencement
-                        (- (+ (overlay-end mouse-drag-overlay)
-                              (overlay-start mouse-drag-overlay))
-                           region-termination))
-                       last-command this-command)
-                  (push-mark region-commencement t t)
-                  (goto-char region-termination)
-                  ;; Don't let copy-region-as-kill set deactivate-mark.
-                  (when mouse-drag-copy-region
-                    (let (deactivate-mark)
-                      (copy-region-as-kill (point) (mark t))))
-                  (let ((buffer (current-buffer)))
-                    (mouse-show-mark)
-                    ;; mouse-show-mark can call read-event,
-                    ;; and that means the Emacs server could switch buffers
-                    ;; under us.  If that happened,
-                    ;; avoid trying to use the region.
-                    (and (mark t) mark-active
-                         (eq buffer (current-buffer))
-                         (mouse-set-region-1))))
-              (delete-overlay mouse-drag-overlay)
-              ;; Run the binding of the terminating up-event.
-              (when (and (functionp fun)
-                         (= start-hscroll (window-hscroll start-window))
-                         ;; Don't run the up-event handler if the
-                         ;; window start changed in a redisplay after
-                         ;; the mouse-set-point for the down-mouse
-                         ;; event at the beginning of this function.
-                         ;; When the window start has changed, the
-                         ;; up-mouse event will contain a different
-                         ;; position due to the new window contents,
-                         ;; and point is set again.
-                         (or end-point
-                             (= (window-start start-window)
-                                start-window-start)))
-                (if (and on-link
-                         (or (not end-point) (= end-point start-point))
-                         (consp event)
-                         (or remap-double-click
-                             (and
-                              (not (eq mouse-1-click-follows-link 'double))
-                              (= click-count 0)
-                              (= (event-click-count event) 1)
-                              (not (input-pending-p))
-                              (or (not (integerp mouse-1-click-follows-link))
-                                  (let ((t0 (posn-timestamp (event-start start-event)))
-                                        (t1 (posn-timestamp (event-end event))))
-                                    (and (integerp t0) (integerp t1)
-                                         (if (> mouse-1-click-follows-link 0)
-                                             (<= (- t1 t0) mouse-1-click-follows-link)
-                                           (< (- t0 t1) mouse-1-click-follows-link)))))
-                              (or (not double-click-time)
-                                  (sit-for 0 (if (integerp double-click-time)
-                                                 double-click-time 500) t)))))
+                        (if (and stop-point (< stop-point start-point))
+                            (overlay-start mouse-drag-overlay)
+                          (overlay-end mouse-drag-overlay)))
+                       ;; The end that comes from where we started the drag.
+                       ;; Mark goes there.
+                       (region-commencement
+                        (- (+ (overlay-end mouse-drag-overlay)
+                              (overlay-start mouse-drag-overlay))
+                           region-termination))
+                       last-command this-command)
+                  (push-mark region-commencement t t)
+                  (goto-char region-termination)
+                  ;; Don't let copy-region-as-kill set deactivate-mark.
+                  (when mouse-drag-copy-region
+                    (let (deactivate-mark)
+                      (copy-region-as-kill (point) (mark t))))
+                  (let ((buffer (current-buffer)))
+                    (mouse-show-mark)
+                    ;; mouse-show-mark can call read-event,
+                    ;; and that means the Emacs server could switch buffers
+                    ;; under us.  If that happened,
+                    ;; avoid trying to use the region.
+                    (and (mark t) mark-active
+                         (eq buffer (current-buffer))
+                         (mouse-set-region-1))))
+              (delete-overlay mouse-drag-overlay)
+              ;; Run the binding of the terminating up-event.
+              (when (and (functionp fun)
+                         (= start-hscroll (window-hscroll start-window))
+                         ;; Don't run the up-event handler if the
+                         ;; window start changed in a redisplay after
+                         ;; the mouse-set-point for the down-mouse
+                         ;; event at the beginning of this function.
+                         ;; When the window start has changed, the
+                         ;; up-mouse event will contain a different
+                         ;; position due to the new window contents,
+                         ;; and point is set again.
+                         (or end-point
+                             (= (window-start start-window)
+                                start-window-start)))
+                (if (and on-link
+                         (or (not end-point) (= end-point start-point))
+                         (consp event)
+                         (or remap-double-click
+                             (and
+                              (not (eq mouse-1-click-follows-link 'double))
+                              (= click-count 0)
+                              (= (event-click-count event) 1)
+                              (not (input-pending-p))
+                              (or (not (integerp mouse-1-click-follows-link))
+                                  (let ((t0 (posn-timestamp (event-start start-event)))
+                                        (t1 (posn-timestamp (event-end event))))
+                                    (and (integerp t0) (integerp t1)
+                                         (if (> mouse-1-click-follows-link 0)
+                                             (<= (- t1 t0) mouse-1-click-follows-link)
+                                           (< (- t0 t1) mouse-1-click-follows-link)))))
+                              (or (not double-click-time)
+                                  (sit-for 0 (if (integerp double-click-time)
+                                                 double-click-time 500) t)))))
                     (if (or (vectorp on-link) (stringp on-link))
                         (setq event (aref on-link 0))
                       (setcar event 'mouse-2)))
-                (setq unread-command-events
-                      (cons event unread-command-events)))))
+                (push event unread-command-events))))
+
+        ;; Case where the end-event is not a cons cell (it's just a boring
+        ;; char-key-press).
         (delete-overlay mouse-drag-overlay)))))
 
 ;; Commands to handle xterm-style multiple clicks.
-
 (defun mouse-skip-word (dir)
   "Skip over word, over whitespace, or over identical punctuation.
 If DIR is positive skip forward; if negative, skip backward."
@@ -1352,8 +1348,8 @@ If you do this twice in the same position, the selection is killed."
           ;; Don't let a subsequent kill command append to this one:
           ;; prevent setting this-command to kill-region.
           (this-command this-command))
-      (if (and (save-excursion
-                 (set-buffer (window-buffer (posn-window (event-start click))))
+      (if (and (with-current-buffer
+                   (window-buffer (posn-window (event-start click)))
                  (and (mark t) (> (mod mouse-selection-click-count 3) 0)
                       ;; Don't be fooled by a recent click in some other buffer.
                       (eq mouse-selection-click-count-buffer
@@ -1416,15 +1412,14 @@ If you do this twice in the same position, the selection is killed."
                           (goto-char new)
                         (set-mark new))
                       (setq deactivate-mark nil)))
-                (kill-new (buffer-substring (point) (mark t)) t)
-                (mouse-show-mark))
+                (kill-new (buffer-substring (point) (mark t)) t))
             ;; Set the mark where point is, then move where clicked.
             (mouse-set-mark-fast click)
             (if before-scroll
                 (goto-char before-scroll))
-            (exchange-point-and-mark)
-            (kill-new (buffer-substring (point) (mark t)))
-            (mouse-show-mark))
+            (exchange-point-and-mark)   ;Why??? --Stef
+            (kill-new (buffer-substring (point) (mark t))))
+          (mouse-show-mark)
           (mouse-set-region-1)
           (setq mouse-save-then-kill-posn
                 (list (car kill-ring) (point) click-posn)))))))
@@ -1435,10 +1430,13 @@ If you do this twice in the same position, the selection is killed."
 (global-set-key [M-mouse-3] 'mouse-secondary-save-then-kill)
 (global-set-key [M-mouse-2] 'mouse-yank-secondary)
 
-;; An overlay which records the current secondary selection
-;; or else is deleted when there is no secondary selection.
-;; May be nil.
-(defvar mouse-secondary-overlay nil)
+(defconst mouse-secondary-overlay
+  (let ((ol (make-overlay (point-min) (point-min))))
+    (delete-overlay ol)
+    (overlay-put ol 'face 'secondary-selection)
+    ol)
+  "An overlay which records the current secondary selection.
+It is deleted when there is no secondary selection.")
 
 (defvar mouse-secondary-click-count 0)
 
@@ -1453,11 +1451,9 @@ and complete the secondary selection."
   (interactive "e")
   (mouse-minibuffer-check click)
   (let ((posn (event-start click)))
-    (save-excursion
-      (set-buffer (window-buffer (posn-window posn)))
+    (with-current-buffer (window-buffer (posn-window posn))
       ;; Cancel any preexisting secondary selection.
-      (if mouse-secondary-overlay
-          (delete-overlay mouse-secondary-overlay))
+      (delete-overlay mouse-secondary-overlay)
       (if (numberp (posn-point posn))
           (progn
             (or mouse-secondary-start
@@ -1472,14 +1468,10 @@ This must be bound to a mouse drag event."
   (let ((posn (event-start click))
         beg
         (end (event-end click)))
-    (save-excursion
-      (set-buffer (window-buffer (posn-window posn)))
+    (with-current-buffer (window-buffer (posn-window posn))
       (if (numberp (posn-point posn))
           (setq beg (posn-point posn)))
-      (if mouse-secondary-overlay
-          (move-overlay mouse-secondary-overlay beg (posn-point end))
-        (setq mouse-secondary-overlay (make-overlay beg (posn-point end))))
-      (overlay-put mouse-secondary-overlay 'face 'secondary-selection))))
+      (move-overlay mouse-secondary-overlay beg (posn-point end)))))
 
 (defun mouse-drag-secondary (start-event)
   "Set the secondary selection to the text that the mouse is dragged over.
@@ -1492,7 +1484,6 @@ The function returns a non-nil value if it creates a secondary selection."
          (start-posn (event-start start-event))
          (start-point (posn-point start-posn))
          (start-window (posn-window start-posn))
-         (start-frame (window-frame start-window))
          (bounds (window-edges start-window))
          (top (nth 1 bounds))
          (bottom (if (window-minibuffer-p start-window)
@@ -1500,20 +1491,16 @@ The function returns a non-nil value if it creates a secondary selection."
                    ;; Don't count the mode line.
                    (1- (nth 3 bounds))))
          (click-count (1- (event-click-count start-event))))
-    (save-excursion
-      (set-buffer (window-buffer start-window))
+    (with-current-buffer (window-buffer start-window)
       (setq mouse-secondary-click-count click-count)
-      (or mouse-secondary-overlay
-          (setq mouse-secondary-overlay
-                (make-overlay (point) (point))))
-      (overlay-put mouse-secondary-overlay 'face 'secondary-selection)
       (if (> (mod click-count 3) 0)
           ;; Double or triple press: make an initial selection
           ;; of one word or line.
           (let ((range (mouse-start-end start-point start-point click-count)))
             (set-marker mouse-secondary-start nil)
-            (move-overlay mouse-secondary-overlay 1 1
-                          (window-buffer start-window))
+            ;; Why the double move?  --Stef
+            ;; (move-overlay mouse-secondary-overlay 1 1
+            ;;            (window-buffer start-window))
             (move-overlay mouse-secondary-overlay (car range) (nth 1 range)
                           (window-buffer start-window)))
         ;; Single-press: cancel any preexisting secondary selection.
@@ -1598,13 +1585,12 @@ is to prevent accidents."
               (current-buffer)))
         (error "Select or click on the buffer where the secondary selection is")))
   (let (this-command)
-    (save-excursion
-      (set-buffer (overlay-buffer mouse-secondary-overlay))
+    (with-current-buffer (overlay-buffer mouse-secondary-overlay)
       (kill-region (overlay-start mouse-secondary-overlay)
                    (overlay-end mouse-secondary-overlay))))
   (delete-overlay mouse-secondary-overlay)
 ;;;  (x-set-selection 'SECONDARY nil)
-  (setq mouse-secondary-overlay nil))
+  )
 
 (defun mouse-secondary-save-then-kill (click)
   "Save text to point in kill ring; the second time, kill the text.
@@ -1627,13 +1613,11 @@ again.  If you do this twice in the same position, it kills the selection."
         ;; prevent setting this-command to kill-region.
         (this-command this-command))
     (or (eq (window-buffer (posn-window posn))
-            (or (and mouse-secondary-overlay
-                     (overlay-buffer mouse-secondary-overlay))
+            (or (overlay-buffer mouse-secondary-overlay)
                 (if mouse-secondary-start
                     (marker-buffer mouse-secondary-start))))
         (error "Wrong buffer"))
-    (save-excursion
-      (set-buffer (window-buffer (posn-window posn)))
+    (with-current-buffer (window-buffer (posn-window posn))
       (if (> (mod mouse-secondary-click-count 3) 0)
           (if (not (and (eq last-command 'mouse-secondary-save-then-kill)
                         (equal click-posn
@@ -1712,10 +1696,7 @@ again.  If you do this twice in the same position, it kills the selection."
                 ;; so put the other end here.
                 (let ((start (+ 0 mouse-secondary-start)))
                   (kill-ring-save start click-posn)
-                  (if mouse-secondary-overlay
-                      (move-overlay mouse-secondary-overlay start click-posn)
-                    (setq mouse-secondary-overlay (make-overlay start click-posn)))
-                  (overlay-put mouse-secondary-overlay 'face 'secondary-selection))))
+                  (move-overlay mouse-secondary-overlay start click-posn))))
           (setq mouse-save-then-kill-posn
                 (list (car kill-ring) (point) click-posn))))
       (if (overlay-buffer mouse-secondary-overlay)
@@ -2433,5 +2414,5 @@ and selects that window."
 (make-obsolete 'mldrag-drag-vertical-line 'mouse-drag-vertical-line "21.1")
 (provide 'mldrag)
 
-;;; arch-tag: 9a710ce1-914a-4923-9b81-697f7bf82ab3
+;; arch-tag: 9a710ce1-914a-4923-9b81-697f7bf82ab3
 ;;; mouse.el ends here
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index e28a044ba55..93f7c24d077 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -194,7 +194,7 @@ attribute names are returned. Default to `person'"
   "Check if the current LDAP server has a configured search base."
   (unless (or (eudc-ldap-get-host-parameter eudc-server 'base)
               ldap-default-base
-              (null (y-or-n-p "No search base defined. Configure it now ?")))
+              (null (y-or-n-p "No search base defined. Configure it now? ")))
     ;; If the server is not in ldap-host-parameters-alist we add it for the
     ;; user
     (if (null (assoc eudc-server ldap-host-parameters-alist))
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index acbac4bb3f2..f1ee41563f3 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -26,9 +26,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-;; USA
+;; along with this program; if not, write to the Free Software Foundation,
+;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;; ======================================================================
 ;;; Commentary:
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index 47ee84d42b8..c643d72da97 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -138,7 +138,7 @@ See \\[compile]."
                     remote-compile-host)
              user (if remote-compile-prompt-for-user
                       (read-from-minibuffer (format
-                                             "Compile by user (default %s)"
+                                             "Compile by user (default %s): "
                                              (or remote-compile-user
                                                  (user-login-name)))
                                             "" nil nil
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 662adf119b7..47f08a8b098 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -156,7 +156,7 @@ Strings will be separated from each other by SPACE lines."
 (defun animate-birthday-present (&optional name)
   "Display one's birthday present in a new buffer.
 You can specify the one's name by NAME; the default value is \"Sarah\"."
-  (interactive (list (read-string "Name (default \"Sarah\"): "
+  (interactive (list (read-string "Name (default Sarah): "
                                   nil nil "Sarah")))
   ;; Make a suitable buffer to display the birthday present in.
   (switch-to-buffer (get-buffer-create (format "*%s*" name)))
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index e9f7a07abe9..c7089ddd7f7 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -671,11 +671,11 @@ that DVAL has been added on SQUARE."
      (cond ((< gomoku-number-of-moves 20)
             "This was a REALLY QUICK win.")
            (gomoku-human-refused-draw
-            "I won... Too bad you refused my offer of a draw !")
+            "I won... Too bad you refused my offer of a draw!")
            (gomoku-human-took-back
-            "I won... Taking moves back will not help you !")
+            "I won... Taking moves back will not help you!")
            ((not gomoku-emacs-played-first)
-            "I won... Playing first did not help you much !")
+            "I won... Playing first did not help you much!")
            ((and (zerop gomoku-number-of-human-wins)
                  (zerop gomoku-number-of-draws)
                  (> gomoku-number-of-emacs-wins 1))
@@ -688,7 +688,7 @@ that DVAL has been added on SQUARE."
               (gomoku-human-took-back
                "  I, for one, never take my moves back...")
               (gomoku-emacs-played-first
-               ".. so what ?")
+               ".. so what?")
               ("  Now, let me play first just once."))))
     ((eq result 'human-resigned)
      (setq gomoku-number-of-emacs-wins (1+ gomoku-number-of-emacs-wins))
@@ -758,7 +758,7 @@ Use \\[describe-mode] for more info."
       (setq gomoku-emacs-is-computing nil)
       (gomoku-terminate-game 'crash-game)
       (sit-for 4)
-      (or (y-or-n-p "Another game ") (error "Chicken !")))
+      (or (y-or-n-p "Another game? ") (error "Chicken!")))
     (switch-to-buffer gomoku-buffer-name)
     (gomoku-mode))
   (cond
@@ -779,14 +779,14 @@ Use \\[describe-mode] for more info."
       (if (and (> m max-height)
                (not (eq m gomoku-saved-board-height))
                ;; Use EQ because SAVED-BOARD-HEIGHT may be nil
-               (not (y-or-n-p (format "Do you really want %d rows " m))))
+               (not (y-or-n-p (format "Do you really want %d rows? " m))))
           (setq m max-height)))
     (message "One moment, please...")
     (gomoku-start-game n m)
-    (if (y-or-n-p "Do you allow me to play first ")
+    (if (y-or-n-p "Do you allow me to play first? ")
         (gomoku-emacs-plays)
         (gomoku-prompt-for-move)))
-   ((y-or-n-p "Shall we continue our game ")
+   ((y-or-n-p "Shall we continue our game? ")
     (gomoku-prompt-for-move))
    (t
     (gomoku-human-resigns))))
@@ -875,9 +875,9 @@ If the game is finished, this command requests for another game."
     (let (square score)
       (setq square (gomoku-point-square))
       (cond ((null square)
-             (error "Your point is not on a square. Retry !"))
+             (error "Your point is not on a square. Retry!"))
             ((not (zerop (aref gomoku-board square)))
-             (error "Your point is not on a free square. Retry !"))
+             (error "Your point is not on a free square. Retry!"))
             (t
              (setq score (aref gomoku-score-table square))
              (gomoku-play-move square 1)
@@ -902,7 +902,7 @@ If the game is finished, this command requests for another game."
     (sit-for 4)
     (gomoku-prompt-for-other-game))
    ((zerop gomoku-number-of-human-moves)
-    (message "You have not played yet... Your move ?"))
+    (message "You have not played yet... Your move?"))
    (t
     (message "One moment, please...")
     ;; It is possible for the user to let Emacs play several consecutive
@@ -923,9 +923,9 @@ If the game is finished, this command requests for another game."
     (gomoku-crash-game))
    ((not gomoku-game-in-progress)
     (message "There is no game in progress"))
-   ((y-or-n-p "You mean, you resign ")
+   ((y-or-n-p "You mean, you resign? ")
     (gomoku-terminate-game 'human-resigned))
-   ((y-or-n-p "You mean, we continue ")
+   ((y-or-n-p "You mean, we continue? ")
     (gomoku-prompt-for-move))
    (t
     (gomoku-terminate-game 'human-resigned)))) ; OK. Accept it
@@ -937,21 +937,21 @@ If the game is finished, this command requests for another game."
 (defun gomoku-prompt-for-move ()
   "Display a message asking for Human's move."
   (message (if (zerop gomoku-number-of-human-moves)
-               "Your move ? (move to a free square and hit X, RET ...)"
-               "Your move ?"))
+               "Your move? (move to a free square and hit X, RET ...)"
+               "Your move?"))
   ;; This may seem silly, but if one omits the following line (or a similar
   ;; one), the cursor may very well go to some place where POINT is not.
   (save-excursion (set-buffer (other-buffer))))
 
 (defun gomoku-prompt-for-other-game ()
   "Ask for another game, and start it."
-  (if (y-or-n-p "Another game ")
+  (if (y-or-n-p "Another game? ")
       (gomoku gomoku-board-width gomoku-board-height)
-    (error "Chicken !")))
+    (error "Chicken!")))
 
 (defun gomoku-offer-a-draw ()
   "Offer a draw and return t if Human accepted it."
-  (or (y-or-n-p "I offer you a draw. Do you accept it ")
+  (or (y-or-n-p "I offer you a draw. Do you accept it? ")
       (not (setq gomoku-human-refused-draw t))))
 
 ;;;
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 67c6c0d3021..48b614ea111 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -763,9 +763,9 @@ If the game is finished, this command requests for another game."
     (let (square score)
       (setq square (lm-point-square))
       (cond ((null square)
-             (error "Your point is not on a square. Retry !"))
+             (error "Your point is not on a square. Retry!"))
             ((not (zerop (aref lm-board square)))
-             (error "Your point is not on a free square. Retry !"))
+             (error "Your point is not on a free square. Retry!"))
             (t
              (setq score (aref lm-score-table square))
              (lm-play-move square 1)
@@ -790,7 +790,7 @@ If the game is finished, this command requests for another game."
     (sit-for 4)
     (lm-prompt-for-other-game))
    ((zerop lm-number-of-human-moves)
-    (message "You have not played yet... Your move ?"))
+    (message "You have not played yet... Your move?"))
    (t
     (message "One moment, please...")
     ;; It is possible for the user to let Emacs play several consecutive
@@ -811,9 +811,9 @@ If the game is finished, this command requests for another game."
     (lm-crash-game))
    ((not lm-game-in-progress)
     (message "There is no game in progress"))
-   ((y-or-n-p "You mean, you resign ")
+   ((y-or-n-p "You mean, you resign? ")
     (lm-terminate-game 'human-resigned))
-   ((y-or-n-p "You mean, we continue ")
+   ((y-or-n-p "You mean, we continue? ")
     (lm-prompt-for-move))
    (t
     (lm-terminate-game 'human-resigned)))) ; OK. Accept it
@@ -823,23 +823,23 @@ If the game is finished, this command requests for another game."
 (defun lm-prompt-for-move ()
   "Display a message asking for Human's move."
   (message (if (zerop lm-number-of-human-moves)
-               "Your move ? (move to a free square and hit X, RET ...)"
-               "Your move ?"))
+               "Your move? (move to a free square and hit X, RET ...)"
+               "Your move?"))
   ;; This may seem silly, but if one omits the following line (or a similar
   ;; one), the cursor may very well go to some place where POINT is not.
   (save-excursion (set-buffer (other-buffer))))
 
 (defun lm-prompt-for-other-game ()
   "Ask for another game, and start it."
-  (if (y-or-n-p "Another game ")
+  (if (y-or-n-p "Another game? ")
       (if (y-or-n-p "Retain learned weights ")
           (lm 2)
         (lm 1))
-    (message "Chicken !")))
+    (message "Chicken!")))
 
 (defun lm-offer-a-draw ()
   "Offer a draw and return t if Human accepted it."
-  (or (y-or-n-p "I offer you a draw. Do you accept it ")
+  (or (y-or-n-p "I offer you a draw. Do you accept it? ")
       (not (setq lm-human-refused-draw t))))
 
 
@@ -1523,9 +1523,9 @@ If the game is finished, this command requests for another game."
     (let (square score)
       (setq square (lm-point-square))
       (cond ((null square)
-             (error "Your point is not on a square. Retry !"))
+             (error "Your point is not on a square. Retry!"))
             ((not (zerop (aref lm-board square)))
-             (error "Your point is not on a free square. Retry !"))
+             (error "Your point is not on a free square. Retry!"))
             (t
              (progn
                (lm-plot-square square 1)
@@ -1678,7 +1678,7 @@ Use \\[describe-mode] for more info."
       (if (and (> lm-m max-height)
                (not (eq lm-m lm-saved-board-height))
                ;; Use EQ because SAVED-BOARD-HEIGHT may be nil
-               (not (y-or-n-p (format "Do you really want %d rows " lm-m))))
+               (not (y-or-n-p (format "Do you really want %d rows? " lm-m))))
           (setq lm-m max-height)))
     (if lm-one-moment-please
         (message "One moment, please..."))
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 948ae126ffa..6f2c9200928 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -400,7 +400,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
 (defun mpuz-offer-abort ()
   "Ask if user wants to abort current puzzle."
   (interactive)
-  (if (y-or-n-p "Abort game ")
+  (if (y-or-n-p "Abort game? ")
       (let ((buf (mpuz-get-buffer)))
         (message "Mult Puzzle aborted.")
         (setq mpuz-in-progress nil
@@ -444,7 +444,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
                (mpuz-ding t))
               (t
                (mpuz-try-proposal letter-char digit-char))))
-    (if (y-or-n-p "Start a new game ")
+    (if (y-or-n-p "Start a new game? ")
         (mpuz-start-new-game)
       (message "OK. I won't."))))
 
@@ -489,7 +489,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
                                (t                       "not serious.")))))
     (message message)
     (sit-for 4)
-    (if (y-or-n-p (concat message "  Start a new game "))
+    (if (y-or-n-p (concat message "  Start a new game? "))
         (mpuz-start-new-game)
       (message "Good Bye!"))))
 
diff --git a/lisp/printing.el b/lisp/printing.el
index ec2c8a3cfda..3771871c9c8 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5704,7 +5704,7 @@ If menu binding was not done, calls `pr-menu-bind'."
 (defun pr-interactive-n-up (mess)
   (or (stringp mess) (setq mess "*"))
   (save-match-data
-    (let* ((fmt-prompt "%s[%s] N-up printing: (default 1) ")
+    (let* ((fmt-prompt "%s[%s] N-up printing (default 1): ")
            (prompt "")
            (str (pr-f-read-string (format fmt-prompt prompt mess) "1" nil "1"))
            int)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 8f5670ed57b..92c402dbad4 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -519,6 +519,7 @@ This does not load the font-lock package.  Use after
           nil nil
           ,c-identifier-syntax-modifications
           c-beginning-of-syntax
+          (font-lock-lines-before . 1)
           (font-lock-mark-block-function
            . c-mark-function)))
   (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f29051ab0b0..5ff256e5f8f 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1778,7 +1778,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
                                     marker)
             (let ((name (expand-file-name
                          (read-file-name
-                          (format "Find this %s in: (default %s) "
+                          (format "Find this %s in (default %s): "
                                   compilation-error filename)
                           spec-dir filename t))))
               (if (file-directory-p name)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 49d0207882c..47e9a12f235 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1798,7 +1798,7 @@ INFO is a list (TREE-HEADER TREE-OR-MEMBER MEMBER-LIST)."
       ;; START will be 0.
       (when (and (boundp 'ebrowse-debug)
                  (symbol-value 'ebrowse-debug))
-        (y-or-n-p (format "start = %d" start))
+        (y-or-n-p (format "start = %d? " start))
         (y-or-n-p pattern))
       (setf found
             (loop do (goto-char (max (point-min) (- start offset)))
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 54b4cda9d18..ea87dce591f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -284,7 +284,7 @@ With a prefix arg, set the buffer-local value instead.
 When you find a tag with \\[find-tag], the buffer it finds the tag
 in is given a local value of this variable which is the name of the tags
 file the tag was in."
-  (interactive (list (read-file-name "Visit tags table: (default TAGS) "
+  (interactive (list (read-file-name "Visit tags table (default TAGS): "
                                      default-directory
                                      (expand-file-name "TAGS"
                                                        default-directory)
@@ -590,7 +590,7 @@ Returns t if it visits a tags table, or nil if there are no more in the list."
                   (car list))
                 ;; Finally, prompt the user for a file name.
                 (expand-file-name
-                 (read-file-name "Visit tags table: (default TAGS) "
+                 (read-file-name "Visit tags table (default TAGS): "
                                  default-directory
                                  "TAGS"
                                  t))))))
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 7dc12226722..4b646a72f3b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2462,7 +2462,7 @@ the problem with not being able to set the breakpoint."
               (beep)
               (y-or-n-p 
                (concat "Okay to recompile file "
-                       (idlwave-shell-bp-get bp 'file) " ")))
+                       (idlwave-shell-bp-get bp 'file) "? ")))
             ;; Recompile
             (progn
               ;; Clean up before retrying
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 47b36db6539..b84fa87a0de 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1470,7 +1470,7 @@ The default is a name found in the buffer around point."
                       default ""))
          (label (if (not (string= default ""))
                     ;; Do completion with default
-                    (completing-read (concat "Label: (default " default ") ")
+                    (completing-read (concat "Label (default " default "): ")
                                      'pascal-comp-defun nil t "")
                   ;; There is no default value. Complete without it
                   (completing-read "Label: "
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 433476f7957..f7788404350 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1341,9 +1341,9 @@ don't support `help'."
                         nil nil symbol))))
   (if (equal symbol "") (error "No symbol"))
   (let* ((func `(lambda ()
-                  (comint-redirect-send-command (format "emacs.ehelp(%S)\n"
-                                                        ,symbol)
-                                                "*Help*" nil))))
+                  (comint-redirect-send-command
+                   (format "emacs.ehelp(%S, globals(), locals())\n" ,symbol)
+                   "*Help*" nil))))
     ;; Ensure we have a suitable help buffer.
     ;; Fixme: Maybe process `Related help topics' a la help xrefs and
     ;; allow C-c C-f in help buffer.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 4d44eb36ab3..2c528ff2f84 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -4663,7 +4663,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
        (let* ((name   (concat (file-name-nondirectory (or (buffer-file-name)
                                                           (buffer-name)))
                               ".ps"))
-              (prompt (format "Save PostScript to file: (default %s) " name))
+              (prompt (format "Save PostScript to file (default %s): " name))
               (res    (read-file-name prompt default-directory name nil)))
          (while (cond ((file-directory-p res)
                        (ding)
diff --git a/lisp/rect.el b/lisp/rect.el
index d7ae6592f74..a7a863e204b 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -332,7 +332,7 @@ Called from a program, takes three args; START, END and STRING."
           (list
            (region-beginning)
            (region-end)
-           (read-string (format "String rectangle (default `%s'): "
+           (read-string (format "String rectangle (default %s): "
                                 (or (car string-rectangle-history) ""))
                         nil 'string-rectangle-history
                         (car string-rectangle-history)))))
@@ -353,7 +353,7 @@ This command does not delete or overwrite any existing text."
           (list
            (region-beginning)
            (region-end)
-           (read-string (format "String insert rectangle (default `%s'): "
+           (read-string (format "String insert rectangle (default %s): "
                                 (or (car string-rectangle-history) ""))
                         nil 'string-rectangle-history
                         (car string-rectangle-history)))))
diff --git a/lisp/replace.el b/lisp/replace.el
index 33162b02d3c..e2562ed3469 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -907,7 +907,7 @@ If the value is nil, don't highlight the buffer names specially."
                (input
                 (read-from-minibuffer
                  (if default
-                     (format "List lines matching regexp (default `%s'): "
+                     (format "List lines matching regexp (default %s): "
                              (query-replace-descr default))
                    "List lines matching regexp: ")
                  nil
diff --git a/lisp/ses.el b/lisp/ses.el
index 75562edddb9..4c959c015a7 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -2560,7 +2560,7 @@ spot, or error signal if user requests cancel."
           colbool  (> needcols 0))
     (when (or rowbool colbool)
       ;;Need to insert.  Get confirm
-      (or (y-or-n-p (format "Yank will insert %s%s%s.  Continue "
+      (or (y-or-n-p (format "Yank will insert %s%s%s.  Continue? "
                             (if rowbool (format "%d rows" needrows) "")
                             (if (and rowbool colbool) " and " "")
                             (if colbool (format "%d columns" needcols) "")))
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 990049afff1..8dd5f375daa 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -438,7 +438,7 @@ in the cluster."
                        (sit-for 2))
                      try-regexp))
 ;        (username (read-no-blanks-input
-;                   (format "Username [default: %s]: "
+;                   (format "Username (default %s): "
 ;                           (shadow-get-user primary))
 ;                   (if old (or (shadow-cluster-username old) "")
 ;                     (user-login-name))))
@@ -458,7 +458,7 @@ specific hostnames, or names of clusters \(see `shadow-define-cluster')."
          (name (nth 2 hup))
          user site group)
     (while (setq site (shadow-read-site))
-      (setq user (read-string (format "Username [default %s]: "
+      (setq user (read-string (format "Username (default %s): "
                                       (shadow-get-user site)))
             name (read-string "Filename: " name))
       (setq group (cons (shadow-make-fullname site
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 31c7c4f2f12..e777f3f8211 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -335,7 +335,17 @@ according to `smerge-match-conflict'.")
 
 (defun smerge-remove-props (beg end)
   (remove-overlays beg end 'smerge 'refine)
-  (remove-overlays beg end 'smerge 'conflict))
+  (remove-overlays beg end 'smerge 'conflict)
+  ;; Now that we use overlays rather than text-properties, this function
+  ;; does not cause refontification any more.  It can be seen very clearly
+  ;; in buffers where jit-lock-contextually is not t, in which case deleting
+  ;; the "<<<<<<< foobar" leading line leaves the rest of the conflict
+  ;; highlighted as if it were still a valid conflict.  Note that in many
+  ;; important cases (such as the previous example) we're actually called
+  ;; during font-locking so inhibit-modification-hooks is non-nil, so we
+  ;; can't just modify the buffer and expect font-lock to be triggered as in:
+  ;; (put-text-property beg end 'smerge-force-highlighting nil)
+  (remove-text-properties beg end '(fontified nil)))
 
 (defun smerge-popup-context-menu (event)
   "Pop up the Smerge mode context menu under mouse."
diff --git a/lisp/subr.el b/lisp/subr.el
index 91d21aa85a6..644172d88f3 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2862,9 +2862,11 @@ Usually the separator is \".\", but it can be any other string.")
 
 
 (defvar version-regexp-alist
-  '(("^a\\(lpha\\)?$"   . -3)
-    ("^b\\(eta\\)?$"    . -2)
-    ("^\\(pre\\|rc\\)$" . -1))
+  '(("^[-_+]?a\\(lpha\\)?$"   . -3)
+    ("^[-_+]$" . -3)    ; treat "1.2.3-20050920" and "1.2-3" as alpha releases
+    ("^[-_+]cvs$" . -3) ; treat "1.2.3-CVS" as alpha release
+    ("^[-_+]?b\\(eta\\)?$"    . -2)
+    ("^[-_+]?\\(pre\\|rc\\)$" . -1))
   "*Specify association between non-numeric version part and a priority.
 
 This association is used to handle version string like \"1.0pre2\",
@@ -2887,6 +2889,9 @@ Each element has the following form:
 Where:
 
 REGEXP          regexp used to match non-numeric part of a version string.
+                It should begin with a `^' anchor and end with a `$' to
+                prevent false hits.  Letter-case is ignored while matching
+                REGEXP.
 
 PRIORITY        negative integer which indicate the non-numeric priority.")
 
@@ -2903,9 +2908,12 @@ The version syntax is given by the following EBNF:
    SEPARATOR ::= `version-separator' (which see)
                | `version-regexp-alist' (which see).
 
+The NUMBER part is optional if SEPARATOR is a match for an element
+in `version-regexp-alist'.
+
 As an example of valid version syntax:
 
-   1.0pre2   1.0.7.5   22.8beta3   0.9alpha1
+   1.0pre2   1.0.7.5   22.8beta3   0.9alpha1   6.9.30Beta
 
 As an example of invalid version syntax:
 
@@ -2928,7 +2936,7 @@ See documentation for `version-separator' and `version-regexp-alist'."
       (error "Invalid version string: '%s'" ver))
   (save-match-data
     (let ((i 0)
-          case-fold-search              ; ignore case in matching
+          (case-fold-search t)          ; ignore case in matching
           lst s al)
       (while (and (setq s (string-match "[0-9]+" ver i))
                   (= s i))
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 1b4e5a6f61f..7cd02570d84 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -33,7 +33,7 @@
   ;; a PC-style keyboard these keys correspond to
   ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The
   ;; code here subsitutes the corresponding defintions in
-  ;; function-key-map. This substitution is needed because if a key
+  ;; function-key-map.  This substitution is needed because if a key
   ;; definition if found in function-key-map, there are no further
   ;; lookups in other keymaps.
   (substitute-key-definition [f11] [S-f1] function-key-map)
@@ -75,12 +75,13 @@
     (define-key map "\e[B" [down])
     (define-key map "\e[C" [right])
     (define-key map "\e[D" [left])
-    (define-key map "\e[7~" [home])
     (define-key map "\e[2~" [insert])
     (define-key map "\e[3~" [delete])
     (define-key map "\e[4~" [select])
     (define-key map "\e[5~" [prior])
     (define-key map "\e[6~" [next])
+    (define-key map "\e[7~" [home])
+    (define-key map "\e[8~" [end])
     (define-key map "\e[11~" [f1])
     (define-key map "\e[12~" [f2])
     (define-key map "\e[13~" [f3])
@@ -145,8 +146,8 @@
     (define-key map "\e[3$" [S-delete])
     (define-key map "\e[5$" [S-prior])
     (define-key map "\e[6$" [S-next])
-    (define-key map "\e[8$" [S-end])
     (define-key map "\e[7$" [S-home])
+    (define-key map "\e[8$" [S-end])
     (define-key map "\e[d" [S-left])
     (define-key map "\e[c" [S-right])
     (define-key map "\e[a" [S-up])
@@ -175,8 +176,8 @@
     ("blue"           4 (  0   0 205))  ; blue3
     ("magenta"        5 (205   0 205))  ; magenta3
     ("cyan"           6 (  0 205 205))  ; cyan3
-    ("white"          7 (250 235 215))  ; AntiqueWhite
-    ("brightblack"    8 ( 64  64  64))  ; gray25
+    ("white"          7 (229 229 229))  ; gray90
+    ("brightblack"    8 ( 77  77  77))  ; gray30
     ("brightred"      9 (255   0   0))  ; red
     ("brightgreen"   10 (  0 255   0))  ; green
     ("brightyellow"  11 (255 255   0))  ; yellow
@@ -209,6 +210,67 @@ for the currently selected frame."
       (setq colors (cdr colors)
             color (car colors)
             ncolors (1- ncolors)))
+    (when (> ncolors 0)
+      (cond
+       ((= ncolors 240)                 ; 256-color rxvt
+        ;; 216 non-gray colors first
+        (let ((r 0) (g 0) (b 0))
+          (while (> ncolors 24)
+            ;; This and other formulae taken from 256colres.pl and
+            ;; 88colres.pl in the xterm distribution.
+            (tty-color-define (format "color-%d" (- 256 ncolors))
+                              (- 256 ncolors)
+                              (mapcar 'rxvt-rgb-convert-to-16bit
+                                      (list (round (* r 42.5))
+                                            (round (* g 42.5))
+                                            (round (* b 42.5)))))
+            (setq b (1+ b))
+            (if (> b 5)
+                (setq g (1+ g)
+                      b 0))
+            (if (> g 5)
+                (setq r (1+ r)
+                      g 0))
+            (setq ncolors (1- ncolors))))
+        ;; Now the 24 gray colors
+        (while (> ncolors 0)
+          (setq color (rxvt-rgb-convert-to-16bit (+ 8 (* (- 24 ncolors) 10))))
+          (tty-color-define (format "color-%d" (- 256 ncolors))
+                            (- 256 ncolors)
+                            (list color color color))
+          (setq ncolors (1- ncolors))))
+       
+       ((= ncolors 72) ; rxvt-unicode
+        ;; 64 non-gray colors
+        (let ((levels '(0 139 205 255))
+              (r 0) (g 0) (b 0))
+          (while (> ncolors 8)
+            (tty-color-define (format "color-%d" (- 88 ncolors))
+                              (- 88 ncolors)
+                              (mapcar 'rxvt-rgb-convert-to-16bit
+                                      (list (nth r levels)
+                                            (nth g levels)
+                                            (nth b levels))))
+            (setq b (1+ b))
+            (if (> b 3)
+                (setq g (1+ g)
+                      b 0))
+            (if (> g 3)
+                (setq r (1+ r)
+                      g 0))
+            (setq ncolors (1- ncolors))))
+        ;; Now the 8 gray colors
+        (while (> ncolors 0)
+          (setq color (rxvt-rgb-convert-to-16bit
+                       (floor
+                        (if (= ncolors 8)
+                            46.36363636
+                          (+ (* (- 8 ncolors) 23.18181818) 69.54545454)))))
+          (tty-color-define (format "color-%d" (- 88 ncolors))
+                            (- 88 ncolors)
+                            (list color color color))
+          (setq ncolors (1- ncolors))))
+       (t (error "Unsupported number of rxvt colors (%d)" (+ 16 ncolors)))))
     ;; Modifying color mappings means realized faces don't use the
     ;; right colors, so clear them.
     (clear-face-cache)))
@@ -236,5 +298,5 @@ for the currently selected frame."
           (setq default-frame-background-mode 'dark)))
     (frame-set-background-mode (selected-frame))))
 
-;;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257
+;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257
 ;;; rxvt.el ends here
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index ce37d1b6086..60b85a4522a 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -34,7 +34,7 @@
   (if (and (getenv "COLORTERM")
            (string-match "\\`rxvt" (getenv "COLORTERM")))
       (progn 
-        (eval-when-compile (load "term/rxvt"))
+        (eval-and-compile (load "term/rxvt"))
         (terminal-init-rxvt))
 
     ;; The terminal intialization C code file might have initialized
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 75d0c7acbd7..645d7a6bd6a 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1115,7 +1115,7 @@ subprocess started."
                          (getenv "SHELL")
                          "/bin/sh"))
                    (s (read-string
-                       (format "Run program in emulator: (default %s) "
+                       (format "Run program in emulator (default %s): "
                                default-s))))
               (if (equal s "")
                   (list default-s '())
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index c3340d6fd37..c9fcd01d018 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -2863,9 +2863,9 @@ Returns a list of strings."
   "Read any extra arguments for figlet."
   (interactive)
   (let* ((avail-fonts  (artist-figlet-get-font-list))
-         (font (completing-read (concat "Select font: (default "
+         (font (completing-read (concat "Select font (default "
                                         artist-figlet-default-font
-                                        ") ")
+                                        "): ")
                                 (mapcar
                                  (lambda (font) (cons font font))
                                  avail-fonts))))
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index e46b8533fc4..151a32c60a9 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -169,11 +169,12 @@ command was not the very same command."
 
 (defcustom flyspell-incorrect-hook nil
   "*List of functions to be called when incorrect words are encountered.
-Each function is given three arguments: the beginning and the end
-of the incorrect region.  The third is either the symbol 'doublon' or the list
+Each function is given three arguments.  The first two
+arguments are the beginning and the end of the incorrect region.
+The third is either the symbol `doublon' or the list
 of possible corrections as returned by `ispell-parse-output'.
 
-If any of the functions return non-Nil, the word is not highlighted as
+If any of the functions return non-nil, the word is not highlighted as
 incorrect."
   :group 'flyspell
   :version "21.1"
@@ -1086,6 +1087,8 @@ Mostly we check word delimiters."
                                               word
                                               (+ end
                                                  flyspell-duplicate-distance))))))
+                              ;; This is a misspelled word which occurs
+                              ;; twice within flyspell-duplicate-distance.
                               (setq flyspell-word-cache-result nil)
                               (if flyspell-highlight-flag
                                   (flyspell-highlight-duplicate-region
@@ -1559,7 +1562,11 @@ for the overlay."
 ;*    flyspell-highlight-incorrect-region ...                          */
 ;*---------------------------------------------------------------------*/
 (defun flyspell-highlight-incorrect-region (beg end poss)
-  "Set up an overlay on a misspelled word, in the buffer from BEG to END."
+  "Set up an overlay on a misspelled word, in the buffer from BEG to END.
+POSS is usually a list of possible spelling/correction lists,
+as returned by `ispell-parse-output'.
+It can also be the symbol `doublon', in the case where the word
+is itself incorrect, but suspiciously repeated."
   (let ((inhibit-read-only t))
     (unless (run-hook-with-args-until-success
              'flyspell-incorrect-hook beg end poss)
@@ -1592,8 +1599,9 @@ for the overlay."
 ;*    flyspell-highlight-duplicate-region ...                          */
 ;*---------------------------------------------------------------------*/
 (defun flyspell-highlight-duplicate-region (beg end poss)
-  "Set up an overlay on a duplicated word, in the buffer from BEG to END.
-??? What does POSS mean?"
+  "Set up an overlay on a duplicate misspelled word, in the buffer from BEG to END.
+POSS is a list of possible spelling/correction lists,
+as returned by `ispell-parse-output'."
   (let ((inhibit-read-only t))
     (unless (run-hook-with-args-until-success
              'flyspell-incorrect-hook beg end poss)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 209e532b0e7..8da812dd45a 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -880,6 +880,16 @@ and added as a submenu of the \"Edit\" menu.")
 (defvar ispell-have-aspell-dictionaries nil
   "Non-nil if we have queried Aspell for dictionaries at least once.")
 
+(defun ispell-maybe-find-aspell-dictionaries ()
+  "Find Aspell's dictionaries, unless already done."
+  (when (and (not ispell-have-aspell-dictionaries)
+             (condition-case ()
+                 (progn (ispell-check-version) t)
+               (error nil))
+             ispell-really-aspell
+             ispell-aspell-supports-utf8)
+    (ispell-find-aspell-dictionaries)))
+
 (defun ispell-find-aspell-dictionaries ()
   "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
   (interactive)
@@ -976,13 +986,7 @@ Assumes that value contains no whitespace."
   "Returns a list of valid dictionaries.
 The variable `ispell-library-directory' defines the library location."
   ;; If Ispell is really Aspell, query it for the dictionary list.
-  (when (and (not ispell-have-aspell-dictionaries)
-             (condition-case ()
-                 (progn (ispell-check-version) t)
-               (error nil))
-             ispell-really-aspell
-             ispell-aspell-supports-utf8)
-    (ispell-find-aspell-dictionaries))
+  (ispell-maybe-find-aspell-dictionaries)
   (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
         (dict-list (cons "default" nil))
         name load-dict)
@@ -3543,6 +3547,7 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 (defun ispell-accept-buffer-local-defs ()
   "Load all buffer-local information, restarting Ispell when necessary."
+  (ispell-maybe-find-aspell-dictionaries)
   (ispell-buffer-local-dict)            ; May kill ispell-process.
   (ispell-buffer-local-words)           ; Will initialize ispell-process.
   (ispell-buffer-local-parsing))
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 9dadfcb152d..938091d18eb 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 3.15
+;; Version: 3.16
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
@@ -80,6 +80,17 @@
 ;;
 ;; Changes:
 ;; -------
+;; Version 3.16
+;;    - In tables, directly after the field motion commands like TAB and RET,
+;;      typing a character will blank the field.  Can be turned off with
+;;      variable `org-table-auto-blank-field'.
+;;    - Inactive timestamps with `C-c !'.  These do not trigger the agenda
+;;      and are not linked to the calendar.
+;;    - Additional key bindings to allow Org-mode to function on a tty emacs.
+;;    - `C-c C-h' prefix key replaced by `C-c C-x', and `C-c C-x C-h' replaced
+;;      by `C-c C-x b' (b=Browser).  This was necessary to recover the
+;;      standard meaning of C-h after a prefix key (show prefix bindings).
+;;
 ;; Version 3.15
 ;;    - QUOTE keyword at the beginning of an entry causes fixed-width export
 ;;      of unmodified entry text. `C-c :' toggles this keyword.
@@ -199,7 +210,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "3.15"
+(defvar org-version "3.16"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -843,6 +854,13 @@ as possible."
   :group 'org-structure
   :type 'hook)
 
+(defcustom org-level-color-stars-only nil
+  "Non-nil means fontify only the stars in each headline.
+When nil, the entire headline is fontified.
+After changin this, requires restart of Emacs to become effective."
+  :group 'org-structure
+  :type 'boolean)
+
 (defcustom org-adapt-indentation t
   "Non-nil means, adapt indentation when promoting and demoting.
 When this is set and the *entire* text in an entry is indented, the
@@ -852,6 +870,14 @@ body starts at column 0, indentation is not changed at all."
   :group 'org-structure
   :type 'boolean)
 
+(defcustom org-enable-fixed-width-editor t
+  "Non-nil means, lines starting with \":\" are treated as fixed-width.
+This currently only means, they are never auto-wrapped.
+When nil, such lines will be treated like ordinary lines.
+See also the QUOTE keyword."
+  :group 'org-structure
+  :type 'boolean)
+
 (defcustom org-cycle-emulate-tab t
   "Where should `org-cycle' emulate TAB.
 nil    Never
@@ -1155,24 +1181,34 @@ do the following
   field does not exceed the column width.
 - Minimize the number of realigns.  Normally, the table is aligned each time
   TAB or RET are pressed to move to another field.  With optimization this
-  happens only if changes to a field might have  changed the column width.
+  happens only if changes to a field might have changed the column width.
 Optimization requires replacing the functions `self-insert-command',
 `delete-char', and `backward-delete-char' in Org-mode buffers, with a
 slight (in fact: unnoticeable) speed impact for normal typing.  Org-mode is
 very good at guessing when a re-align will be necessary, but you can always
-force one with `C-c C-c'.
+force one with \\[org-ctrl-c-ctrl-c].
 
 If you would like to use the optimized version in Org-mode, but the
 un-optimized version in OrgTbl-mode, see the variable `orgtbl-optimized'.
 
 This variable can be used to turn on and off the table editor during a session,
-but in order to toggle optimization, a restart is required."
+but in order to toggle optimization, a restart is required.
+
+See also the variable `org-table-auto-blank-field'."
   :group 'org-table
   :type '(choice
           (const :tag "off" nil)
           (const :tag "on" t)
           (const :tag "on, optimized" optimized)))
 
+(defcustom org-table-auto-blank-field t
+  "Non-nil means, automatically blank table field when starting to type into it.
+This only happens when typing immediately after a field motion
+command (TAB, S-TAB or RET).
+Only relevant when `org-enable-table-editor' is equal to `optimized'."
+  :group 'org-table
+  :type 'boolean)
+
 (defcustom org-table-default-size "5x2"
   "The default size for newly created tables, Columns x Rows."
   :group 'org-table
@@ -1248,14 +1284,6 @@ calls `table-recognize-table'."
   :group 'org-table
   :type 'boolean)
 
-;; FIXME: Should this one be in another group?  Which one?
-(defcustom org-enable-fixed-width-editor t
-  "Non-nil means, lines starting with \":\" are treated as fixed-width.
-This currently only means, they are never auto-wrapped.
-When nil, such lines will be treated like ordinary lines."
-  :group 'org-table
-  :type 'boolean)
-
 (defgroup org-table-calculation nil
   "Options concerning tables in Org-mode."
   :tag "Org Table Calculation"
@@ -1978,17 +2006,19 @@ The following commands are available:
          (append
           (if org-noutline-p     ; FIXME:  I am not sure if eval will work
                                  ; on XEmacs if noutline is ever ported
-              '((eval . (list "^\\(\\*+\\).*"
-                              0 '(nth
+              `((eval . (list "^\\(\\*+\\).*"
+                              ,(if org-level-color-stars-only 1 0)
+                              '(nth   ;; FIXME:  1<->0 ????
                                   (% (- (match-end 1) (match-beginning 1) 1)
                                      org-n-levels)
                                   org-level-faces)
                               nil t)))
-            '(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]"
-               (1 (nth (% (- (match-end 2) (match-beginning 2) 1)
-                          org-n-levels)
-                       org-level-faces)
-                  nil t))))
+            `(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]"
+               (,(if org-level-color-stars-only 2 0)
+                (nth (% (- (match-end 2) (match-beginning 2) 1)
+                        org-n-levels)
+                     org-level-faces)
+                nil t))))
           org-font-lock-extra-keywords))
     (set (make-local-variable 'font-lock-defaults)
          '(org-font-lock-keywords t nil nil backward-paragraph))
@@ -2806,7 +2836,7 @@ At all other locations, this simply calls `ispell-complete-word'."
                  (insert " "))
              (if (and (equal type :opt) (assoc completion table))
                  (message "%s" (substitute-command-keys
-                           "Press \\[org-complete] again to insert example settings"))))
+                                "Press \\[org-complete] again to insert example settings"))))
             (t
              (message "Making completion list...")
              (let ((list (sort (all-completions pattern table) 'string<)))
@@ -2913,7 +2943,7 @@ to modify it to the correct date."
    (format-time-string (car org-time-stamp-formats)
                        (org-read-date nil 'to-time)))
   (message "%s" (substitute-command-keys
-            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+                 "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
 
 (defun org-schedule ()
   "Insert the SCHEDULED: string to schedule a TODO item.
@@ -2925,7 +2955,7 @@ to modify it to the correct date."
    (format-time-string (car org-time-stamp-formats)
                        (org-read-date nil 'to-time)))
   (message "%s" (substitute-command-keys
-            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+                 "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
 
 
 (defun org-occur (regexp &optional callback)
@@ -3077,6 +3107,21 @@ at the cursor, it will be modified."
       (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
       (insert (format-time-string fmt time))))))
 
+(defun org-time-stamp-inactive (&optional arg)
+  "Insert an inactive time stamp.
+An inactive time stamp is enclosed in square brackets instead of angle
+brackets.  It is inactive in the sense that it does not trigger agenda entries,
+does not link to the calendar and cannot be changed with the S-cursor keys."
+  (interactive "P")
+  (let ((fmt (if arg (cdr org-time-stamp-formats)
+               (car org-time-stamp-formats)))
+        (org-time-was-given nil)
+        time)
+    (setq time (org-read-date arg 'totime))
+    (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
+    (setq fmt (concat "[" (substring fmt 1 -1) "]"))
+    (insert (format-time-string fmt time))))
+
 ;;; FIXME: Make the function take "Fri" as "next friday"
 (defun org-read-date (&optional with-time to-time)
   "Read a date and make things smooth for the user.
@@ -3539,6 +3584,8 @@ The following commands are available:
 (define-key org-agenda-mode-map "w"        'org-agenda-week-view)
 (define-key org-agenda-mode-map (org-key 'S-right) 'org-agenda-date-later)
 (define-key org-agenda-mode-map (org-key 'S-left) 'org-agenda-date-earlier)
+(define-key org-agenda-mode-map [?\C-c ?\C-x (right)] 'org-agenda-date-later)
+(define-key org-agenda-mode-map [?\C-c ?\C-x (left)] 'org-agenda-date-earlier)
 
 (define-key org-agenda-mode-map ">" 'org-agenda-date-prompt)
 (let ((l '(1 2 3 4 5 6 7 8 9 0)))
@@ -3574,6 +3621,8 @@ The following commands are available:
 (define-key org-agenda-mode-map "-" 'org-agenda-priority-down)
 (define-key org-agenda-mode-map (org-key 'S-up) 'org-agenda-priority-up)
 (define-key org-agenda-mode-map (org-key 'S-down) 'org-agenda-priority-down)
+(define-key org-agenda-mode-map [?\C-c ?\C-x (up)] 'org-agenda-priority-up)
+(define-key org-agenda-mode-map [?\C-c ?\C-x (down)] 'org-agenda-priority-down)
 (define-key org-agenda-mode-map [(right)] 'org-agenda-later)
 (define-key org-agenda-mode-map [(left)] 'org-agenda-earlier)
 
@@ -6321,7 +6370,8 @@ integer, it will be incremented while copying."
 
 (defun org-table-check-inside-data-field ()
   "Is point inside a table data field?
-I.e. not on a hline or before the first or after the last column?"
+I.e. not on a hline or before the first or after the last column?
+This actually throws an error, so it aborts the current command."
   (if (or (not (org-at-table-p))
           (= (org-table-current-column) 0)
           (org-at-table-hline-p)
@@ -7014,13 +7064,10 @@ If NLAST is a number, only the NLAST fields will actually be summed."
                      (format "%d:%02d:%02d" h m s))))
         (kill-new sres)
         (if (interactive-p)
-            (message "%s"
-                     (concat
-                      (format "Sum of %d items: %-20s     "  (length numbers) sres)
-                      (substitute-command-keys
-                       "(\\[yank] will insert result into buffer)")
-                      ))
-          )
+            (message "s"
+                     (substitute-command-keys
+                      (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
+                              (length numbers) sres))))
         sres))))
 
 (defun org-table-get-number-for-summing (s)
@@ -7126,7 +7173,7 @@ the current column, to avoid unnecessary parsing."
          (stored-list (org-table-get-stored-formulas))
          (stored (cdr (assoc scol stored-list)))
          (eq (cond
-              ((and stored equation (string-match "^ *= *$" equation))
+              ((and stored equation (string-match "^ *=? *$" equation))
                stored)
               ((stringp equation)
                equation)
@@ -7294,7 +7341,7 @@ If yes, store the formula and apply it."
   (when org-table-formula-evaluate-inline
     (let* ((field (org-trim (or (org-table-get-field) "")))
            named eq)
-      (when (string-match "^:?=\\(.+\\)" field)
+      (when (string-match "^:?=\\(.*\\)" field)
         (setq named (equal (string-to-char field) ?:)
               eq (match-string 1 field))
         (if (fboundp 'calc-eval)
@@ -7916,8 +7963,7 @@ to execute outside of tables."
           '("\C-c\M-w"           org-table-copy-region)
           '("\C-c\C-y"           org-table-paste-rectangle)
           '("\C-c-"              org-table-insert-hline)
-          '([(shift tab)]        org-table-previous-field)
-          '("\C-c\C-c"           org-ctrl-c-ctrl-c)
+;         '([(shift tab)]        org-table-previous-field)
           '("\C-m"               org-table-next-row)
           (list (org-key 'S-return) 'org-table-copy-down)
           '([(meta return)]      org-table-wrap-region)
@@ -7946,16 +7992,18 @@ to execute outside of tables."
       (orgtbl-make-binding 'orgtbl-tab 102 [(tab)] "\C-i"))
     (define-key orgtbl-mode-map "\C-i"
       (orgtbl-make-binding 'orgtbl-tab 103 "\C-i" [(tab)])))
+    (define-key orgtbl-mode-map "\C-i"
+      (orgtbl-make-binding 'orgtbl-tab 104 [(shift tab)]))
+    (define-key orgtbl-mode-map "\C-c\C-c"
+      (orgtbl-make-binding 'org-ctrl-c-ctrl-c 105 "\C-c\C-c"))
     (when orgtbl-optimized
       ;; If the user wants maximum table support, we need to hijack
       ;; some standard editing functions
-      (substitute-key-definition 'self-insert-command 'orgtbl-self-insert-command
-                                 orgtbl-mode-map global-map)
-      (substitute-key-definition 'delete-char 'orgtbl-delete-char
-                                 orgtbl-mode-map global-map)
-      (substitute-key-definition 'delete-backward-char 'orgtbl-delete-backward-char
-                                 orgtbl-mode-map global-map)
-      (define-key org-mode-map "|" 'self-insert-command))
+      (org-remap orgtbl-mode-map
+                 'self-insert-command 'orgtbl-self-insert-command
+                 'delete-char 'orgtbl-delete-char
+                 'delete-backward-char 'orgtbl-delete-backward-char)
+      (define-key orgtbl-mode-map "|" 'org-force-self-insert))
     (easy-menu-define orgtbl-mode-menu orgtbl-mode-map "OrgTbl menu"
       '("OrgTbl"
         ["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"]
@@ -7980,9 +8028,9 @@ to execute outside of tables."
          "--"
          ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
         ("Rectangle"
-         ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c M-w"]
-         ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-w"]
-         ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-y"]
+         ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c C-x M-w"]
+         ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-x C-w"]
+         ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-x C-y"]
          ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p) :keys "C-c C-q"])
         "--"
         ["Set Column Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
@@ -8018,6 +8066,17 @@ If the cursor is in a table looking at whitespace, the whitespace is
 overwritten, and the table is not marked as requiring realignment."
   (interactive "p")
   (if (and (org-at-table-p)
+           (or
+            (and org-table-auto-blank-field
+                 (member last-command
+                         '(orgtbl-hijacker-command-100
+                           orgtbl-hijacker-command-101
+                           orgtbl-hijacker-command-102
+                           orgtbl-hijacker-command-103
+                           orgtbl-hijacker-command-104
+                           orgtbl-hijacker-command-105))
+                 (org-table-blank-field))
+            t)
            (eq N 1)
            (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
@@ -8029,6 +8088,11 @@ overwritten, and the table is not marked as requiring realignment."
     (let (orgtbl-mode)
       (call-interactively (key-binding (vector last-input-event))))))
 
+(defun org-force-self-insert (N)
+  "Needed to enforce self-insert under remapping."
+  (interactive "p")
+  (self-insert-command N))
+
 (defun orgtbl-delete-backward-char (N)
   "Like `delete-backward-char', insert whitespace at field end in tables.
 When deleting backwards, in tables this function will insert whitespace in
@@ -9344,23 +9408,55 @@ When LEVEL is non-nil, increase section numbers on that level."
 ;;                     i k                 @                                expendable from outline-mode
 ;;   0123456789                          !    %^&     ()_{}    "      `'    free
 
-(define-key org-mode-map "\C-i" 'org-cycle)
+;; TAB key with modifiers
+(define-key org-mode-map "\C-i"       'org-cycle)
 (define-key org-mode-map [(meta tab)] 'org-complete)
-(define-key org-mode-map "\M-\C-i" 'org-complete)
-(define-key org-mode-map [(meta shift left)] 'org-shiftmetaleft)
-(define-key org-mode-map [(meta left)] 'org-metaleft)
-(define-key org-mode-map [(meta shift right)] 'org-shiftmetaright)
-(define-key org-mode-map [(meta shift up)] 'org-shiftmetaup)
-(define-key org-mode-map [(meta shift down)] 'org-shiftmetadown)
+(define-key org-mode-map "\M-\C-i"    'org-complete)            ; for tty emacs
+;; The following line is necessary under Suse GNU/Linux
+(unless org-xemacs-p
+  (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
+(define-key org-mode-map [(shift tab)]    'org-shifttab)
+
+(define-key org-mode-map (org-key 'S-return)   'org-table-copy-down)
+(define-key org-mode-map "\C-c\C-xc"           'org-table-copy-down)     ; tty
+(define-key org-mode-map [(meta shift return)] 'org-insert-todo-heading)
+(define-key org-mode-map "\C-c\C-xM"           'org-insert-todo-heading) ; tty
+(define-key org-mode-map [(meta return)]       'org-meta-return)
+(define-key org-mode-map "\C-c\C-xm"           'org-meta-return)  ; tty emacs
+(define-key org-mode-map [?\e (return)]        'org-meta-return)   ; tty emacs
+
+;; Cursor keys with modifiers
+(define-key org-mode-map [(meta left)]  'org-metaleft)
+(define-key org-mode-map [?\e (left)]   'org-metaleft)          ; for tty emacs
+(define-key org-mode-map "\C-c\C-xl"    'org-metaleft)          ; for tty emacs
 (define-key org-mode-map [(meta right)] 'org-metaright)
-(define-key org-mode-map [(meta up)] 'org-metaup)
-(define-key org-mode-map [(meta down)] 'org-metadown)
-;(define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-subtree)
-;(define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-subtree)
-;(define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-subtree)
-(define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-special)
-(define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-special)
-(define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-special)
+(define-key org-mode-map [?\e (right)]  'org-metaright)         ; for tty emacs
+(define-key org-mode-map "\C-c\C-xr"    'org-metaright)         ; for tty emacs
+(define-key org-mode-map [(meta up)]    'org-metaup)
+(define-key org-mode-map [?\e (up)]     'org-metaup)            ; for tty emacs
+(define-key org-mode-map "\C-c\C-xu"    'org-metaup)            ; for tty emacs
+(define-key org-mode-map [(meta down)]  'org-metadown)
+(define-key org-mode-map [?\e (down)]   'org-metadown)          ; for tty emacs
+(define-key org-mode-map "\C-c\C-xd"    'org-metadown)          ; for tty emacs
+
+(define-key org-mode-map [(meta shift left)]       'org-shiftmetaleft)
+(define-key org-mode-map "\C-c\C-xL"               'org-shiftmetaleft)  ; tty
+(define-key org-mode-map [(meta shift right)]      'org-shiftmetaright)
+(define-key org-mode-map "\C-c\C-xR"               'org-shiftmetaright) ; tty
+(define-key org-mode-map [(meta shift up)]         'org-shiftmetaup)
+(define-key org-mode-map "\C-c\C-xU"               'org-shiftmetaup)    ; tty
+(define-key org-mode-map [(meta shift down)]       'org-shiftmetadown)
+(define-key org-mode-map "\C-c\C-xD"               'org-shiftmetadown)  ; tty
+(define-key org-mode-map (org-key 'S-up)       'org-shiftup)
+(define-key org-mode-map [?\C-c ?\C-x (up)]    'org-shiftup)
+(define-key org-mode-map (org-key 'S-down)     'org-shiftdown)
+(define-key org-mode-map [?\C-c ?\C-x (down)]  'org-shiftdown)
+(define-key org-mode-map (org-key 'S-left)     'org-timestamp-down-day)
+(define-key org-mode-map [?\C-c ?\C-x (left)]  'org-timestamp-down-day)
+(define-key org-mode-map (org-key 'S-right)    'org-timestamp-up-day)
+(define-key org-mode-map [?\C-c ?\C-x (right)] 'org-timestamp-up-day)
+
+;; All the other keys
 (define-key org-mode-map "\C-c$"    'org-archive-subtree)
 (define-key org-mode-map "\C-c\C-j" 'org-goto)
 (define-key org-mode-map "\C-c\C-t" 'org-todo)
@@ -9372,11 +9468,11 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c/"    'org-occur)   ; Minor-mode reserved
 (define-key org-mode-map "\C-c\C-m" 'org-insert-heading)
 (define-key org-mode-map "\M-\C-m"  'org-insert-heading)
-(define-key org-mode-map [(meta shift return)] 'org-insert-todo-heading)
 (define-key org-mode-map "\C-c\C-l" 'org-insert-link)
 (define-key org-mode-map "\C-c\C-o" 'org-open-at-point)
 (define-key org-mode-map "\C-c\C-z" 'org-time-stamp)  ; Alternative binding
 (define-key org-mode-map "\C-c."    'org-time-stamp)  ; Minor-mode reserved
+(define-key org-mode-map "\C-c!"    'org-time-stamp-inactive) ; Minor-mode r.
 (define-key org-mode-map "\C-c,"    'org-priority)    ; Minor-mode reserved
 (define-key org-mode-map "\C-c\C-y" 'org-evaluate-time-range)
 (define-key org-mode-map "\C-c>"    'org-goto-calendar)
@@ -9384,19 +9480,9 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c["    'org-add-file)
 (define-key org-mode-map "\C-c]"    'org-remove-file)
 (define-key org-mode-map "\C-c\C-r"       'org-timeline)
-(define-key org-mode-map (org-key 'S-up)    'org-shiftup)
-(define-key org-mode-map (org-key 'S-down)  'org-shiftdown)
-(define-key org-mode-map (org-key 'S-left)  'org-timestamp-down-day)
-(define-key org-mode-map (org-key 'S-right) 'org-timestamp-up-day)
 (define-key org-mode-map "\C-c-"          'org-table-insert-hline)
-;; The following line is necessary for German keyboards under Suse GNU/Linux
-(unless org-xemacs-p
-  (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
-(define-key org-mode-map [(shift tab)]    'org-shifttab)
 (define-key org-mode-map "\C-c\C-c"       'org-ctrl-c-ctrl-c)
 (define-key org-mode-map "\C-m"           'org-return)
-(define-key org-mode-map (org-key 'S-return) 'org-table-copy-down)
-(define-key org-mode-map [(meta return)]  'org-meta-return)
 (define-key org-mode-map "\C-c?"          'org-table-current-column)
 (define-key org-mode-map "\C-c "          'org-table-blank-field)
 (define-key org-mode-map "\C-c+"          'org-table-sum)
@@ -9411,12 +9497,18 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c\C-x\C-a"   'org-export-as-ascii)
 (define-key org-mode-map "\C-c\C-xv"      'org-export-copy-visible)
 (define-key org-mode-map "\C-c\C-x\C-v"   'org-export-copy-visible)
+;; OPML support is only planned
 ;(define-key org-mode-map "\C-c\C-xo"      'org-export-as-opml)
 ;(define-key org-mode-map "\C-c\C-x\C-o"   'org-export-as-opml)
 (define-key org-mode-map "\C-c\C-xt"      'org-insert-export-options-template)
 (define-key org-mode-map "\C-c:"          'org-toggle-fixed-width-section)
 (define-key org-mode-map "\C-c\C-xh"      'org-export-as-html)
-(define-key org-mode-map "\C-c\C-x\C-h"   'org-export-as-html-and-open)
+(define-key org-mode-map "\C-c\C-xb"      'org-export-as-html-and-open)
+(define-key org-mode-map "\C-c\C-x\C-b"   'org-export-as-html-and-open)
+
+(define-key org-mode-map "\C-c\C-x\C-w"   'org-cut-special)
+(define-key org-mode-map "\C-c\C-x\M-w"   'org-copy-special)
+(define-key org-mode-map "\C-c\C-x\C-y"   'org-paste-special)
 
 (defsubst org-table-p () (org-at-table-p))
 
@@ -9426,6 +9518,12 @@ If the cursor is in a table looking at whitespace, the whitespace is
 overwritten, and the table is not marked as requiring realignment."
   (interactive "p")
   (if (and (org-table-p)
+           (or
+            (and org-table-auto-blank-field
+                 (member last-command
+                         '(org-cycle org-return org-shifttab org-ctrl-c-ctrl-c))
+                 (org-table-blank-field))
+            t)
            (eq N 1)
            (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
@@ -9480,30 +9578,42 @@ a reduced column width."
 ;; How to do this: Measure non-white length of current string
 ;; If equal to column width, we should realign.
 
+(defun org-remap (map &rest commands)
+  "In MAP, remap the functions given in COMMANDS.
+COMMANDS is a list of alternating OLDDEF NEWDEF command names."
+  (let (new old)
+    (while commands
+      (setq old (pop commands) new (pop commands))
+      (if (fboundp 'command-remapping)
+          (define-key map (vector 'remap old) new)
+        (substitute-key-definition old new map global-map)))))
+  
 (when (eq org-enable-table-editor 'optimized)
   ;; If the user wants maximum table support, we need to hijack
   ;; some standard editing functions
-  (substitute-key-definition 'self-insert-command 'org-self-insert-command
-                             org-mode-map global-map)
-  (substitute-key-definition 'delete-char 'org-delete-char
-                             org-mode-map global-map)
-  (substitute-key-definition 'delete-backward-char 'org-delete-backward-char
-                             org-mode-map global-map)
-  (define-key org-mode-map "|" 'self-insert-command))
+  (org-remap org-mode-map
+             'self-insert-command 'org-self-insert-command
+             'delete-char 'org-delete-char
+             'delete-backward-char 'org-delete-backward-char)
+  (define-key org-mode-map "|" 'org-force-self-insert))
 
 (defun org-shiftcursor-error ()
   "Throw an error because Shift-Cursor command was applied in wrong context."
   (error "This command is only active in tables and on headlines"))
 
 (defun org-shifttab ()
-  "Call `(org-cycle t)' or `org-table-previous-field'."
+  "Global visibility cycling or move to previous table field.
+Calls `(org-cycle t)' or `org-table-previous-field', depending on context.
+See the individual commands for more information."
   (interactive)
   (cond
    ((org-at-table-p) (org-table-previous-field))
    (t (org-cycle '(4)))))
 
 (defun org-shiftmetaleft ()
-  "Call `org-promote-subtree' or `org-table-delete-column'."
+  "Promote subtree or delete table column.
+Calls `org-promote-subtree' or `org-table-delete-column', depending on context.
+See the individual commands for more information."
   (interactive)
   (cond
    ((org-at-table-p) (org-table-delete-column))
@@ -9511,7 +9621,9 @@ a reduced column width."
    (t (org-shiftcursor-error))))
 
 (defun org-shiftmetaright ()
-  "Call `org-demote-subtree' or `org-table-insert-column'."
+  "Demote subtree or insert table column.
+Calls `org-demote-subtree' or `org-table-insert-column', depending on context.
+See the individual commands for more information."
   (interactive)
   (cond
    ((org-at-table-p) (org-table-insert-column))
@@ -9519,14 +9631,18 @@ a reduced column width."
    (t (org-shiftcursor-error))))
 
 (defun org-shiftmetaup (&optional arg)
-  "Call `org-move-subtree-up' or `org-table-kill-row'."
+  "Move subtree up or kill table row.
+Calls `org-move-subtree-up' or `org-table-kill-row', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-kill-row))
    ((org-on-heading-p) (org-move-subtree-up arg))
    (t (org-shiftcursor-error))))
 (defun org-shiftmetadown (&optional arg)
-  "Call `org-move-subtree-down' or `org-table-insert-row'."
+  "Move subtree down or insert table row.
+Calls `org-move-subtree-down' or `org-table-insert-row', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-insert-row arg))
@@ -9534,7 +9650,9 @@ a reduced column width."
    (t (org-shiftcursor-error))))
 
 (defun org-metaleft (&optional arg)
-  "Call `org-do-promote' or `org-table-move-column' to left."
+  "Promote heading or move table column to left.
+Calls `org-do-promote' or `org-table-move-column', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-column 'left))
@@ -9542,7 +9660,9 @@ a reduced column width."
    (t (backward-word (prefix-numeric-value arg)))))
 
 (defun org-metaright (&optional arg)
-  "Call `org-do-demote' or `org-table-move-column' to right."
+  "Demote subtree or move table column to right.
+Calls `org-do-demote' or `org-table-move-column', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-column nil))
@@ -9550,7 +9670,9 @@ a reduced column width."
    (t (forward-word (prefix-numeric-value arg)))))
 
 (defun org-metaup (&optional arg)
-  "Call `org-move-subtree-up' or `org-table-move-row' up."
+  "Move subtree up or move table row up.
+Calls `org-move-subtree-up' or `org-table-move-row', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-row 'up))
@@ -9558,7 +9680,9 @@ a reduced column width."
    (t (org-shiftcursor-error))))
 
 (defun org-metadown (&optional arg)
-  "Call `org-move-subtree-down' or `org-table-move-row' down."
+  "Move subtree down or move table row down.
+Calls `org-move-subtree-down' or `org-table-move-row', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-row nil))
@@ -9566,33 +9690,43 @@ a reduced column width."
    (t (org-shiftcursor-error))))
 
 (defun org-shiftup (&optional arg)
-  "Call `org-timestamp-up' or `org-priority-up'."
+  "Increase item in timestamp or increase priority of current item.
+Calls `org-timestamp-up' or `org-priority-up', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-timestamp-p) (org-timestamp-up arg))
    (t (org-priority-up))))
 
 (defun org-shiftdown (&optional arg)
-  "Call `org-timestamp-down' or `org-priority-down'."
+  "Decrease item in timestamp or decrease priority of current item.
+Calls `org-timestamp-down' or `org-priority-down', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-timestamp-p) (org-timestamp-down arg))
    (t (org-priority-down))))
 
 (defun org-copy-special ()
-  "Call either `org-table-copy' or `org-copy-subtree'."
+  "Copy region in table or copy current subtree.
+Calls `org-table-copy' or `org-copy-subtree', depending on context.
+See the individual commands for more information."
   (interactive)
   (call-interactively
    (if (org-at-table-p) 'org-table-copy-region 'org-copy-subtree)))
 
 (defun org-cut-special ()
-  "Call either `org-table-copy' or `org-cut-subtree'."
+  "Cut region in table or cut current subtree.
+Calls `org-table-copy' or `org-cut-subtree', depending on context.
+See the individual commands for more information."
   (interactive)
   (call-interactively
    (if (org-at-table-p) 'org-table-cut-region 'org-cut-subtree)))
 
 (defun org-paste-special (arg)
-  "Call either `org-table-paste-rectangle' or `org-paste-subtree'."
+  "Paste rectangular region into table, or past subtree relative to level.
+Calls `org-table-paste-rectangle' or `org-paste-subtree', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (if (org-at-table-p)
       (org-table-paste-rectangle)
@@ -9605,7 +9739,8 @@ activate that table.  Otherwise, if the cursor is at a normal table
 created with org.el, re-align that table.  This command works even if
 the automatic table editor has been turned off.
 If the cursor is in one of the special #+KEYWORD lines, this triggers
-scanning the buffer for these lines and updating the information."
+scanning the buffer for these lines and updating the information.
+If the cursor is on a #+TBLFM line, re-apply the formulae to the table."
   (interactive "P")
   (let  ((org-enable-table-editor t))
     (cond
@@ -9629,7 +9764,7 @@ scanning the buffer for these lines and updating the information."
           (skip-chars-backward " \r\n\t")
           (if (org-at-table-p) (org-table-recalculate t))))
        (t
-        (let ((org-inhibit-startup t)) (org-mode)))))
+        (org-mode-restart))))
      ((org-region-active-p)
       (org-table-convert-region (region-beginning) (region-end) arg))
      ((and (region-beginning) (region-end))
@@ -9638,8 +9773,17 @@ scanning the buffer for these lines and updating the information."
         (error "Abort")))
      (t (error "No table at point, and no region to make one")))))
 
+(defun org-mode-restart ()
+  "Restart Org-mode, to scan again for special lines.
+Also updates the keyword regular expressions."
+  (interactive)
+  (let ((org-inhibit-startup t)) (org-mode))
+  (message "Org-mode restarted to refresh keyword and special line setup"))
+
 (defun org-return ()
-  "Call `org-table-next-row' or `newline'."
+  "Goto next table row or insert a newline.
+Calls `org-table-next-row' or `newline', depending on context.
+See the individual commands for more information."
   (interactive)
   (cond
    ((org-at-table-p)
@@ -9648,7 +9792,9 @@ scanning the buffer for these lines and updating the information."
    (t (newline))))
 
 (defun org-meta-return (&optional arg)
-  "Call `org-insert-heading' or `org-table-wrap-region'."
+  "Insert a new heading or wrap a region in a table.
+Calls `org-insert-heading' or `org-table-wrap-region', depending on context.
+See the individual commands for more information."
   (interactive "P")
   (cond
    ((org-at-table-p)
@@ -9716,6 +9862,7 @@ scanning the buffer for these lines and updating the information."
 (easy-menu-define org-org-menu org-mode-map "Org menu"
   '("Org"
     ["Cycle Visibility" org-cycle (or (bobp) (outline-on-heading-p))]
+    ["Cycle Global Visibility" org-shifttab (not (org-at-table-p))]
     ["Sparse Tree" org-occur t]
     ["Show All" show-all t]
     "--"
@@ -9752,6 +9899,7 @@ scanning the buffer for these lines and updating the information."
      ["Priority Down" org-shiftdown t])
     ("Dates and Scheduling"
      ["Timestamp" org-time-stamp t]
+     ["Timestamp (inactive)" org-time-stamp-inactive t]
      ("Change Date"
       ["1 Day Later" org-timestamp-up-day t]
       ["1 Day Earlier" org-timestamp-down-day t]
@@ -9795,6 +9943,8 @@ scanning the buffer for these lines and updating the information."
      "--"
      ["Build Full Customize Menu" org-create-customize-menu
       (fboundp 'customize-menu-create)])
+    "--"
+    ["Refresh setup" org-mode-restart t]
     ))
 
 (defun org-info (&optional node)
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 82f06576c1a..9fa0afe2046 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -339,7 +339,7 @@ found on the last refer-find-entry or refer-find-next-entry."
              (list (expand-file-name
                     (if (eq major-mode 'bibtex-mode)
                         (read-file-name
-                         (format ".bib file: (default %s) "
+                         (format ".bib file (default %s): "
                                  (file-name-nondirectory
                                   (buffer-file-name)))
                          (file-name-directory (buffer-file-name))
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index f94a9d0956f..65815dd2885 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -67,8 +67,8 @@ What is being used depends upon `reftex-plug-into-AUCTeX'."
       (setq items (list (or (reftex-citation t) ""))))
      (t
       (setq prompt (concat (if optional "(Optional) " "")
-                           (if prompt prompt "Add key")
-                           ": (default none) "))
+                           (if prompt prompt "Add key")
+                           " (default none): "))
       (setq items (multi-prompt "," t prompt (LaTeX-bibitem-list)))))
     (apply 'LaTeX-add-bibitems items)
     (TeX-argument-insert (mapconcat 'identity items ",") optional)))
@@ -79,8 +79,8 @@ What is being used depends upon `reftex-plug-into-AUCTeX'."
 This is the name of an index, not the entry."
   (let (tag taglist)
     (setq prompt (concat (if optional "(Optional) " "")
-                         (if prompt prompt "Index tag")
-                         ": (default none) "))
+                         (if prompt prompt "Index tag")
+                         " (default none): "))
     (if (and reftex-support-index (reftex-plug-flag 4))
         ;; Use RefTeX completion
         (progn
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index fbe1fc4621a..cb85ea201fa 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 18e12a66325..56adf2956c6 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index aa8c6a354ca..580a0c8e314 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 83a5d4ac137..65025645c0d 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -166,13 +166,20 @@ will prompt for other arguments."
   ;; OPT-ARGS is a list of optional argument indices, as given by
   ;; `reftex-parse-args'.
   (let* ((opt (and (integerp itag) (member itag opt-args)))
-         (index-tags (cdr (assq 'index-tags 
-                                (symbol-value reftex-docstruct-symbol))))
-         (default (reftex-default-index))
-         (prompt (concat "Index tag"
-                         (if default (format " (default: %s)" default) "")
-                         (if opt " (optional)" "") ": "))
-         (tag (completing-read prompt (mapcar 'list index-tags))))
+         (index-tags (cdr (assq 'index-tags
+                                (symbol-value reftex-docstruct-symbol))))
+         (default (reftex-default-index))
+         (prompt (concat "Index tag"
+                         (if (or opt default)
+                             (format " (%s): "
+                                     (concat
+                                      (if opt "optional" "")
+                                      (if default
+                                          (concat (if opt ", " "")
+                                                  (format "default %s" default))
+                                        "")))
+                           ": ")))
+         (tag (completing-read prompt (mapcar 'list index-tags))))
     (if (and default (equal tag "")) (setq tag default))
     (reftex-update-default-index tag)
     tag))
@@ -1232,7 +1239,7 @@ If the buffer is non-empty, delete the old header first."
           (beginning-of-line 2))          
       (cond ((fboundp 'zmacs-activate-region) (zmacs-activate-region))
             ((boundp 'make-active) (setq mark-active t)))
-      (if (yes-or-no-p "Delete and rebuilt header ")
+      (if (yes-or-no-p "Delete and rebuild header? ")
           (delete-region (point-min) (point))))
 
     ;; Insert the mode line
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 448f4381d23..032bcba7dc9 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index d3fce91a946..c250806c118 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index 6402a8fea41..f4fc8368a50 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 3e8cd87bea2..541b3091af0 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 7a3cfab6742..703f5b8dd2a 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 81f6ad70f87..8d0aa4bf80d 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;---------------------------------------------------------------------------
 ;;
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index fa6fdea8b18..4c5fe0d3e09 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -472,7 +472,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
            (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
        ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
-       ;; highlighted as tex-verbatim-face.  Let's undo that.
+       ;; highlighted as tex-verbatim face.  Let's undo that.
        ;; This is ugly and brittle :-(  --Stef
        '("^\\(\\\\\\)end" (1 (get-text-property (match-end 1) 'face) t))
        ;; display $$ math $$
@@ -509,7 +509,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
 
 (defun tex-font-lock-append-prop (prop)
   (unless (memq (get-text-property (match-end 1) 'face)
-                '(font-lock-comment-face tex-verbatim-face))
+                '(font-lock-comment-face tex-verbatim))
     prop))
 
 (defconst tex-font-lock-keywords-2
@@ -583,7 +583,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
 (defun tex-font-lock-suscript (pos)
   (unless (or (memq (get-text-property pos 'face)
                     '(font-lock-constant-face font-lock-builtin-face
-                      font-lock-comment-face tex-verbatim-face))
+                      font-lock-comment-face tex-verbatim))
               ;; Check for backslash quoting
               (let ((odd nil)
                     (pos pos))
@@ -1109,7 +1109,7 @@ Inserts the value of `tex-open-quote' (normally ``) or `tex-close-quote'
 inserts \" characters."
   (interactive "*P")
   (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
-          (eq (get-text-property (point) 'face) tex-verbatim-face)
+          (eq (get-text-property (point) 'face) tex-verbatim)
           (save-excursion
             (backward-char (length tex-open-quote))
             (when (or (looking-at (regexp-quote tex-open-quote))
@@ -2341,7 +2341,7 @@ Runs the shell command defined by `tex-show-queue-command'."
 
 (defun latex-indent (&optional arg)
   (if (and (eq (get-text-property (line-beginning-position) 'face)
-               tex-verbatim-face))
+               tex-verbatim))
       'noindent
     (with-syntax-table tex-latex-indent-syntax-table
       ;; TODO: Rather than ignore $, we should try to be more clever about it.
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 28207436688..d29e224f549 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -651,7 +651,9 @@ This hook should be local in the buffer setup to display widgets.")
           (widget-put tree :node (widget-convert node))
           ;; Create the icon widget for the expanded tree.
           (push (widget-create-child-and-convert
-                 tree (widget-get tree (if args :open-icon :empty-icon)))
+                 tree (widget-get tree (if args :open-icon :empty-icon))
+                 ;; Pass the node widget to child.
+                 :node (widget-get tree :node))
                 buttons)
           ;; Create the tree node widget.
           (push (widget-create-child tree (widget-get tree :node))
@@ -701,7 +703,9 @@ This hook should be local in the buffer setup to display widgets.")
       (widget-put tree :node (widget-convert node))
       ;; Create the icon widget for the collapsed tree.
       (push (widget-create-child-and-convert
-             tree (widget-get tree :close-icon))
+             tree (widget-get tree :close-icon)
+             ;; Pass the node widget to child.
+             :node (widget-get tree :node))
             buttons)
       ;; Create the tree node widget.
       (push (widget-create-child tree (widget-get tree :node))
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 271cd01cbfb..b52bc797dda 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -225,7 +225,7 @@ the Meta-CVS command (in that order)."
     ;; Make sure the `mcvs add' will not fire up the CVSEDITOR
     ;; to add a rule for the given file's extension.
     (when (and ext (not (assoc ext types)))
-      (let ((type (completing-read "Type to use [default]: "
+      (let ((type (completing-read "Type to use (default): "
                                    '("default" "name-only" "keep-old"
                                      "binary" "value-only")
                                    nil t nil nil "default")))
diff --git a/lisp/vc.el b/lisp/vc.el
index 665bb3d31e7..f7afbedc354 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1707,7 +1707,7 @@ versions of all registered files in or below it."
   (interactive
    (let ((file (expand-file-name
                 (read-file-name (if buffer-file-name
-                                    "File or dir to diff: (default visited file) "
+                                    "File or dir to diff (default visited file): "
                                   "File or dir to diff: ")
                                 default-directory buffer-file-name t)))
          (rev1-default nil) (rev2-default nil))
@@ -1728,14 +1728,14 @@ versions of all registered files in or below it."
      ;; construct argument list
      (list file
            (read-string (if rev1-default
-                            (concat "Older version: (default "
-                                    rev1-default ") ")
+                            (concat "Older version (default "
+                                    rev1-default "): ")
                           "Older version: ")
                         nil nil rev1-default)
            (read-string (if rev2-default
-                            (concat "Newer version: (default "
-                                    rev2-default ") ")
-                          "Newer version (default: current source): ")
+                            (concat "Newer version (default "
+                                    rev2-default "): ")
+                          "Newer version (default current source): ")
                         nil nil rev2-default))))
   (if (file-directory-p file)
       ;; recursive directory diff
@@ -1998,7 +1998,7 @@ See Info node `Merging'."
         (error "Merge aborted"))))
     (setq first-version
           (read-string (concat "Branch or version to merge from "
-                               "(default: news on current branch): ")))
+                               "(default news on current branch): ")))
     (if (string= first-version "")
         (if (not (vc-find-backend-function backend 'merge-news))
             (error "Sorry, merging news is not implemented for %s" backend)
@@ -2727,7 +2727,7 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
       (error "Deleting files under %s is not supported in VC" backend))
     (if (and buf (buffer-modified-p buf))
         (error "Please save files before deleting them"))
-    (unless (y-or-n-p (format "Really want to delete %s ? "
+    (unless (y-or-n-p (format "Really want to delete %s? "
                               (file-name-nondirectory file)))
       (error "Abort!"))
     (unless (or (file-directory-p file) (null make-backup-files))
@@ -3080,7 +3080,7 @@ colors. `vc-annotate-background' specifies the background color."
          (bfn buffer-file-name)
          (vc-annotate-version
           (if prefix (read-string
-                      (format "Annotate from version: (default %s) " rev)
+                      (format "Annotate from version (default %s): " rev)
                       nil nil rev)
             rev)))
     (if display-mode
@@ -3088,7 +3088,7 @@ colors. `vc-annotate-background' specifies the background color."
       (if prefix
           (setq vc-annotate-display-mode
                 (float (string-to-number
-                        (read-string "Annotate span days: (default 20) "
+                        (read-string "Annotate span days (default 20): "
                                      nil nil "20"))))))
     (setq temp-buffer-name (format "*Annotate %s (rev %s)*"
                                    (buffer-name) vc-annotate-version))
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 290f23276b1..3bcea6329a8 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -283,7 +283,7 @@ This function is provided for backward compatibility, since
   (interactive
    (list (let ((default locale-coding-system))
            (read-coding-system
-            (format "Coding system for system calls (default, %s): "
+            (format "Coding system for system calls (default %s): "
                     default)
             default))))
   (check-coding-system coding-system)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b11240addab..b6ce0aa0f67 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3055,7 +3055,7 @@ It will read a file name from the minibuffer when invoked."
   (abbreviate-file-name
    (if unbound
        (read-file-name prompt)
-     (let ((prompt2 (format "%s (default %s) " prompt value))
+     (let ((prompt2 (format "%s (default %s): " prompt value))
            (dir (file-name-directory value))
            (file (file-name-nondirectory value))
            (must-match (widget-get widget :must-match)))
@@ -3068,7 +3068,7 @@ It will read a file name from the minibuffer when invoked."
 ;;;      (file (file-name-nondirectory value))
 ;;;      (menu-tag (widget-apply widget :menu-tag-get))
 ;;;      (must-match (widget-get widget :must-match))
-;;;      (answer (read-file-name (concat menu-tag ": (default `" value "') ")
+;;;      (answer (read-file-name (concat menu-tag " (default " value "): ")
 ;;;                              dir nil must-match file)))
 ;;;    (widget-value-set widget (abbreviate-file-name answer))
 ;;;    (widget-setup)
@@ -3169,10 +3169,10 @@ It will read a directory name from the minibuffer when invoked."
   "Read coding-system from minibuffer."
   (if (widget-get widget :base-only)
       (intern
-       (completing-read (format "%s (default %s) " prompt value)
+       (completing-read (format "%s (default %s): " prompt value)
                         (mapcar #'list (coding-system-list t)) nil nil nil
                         coding-system-history))
-      (read-coding-system (format "%s (default %s) " prompt value) value)))
+      (read-coding-system (format "%s (default %s): " prompt value) value)))
 
 (defun widget-coding-system-action (widget &optional event)
   (let ((answer
diff --git a/lisp/woman.el b/lisp/woman.el
index 315a0a3bbe5..bc7ec86e4a7 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1229,7 +1229,7 @@ cache to be re-read."
                          word-at-point)))
                 (completing-read
                  (if default
-                     (format "Manual entry [default: %s]: " default)
+                     (format "Manual entry (default %s): " default)
                    "Manual entry: ")
                  woman-topic-all-completions nil 1
                  nil