Merged in changes from CVS trunk.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-404

39 files changed, 876 insertions, 368 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1782616a1c9..fd85c39f3a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,15 +1,185 @@
+2005-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Don't complain about fringe-related
+        built-ins if fringes are not supported.  Ditto about
+        selection-related built-ins.  Fix the test for GTK-related
+        built-ins.
+
+        * menu-bar.el ("Split Window", "Postscript Print Buffer (B+W)")
+        ("Postscript Print Buffer", "Print Region", "Save As...")
+        ("Save", "Insert File...", "Open Directory...")
+        ("Open File...", "Visit New File..."")
+        ("Truncate Long Lines in this Buffer"): Don't look at
+        menu-updating-frame if this display does not support multiple
+        frames.
+
+2005-09-09  Frederik Fouvry  <fouvry@CoLi.Uni-SB.DE>
+
+        * mail/sendmail.el (default-sendmail-coding-system): Doc fix.
+
+2005-09-09  Emilio Lopes  <eclig@gmx.net>
+
+        * woman.el: Format- and whitespace-related changes.
+
+2005-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * woman.el: Fix my email address.
+
+2005-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/sh-script.el (sh-skeleton-pair-default-alist): New var.
+        (sh-mode): Locally set skeleton-pair-default-alist.
+
+        * progmodes/make-mode.el (makefile-add-log-defun): Trim the result.
+
+        * progmodes/flymake.el: Require `compile' unconditionally.
+
+        * mail/sendmail.el (send-mail-function): Add Mailclient alternative.
+
+        * woman.el (woman-file-name): Provide a default, not initial input.
+
+        * smerge-mode.el (smerge-resolve): Pass args to smerge-remove-props.
+
+        * font-lock.el (font-lock-support-mode): Doc fix.
+
+        * descr-text.el (describe-property-list): Handle non-symbol prop names.
+
+2005-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/ange-ftp.el (ange-ftp-process-filter): Revert to ^#+$.
+        Use with-current-buffer.
+        (ange-ftp-gwp-start): Remove unused var `gw-user'.
+        (ange-ftp-guess-hash-mark-size): Remove unused var `result'.
+        (ange-ftp-insert-directory): Remove unused var `short'.
+        (ange-ftp-file-name-sans-versions): Remove unused var `host-type'.
+
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (blink-matching-open): Get rid of text props from
+        the string shown in echo area.  Don't permanently set point.
+        Some rearrangements.
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
+2005-09-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * recentf.el (recentf-filename-handler): Add custom choice
+        `abbreviate-file-name'.
+
+        * msb.el (msb--very-many-menus): Fix typo.
+
+        * disp-table.el (standard-display-european): Don't set
+        enable-multibyte-characters to nil.
+
+2005-09-08  David Ponce  <david@dponce.com>
+
+        * recentf.el (recentf-show-file-shortcuts-flag): New option.
+        (recentf-expand-file-name): Doc fix.
+        (recentf-dialog-mode-map): Define digit shortcuts.
+        (recentf--files-with-key): New variable.
+        (recentf-show-digit-shortcut-filter): New function.
+        (recentf-open-files-items): New function.
+        (recentf-open-files): Use it.
+        (recentf-open-file-with-key): New command.
+
+2005-09-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * woman.el (top): Remap `man' command by `woman' in `woman-mode-map'.
+        (Man-getpage-in-background-advice): Remove defadvice; it isn't
+        necessary any longer with the remapped command.
+        (Man-bgproc-sentinel-advice): Remove defadvice which counts
+        formatting time only.
+
+        * net/tramp.el (tramp-action-password)
+        (tramp-multi-action-password): Compile the password prompt from
+        `method', `user' and `host'.  Sometimes it isn't obvious which
+        password to enter, for example with remote files offered by
+        recentf.el, or with multiple steps.  Suggested by Robert Marshall
+        <robert@chezmarshall.freeserve.co.uk>.
+
+2005-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+        Fix regexp for when "s///" is at the beginning of line.
+
+2005-09-07  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-poly.el (math-expand-term): Multiply out any powers
+        when in matrix mode.
+
+2005-09-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buff-menu.el (Buffer-menu-sort-by-column): New function.
+        Suggested by Kim F. Storm.
+        (Buffer-menu-sort-button-map): Global keymap for sort buttons.
+        (Buffer-menu-make-sort-button): Use global keymap.
+
+2005-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buff-menu.el (Buffer-menu-make-sort-button): Add docstrings, use
+        non-anonymous functions.
+
+2005-09-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buff-menu.el (Buffer-menu-make-sort-button): Allow mouse-1 clicks
+        when using a header line.  Otherwise, use mouse-1-click-follows-link.
+
+        * mouse.el (mouse-drag-header-line): Do nothing if the header-line
+        can't be moved; don't signal an error.
+
+2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-theme.el (custom-theme-write-faces): Save the current face
+        spec, not the defface spec.
+
+        * custom.el (custom-known-themes): Clarify meaning of "standard".
+        (custom-push-theme): Save old values in the standard theme.
+        (disable-theme): Correct typo.
+        (custom-face-theme-value) Deleted unused function.
+        (custom-theme-recalc-face): Rewritten to treat enable/disable properly.
+
+2005-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-goto-locus): Take into account
+        iconified frames when determining whether the buffer is
+        already visible.
+        Don't reset window height if the window already existed.
+
 2005-09-04  Chong Yidong  <cyd@stupidchicken.com>
 
-        * custom.el (load-theme): Renamed from require-theme.
+        * custom.el (load-theme): Rename from require-theme.
         Add interactive spec.
-        (enable-theme): Renamed from custom-enable-theme.
+        (enable-theme): Rename from custom-enable-theme.
         Add interactive spec.
-        (disable-theme): Renamed from custom-disable-theme.
+        (disable-theme): Rename from custom-disable-theme.
         Add interactive spec.
         (custom-make-theme-feature): Doc fix.
         (custom-theme-directory): Doc fix.
         (provide-theme): Call enable-theme.
 
+2005-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * obsolete/lazy-lock.el (lazy-lock-mode):
+        * obsolete/fast-lock.el (fast-lock-mode): Don't try to turn on
+        font-lock-mode if it's off.  Print a warning instead.
+
+        * progmodes/compile.el (compilation-start): Ignore errors if the
+        process died before we get to send-eof.
+
+        * textmodes/tex-mode.el (tex-send-tex-command, tex-bibtex-file):
+        Undo last change.  Enclosing the result in quotes broke things on Unix
+        since tex-send-command passes it through shell-quote-argument.
+        (tex-send-command): Pass `file' through convert-standard-filename
+        when possible.
+        (tex-uptodate-p): Handle the case where TeX hasn't put additional
+        info in a transcript.
+
 2005-09-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term/xterm.el (terminal-init-xterm): Add eval-when-compile to
@@ -27,6 +197,8 @@
 
 2005-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * international/mule-cmds.el (set-locale-environment): Soothe compiler.
+
         * obsolete/lazy-lock.el (lazy-lock) <defgroup>: Move from font-lock.el.
 
         * obsolete/fast-lock.el (fast-lock) <defgroup>: Move from font-lock.el.
@@ -169,6 +341,16 @@
         (tramp-advice-make-auto-save-file-name): Make defadvice only when
         `make-auto-save-file-name' is not a magic file name operation.
 
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
 2005-08-30  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el (org-special-keyword): New face.
