Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-639
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-641
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-642
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-644
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-645
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-646
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-647
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-648
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-652
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
   Update from CVS


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

52 files changed, 1073 insertions, 703 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e99856fe5f3..c22ab994eff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,221 @@
+2004-10-30  Simon Josefsson  <jas@extundo.com>
+
+        * progmodes/autoconf.el (autoconf-font-lock-keywords): Recognize
+        AS_* too.
+
+2004-10-29  Simon Josefsson  <jas@extundo.com>
+
+        * subr.el (read-passwd): Move back from password.el.
+
+        * password.el: Remove, not ready yet.
+
+2004-10-29  Andreas Schwab  <schwab@suse.de>
+
+        * speedbar.el (speedbar-frame-parameters): Improve customize type.
+
+2004-10-29  Sam Steingold  <sds@gnu.org>
+
+        * mouse.el (mouse-show-mark): Replace the last occurrence of
+        x-lost-selection-hooks with x-lost-selection-functions.
+
+2004-10-28  Stefan  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse-show-mark): Adjust to new name and don't assume
+        x-lost-selection-functions is bound.
+
+        * mouse-sel.el (mouse-sel-mode):
+        * emacs-lisp/lselect.el: Adjust to new names for
+        x-(lost|sent)-selection-functions.
+
+        * subr.el (x-lost-selection-hooks, x-sent-selection-hooks):
+        New obsolete aliases of x-lost-selection-functions and
+        x-sent-selection-functions.
+
+2004-10-28  Kim F. Storm  <storm@cua.dk>
+
+        * imenu.el (imenu-scanning-message): Remove.
+        (imenu-progress-message): Make it a no-op.
+
+2004-10-28  John Paul Wallington  <jpw@gnu.org>
+
+        * files.el (set-auto-mode): Call `throw' correctly.
+
+2004-10-28  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-file-list-for-emacs): Add ("Info" . "info")
+        to search `Info-...' commands in `info' manual.
+        (Info-goto-emacs-command-node, Info-goto-emacs-key-command-node):
+        Add 'info-file "emacs" property.
+        (Info-find-emacs-command-nodes): Fix index line number regexp.
+        Set real line number (instead of fake 0) in first element of the
+        returned list.
+        (Info-goto-emacs-command-node): Use line number of first element
+        to set point in the first found Info node.
+
+        * progmodes/grep.el (grep-regexp-alist): Move match highlighting
+        code to `grep-mode-font-lock-keywords'.
+        (grep-mode-font-lock-keywords): Delete grep markers instead
+        of making them invisible.
+
+2004-10-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * mail/emacsbug.el (report-emacs-bug): Insert x-server-vendor
+        and x-server-version in bug report.
+
+2004-10-28  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * files.el (set-auto-mode-0): New function.
+        (set-auto-mode): Use it to handle aliased modes and to
+        be consistent between C-x C-f and C-x C-w.
+
+2004-10-28  Kenichi Handa  <handa@m17n.org>
+
+        * international/utf-8.el (utf-translate-cjk-charsets): Add
+        katakana-jisx0201.
+
+        * international/subst-jis.el: Add data for JISX0201.
+
+2004-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * obsolete/hilit19.el (hilit-mode): New function.
+        Move all the toplevel side-effecting stuff into it, so that loading
+        hilit19 doesn't mess everything up any more.
+
+2004-10-27  Richard M. Stallman  <rms@gnu.org>
+
+        * add-log.el (add-change-log-entry): Set up mailing address
+        and full name later, and don't alter add-log-mailing-address
+        or add-log-full-name.
+
+        * elide-head.el (elide-head): Change error to message.
+        (elide-head-show): Likewise.
+
+        * apropos.el (apropos-macrop): Doc fix.
+
+        * mouse.el (mouse-show-mark): Do most processing the same
+        regardless of transient-mark-mode.
+
+        * shadowfile.el (shadow-copy-files): Use interactive-p
+        only to control whether to print a message.
+
+        * tar-mode.el (tar-mode): Use write-contents-functions,
+        not write-contents-hooks.
+
+        * eshell/em-unix.el (eshell-du-sum-directory): Don't use
+        directory-sep-char.
+
+2004-10-27  Richard M. Stallman  <rms@gnu.org>
+
+        * strokes.el (strokes-unload-hook): Fix previous change.
+
+        * type-break.el (type-break-run-at-time): Always use run-at-time;
+        forget the alternatives.
+        (type-break-cancel-function-timers): Always use cancel-function-timers;
+        forget the alternatives.
+
+        * pcomplete.el (pcomplete-entries): Don't use directory-sep-char.
+
+2004-10-27  Kenichi Handa  <handa@m17n.org>
+
+        * international/subst-jis.el: Use utf-translate-cjk-substitutable-p.
+
+        * international/subst-gb2312.el: Likewise.
+
+        * international/subst-big5.el: Likewise.
+
+        * international/subst-ksc.el: Likewise.
+
+        * international/utf-8.el (utf-translate-cjk-unicode-range-string):
+        New variable.
+        (utf-translate-cjk-set-unicode-range): New function.
+        (utf-translate-cjk-unicode-range): Make it customizable.
+        (utf-8-post-read-conversion):
+        Use utf-translate-cjk-unicode-range-string.
+        (ccl-decode-mule-utf-8): Check utf-subst-table-for-decode for more
+        Unicode ranges.
+
+2004-10-26  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * files.el (auto-mode-alist): Add pod, js, xbm and xpm and group
+        trivial variants to shorten the list.
+        (xml-based-modes): New var.
+        (set-auto-mode): Give interpreter-mode-alist or <?xml or <!DOCTYPE
+        declaration higher priority than auto-mode-alist.
+
+        * find-file.el (cc-other-file-alist): Bring it in line with
+        cc-mode's auto-mode-alist entries and use \' instead of $.
+
+        * textmodes/sgml-mode.el (sgml-mode): Fix imenu-generic-expression
+        and add "Id" and "Name" submenus to it.
+
+        * imenu.el (imenu--generic-function): Skip matches in comments.
+
+2004-10-26  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc.el (calc,full-calc, calc-quit, calc-keypad)
+        (full-calc-keypad, calc-trail-display):  Use an extra argument
+        instead of `interactive-p'.
+
+        * calc/calc-misc.el (calc-other-window): Use an extra argument
+        instead of `interactive-p'.
+
+        * calc/calc-rewr.el (calc-match): Use an extra argument instead of
+        `interactive-p'.
+
+2004-10-26  Kim F. Storm  <storm@cua.dk>
+
+        * help.el (describe-key): Describe both down-event and up-event
+        for a mouse click.
+
+2004-10-26  Richard M. Stallman  <rms@gnu.org>
+
+        * woman.el (woman): Don't call interactive-p.
+
+        * pcomplete.el (pcomplete): Instead of interactive-p,
+        use an arg set non-nil by the interactive spec.
+
+        * menu-bar.el (menu-bar-make-toggle): Instead of interactive-p,
+        use an arg set non-nil by the interactive spec.
+
+        * man.el (Man-cleanup-manpage): Instead of interactive-p,
+        use an arg set non-nil by the interactive spec.
+
+2004-10-26  Pavel Kobiakov  <pk_at_work@yahoo.com>
+
+        * progmodes/flymake.el (flymake-split-string):
+        Use `flymake-split-string-remove-empty-edges' in any case.
+
+2004-10-26  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/flymake.el (flymake-err-line-patterns):
+        Use `compilation-error-regexp-alist-alist' instead of
+        `compilation-error-regexp-alist'.
+
+2004-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/tex-mode.el (tex-font-lock-keywords-1): Fix up the spurious
+        verbatim face on the \ of \end{verbatim}.
+
+2004-10-25  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-incom.el (calc-digit-dots):  Inhibit read-only before
+        erasing minibuffer.
+
+2004-10-25  Simon Josefsson  <jas@extundo.com>
+
+        * subr.el (read-passwd): Move to net/password.el.
+
+        * net/password.el (read-passwd): Add.  Autoload it.
+
+2004-10-25  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        * mouse-sel.el (mouse-sel-mode): Specify custom group.
+
+        * simple.el (process-file): Fix logic.
+
 2004-10-24  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * indent.el (set-left-margin, set-right-margin): Delete redundant
-        code.
+        * indent.el (set-left-margin, set-right-margin): Delete redundant code.
         (increase-right-margin): Remove erroneous call to `interactive-p'.
 
 2004-10-24  Kim F. Storm  <storm@cua.dk>
@@ -22,24 +236,23 @@
 
 2004-10-24  Masatake YAMATO  <jet@gyve.org>
 
-        * progmodes/gdb-ui.el (gdb-assembler-font-lock-keywords): Handle
-        periods and underscores in a function name.
+        * progmodes/gdb-ui.el (gdb-assembler-font-lock-keywords):
+        Handle periods and underscores in a function name.
         Remove the address fontification.
 
 2004-10-24 Masatake YAMATO <jet@gyve.org>
 
-        * progmodes/asm-mode.el (asm-font-lock-keywords): Use
-        font-lock-variable-name-face for registers.
+        * progmodes/asm-mode.el (asm-font-lock-keywords):
+        Use font-lock-variable-name-face for registers.
 
 2004-10-24  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-get-create-buffer): Allow modes to run
         kill-all-local-variables.
         (gdb-breakpoints-mode, gdb-frames-mode, gdb-threads-mode)
-        (gdb-registers-mode, gdb-locals-mode, gdb-assembler-mode): Use
-        kill-all-local-variables and provide mode-hooks.
-        (gdb-assembler-font-lock-keywords): New font lock keywords
-        definition.
+        (gdb-registers-mode, gdb-locals-mode, gdb-assembler-mode):
+        Use kill-all-local-variables and provide mode-hooks.
+        (gdb-assembler-font-lock-keywords): New font lock keywords definition.
         (gdb-assembler-mode): Use 'gdb-assembler-font-lock-keywords'.
         Suggested by Masatake YAMATO <jet@gyve.org>.
 
@@ -84,13 +297,16 @@
 2004-10-21  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-aent.el (calc-alg-ent-map, calc-alg-ent-esc-map):
-        Declared these variables with defvar.
+        Declare these variables with defvar.
 
         * calc/calc-aent.el (calc-do-alg-entry): Since `calc-alg-ent-map'
         is bound, only check to see if it is bound.
 
 2004-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * textmodes/tex-mode.el (tex-compilation-parse-errors):
+        Don't output messages.
+
         * calc/calc-help.el (calc-describe-bindings): Fix last change.
 
 2004-10-21  John Paul Wallington  <jpw@gnu.org>
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 26faea2ddc3..ae135b2bfb3 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -471,20 +471,6 @@ Today's date is calculated according to `change-log-time-zone-rule' if
 non-nil, otherwise in local time."
   (interactive (list current-prefix-arg
                      (prompt-for-change-log-name)))
-  (or add-log-full-name
-      (setq add-log-full-name (user-full-name)))
-  (or add-log-mailing-address
-      (setq add-log-mailing-address user-mail-address))
-  (if whoami
-      (progn
-        (setq add-log-full-name (read-input "Full name: " add-log-full-name))
-         ;; Note that some sites have room and phone number fields in
-         ;; full name which look silly when inserted.  Rather than do
-         ;; anything about that here, let user give prefix argument so that
-         ;; s/he can edit the full name field in prompter if s/he wants.
-        (setq add-log-mailing-address
-              (read-input "Mailing address: " add-log-mailing-address))))
-
   (let* ((defun (add-log-current-defun))
          (version (and change-log-version-info-enabled
                        (change-log-version-number-search)))
@@ -495,7 +481,19 @@ non-nil, otherwise in local time."
          (file-name (expand-file-name (find-change-log file-name buffer-file)))
          ;; Set ITEM to the file name to use in the new item.
          (item (add-log-file-name buffer-file file-name))
-         bound)
+         bound
+         (full-name (or add-log-full-name (user-full-name)))
+         (mailing-address (or add-log-mailing-address user-mail-address)))
+
+    (if whoami
+        (progn
+          (setq full-name (read-input "Full name: " full-name))
+          ;; Note that some sites have room and phone number fields in
+          ;; full name which look silly when inserted.  Rather than do
+          ;; anything about that here, let user give prefix argument so that
+          ;; s/he can edit the full name field in prompter if s/he wants.
+          (setq mailing-address
+                (read-input "Mailing address: " mailing-address))))
 
     (unless (equal file-name buffer-file-name)
       (if (or other-window (window-dedicated-p (selected-window)))
@@ -515,11 +513,11 @@ non-nil, otherwise in local time."
     ;; Advance into first entry if it is usable; else make new one.
     (let ((new-entries (mapcar (lambda (addr)
                                  (concat (funcall add-log-time-format)
-                                         "  " add-log-full-name
+                                         "  " full-name
                                          "  <" addr ">"))
-                               (if (consp add-log-mailing-address)
-                                   add-log-mailing-address
-                                 (list add-log-mailing-address)))))
+                               (if (consp mailing-address)
+                                   mailing-address
+                                 (list mailing-address)))))
       (if (and (not add-log-always-start-new-record)
                (let ((hit nil))
                  (dolist (entry new-entries hit)
diff --git a/lisp/apropos.el b/lisp/apropos.el
index e5904e73b71..8bfaa3ad592 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -875,7 +875,7 @@ If non-nil TEXT is a string that will be printed as a heading."
 
 
 (defun apropos-macrop (symbol)
-  "T if SYMBOL is a Lisp macro."
+  "Return t if SYMBOL is a Lisp macro."
   (and (fboundp symbol)
        (consp (setq symbol
                     (symbol-function symbol)))
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index b8bb7ab4f9a..7dc7f08b4bd 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -183,7 +183,8 @@
         (if calc-prev-prev-char
             (calcDigit-nondigit)
           (setq calc-digit-value nil)
-          (erase-buffer)
+          (let ((inhibit-read-only t))
+            (erase-buffer))
           (exit-minibuffer)))
     ;; just ignore extra decimal point, anticipating ".."
     (delete-backward-char 1)))
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index c01d37e6848..159b1ee3178 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -130,9 +130,9 @@ Calc user interface as before (either M-# C or M-# K; initially M-# C)."
                  "Now using full screen for Calc"
                "Now using partial screen for Calc"))))
 
-(defun calc-other-window ()
+(defun calc-other-window (&optional interactive)
   "Invoke the Calculator in another window."
-  (interactive)
+  (interactive "p")
   (if (memq major-mode '(calc-mode calc-trail-mode))
       (progn
         (other-window 1)
@@ -141,7 +141,7 @@ Calc user interface as before (either M-# C or M-# K; initially M-# C)."
     (if (get-buffer-window "*Calculator*")
         (calc-quit)
       (let ((win (selected-window)))
-        (calc nil win (interactive-p))))))
+        (calc nil win interactive)))))
 
 (defun another-calc ()
   "Create another, independent Calculator buffer."
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index 51cffb753fc..47b48bd88d8 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -143,15 +143,15 @@
      (calc-pop-push-record-list n "rwrt" (list expr)))
    (calc-handle-whys)))
 
