Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-65

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-634
 - 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/gnus--rel--5.10--patch-59
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
   Update from CVS

33 files changed, 687 insertions, 407 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 556f9ad2a94..260dfb22af5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,166 @@
+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  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.
+        (increase-right-margin): Remove erroneous call to `interactive-p'.
+
+2004-10-24  Kim F. Storm  <storm@cua.dk>
+
+        * help.el (describe-mode): Fix 2004-10-13 change.
+        Copy pure "Auto Fill" string so it can be propertized later
+        without causing a read-only error.
+
+2004-10-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * info.el (Info-find-emacs-command-nodes): Adapt to Texinfo-4.7
+        style indexes.
+
+2004-10-24  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        * simple.el (process-file): Accept nil for INFILE.  Reported by
+        Luc Teirlinck.
+
+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.
+        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.
+
+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-assembler-mode): Use 'gdb-assembler-font-lock-keywords'.
+        Suggested by Masatake YAMATO <jet@gyve.org>.
+
+2004-10-23  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        * simple.el (process-file): New function, similar to call-process
+        but supports file handlers.
+        * vc.el (vc-do-command): Use it, instead of call-process.
+        * net/tramp-vc.el (vc-do-command): Do not advise it if
+        process-file is fboundp.
+        * net/tramp.el (tramp-file-name-handler-alist): Add entry for
+        process-file.
+        (tramp-handle-process-file): New function.
+        (tramp-file-name-for-operation): Support process-file.
+
+2004-10-23  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar--weekday-array): New constant.
+        (icalendar-weekdayabbrev-table)
+        (icalendar-monthnumber-table): Delete.
+        (icalendar--get-month-number): Use calendar-month-name-array.
+        (icalendar--get-weekday-number): New function.
+        (icalendar--get-weekday-abbrev) Use calendar-day-name-array.
+        (icalendar-export-region): Handle multi-line entries.
+        (icalendar--convert-ical-to-diary): Use calendar-day-name-array.
+
+2004-10-23  John Paul Wallington  <jpw@gnu.org>
+
+        * ibuffer.el (ibuffer-find-file): Remove `interactive-p' call;
+        `wildcards' set to t in interactive spec.
+
+        * ibuf-ext.el (ibuffer-jump-to-buffer): Read buffer name in
+        interactive spec rather than use `interactive-p'.
+        (ibuffer-kill-line): Set arg `interactive-p' in interactive spec
+        rather than use function `interactive-p'.
+
 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>
@@ -245,6 +398,13 @@
 
         * net/password.el: Add.
 
+2004-10-14  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/gud.el (gdb-script-beginning-of-defun): New function.
+        (gdb-script-end-of-defun): New function.
+        (gdb-script-mode): Use `gdb-script-beginning-of-defun' and
+        `gdb-script-end-of-defun' as *-of-defun-function.
+
 2004-10-13  Daniel Pfeiffer  <occitan@esperanto.org>
 
         * button.el (button-activate): Allow a marker to display as an action.
@@ -254,13 +414,6 @@
         * help.el (describe-mode): Use it to make minor mode list into
         hyperlinks.
 
-2004-10-14  Masatake YAMATO  <jet@gyve.org>
-
-        * progmodes/gud.el (gdb-script-beginning-of-defun): New function.
-        (gdb-script-end-of-defun): New function.
-        (gdb-script-mode): Use `gdb-script-beginning-of-defun' and
-        `gdb-script-end-of-defun' as *-of-defun-function.
-
 2004-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc.el (vc-annotate-display-select): Fix typo.
@@ -564,15 +717,6 @@
         * diff-mode.el (diff-file-header-re): Tighten up regexp a tiny bit.
         (diff-fixup-modifs): Catch unified-diff file-headers.
 
-2004-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * dired.el (dired-view-command-alist): Use more efficient regexps.
-        Remove dubious arguments.
-        (dired-align-file): New function.
-        (dired-insert-directory): Use it.
-        (dired-move-to-end-of-filename): Make the " -> " search more specific.
-        (dired-buffers-for-dir): Remove unused var `pattern'.
-
 2004-09-29  Kim F. Storm  <storm@cua.dk>
 
         * progmodes/gdb-ui.el (breakpoint): Define as fringe bitmap.
@@ -582,6 +726,15 @@
         * fringe.el (fringe-bitmap-p): New macro.
         (fringe-bitmaps): Add standard fringe bitmaps on load.
 
+2004-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.el (dired-view-command-alist): Use more efficient regexps.
+        Remove dubious arguments.
+        (dired-align-file): New function.
+        (dired-insert-directory): Use it.
+        (dired-move-to-end-of-filename): Make the " -> " search more specific.
+        (dired-buffers-for-dir): Remove unused var `pattern'.
+
 2004-09-28  Matthew Mundell  <matt@mundell.ukfsn.org>  (tiny change)
 
         * calendar/diary-lib.el (list-diary-entries): Save diary buffer