@@ -470,6 +652,12 @@
         New hook.
         (add-to-diary-list): Call `diary-modify-entry-list-string-function'
 
+2005-08-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Simplify.
+
+        * custom.el (custom-theme-set-variables): Sort minor modes last.
+
 2005-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * subr.el (version-separator, version-regexp-alist): New vars used by
@@ -545,18 +733,16 @@
         (xscheme-allow-output-p, xscheme-prompt, xscheme-mode-string):
         Move to beginning of file.
         (scheme-interaction-mode-commands-alist)
-        (scheme-interaction-mode-map, scheme-debugger-mode-map): Declare
-        them before use.  Note: the initialization code for the variables
-        has not been moved because it uses functions that reference the
-        variables.
+        (scheme-interaction-mode-map, scheme-debugger-mode-map):
+        Declare them before use.  Note: the initialization code for the variables
+        has not been moved because it uses functions that reference the variables.
         (xscheme-control-g-message-string, xscheme-process-filter-alist)
         (xscheme-prompt-for-expression-map): Declare them before use.
         (scheme-debugger-mode-commands): "?\ " -> "?\s".
 
 2005-08-23  Ed Swarthout  <ed.swarthout@gmail.com>  (tiny change)
 
-        * hexl.el (hexl-print-current-point-info): Fix simple spelling
-        error.
+        * hexl.el (hexl-print-current-point-info): Fix simple spelling error.
 
 2005-08-22  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index a0688eefe37..6bd0b347c30 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -1127,7 +1127,7 @@
 
         * isearch.el (isearch-intersects-p): Fix end checks.
 
-2001-09-11  Eli Zaretskii  <a34785@is.elta.co.il>
+2001-09-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * gud.el (dbx) <gud-dbx-use-stopformat-p>: Move this case into the
         `t' branch of `cond', since Irix 6.1 and up is a special case of
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 9418eebe98f..4c45847df0f 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -633,35 +633,40 @@ For more information, see the function `buffer-menu'."
             (insert m2)))
         (forward-line)))))
 
+(defun Buffer-menu-sort-by-column (&optional e)
+  "Sort the buffer menu by the column clicked on."
+  (interactive (list last-input-event))
+  (if e (mouse-select-window e))
+  (let* ((pos (event-start e))
+         (obj (posn-object pos))
+         (col (if obj
+                  (get-text-property (cdr obj) 'column (car obj))
+                (get-text-property (posn-point pos) 'column))))
+    (Buffer-menu-sort col)))
+
+(defvar Buffer-menu-sort-button-map
+  (let ((map (make-sparse-keymap)))
+    ;; This keymap handles both nil and non-nil values for
+    ;; Buffer-menu-use-header-line.
+    (define-key map [header-line mouse-1] 'Buffer-menu-sort-by-column)
+    (define-key map [header-line mouse-2] 'Buffer-menu-sort-by-column)
+    (define-key map [mouse-2] 'Buffer-menu-sort-by-column)
+    (define-key map [follow-link] 'mouse-face)
+    (define-key map "\C-m" 'Buffer-menu-sort-by-column)
+    map)
+  "Local keymap for Buffer menu sort buttons.")
+
 (defun Buffer-menu-make-sort-button (name column)
   (if (equal column Buffer-menu-sort-column) (setq column nil))
   (propertize name
-              'help-echo (if column
-                             (if Buffer-menu-use-header-line
-                                 (concat "mouse-2: sort by " (downcase name))
-                               (concat "mouse-2, RET: sort by "
-                                       (downcase name)))
-                           (if Buffer-menu-use-header-line
-                               "mouse-2: sort by visited order"
-                             "mouse-2, RET: sort by visited order"))
+              'column column
+              'help-echo (concat
+                          (if Buffer-menu-use-header-line
+                              "mouse-1, mouse-2: sort by "
+                            "mouse-2, RET: sort by ")
+                          (if column (downcase name) "visited order"))
               'mouse-face 'highlight
-              'keymap (let ((map (make-sparse-keymap)))
-                        (if Buffer-menu-use-header-line
-                            (define-key map [header-line mouse-2]
-                              `(lambda (e)
-                                 (interactive "e")
-                                 (save-window-excursion
-                                   (if e (mouse-select-window e))
-                                   (Buffer-menu-sort ,column))))
-                          (define-key map [mouse-2]
-                            `(lambda (e)
-                               (interactive "e")
-                               (if e (mouse-select-window e))
-                               (Buffer-menu-sort ,column)))
-                          (define-key map "\C-m"
-                            `(lambda () (interactive)
-                               (Buffer-menu-sort ,column))))
-                        map)))
+              'keymap Buffer-menu-sort-button-map))
 
 (defun list-buffers-noselect (&optional files-only buffer-list)
   "Create and return a buffer with a list of names of existing buffers.
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 3dd19b6f67a..e27705de98a 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1069,18 +1069,45 @@
          (math-add-or-sub (list '/ (nth 1 (nth 1 expr)) (nth 2 expr))
                           (list '/ (nth 2 (nth 1 expr)) (nth 2 expr))
                           nil (eq (car (nth 1 expr)) '-)))
+        ((and (eq calc-matrix-mode 'matrix)
+              (eq (car-safe expr) '^)
+              (natnump (nth 2 expr))
+              (> (nth 2 expr) 1)
+              (memq (car-safe (nth 1 expr)) '(+ -)))
+         (if (= (nth 2 expr) 2)
+             (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
+                              (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
+                              nil (eq (car (nth 1 expr)) '-))
+           (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            (list '* (nth 2 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            nil (eq (car (nth 1 expr)) '-))))
         ((and (eq (car-safe expr) '^)
               (memq (car-safe (nth 1 expr)) '(+ -))
               (integerp (nth 2 expr))
-              (if (> (nth 2 expr) 0)
-                  (or (and (or (> math-mt-many 500000) (< math-mt-many -500000))
-                           (math-expand-power (nth 1 expr) (nth 2 expr)
-                                              nil t))
-                      (list '*
-                            (nth 1 expr)
-                            (list '^ (nth 1 expr) (1- (nth 2 expr)))))
-                (if (< (nth 2 expr) 0)
-                    (list '/ 1 (list '^ (nth 1 expr) (- (nth 2 expr))))))))
+              (if (and (eq calc-matrix-mode 'matrix)
+                       (> (nth 2 expr) 1))
+                  (if (= (nth 2 expr) 2)
+                      (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
+                                       (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
+                                       nil (eq (car (nth 1 expr)) '-))
+                    (math-add-or-sub (list '* (nth 1 (nth 1 expr)) 
+                                           (list '^ (nth 1 expr) 
+                                                 (1- (nth 2 expr))))
+                                     (list '* (nth 2 (nth 1 expr)) 
+                                           (list '^ (nth 1 expr) 
+                                                 (1- (nth 2 expr))))
+                                     nil (eq (car (nth 1 expr)) '-)))
+                (if (> (nth 2 expr) 0)
+                    (or (and (or (> math-mt-many 500000) (< math-mt-many -500000))
+                             (math-expand-power (nth 1 expr) (nth 2 expr)
+                                                nil t))
+                        (list '*
+                              (nth 1 expr)
+                              (list '^ (nth 1 expr) (1- (nth 2 expr)))))
+                  (if (< (nth 2 expr) 0)
+                      (list '/ 1 (list '^ (nth 1 expr) (- (nth 2 expr)))))))))
         (t expr)))
 
 (defun calcFunc-expand (expr &optional many)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2f3cd5d0e07..d8ca2a77b58 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -366,9 +366,16 @@ since it could result in memory overflow and make Emacs crash."
                       ((string-match "\\`w32-" (symbol-name symbol))
                        (eq system-type 'windows-nt))
                       ((string-match "\\`x-.*gtk" (symbol-name symbol))
-                       (or (boundp 'gtk) (not (eq system-type 'windows-nt))))
+                       (or (boundp 'gtk)
+                           (and window-system
+                                (not (eq window-system 'pc))
+                                (not (eq system-type 'windows-nt)))))
                       ((string-match "\\`x-" (symbol-name symbol))
                        (fboundp 'x-create-frame))
+                      ((string-match "selection" (symbol-name symbol))
+                       (fboundp 'x-selection-exists-p))
+                      ((string-match "fringe" (symbol-name symbol))
+                       (fboundp 'define-fringe-bitmap))
                       (t t))))
     (if (not (boundp symbol))
         ;; If variables are removed from C code, give an error here!
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 95a0a4b2896..43cf96e34fa 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -168,8 +168,9 @@ It includes all faces in list FACES."
                 (princ " '(")
                 (prin1 symbol)
                 (princ " ")
-                (prin1 (or (get symbol 'customized-face)
-                           (get symbol 'face-defface-spec)))
+                (prin1 (list (append '(t)
+                                     (custom-face-attributes-get
+                                      'font-lock-comment-face nil))))
                 (princ ")")))
               faces)
       (if (bolp)
diff --git a/lisp/custom.el b/lisp/custom.el
index c4eae52751b..d634160e534 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -583,7 +583,7 @@ This recursively follows aliases."
 (defvar custom-known-themes '(user standard)
    "Themes that have been defined with `deftheme'.
 The default value is the list (user standard).  The theme `standard'
-contains the Emacs standard settings from the original Lisp files.  The
+contains the settings before custom themes are applied.  The
 theme `user' contains all the settings the user customized and saved.
 Additional themes declared with the `deftheme' macro will be added to
 the front of this list.")
@@ -649,6 +649,17 @@ See `custom-known-themes' for a list of known themes."
         (progn
           (setcar (cdr setting) mode)
           (setcar (cddr setting) value))
+      (if (and (null old)
+               (boundp symbol))
+          (setq old
+                (list
+                 (list 'standard 'set
+                       (if (eq prop 'theme-value)
+                           (symbol-value symbol)
+                         (list
+                          (append
+                           '(t)
+                           (custom-face-attributes-get symbol nil))))))))
       (put symbol prop (cons (list theme mode value) old)))
     ;; Record, for each theme, all its settings.
     (put theme 'theme-settings
@@ -1117,7 +1128,7 @@ See `custom-known-themes' for a list of known themes."
       (let* ((prop (car s))
              (symbol (cadr s))
              (spec-list (get symbol prop)))
-        (put symbol 'theme-value (assq-delete-all theme spec-list))
+        (put symbol prop (assq-delete-all theme spec-list))
         (if (eq prop 'theme-value)
             (custom-theme-recalc-variable symbol)
           (custom-theme-recalc-face symbol)))))
@@ -1156,13 +1167,6 @@ This function returns nil if no custom theme specifies a value for VARIABLE."
     (if theme-value
         (custom-theme-value (car (car theme-value)) theme-value))))
 
-(defun custom-face-theme-value (face)
-  "Return the face spec of FACE according to currently enabled custom themes.
-This function returns nil if no custom theme specifies anything for FACE."
-  (let* ((theme-value (get face 'theme-face)))
-    (if theme-value
-        (custom-theme-value (car (car theme-value)) theme-value))))
-
 (defun custom-theme-recalc-variable (variable)
   "Set VARIABLE according to currently enabled custom themes."
   (let ((valspec (custom-variable-theme-value variable)))
@@ -1177,16 +1181,9 @@ This function returns nil if no custom theme specifies anything for FACE."
 
 (defun custom-theme-recalc-face (face)
   "Set FACE according to currently enabled custom themes."
-  (let ((spec (custom-face-theme-value face)))
-    (when spec
-      (put face 'save-face spec))
-    (unless spec
-      (setq spec (get face 'face-defface-spec)))
-    (when spec
-      (when (or (get face 'force-face) (facep face))
-        (unless (facep face)
-          (make-empty-face face))
-        (face-spec-set face spec)))))
+  (let ((theme-faces (reverse (get face 'theme-face))))
+    (dolist (spec theme-faces)
+      (face-spec-set face (car (cddr spec))))))
 
 (defun custom-theme-reset-variables (theme &rest args)
   "Reset the specs in THEME of some variables to their values in other themes.
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index e25d740b89b..5f410da17a7 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -108,7 +108,8 @@ into widget buttons that call `describe-text-category' or
                        (while properties
                          (push (list (pop properties) (pop properties)) ret))
                        ret)
-                     (lambda (a b) (string< (nth 0 a) (nth 0 b)))))
+                     (lambda (a b) (string< (prin1-to-string (nth 0 a) t)
+                                            (prin1-to-string (nth 0 b) t)))))
     (let ((key (nth 0 elt))
           (value (nth 1 elt)))
       (widget-insert (propertize (format "  %-20s " key)
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 8e5fa12bad7..778ea092e43 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -220,8 +220,10 @@ for users who call this function in `.emacs'."
         (unless (or (memq window-system '(x w32)))
           (and (terminal-coding-system)
                (set-terminal-coding-system nil))))
-    ;; Turn off multibyte chars for more compatibility.
-    (setq-default enable-multibyte-characters nil)
+
+    (display-warning 'i18n
+                     "`standard-display-european' is semi-obsolete"
+                     :warning)
 
     ;; Switch to Latin-1 language environment
     ;; unless some other has been specified.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5b421f2b3f8..12b265661ea 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -846,9 +846,13 @@ happens, so the major mode can be corrected."
 (defcustom font-lock-support-mode 'jit-lock-mode
   "*Support mode for Font Lock mode.
 Support modes speed up Font Lock mode by being choosy about when fontification
-occurs.  Known support modes are Fast Lock mode (symbol `fast-lock-mode'),
-Lazy Lock mode (symbol `lazy-lock-mode'), and Just-in-time Lock mode (symbol
-`jit-lock-mode'.  See those modes for more info.
+occurs.  The default support mode, Just-in-time Lock mode (symbol
+`jit-lock-mode'), is recommended.
+
+Other, older support modes are Fast Lock mode (symbol `fast-lock-mode') and
+Lazy Lock mode (symbol `lazy-lock-mode').  See those modes for more info.
+However, they are no longer recommended, as Just-in-time Lock mode is better.
+
 If nil, means support for Font Lock mode is never performed.
 If a symbol, use that support mode.
 If a list, each element should be of the form (MAJOR-MODE . SUPPORT-MODE),
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 198e395d260..ac4dc382907 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,112 @@
+2005-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam-report.el (spam-report-gmane): Make it work without
+        X-Report-Spam header.  Gmane now only provides Archived-At.  This
+        is only used if `spam-report-gmane-use-article-number' is nil.
+        (spam-report-gmane-spam-header): Removed.  Not used anymore.
+
+        * nnweb.el (nnweb-google-wash-article): Print a message if article
+        is not available.
+
+2005-09-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+        * gnus-art.el (gnus-mime-display-single): Decode text/* parts
+        content before displaying.
+
+2005-09-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mml-smime.el: Remove defvar of gnus-extract-address-components.
+
+2005-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-display-inline-fontify): Disable support modes.
+
+2005-09-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el (message-tab-body-function): Fixed mismatched custom
+        type.
+
+        * gnus.el (gnus-group-change-level-function): Ditto.
+
+        * gnus-msg.el (gnus-outgoing-message-group): Ditto.
+
+        * gnus-art.el (gnus-signature-limit)
+        (gnus-article-mime-part-function): Ditto.
+
+2005-09-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * nnweb.el (nnweb-type-definition, nnweb-google-wash-article):
+        Make fetching article by MID work again for Google Groups.  Added
+        FIXME concerning gnus-group-make-web-group.
+
+        * mml-smime.el (mml-smime-sign-query, mml-smime-get-dns-cert):
+        Don't depend on Gnus by using mail-extract-address-components if
+        gnus-extract-address-components is not bound.
+
+        * gnus.el (gnus-user-agent): Use list of symbols instead of
+        symbols.  Display full version number for (S)XEmacs.  Optionally
+        display (S)XEmacs codename.
+
+        * gnus-util.el (gnus-emacs-version): Update for new
+        `gnus-user-agent'.
+
+        * gnus-msg.el (gnus-extended-version): Make it possible to omit
+        Gnus version.
+
+2005-09-02  Hrvoje Niksic  <hniksic@xemacs.org>
+
+        * mm-encode.el (mm-encode-content-transfer-encoding): Likewise
+        when encoding.
+
+        * mm-bodies.el (mm-decode-content-transfer-encoding):
+        De-canonicalize CRLF for all text content types, not just
+        text/plain.
+
+2005-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-thread-hide-subtree): Doc fix.
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Fix the mistake of using
+        list, not listp.
+
+2005-08-29  Romain Francoise  <romain@orebokech.com>
+
+        * gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in
+        docstring.
+        (gnus-face-from-file): Likewise.
+
+2005-08-31  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-art.el (w3m-minor-mode-map):
+        * gnus-spec.el (gnus-newsrc-file-version):
+        * gnus-util.el (nnmail-active-file-coding-system)
+        (gnus-original-article-buffer, gnus-user-agent):
+        * gnus.el (gnus-ham-process-destinations)
+        (gnus-parameter-ham-marks-alist)
+        (gnus-parameter-spam-marks-alist, gnus-spam-autodetect)
+        (gnus-spam-autodetect-methods, gnus-spam-newsgroup-contents)
+        (gnus-spam-process-destinations, gnus-spam-process-newsgroups):
+        * mm-decode.el (gnus-current-window-configuration):
+        * mm-extern.el (gnus-article-mime-handles):
+        * mm-url.el (url-current-object, url-package-name)
+        (url-package-version):
+        * mm-view.el (gnus-article-mime-handles, gnus-newsgroup-charset)
+        (smime-keys, w3m-cid-retrieve-function-alist)
+        (w3m-current-buffer, w3m-display-inline-images)
+        (w3m-minor-mode-map):
+        * mml-smime.el (gnus-extract-address-components):
+        * mml.el (gnus-article-mime-handles, gnus-mouse-2)
+        (gnus-newsrc-hashtb, message-default-charset)
+        (message-deletable-headers, message-options)
+        (message-posting-charset, message-required-mail-headers)
+        (message-required-news-headers):
+        * mml1991.el (mc-pgp-always-sign):
+        * mml2015.el (mc-pgp-always-sign):
+        * nnheader.el (nnmail-extra-headers):
+        * rfc1843.el (gnus-decode-encoded-word-function)
+        (gnus-decode-header-function, gnus-newsgroup-name):
+        * spam-stat.el (gnus-original-article-buffer): Add defvars.
+
 2005-08-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus-art.el (w3m-minor-mode-map):
@@ -151,8 +260,6 @@
         * gnus-util.el (gnus-beginning-of-window): Remove.
         (gnus-end-of-window): Remove.
 
-        * lpath.el: Don't bind scroll-margin.
-
 2005-07-25  Simon Josefsson  <jas@extundo.com>
 
         * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 822448fa460..3bdc93935bc 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -236,7 +236,8 @@ longer (in lines) than that number.  If it is a function, the function
 will be called without any parameters, and if it returns nil, there is
 no signature in the buffer.  If it is a string, it will be used as a
 regexp.  If it matches, the text in question is not a signature."
-  :type '(choice (integer :value 200)
+  :type '(choice (const nil)
+                 (integer :value 200)
                  (number :value 4.0)
                  (function :value fun)
                  (regexp :value ".*"))
@@ -869,7 +870,8 @@ see http://www.cs.indiana.edu/picons/ftp/index.html"
 This is meant for people who want to do something automatic based
 on parts -- for instance, adding Vcard info to a database."
   :group 'gnus-article-mime
-  :type 'function)
+  :type '(choice (const nil)
+                 function))
 
 (defcustom gnus-mime-multipart-functions nil
   "An alist of MIME types to functions to display them."
@@ -4860,7 +4862,14 @@ If displaying \"text/html\" is discouraged \(see
               (forward-line -1)
               (setq beg (point)))
             (gnus-article-insert-newline)
-            (mm-insert-inline handle (mm-get-part handle))
+            (mm-insert-inline handle
+                              (let ((charset
+                                     (mail-content-type-get
+                                      (mm-handle-type handle) 'charset)))
+                                (if (eq charset 'gnus-decoded)
+                                    (mm-get-part handle)
+                                  (mm-decode-string (mm-get-part handle)
+                                                    charset))))
             (goto-char (point-max))))
           ;; Do highlighting.
           (save-excursion
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 94f42efc360..43cd02c1b5e 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -54,7 +54,7 @@ on stdout."
   :type 'string)
 
 (defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng"
-  "Command for converting an image to an Face.
+  "Command for converting an image to a Face.
 By default it takes a JPEG filename and output the Face header data
 on stdout."
   :version "22.1"
@@ -110,7 +110,7 @@ Output to the current buffer, replace text, and don't mingle error."
 
 ;;;###autoload
 (defun gnus-face-from-file (file)
-  "Return an Face header based on an image file."
+  "Return a Face header based on an image file."
   (interactive "fImage file name (by default JPEG): ")
   (when (file-exists-p file)
     (let ((done nil)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 0614a2304f7..eced2a8097a 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -67,8 +67,10 @@ message in, you can set this variable to a function that checks the
 current newsgroup name and then returns a suitable group name (or list
 of names)."
   :group 'gnus-message
-  :type '(choice (string :tag "Group")
-                 (function)))
+  :type '(choice (const nil)
+                 (function)
+                 (string :tag "Group")
+                 (repeat :tag "List of groups" (string :tag "Group"))))
 
 (defcustom gnus-mailing-list-groups nil
   "*If non-nil a regexp matching groups that are really mailing lists.
@@ -1031,17 +1033,18 @@ If SILENT, don't prompt the user."
   "Stringified Gnus version and Emacs version.
 See the variable `gnus-user-agent'."
   (interactive)
-  (let* ((float-output-format nil)
-         (gnus-v
-          (concat "Gnus/"
-                  (prin1-to-string (gnus-continuum-version gnus-version) t)
-                  " (" gnus-version ")"))
-         (emacs-v (gnus-emacs-version)))
-    (if (stringp gnus-user-agent)
-        gnus-user-agent
-      (concat gnus-v
-              (when emacs-v
-                (concat " " emacs-v))))))
+  (if (stringp gnus-user-agent)
+      gnus-user-agent
+    ;; `gnus-user-agent' is a list:
+    (let* ((float-output-format nil)
+           (gnus-v
+            (when (memq 'gnus gnus-user-agent)
+              (concat "Gnus/"
+                      (prin1-to-string (gnus-continuum-version gnus-version) t)
+                      " (" gnus-version ")")))
+           (emacs-v (gnus-emacs-version)))
+      (concat gnus-v (when (and gnus-v emacs-v) " ")
+              emacs-v))))
 
 
 ;;;
@@ -1661,7 +1664,7 @@ this is a reply."
              (gcc (cond
                    ((functionp group)
                     (funcall group))
-                   ((or (stringp group) (list group))
+                   ((or (stringp group) (listp group))
                     group))))
         (when gcc
           (insert "Gcc: "
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c2f7143a9ca..73837e21902 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -257,8 +257,7 @@ simplification is selected."
   "*If non-nil, hide all threads initially.
 This can be a predicate specifier which says which threads to hide.
 If threads are hidden, you have to run the command
-`gnus-summary-show-thread' by hand or use `gnus-select-article-hook'
-to expose hidden threads."
+`gnus-summary-show-thread' by hand or select an article."
   :group 'gnus-thread
   :type '(radio (sexp :format "Non-nil\n"
                       :match (lambda (widget value)
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 69bcee90110..4c1721029be 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1,7 +1,7 @@
 ;;; gnus-util.el --- utility functions for Gnus
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -1517,41 +1517,48 @@ predicate on the elements."
       (nconc (nreverse res) list1 list2))))
 
 (eval-when-compile
-  (defvar xemacs-codename))
+  (defvar xemacs-codename)
+  (defvar sxemacs-codename)
+  (defvar emacs-program-version))
 
 (defun gnus-emacs-version ()
   "Stringified Emacs version."
-  (let ((system-v
-         (cond
-          ((eq gnus-user-agent 'emacs-gnus-config)
-           system-configuration)
-          ((eq gnus-user-agent 'emacs-gnus-type)
-           (symbol-name system-type))
-          (t nil))))
+  (let* ((lst (if (listp gnus-user-agent)
+                  gnus-user-agent
+                '(gnus emacs type)))
+         (system-v (cond ((memq 'config lst)
+                          system-configuration)
+                         ((memq 'type lst)
+                          (symbol-name system-type))
+                         (t nil)))
+         codename emacsname)
+    (cond ((featurep 'sxemacs)
+           (setq emacsname "SXEmacs"
+                 codename sxemacs-codename))
+          ((featurep 'xemacs)
+           (setq emacsname "XEmacs"
+                 codename xemacs-codename))
+          (t
+           (setq emacsname "Emacs")))
     (cond
-     ((eq gnus-user-agent 'gnus)
+     ((not (memq 'emacs lst))
       nil)
      ((string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
+      ;; Emacs:
       (concat "Emacs/" (match-string 1 emacs-version)
               (if system-v
                   (concat " (" system-v ")")
                 "")))
-     ((string-match
-       "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
-       emacs-version)
-      (concat
-       (match-string 1 emacs-version)
-       (format "/%d.%d" emacs-major-version emacs-minor-version)
-       (if (match-beginning 3)
-           (match-string 3 emacs-version)
-         "")
-       (if (boundp 'xemacs-codename)
-           (concat
-            " (" xemacs-codename
-            (if system-v
-                (concat ", " system-v ")")
+     ((or (featurep 'sxemacs) (featurep 'xemacs))
+      ;; XEmacs or SXEmacs:
+      (concat emacsname "/" emacs-program-version
+              " ("
+              (when (and (memq 'codename lst)
+                         codename)
+                (concat codename
+                        (when system-v ", ")))
+              (when system-v system-v)
               ")"))
-         "")))
      (t emacs-version))))
 
 (defun gnus-rename-file (old-path new-path &optional trim)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index e1abe07b559..d0e199e2d06 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2343,7 +2343,8 @@ following hook:
   "Function run when a group level is changed.
 It is called with three parameters -- GROUP, LEVEL and OLDLEVEL."
   :group 'gnus-group-levels
-  :type 'function)
+  :type '(choice (const nil)
+                 function))
 
 ;;; Face thingies.
 
@@ -2472,24 +2473,45 @@ This should be an alist for Emacs, or a plist for XEmacs."
                          (symbol :tag "Parameter")
                          (sexp :tag "Value")))))
 
-(defcustom gnus-user-agent 'emacs-gnus-type
+(defcustom gnus-user-agent '(emacs gnus type)
   "Which information should be exposed in the User-Agent header.
 
-It can be one of the symbols `gnus' \(show only Gnus version\), `emacs-gnus'
-\(show only Emacs and Gnus versions\), `emacs-gnus-config' \(same as
-`emacs-gnus' plus system configuration\), `emacs-gnus-type' \(same as
-`emacs-gnus' plus system type\) or a custom string.  If you set it to a
-string, be sure to use a valid format, see RFC 2616."
+Can be a list of symbols or a string.  Valid symbols are `gnus'
+\(show Gnus version\) and `emacs' \(show Emacs version\).  In
+addition to the Emacs version, you can add `codename' \(show
+\(S\)XEmacs codename\) or either `config' \(show system
+configuration\) or `type' \(show system type\).  If you set it to
+a string, be sure to use a valid format, see RFC 2616."
+
   :version "22.1"
   :group 'gnus-message
-  :type '(choice
-          (item :tag "Show Gnus and Emacs versions and system type"
-                emacs-gnus-type)
-          (item :tag "Show Gnus and Emacs versions and system configuration"
-                emacs-gnus-config)
-          (item :tag "Show Gnus and Emacs versions" emacs-gnus)
-          (item :tag "Show only Gnus version" gnus)
-          (string :tag "Other")))
+  :type '(choice (list (set :inline t
+                            (const gnus  :tag "Gnus version")
+                            (const emacs :tag "Emacs version")
+                            (choice :tag "system"
+                                    (const type   :tag "system type")
+                                    (const config :tag "system configuration"))
+                            (const codename :tag "Emacs codename")))
+                 (string)))
+
+;; Convert old (No Gnus < 2005-01-10, v5-10 < 2005-09-05) symbol type values:
+(when (symbolp gnus-user-agent)
+  (setq gnus-user-agent
+        (cond ((eq gnus-user-agent 'emacs-gnus-config)
+               '(emacs gnus config))
+              ((eq gnus-user-agent 'emacs-gnus-type)
+               '(emacs gnus type))
+              ((eq gnus-user-agent 'emacs-gnus)
+               '(emacs gnus))
+              ((eq gnus-user-agent 'gnus)
+               '(gnus))
+              (t gnus-user-agent)))
+  (gnus-message 1 "Converted `gnus-user-agent' to `%s'." gnus-user-agent)
+  (sit-for 1)
+  (if (get 'gnus-user-agent 'saved-value)
+      (customize-save-variable 'gnus-user-agent gnus-user-agent)
+    (gnus-message 1 "Edit your init file to make this change permanent.")
+    (sit-for 2)))
 
 
 ;;; Internal variables
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7c55b7cc72f..5995fcbcea0 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6631,7 +6631,8 @@ If nil, the function bound in `text-mode-map' or `global-map' is executed."
   :version "22.1"
   :group 'message
   :link '(custom-manual "(message)Various Commands")
-  :type 'function)
+  :type '(choice (const nil)
+                 function))
 
 (defun message-tab ()
   "Complete names according to `message-completion-alist'.
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index ffca7da75bf..e9f8f1e9391 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -228,7 +228,7 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
          nil))
     (when (and
            (memq encoding '(base64 x-uuencode x-uue x-binhex x-yenc))
-           (equal type "text/plain"))
+           (string-match "\\`text/" type))
       (goto-char (point-min))
       (while (search-forward "\r\n" nil t)
         (replace-match "\n" t t)))))
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index fd6251c37d3..5e149d16ed3 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -118,7 +118,7 @@ ENCODING can be: nil (do nothing); one of `quoted-printable', `base64';
     ;; Likewise base64 below.
     (quoted-printable-encode-region (point-min) (point-max) t))
    ((eq encoding 'base64)
-    (when (equal type "text/plain")
+    (when (string-match "\\`text/" type)
       (goto-char (point-min))
       (while (search-forward "\n" nil t)
         (replace-match "\r\n" t t)))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 2d78ccab864..ac408aa179f 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -476,14 +476,16 @@
             (buffer-disable-undo)
             (mm-insert-part handle)
             (require 'font-lock)
-            ;; Inhibit font-lock this time (*-mode-hook might run
-            ;; `turn-on-font-lock') so that jit-lock may not turn off
-            ;; font-lock immediately after this.
-            (let ((font-lock-mode t))
-              (funcall mode))
-            (let ((font-lock-verbose nil))
-              ;; I find font-lock a bit too verbose.
-              (font-lock-fontify-buffer))
+            (let ((font-lock-maximum-size nil)
+                  ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+                  (font-lock-mode-hook nil)
+                  (font-lock-support-mode nil)
+                  ;; I find font-lock a bit too verbose.
+                  (font-lock-verbose nil))
+              (funcall mode)
+              ;; The mode function might have already turned on font-lock.
+              (unless (symbol-value 'font-lock-mode)
+                (font-lock-fontify-buffer)))
             ;; By default, XEmacs font-lock uses non-duplicable text
             ;; properties.  This code forces all the text properties
             ;; to be copied along with the text.
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 8a5ba61d002..2933c14744a 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -29,8 +29,6 @@
 
 (eval-when-compile (require 'cl))
 
-(defvar gnus-extract-address-components)
-
 (require 'smime)
 (require 'mm-decode)
 (autoload 'message-narrow-to-headers "message")
@@ -81,7 +79,10 @@
   (list 'keyfile
         (if (= (length smime-keys) 1)
             (cadar smime-keys)
-          (or (let ((from (cadr (funcall gnus-extract-address-components
+          (or (let ((from (cadr (funcall (if (boundp
+                                              'gnus-extract-address-components)
+                                             gnus-extract-address-components
+                                           'mail-extract-address-components)
                                          (or (save-excursion
                                                (save-restriction
                                                  (message-narrow-to-headers)
@@ -107,7 +108,10 @@
         (while (not result)
           (setq who (read-from-minibuffer
                      (format "%sLookup certificate for: " (or bad ""))
-                     (cadr (funcall gnus-extract-address-components
+                     (cadr (funcall (if (boundp
+                                         'gnus-extract-address-components)
+                                        gnus-extract-address-components
+                                      'mail-extract-address-components)
                                     (or (save-excursion
                                           (save-restriction
                                             (message-narrow-to-headers)
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index d05520ee1dc..d3737cd66fd 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -27,6 +27,12 @@
 
 ;; Note: You need to have `w3' installed for some functions to work.
 
+;; FIXME: Due to changes in the HTML output of Google Groups and Gmane, stuff
+;; related to web groups (gnus-group-make-web-group) doesn't work anymore.
+
+;; Fetching an article by MID (cf. gnus-refer-article-method) over Google
+;; Groups should work.
+
 ;;; Code:
 
 (eval-when-compile (require 'cl))
@@ -54,13 +60,13 @@ Valid types include `google', `dejanews', and `gmane'.")
 
 (defvar nnweb-type-definition
   '((google
-     (article . ignore)
-     (id . "http://groups.google.de/groups?selm=%s&output=gplain")
+     (id . "http://www.google.com/groups?as_umsgid=%s&hl=en&dmode=source")
+     (article . nnweb-google-wash-article)
      (reference . identity)
      (map . nnweb-google-create-mapping)
      (search . nnweb-google-search)
-     (address . "http://groups.google.de/groups")
-     (base    . "http://groups.google.de")
+     (address . "http://groups.google.com/groups")
+     (base    . "http://groups.google.com")
      (identifier . nnweb-google-identity))
     (dejanews ;; alias of google
      (article . ignore)
@@ -306,35 +312,29 @@ Valid types include `google', `dejanews', and `gmane'.")
               (current-buffer))))))
 
 ;;;
-;;; Deja bought by google.com
+;;; groups.google.com
 ;;;
 
 (defun nnweb-google-wash-article ()
-  (let ((case-fold-search t) url)
-    (goto-char (point-min))
-    (re-search-forward "^<pre>" nil t)
-    (narrow-to-region (point-min) (point))
-    (search-backward "<table " nil t 2)
-    (delete-region (point-min) (point))
-    (if (re-search-forward "Search Result [0-9]+" nil t)
-        (replace-match ""))
-    (if (re-search-forward "View complete thread ([0-9]+ articles?)" nil t)
-        (replace-match ""))
-    (goto-char (point-min))
-    (while (search-forward "<br>" nil t)
-      (replace-match "\n"))
-    (mm-url-remove-markup)
+  ;; We have Google's masked e-mail addresses here.  :-/
+  (let ((case-fold-search t))
     (goto-char (point-min))
-    (while (re-search-forward "^[ \t]*\n" nil t)
-      (replace-match ""))
-    (goto-char (point-max))
-    (insert "\n")
-    (widen)
-    (narrow-to-region (point) (point-max))
-    (search-forward "</pre>" nil t)
-    (delete-region (point) (point-max))
-    (mm-url-remove-markup)
-    (widen)))
+    (if (save-excursion
+          (or (re-search-forward "The requested message.*could not be found."
+                                 nil t)
+              (not (and (re-search-forward "^<pre>" nil t)
+                        (re-search-forward "^</pre>" nil t)))))
+        ;; FIXME: Don't know how to indicate "not found".
+        ;; Should this function throw an error?  --rsteib
+        (progn
+          (gnus-message 3 "Requested article not found")
+          (erase-buffer))
+      (delete-region (point-min)
+                     (1+ (re-search-forward "^<pre>" nil t)))
+      (goto-char (point-min))
+      (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
+                     (point-max))
+      (mm-url-decode-entities))))
 
 (defun nnweb-google-parse-1 (&optional Message-ID)
   (let ((i 0)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 50a564885bb..302cafbb19b 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -49,12 +49,6 @@ instead."
                 (regexp :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
-(defcustom spam-report-gmane-spam-header
-  "^X-Report-Spam: http://\\([^/]+\\)\\(.*\\)$"
-  "String matching Gmane spam-reporting header.  Two match groups are needed."
-  :type 'regexp
-  :group 'spam-report)
-
 (defcustom spam-report-gmane-use-article-number t
   "Whether the article number (faster!) or the header should be used."
   :type 'boolean
@@ -103,19 +97,40 @@ undo that change.")
                    article))
         (with-current-buffer nntp-server-buffer
           (gnus-request-head article gnus-newsgroup-name)
-          (goto-char (point-min))
-          (if (re-search-forward spam-report-gmane-spam-header nil t)
-              (let* ((host (match-string 1))
-                     (report (match-string 2))
-                     (url (format "http://%s%s" host report)))
-                (gnus-message 7 "Reporting spam through URL %s..." url)
-                (spam-report-url-ping host report))
-            (gnus-message 3 "Could not find X-Report-Spam in article %d..."
-                          article)))))))
+          (let ((case-fold-search t)
+                field host report url)
+            ;; First check for X-Report-Spam because it's more specific to
+            ;; spam reporting than Archived-At.  OTOH, all new articles on
+            ;; Gmane don't have X-Report-Spam anymore (unless Lars changes his
+            ;; mind :-)).
+            ;;
+            ;; There might be more than one Archived-At header so we need to
+            ;; find (and transform) the one related to Gmane.
+            (setq field (or (gnus-fetch-field "X-Report-Spam")
+                            (gnus-fetch-field "Archived-At")))
+            (setq host (progn
+                         (string-match
+                          (concat "http://\\([a-z]+\\.gmane\\.org\\)"
+                                  "\\(/[^:/]+[:/][0-9]+\\)")
+                          field)
+                         (match-string 1 field)))
+            (setq report (match-string 2 field))
+            (when (string-equal "permalink.gmane.org" host)
+              (setq host "spam.gmane.org"))
+            (setq url (format "http://%s%s" host report))
+            (if (not (and host report url))
+                (gnus-message
+                 3 "Could not find a spam report header in article %d..."
+                 article)
+              (gnus-message 7 "Reporting spam through URL %s..." url)
+              (spam-report-url-ping host report))))))))
 
 (defun spam-report-url-ping (host report)
   "Ping a host through HTTP, addressing a specific GET resource using
 the function specified by `spam-report-url-ping-function'."
+  ;; Example:
+  ;; host: "spam.gmane.org"
+  ;; report: "/gmane.some.group:123456"
   (funcall spam-report-url-ping-function host report))
 
 (defun spam-report-url-ping-plain (host report)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f2dec757520..f5c34ff80ca 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -130,6 +130,7 @@ This is used by the default mail-sending commands.  See also
   :type '(radio (function-item sendmail-send-it :tag "Use Sendmail package")
                 (function-item smtpmail-send-it :tag "Use SMTPmail package")
                 (function-item feedmail-send-it :tag "Use Feedmail package")
+                (function-item mailclient-send-it :tag "Use Mailclient package")
                 function)
   :group 'sendmail)
 
@@ -886,9 +887,9 @@ See also the function `select-message-coding-system'.")
   "Default coding system for encoding the outgoing mail.
 This variable is used only when `sendmail-coding-system' is nil.
 
-This variable is set/changed by the command set-language-environment.
+This variable is set/changed by the command `set-language-environment'.
 User should not set this variable manually,
-instead use sendmail-coding-system to get a constant encoding
+instead use `sendmail-coding-system' to get a constant encoding
 of outgoing mails regardless of the current language environment.
 See also the function `select-message-coding-system'.")
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 302ede8c8ff..efb16807c56 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -105,10 +105,12 @@ A large number or nil slows down menu responsiveness."
 
 (define-key menu-bar-file-menu [split-window]
   '(menu-item "Split Window" split-window-vertically
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame )
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame )
+                               (not (window-minibuffer-p
+                                     (frame-selected-window
+                                      menu-updating-frame)))))
               :help "Split selected window in two windows"))
 
 (define-key menu-bar-file-menu [separator-window]
@@ -120,8 +122,9 @@ A large number or nil slows down menu responsiveness."
               :help "Pretty-print marked region in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer]
   '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame)))
               :help "Pretty-print current buffer in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-region-faces]
   '(menu-item "Postscript Print Region" ps-print-region-with-faces
@@ -129,8 +132,9 @@ A large number or nil slows down menu responsiveness."
               :help "Pretty-print marked region to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer-faces]
   '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame)))
               :help "Pretty-print current buffer to PostScript printer"))
 (define-key menu-bar-file-menu [print-region]
   '(menu-item "Print Region" print-region
@@ -138,8 +142,9 @@ A large number or nil slows down menu responsiveness."
               :help "Print region between mark and current position"))
 (define-key menu-bar-file-menu [print-buffer]
   '(menu-item "Print Buffer" print-buffer
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame)))
               :help "Print current buffer with page headings"))
 
 (define-key menu-bar-file-menu [separator-print]
@@ -170,17 +175,21 @@ A large number or nil slows down menu responsiveness."
               :help "Re-read current buffer from its file"))
 (define-key menu-bar-file-menu [write-file]
   '(menu-item "Save As..." write-file
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame )
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame )
+                               (not (window-minibuffer-p
+                                     (frame-selected-window
+                                      menu-updating-frame)))))
               :help "Write current buffer to another file"))
 (define-key menu-bar-file-menu [save-buffer]
   '(menu-item "Save" save-buffer
               :enable (and (buffer-modified-p)
                            (buffer-file-name)
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+                           (or (not (display-multi-frame-p))
+                               (not (window-minibuffer-p
+                                     (frame-selected-window
+                                      menu-updating-frame)))))
               :help "Save current buffer to its file"))
 
 (define-key menu-bar-file-menu [separator-save]
@@ -192,23 +201,28 @@ A large number or nil slows down menu responsiveness."
               :help "Discard (kill) current buffer"))
 (define-key menu-bar-file-menu [insert-file]
   '(menu-item "Insert File..." insert-file
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (or (not (display-multi-frame-p))
+                          (and (not (window-minibuffer-p
+                                     (frame-selected-window
+                                      menu-updating-frame)))))
               :help "Insert another file into current buffer"))
 (define-key menu-bar-file-menu [dired]
   '(menu-item "Open Directory..." dired
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (or (not (display-multi-frame-p))
+                          (not (window-minibuffer-p
+                                (frame-selected-window menu-updating-frame))))
               :help "Read a directory, operate on its files"))
 (define-key menu-bar-file-menu [open-file]
   '(menu-item "Open File..." find-file-existing
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (or (not (display-multi-frame-p))
+                          (not (window-minibuffer-p
+                                (frame-selected-window menu-updating-frame))))
               :help "Read an existing file into an Emacs buffer"))
 (define-key menu-bar-file-menu [new-file]
   '(menu-item "Visit New File..." find-file
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (or (not (display-multi-frame-p))
+                          (not (window-minibuffer-p
+                                (frame-selected-window menu-updating-frame))))
               :help "Read or create a file and edit it"))
 
 
@@ -1043,8 +1057,9 @@ mail status in mode line"))
               toggle-truncate-lines
               :help "Truncate long lines on the screen"
               :button (:toggle . truncate-lines)
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame))))
+              :enable (or (not (display-multi-frame-p))
+                          (and (frame-live-p menu-updating-frame)
+                               (frame-visible-p menu-updating-frame)))))
 
 (define-key menu-bar-options-menu [highlight-separator]
   '("--"))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index c928e04f8ed..1970fbf1eeb 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -538,11 +538,10 @@ resized by dragging their header-line."
          (window (posn-window start))
          (frame (window-frame window))
          (first-window (frame-first-window frame)))
-    (when (or (eq window first-window)
-              (= (nth 1 (window-edges window))
-                 (nth 1 (window-edges first-window))))
-      (error "Cannot move header-line at the top of the frame"))
-    (mouse-drag-mode-line-1 start-event nil)))
+    (unless (or (eq window first-window)
+                (= (nth 1 (window-edges window))
+                   (nth 1 (window-edges first-window))))
+      (mouse-drag-mode-line-1 start-event nil))))
 
 
 (defun mouse-drag-vertical-line (start-event)
diff --git a/lisp/msb.el b/lisp/msb.el
index 8fa63d98051..94a1599371f 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -185,7 +185,7 @@
      "Elisp Files (%d)")
     ((eq major-mode 'latex-mode)
      3030
-     "LaTex Files (%d)")
+     "LaTeX Files (%d)")
     ('no-multi
      3099
      "Other files (%d)")))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e721f3fb016..b8b3fb9068a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5213,7 +5213,10 @@ Returns nil if none was found, else the command is returned."
 
 (defun tramp-action-password (p multi-method method user host)
   "Query the user for a password."
-  (let ((pw-prompt (match-string 0)))
+  (let ((pw-prompt
+         (format "Password for %s "
+                 (tramp-make-tramp-file-name
+                  nil method user host ""))))
     (tramp-message 9 "Sending password")
     (tramp-enter-password p pw-prompt user host)))
 
@@ -5300,8 +5303,12 @@ The terminal type can be configured with `tramp-terminal-type'."
 
 (defun tramp-multi-action-password (p method user host)
   "Query the user for a password."
-  (tramp-message 9 "Sending password")
-  (tramp-enter-password p (match-string 0) user host))
+  (let ((pw-prompt
+         (format "Password for %s "
+                 (tramp-make-tramp-file-name
+                  nil method user host ""))))
+    (tramp-message 9 "Sending password")
+    (tramp-enter-password p pw-prompt user host)))
 
 (defun tramp-multi-action-succeed (p method user host)
   "Signal success in finding shell prompt."
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 6321216dcce..f0836cbf2b0 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1688,14 +1688,18 @@ and overlay is highlighted between MK and END-MK."
   ;; Show compilation buffer in other window, scrolled to this error.
   (let* ((pop-up-windows t)
          ;; Use an existing window if it is in a visible frame.
-         (w (or (get-buffer-window (marker-buffer msg) 'visible)
-                ;; Pop up a window.
-                (display-buffer (marker-buffer msg))))
+         (pre-existing (get-buffer-window (marker-buffer msg) 0))
+         (w (let ((display-buffer-reuse-frames t))
+              ;; Pop up a window.
+              (display-buffer (marker-buffer msg))))
          (highlight-regexp (with-current-buffer (marker-buffer msg)
                              ;; also do this while we change buffer
                              (compilation-set-window w msg)
                              compilation-highlight-regexp)))
-    (compilation-set-window-height w)
+    ;; Ideally, the window-size should be passed to `display-buffer' (via
+    ;; something like special-display-buffer) so it's only used when
+    ;; creating a new window.
+    (unless pre-existing (compilation-set-window-height w))
 
     (when highlight-regexp
       (if (timerp next-error-highlight-timer)
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 0c94120a0f8..85f7e1339f3 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -4,6 +4,7 @@
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <blaak@infomatch.com>
+;; Maintainer: FSF  (Blaak's email addr bounces, Aug 2005)
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index d137284f795..e5089d84fb0 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -960,8 +960,7 @@ Convert it to flymake internal format."
           (setq converted-list (cons (list regexp file line col) converted-list)))))
     converted-list))
 