-(defun calc-match (pat)
-  (interactive "sPattern: \n")
+(defun calc-match (pat &optional interactive)
+  (interactive "sPattern: \np")
   (calc-slow-wrapper
    (let (n expr)
      (if (or (null pat) (equal pat "") (equal pat "$"))
          (setq expr (calc-top-n 2)
                pat (calc-top-n 1)
                n 2)
-       (if (interactive-p) (setq calc-previous-alg-entry pat))
+       (if interactive (setq calc-previous-alg-entry pat))
        (setq pat (if (stringp pat) (math-read-expr pat) pat))
        (if (eq (car-safe pat) 'error)
            (error "Bad format in expression: %s" (nth 1 pat)))
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index c1669f78f08..4ace5fb6780 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1142,7 +1142,7 @@ commands given here will actually operate on the *Calculator* stack."
 ;;;###autoload
 (defun calc (&optional arg full-display interactive)
   "The Emacs Calculator.  Full documentation is listed under \"calc-mode\"."
-  (interactive "P")
+  (interactive "P\ni\np")
   (if arg
       (unless (eq arg 0)
         (calc-extensions)
@@ -1188,17 +1188,16 @@ commands given here will actually operate on the *Calculator* stack."
              (window-point full-display)
              (select-window full-display))
         (calc-check-defines)
-        (when (and calc-said-hello
-                   (or (interactive-p) interactive))
+        (when (and calc-said-hello interactive)
           (sit-for 2)
           (message ""))
         (setq calc-said-hello t)))))
 
 ;;;###autoload
-(defun full-calc ()
+(defun full-calc (&optional interactive)
   "Invoke the Calculator and give it a full-sized window."
-  (interactive)
-  (calc nil t (interactive-p)))
+  (interactive "p")
+  (calc nil t interactive))
 
 (defun calc-same-interface (arg)
   "Invoke the Calculator using the most recent interface (calc or calc-keypad)."
@@ -1215,8 +1214,8 @@ commands given here will actually operate on the *Calculator* stack."
           (calc arg calc-full-mode t))))))
 
 
-(defun calc-quit (&optional non-fatal)
-  (interactive)
+(defun calc-quit (&optional non-fatal interactive)
+  (interactive "i\np")
   (and calc-standalone-flag (not non-fatal)
        (save-buffers-kill-emacs nil))
   (if (and (equal (buffer-name) "*Gnuplot Trail*")
@@ -1226,7 +1225,7 @@ commands given here will actually operate on the *Calculator* stack."
       (calc-edit-cancel)
     (if (eq major-mode 'MacEdit-mode)
         (MacEdit-cancel-edit)
-      (if (and (interactive-p)
+      (if (and interactive
                calc-embedded-info
                (eq (current-buffer) (aref calc-embedded-info 0)))
           (calc-embedded nil)
@@ -1266,22 +1265,22 @@ or a list containing a character position and an error message in string form."
   (calc-do-calc-eval str separator args))
 
 ;;;###autoload
-(defun calc-keypad ()
+(defun calc-keypad (&optional interactive)
   "Invoke the Calculator in \"visual keypad\" mode.
 This is most useful in the X window system.
 In this mode, click on the Calc \"buttons\" using the left mouse button.
 Or, position the cursor manually and do M-x calc-keypad-press."
-  (interactive)
+  (interactive "p")
   (calc-extensions)
-  (calc-do-keypad calc-full-mode (interactive-p)))
+  (calc-do-keypad calc-full-mode interactive))
 
 ;;;###autoload
-(defun full-calc-keypad ()
+(defun full-calc-keypad (&optional interactive)
   "Invoke the Calculator in full-screen \"visual keypad\" mode.
 See calc-keypad for details."
-  (interactive)
+  (interactive "p")
   (calc-extensions)
-  (calc-do-keypad t (interactive-p)))
+  (calc-do-keypad t interactive))
 
 
 (defvar calc-aborted-prefix nil)
@@ -1802,8 +1801,8 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack."
   val)
 
 
-(defun calc-trail-display (flag &optional no-refresh)
-  (interactive "P")
+(defun calc-trail-display (flag &optional no-refresh interactive)
+  (interactive "P\ni\np")
   (let ((win (get-buffer-window (calc-trail-buffer))))
     (if (setq calc-display-trail
               (not (if flag (memq flag '(nil 0)) win)))
@@ -1817,7 +1816,7 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack."
                (setq overlay-arrow-string calc-trail-overlay
                      overlay-arrow-position calc-trail-pointer)
                (or no-refresh
-                   (if (interactive-p)
+                   (if interactive
                        (calc-do-refresh)
                      (calc-refresh))))))
       (if win
@@ -1825,7 +1824,7 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack."
             (delete-window win)
             (calc-wrapper
              (or no-refresh
-                 (if (interactive-p)
+                 (if interactive
                      (calc-do-refresh)
                    (calc-refresh))))))))
   calc-trail-buffer)
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 8fc8e12a3fb..fed6ecee7af 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -98,7 +98,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
             (if rest (setq rest (cdr rest))))
           (if (not (and beg end))
               (if (interactive-p)
-                  (error "No header found"))
+                  (message "No header found"))
             (goto-char beg)
             (end-of-line)
             (if (overlayp elide-head-overlay)
@@ -115,7 +115,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
            (overlay-buffer elide-head-overlay))
       (delete-overlay elide-head-overlay)
     (if (interactive-p)
-        (error "No header hidden"))))
+        (message "No header hidden"))))
 
 (provide 'elide-head)
 
diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el
index b292eefbaec..42dad0c48d8 100644
--- a/lisp/emacs-lisp/lselect.el
+++ b/lisp/emacs-lisp/lselect.el
@@ -1,6 +1,6 @@
 ;;; lselect.el --- Lucid interface to X Selections
 
-;; Copyright (C) 1990, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1993, 2004  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
@@ -146,7 +146,7 @@ secondary selection instead of the primary selection."
   (x-disown-selection-internal (if secondary-p 'SECONDARY 'PRIMARY)))
 
 (defun x-dehilight-selection (selection)
-  "for use as a value of x-lost-selection-hooks."
+  "for use as a value of `x-lost-selection-functions'."
   (cond ((eq selection 'PRIMARY)
          (if primary-selection-extent
              (let ((inhibit-quit t))
@@ -160,23 +160,23 @@ secondary selection instead of the primary selection."
                (setq secondary-selection-extent nil)))))
   nil)
 
-(setq x-lost-selection-hooks 'x-dehilight-selection)
+(setq x-lost-selection-functions 'x-dehilight-selection)
 
 (defun x-notice-selection-requests (selection type successful)
-  "for possible use as the value of x-sent-selection-hooks."
+  "for possible use as the value of `x-sent-selection-functions'."
   (if (not successful)
       (message "Selection request failed to convert %s to %s"
                selection type)
     (message "Sent selection %s as %s" selection type)))
 
 (defun x-notice-selection-failures (selection type successful)
-  "for possible use as the value of x-sent-selection-hooks."
+  "for possible use as the value of `x-sent-selection-functions'."
   (or successful
       (message "Selection request failed to convert %s to %s"
                selection type)))
 
-;(setq x-sent-selection-hooks 'x-notice-selection-requests)
-;(setq x-sent-selection-hooks 'x-notice-selection-failures)
+;(setq x-sent-selection-functions 'x-notice-selection-requests)
+;(setq x-sent-selection-functions 'x-notice-selection-failures)
 
 
 ;; Random utility functions
@@ -232,5 +232,5 @@ the kill ring or the Clipboard."
 
 (provide 'lselect)
 
-;;; arch-tag: 92fa54d4-c5d1-4e9b-ad58-cf1e13930556
+;; arch-tag: 92fa54d4-c5d1-4e9b-ad58-cf1e13930556
 ;;; lselect.el ends here
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index fb3c537936f..00411c8ca4c 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,6 +1,7 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
-;; Copyright (C) 1997,98,99,200,01,02,03,04  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;;        Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulation convenience cua
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index ce30cec6604..d932916d8c9 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -799,7 +799,7 @@ external command."
         (size 0.0))
     (while entries
       (unless (string-match "\\`\\.\\.?\\'" (caar entries))
-        (let* ((entry (concat path (char-to-string directory-sep-char)
+        (let* ((entry (concat path "/"
                               (caar entries)))
                (symlink (and (stringp (cadr (car entries)))
                              (cadr (car entries)))))
diff --git a/lisp/files.el b/lisp/files.el
index 7c06316a487..26f0ed608a2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1645,41 +1645,35 @@ in that case, this function acts as if `enable-local-variables' were t."
   (mapc
    (lambda (elt)
      (cons (purecopy (car elt)) (cdr elt)))
-   '(("\\.te?xt\\'" . text-mode)
-     ("\\.tex\\'" . tex-mode)
+   '(;; do this first, so that .html.pl is Polish html, not Perl
+     ("\\.s?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode)
+     ("\\.te?xt\\'" . text-mode)
+     ("\\.[tT]e[xX]\\'" . tex-mode)
      ("\\.ins\\'" . tex-mode)           ;Installation files for TeX packages.
      ("\\.ltx\\'" . latex-mode)
      ("\\.dtx\\'" . doctex-mode)
      ("\\.el\\'" . emacs-lisp-mode)
      ("\\.\\(scm\\|stk\\|ss\\|sch\\)\\'" . scheme-mode)
      ("\\.l\\'" . lisp-mode)
-     ("\\.lisp\\'" . lisp-mode)
-     ("\\.f\\'" . fortran-mode)
-     ("\\.F\\'" . fortran-mode)
+     ("\\.li?sp\\'" . lisp-mode)
+     ("\\.[fF]\\'" . fortran-mode)
      ("\\.for\\'" . fortran-mode)
      ("\\.p\\'" . pascal-mode)
      ("\\.pas\\'" . pascal-mode)
      ("\\.ad[abs]\\'" . ada-mode)
      ("\\.ad[bs].dg\\'" . ada-mode)
-     ("\\.\\([pP]\\([Llm]\\|erl\\)\\|al\\)\\'" . perl-mode)
-     ("\\.s?html?\\'" . html-mode)
+     ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
      ("\\.mk\\'" . makefile-mode)
-     ("\\(M\\|m\\|GNUm\\)akefile\\'" . makefile-mode)
+     ("\\([Mm]\\|GNUm\\)akep*file\\'" . makefile-mode)
      ("\\.am\\'" . makefile-mode)       ;For Automake.
      ;; Less common extensions come here
      ;; so more common ones above are found faster.
      ("\\.texinfo\\'" . texinfo-mode)
      ("\\.te?xi\\'" . texinfo-mode)
-     ("\\.s\\'" . asm-mode)
-     ("\\.S\\'" . asm-mode)
+     ("\\.[sS]\\'" . asm-mode)
      ("\\.asm\\'" . asm-mode)
-     ("ChangeLog\\'" . change-log-mode)
-     ("change\\.log\\'" . change-log-mode)
-     ("changelo\\'" . change-log-mode)
-     ("ChangeLog\\.[0-9]+\\'" . change-log-mode)
-     ;; for MSDOS and MS-Windows (which are case-insensitive)
-     ("changelog\\'" . change-log-mode)
-     ("changelog\\.[0-9]+\\'" . change-log-mode)
+     ("[cC]hange\\.?[lL]og?\\'" . change-log-mode)
+     ("[cC]hange[lL]og\\.[0-9]+\\'" . change-log-mode)
      ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode)
      ("\\.scm\\.[0-9]*\\'" . scheme-mode)
      ("\\.[ck]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
@@ -1688,36 +1682,28 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\(/\\|\\`\\)\\.\\(bash_logout\\|shrc\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode)
      ("\\.m?spec\\'" . sh-mode)
-     ("\\.mm\\'" . nroff-mode)
-     ("\\.me\\'" . nroff-mode)
-     ("\\.ms\\'" . nroff-mode)
+     ("\\.m[mes]\\'" . nroff-mode)
      ("\\.man\\'" . nroff-mode)
-     ("\\.TeX\\'" . tex-mode)
      ("\\.sty\\'" . latex-mode)
-     ("\\.cls\\'" . latex-mode)         ;LaTeX 2e class
-     ("\\.clo\\'" . latex-mode)         ;LaTeX 2e class option
+     ("\\.cl[so]\\'" . latex-mode)              ;LaTeX 2e class option
      ("\\.bbl\\'" . latex-mode)
      ("\\.bib\\'" . bibtex-mode)
      ("\\.sql\\'" . sql-mode)
-     ("\\.m4\\'" . m4-mode)
-     ("\\.mc\\'" . m4-mode)
+     ("\\.m[4c]\\'" . m4-mode)
      ("\\.mf\\'" . metafont-mode)
      ("\\.mp\\'" . metapost-mode)
      ("\\.vhdl?\\'" . vhdl-mode)
      ("\\.article\\'" . text-mode)
      ("\\.letter\\'" . text-mode)
-     ("\\.tcl\\'" . tcl-mode)
+     ("\\.i?tcl\\'" . tcl-mode)
      ("\\.exp\\'" . tcl-mode)
-     ("\\.itcl\\'" . tcl-mode)
      ("\\.itk\\'" . tcl-mode)
      ("\\.icn\\'" . icon-mode)
      ("\\.sim\\'" . simula-mode)
      ("\\.mss\\'" . scribe-mode)
-     ("\\.f90\\'" . f90-mode)
-     ("\\.f95\\'" . f90-mode)
+     ("\\.f9[05]\\'" . f90-mode)
      ("\\.indent\\.pro\\'" . fundamental-mode) ; to avoid idlwave-mode
      ("\\.pro\\'" . idlwave-mode)
-     ("\\.lsp\\'" . lisp-mode)
      ("\\.prolog\\'" . prolog-mode)
      ("\\.tar\\'" . tar-mode)
      ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|ear\\|jar\\|war\\)\\'" . archive-mode)
@@ -1733,10 +1719,11 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\`/tmp/fol/" . text-mode)
      ("\\.oak\\'" . scheme-mode)
      ("\\.sgml?\\'" . sgml-mode)
-     ("\\.xml\\'" . sgml-mode)
-     ("\\.xsl\\'" . sgml-mode)
+     ("\\.x[ms]l\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
+     ("\\.js\\'" . java-mode)           ; javascript-mode would be better
+     ("\\.x[bp]m\\'" . c-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.
      ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
@@ -1760,7 +1747,7 @@ in that case, this function acts as if `enable-local-variables' were t."
      ;; or .#<file>.<rev>-<rev> or VC's <file>.~<rev>~.
      ;; Using mode nil rather than `ignore' would let the search continue
      ;; through this list (with the shortened name) rather than start over.
-     ("\\.~?[0-9]+\\.[0-9][-.0-9]*~?\\'" ignore t)
+     ("\\.~?[0-9]+\\.[0-9][-.0-9]*~?\\'" nil t)
      ;; The following should come after the ChangeLog pattern
      ;; for the sake of ChangeLog.1, etc.
      ;; and after the .scm.[0-9] and CVS' <file>.<rev> patterns too.
@@ -1849,12 +1836,20 @@ be interpreted by the interpreter matched by the second group of the
 regular expression.  The mode is then determined as the mode associated
 with that interpreter in `interpreter-mode-alist'.")
 
-(defun set-auto-mode (&optional just-from-file-name)
+(defvar xml-based-modes '(html-mode)
+  "Modes that override an XML declaration.
+When `set-auto-mode' sees an <?xml or <!DOCTYPE declaration, that
+buffer will be in some XML mode.  If `auto-mode-alist' associates
+the file with one of the modes in this list, that mode will be
+used.  Else `xml-mode' or `sgml-mode' is used.")
+
+(defun set-auto-mode (&optional keep-mode-if-same)
   "Select major mode appropriate for current buffer.
-This checks for a -*- mode tag in the buffer's text,
-compares the filename against the entries in `auto-mode-alist',
-or checks the interpreter that runs this file against
-`interpreter-mode-alist'.
+This checks for a -*- mode tag in the buffer's text, checks the
+interpreter that runs this file against `interpreter-mode-alist',
+looks for an <?xml or <!DOCTYPE declaration (see
+`xml-based-modes'), or compares the filename against the entries
+in `auto-mode-alist'.
 
 It does not check for the `mode:' local variable in the
 Local Variables section of the file; for that, use `hack-local-variables'.
@@ -1862,14 +1857,16 @@ Local Variables section of the file; for that, use `hack-local-variables'.
 If `enable-local-variables' is nil, this function does not check for a
 -*- mode tag.
 
-If the optional argument JUST-FROM-FILE-NAME is non-nil,
-then we do not set anything but the major mode,
-and we don't even do that unless it would come from the file name."
+If the optional argument KEEP-MODE-IF-SAME is non-nil, then we
+only set the major mode, if that would change it."
   ;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*-
-  (let (end done modes)
+  (let (end done mode modes xml)
+    ;; Find a -*- mode tag
     (save-excursion
       (goto-char (point-min))
       (skip-chars-forward " \t\n")
+      ;; While we're at this point, check xml for later.
+      (setq xml (looking-at "<\\?xml \\|<!DOCTYPE"))
       (and enable-local-variables
            (setq end (set-auto-mode-1))
            (if (save-excursion (search-forward ":" end t))
@@ -1891,62 +1888,71 @@ and we don't even do that unless it would come from the file name."
              (push (intern (concat (downcase (buffer-substring (point) end))
                                    "-mode"))
                    modes))))
-    ;; If we found modes to use, invoke them now,
-    ;; outside the save-excursion.
-    (unless just-from-file-name
-      (dolist (mode (nreverse modes))
-        (if (not (functionp mode))
-            (message "Ignoring unknown mode `%s'" mode)
-          (setq done t)
-          (funcall mode))))
-    ;; If we didn't find a mode from a -*- line, try using the file name.
+    ;; If we found modes to use, invoke them now, outside the save-excursion.
+    (if modes
+        (catch 'nop
+          (dolist (mode (nreverse modes))
+            (if (not (functionp mode))
+                (message "Ignoring unknown mode `%s'" mode)
+              (setq done t)
+              (or (set-auto-mode-0 mode)
+                  (throw 'nop nil)))))
+      ;; If we didn't, look for an interpreter specified in the first line.
+      ;; As a special case, allow for things like "#!/bin/env perl", which
+      ;; finds the interpreter anywhere in $PATH.
+      (setq mode (save-excursion
+                   (goto-char (point-min))
+                   (if (looking-at auto-mode-interpreter-regexp)
+                       (match-string 2)
+                     ""))
+            ;; Map interpreter name to a mode, signalling we're done at the
+            ;; same time.
+            done (assoc (file-name-nondirectory mode)
+                        interpreter-mode-alist))
+      ;; If we found an interpreter mode to use, invoke it now.
+      (if done (set-auto-mode-0 (cdr done))))
     (if (and (not done) buffer-file-name)
-        (let ((name buffer-file-name)
-              (keep-going t))
+        (let ((name buffer-file-name))
           ;; Remove backup-suffixes from file name.
           (setq name (file-name-sans-versions name))
-          (while keep-going
-            (setq keep-going nil)
-            (let ((alist auto-mode-alist)
-                  (mode nil))
-              ;; Find first matching alist entry.
-              (let ((case-fold-search
-                     (memq system-type '(vax-vms windows-nt cygwin))))
-                (while (and (not mode) alist)
-                  (if (string-match (car (car alist)) name)
-                      (if (and (consp (cdr (car alist)))
-                               (nth 2 (car alist)))
-                          (setq mode (car (cdr (car alist)))
-                                name (substring name 0 (match-beginning 0))
-                                keep-going t)
-                        (setq mode (cdr (car alist))
-                              keep-going nil)))
-                  (setq alist (cdr alist))))
-              (if mode
-                  ;; When JUST-FROM-FILE-NAME is set,
-                  ;; we are working on behalf of set-visited-file-name.
-                  ;; In that case, if the major mode specified is the
-                  ;; same one we already have, don't actually reset it.
-                  ;; We don't want to lose minor modes such as Font Lock.
-                  (unless (and just-from-file-name (eq mode major-mode))
-                    (funcall mode))
-                ;; If we can't deduce a mode from the file name,
-                ;; look for an interpreter specified in the first line.
-                ;; As a special case, allow for things like "#!/bin/env perl",
-                ;; which finds the interpreter anywhere in $PATH.
-                (let ((interpreter
-                       (save-excursion
-                         (goto-char (point-min))
-                         (if (looking-at auto-mode-interpreter-regexp)
-                             (match-string 2)
-                           "")))
-                      elt)
-                  ;; Map interpreter name to a mode.
-                  (setq elt (assoc (file-name-nondirectory interpreter)
-                                   interpreter-mode-alist))
-                  (unless just-from-file-name
-                    (if elt
-                        (funcall (cdr elt))))))))))))
+          (while name
+            ;; Find first matching alist entry.
+            (let ((case-fold-search
+                   (memq system-type '(vax-vms windows-nt cygwin))))
+              (if (and (setq mode (assoc-default name auto-mode-alist
+                                                 'string-match))
+                       (consp mode)
+                       (cadr mode))
+                  (setq mode (car mode)
+                        name (substring name 0 (match-beginning 0)))
+                (setq name)))
+            (when mode
+              (if xml (or (memq mode xml-based-modes)
+                          (setq mode 'xml-mode)))
+              (set-auto-mode-0 mode)
+              (setq done t)))))
+    (and xml
+         (not done)
+         (set-auto-mode-0 'xml-mode))))
+
+
+;; When `keep-mode-if-same' is set, we are working on behalf of
+;; set-visited-file-name.  In that case, if the major mode specified is the
+;; same one we already have, don't actually reset it.  We don't want to lose
+;; minor modes such as Font Lock.
+(defun set-auto-mode-0 (mode)
+  "Apply MODE and return it.
+If `keep-mode-if-same' is non-nil MODE is chased of any aliases and
+compared to current major mode.  If they are the same, do nothing
+and return nil."
+  (when keep-mode-if-same
+    (while (symbolp (symbol-function mode))
+      (setq mode (symbol-function mode)))
+    (if (eq mode major-mode)
+        (setq mode)))
+  (when mode
+    (funcall mode)
+    mode))
 
 
 (defun set-auto-mode-1 ()
@@ -2157,7 +2163,7 @@ is specified, returning t if it is specified."
                         (error "Local variables entry is missing the suffix")))
                   (forward-line 1))
                 (goto-char (point-min))
-                  
+
                 (while (not (eobp))
                   ;; Find the variable name; strip whitespace.
                   (skip-chars-forward " \t")
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 4805d08400b..d85d2ab0f51 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -57,7 +57,7 @@
 ;; format above can be changed to include a function to be called when the
 ;; current file matches the regexp:
 ;;
-;;   '(("\\.cc$"  cc-function)
+;;   '(("\\.cc$"  cc--function)
 ;;     ("\\.hh$"  hh-function))
 ;;
 ;; These functions must return a list consisting of the possible names of the
@@ -239,22 +239,26 @@ the preceding slash.  The star represents all the subdirectories except
   :group 'ff)
 
 (defcustom cc-other-file-alist
-  '(
-    ("\\.cc$"  (".hh" ".h"))
-    ("\\.hh$"  (".cc" ".C"))
+  '(("\\.cc\\'"  (".hh" ".h"))
+    ("\\.hh\\'"  (".cc" ".C"))
 
-    ("\\.c$"   (".h"))
-    ("\\.h$"   (".c" ".cc" ".C" ".CC" ".cxx" ".cpp"))
+    ("\\.c\\'"   (".h"))
+    ("\\.h\\'"   (".c" ".cc" ".C" ".CC" ".cxx" ".cpp"))
 
-    ("\\.C$"   (".H"  ".hh" ".h"))
-    ("\\.H$"   (".C"  ".CC"))
+    ("\\.C\\'"   (".H"  ".hh" ".h"))
+    ("\\.H\\'"   (".C"  ".CC"))
 
-    ("\\.CC$"  (".HH" ".H"  ".hh" ".h"))
-    ("\\.HH$"  (".CC"))
+    ("\\.CC\\'"  (".HH" ".H"  ".hh" ".h"))
+    ("\\.HH\\'"  (".CC"))
 
-    ("\\.cxx$" (".hh" ".h"))
-    ("\\.cpp$" (".hh" ".h"))
-    )
+    ("\\.c\\+\\+\\'" (".h++" ".hh" ".h"))
+    ("\\.h\\+\\+\\'" (".c++"))
+
+    ("\\.cpp\\'" (".hpp" ".hh" ".h"))
+    ("\\.hpp\\'" (".cpp"))
+
+    ("\\.cxx\\'" (".hxx" ".hh" ".h"))
+    ("\\.hxx\\'" (".cxx")))
   "*Alist of extensions to find given the current file's extension.
 
 This list should contain the most used extensions before the others,
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2a4b0a80398..2c658a4c562 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,39 @@
+2004-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-util.el (mm-coding-system-priorities): Prefer iso-8859-1 than
+        iso-2022-jp even in the Japanese language environment.  Suggested
+        by Jason Rumney <jasonr@gnu.org>.
+
+2004-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-update-summary-mark-positions): Allow users to
+        use the same characters as the dummy marks; make it free from
+        getting affected by the language environment.
+        (gnus-summary-read-group-1): Update mark positions only when the
+        format spec is updated.
+
+        * gnus-spec.el (gnus-update-format-specifications): Return a list
+        of updated types.
+
+2004-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nnspool.el (nnspool-spool-directory): Use news-path if the
+        news-directory variable is not bound.
+
+        * gnus-group.el (gnus-group-line-format-alist): Convert the value
+        of gnus-tmp-news-method into string if it may be passed to
+        gnus-correct-length which takes only a string argument.
+
+2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * html2text.el (html2text-buffer-head): Removed.  Use `goto-char'
+        instead.
+
+2004-10-24  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+        * gnus-start.el (gnus-convert-old-newsrc): Fixed numeric
+        comparison on string.
+
 2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f3b2f91cd5e..c55264b22de 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -491,7 +491,10 @@ simple manner.")
     (?O gnus-tmp-moderated-string ?s)
     (?p gnus-tmp-process-marked ?c)
     (?s gnus-tmp-news-server ?s)
-    (?n gnus-tmp-news-method ?s)
+    (?n ,(if (featurep 'xemacs)
+             '(symbol-name gnus-tmp-news-method)
+           'gnus-tmp-news-method)
+        ?s)
     (?P gnus-group-indentation ?s)
     (?E gnus-tmp-group-icon ?s)
     (?B gnus-tmp-summary-live ?c)
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 690fc7e026a..dc93fef5176 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -183,7 +183,8 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
     (insert (gnus-pp-to-string spec))))
 
 (defun gnus-update-format-specifications (&optional force &rest types)
-  "Update all (necessary) format specifications."
+  "Update all (necessary) format specifications.
+Return a list of updated types."
   ;; Make the indentation array.
   ;; See whether all the stored info needs to be flushed.
   (when (or force
@@ -195,13 +196,12 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
     (setq gnus-format-specs nil))
 
   ;; Go through all the formats and see whether they need updating.
-  (let (new-format entry type val)
+  (let (new-format entry type val updated)
     (while (setq type (pop types))
       ;; Jump to the proper buffer to find out the value of the
       ;; variable, if possible.  (It may be buffer-local.)
       (save-excursion
-        (let ((buffer (intern (format "gnus-%s-buffer" type)))
-              val)
+        (let ((buffer (intern (format "gnus-%s-buffer" type))))
           (when (and (boundp buffer)
                      (setq val (symbol-value buffer))
                      (gnus-buffer-exists-p val))
@@ -231,10 +231,12 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
                 (setcar (cdr entry) val)
                 (setcar entry new-format))
             (push (list type new-format val) gnus-format-specs))
-          (set (intern (format "gnus-%s-line-format-spec" type)) val)))))
+          (set (intern (format "gnus-%s-line-format-spec" type)) val)
+          (push type updated))))
 
-  (unless (assq 'version gnus-format-specs)
-    (push (cons 'version emacs-version) gnus-format-specs)))
+    (unless (assq 'version gnus-format-specs)
+      (push (cons 'version emacs-version) gnus-format-specs))
+    updated))
 
 (defvar gnus-mouse-face-0 'highlight)
 (defvar gnus-mouse-face-1 'highlight)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index c6445b460ff..971124ba831 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2225,7 +2225,8 @@ If FORCE is non-nil, the .newsrc file is read."
 (defun gnus-convert-old-newsrc ()
   "Convert old newsrc formats into the current format, if needed."
   (let ((fcv (and gnus-newsrc-file-version
-                  (gnus-continuum-version gnus-newsrc-file-version))))
+                  (gnus-continuum-version gnus-newsrc-file-version)))
+        (gcv (gnus-continuum-version)))
     (when fcv
       ;; A newsrc file was loaded.
       (let (prompt-displayed
@@ -2259,7 +2260,7 @@ If FORCE is non-nil, the .newsrc file is read."
         ;; Perform converters to bring older version up to date.
         (when (and converters (< fcv (caar converters)))
           (while (and converters (< fcv (caar converters))
-                      (<= (caar converters) gnus-version))
+                      (<= (caar converters) gcv))
             (let* ((converter-spec  (pop converters))
                    (convert-to      (nth 1 converter-spec))
                    (load-from       (nth 2 converter-spec))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 14ad9c99a3b..6ce2f55e2b7 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3225,43 +3225,54 @@ buffer that was in action when the last article was fetched."
   (save-excursion
     (when (gnus-buffer-exists-p gnus-summary-buffer)
       (set-buffer gnus-summary-buffer))
-    (let ((gnus-replied-mark 129)
-          (gnus-score-below-mark 130)
-          (gnus-score-over-mark 130)
-          (gnus-undownloaded-mark 131)
-          (spec gnus-summary-line-format-spec)
-          gnus-visual pos)
+    (let ((spec gnus-summary-line-format-spec)
+          pos)
       (save-excursion
         (gnus-set-work-buffer)
-        (let ((gnus-summary-line-format-spec spec)
+        (let ((gnus-tmp-unread ?Z)
+              (gnus-replied-mark ?Z)
+              (gnus-score-below-mark ?Z)
+              (gnus-score-over-mark ?Z)
+              (gnus-undownloaded-mark ?Z)
+              (gnus-summary-line-format-spec spec)
               (gnus-newsgroup-downloadable '(0))
-              marks)
-          (insert ?\200 "\200" ?\201 "\201" ?\202 "\202" ?\203 "\203")
-          (while (not (bobp))
-            (push (buffer-substring (1- (point)) (point)) marks)
-            (backward-char))
+              (header [0 "" "" "05 Apr 2001 23:33:09 +0400" "" "" 0 0 "" nil])
+              case-fold-search ignores)
+          ;; Here, all marks are bound to Z.
+          (gnus-summary-insert-line header
+                                    0 nil t gnus-tmp-unread t nil "" nil 1)
+          (goto-char (point-min))
+          ;; Memorize the positions of the same characters as dummy marks.
+          (while (re-search-forward "[A-D]" nil t)
+            (push (point) ignores))
           (erase-buffer)
-          (gnus-summary-insert-line
-           [0 "" "" "05 Apr 2001 23:33:09 +0400" "" "" 0 0 "" nil]
-           0 nil t 128 t nil "" nil 1)
+          ;; We use A-D as dummy marks in order to know column positions
+          ;; where marks should be inserted.
+          (setq gnus-tmp-unread ?A
+                gnus-replied-mark ?B
+                gnus-score-below-mark ?C
+                gnus-score-over-mark ?C
+                gnus-undownloaded-mark ?D)
+          (gnus-summary-insert-line header
+                                    0 nil t gnus-tmp-unread t nil "" nil 1)
+          ;; Ignore characters which aren't dummy marks.
+          (dolist (p ignores)
+            (delete-region (goto-char (1- p)) p)
+            (insert ?Z))
           (goto-char (point-min))
           (setq pos (list (cons 'unread
-                                (and (or (search-forward (nth 0 marks) nil t)
-                                         (search-forward (nth 1 marks) nil t))
+                                (and (search-forward "A" nil t)
                                      (- (point) (point-min) 1)))))
           (goto-char (point-min))
-          (push (cons 'replied (and (or (search-forward (nth 2 marks) nil t)
-                                        (search-forward (nth 3 marks) nil t))
+          (push (cons 'replied (and (search-forward "B" nil t)
                                     (- (point) (point-min) 1)))
                 pos)
           (goto-char (point-min))
-          (push (cons 'score (and (or (search-forward (nth 4 marks) nil t)
-                                      (search-forward (nth 5 marks) nil t))
+          (push (cons 'score (and (search-forward "C" nil t)
                                   (- (point) (point-min) 1)))
                 pos)
           (goto-char (point-min))
-          (push (cons 'download (and (or (search-forward (nth 6 marks) nil t)
-                                         (search-forward (nth 7 marks) nil t))
+          (push (cons 'download (and (search-forward "D" nil t)
                                      (- (point) (point-min) 1)))
                 pos)))
       (setq gnus-summary-mark-positions pos))))
@@ -3559,9 +3570,11 @@ If NO-DISPLAY, don't generate a summary buffer."
              (gnus-active gnus-newsgroup-name)))
       ;; You can change the summary buffer in some way with this hook.
       (gnus-run-hooks 'gnus-select-group-hook)
-      (gnus-update-format-specifications
-       nil 'summary 'summary-mode 'summary-dummy)
-      (gnus-update-summary-mark-positions)
+      (when (memq 'summary (gnus-update-format-specifications
+                            nil 'summary 'summary-mode 'summary-dummy))
+        ;; The format specification for the summary line was updated,
+        ;; so we need to update the mark positions as well.
+        (gnus-update-summary-mark-positions))
       ;; Do score processing.
       (when gnus-use-scoring
         (gnus-possibly-score-headers))
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 6f1ef3b0289..31d1869c695 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -116,12 +116,6 @@ formatting, and then moved afterward.")
 ;; <Utility functions>
 ;;
 
-(defun html2text-buffer-head ()
-  (if (string= mode-name "Article")
-      (beginning-of-buffer)
-    (beginning-of-buffer)
-    )
-  )
 
 (defun html2text-replace-string (from-string to-string p1 p2)
   (goto-char p1)
@@ -432,11 +426,11 @@ formatting, and then moved afterward.")
   "This _tries_ to fix up the paragraphs - this is done in quite a ad-hook
 fashion, quite close to pure guess-work. It does work in some cases though."
   (interactive)
-  (html2text-buffer-head)
+  (goto-char (point-min))
   (replace-regexp "^<br>$" "")
   ;; Removing lonely <br> on a single line, if they are left intact we
   ;; dont have any paragraphs at all.
-  (html2text-buffer-head)
+  (goto-char (point-min))
   (while (not (eobp))
     (let ((p1 (point)))
       (forward-paragraph 1)
@@ -462,7 +456,7 @@ fashion, quite close to pure guess-work. It does work in some cases though."
 See the documentation for that variable."
   (interactive)
   (dolist (tag tag-list)
-    (html2text-buffer-head)
+    (goto-char (point-min))
     (while (re-search-forward (format "\\(</?%s[^>]*>\\)" tag) (point-max) t)
       (delete-region (match-beginning 0) (match-end 0)))))
 
@@ -472,7 +466,7 @@ See the documentation for that variable."
   (dolist (tag-and-function html2text-format-tag-list)
     (let ((tag      (car tag-and-function))
           (function (cdr tag-and-function)))
-      (html2text-buffer-head)
+      (goto-char (point-min))
       (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
                                 (point-max) t)
         (let ((p1)
@@ -497,7 +491,7 @@ See the documentation for that variable."
   "See the variable \"html2text-replace-list\" for documentation"
   (interactive)
   (dolist (e html2text-replace-list)
-    (html2text-buffer-head)
+    (goto-char (point-min))
     (let ((old-string (car e))
           (new-string (cdr e)))
       (html2text-replace-string old-string new-string (point-min) (point-max))
@@ -511,7 +505,7 @@ See the documentation for that variable."
   (dolist (tag-and-function html2text-format-single-element-list)
     (let ((tag      (car tag-and-function))
           (function (cdr tag-and-function)))
-      (html2text-buffer-head)
+      (goto-char (point-min))
       (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
                                 (point-max) t)
         (let ((p1)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index c608820c8ed..b68b4ec584c 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -302,9 +302,10 @@ Valid elements include:
   (if (boundp 'current-language-environment)
       (let ((lang (symbol-value 'current-language-environment)))
         (cond ((string= lang "Japanese")
-               ;; Japanese users may prefer iso-2022-jp to shift-jis.
-               '(iso-2022-jp iso-2022-jp-2 japanese-shift-jis
-                             iso-latin-1 utf-8)))))
+               ;; Japanese users prefer iso-2022-jp to euc-japan or
+               ;; shift_jis, however iso-8859-1 should be used when
+               ;; there are only ASCII text and Latin-1 characters.
+               '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))))
   "Preferred coding systems for encoding outgoing messages.
 
 More than one suitable coding system may be found for some text.
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 9a08cdfe71c..d54897a7750 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -44,7 +44,10 @@ This is most commonly `inews' or `injnews'.")
   "Switches for nnspool-request-post to pass to `inews' for posting news.
 If you are using Cnews, you probably should set this variable to nil.")
 
-(defvoo nnspool-spool-directory (file-name-as-directory news-directory)
+(defvoo nnspool-spool-directory
+    (file-name-as-directory (if (boundp 'news-directory)
+                                (symbol-value 'news-directory)
+                              news-path))
   "Local news spool directory.")
 
 (defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
diff --git a/lisp/help.el b/lisp/help.el
index c27bcc49055..ee35d007639 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -573,14 +573,14 @@ the last key hit are used."
                          (if (symbolp defn) defn (prin1-to-string defn)))))))))
 
 
-(defun describe-key (key &optional untranslated)
+(defun describe-key (key &optional untranslated up-event)
   "Display documentation of the function invoked by KEY.
 KEY should be a key sequence--when calling from a program,
 pass a string or a vector.
 If non-nil UNTRANSLATED is a vector of the untranslated events.
 It can also be a number in which case the untranslated events from
 the last key hit are used."
-  (interactive "kDescribe key: \np")
+  (interactive "kDescribe key: \np\nU")
   (if (numberp untranslated)
       (setq untranslated (this-single-command-raw-keys)))
   (save-excursion
@@ -608,6 +608,17 @@ the last key hit are used."
             (prin1 defn)
             (princ "\n   which is ")
             (describe-function-1 defn)
+            (when up-event
+              (let ((defn (or (string-key-binding up-event) (key-binding up-event))))
+                (unless (or (null defn) (integerp defn) (equal defn 'undefined))
+                  (princ "\n\n-------------- up event ---------------\n\n")
+                  (princ (key-description up-event))
+                  (if (windowp window)
+                      (princ " at that spot"))
+                  (princ " runs the command ")
+                  (prin1 defn)
+                  (princ "\n   which is ")
+                  (describe-function-1 defn))))
             (print-help-return-message)))))))
 
 
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 6859c0c74c7..7c775dc6337 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -62,6 +62,8 @@
 
 ;;; Code:
 
+(require 'newcomment)
+
 (eval-when-compile (require 'cl))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -159,16 +161,17 @@ element should come before the second.  The arguments are cons cells;
   :type 'integer
   :group 'imenu)
 
-(defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)"
-  "*Progress message during the index scanning of the buffer.
-If non-nil, user gets a message during the scanning of the buffer.
-
-Relevant only if the mode-specific function that creates the buffer
-index use `imenu-progress-message', and not useful if that is fast, in
-which case you might as well set this to nil."
-  :type '(choice string
-                 (const :tag "None" nil))
-  :group 'imenu)
+;; No longer used.  KFS 2004-10-27
+;; (defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)"
+;;   "*Progress message during the index scanning of the buffer.
+;; If non-nil, user gets a message during the scanning of the buffer.
+;;
+;; Relevant only if the mode-specific function that creates the buffer
+;; index use `imenu-progress-message', and not useful if that is fast, in
+;; which case you might as well set this to nil."
+;;   :type '(choice string
+;;               (const :tag "None" nil))
+;;   :group 'imenu)
 
 (defcustom imenu-space-replacement "."
   "*The replacement string for spaces in index names.
@@ -298,16 +301,22 @@ The function in this variable is called when selecting a normal index-item.")
 ;; is calculated.
 ;; PREVPOS is the variable in which we store the last position displayed.
 (defmacro imenu-progress-message (prevpos &optional relpos reverse)
-  `(and
-    imenu-scanning-message
-    (let ((pos ,(if relpos
-                    relpos
-                  `(imenu--relative-position ,reverse))))
-      (if ,(if relpos t
-             `(> pos (+ 5 ,prevpos)))
-          (progn
-            (message imenu-scanning-message pos)
-            (setq ,prevpos pos))))))
+
+;; Made obsolete/empty, as computers are now faster than the eye, and
+;; it had problems updating the messages correctly, and could shadow
+;; more important messages/prompts in the minibuffer.  KFS 2004-10-27.
+
+;;  `(and
+;;    imenu-scanning-message
+;;    (let ((pos ,(if relpos
+;;                  relpos
+;;                `(imenu--relative-position ,reverse))))
+;;      (if ,(if relpos t
+;;           `(> pos (+ 5 ,prevpos)))
+;;        (progn
+;;          (message imenu-scanning-message pos)
+;;          (setq ,prevpos pos)))))
+)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -763,7 +772,7 @@ the alist look like:
  (INDEX-NAME . INDEX-POSITION)
 or like:
  (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...)
-They may also be nested index alists like: 
+They may also be nested index alists like:
  (INDEX-NAME . INDEX-ALIST)
 depending on PATTERNS."
 
@@ -796,32 +805,37 @@ depending on PATTERNS."
                   (regexp (nth 1 pat))
                   (index (nth 2 pat))
                   (function (nth 3 pat))
-                  (rest (nthcdr 4 pat)))
+                  (rest (nthcdr 4 pat))
+                  cs)
               ;; Go backwards for convenience of adding items in order.
               (goto-char (point-max))
               (while (re-search-backward regexp nil t)
-                (imenu-progress-message prev-pos nil t)
+                (goto-char (match-end index))
                 (setq beg (match-beginning index))
-                ;; Add this sort of submenu only when we've found an
-                ;; item for it, avoiding empty, duff menus.
-                (unless (assoc menu-title index-alist)
-                  (push (list menu-title) index-alist))
-                (if imenu-use-markers
-                    (setq beg (copy-marker beg)))
-                (let ((item
-                       (if function
-                           (nconc (list (match-string-no-properties index)
-                                        beg function)
-                                  rest)
-                         (cons (match-string-no-properties index)
-                               beg)))
-                      ;; This is the desired submenu,
-                      ;; starting with its title (or nil).
-                      (menu (assoc menu-title index-alist)))
-                  ;; Insert the item unless it is already present.
-                  (unless (member item (cdr menu))
-                    (setcdr menu
-                            (cons item (cdr menu))))))))
+                (if (setq cs (save-match-data (comment-beginning)))
+                    (goto-char cs)      ; skip this one, it's in a comment
+                  (goto-char beg)
+                  (imenu-progress-message prev-pos nil t)
+                  ;; Add this sort of submenu only when we've found an
+                  ;; item for it, avoiding empty, duff menus.
+                  (unless (assoc menu-title index-alist)
+                    (push (list menu-title) index-alist))
+                  (if imenu-use-markers
+                      (setq beg (copy-marker beg)))
+                  (let ((item
+                         (if function
+                             (nconc (list (match-string-no-properties index)
+                                          beg function)
+                                    rest)
+                           (cons (match-string-no-properties index)
+                                 beg)))
+                        ;; This is the desired submenu,
+                        ;; starting with its title (or nil).
+                        (menu (assoc menu-title index-alist)))
+                    ;; Insert the item unless it is already present.
+                    (unless (member item (cdr menu))
+                      (setcdr menu
+                              (cons item (cdr menu)))))))))
           (set-syntax-table old-table)))
     (imenu-progress-message prev-pos 100 t)
     ;; Sort each submenu by position.
diff --git a/lisp/info.el b/lisp/info.el
index 4fc7b5c9cf7..2e0ddd0fb02 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1980,7 +1980,7 @@ Because of ambiguities, this should be concatenated with something like
               (if (match-beginning 5)
                   (string-to-number (match-string 5))
                 (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))
-;;; Comment out the next line to use names of cross-references:
+;;; Uncomment next line to use names of cross-references in non-index nodes:
 ;;;       (setq Info-point-loc
 ;;;             (buffer-substring (match-beginning 0) (1- (match-beginning 1))))
       )
@@ -3214,7 +3214,7 @@ Allowed only if variable `Info-enable-edit' is non-nil."
        (message "Tags may have changed.  Use Info-tagify if necessary")))
 
 (defvar Info-file-list-for-emacs
-  '("ediff" "eudc" "forms" "gnus" "info" ("mh" . "mh-e")
+  '("ediff" "eudc" "forms" "gnus" "info" ("Info" . "info") ("mh" . "mh-e")
     "sc" "message" ("dired" . "dired-x") "viper" "vip" "idlwave"
     ("c" . "ccmode") ("c++" . "ccmode") ("objc" . "ccmode")
     ("java" . "ccmode") ("idl" . "ccmode") ("pike" . "ccmode")
@@ -3245,11 +3245,13 @@ The `info-file' property of COMMAND says which Info manual to search.
 If COMMAND has no property, the variable `Info-file-list-for-emacs'
 defines heuristics for which Info manual to try.
 The locations are of the format used in `Info-history', i.e.
-\(FILENAME NODENAME BUFFERPOS\)."
-  (let ((where '())
+\(FILENAME NODENAME BUFFERPOS\), where BUFFERPOS is the line number
+in the first element of the returned list (which is treated specially in
+`Info-goto-emacs-command-node'), and 0 for the rest elements of a list."
+  (let ((where '()) line-number
         (cmd-desc (concat "^\\* +" (regexp-quote (symbol-name command))
                           "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\."
-                          "\\([ \t]*(line[ \t]*[0-9]*)\\)?$"))
+                          "\\(?:[ \t\n]+(line +\\([0-9]+\\))\\)?"))
         (info-file "emacs"))            ;default
     ;; Determine which info file this command is documented in.
     (if (get command 'info-file)
@@ -3288,11 +3290,17 @@ The locations are of the format used in `Info-history', i.e.
                     (cons (list Info-current-file
                                 (match-string-no-properties 2)
                                 0)
-                          where)))
+                          where))
+              (setq line-number (and (match-beginning 3)
+                                     (string-to-number (match-string 3)))))
             (and (setq nodes (cdr nodes) node (car nodes))))
         (Info-goto-node node)))
-    where))
+    (if (and line-number where)
+        (cons (list (nth 0 (car where)) (nth 1 (car where)) line-number)
+              (cdr where))
+      where)))
 
+;;;###autoload (put 'Info-goto-emacs-command-node 'info-file "emacs")
 ;;;###autoload
 (defun Info-goto-emacs-command-node (command)
   "Go to the Info node in the Emacs manual for command COMMAND.
@@ -3316,9 +3324,11 @@ COMMAND must be a symbol or string."
           ;; Bind Info-history to nil, to prevent the last Index node
           ;; visited by Info-find-emacs-command-nodes from being
           ;; pushed onto the history.
-          (let ((Info-history nil) (Info-history-list nil))
-            (Info-find-node (car (car where))
-                            (car (cdr (car where)))))
+          (let ((Info-history nil) (Info-history-list nil)
+                (line-number (nth 2 (car where))))
+            (Info-find-node (nth 0 (car where)) (nth 1 (car where)))
+            (if (and (integerp line-number) (> line-number 0))
+                (forward-line (1- line-number))))
           (if (> num-matches 1)
               (progn
                 ;; (car where) will be pushed onto Info-history
@@ -3332,6 +3342,7 @@ COMMAND must be a symbol or string."
                          (if (> num-matches 2) "them" "it")))))
       (error "Couldn't find documentation for %s" command))))
 
+;;;###autoload (put 'Info-goto-emacs-key-command-node 'info-file "emacs")
 ;;;###autoload
 (defun Info-goto-emacs-key-command-node (key)
   "Go to the node in the Emacs manual which describes the command bound to KEY.
diff --git a/lisp/international/subst-big5.el b/lisp/international/subst-big5.el
index f2004b07544..9a17974ab01 100644
--- a/lisp/international/subst-big5.el
+++ b/lisp/international/subst-big5.el
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
          (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-             (and (>= unicode #xff00) (<= unicode #xffef)))
-         (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+         (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa7 ?¡±)
    (#xaf ?¡Â)
diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el
index dba26c9bd5c..446420490c5 100644
--- a/lisp/international/subst-gb2312.el
+++ b/lisp/international/subst-gb2312.el
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
          (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-             (and (>= unicode #xff00) (<= unicode #xffef)))
-         (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+         (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa4 ?¡è)
    (#xa7 ?¡ì)
diff --git a/lisp/international/subst-jis.el b/lisp/international/subst-jis.el
index edd01c0a0b3..2dfe3297ba0 100644
--- a/lisp/international/subst-jis.el
+++ b/lisp/international/subst-jis.el
@@ -45,11 +45,11 @@
 (mapc
  (lambda (pair)
    (let ((unicode (car pair))
-         (char (cadr pair)))
-     ;; exclude non-CJK components from decode table
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-             (and (>= unicode #xff00) (<= unicode #xffef)))
-         (puthash unicode  char ucs-unicode-to-mule-cjk))
+         (char (cadr pair))
+         (tail utf-translate-cjk-unicode-range))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+         (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '(
    ;; jisx0208
@@ -13001,7 +13001,73 @@
    (#x9fa2 ?�íá)
    (#x9fa3 ?�íâ)
    (#x9fa5 ?�íã)
-   (#xff5e ?�¢·)))
+   (#xff5e ?�¢·)
+
+   ;; jisx0201
+   (#xFF61 ?Ž¡)
+   (#xFF62 ?\Ž¢)
+   (#xFF63 ?\Ž£)
+   (#xFF64 ?Ž¤)
+   (#xFF65 ?Ž¥)
+   (#xFF66 ?Ž¦)
+   (#xFF67 ?Ž§)
+   (#xFF68 ?Ž¨)
+   (#xFF69 ?Ž©)
+   (#xFF6A ?Žª)
+   (#xFF6B ?Ž«)
+   (#xFF6C ?Ž¬)
+   (#xFF6D ?Ž­)
+   (#xFF6E ?Ž®)
+   (#xFF6F ?Ž¯)
+   (#xFF70 ?Ž°)
+   (#xFF71 ?Ž±)
+   (#xFF72 ?Ž²)
+   (#xFF73 ?Ž³)
+   (#xFF74 ?Ž´)
+   (#xFF75 ?Žµ)
+   (#xFF76 ?Ž¶)
+   (#xFF77 ?Ž·)
+   (#xFF78 ?Ž¸)
+   (#xFF79 ?Ž¹)
+   (#xFF7A ?Žº)
+   (#xFF7B ?Ž»)
+   (#xFF7C ?Ž¼)
+   (#xFF7D ?Ž½)
+   (#xFF7E ?Ž¾)
+   (#xFF7F ?Ž¿)
+   (#xFF80 ?ŽÀ)
+   (#xFF81 ?ŽÁ)
+   (#xFF82 ?ŽÂ)
+   (#xFF83 ?ŽÃ)
+   (#xFF84 ?ŽÄ)
+   (#xFF85 ?ŽÅ)
+   (#xFF86 ?ŽÆ)
+   (#xFF87 ?ŽÇ)
+   (#xFF88 ?ŽÈ)
+   (#xFF89 ?ŽÉ)
+   (#xFF8A ?ŽÊ)
+   (#xFF8B ?ŽË)
+   (#xFF8C ?ŽÌ)
+   (#xFF8D ?ŽÍ)
+   (#xFF8E ?ŽÎ)
+   (#xFF8F ?ŽÏ)
+   (#xFF90 ?ŽÐ)
+   (#xFF91 ?ŽÑ)
+   (#xFF92 ?ŽÒ)
+   (#xFF93 ?ŽÓ)
+   (#xFF94 ?ŽÔ)
+   (#xFF95 ?ŽÕ)
+   (#xFF96 ?ŽÖ)
+   (#xFF97 ?Ž×)
+   (#xFF98 ?ŽØ)
+   (#xFF99 ?ŽÙ)
+   (#xFF9A ?ŽÚ)
+   (#xFF9B ?ŽÛ)
+   (#xFF9C ?ŽÜ)
+   (#xFF9D ?ŽÝ)
+   (#xFF9E ?ŽÞ)
+   (#xFF9F ?Žß)
+   ))
 
 ;;; arch-tag: 7f320453-b293-4159-af5e-6f0bab03048c
 ;;; subst-jis.el ends here
diff --git a/lisp/international/subst-ksc.el b/lisp/international/subst-ksc.el
index 9f4b329b675..3cc339bbf8b 100644
--- a/lisp/international/subst-ksc.el
+++ b/lisp/international/subst-ksc.el
@@ -31,9 +31,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
          (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-             (and (>= unicode #xff00) (<= unicode #xffef)))
-         (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+         (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa1 ?¢®)
    (#xa4 ?¢´)
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 5a7acee0f0e..ed658eb3ddf 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -194,13 +194,88 @@ Setting this variable outside customize has no effect."
 (defconst utf-translate-cjk-charsets '(chinese-gb2312
                                        chinese-big5-1 chinese-big5-2
                                        japanese-jisx0208 japanese-jisx0212
+                                       katakana-jisx0201
                                        korean-ksc5601)
   "List of charsets supported by `utf-translate-cjk-mode'.")
 
-(defconst utf-translate-cjk-unicode-range
-  '((#x2e80 . #xd7a3)
-    (#xff00 . #xffef))
-  "List of Unicode code ranges supported by `utf-translate-cjk-mode'.")
+(defvar utf-translate-cjk-lang-env nil
+  "Language environment in which tables for `utf-translate-cjk-mode' is loaded.
+The value nil means that the tables are not yet loaded.")
+
+(defvar utf-translate-cjk-unicode-range)
+
+;; String generated from utf-translate-cjk-unicode-range.  It is
+;; suitable for an argument to skip-chars-forward.
+(defvar utf-translate-cjk-unicode-range-string nil)
+
+(defun utf-translate-cjk-set-unicode-range (range)
+  (setq utf-translate-cjk-unicode-range range)
+  (setq utf-translate-cjk-unicode-range-string
+        (let ((decode-char-no-trans
+               #'(lambda (x)
+                   (cond ((< x #x100) (make-char 'latin-iso8859-1 x))
+                         ((< x #x2500)
+                          (setq x (- x #x100))
+                          (make-char 'mule-unicode-0100-24ff
+                                     (+ (/ x 96) 32) (+ (% x 96) 32)))
+                         ((< x #x3400) 
+                          (setq x (- x #x2500))
+                          (make-char 'mule-unicode-2500-33ff
+                                     (+ (/ x 96) 32) (+ (% x 96) 32)))
+                         (t
+                          (setq x (- x #xe000))
+                          (make-char 'mule-unicode-e000-ffff
+                                     (+ (/ x 96) 32) (+ (% x 96) 32))))))
+              ranges from to)
+          (dolist (elt range)
+            (setq from (max #xA0 (car elt)) to (min #xffff (cdr elt)))
+            (if (and (>= to #x3400) (< to #xE000))
+                (setq to #x33FF))
+            (cond ((< from #x100)
+                   (if (>= to #xE000)
+                       (setq ranges (cons (cons #xE000 to) ranges)
+                             to #x33FF))
+                   (if (>= to #x2500)
+                       (setq ranges (cons (cons #x2500 to) ranges)
+                             to #x24FF))
+                   (if (>= to #x100)
+                       (setq ranges (cons (cons #x100 to) ranges)
+                             to #xFF)))
+                  ((< from #x2500)
+                   (if (>= to #xE000)
+                       (setq ranges (cons (cons #xE000 to) ranges)
+                             to #x33FF))
+                   (if (>= to #x2500)
+                       (setq ranges (cons (cons #x2500 to) ranges)
+                             to #x24FF)))
+                  ((< from #x3400)
+                   (if (>= to #xE000)
+                       (setq ranges (cons (cons #xE000 to) ranges)
+                             to #x33FF))))
+            (if (<= from to)
+                (setq ranges (cons (cons from to) ranges))))
+          (mapconcat #'(lambda (x) 
+                         (format "%c-%c" 
+                                 (funcall decode-char-no-trans (car x))
+                                 (funcall decode-char-no-trans (cdr x))))
+                     ranges "")))
+  ;; These forces loading and settting tables for
+  ;; utf-translate-cjk-mode.
+  (setq utf-translate-cjk-lang-env nil
+        ucs-mule-cjk-to-unicode (make-hash-table :test 'eq)
+        ucs-unicode-to-mule-cjk (make-hash-table :test 'eq)))
+
+(defcustom utf-translate-cjk-unicode-range '((#x2e80 . #xd7a3)
+                                             (#xff00 . #xffef))
+  "List of Unicode code ranges supported by `utf-translate-cjk-mode'.
+Setting this variable directly does not take effect;
+use either \\[customize] or the function
+`utf-translate-cjk-set-unicode-range'."
+  :version "21.4"
+  :type '(repeat (cons integer integer))
+  :set (lambda (symbol value)
+         (utf-translate-cjk-set-unicode-range value))
+  :group 'mule)
 
 ;; Return non-nil if CODE-POINT is in `utf-translate-cjk-unicode-range'.
 (defsubst utf-translate-cjk-substitutable-p (code-point)
@@ -213,10 +288,6 @@ Setting this variable outside customize has no effect."
         (setq elt nil)))
     elt))
 
-(defvar utf-translate-cjk-lang-env nil
-  "Language environment in which tables for `utf-translate-cjk-mode' is loaded.
-The value nil means that the tables are not yet loaded.")
-
 (defun utf-translate-cjk-load-tables ()
   "Load tables for `utf-translate-cjk-mode'."
   ;; Fixme: Allow the use of the CJK charsets to be
@@ -425,25 +496,32 @@ by the above coding systems, you can customize the user option
           ;; 2-byte encoding 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
           ((r1 &= #x3F)
            (r1 |= ((r0 & #x1F) << 6))
-           ;; Now r2 holds scalar value.  We don't have to check
+           ;; Now r1 holds scalar value.  We don't have to check
            ;; `overlong sequence' because r0 >= 0xC2.
 
            (if (r1 >= 256)
                ;; mule-unicode-0100-24ff (< 0800)
-               ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
-                (r1 -= #x0100)
-                (r2 = (((r1 / 96) + 32) << 7))
-                (r1 %= 96)
-                (r1 += (r2 + 32))
-                (translate-character
-                 utf-translation-table-for-decode r0 r1)
+               ((r0 = r1)
+                (lookup-integer utf-subst-table-for-decode r0 r1)
+                (if (r7 == 0)
+                    ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
+                     (r1 -= #x0100)
+                     (r2 = (((r1 / 96) + 32) << 7))
+                     (r1 %= 96)
+                     (r1 += (r2 + 32))
+                     (translate-character
+                      utf-translation-table-for-decode r0 r1)))
                 (write-multibyte-character r0 r1)
                 (read r0)
                 (repeat))
              (if (r1 >= 160)
                  ;; latin-iso8859-1
-                 ((r1 -= 128)
-                  (write-multibyte-character r6 r1)
+                 ((r0 = r1)
+                  (lookup-integer utf-subst-table-for-decode r0 r1)
+                  (if (r7 == 0)
+                      ((r1 -= 128)
+                       (write-multibyte-character r6 r1))
+                    ((write-multibyte-character r0 r1)))
                   (read r0)
                   (repeat))
                ;; eight-bit-control
@@ -482,13 +560,16 @@ by the above coding systems, you can customize the user option
 
            (if (r3 < #x2500)
                ;; mule-unicode-0100-24ff (>= 0800)
-               ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
-                (r3 -= #x0100)
-                (r3 //= 96)
-                (r1 = (r7 + 32))
-                (r1 += ((r3 + 32) << 7))
-                (translate-character
-                 utf-translation-table-for-decode r0 r1)
+               ((r0 = r3)
+                (lookup-integer utf-subst-table-for-decode r0 r1)
+                (if (r7 == 0)
+                    ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
+                     (r3 -= #x0100)
+                     (r3 //= 96)
+                     (r1 = (r7 + 32))
+                     (r1 += ((r3 + 32) << 7))
+                     (translate-character
+                      utf-translation-table-for-decode r0 r1)))
                 (write-multibyte-character r0 r1)
                 (read r0)
                 (repeat)))
@@ -874,17 +955,17 @@ Also compose particular scripts if `utf-8-compose-scripts' is non-nil."
             hash-table ch)
         (set-buffer-multibyte t)
         (when utf-translate-cjk-mode
-          (if (not utf-translate-cjk-lang-env)
-              ;; Check these characters:
-              ;;   "U+2e80-U+33ff", "U+ff00-U+ffef"
-              ;; We may have to translate them to CJK charsets.
-              (let ((range2 "$,29@(B-$,2G$,3r`(B-$,3u/(B"))
-                (skip-chars-forward (concat range range2))
-                (unless (eobp)
-                  (utf-translate-cjk-load-tables)
-                  (setq range (concat range range2)))
-          (setq hash-table (get 'utf-subst-table-for-decode
-                                'translation-hash-table)))))
+          (unless utf-translate-cjk-lang-env
+            ;; Check these characters in utf-translate-cjk-range.
+            ;; We may have to translate them to CJK charsets.
+            (skip-chars-forward
+             (concat range utf-translate-cjk-unicode-range-string))
+            (unless (eobp)
+              (utf-translate-cjk-load-tables)
+              (setq range
+                    (concat range utf-translate-cjk-unicode-range-string)))
+            (setq hash-table (get 'utf-subst-table-for-decode
+                                  'translation-hash-table))))
         (while (and (skip-chars-forward range)
                     (not (eobp)))
           (setq ch (following-char))
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index e93f76c3042..c5579b3c0db 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -128,6 +128,9 @@ usually do not have translators to read other languages for them.\n\n")
     (insert "\n\n\n")
 
     (insert "In " (emacs-version) "\n")
+    (if (fboundp 'x-server-vendor)
+        (insert "Distributor `" (x-server-vendor) "', version "
+                (mapconcat 'number-to-string (x-server-version) ".") "\n"))
     (if (and system-configuration-options
              (not (equal system-configuration-options "")))
         (insert "configured using `configure "
diff --git a/lisp/man.el b/lisp/man.el
index cbfae21e44b..afd183fa720 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -893,12 +893,15 @@ header file(#include <foo.h>) and files in FILES"
          'Man-target-string (match-string target-pos)
          )))))
 
-(defun Man-cleanup-manpage ()
-  "Remove overstriking and underlining from the current buffer."
-  (interactive)
+(defun Man-cleanup-manpage (&optional interactive)
+  "Remove overstriking and underlining from the current buffer.
+Normally skip any jobs that should have been done by the sed script,
+but when called interactively, do those jobs even if the sed
+script would have done them."
+  (interactive "p")
   (message "Please wait: cleaning up the %s man page..."
            Man-arguments)
-  (if (or (interactive-p) (not Man-sed-script))
+  (if (or interactive (not Man-sed-script))
       (progn
         (goto-char (point-min))
         (while (search-forward "_\b" nil t) (backward-delete-char 2))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 17deeff4619..22840896c17 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -596,10 +596,12 @@ PROPS are additional properties."
 
 (defmacro menu-bar-make-toggle (name variable doc message help &rest body)
   `(progn
-     (defun ,name ()
+     (defun ,name (&optional interactively)
        ,(concat "Toggle whether to " (downcase (substring help 0 1))
-                (substring help 1) ".")
-       (interactive)
+                (substring help 1) ".\
+In an interactive call, record this option as a candidate for saving
+by \"Save Options\" in Custom buffers.")
+       (interactive "p")
        (if ,(if body `(progn . ,body)
               `(progn
                  (custom-load-symbol ',variable)
@@ -612,7 +614,7 @@ PROPS are additional properties."
        ;; a variable is set interactively, as the purpose is to mark it as
        ;; a candidate for "Save Options", and we do not want to save options
        ;; the user have already set explicitly in his init file.
-       (if (interactive-p) (customize-mark-as-set ',variable)))
+       (if interactively (customize-mark-as-set ',variable)))
      '(menu-item ,doc ,name
                  :help ,help
                  :button (:toggle . (and (default-boundp ',variable)
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index f9b90fbfc6a..4f3741a5213 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -1,6 +1,7 @@
 ;;; mouse-sel.el --- multi-click selection support for Emacs 19
 
-;; Copyright (C) 1993,1994,1995,2001,2002 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2004
+;;           Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
@@ -240,9 +241,10 @@ to the kill ring.  Pressing mouse-1 or mouse-3 kills it.
 & mouse-3, but operate on the X secondary selection rather than the
 primary selection and region."
   :global t
+  :group 'mouse-sel
   (if mouse-sel-mode
       (progn
-        (add-hook 'x-lost-selection-hooks 'mouse-sel-lost-selection-hook)
+        (add-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook)
         (when mouse-sel-default-bindings
           ;; Save original bindings and replace them with new ones.
           (setq mouse-sel-original-bindings
@@ -262,7 +264,7 @@ primary selection and region."
                   interprogram-paste-function nil))))
 
     ;; Restore original bindings
-    (remove-hook 'x-lost-selection-hooks 'mouse-sel-lost-selection-hook)
+    (remove-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook)
     (dolist (binding mouse-sel-original-bindings)
       (global-set-key (car binding) (cdr binding)))
     ;; Restore the old values of these variables,
@@ -711,5 +713,5 @@ If `mouse-yank-at-point' is non-nil, insert at point instead."
 
 (provide 'mouse-sel)
 
-;;; arch-tag: 86e6c73f-deaa-48d3-a24e-c565fda1f7d7
+;; arch-tag: 86e6c73f-deaa-48d3-a24e-c565fda1f7d7
 ;;; mouse-sel.el ends here
diff --git a/lisp/mouse.el b/lisp/mouse.el
index abf62a97836..8f05324d84d 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1025,54 +1025,56 @@ If MODE is 2 then do the same for lines."
   "List of keys which shall cause the mouse region to be deleted.")
 
 (defun mouse-show-mark ()
-  (if transient-mark-mode
-      (delete-overlay mouse-drag-overlay)
-    (let ((inhibit-quit t)
-          (echo-keystrokes 0)
-          event events key ignore
-          x-lost-selection-hooks)
-      (add-hook 'x-lost-selection-hooks
-                (lambda (seltype)
-                  (if (eq seltype 'PRIMARY)
-                      (progn (setq ignore t)
-                             (throw 'mouse-show-mark t)))))
-      (move-overlay mouse-drag-overlay (point) (mark t))
-      (catch 'mouse-show-mark
-        ;; In this loop, execute scroll bar and switch-frame events.
-        ;; Also ignore down-events that are undefined.
-        (while (progn (setq event (read-event))
-                      (setq events (append events (list event)))
-                      (setq key (apply 'vector events))
-                      (or (and (consp event)
-                               (eq (car event) 'switch-frame))
-                          (and (consp event)
-                               (eq (posn-point (event-end event))
-                                   'vertical-scroll-bar))
-                          (and (memq 'down (event-modifiers event))
-                               (not (key-binding key))
-                               (not (mouse-undouble-last-event events))
-                               (not (member key mouse-region-delete-keys)))))
-          (and (consp event)
-               (or (eq (car event) 'switch-frame)
-                   (eq (posn-point (event-end event))
-                       'vertical-scroll-bar))
-               (let ((keys (vector 'vertical-scroll-bar event)))
-                 (and (key-binding keys)
-                      (progn
-                        (call-interactively (key-binding keys)
-                                            nil keys)
-                        (setq events nil)))))))
-      ;; If we lost the selection, just turn off the highlighting.
-      (if ignore
-          nil
-        ;; For certain special keys, delete the region.
-        (if (member key mouse-region-delete-keys)
-            (delete-region (overlay-start mouse-drag-overlay)
-                           (overlay-end mouse-drag-overlay))
-          ;; Otherwise, unread the key so it gets executed normally.
-          (setq unread-command-events
-                (nconc events unread-command-events))))
-      (setq quit-flag nil)
+  (let ((inhibit-quit t)
+        (echo-keystrokes 0)
+        event events key ignore
+        (x-lost-selection-functions
+         (when (boundp 'x-lost-selection-functions)
+           (copy-sequence x-lost-selection-functions))))
+    (add-hook 'x-lost-selection-functions
+              (lambda (seltype)
+                (when (eq seltype 'PRIMARY)
+                  (setq ignore t)
+                  (throw 'mouse-show-mark t))))
+    (if transient-mark-mode
+        (delete-overlay mouse-drag-overlay)
+      (move-overlay mouse-drag-overlay (point) (mark t)))
+    (catch 'mouse-show-mark
+      ;; In this loop, execute scroll bar and switch-frame events.
+      ;; Also ignore down-events that are undefined.
+      (while (progn (setq event (read-event))
+                    (setq events (append events (list event)))
+                    (setq key (apply 'vector events))
+                    (or (and (consp event)
+                             (eq (car event) 'switch-frame))
+                        (and (consp event)
+                             (eq (posn-point (event-end event))
+                                 'vertical-scroll-bar))
+                        (and (memq 'down (event-modifiers event))
+                             (not (key-binding key))
+                             (not (mouse-undouble-last-event events))
+                             (not (member key mouse-region-delete-keys)))))
+        (and (consp event)
+             (or (eq (car event) 'switch-frame)
+                 (eq (posn-point (event-end event))
+                     'vertical-scroll-bar))
+             (let ((keys (vector 'vertical-scroll-bar event)))
+               (and (key-binding keys)
+                    (progn
+                      (call-interactively (key-binding keys)
+                                          nil keys)
+                      (setq events nil)))))))
+    ;; If we lost the selection, just turn off the highlighting.
+    (unless ignore
+      ;; For certain special keys, delete the region.
+      (if (member key mouse-region-delete-keys)
+          (delete-region (overlay-start mouse-drag-overlay)
+                         (overlay-end mouse-drag-overlay))
+        ;; Otherwise, unread the key so it gets executed normally.
+        (setq unread-command-events
+              (nconc events unread-command-events))))
+    (setq quit-flag nil)
+    (unless transient-mark-mode
       (delete-overlay mouse-drag-overlay))))
 
 (defun mouse-set-mark (click)
diff --git a/lisp/net/password.el b/lisp/net/password.el
deleted file mode 100644
index e8be612ecca..00000000000
--- a/lisp/net/password.el
+++ /dev/null
@@ -1,128 +0,0 @@
-;;; password.el --- Read passwords from user, possibly using a password cache.
-
-;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-;; Author: Simon Josefsson <simon@josefsson.org>
-;; Created: 2003-12-21
-;; Keywords: password cache passphrase key
-
-;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; Greatly influenced by pgg.el written by Daiki Ueno, with timer
-;; fixes for XEmacs by Katsumi Yamaoka.  In fact, this is mostly just
-;; a rip-off.
-;;
-;; (password-read "Password? " "test")
-;; ;; Minibuffer prompt for password.
-;;  => "foo"
-;;
-;; (password-cache-add "test" "foo")
-;;  => nil
-
-;; Note the previous two can be replaced with:
-;; (password-read-and-add "Password? " "test")
-;; ;; Minibuffer prompt for password.
-;; => "foo"
-;; ;; "foo" is now cached with key "test"
-
-
-;; (password-read "Password? " "test")
-;; ;; No minibuffer prompt
-;;  => "foo"
-;;
-;; (password-read "Password? " "test")
-;; ;; No minibuffer prompt
-;;  => "foo"
-;;
-;; ;; Wait `password-cache-expiry' seconds.
-;;
-;; (password-read "Password? " "test")
-;; ;; Minibuffer prompt for password is back.
-;;  => "foo"
-
-;;; Code:
-
-(when (featurep 'xemacs)
-  (require 'run-at-time))
-
-(eval-when-compile
-  (require 'cl))
-
-(defcustom password-cache t
-  "Whether to cache passwords."
-  :group 'password
-  :type 'boolean)
-
-(defcustom password-cache-expiry 16
-  "How many seconds passwords are cached, or nil to disable expiring.
-Whether passwords are cached at all is controlled by `password-cache'."
-  :group 'password
-  :type '(choice (const :tag "Never" nil)
-                 (integer :tag "Seconds")))
-
-(defvar password-data (make-vector 7 0))
-
-(defun password-read (prompt &optional key)
-  "Read password, for use with KEY, from user, or from cache if wanted.
-KEY indicate the purpose of the password, so the cache can
-separate passwords.  The cache is not used if KEY is nil.  It is
-typically a string.
-The variable `password-cache' control whether the cache is used."
-  (or (and password-cache
-           key
-           (symbol-value (intern-soft key password-data)))
-      (read-passwd prompt)))
-
-(defun password-read-and-add (prompt &optional key)
-  "Read password, for use with KEY, from user, or from cache if wanted.
-Then store the password in the cache.  Uses `password-read' and
-`password-cache-add'."
-  (let ((password (password-read prompt key)))
-    (when (and password key)
-      (password-cache-add key password))
-    password))
-
-(defun password-cache-remove (key)
-  "Remove password indexed by KEY from password cache.
-This is typically run be a timer setup from `password-cache-add',
-but can be invoked at any time to forcefully remove passwords
-from the cache.  This may be useful when it has been detected
-that a password is invalid, so that `password-read' query the
-user again."
-  (let ((password (symbol-value (intern-soft key password-data))))
-    (when password
-      (fillarray password ?_)
-      (unintern key password-data))))
-
-(defun password-cache-add (key password)
-  "Add password to cache.
-The password is removed by a timer after `password-cache-expiry'
-seconds."
-  (set (intern key password-data) password)
-  (when password-cache-expiry
-    (run-at-time password-cache-expiry nil
-                 #'password-cache-remove
-                 key))
-  nil)
-
-(provide 'password)
-
-;;; arch-tag: ab160494-16c8-4c68-a4a1-73eebf6686e5
-;;; password.el ends here
diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index 4d8af4b5a2b..a5fd33adcaa 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -1,6 +1,6 @@
 ;;; hilit19.el --- customizable highlighting for Emacs 19
 
-;; Copyright (c) 1993, 1994, 2001 Free Software Foundation, Inc.
+;; Copyright (c) 1993, 1994, 2001, 2004 Free Software Foundation, Inc.
 
 ;; Author:   Jonathan Stigelman <stig@hackvan.com>
 ;; Maintainer: FSF
@@ -397,8 +397,6 @@ See the hilit-lookup-face-create documentation for valid face names.")
 If hilit19 is dumped into emacs at your site, you may have to set this in
 your init file.")
 
-(eval-when-compile (setq byte-optimize t))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Use this to report bugs:
 
@@ -945,47 +943,61 @@ the entire buffer is forced."
 ;; Initialization.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(and (not hilit-inhibit-rebinding)
-     (progn
-       (substitute-key-definition 'yank     'hilit-yank
-                                  (current-global-map))
-       (substitute-key-definition 'yank-pop 'hilit-yank-pop
-                                  (current-global-map))
-       (substitute-key-definition 'recenter 'hilit-recenter
-                                  (current-global-map))))
-
-(global-set-key [?\C-\S-l] 'hilit-repaint-command)
-
-(add-hook 'find-file-hook 'hilit-find-file-hook t)
+(define-minor-mode hilit-mode
+  "Obsolete minor mode.  Use `global-font-lock-mode' instead."
+  :global t
+
+  (unless (and hilit-inhibit-rebinding hilit-mode)
+    (substitute-key-definition
+     (if hilit-mode 'yank 'hilit-yank)
+     (if hilit-mode 'hilit-yank 'yank)
+     (current-global-map))
+    (substitute-key-definition
+     (if hilit-mode 'yank-pop 'hilit-yank-pop)
+     (if hilit-mode 'hilit-yank-pop 'yank-pop)
+     (current-global-map))
+    (substitute-key-definition
+     (if hilit-mode 'recenter 'hilit-recenter)
+     (if hilit-mode 'hilit-recenter 'recenter)
+     (current-global-map)))
+
+  (if hilit-mode
+      (global-set-key [?\C-\S-l] 'hilit-repaint-command)
+    (global-unset-key [?\C-\S-l]))
+
+  (if hilit-mode
+      (add-hook 'find-file-hook 'hilit-find-file-hook t)
+    (remove-hook 'find-file-hook 'hilit-find-file-hook))
+
+  (unless (and hilit-inhibit-hooks hilit-mode)
+    (condition-case c
+        (progn
+
+          ;; BUFFER highlights...
+          (mapcar (lambda (hook)
+                    (if hilit-mode
+                        (add-hook hook 'hilit-rehighlight-buffer-quietly)
+                      (remove-hook hook 'hilit-rehighlight-buffer-quietly)))
+                  '(
+                    Info-selection-hook
+
+                    ;; runs too early                vm-summary-mode-hooks
+                    vm-summary-pointer-hook
+                    vm-preview-message-hook
+                    vm-show-message-hook
+
+                    rmail-show-message-hook
+                    mail-setup-hook
+                    mh-show-mode-hook
+
+                    dired-after-readin-hook
+                    ))
+          )
+      (error (message "Error loading highlight hooks: %s" c)
+             (ding) (sit-for 1)))))
 
 (eval-when-compile (require 'gnus))     ; no compilation gripes
 
-(and (not hilit-inhibit-hooks)
-     (condition-case c
-         (progn
-
-           ;; BUFFER highlights...
-           (mapcar (function
-                    (lambda (hook)
-                      (add-hook hook 'hilit-rehighlight-buffer-quietly)))
-                   '(
-                     Info-selection-hook
-
-;; runs too early                    vm-summary-mode-hooks
-                     vm-summary-pointer-hook
-                     vm-preview-message-hook
-                     vm-show-message-hook
-
-                     rmail-show-message-hook
-                     mail-setup-hook
-                     mh-show-mode-hook
-
-                     dired-after-readin-hook
-                     ))
-           )
-       (error (message "Error loading highlight hooks: %s" c)
-              (ding) (sit-for 1))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Default patterns for various modes.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1510,5 +1522,5 @@ number of backslashes."
 
 (provide 'hilit19)
 
-;;; arch-tag: db99739a-4837-41ee-ad02-3baced8ae71d
+;; arch-tag: db99739a-4837-41ee-ad02-3baced8ae71d
 ;;; hilit19.el ends here
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 1260867f7c6..f4b796dd1a7 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -150,7 +150,7 @@ This mirrors the optional behavior of tcsh."
   :type 'boolean
   :group 'pcomplete)
 
-(defcustom pcomplete-suffix-list (list directory-sep-char ?:)
+(defcustom pcomplete-suffix-list (list ?/ ?:)
   "*A list of characters which constitute a proper suffix."
   :type '(repeat character)
   :group 'pcomplete)
@@ -347,12 +347,12 @@ modified to be an empty string, or the desired separation string."
 ;;; User Functions:
 
 ;;;###autoload
-(defun pcomplete ()
+(defun pcomplete (&optional interactively)
   "Support extensible programmable completion.
 To use this function, just bind the TAB key to it, or add it to your
 completion functions list (it should occur fairly early in the list)."
-  (interactive)
-  (if (and (interactive-p)
+  (interactive "p")
+  (if (and interactively
            pcomplete-cycle-completions
            pcomplete-current-completions
            (memq last-command '(pcomplete
@@ -740,7 +740,7 @@ component, `default-directory' is used as the basis for completion."
                  (function
                   (lambda (file)
                     (if (eq (aref file (1- (length file)))
-                            directory-sep-char)
+                            ?/)
                         (and pcomplete-dir-ignore
                              (string-match pcomplete-dir-ignore file))
                       (and pcomplete-file-ignore
@@ -757,11 +757,11 @@ component, `default-directory' is used as the basis for completion."
                ;; since . is earlier in the ASCII alphabet than
                ;; /
                (let ((left (if (eq (aref l (1- (length l)))
-                                   directory-sep-char)
+                                   ?/)
                                (substring l 0 (1- (length l)))
                              l))
                      (right (if (eq (aref r (1- (length r)))
-                                    directory-sep-char)
+                                    ?/)
                                 (substring r 0 (1- (length r)))
                               r)))
                  (if above-cutoff
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 5bdb1fb25eb..ec83e33b10d 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -1,6 +1,6 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.in files
 
-;; Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
@@ -49,7 +49,7 @@
   "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\(\\sw+\\)")
 
 (defvar autoconf-font-lock-keywords
-  `(("A[CHM]_\\sw+" . font-lock-keyword-face)
+  `(("A[CHMS]_\\sw+" . font-lock-keyword-face)
     (,autoconf-definition-regexp
      3 font-lock-function-name-face)
     ;; Are any other M4 keywords really appropriate for configure.in,
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0dc73e96664..223455e9872 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -181,6 +181,16 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     (epc
      "^Error [0-9]+ at (\\([0-9]+\\):\\([^)\n]+\\))" 2 1)
 
+    (ftnchek-file
+     "^File \\(.+\\.f\\):$"
+     1 nil nil 0)
+    (ftnchek-line-file
+     "\\(^Warning .* \\)?line \\([0-9]+\\)\\(?: col \\([0-9]+\\)\\)? file \\(.+\\.f\\)"
+     4 2 3 (1) nil (1 'default nil t))
+    (ftnchek-line
+     "\\(?:^\\(Warning\\) .* \\)?line \\([0-9]+\\)\\(?: col \\([0-9]+\\)\\)?"
+     nil 2 3 (1) nil (1 (compilation-face '(1)) nil t))
+
     (iar
      "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:"
      1 2 nil (3))
@@ -191,8 +201,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     ;; fixme: should be `mips'
     (irix
-     "^[-[:alnum:]_/]+: \\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
- \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
+     "^[-[:alnum:]_/ ]+: \\(?:\\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*: \\)?\
+\\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
 
     (java
      "^\\(?:[ \t]+at \\|==[0-9]+== +\\(?:at\\|b\\(y\\)\\)\\).+(\\([^()\n]+\\):\\([0-9]+\\))$" 2 3 nil (1))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 2cd62eeecee..3ccea967bc5 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -94,7 +94,7 @@
 (defun flymake-split-string(str pattern)
     (cond
         ((equal flymake-emacs 'xemacs)  (flymake-split-string-remove-empty-edges str pattern))
-        (t                              (split-string str pattern))
+        (t                              (flymake-split-string-remove-empty-edges str pattern))
     )
 )
 
@@ -1243,7 +1243,8 @@ Whenether a buffer for master-file-name exists, use it as a source instead of re
            (" *\\(\\[javac\\]\\)? *\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[ \t\n]*\\(.+\\)"
         2 4 nil 5)
       )
-     compilation-error-regexp-alist)
+     ;; compilation-error-regexp-alist)
+     (mapcar (lambda (x) (cdr x)) compilation-error-regexp-alist-alist)) 
     "patterns for matching error/warning lines, (regexp file-idx line-idx err-text-idx)"
 )
 ;(defcustom flymake-err-line-patterns
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 64f8808c7f1..1486ec7e5cf 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -25,28 +25,28 @@
 
 ;;; Commentary:
 
-;; This mode acts as a graphical user interface to GDB. You can interact with
+;; This mode acts as a graphical user interface to GDB.  You can interact with
 ;; GDB through the GUD buffer in the usual way, but there are also further
 ;; buffers which control the execution and describe the state of your program.
 ;; It separates the input/output of your program from that of GDB, if
-;; required, and watches expressions in the speedbar. It also uses features of
+;; required, and watches expressions in the speedbar.  It also uses features of
 ;; Emacs 21 such as the fringe/display margin for breakpoints, and the toolbar
 ;; (see the GDB Graphical Interface section in the Emacs info manual).
 
 ;; Start the debugger with M-x gdba.
 
 ;; This file has evolved from gdba.el from GDB 5.0 written by Tom Lord and Jim
-;; Kingdon and uses GDB's annotation interface. You don't need to know about
+;; Kingdon and uses GDB's annotation interface.  You don't need to know about
 ;; annotations to use this mode as a debugger, but if you are interested
 ;; developing the mode itself, then see the Annotations section in the GDB
 ;; info manual.
 ;;
-;; GDB developers plan to make the annotation interface obsolete. A new
+;; GDB developers plan to make the annotation interface obsolete.  A new
 ;; interface called GDB/MI (machine interface) has been designed to replace
-;; it. Some GDB/MI commands are used in this file through the CLI command
-;; 'interpreter mi <mi-command>'. A file called gdb-mi.el is included in the
+;; it.  Some GDB/MI commands are used in this file through the CLI command
+;; 'interpreter mi <mi-command>'.  A file called gdb-mi.el is included in the
 ;; GDB repository for future releases (6.2 onwards) that uses GDB/MI as the
-;; primary interface to GDB. It is still under development and is part of a
+;; primary interface to GDB.  It is still under development and is part of a
 ;; process to migrate Emacs from annotations to GDB/MI.
 ;;
 ;; Known Bugs:
@@ -63,7 +63,7 @@
 (defvar gdb-current-language nil)
 (defvar gdb-view-source t "Non-nil means that source code can be viewed.")
 (defvar gdb-selected-view 'source "Code type that user wishes to view.")
-(defvar gdb-var-list nil "List of variables in watch window")
+(defvar gdb-var-list nil "List of variables in watch window.")
 (defvar gdb-var-changed nil "Non-nil means that gdb-var-list has changed.")
 (defvar gdb-buffer-type nil)
 (defvar gdb-overlay-arrow-position nil)
@@ -85,12 +85,12 @@ other with the source file with the main routine of the inferior.
 If `gdb-many-windows' is t, regardless of the value of
 `gdb-show-main', the layout below will appear unless
 `gdb-use-inferior-io-buffer' is nil when the source buffer
-occupies the full width of the frame. Keybindings are given in
+occupies the full width of the frame.  Keybindings are given in
 relevant buffer.
 
 Watch expressions appear in the speedbar/slowbar.
 
-The following interactive lisp functions help control operation :
+The following commands help control operation :
 
 `gdb-many-windows'    - Toggle the number of windows gdb uses.
 `gdb-restore-windows' - To restore the window layout.
@@ -120,8 +120,7 @@ detailed description of this mode.
  RET      gdb-frames-select       | SPC    gdb-toggle-breakpoint
                                   | RET    gdb-goto-breakpoint
                                   |   d    gdb-delete-breakpoint
----------------------------------------------------------------------
-"
+---------------------------------------------------------------------"
   ;;
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
@@ -210,8 +209,7 @@ detailed description of this mode.
   (run-hooks 'gdba-mode-hook))
 
 (defcustom gdb-use-colon-colon-notation nil
-  "Non-nil means use FUNCTION::VARIABLE format to display variables in the
-speedbar."
+  "If non-nil use FUN::VAR format to display variables in the speedbar." ;
   :type 'boolean
   :group 'gud)
 
@@ -376,7 +374,7 @@ speedbar."
             (setq gdb-var-changed t))))))
 
 (defun gdb-edit-value (text token indent)
-  "Assign a value to a variable displayed in the speedbar"
+  "Assign a value to a variable displayed in the speedbar."
   (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
          (varnum (cadr var)) (value))
     (setq value (read-string "New value: "))
@@ -389,8 +387,8 @@ speedbar."
            'ignore))))
 
 (defcustom gdb-show-changed-values t
-  "Non-nil means use font-lock-warning-face to display values that have
-recently changed in the speedbar."
+  "If non-nil highlight values that have recently changed in the speedbar.
+The highlighting is done with `font-lock-warning-face'."
   :type 'boolean
   :group 'gud)
 
@@ -422,23 +420,23 @@ INDENT is the current indentation depth."
   "The disposition of the output of the current gdb command.
 Possible values are these symbols:
 
-    user -- gdb output should be copied to the GUD buffer
-            for the user to see.
+    `user' -- gdb output should be copied to the GUD buffer
+              for the user to see.
 
-    inferior -- gdb output should be copied to the inferior-io buffer
+    `inferior' -- gdb output should be copied to the inferior-io buffer
 
-    pre-emacs -- output should be ignored util the post-prompt
-                 annotation is received.  Then the output-sink
-                 becomes:...
-    emacs -- output should be collected in the partial-output-buffer
-             for subsequent processing by a command.  This is the
-             disposition of output generated by commands that
-             gdb mode sends to gdb on its own behalf.
-    post-emacs -- ignore output until the prompt annotation is
-                  received, then go to USER disposition.
+    `pre-emacs' -- output should be ignored util the post-prompt
+                   annotation is received.  Then the output-sink
+                   becomes:...
+    `emacs' -- output should be collected in the partial-output-buffer
+               for subsequent processing by a command.  This is the
+               disposition of output generated by commands that
+               gdb mode sends to gdb on its own behalf.
+    `post-emacs' -- ignore output until the prompt annotation is
+                    received, then go to USER disposition.
 
 gdba (gdb-ui.el) uses all five values,  gdbmi (gdb-mi.el) only two
-(user and emacs).")
+\(`user' and `emacs').")
 
 (defvar gdb-current-item nil
   "The most recent command item sent to gdb.")
@@ -619,7 +617,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
 
 (defun gdb-send (proc string)
   "A comint send filter for gdb.
-This filter may simply queue output for a later time."
+This filter may simply queue input for a later time."
   (if gud-running
       (process-send-string proc (concat string "\n"))
     (gdb-enqueue-input (concat string "\n"))))
@@ -705,25 +703,25 @@ This filter may simply queue output for a later time."
   (setq gdb-current-item item)
   (with-current-buffer gud-comint-buffer
     (if (eq gud-minor-mode 'gdba)
-        (progn
-          (if (stringp item)
-              (progn
-                (setq gdb-output-sink 'user)
-                (process-send-string (get-buffer-process gud-comint-buffer) item))
+        (if (stringp item)
             (progn
-              (gdb-clear-partial-output)
-              (setq gdb-output-sink 'pre-emacs)
-              (process-send-string (get-buffer-process gud-comint-buffer)
-                                   (car item)))))
-      ; case: eq gud-minor-mode 'gdbmi
+              (setq gdb-output-sink 'user)
+              (process-send-string (get-buffer-process gud-comint-buffer) item))
+          (progn
+            (gdb-clear-partial-output)
+            (setq gdb-output-sink 'pre-emacs)
+            (process-send-string (get-buffer-process gud-comint-buffer)
+                                 (car item))))
+      ;; case: eq gud-minor-mode 'gdbmi
       (gdb-clear-partial-output)
       (setq gdb-output-sink 'emacs)
       (process-send-string (get-buffer-process gud-comint-buffer)
-                         (car item)))))
+                           (car item)))))
 
 (defun gdb-pre-prompt (ignored)
-  "An annotation handler for `pre-prompt'. This terminates the collection of
-output from a previous command if that happens to be in effect."
+  "An annotation handler for `pre-prompt'.
+This terminates the collection of output from a previous command if that
+happens to be in effect."
   (let ((sink gdb-output-sink))
     (cond
      ((eq sink 'user) t)
@@ -761,8 +759,9 @@ This sends the next command (if any) to gdb."
   (setq gdb-prompting t))
 
 (defun gdb-starting (ignored)
-  "An annotation handler for `starting'.  This says that I/O for the
-subprocess is now the program being debugged, not GDB."
+  "An annotation handler for `starting'.
+This says that I/O for the subprocess is now the program being debugged,
+not GDB."
   (let ((sink gdb-output-sink))
     (cond
      ((eq sink 'user)
@@ -773,8 +772,9 @@ subprocess is now the program being debugged, not GDB."
      (t (error "Unexpected `starting' annotation")))))
 
 (defun gdb-stopping (ignored)
-  "An annotation handler for `exited' and other annotations which say that I/O
-for the subprocess is now GDB, not the program being debugged."
+  "An annotation handler for `exited' and other annotations.
+They say that I/O for the subprocess is now GDB, not the program
+being debugged."
   (if gdb-use-inferior-io-buffer
       (let ((sink gdb-output-sink))
         (cond
@@ -792,8 +792,9 @@ for the subprocess is now GDB, not the program being debugged."
      (t (error "Unexpected frame-begin annotation (%S)" sink)))))
 
 (defun gdb-stopped (ignored)
-  "An annotation handler for `stopped'.  It is just like gdb-stopping, except
-that if we already set the output sink to 'user in gdb-stopping, that is fine."
+  "An annotation handler for `stopped'.
+It is just like `gdb-stopping', except that if we already set the output
+sink to `user' in `gdb-stopping', that is fine."
   (setq gud-running nil)
   (let ((sink gdb-output-sink))
     (cond
@@ -803,8 +804,9 @@ that if we already set the output sink to 'user in gdb-stopping, that is fine."
      (t (error "Unexpected stopped annotation")))))
 
 (defun gdb-post-prompt (ignored)
-  "An annotation handler for `post-prompt'. This begins the collection of
-output from the current command if that happens to be appropriate."
+  "An annotation handler for `post-prompt'.
+This begins the collection of output from the current command if that
+happens to be appropriate."
   (if (not gdb-pending-triggers)
       (progn
         (gdb-get-current-frame)
@@ -832,7 +834,7 @@ output from the current command if that happens to be appropriate."
       (error "Phase error in gdb-post-prompt (got %s)" sink)))))
 
 (defun gud-gdba-marker-filter (string)
-  "A gud marker filter for gdb. Handle a burst of output from GDB."
+  "A gud marker filter for gdb.  Handle a burst of output from GDB."
   (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
   ;; Recall the left over gud-marker-acc from last time
   (setq gud-marker-acc (concat gud-marker-acc string))
@@ -1065,10 +1067,10 @@ static char *magick[] = {
   "PBM data used for disabled breakpoint icon.")
 
 (defvar breakpoint-enabled-icon nil
-  "Icon for enabled breakpoint in display margin")
+  "Icon for enabled breakpoint in display margin.")
 
 (defvar breakpoint-disabled-icon nil
-  "Icon for disabled breakpoint in display margin")
+  "Icon for disabled breakpoint in display margin.")
 
 ;; Bitmap for breakpoint in fringe
 (define-fringe-bitmap 'breakpoint
@@ -1133,7 +1135,7 @@ static char *magick[] = {
   (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
 
 (defun gdb-mouse-toggle-breakpoint (event)
-  "Toggle breakpoint in left fringe/margin with mouse click"
+  "Toggle breakpoint in left fringe/margin with mouse click."
   (interactive "e")
   (mouse-minibuffer-check event)
   (let ((posn (event-end event)))
@@ -1718,11 +1720,11 @@ static char *magick[] = {
   (other-window 1))
 
 (defcustom gdb-many-windows nil
-  "Nil (the default value) means just pop up the GUD buffer
-unless `gdb-show-main' is t. In this case it starts with two
-windows: one displaying the GUD buffer and the other with the
-source file with the main routine of the inferior. Non-nil means
-display the layout shown for `gdba'."
+  "Nil means just pop up the GUD buffer unless `gdb-show-main' is t.
+In this case it starts with two windows: one displaying the GUD
+buffer and the other with the source file with the main routine
+of the inferior.  Non-nil means display the layout shown for
+`gdba'."
   :type 'boolean
   :group 'gud)
 
@@ -1760,8 +1762,8 @@ This arrangement depends on the value of `gdb-many-windows'."
     (other-window 1)))
 
 (defun gdb-reset ()
-  "Exit a debugging session cleanly by killing the gdb buffers and resetting
- the source buffers."
+  "Exit a debugging session cleanly.
+Kills the gdb buffers and resets the source buffers."
   (dolist (buffer (buffer-list))
     (unless (eq buffer gud-comint-buffer)
       (with-current-buffer buffer
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4d9e05109a8..71927642a96 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1,7 +1,7 @@
 ;;; grep.el --- run compiler as inferior of Emacs, parse error messages
 
-;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001, 02, 2004
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+;;   2001, 2002, 2004  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
@@ -252,21 +252,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[:) \t]" 1 (2 . 5) (4 . 6))
     ("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)"
      1 2
+     ;; Calculate column positions (beg . end) of first grep match on a line
      ((lambda ()
         (setq compilation-error-screen-columns nil)
         (- (match-beginning 5) (match-end 3) 8))
       .
-      (lambda () (- (match-end 5) (match-end 3) 8)))
-     nil nil
-     (4 (list 'face nil 'invisible t 'intangible t))
-     (5 (list 'face compilation-column-face))
-     (6 (list 'face nil 'invisible t 'intangible t))
-     ;; highlight other matches on the same line
-     ("\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)"
-      nil nil
-      (1 (list 'face nil 'invisible t 'intangible t))
-      (2 (list 'face compilation-column-face) t)
-      (3 (list 'face nil 'invisible t 'intangible t))))
+      (lambda () (- (match-end 5) (match-end 3) 8))))
     ("^Binary file \\(.+\\) matches$" 1 nil nil 1))
   "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")
 
@@ -294,7 +285,16 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
      ("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 compilation-warning-face)
-      (2 compilation-line-face)))
+      (2 compilation-line-face))
+     ;; Highlight grep matches and delete markers
+     ("\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)"
+      (2 compilation-column-face)
+      ((lambda (p))
+       (progn
+         ;; Delete markers with `replace-match' because it updates
+         ;; the match-data, whereas `delete-region' would render it obsolete.
+         (replace-match "" t t nil 3)
+         (replace-match "" t t nil 1)))))
    "Additional things to highlight in grep output.
 This gets tacked on the end of the generated expressions.")
 
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index f047223cbae..b3149500ae5 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -518,8 +518,9 @@ Pending copies are stored in variable `shadow-files-to-copy', and in
 `shadow-save-buffers-kill-emacs', so it is not usually necessary to
 call it manually."
   (interactive "P")
-  (if (and (not shadow-files-to-copy) (interactive-p))
-      (message "No files need to be shadowed.")
+  (if (not shadow-files-to-copy)
+      (if (interactive-p)
+          (message "No files need to be shadowed."))
     (save-excursion
       (map-y-or-n-p (function
                      (lambda (pair)
diff --git a/lisp/simple.el b/lisp/simple.el
index 34215a39c8b..2ce0cc57b15 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1901,13 +1901,13 @@ value passed."
         (if fh (apply fh 'process-file program infile buffer display args)
           (when infile (setq lc (file-local-copy infile)))
           (setq stderr-file (when (and (consp buffer) (stringp (cadr buffer)))
-                              (make-temp-file "emacs"))))
-      (prog1
-          (apply 'call-process program
-                 (or lc infile)
-                 (if stderr-file (list (car buffer) stderr-file) buffer)
-                 display args)
-        (when stderr-file (copy-file stderr-file (cadr buffer))))
+                              (make-temp-file "emacs")))
+          (prog1
+              (apply 'call-process program
+                     (or lc infile)
+                     (if stderr-file (list (car buffer) stderr-file) buffer)
+                     display args)
+            (when stderr-file (copy-file stderr-file (cadr buffer)))))
       (when stderr-file (delete-file stderr-file))
       (when lc (delete-file lc)))))
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index db16f2f78f3..c182dffdba7 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -354,7 +354,9 @@ Any parameter supported by a frame may be added.  The parameter `height'
 will be initialized to the height of the frame speedbar is
 attached to and added to this list before the new frame is initialized."
   :group 'speedbar
-  :type '(repeat (sexp :tag "Parameter:")))
+  :type '(repeat (cons :format "%v"
+                       (symbol :tag "Parameter")
+                       (sexp :tag "Value"))))
 
 ;; These values by Hrvoje Niksic <hniksic@srce.hr>
 (defcustom speedbar-frame-plist
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 57f1e3355b2..f1121d1fee5 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1746,7 +1746,7 @@ Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
   (strokes-mode -1)
   (remove-hook 'kill-emacs-query-functions 'strokes-prompt-user-save-strokes))
 
-(add-hooks 'strokes-unload-hook 'strokes-unload-hook)
+(add-hook 'strokes-unload-hook 'strokes-unload-hook)
 
 (run-hooks 'strokes-load-hook)
 (provide 'strokes)
diff --git a/lisp/subr.el b/lisp/subr.el
index a06b136b642..621aec8d571 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -817,6 +817,10 @@ is converted into a string by expressing it in decimal."
 (make-obsolete-variable 'post-command-idle-delay
   "use timers instead, with `run-with-idle-timer'." "before 19.34")
 
+(defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions)
+(make-obsolete-variable 'x-lost-selection-hooks 'x-lost-selection-functions "21.4")
+(defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions)
+(make-obsolete-variable 'x-sent-selection-hooks 'x-sent-selection-functions "21.4")
 
 ;;;; Alternate names for functions - these are not being phased out.
 
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 62686d026c1..42dcc0f7a26 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -578,7 +578,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
   ;; Prevent loss of data when saving the file.
   (set (make-local-variable 'file-precious-flag) t)
   (auto-save-mode 0)
-  (set (make-local-variable 'write-contents-hooks) '(tar-mode-write-file))
+  (set (make-local-variable 'write-contents-functions) '(tar-mode-write-file))
   (widen)
   (if (and (boundp 'tar-header-offset) tar-header-offset)
       (narrow-to-region (point-min) (byte-to-position tar-header-offset))
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 6e7b2a9a51c..4ac96b2e4b0 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -453,10 +453,22 @@ Do \\[describe-key] on the following bindings to discover what they do.
   ;; recognized.
   (set (make-local-variable 'comment-start-skip) "\\(?:<!\\)?--[ \t]*")
   (set (make-local-variable 'comment-end-skip) "[ \t]*--\\([ \t\n]*>\\)?")
-  ;; This definition probably is not useful in derived modes.
-  (set (make-local-variable 'imenu-generic-expression)
-       (concat "<!\\(element\\|entity\\)[ \t\n]+%?[ \t\n]*\\("
-               sgml-name-re "\\)")))
+  ;; This definition has an HTML leaning but probably fits well for other modes.
+  (setq imenu-generic-expression
+        `((nil
+           ,(concat "<!\\(element\\|entity\\)[ \t\n]+%?[ \t\n]*\\("
+                    sgml-name-re "\\)")
+           2)
+          ("Id"
+           ,(concat "<[^>]+[ \t\n]+[Ii][Dd]=\\(['\"]"
+                    (if sgml-xml-mode "" "?")
+                    "\\)\\(" sgml-name-re "\\)\\1")
+           2)
+          ("Name"
+           ,(concat "<[^>]+[ \t\n]+[Nn][Aa][Mm][Ee]=\\(['\"]"
+                    (if sgml-xml-mode "" "?")
+                    "\\)\\(" sgml-name-re "\\)\\1")
+           2))))
 
 ;; Some programs (such as Glade 2) generate XML which has
 ;; -*- mode: xml -*-.
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 5c5e0a4d1c7..cb5bf24badd 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -468,6 +468,10 @@ An alternative value is \" . \", if you use a font with a narrow period."
            ;; (arg "\\(?:{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)\\|\\\\[a-z*]+\\)"))
            (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
+       ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
+       ;; 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 $$
        ;; We only mark the match between $$ and $$ because the $$ delimiters
        ;; themselves have already been marked (along with $..$) by syntactic
@@ -619,6 +623,8 @@ An alternative value is \" . \", if you use a font with a narrow period."
       ;; 2 - font-lock considers the preceding \n as being part of the
       ;;     preceding line, so things gets screwed every time the previous
       ;;     line is re-font-locked on its own.
+      ;; There's a hack in tex-font-lock-keywords-1 to remove the verbatim
+      ;; face from the \ but C-M-f still jumps to the wrong spot :-(  --Stef
       (,(concat "^\\(\\\\\\)end *{" verbs "}\\(.?\\)") (1 "|") (3 "<"))
       ;; ("^\\(\\\\\\)begin *{comment}" 1 "< b")
       ;; ("^\\\\end *{comment}.*\\(\n\\)" 1 "> b")
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 253e1406f06..ec96ab09fe2 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1005,8 +1005,8 @@ FRAC should be the inverse of the fractional value; for example, a value of
     (setcar type-break-keystroke-threshold lower)
     (setcdr type-break-keystroke-threshold upper)
     (if (interactive-p)
-        (message "min threshold: %d\tmax threshold: %d" lower upper)
-      type-break-keystroke-threshold)))
+        (message "min threshold: %d\tmax threshold: %d" lower upper))
+    type-break-keystroke-threshold))
 
 
 ;;; misc functions
@@ -1103,37 +1103,12 @@ With optional non-nil ALL, force redisplay of all mode-lines."
 
 (defun type-break-run-at-time (time repeat function)
   (condition-case nil (or (require 'timer) (require 'itimer)) (error nil))
-  (cond ((fboundp 'run-at-time)
-         (run-at-time time repeat function))
-        ((fboundp 'start-timer)
-         (let ((name (if (symbolp function)
-                         (symbol-name function)
-                       "type-break")))
-           (start-timer name function time repeat)))
-        ((fboundp 'start-itimer)
-         (let ((name (if (symbolp function)
-                         (symbol-name function)
-                       "type-break")))
-           (start-itimer name function time repeat)))))
+  (run-at-time time repeat function))
 
 (defvar timer-dont-exit)
 (defun type-break-cancel-function-timers (function)
-  (cond ((fboundp 'cancel-function-timers)
-         (let ((timer-dont-exit t))
-           (cancel-function-timers function)))
-        ((fboundp 'delete-timer)
-         (let ((list timer-list))
-           (while list
-             (and (eq (funcall 'timer-function (car list)) function)
-                  (delete-timer (car list)))
-             (setq list (cdr list)))))
-        ((fboundp 'delete-itimer)
-         (with-no-warnings
-          (let ((list itimer-list))
-            (while list
-              (and (eq (funcall 'itimer-function (car list)) function)
-                   (delete-itimer (car list)))
-              (setq list (cdr list))))))))
+  (let ((timer-dont-exit t))
+    (cancel-function-timers function)))
 
 
 ;;; Demo wrappers
diff --git a/lisp/woman.el b/lisp/woman.el
index cea1c61bcc4..610590a2972 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1132,7 +1132,7 @@ Used non-interactively, arguments are optional: if given then TOPIC
 should be a topic string and non-nil RE-CACHE forces re-caching."
   (interactive (list nil current-prefix-arg))
   ;; The following test is for non-interactive calls via gnudoit etc.
-  (if (or (interactive-p) (not (stringp topic)) (string-match "\\S " topic))
+  (if (or (not (stringp topic)) (string-match "\\S " topic))
       (let ((file-name (woman-file-name topic re-cache)))
         (if file-name
             (woman-find-file file-name)