@@ -720,7 +873,7 @@
 
         * calc/calc-graph.el (calc-graph-add-curve): Moved the call to
         `calc-graph-set-styles' so the gnuplot buffer will appear in a
-        separate window. 
+        separate window.
 
 2004-09-21  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -737,7 +890,7 @@
         fixed.
 
 2004-09-21  Jay Belanger  <belanger@truman.edu>
-        
+
         * calc/calc.el (calc-mode-var-list): Removed unnecessary quotes.
 
 2004-09-20  Luc Teirlinck  <teirllm@auburn.edu>
@@ -828,8 +981,8 @@
 2004-09-17  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc.el (calc-mode-var-list): Fixed the value of
-        `calc-matrix-brackets'. 
-        
+        `calc-matrix-brackets'.
+
 2004-09-17  Romain Francoise  <romain@orebokech.com>
 
         * ibuf-ext.el (define-ibuffer-filter filename):
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/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 9e5f2b93c22..5f581e1d74a 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -39,6 +39,8 @@
 ;;        Added icalendar-export-region.
 ;;        The import and export commands do not clear their target file,
 ;;        but append their results to the target file.
+;;        I18n-problems fixed -- use calendar-(month|day)-name-array.
+;;        Fixed problems with export of multi-line diary entries.
 
 ;;  0.06: Bugfixes regarding icalendar-import-format-*.
 ;;        Fix in icalendar-convert-diary-to-ical -- thanks to Philipp
@@ -167,31 +169,7 @@ longer than they are."
 ;; NO USER SERVICABLE PARTS BELOW THIS LINE
 ;; ======================================================================
 
-(defconst icalendar-weekdayabbrev-table
-  '(("mon\\(day\\)?"    . "MO")
-    ("tue\\(sday\\)?"   . "TU")
-    ("wed\\(nesday\\)?" . "WE")
-    ("thu\\(rsday\\)?"  . "TH")
-    ("fri\\(day\\)?"    . "FR")
-    ("sat\\(urday\\)?"  . "SA")
-    ("sun\\(day\\)?"    . "SU"))
-  "Translation table for weekdays.")
-
-(defconst icalendar-monthnumber-table
-  '(("^jan\\(uar\\)?y?$"       . 1)
-    ("^feb\\(ruar\\)?y?$"      . 2)
-    ("^mar\\(ch\\)?\\|märz$"   . 3)
-    ("^apr\\(il\\)?$"          . 4)
-    ("^ma[iy]$"                . 5)
-    ("^jun[ie]?$"              . 6)
-    ("^jul[iy]?$"              . 7)
-    ("^aug\\(ust\\)?$"         . 8)
-    ("^sep\\(tember\\)?$"      . 9)
-    ("^o[ck]t\\(ober\\)?$"     . 10)
-    ("^nov\\(ember\\)?$"       . 11)
-    ("^de[cz]\\(ember\\)?$"    . 12))
-  "Regular expressions for month names.
-Currently this matches only German and English.")
+(defconst icalendar--weekday-array ["SU" "MO" "TU" "WE" "TH" "FR" "SA"])
 
 (defvar icalendar-debug nil ".")
 
@@ -511,18 +489,47 @@ Note that this silently ignores seconds."
 
 (defun icalendar--get-month-number (monthname)
   "Return the month number for the given MONTHNAME."
-  (save-match-data
-    (let ((case-fold-search t))
-      (assoc-default monthname icalendar-monthnumber-table
-                     'string-match))))
+  (catch 'found
+    (let ((num 1)
+          (m (downcase monthname)))
+      (mapc (lambda (month)
+              (let ((mm (downcase month)))
+                (if (or (string-equal mm m)
+                        (string-equal (substring mm 0 3) m))
+                    (throw 'found num))
+                (setq num (1+ num))))
+            calendar-month-name-array))
+    ;; Error:
+    -1))
+
+(defun icalendar--get-weekday-number (abbrevweekday)
+  "Return the number for the ABBREVWEEKDAY."
+  (catch 'found
+    (let ((num 0)
+          (aw (downcase abbrevweekday)))
+      (mapc (lambda (day)
+              (let ((d (downcase day)))
+                (if (string-equal d aw)
+                    (throw 'found num))
+                (setq num (1+ num))))
+            icalendar--weekday-array))
+    ;; Error:
+    -1))
 
 (defun icalendar--get-weekday-abbrev (weekday)
   "Return the abbreviated WEEKDAY."
-  ;;FIXME: ISO-like(?).
-  (save-match-data
-    (let ((case-fold-search t))
-      (assoc-default weekday icalendar-weekdayabbrev-table
-                     'string-match))))
+  (catch 'found
+    (let ((num 0)
+          (w (downcase weekday)))
+      (mapc (lambda (day)
+              (let ((d (downcase day)))
+                (if (or (string-equal d w)
+                        (string-equal (substring d 0 3) w))
+                    (throw 'found (aref icalendar--weekday-array num)))
+                (setq num (1+ num))))
+            calendar-day-name-array))
+    ;; Error:
+    "??"))
 
 (defun icalendar--datestring-to-isodate (datestring &optional day-shift)
   "Convert diary-style DATESTRING to iso-style date.
@@ -648,7 +655,7 @@ FExport diary data into iCalendar file: ")
     (save-excursion
       (goto-char min)
       (while (re-search-forward
-              "^\\([^ \t\n].*\\)\\(\n[ \t].*\\)*" max t)
+              "^\\([^ \t\n].*\\)\\(\\(\n[ \t].*\\)*\\)" max t)
         (setq entry-main (match-string 1))
         (if (match-beginning 2)
             (setq entry-rest (match-string 2))
@@ -1171,13 +1178,13 @@ written into the buffer ` *icalendar-errors*'."
                          ;; weekly and not all-day
                          (let* ((byday (cadr (assoc 'BYDAY rrule-props)))
                                 (weekday
-                                 (cdr (rassoc
-                                       byday
-                                       icalendar-weekdayabbrev-table))))
+                                 (icalendar--get-weekday-number byday)))
                            (icalendar--dmsg "weekly not-all-day")
-                           (if weekday
+                           (if (> weekday -1)
                                (setq diary-string
-                                     (format "%s %s%s%s" weekday
+                                     (format "%s %s%s%s"
+                                             (aref calendar-day-name-array
+                                                   weekday)
                                              start-t (if end-t "-" "")
                                              (or end-t "")))
                              ;; FIXME!!!!
diff --git a/lisp/files.el b/lisp/files.el
index aaed1395275..c9fb3514b57 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1646,40 +1646,33 @@ in that case, this function acts as if `enable-local-variables' were t."
    (lambda (elt)
      (cons (purecopy (car elt)) (cdr elt)))
    '(("\\.te?xt\\'" . text-mode)
-     ("\\.tex\\'" . tex-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)
+     ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
      ("\\.s?html?\\'" . html-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 +1681,27 @@ 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)
-     ("\\.mf\\'" . metafont-mode)
-     ("\\.mp\\'" . metapost-mode)
+     ("\\.m[4c]\\'" . m4-mode)
+     ("\\.m[fp]\\'" . 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 +1717,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 +1745,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 +1834,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'.")
 
+(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 just-from-file-name)
   "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'.
@@ -1866,87 +1859,84 @@ 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."
   ;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*-
-  (let (end done modes)
-    (save-excursion
-      (goto-char (point-min))
-      (skip-chars-forward " \t\n")
-      (and enable-local-variables
-           (setq end (set-auto-mode-1))
-           (if (save-excursion (search-forward ":" end t))
-               ;; Find all specifications for the `mode:' variable
-               ;; and execute them left to right.
-               (while (let ((case-fold-search t))
-                        (or (and (looking-at "mode:")
-                                 (goto-char (match-end 0)))
-                            (re-search-forward "[ \t;]mode:" end t)))
-                 (skip-chars-forward " \t")
-                 (let ((beg (point)))
-                   (if (search-forward ";" end t)
-                       (forward-char -1)
-                     (goto-char end))
-                   (skip-chars-backward " \t")
-                   (push (intern (concat (downcase (buffer-substring beg (point))) "-mode"))
-                         modes)))
-             ;; Simple -*-MODE-*- case.
-             (push (intern (concat (downcase (buffer-substring (point) end))
-                                   "-mode"))
-                   modes))))
-    ;; If we found modes to use, invoke them now,
-    ;; outside the save-excursion.
+  (let (end done mode modes xml)
     (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.
+      ;; 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))
+                 ;; Find all specifications for the `mode:' variable
+                 ;; and execute them left to right.
+                 (while (let ((case-fold-search t))
+                          (or (and (looking-at "mode:")
+                                   (goto-char (match-end 0)))
+                              (re-search-forward "[ \t;]mode:" end t)))
+                   (skip-chars-forward " \t")
+                   (let ((beg (point)))
+                     (if (search-forward ";" end t)
+                         (forward-char -1)
+                       (goto-char end))
+                     (skip-chars-backward " \t")
+                     (push (intern (concat (downcase (buffer-substring beg (point))) "-mode"))
+                           modes)))
+               ;; Simple -*-MODE-*- case.
+               (push (intern (concat (downcase (buffer-substring (point) end))
+                                     "-mode"))
+                     modes))))
+      ;; If we found modes to use, invoke them now, outside the save-excursion.
+      (if modes
+          (dolist (mode (nreverse modes))
+            (if (not (functionp mode))
+                (message "Ignoring unknown mode `%s'" mode)
+              (setq done t)
+              (funcall mode)))
+        ;; 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 (funcall (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 (not done)
+            ;; 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 done t)))
+            (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))
+                  (if (if xml (memq mode xml-based-modes) t)
+                      (funcall mode)
+                    (xml-mode)))))))
+    (and (not done)
+         xml
+         (xml-mode))))
 
 
 (defun set-auto-mode-1 ()
@@ -2157,7 +2147,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..02d8fe24007 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+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-start.el b/lisp/gnus/gnus-start.el
index dda03b864b1..ecce9f00b37 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2227,7 +2227,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
@@ -2261,7 +2262,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/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/help.el b/lisp/help.el
index 5a2867bdc18..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)))))))
 
 
@@ -651,7 +662,8 @@ whose documentation describes the minor mode."
                  (push (list pretty-minor-mode mode indicator)
                        minor-modes))))
         (if auto-fill-function
-            (push '("Auto Fill" auto-fill-mode " Fill")
+            ;; copy pure string so we can add face property to it below.
+            (push (list (copy-sequence "Auto Fill") 'auto-fill-mode " Fill")
                   minor-modes))
         (setq minor-modes
               (sort minor-modes
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 5d24964362a..bed4330d0c2 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -645,16 +645,16 @@ The group will be added to `ibuffer-filter-group-kill-ring'."
   (ibuffer-update nil t))
 
 ;;;###autoload
-(defun ibuffer-kill-line (&optional arg)
+(defun ibuffer-kill-line (&optional arg interactive-p)
   "Kill the filter group at point.
 See also `ibuffer-kill-filter-group'."
-  (interactive "P")
+  (interactive "P\np")
   (ibuffer-aif (save-excursion
                  (ibuffer-forward-line 0)
                  (get-text-property (point) 'ibuffer-filter-group-name))
       (progn
         (ibuffer-kill-filter-group it))
-      (funcall (if (interactive-p) #'call-interactively #'funcall)
+      (funcall (if interactive-p #'call-interactively #'funcall)
                #'kill-line arg)))
 
 (defun ibuffer-insert-filter-group-before (newgroup group)
@@ -1237,53 +1237,51 @@ hidden group filter, open it.
 If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
 visible buffers in the completion list.  Calling the command with
 a prefix argument reverses the meaning of that variable."
-  (interactive (list nil))
-  (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
-    (when current-prefix-arg
-      (setq only-visible (not only-visible)))
-    (if only-visible
-        (let ((table (mapcar #'(lambda (x)
-                                 (buffer-name (car x)))
-                             (ibuffer-current-state-list))))
-          (when (null table)
-            (error "No buffers!"))
-          (when (interactive-p)
-            (setq name (completing-read "Jump to buffer: "
-                                        table nil t))))
-      (when (interactive-p)
-        (setq name (read-buffer "Jump to buffer: " nil t))))
-    (when (not (string= "" name))
-      (let (buf-point)
-        ;; Blindly search for our buffer: it is very likely that it is
-        ;; not in a hidden filter group.
-        (ibuffer-map-lines #'(lambda (buf marks)
-                               (when (string= (buffer-name buf) name)
-                                 (setq buf-point (point))
-                                 nil))
-                           t nil)
-        (when (and
-               (null buf-point)
-               (not (null ibuffer-hidden-filter-groups)))
-          ;; We did not find our buffer.  It must be in a hidden filter
-          ;; group, so go through all hidden filter groups to find it.
-          (catch 'found
-            (dolist (group ibuffer-hidden-filter-groups)
-              (ibuffer-jump-to-filter-group group)
-              (ibuffer-toggle-filter-group)
-              (ibuffer-map-lines #'(lambda (buf marks)
-                                     (when (string= (buffer-name buf) name)
-                                       (setq buf-point (point))
-                                       nil))
-                                 t group)
-              (if buf-point
-                  (throw 'found nil)
-                (ibuffer-toggle-filter-group)))))
-        (if (null buf-point)
-            ;; Still not found even though we expanded all hidden filter
-            ;; groups: that must be because it's hidden by predicate:
-            ;; we won't bother trying to display it.
-            (error "No buffer with name %s" name)
-          (goto-char buf-point))))))
+  (interactive (list
+                (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
+                  (when current-prefix-arg
+                    (setq only-visible (not only-visible)))
+                  (if only-visible
+                      (let ((table (mapcar #'(lambda (x)
+                                               (buffer-name (car x)))
+                                           (ibuffer-current-state-list))))
+                        (when (null table)
+                          (error "No buffers!"))
+                        (completing-read "Jump to buffer: "
+                                         table nil t))
+                    (read-buffer "Jump to buffer: " nil t)))))
+  (when (not (string= "" name))
+    (let (buf-point)
+      ;; Blindly search for our buffer: it is very likely that it is
+      ;; not in a hidden filter group.
+      (ibuffer-map-lines #'(lambda (buf marks)
+                             (when (string= (buffer-name buf) name)
+                               (setq buf-point (point))
+                               nil))
+                         t nil)
+      (when (and
+             (null buf-point)
+             (not (null ibuffer-hidden-filter-groups)))
+        ;; We did not find our buffer.  It must be in a hidden filter
+        ;; group, so go through all hidden filter groups to find it.
+        (catch 'found
+          (dolist (group ibuffer-hidden-filter-groups)
+            (ibuffer-jump-to-filter-group group)
+            (ibuffer-toggle-filter-group)
+            (ibuffer-map-lines #'(lambda (buf marks)
+                                   (when (string= (buffer-name buf) name)
+                                     (setq buf-point (point))
+                                     nil))
+                               t group)
+            (if buf-point
+                (throw 'found nil)
+              (ibuffer-toggle-filter-group)))))
+      (if (null buf-point)
+          ;; Still not found even though we expanded all hidden filter
+          ;; groups: that must be because it's hidden by predicate:
+          ;; we won't bother trying to display it.
+          (error "No buffer with name %s" name)
+        (goto-char buf-point)))))
 
 ;;;###autoload
 (defun ibuffer-diff-with-file ()
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 12f29bdac63..30c97a383d3 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -873,8 +873,8 @@ width and the longest string in LIST."
                                     default-directory)
                                 default-directory))))
      (list (read-file-name "Find file: " default-directory)
-           current-prefix-arg)))
-  (find-file file (or wildcards (interactive-p))))
+           t)))
+  (find-file file wildcards))
 
 (defun ibuffer-mouse-visit-buffer (event)
   "Visit the buffer chosen with the mouse."
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 6859c0c74c7..924746f3bd1 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -62,6 +62,8 @@
 
 ;;; Code:
 
+(require 'newcomment)
+
 (eval-when-compile (require 'cl))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -796,32 +798,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/indent.el b/lisp/indent.el
index e1a9cae4819..9713268f03b 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -205,7 +205,6 @@ If `auto-fill-mode' is active, re-fill the region to fit the new margin.
 Interactively, WIDTH is the prefix argument, if specified.
 Without prefix argument, the command prompts for WIDTH."
   (interactive "r\nNSet left margin to column: ")
-  (if (interactive-p) (setq width (prefix-numeric-value width)))
   (save-excursion
     ;; If inside indentation, start from BOL.
     (goto-char from)
@@ -229,7 +228,6 @@ If `auto-fill-mode' is active, re-fill the region to fit the new margin.
 Interactively, WIDTH is the prefix argument, if specified.
 Without prefix argument, the command prompts for WIDTH."
   (interactive "r\nNSet right margin to width: ")
-  (if (interactive-p) (setq width (prefix-numeric-value width)))
   (save-excursion
     (goto-char from)
     (skip-chars-backward " \t")
@@ -289,12 +287,10 @@ to change the margin by, in characters.  A negative argument decreases
 the right margin width.
 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
   (interactive "r\nP")
-  (if (interactive-p)
-      (setq inc (if inc (prefix-numeric-value current-prefix-arg)
-                  standard-indent)))
+  (setq inc (if inc (prefix-numeric-value inc) standard-indent))
   (save-excursion
     (alter-text-property from to 'right-margin
-       (lambda (v) (+ inc (or v 0))))
+                         (lambda (v) (+ inc (or v 0))))
     (if auto-fill-function
         (fill-region from to nil t t))))
 
diff --git a/lisp/info.el b/lisp/info.el
index 17905c6d738..4fc7b5c9cf7 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3248,7 +3248,8 @@ The locations are of the format used in `Info-history', i.e.
 \(FILENAME NODENAME BUFFERPOS\)."
   (let ((where '())
         (cmd-desc (concat "^\\* +" (regexp-quote (symbol-name command))
-                          "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\.$"))
+                          "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\."
+                          "\\([ \t]*(line[ \t]*[0-9]*)\\)?$"))
         (info-file "emacs"))            ;default
     ;; Determine which info file this command is documented in.
     (if (get command 'info-file)
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..b6f4558f280 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -240,6 +240,7 @@ 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)
diff --git a/lisp/net/password.el b/lisp/net/password.el
index e8be612ecca..da009ed9ea0 100644
--- a/lisp/net/password.el
+++ b/lisp/net/password.el
@@ -122,6 +122,62 @@ seconds."
                  key))
   nil)
 
+;;;###autoload
+(defun read-passwd (prompt &optional confirm default)
+  "Read a password, prompting with PROMPT, and return it.
+If optional CONFIRM is non-nil, read the password twice to make sure.
+Optional DEFAULT is a default password to use instead of empty input.
+
+This function echoes `.' for each character that the user types.
+The user ends with RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.
+C-g quits; if `inhibit-quit' was non-nil around this function,
+then it returns nil if the user types C-g.
+
+Once the caller uses the password, it can erase the password
+by doing (clear-string STRING)."
+  (with-local-quit
+    (if confirm
+        (let (success)
+          (while (not success)
+            (let ((first (read-passwd prompt nil default))
+                  (second (read-passwd "Confirm password: " nil default)))
+              (if (equal first second)
+                  (progn
+                    (and (arrayp second) (clear-string second))
+                    (setq success first))
+                (and (arrayp first) (clear-string first))
+                (and (arrayp second) (clear-string second))
+                (message "Password not repeated accurately; please start over")
+                (sit-for 1))))
+          success)
+      (let ((pass nil)
+            (c 0)
+            (echo-keystrokes 0)
+            (cursor-in-echo-area t))
+        (while (progn (message "%s%s"
+                               prompt
+                               (make-string (length pass) ?.))
+                      (setq c (read-char-exclusive nil t))
+                      (and (/= c ?\r) (/= c ?\n) (/= c ?\e)))
+          (clear-this-command-keys)
+          (if (= c ?\C-u)
+              (progn
+                (and (arrayp pass) (clear-string pass))
+                (setq pass ""))
+            (if (and (/= c ?\b) (/= c ?\177))
+                (let* ((new-char (char-to-string c))
+                       (new-pass (concat pass new-char)))
+                  (and (arrayp pass) (clear-string pass))
+                  (clear-string new-char)
+                  (setq c ?\0)
+                  (setq pass new-pass))
+              (if (> (length pass) 0)
+                  (let ((new-pass (substring pass 0 -1)))
+                    (and (arrayp pass) (clear-string pass))
+                    (setq pass new-pass))))))
+        (message nil)
+        (or pass default "")))))
+
 (provide 'password)
 
 ;;; arch-tag: ab160494-16c8-4c68-a4a1-73eebf6686e5
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index e720deb8f07..3cc54eda650 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -217,6 +217,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 ;; Daniel Pittman <daniel@danann.net>
 ;;-(if (fboundp 'vc-call-backend)
 ;;-    () ;; This is the new VC for which we don't have an appropriate advice yet
+(unless (fboundp 'process-file)
 (if (fboundp 'vc-call-backend)
     (defadvice vc-do-command
       (around tramp-advice-vc-do-command
@@ -242,7 +243,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
           (setq ad-return-value
                 (apply 'tramp-vc-do-command buffer okstatus command 
                        (or file (buffer-file-name)) last flags))
-        ad-do-it))))
+        ad-do-it)))))
 ;;-)
 
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 582ae8ee207..5a71a50c5db 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1770,6 +1770,7 @@ on the FILENAME argument, even if VISIT was a string.")
     (delete-file . tramp-handle-delete-file)
     (directory-file-name . tramp-handle-directory-file-name)
     (shell-command . tramp-handle-shell-command)
+    (process-file . tramp-handle-process-file)
     (insert-directory . tramp-handle-insert-directory)
     (expand-file-name . tramp-handle-expand-file-name)
     (file-local-copy . tramp-handle-file-local-copy)
@@ -3469,6 +3470,18 @@ This will break if COMMAND prints a newline, followed by the value of
     (tramp-run-real-handler 'shell-command
                             (list command output-buffer error-buffer))))
 
+(defun tramp-handle-process-file (program &optional infile buffer display &rest args)
+  "Like `process-file' for Tramp files."
+  (when infile (error "Implementation does not handle input from file"))
+  (when (and (numberp buffer) (zerop buffer))
+    (error "Implementation does not handle immediate return"))
+  (when (consp buffer) (error "Implementation does not handle error files"))
+  (shell-command 
+   (mapconcat 'tramp-shell-quote-argument
+              (cons program args)
+              " ")
+   buffer))
+
 ;; File Editing.
 
 (defsubst tramp-make-temp-file ()
@@ -3960,6 +3973,8 @@ ARGS are the arguments OPERATION has been called with."
    ; COMMAND
    ((member operation
             (list 'dired-call-process 'shell-command
+                  ; Post Emacs 21.3 only
+                  'process-file
                   ; XEmacs only
                   'dired-print-file 'dired-shell-call-process))
     default-directory)
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 1260867f7c6..5dff6d954f8 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -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
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 76d12aa6f6e..17cb7c78316 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -90,7 +90,9 @@
     2 font-lock-keyword-face)
    ;; directive started from ".".
    ("^\\(\\.\\(\\sw\\|\\s_\\)+\\)\\>[^:]?"
-    1 font-lock-keyword-face))
+    1 font-lock-keyword-face)
+   ;; %register
+   ("%\\sw+" . font-lock-variable-name-face))
  "Additional expressions to highlight in Assembler mode.")
 
 ;;;###autoload
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 d8f2cf34867..64f8808c7f1 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -177,7 +177,7 @@ detailed description of this mode.
 
   (setq comint-input-sender 'gdb-send)
   ;;
-  ;; (re-)initialise
+  ;; (re-)initialize
   (setq gdb-current-address "main")
   (setq gdb-previous-address nil)
   (setq gdb-previous-frame nil)
@@ -482,14 +482,14 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
              (name (funcall (gdb-rules-name-maker rules)))
              (new (get-buffer-create name)))
         (with-current-buffer new
-          ;; FIXME: This should be set after calling the function, since the
-          ;; function should run kill-all-local-variables.
-          (set (make-local-variable 'gdb-buffer-type) key)
-          (if (cdr (cdr rules))
-              (funcall (car (cdr (cdr rules)))))
-          (set (make-local-variable 'gud-minor-mode)
-               (with-current-buffer gud-comint-buffer gud-minor-mode))
-          (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+          (let ((trigger))        
+            (if (cdr (cdr rules))
+                (setq trigger (funcall (car (cdr (cdr rules))))))
+            (set (make-local-variable 'gdb-buffer-type) key)
+            (set (make-local-variable 'gud-minor-mode)
+                 (with-current-buffer gud-comint-buffer gud-minor-mode))
+            (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+            (if trigger (funcall trigger)))
           new))))
 
 (defun gdb-rules-name-maker (rules) (car (cdr rules)))
@@ -1190,13 +1190,15 @@ static char *magick[] = {
   "Major mode for gdb breakpoints.
 
 \\{gdb-breakpoints-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-breakpoints-mode)
   (setq mode-name "Breakpoints")
   (use-local-map gdb-breakpoints-mode-map)
   (setq buffer-read-only t)
+  (run-mode-hooks 'gdb-breakpoints-mode-hook)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
-      (gdb-invalidate-breakpoints)
-    (gdbmi-invalidate-breakpoints)))
+      'gdb-invalidate-breakpoints
+    'gdbmi-invalidate-breakpoints))
 
 (defun gdb-toggle-breakpoint ()
   "Enable/disable the breakpoint at current line."
@@ -1317,14 +1319,16 @@ static char *magick[] = {
   "Major mode for gdb frames.
 
 \\{gdb-frames-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-frames-mode)
   (setq mode-name "Frames")
   (setq buffer-read-only t)
   (use-local-map gdb-frames-mode-map)
   (font-lock-mode -1)
+  (run-mode-hooks 'gdb-frames-mode-hook)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
-      (gdb-invalidate-frames)
-    (gdbmi-invalidate-frames)))
+      'gdb-invalidate-frames
+    'gdbmi-invalidate-frames))
 
 (defun gdb-get-frame-number ()
   (save-excursion
@@ -1396,11 +1400,13 @@ static char *magick[] = {
   "Major mode for gdb frames.
 
 \\{gdb-threads-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-threads-mode)
   (setq mode-name "Threads")
   (setq buffer-read-only t)
   (use-local-map gdb-threads-mode-map)
-  (gdb-invalidate-threads))
+  (run-mode-hooks 'gdb-threads-mode-hook)
+  'gdb-invalidate-threads)
 
 (defun gdb-get-thread-number ()
   (save-excursion
@@ -1444,11 +1450,13 @@ static char *magick[] = {
   "Major mode for gdb registers.
 
 \\{gdb-registers-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-registers-mode)
   (setq mode-name "Registers")
   (setq buffer-read-only t)
   (use-local-map gdb-registers-mode-map)
-  (gdb-invalidate-registers))
+  (run-mode-hooks 'gdb-registers-mode-hook)
+  'gdb-invalidate-registers)
 
 (defun gdb-registers-buffer-name ()
   (with-current-buffer gud-comint-buffer
@@ -1518,13 +1526,15 @@ static char *magick[] = {
   "Major mode for gdb locals.
 
 \\{gdb-locals-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-locals-mode)
   (setq mode-name (concat "Locals:" gdb-current-frame))
   (setq buffer-read-only t)
   (use-local-map gdb-locals-mode-map)
+  (run-mode-hooks 'gdb-locals-mode-hook)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
-      (gdb-invalidate-locals)
-    (gdbmi-invalidate-locals)))
+      'gdb-invalidate-locals
+    'gdbmi-invalidate-locals))
 
 (defun gdb-locals-buffer-name ()
   (with-current-buffer gud-comint-buffer
@@ -1939,10 +1949,26 @@ BUFFER nil or omitted means use the current buffer."
     (suppress-keymap map)
     map))
 
+(defvar gdb-assembler-font-lock-keywords
+  '(;; <__function.name+n>
+    ("<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>"
+     (1 font-lock-function-name-face))
+    ;; 0xNNNNNNNN <__function.name+n>: opcode
+    ("^0x[0-9a-f]+ \\(<\\(\\(\\sw\\|[_.]\\)+\\)\\+[0-9]+>\\)?:[ \t]+\\(\\sw+\\)"
+     (4 font-lock-keyword-face))
+    ;; %register(at least i386)
+    ("%\\sw+" . font-lock-variable-name-face)
+    ("^\\(Dump of assembler code for function\\) \\(.+\\):"
+     (1 font-lock-comment-face)
+     (2 font-lock-function-name-face))
+    ("^\\(End of assembler dump\\.\\)" . font-lock-comment-face))
+  "Font lock keywords used in `gdb-assembler-mode'.")
+
 (defun gdb-assembler-mode ()
   "Major mode for viewing code assembler.
 
 \\{gdb-assembler-mode-map}"
+  (kill-all-local-variables)
   (setq major-mode 'gdb-assembler-mode)
   (setq mode-name "Machine")
   (setq gdb-overlay-arrow-position nil)
@@ -1951,7 +1977,11 @@ BUFFER nil or omitted means use the current buffer."
   (setq fringes-outside-margins t)
   (setq buffer-read-only t)
   (use-local-map gdb-assembler-mode-map)
-  (gdb-invalidate-assembler))
+  (gdb-invalidate-assembler)
+  (set (make-local-variable 'font-lock-defaults)
+       '(gdb-assembler-font-lock-keywords))
+  (run-mode-hooks 'gdb-assembler-mode-hook)
+  'gdb-invalidate-assembler)
 
 (defun gdb-assembler-buffer-name ()
   (with-current-buffer gud-comint-buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index 1e6e49012e1..6420ebffd54 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1879,6 +1879,39 @@ specifies the value of ERROR-BUFFER."
     (with-current-buffer
       standard-output
       (call-process shell-file-name nil t nil shell-command-switch command))))
+
+(defun process-file (program &optional infile buffer display &rest args)
+  "Process files synchronously in a separate process.
+Similar to `call-process', but may invoke a file handler based on
+`default-directory'.  The current working directory of the
+subprocess is `default-directory'.
+
+File names in INFILE and BUFFER are handled normally, but file
+names in ARGS should be relative to `default-directory', as they
+are passed to the process verbatim.  \(This is a difference to
+`call-process' which does not support file handlers for INFILE
+and BUFFER.\)
+
+Some file handlers might not support all variants, for example
+they might behave as if DISPLAY was nil, regardless of the actual
+value passed."
+  (let ((fh (find-file-name-handler default-directory 'process-file))
+        lc stderr-file)
+    (unwind-protect
+        (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)))))
+      (when stderr-file (delete-file stderr-file))
+      (when lc (delete-file lc)))))
+
+
 
 (defvar universal-argument-map
   (let ((map (make-sparse-keymap)))
diff --git a/lisp/subr.el b/lisp/subr.el
index 5e162ef5c83..7d666f4c157 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1211,61 +1211,6 @@ any other non-digit terminates the character code and is then used as input."))
       (setq first nil))
     code))
 
-(defun read-passwd (prompt &optional confirm default)
-  "Read a password, prompting with PROMPT, and return it.
-If optional CONFIRM is non-nil, read the password twice to make sure.
-Optional DEFAULT is a default password to use instead of empty input.
-
-This function echoes `.' for each character that the user types.
-The user ends with RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.
-C-g quits; if `inhibit-quit' was non-nil around this function,
-then it returns nil if the user types C-g.
-
-Once the caller uses the password, it can erase the password
-by doing (clear-string STRING)."
-  (with-local-quit
-    (if confirm
-        (let (success)
-          (while (not success)
-            (let ((first (read-passwd prompt nil default))
-                  (second (read-passwd "Confirm password: " nil default)))
-              (if (equal first second)
-                  (progn
-                    (and (arrayp second) (clear-string second))
-                    (setq success first))
-                (and (arrayp first) (clear-string first))
-                (and (arrayp second) (clear-string second))
-                (message "Password not repeated accurately; please start over")
-                (sit-for 1))))
-          success)
-      (let ((pass nil)
-            (c 0)
-            (echo-keystrokes 0)
-            (cursor-in-echo-area t))
-        (while (progn (message "%s%s"
-                               prompt
-                               (make-string (length pass) ?.))
-                      (setq c (read-char-exclusive nil t))
-                      (and (/= c ?\r) (/= c ?\n) (/= c ?\e)))
-          (clear-this-command-keys)
-          (if (= c ?\C-u)
-              (progn
-                (and (arrayp pass) (clear-string pass))
-                (setq pass ""))
-            (if (and (/= c ?\b) (/= c ?\177))
-                (let* ((new-char (char-to-string c))
-                       (new-pass (concat pass new-char)))
-                  (and (arrayp pass) (clear-string pass))
-                  (clear-string new-char)
-                  (setq c ?\0)
-                  (setq pass new-pass))
-              (if (> (length pass) 0)
-                  (let ((new-pass (substring pass 0 -1)))
-                    (and (arrayp pass) (clear-string pass))
-                    (setq pass new-pass))))))
-        (message nil)
-        (or pass default "")))))
-
 ;; This should be used by `call-interactively' for `n' specs.
 (defun read-number (prompt &optional default)
   (let ((n nil))
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 584056bf30b..28f3d7c3b27 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -451,10 +451,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 a7ca14d1294..06ae4db1d8a 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/vc.el b/lisp/vc.el
index a0d3d1cd4be..15d0258e85d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -953,7 +953,7 @@ that is inserted into the command line before the filename."
               (vc-exec-after
                `(unless (active-minibuffer-window)
                   (message "Running %s in the background... done" ',command))))
-          (setq status (apply 'call-process command nil t nil squeezed))
+          (setq status (apply 'process-file command nil t nil squeezed))
           (when (or (not (integerp status)) (and okstatus (< okstatus status)))
             (pop-to-buffer (current-buffer))
             (goto-char (point-min))
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)