-(eval-when-compile
-  (require 'compile))
+(require 'compile)
 
 (defvar flymake-err-line-patterns ; regexp file-idx line-idx col-idx (optional) text-idx(optional), match-end to end of string is error text
   (append
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index b8336691307..11ae1c66aa7 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1833,6 +1833,10 @@ If it isn't in one, return nil."
                       ;; Don't keep looking across a blank line or comment.
                       (looking-at "$\\|#")
                       (not (zerop (forward-line -1))))))
+      ;; Remove leading and trailing whitespace.
+      (when found
+        (setq found (replace-regexp-in-string "[ \t]+\\'" "" found))
+        (setq found (replace-regexp-in-string "\\`[ \t]+" "" found)))
       found)))
 
 (provide 'make-mode)
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 7991f1fd1b4..e1af8b0f007 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -267,12 +267,12 @@ The expansion is entirely correct because it uses the C preprocessor."
     ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
     ;; regexp and funny quotes
     ("[?:.,;=!~({[][ \t\n]*\\(/\\)" (1 '(7)))
-    ("[?:.,;=!~({[ \t\n]\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
+    ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
      ;; Nasty cases:
      ;; /foo/m  $a->m  $#m $m @m %m
      ;; \s (appears often in regexps).
      ;; -s file
-     (2 (if (assoc (char-after (match-beginning 2))
+     (3 (if (assoc (char-after (match-beginning 3))
                    perl-quote-like-pairs)
             '(15) '(7))))
     ;; TODO: here-documents ("<<\\(\\sw\\|['\"]\\)")
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 4f702186685..e37390f5b80 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -490,7 +490,10 @@ This is buffer-local in every such buffer.")
     map)
   "Keymap used in Shell-Script mode.")
 
-
+(defvar sh-skeleton-pair-default-alist '((?( _ ?)) (?\))
+                                      (?[ ?\s _ ?\s ?]) (?\])
+                                      (?{ _ ?}) (?\}))
+  "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.")
 
 (defcustom sh-dynamic-complete-functions
   '(shell-dynamic-complete-environment-variable
@@ -1362,6 +1365,8 @@ with your script for an edit-interpret-debug cycle."
   (make-local-variable 'sh-shell-variables-initialized)
   (make-local-variable 'imenu-generic-expression)
   (make-local-variable 'sh-indent-supported-here)
+  (make-local-variable 'skeleton-pair-default-alist)
+  (setq skeleton-pair-default-alist sh-skeleton-pair-default-alist)
   (setq skeleton-end-hook (lambda ()
                             (or (eolp) (newline) (indent-relative)))
         paragraph-start (concat page-delimiter "\\|$")
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 524d00d389d..20251508941 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -5,7 +5,6 @@
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: July 19 1999
-;; Maintainer: FSF
 ;; Keywords: files
 
 ;; This file is part of GNU Emacs.
@@ -258,7 +257,16 @@ It is passed a filename to give a chance to transform it.
 If it returns nil, the filename is left unchanged."
   :group 'recentf
   :type '(choice (const :tag "None" nil)
+                 (const abbreviate-file-name)
                  function))
+
+(defcustom recentf-show-file-shortcuts-flag t
+  "Whether to show ``[N]'' for the Nth item up to 10.
+If non-nil, `recentf-open-files' will show labels for keys that can be
+used as shortcuts to open the Nth file."
+  :group 'recentf
+  :type 'boolean)
+
 
 ;;; Utilities
 ;;
@@ -349,7 +357,7 @@ filenames."
   "Convert filename NAME to absolute, and canonicalize it.
 See also the function `expand-file-name'.
 If defined, call the function `recentf-filename-handler'
-to postprocess the canonical name."
+to post process the canonical name."
   (let* ((filename (expand-file-name name)))
     (or (and recentf-filename-handler
              (funcall recentf-filename-handler filename))
@@ -926,6 +934,9 @@ Go to the beginning of buffer if not found."
     (set-keymap-parent km widget-keymap)
     (define-key km "q" 'recentf-cancel-dialog)
     (define-key km [down-mouse-1] 'widget-button-click)
+    ;; Keys in reverse order of appearence in help.
+    (dolist (k '("0" "9" "8" "7" "6" "5" "4" "3" "2" "1"))
+      (define-key km k 'recentf-open-file-with-key))
     km)
   "Keymap used in recentf dialogs.")
 
@@ -1063,6 +1074,18 @@ IGNORE other arguments."
   (kill-buffer (current-buffer))
   (funcall recentf-menu-action (widget-value widget)))
 
+;; List of files associated to a digit shortcut key.
+(defvar recentf--files-with-key nil)
+
+(defun recentf-show-digit-shortcut-filter (l)
+  "Filter the list of menu-elements L to show digit shortcuts."
+  (let ((i 0))
+    (dolist (e l)
+      (setq i (1+ i))
+      (recentf-set-menu-element-item
+       e (format "[%d] %s" (% i 10) (recentf-menu-element-item e))))
+    l))
+
 (defun recentf-open-files-item (menu-element)
   "Return a widget to display MENU-ELEMENT in a dialog buffer."
   (if (consp (cdr menu-element))
@@ -1085,6 +1108,26 @@ IGNORE other arguments."
            :action recentf-open-files-action
            ,(cdr menu-element))))
 
+(defun recentf-open-files-items (files)
+  "Return a list of widgets to display FILES in a dialog buffer."
+  (set (make-local-variable 'recentf--files-with-key)
+       (recentf-trunc-list files 10))
+  (mapcar 'recentf-open-files-item
+          (append
+           ;; When requested group the files with shortcuts together
+           ;; at the top of the list.
+           (when recentf-show-file-shortcuts-flag
+             (setq files (nthcdr 10 files))
+             (recentf-apply-menu-filter
+              'recentf-show-digit-shortcut-filter
+              (mapcar 'recentf-make-default-menu-element
+                      recentf--files-with-key)))
+           ;; Then the other files.
+           (recentf-apply-menu-filter
+            recentf-menu-filter
+            (mapcar 'recentf-make-default-menu-element
+                    files)))))
+
 (defun recentf-open-files (&optional files buffer-name)
   "Show a dialog to open a recent file.
 If optional argument FILES is non-nil, it is a list of recently-opened
@@ -1093,25 +1136,43 @@ If optional argument BUFFER-NAME is non-nil, it is a buffer name to
 use for the dialog.  It defaults to \"*`recentf-menu-title'*\"."
   (interactive)
   (recentf-dialog (or buffer-name (format "*%s*" recentf-menu-title))
-    (widget-insert "Click on a file to open it.
-Click on Cancel or type `q' to cancel.\n" )
+    (widget-insert "Click on a file"
+                   (if recentf-show-file-shortcuts-flag
+                       ", or type the corresponding digit key,"
+                     "")
+                   " to open it.\n"
+                   "Click on Cancel or type `q' to cancel.\n")
     ;; Use a L&F that looks like the recentf menu.
     (tree-widget-set-theme "folder")
     (apply 'widget-create
            `(group
              :indent 2
              :format "\n%v\n"
-             ,@(mapcar 'recentf-open-files-item
-                       (recentf-apply-menu-filter
-                        recentf-menu-filter
-                        (mapcar 'recentf-make-default-menu-element
-                                (or files recentf-list))))))
+             ,@(recentf-open-files-items (or files recentf-list))))
     (widget-create
      'push-button
      :notify 'recentf-cancel-dialog
      "Cancel")
     (recentf-dialog-goto-first 'link)))
 
+(defun recentf-open-file-with-key (n)
+  "Open the recent file with the shortcut numeric key N.
+N must be a valid digit.
+`1' opens the first file, `2' the second file, ... `9' the ninth file.
+`0' opens the tenth file."
+  (interactive
+   (list
+    (let ((n (string-to-number (this-command-keys))))
+      (cond
+       ((zerop n) 10)
+       ((and (> n 0) (< n 10)) n)
+       ((error "Invalid digit key %d" n))))))
+  (when recentf--files-with-key
+    (let ((file (nth (1- n) recentf--files-with-key)))
+      (unless file (error "Not that many recent files"))
+      (kill-buffer (current-buffer))
+      (funcall recentf-menu-action file))))
+
 (defun recentf-open-more-files ()
   "Show a dialog to open a recent file that is not in the menu."
   (interactive)
diff --git a/lisp/simple.el b/lisp/simple.el
index c6837ecabba..cb8fcc97136 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4231,88 +4231,90 @@ If nil, search stops at the beginning of the accessible portion of the buffer."
 (defun blink-matching-open ()
   "Move cursor momentarily to the beginning of the sexp before point."
   (interactive)
-  (and (> (point) (1+ (point-min)))
-       blink-matching-paren
-       ;; Verify an even number of quoting characters precede the close.
-       (= 1 (logand 1 (- (point)
-                         (save-excursion
-                           (forward-char -1)
-                           (skip-syntax-backward "/\\")
-                           (point)))))
-       (let* ((oldpos (point))
-              (blinkpos)
-              (mismatch)
-              matching-paren)
-         (save-excursion
-           (save-restriction
-             (if blink-matching-paren-distance
-                 (narrow-to-region (max (point-min)
-                                        (- (point) blink-matching-paren-distance))
-                                   oldpos))
-             (condition-case ()
-                 (let ((parse-sexp-ignore-comments
-                        (and parse-sexp-ignore-comments
-                             (not blink-matching-paren-dont-ignore-comments))))
-                   (setq blinkpos (scan-sexps oldpos -1)))
-               (error nil)))
-           (and blinkpos
-                ;; Not syntax '$'.
-                (not (eq (syntax-class (syntax-after blinkpos)) 8))
-                (setq matching-paren
-                      (let ((syntax (syntax-after blinkpos)))
-                        (and (consp syntax)
-                             (eq (syntax-class syntax) 4)
-                             (cdr syntax)))
-                      mismatch
-                      (or (null matching-paren)
-                          (/= (char-after (1- oldpos))
-                              matching-paren))))
-           (if mismatch (setq blinkpos nil))
-           (if blinkpos
-               ;; Don't log messages about paren matching.
-               (let (message-log-max)
-                (goto-char blinkpos)
-                (if (pos-visible-in-window-p)
-                    (and blink-matching-paren-on-screen
-                         (sit-for blink-matching-delay))
-                  (goto-char blinkpos)
-                  (message
-                   "Matches %s"
-                   ;; Show what precedes the open in its line, if anything.
-                   (if (save-excursion
-                         (skip-chars-backward " \t")
-                         (not (bolp)))
-                       (buffer-substring (progn (beginning-of-line) (point))
-                                         (1+ blinkpos))
-                     ;; Show what follows the open in its line, if anything.
-                     (if (save-excursion
-                           (forward-char 1)
-                           (skip-chars-forward " \t")
-                           (not (eolp)))
-                         (buffer-substring blinkpos
-                                           (progn (end-of-line) (point)))
-                       ;; Otherwise show the previous nonblank line,
-                       ;; if there is one.
-                       (if (save-excursion
-                             (skip-chars-backward "\n \t")
-                             (not (bobp)))
-                           (concat
-                            (buffer-substring (progn
+  (when (and (> (point) (1+ (point-min)))
+             blink-matching-paren
+             ;; Verify an even number of quoting characters precede the close.
+             (= 1 (logand 1 (- (point)
+                               (save-excursion
+                                 (forward-char -1)
+                                 (skip-syntax-backward "/\\")
+                                 (point))))))
+    (let* ((oldpos (point))
+           blinkpos
+           message-log-max  ; Don't log messages about paren matching.
+           matching-paren
+           open-paren-line-string)
+      (save-excursion
+        (save-restriction
+          (if blink-matching-paren-distance
+              (narrow-to-region (max (point-min)
+                                     (- (point) blink-matching-paren-distance))
+                                oldpos))
+          (condition-case ()
+              (let ((parse-sexp-ignore-comments
+                     (and parse-sexp-ignore-comments
+                          (not blink-matching-paren-dont-ignore-comments))))
+                (setq blinkpos (scan-sexps oldpos -1)))
+            (error nil)))
+        (and blinkpos
+             ;; Not syntax '$'.
+             (not (eq (syntax-class (syntax-after blinkpos)) 8))
+             (setq matching-paren
+                   (let ((syntax (syntax-after blinkpos)))
+                     (and (consp syntax)
+                          (eq (syntax-class syntax) 4)
+                          (cdr syntax)))))
+        (cond
+         ((or (null matching-paren)
+              (/= (char-before oldpos)
+                  matching-paren))
+          (message "Mismatched parentheses"))
+         ((not blinkpos)
+          (if (not blink-matching-paren-distance)
+              (message "Unmatched parenthesis")))
+         ((pos-visible-in-window-p blinkpos)
+          ;; Matching open within window, temporarily move to blinkpos but only
+          ;; if `blink-matching-paren-on-screen' is non-nil.
+          (when blink-matching-paren-on-screen
+            (save-excursion
+              (goto-char blinkpos)
+              (sit-for blink-matching-delay))))
+         (t
+          (save-excursion
+            (goto-char blinkpos)
+            (setq open-paren-line-string
+                  ;; Show what precedes the open in its line, if anything.
+                  (if (save-excursion
+                        (skip-chars-backward " \t")
+                        (not (bolp)))
+                      (buffer-substring (line-beginning-position)
+                                        (1+ blinkpos))
+                    ;; Show what follows the open in its line, if anything.
+                    (if (save-excursion
+                          (forward-char 1)
+                          (skip-chars-forward " \t")
+                          (not (eolp)))
+                        (buffer-substring blinkpos
+                                          (line-end-position))
+                      ;; Otherwise show the previous nonblank line,
+                      ;; if there is one.
+                      (if (save-excursion
+                            (skip-chars-backward "\n \t")
+                            (not (bobp)))
+                          (concat
+                           (buffer-substring (progn
                                                (skip-chars-backward "\n \t")
-                                               (beginning-of-line)
-                                               (point))
-                                              (progn (end-of-line)
-                                                     (skip-chars-backward " \t")
-                                                     (point)))
-                            ;; Replace the newline and other whitespace with `...'.
-                            "..."
-                            (buffer-substring blinkpos (1+ blinkpos)))
-                         ;; There is nothing to show except the char itself.
-                         (buffer-substring blinkpos (1+ blinkpos))))))))
-             (cond (mismatch
-                    (message "Mismatched parentheses"))
-                   ((not blink-matching-paren-distance)
-                    (message "Unmatched parenthesis"))))))))
+                                               (line-beginning-position))
+                                             (progn (end-of-line)
+                                                    (skip-chars-backward " \t")
+                                                    (point)))
+                           ;; Replace the newline and other whitespace with `...'.
+                           "..."
+                           (buffer-substring blinkpos (1+ blinkpos)))
+                        ;; There is nothing to show except the char itself.
+                        (buffer-substring blinkpos (1+ blinkpos)))))))
+          (message "Matches %s"
+                   (substring-no-properties open-paren-line-string))))))))
 
 ;Turned off because it makes dbx bomb out.
 (setq blink-paren-function 'blink-matching-open)
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 4b677edc36a..31c7c4f2f12 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in
 some major modes.  Uses `smerge-resolve-function' to do the actual work."
   (interactive)
   (smerge-match-conflict)
-  (smerge-remove-props)
+  (smerge-remove-props (match-beginning 0) (match-end 0))
   (cond
    ;; Trivial diff3 -A non-conflicts.
    ((and (eq (match-end 1) (match-end 3))
diff --git a/lisp/woman.el b/lisp/woman.el
index 5ecc4744305..e5753d746f7 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
-;; Maintainer: Francis J. Wright <F.J.Wright@qmul.ac.uk>
+;; Maintainer: FSF
 ;; Keywords: help, unix
 ;; Adapted-By: Eli Zaretskii <eliz@gnu.org>
 ;; Version: see `woman-version'
@@ -420,10 +420,7 @@
 ;;   Paul A. Thompson <pat@po.cwru.edu>
 ;;   Arrigo Triulzi <arrigo@maths.qmw.ac.uk>
 ;;   Geoff Voelker <voelker@cs.washington.edu>
-;;   Eli Zaretskii <eliz@is.elta.co.il>
-
-;;; History:
-;;  For recent change log see end of file.
+;;   Eli Zaretskii <eliz@gnu.org>
 
 
 ;;; Code:
@@ -956,8 +953,9 @@ This is usually either black or white."
     :group 'woman-faces)
 
   (defcustom woman-use-symbol-font nil
-    "*If non-nil then may use the symbol font.  It is off by default,
-mainly because it may change the line spacing (in NTEmacs 20.5)."
+    "*If non-nil then may use the symbol font.
+It is off by default, mainly because it may change the line spacing
+\(in NTEmacs 20.5)."
     :type 'boolean
     :group 'woman-faces)
 
@@ -1221,7 +1219,8 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
   ;; completions, but to return only a case-sensitive match.  This
   ;; does not seem to work properly by default, so I re-do the
   ;; completion if necessary.
-  (let (files)
+  (let (files
+        (default (current-word)))
     (or (stringp topic)
         (and (eq t
                  (if (boundp 'woman-topic-at-point)
@@ -1233,13 +1232,15 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
              (assoc topic woman-topic-all-completions))
         (setq topic
               (completing-read
-               "Manual entry: "
+               (if default
+                   (format "Manual entry (default `%s'): " default)
+                 "Manual entry: ")
                woman-topic-all-completions nil 1
-               ;; Initial input suggestion (was nil), with
-               ;; cursor at left ready to kill suggestion!:
+               nil
+               'woman-topic-history
+               ;; Default topic.
                (and woman-topic-at-point
-                    (cons (or (current-word) "") 0)) ; nearest word
-               'woman-topic-history)))
+                    default))))
     ;; Note that completing-read always returns a string.
     (if (= (length topic) 0)
         nil                             ; no topic, so no file!
@@ -1259,10 +1260,9 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
         ;; Unread the command event (TAB = ?\t = 9) that runs the command
         ;; `minibuffer-complete' in order to automatically complete the
         ;; minibuffer contents as far as possible.
-        (setq unread-command-events '(9))       ; and delete any type-ahead!
+        (setq unread-command-events '(9)) ; and delete any type-ahead!
         (completing-read "Manual file: " files nil 1
-                         (try-completion "" files) 'woman-file-history)))
-      )))
+                         (try-completion "" files) 'woman-file-history))))))
 
 (defun woman-select (predicate list)
   "Select unique elements for which PREDICATE is true in LIST.
@@ -1741,7 +1741,10 @@ Leave point at end of new text.  Return length of inserted text."
   (define-key woman-mode-map "w" 'woman)
   (define-key woman-mode-map "\en" 'WoMan-next-manpage)
   (define-key woman-mode-map "\ep" 'WoMan-previous-manpage)
-  (define-key woman-mode-map [M-mouse-2] 'woman-follow-word))
+  (define-key woman-mode-map [M-mouse-2] 'woman-follow-word)
+
+  ;; We don't need to call `man' when we are in `woman-mode'.
+  (define-key woman-mode-map [remap man] 'woman))
 
 (defun woman-follow-word (event)
   "Run WoMan with word under mouse as topic.
@@ -1942,25 +1945,33 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
 (defvar WoMan-Man-start-time nil
   "Used to record formatting time used by the `man' command.")
 
-(defadvice Man-getpage-in-background
-  (around Man-getpage-in-background-advice (topic) activate)
-  "Use WoMan unless invoked outside a WoMan buffer or invoked explicitly.
-Otherwise use Man and record start of formatting time."
-  (if (and (eq major-mode 'woman-mode)
-           (not (eq (caar command-history) 'man)))
-      (WoMan-getpage-in-background topic)
-    ;; Initiates man processing
-    (setq WoMan-Man-start-time (current-time))
-    ad-do-it))
-
-(defadvice Man-bgproc-sentinel
-  (after Man-bgproc-sentinel-advice activate)
-  ;; Terminates man processing
-  "Report formatting time."
-  (let* ((time (current-time))
-         (time (+ (* (- (car time) (car WoMan-Man-start-time)) 65536)
-                  (- (cadr time) (cadr WoMan-Man-start-time)))))
-    (message "Man formatting done in %d seconds" time)))
+;; Both advices are disabled because "a file in Emacs should not put
+;; advice on a function in Emacs" (see Info node "(elisp)Advising
+;; Functions").  Counting the formatting time is useful for
+;; developping, but less applicable for daily use.  The advice for
+;; `Man-getpage-in-background' can be discarded, because the
+;; key-binding in `woman-mode-map' has been remapped to call `woman'
+;; but `man'.  Michael Albinus <michael.albinus@gmx.de>
+
+;; (defadvice Man-getpage-in-background
+;;   (around Man-getpage-in-background-advice (topic) activate)
+;;   "Use WoMan unless invoked outside a WoMan buffer or invoked explicitly.
+;; Otherwise use Man and record start of formatting time."
+;;   (if (and (eq major-mode 'woman-mode)
+;;         (not (eq (caar command-history) 'man)))
+;;       (WoMan-getpage-in-background topic)
+;;     ;; Initiates man processing
+;;     (setq WoMan-Man-start-time (current-time))
+;;     ad-do-it))
+
+;; (defadvice Man-bgproc-sentinel
+;;   (after Man-bgproc-sentinel-advice activate)
+;;   ;; Terminates man processing
+;;   "Report formatting time."
+;;   (let* ((time (current-time))
+;;       (time (+ (* (- (car time) (car WoMan-Man-start-time)) 65536)
+;;                (- (cadr time) (cadr WoMan-Man-start-time)))))
+;;     (message "Man formatting done in %d seconds" time)))
 
 
 ;;; Buffer handling: