Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
   Restore deleted tagline in etc/TUTORIAL.ru

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

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

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

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


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

16 files changed, 484 insertions, 319 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4fd4341c89..16de868d006 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,91 @@
+2004-04-18  Nick Roberts  <nick@nick.uklinux.net>
+
+        * progmodes/gdb-ui.el (gdb-goto-info): Require 'info.
+        (gdb-info-breakpoints-custom): Revert previous change.
+        (gdb-view-assembler): Update assembler if necessary.
+        (gdb-frame-handler): Parse correctly for gdb-current-frame.
+        (gdb-display-source-buffer): Update properly when both source and
+        assembler are visible.
+
+2004-04-17  John Wiegley  <johnw@newartisans.com>
+
+        * iswitchb.el (iswitchb-max-to-show): Added a new config variable
+        which limits the number of names shown in the minibuffer.  Off by
+        default.
+        (iswitchb-completions): Use `iswitchb-max-to-show'.  This speeds
+        up iswitchb for users with a multitude of open buffers by showing
+        only the first and last N/2 buffers in the completion list (which
+        is enough to aid C-s/C-r, and to know that more characters are
+        needed to refine the completion list).
+
+2004-04-17  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (locate-file-completion): Handle nil in path-and-suffixes.
+        (file-truename): Expand all ~ constructs directly.
+        (insert-directory): Delete any error msg output by the
+        `insert-directory-program'.
+
+        * allout.el (allout-mode-exposure-menu, allout-mode-editing-menu):
+        (allout-mode-navigation-menu, allout-mode-misc-menu): New defvars.
+        (allout-prior-bindings, allout-added-bindings): Defvars deleted.
+        (allout-init): Use find-file-hook, not find-file-hooks.
+        (allout-mode): Eliminate Emacs 18 support.
+        Use write-contents-functions, not local-write-file-hooks.
+
+2004-04-17  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * progmodes/compile.el (compilation-error-properties): Fix for
+        adding messages when there are already markers for their file.
+        (compilation-fake-loc): New function.
+
+2004-04-16  Dave Love  <fx@gnu.org>
+
+        * progmodes/python.el (python-compilation-line-number): Fix braindamage.
+        (python-load-file): Fix python-orig-start setting.
+
+        * progmodes/compile.el: Doc fixes.
+        (compilation-error-regexp-alist-alist)
+        (compilation-mode-font-lock-keywords): Allow non-ASCII where possible.
+        (compilation-assq): Wrap in eval-when-compile.
+        (compilation-mode-font-lock-keywords): Don't use list*.
+        (compilation-start): Avoid warning.
+        (compilation-compat-error-properties)
+        (compilation-directory-properties): Add keymap property.
+        (compilation-parsing-end): Make it a marker for better compatibility.
+
+        * progmodes/python.el (python-after-info-look): Use with-no-warnings.
+
+2004-04-16  Mark A. Hershberger  <mah@everybody.org>
+
+        * xml.el: Doc fixes.
+        (xml-get-children): Only looks at sub-tags and ignore strings.
+
+        * xml.el (xml-parse-tag): Avoid overwriting node-name.
+
+2004-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url/url-util.el (url-debug): Use with-current-buffer.
+
+        * url/url-nfs.el (url-nfs-file-attributes): Add id-format parameter.
+        (url-nfs-create-wrapper): Use new backquote syntax.
+
+        * url/url-https.el (url-https-file-attributes): Add id-format param.
+
+        * url/url-http.el (url-http-head-file-attributes)
+        (url-http-file-attributes): Add id-format parameter.
+
+        * url/url-handlers.el: Use new find-file-hook.
+        (url-file-attributes): Add id-format parameter.
+
+        * url/url-file.el (url-file-create-wrapper): Use new backquote syntax.
+        (url-file-file-attributes): Add id-format parameter.
+
+        * url/url-dav.el: Use with-current-buffer.
+        (url-dav-process-response): Fix regexps and spurious quote.
+        (url-dav-file-attributes): Add id-format param.
+
+        * diff-mode.el (diff-end-of-hunk): Be more careful with unified hunks.
+
 2004-04-16  Andre Spiegel  <spiegel@gnu.org>
 
         * vc-hooks.el (vc-default-workfile-unchanged-p): Quote signal.
@@ -9,8 +97,7 @@
         * simple.el (completion-setup-function): Set an initial value
         to `element-common-end' before entering loop. Set a value
         to `element-common-end' at the end of loop.
-        The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel
-        list.
+        The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel list.
         (completions-common-part): Rename from completion-de-emphasis.
         (completions-first-difference): Rename from completion-emphasis.
         Suggested by RMS.
@@ -20,6 +107,12 @@
         * bookmark.el (bookmark-send-edited-annotation): Fix docstring.
         (bookmark-edit-annotation-mode): Add mode name.
 
+2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * smerge-mode.el (smerge-match-conflict): Try to do something sensible
+        for nested conflict markers.
+        (smerge-find-conflict): Better handle errors in smerge-match-conflict.
+
 2004-04-15  Nick Roberts  <nick@nick.uklinux.net>
 
         * progmodes/gdb-ui.el (gdb-goto-info): New function.
@@ -119,7 +212,7 @@
         in addition it also disables menu-bar, tool-bar, scroll-bars,
         tool-tips, and the blinking cursor.
         (command-line-1): Skip startup screen if -Q.
-        (fancy-splash-head): Use :align-to center prop to center splash image.
+        (fancy-splash-head): Use ":align-to center" prop to center splash image.
 
         * emulation/cua-base.el (cua-read-only-cursor-color)
         (cua-overwrite-cursor-color, cua-global-mark-cursor-color): Doc fix.
@@ -154,6 +247,10 @@
         * progmodes/python.el (run-python): Use compilation-shell-minor-mode.
         Set compilation-error-regexp-alist earlier.
 
+        * progmodes/compile.el (compilation-minor-mode-map)
+        (compilation-shell-minor-mode-map, compile-mouse-goto-error)
+        (compile-goto-error): Re-merge the mouse and non-mouse commands.
+
 2004-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/compile.el (compile-goto-error): Select the buffer/window
diff --git a/lisp/allout.el b/lisp/allout.el
index 04dcf88e91c..458db865535 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -83,7 +83,7 @@ dictated by `allout-layout' should be imposed on mode activation.
 
 With value t, auto-mode-activation and auto-layout are enabled.
 \(This also depends on `allout-find-file-hook' being installed in
-`find-file-hooks', which is also done by `allout-init'.)
+`find-file-hook', which is also done by `allout-init'.)
 
 With value `ask', auto-mode-activation is enabled, and endorsement for
 performing auto-layout is asked of the user each time.
@@ -726,17 +726,12 @@ See doc string for allout-keybindings-list for format of binding list."
                               (car (cdr cell)))))))
             keymap-list)
     map))
-;;;_   = allout-prior-bindings - being deprecated.
-(defvar allout-prior-bindings nil
-  "Variable for use in V18, with `allout-added-bindings', for
-resurrecting, on mode deactivation, bindings that existed before
-activation.  Being deprecated.")
-;;;_   = allout-added-bindings - being deprecated
-(defvar allout-added-bindings nil
-  "Variable for use in V18, with `allout-prior-bindings', for
-resurrecting, on mode deactivation, bindings that existed before
-activation.  Being deprecated.")
+
 ;;;_  : Menu bar
+(defvar allout-mode-exposure-menu)
+(defvar allout-mode-editing-menu)
+(defvar allout-mode-navigation-menu)
+(defvar allout-mode-misc-menu)
 (defun produce-allout-mode-menubar-entries ()
   (require 'easymenu)
   (easy-menu-define allout-mode-exposure-menu
@@ -909,7 +904,7 @@ mode from prop-line file-var activation.  Used by `allout-mode' function
 to track repeats.")
 ;;;_   > allout-write-file-hook ()
 (defun allout-write-file-hook ()
-  "In `allout-mode', run as a `local-write-file-hooks' activity.
+  "In `allout-mode', run as a `write-contents-functions' activity.
 
 Currently just sets `allout-during-write-cue', so outline change-protection
 knows to keep inactive during file write."
@@ -950,7 +945,7 @@ the `allout-layout' variable.  (See `allout-layout' and
 `allout-expose-topic' docstrings for more details on auto layout).
 
 `allout-init' works by setting up (or removing)
-`allout-find-file-hook' in `find-file-hooks', and giving
+`allout-find-file-hook' in `find-file-hook', and giving
 `allout-auto-activation' a suitable setting.
 
 To prime your emacs session for full auto-outline operation, include
@@ -979,16 +974,16 @@ the following two lines in your emacs init file:
        (curr-mode 'allout-auto-activation))
 
     (cond ((not mode)
-           (setq find-file-hooks (delq hook find-file-hooks))
+           (setq find-file-hook (delq hook find-file-hook))
            (if (interactive-p)
                (message "Allout outline mode auto-activation inhibited.")))
           ((eq mode 'report)
-           (if (memq hook find-file-hooks)
+           (if (memq hook find-file-hook)
                ;; Just punt and use the reports from each of the modes:
                (allout-init (symbol-value curr-mode))
              (allout-init nil)
              (message "Allout outline mode auto-activation inhibited.")))
-          (t (add-hook 'find-file-hooks hook)
+          (t (add-hook 'find-file-hook hook)
              (set curr-mode             ; `set', not `setq'!
                   (cond ((eq mode 'activate)
                          (message
@@ -1252,19 +1247,6 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                                        ; active state or *de*activation
                                        ; specifically requested:
       (setq allout-explicitly-deactivated t)
-      (if (string-match "^18\." emacs-version)
-                                       ; Revoke those keys that remain
-                                       ; as we set them:
-          (let ((curr-loc (current-local-map)))
-           (mapcar (function
-                    (lambda (cell)
-                      (if (eq (lookup-key curr-loc (car cell))
-                              (car (cdr cell)))
-                          (define-key curr-loc (car cell)
-                            (assq (car cell) allout-prior-bindings)))))
-                   allout-added-bindings)
-           (allout-resumptions 'allout-added-bindings)
-           (allout-resumptions 'allout-prior-bindings)))
 
       (if allout-old-style-prefixes
           (progn
@@ -1273,9 +1255,9 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (allout-resumptions 'selective-display)
       (if (and (boundp 'before-change-functions) before-change-functions)
           (allout-resumptions 'before-change-functions))
-      (setq local-write-file-hooks
-           (delq 'allout-write-file-hook
-                 local-write-file-hooks))
+      (setq write-contents-functions
+            (delq 'allout-write-file-hook
+                  write-contents-functions))
       (allout-resumptions 'paragraph-start)
       (allout-resumptions 'paragraph-separate)
       (allout-resumptions (if (string-match "^18" emacs-version)
@@ -1315,13 +1297,6 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                      (cons '(allout-mode . allout-mode-map)
                            minor-mode-map-alist))))
 
-                                       ; V18 minor-mode key bindings:
-                                       ; Stash record of added bindings
-                                       ; for later revocation:
-        (allout-resumptions 'allout-added-bindings
-                            (list allout-keybindings-list))
-        (allout-resumptions 'allout-prior-bindings
-                            (list (current-local-map)))
                                        ; and add them:
         (use-local-map (produce-allout-mode-map allout-keybindings-list
                                                 (current-local-map)))
@@ -1340,7 +1315,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                                        ; Temporarily set by any outline
                                        ; functions that can be trusted to
                                        ; deal properly with concealed text.
-      (add-hook 'local-write-file-hooks 'allout-write-file-hook)
+      (add-hook 'write-contents-functions 'allout-write-file-hook)
                                        ; Custom auto-fill func, to support
                                        ; respect for topic headline,
                                        ; hanging-indents, etc:
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index f6b2520a112..d41bfcad58a 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -305,7 +305,11 @@ when editing big diffs)."
 (defvar diff-narrowed-to nil)
 
 (defun diff-end-of-hunk (&optional style)
-  (if (looking-at diff-hunk-header-re) (goto-char (match-end 0)))
+  (when (looking-at diff-hunk-header-re)
+    (unless style
+      ;; Especially important for unified (because headers are ambiguous).
+      (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
+    (goto-char (match-end 0)))
   (let ((end (and (re-search-forward (case style
                                        ;; A `unified' header is ambiguous.
                                        (unified (concat "^[^-+# \\]\\|"
diff --git a/lisp/files.el b/lisp/files.el
index be40a0b595e..6a406b6fbf0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -616,6 +616,8 @@ PATH-AND-SUFFIXES is a pair of lists (DIRECTORIES . SUFFIXES)."
           (suffix (concat (regexp-opt (cdr path-and-suffixes) t) "\\'"))
           (string-dir (file-name-directory string)))
       (dolist (dir (car path-and-suffixes))
+        (unless dir
+          (setq dir default-directory))
         (if string-dir (setq dir (expand-file-name string-dir dir)))
         (when (file-directory-p dir)
           (dolist (file (file-name-all-completions
@@ -668,14 +670,17 @@ Do not specify them in other calls."
   ;; PREV-DIRS can be a cons cell whose car is an alist
   ;; of truenames we've just recently computed.
 
-  ;; The last test looks dubious, maybe `+' is meant here?  --simon.
-  (if (or (string= filename "") (string= filename "~")
-          (and (string= (substring filename 0 1) "~")
-               (string-match "~[^/]*" filename)))
-      (progn
-        (setq filename (expand-file-name filename))
-        (if (string= filename "")
-            (setq filename "/"))))
+  (cond ((or (string= filename "") (string= filename "~"))
+         (setq filename (expand-file-name filename))
+         (if (string= filename "")
+             (setq filename "/")))
+        ((and (string= (substring filename 0 1) "~")
+              (string-match "~[^/]*/?" filename))
+         (let ((first-part
+                (substring filename 0 (match-end 0)))
+               (rest (substring filename (match-end 0))))
+           (setq filename (concat (expand-file-name first-part) rest)))))
+
   (or counter (setq counter (list 100)))
   (let (done
         ;; For speed, remove the ange-ftp completion handler from the list.
@@ -4230,7 +4235,7 @@ This works by running a directory listing program
 whose name is in the variable `insert-directory-program'.
 If WILDCARD, it also runs the shell specified by `shell-file-name'.
 
-When SWITCHES contains the long `--dired' option,this function
+When SWITCHES contains the long `--dired' option, this function
 treats it specially, for the sake of dired.  However, the
 normally equivalent short `-D' option is just passed on to
 `insert-directory-program', as any other option."
@@ -4307,6 +4312,8 @@ normally equivalent short `-D' option is just passed on to
 
           ;; If `insert-directory-program' failed, signal an error.
           (unless (eq 0 result)
+            ;; Delete the error message it may have output.
+            (delete-region beg (point))
             ;; On non-Posix systems, we cannot open a directory, so
             ;; don't even try, because that will always result in
             ;; the ubiquitous "Access denied".  Instead, show the
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index aab768387d0..0c43c270751 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -298,6 +298,13 @@ example functions that filter buffernames."
   :type '(repeat (choice regexp function))
   :group 'iswitchb)
 
+(defcustom iswitchb-max-to-show nil
+  "*If non-nil, limit the number of names shown in the minibuffer.
+This can greatly speed up iswitchb if you have a multitude of
+buffers open."
+  :type 'integer
+  :group 'iswitchb)
+
 (defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help
   "*Hook run when `iswitchb-complete' can't complete any more.
 The most useful values are `iswitchb-completion-help', which pops up a
@@ -1185,6 +1192,15 @@ Copied from `icomplete-exhibit' with two changes:
                    contents
                    (not minibuffer-completion-confirm)))))))
 
+(defun iswitchb-output-completion (com)
+  (if (= (length com) most-len)
+      ;; Most is one exact match,
+      ;; note that and leave out
+      ;; for later indication:
+      (ignore
+       (setq most-is-exact t))
+    (substring com most-len)))
+
 (defun iswitchb-completions (name require-match)
   "Return the string that is displayed after the user's text.
 Modified from `icomplete-completions'."
@@ -1224,28 +1240,23 @@ Modified from `icomplete-completions'."
                      "")
                    (if (not iswitchb-use-fonts) " [Matched]")))
           (t                            ;multiple matches
+           (if (and iswitchb-max-to-show
+                    (> (length comps) iswitchb-max-to-show))
+               (setq comps
+                     (append
+                      (subseq comps 0 (/ iswitchb-max-to-show 2))
+                      (list "...")
+                      (subseq comps (- (length comps)
+                                       (/ iswitchb-max-to-show 2))))))
            (let* (
                   ;;(most (try-completion name candidates predicate))
                   (most nil)
                   (most-len (length most))
                   most-is-exact
-                  (alternatives
-                   (apply
-                    (function concat)
-                    (cdr (apply
-                          (function nconc)
-                          (mapcar '(lambda (com)
-                                     (if (= (length com) most-len)
-                                         ;; Most is one exact match,
-                                         ;; note that and leave out
-                                         ;; for later indication:
-                                         (progn
-                                           (setq most-is-exact t)
-                                           ())
-                                       (list ","
-                                             (substring com
-                                                        most-len))))
-                                  comps))))))
+                  (alternatives (if most
+                                    (mapconcat 'iswitchb-output-completion
+                                               comps ",")
+                                  (mapconcat 'identity comps ","))))
 
              (concat
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index ff4256192c4..71946dd02f5 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -100,7 +100,7 @@ in the compilation output, and should return a transformed file name.")
 ;;;###autoload
 (defvar compilation-process-setup-function nil
   "*Function to call to customize the compilation process.
-This functions is called immediately before the compilation process is
+This function is called immediately before the compilation process is
 started.  It can be used to set any variables or functions that are used
 while processing the output of the compilation process.  The function
 is called with variables `compilation-buffer' and `compilation-window'
@@ -187,8 +187,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      "^\\([^( \n\t]+\\)(\\([0-9]+\\):\\([0-9]+\\)) :\
  \\(?:warnin\\(g\\)\\|informationa\\(l\\)\\)?" 1 2 3 (4 . 5))
 
+    ;; fixme: should be `mips'
     (irix
-     "^[a-z0-9/]+: \\(?:[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
+     "^[-[:alnum:]_/]+: \\(?:[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
  \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
 
     (java
@@ -206,7 +207,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
 
     (gnu
-     "^\\(?:[a-zA-Z][-a-zA-Z0-9.]+: ?\\)?\
+     "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
 \\([/.]*[a-zA-Z]:?[^ \t\n:]*\\): ?\
 \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
 \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
@@ -228,6 +229,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
       (1 (compilation-error-properties 2 3 nil nil nil 0 nil)
          append)))
 
+    ;; Should be lint-1, lint-2 (SysV lint)
     (mips-1
      " (\\([0-9]+\\)) in \\([^ \n]+\\)" 2 1)
     (mips-2
@@ -261,15 +263,16 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      nil 1 nil (3) nil (2 (compilation-face '(3))))
 
     (sun
-     ": \\(?:ERROR\\|WARNIN\\(G\\)\\|REMAR\\(K\\)\\) \\(?:[a-zA-Z0-9 ]+, \\)?\
+     ": \\(?:ERROR\\|WARNIN\\(G\\)\\|REMAR\\(K\\)\\) \\(?:[[:alnum:] ]+, \\)?\
 File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      3 4 5 (1 . 2))
 
     (sun-ada
      "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3)
 
-    (ultrix
-     "^\\(?:cfe\\|fort\\): \\(Warning\\)?[^:\n]*: \\([^ \n]*\\), line \\([0-9]+\\):" 2 3 nil (1))
+    ;; Redundant with `mips'
+;;    (ultrix
+;;      "^\\(?:cfe\\|fort\\): \\(Warning\\)?[^:\n]*: \\([^ \n]*\\), line \\([0-9]+\\):" 2 3 nil (1))
 
     (4bsd
      "\\(?:^\\|::  \\|\\S ( \\)\\(/[^ \n\t()]+\\)(\\([0-9]+\\))\
@@ -279,14 +282,14 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
 (defcustom compilation-error-regexp-alist
   (mapcar 'car compilation-error-regexp-alist-alist)
   "Alist that specifies how to match errors in compiler output.
-Note that on Unix exerything is a valid filename, so these
+Note that on Unix everything is a valid filename, so these
 matchers must make some common sense assumptions, which catch
 normal cases.  A shorter list will be lighter on resource usage.
 
 Instead of an alist element, you can use a symbol, which is
 looked up in `compilation-error-regexp-alist-alist'.  You can see
 the predefined symbols and their effects in the file
-`etc/compilation.txt' (linked below if your are customizing this).
+`etc/compilation.txt' (linked below if you are customizing this).
 
 Each elt has the form (REGEXP FILE [LINE COLUMN TYPE HYPERLINK
 HIGHLIGHT...]).  If REGEXP matches, the FILE'th subexpression
@@ -357,7 +360,7 @@ you may also want to change `compilation-page-delimiter'.")
       (1 font-lock-variable-name-face)
       (2 (compilation-face '(4 . 3))))
      ;; Command output lines.  Recognize `make[n]:' lines too.
-     ("^\\([A-Za-z_0-9/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
+     ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
      (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
      ("^Compilation finished" . compilation-info-face)
@@ -427,7 +430,7 @@ You might also use mode hooks to specify it in certain modes, like this:
 (defvar compilation-locs ())
 
 (defvar compilation-debug nil
-  "*Set this to `t' before creating a *compilation* buffer.
+  "*Set this to t before creating a *compilation* buffer.
 Then every error line will have a debug text property with the matcher that
 fit this line and the match data.  Use `describe-text-properties'.")
 
@@ -494,7 +497,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 
 
 ;; Used for compatibility with the old compile.el.
-(defvar compilation-parsing-end nil)
+(defvar compilation-parsing-end (make-marker))
 (defvar compilation-parse-errors-function nil)
 (defvar compilation-error-list nil)
 (defvar compilation-old-error-list nil)
@@ -518,6 +521,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                          '(nil))        ; nil only isn't a property-change
                    (cons (match-string-no-properties idx) dir))
       mouse-face highlight
+      keymap compilation-button-map
       help-echo "mouse-2: visit current directory")))
 
 ;; Data type `reverse-ordered-alist' retriever.  This function retrieves the
@@ -528,6 +532,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 ;; may be nil.  The other KEYs are ordered backwards so that growing line
 ;; numbers can be inserted in front and searching can abort after half the
 ;; list on average.
+(eval-when-compile                  ;Don't keep it at runtime if not needed.
 (defmacro compilation-assq (key alist)
   `(let* ((l1 ,alist)
           (l2 (cdr l1)))
@@ -538,7 +543,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                         l2 (cdr l1)))
                 (if l2 (eq ,key (caar l2))))
               l2
-            (setcdr l1 (cons (list ,key) l2))))))
+            (setcdr l1 (cons (list ,key) l2)))))))
 
 
 ;; This function is the central driver, called when font-locking to gather
@@ -564,7 +569,7 @@ Faces `compilation-error-face', `compilation-warning-face',
             file (or (if file
                          (nth 2 (car (or (get-text-property (1- file) 'message)
                                          (get-text-property file 'message)))))
-                     ;; no previous either -- let font-lock continue
+                     ;; no previous either -- but don't let font-lock fail
                      (gethash (setq file '("*unknown*")) compilation-locs)
                      (puthash file (list file fmt) compilation-locs))))
     ;; All of these fields are optional, get them only if we have an index, and
@@ -581,15 +586,54 @@ Faces `compilation-error-face', `compilation-warning-face',
     (if (and end-col (setq end-col (match-string-no-properties end-col)))
         (setq end-col (- (string-to-number end-col) compilation-first-column))
       (if end-line (setq end-col -1)))
-    (if (consp type)                    ; not a preset type, check what it is.
+    (if (consp type)                    ; not a static type, check what it is.
         (setq type (or (and (car type) (match-end (car type)) 1)
                        (and (cdr type) (match-end (cdr type)) 0)
                        2)))
-    ;; Get any (first) already existing marker (if any has one, all have one).
-    ;; Do this first, as the next assq`s may create new nodes.
-    (let ((marker (nth 3 (car (cdar (cddr file)))))
-          (loc (compilation-assq line (cdr file)))
-          end-loc)
+    ;; Get first already existing marker (if any has one, all have one).
+    ;; Do this first, as the compilation-assq`s may create new nodes.
+    (let* ((marker-line (car (cddr file)))      ; a line structure
+           (marker (nth 3 (cadr marker-line)))  ; its marker
+           (compilation-error-screen-columns compilation-error-screen-columns)
+           end-marker loc end-loc)
+      (if (not (and marker (marker-buffer marker)))
+          (setq marker)                 ; no valid marker for this file
+        (setq loc (or line 1)           ; normalize no linenumber to line 1
+              marker-line)
+        (catch 'marker                  ; find nearest loc, at least one exists
+          (dolist (x (cddr file))       ; loop over lines
+            (if (> (or (car x) 1) loc)  ; still bigger
+                (setq marker-line x)
+              (if (or (not marker-line) ; first in list
+                      (> (- (or (car marker-line) 1) loc)
+                         (- loc (or (car x) 1)))) ; current line is nearer
+                  (setq marker-line x))
+              (throw 'marker t))))
+        (setq marker (nth 3 (cadr marker-line))
+              marker-line (car marker-line))
+        (with-current-buffer (marker-buffer marker)
+          (save-restriction
+            (widen)
+            (goto-char (marker-position marker))
+            (when (or end-col end-line)
+              (beginning-of-line (- (or end-line line) marker-line -1))
+              (if (< end-col 0)
+                  (end-of-line)
+                (if compilation-error-screen-columns
+                    (move-to-column end-col)
+                  (forward-char end-col)))
+              (setq end-marker (list (point-marker))))
+            (beginning-of-line (if end-line
+                                   (- end-line line -1)
+                                 (- loc marker-line -1)))
+            (if col
+                (if compilation-error-screen-columns
+                    (move-to-column col)
+                  (forward-char col))
+              (forward-to-indentation 0))
+            (setq marker (list (point-marker))))))
+
+      (setq loc (compilation-assq line (cdr file)))
       (if end-line
           (setq end-loc (compilation-assq end-line (cdr file))
                 end-loc (compilation-assq end-col end-loc))
@@ -597,44 +641,10 @@ Faces `compilation-error-face', `compilation-warning-face',
             (setq end-loc (compilation-assq end-col loc))))
       (setq loc (compilation-assq col loc))
       ;; If they are new, make the loc(s) reference the file they point to.
-      (or (cdr loc) (setcdr loc (list line file)))
+      (or (cdr loc) (setcdr loc `(,line ,file ,@marker)))
       (if end-loc
-          (or (cdr end-loc) (setcdr end-loc (list (or end-line line) file))))
-      ;; If we'd found a marker, ensure that the new locs also get markers
-      (when (and marker
-                 (not (or (cddr loc) (cddr end-loc))) ; maybe new node w/o marker
-                 (marker-buffer marker)) ; other marker still valid
-        (or line (setq line 1))          ; normalize no linenumber to line 1
-        (catch 'marker                 ; find nearest loc, at least one exists
-          (dolist (x (cddr file))
-            (if (> (or (car x) 1) line)
-                (setq marker x)
-              (if (eq (or (car x) 1) line)
-                  (if (cdr (cddr x))    ; at least one other column
-                      (throw 'marker (setq marker x))
-                    (if marker (throw 'marker t)))
-                (throw 'marker (or marker (setq marker x)))))))
-        (setq marker (if (eq (car (cddr marker)) col)
-                         (nthcdr 3 marker)
-                       (cddr marker))
-              file compilation-error-screen-columns)
-        (with-current-buffer (marker-buffer (cddr marker))
-          (save-restriction
-            (widen)
-            (goto-char (marker-position (cddr marker)))
-            (beginning-of-line (- line (car (cadr marker)) -1))
-            (if file                    ; original c.-error-screen-columns
-                (move-to-column (car loc))
-              (forward-char (car loc)))
-            (setcdr (cdr loc) (point-marker))
-            (when end-loc
-              (beginning-of-line (- end-line line -1))
-              (if (< end-col 0)
-                  (end-of-line)
-                (if file                ; original c.-error-screen-columns
-                    (move-to-column (car end-loc))
-                  (forward-char (car end-loc))))
-              (setcdr (cdr end-loc) (point-marker))))))
+          (or (cdr end-loc) (setcdr end-loc `(,(or end-line line) ,file ,@end-marker))))
+
       ;; Must start with face
       `(face ,compilation-message-face
              message (,loc ,type ,end-loc)
@@ -686,9 +696,9 @@ Faces `compilation-error-face', `compilation-warning-face',
               ;; error location.  Let's do our best.
               `(,(car item)
                 (0 (compilation-compat-error-properties
-                    (funcall ',line (list* (match-string ,file)
-                                           default-directory
-                                           ',(nthcdr 4 item))
+                    (funcall ',line (cons (match-string ,file)
+                                          (cons default-directory
+                                                ',(nthcdr 4 item)))
                              ,(if col `(match-string ,col)))))
                 (,file compilation-error-face t))
 
@@ -729,7 +739,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 Runs COMMAND, a shell command, in a separate process asynchronously
 with output going to the buffer `*compilation*'.
 
-If optional second arg COMINT is t the buffer will be in comint mode with
+If optional second arg COMINT is t the buffer will be in Comint mode with
 `compilation-shell-minor-mode'.
 
 You can then use the command \\[next-error] to find the next error message
@@ -762,8 +772,8 @@ to a function that generates a unique name."
 ;; run compile with the default command line
 (defun recompile ()
   "Re-compile the program including the current buffer.
-If this is run in a compilation-mode buffer, re-use the arguments from the
-original use.  Otherwise, it recompiles using `compile-command'."
+If this is run in a Compilation mode buffer, re-use the arguments from the
+original use.  Otherwise, recompile using `compile-command'."
   (interactive)
   (save-some-buffers (not compilation-ask-about-save) nil)
   (let ((default-directory (or compilation-directory default-directory)))
@@ -773,9 +783,9 @@ original use.  Otherwise, it recompiles using `compile-command'."
 (defcustom compilation-scroll-output nil
   "*Non-nil to scroll the *compilation* buffer window as output appears.
 
-Setting it causes the compilation-mode commands to put point at the
+Setting it causes the Compilation mode commands to put point at the
 end of their output window so that the end of the output is always
-visible rather than the begining."
+visible rather than the beginning."
   :type 'boolean
   :version "20.3"
   :group 'compilation)
@@ -822,11 +832,11 @@ Otherwise, construct a buffer name from MODE-NAME."
 The rest of the arguments are optional; for them, nil means use the default.
 
 MODE is the major mode to set in the compilation buffer.  Mode
-may also be `t' meaning `compilation-shell-minor-mode' under `comint-mode'.
+may also be t meaning use `compilation-shell-minor-mode' under `comint-mode'.
 NAME-FUNCTION is a function called to name the buffer.
 
 If HIGHLIGHT-REGEXP is non-nil, `next-error' will temporarily highlight
-matching section of the visited source line; the default is to use the
+the matching section of the visited source line; the default is to use the
 global value of `compilation-highlight-regexp'.
 
 Returns the compilation buffer created."
@@ -838,8 +848,8 @@ Returns the compilation buffer created."
         (process-environment
          (append
           compilation-environment
-          (if (and (boundp 'system-uses-terminfo)
-                   system-uses-terminfo)
+          (if (if (boundp 'system-uses-terminfo) ; `if' for compiler warning
+                  system-uses-terminfo)
               (list "TERM=dumb" "TERMCAP="
                     (format "COLUMNS=%d" (window-width)))
             (list "TERM=emacs"
@@ -1136,7 +1146,9 @@ The global commands next/previous/first-error/goto-error use this.")
 (defconst compilation-turn-on-font-lock 'turn-on-font-lock)
 
 (defun compilation-setup (&optional minor)
-  "Prepare the buffer for the compilation parsing commands to work."
+  "Prepare the buffer for the compilation parsing commands to work.
+Optional argument MINOR indicates this is called from
+`compilation-minor-mode'."
   (make-local-variable 'compilation-current-error)
   (make-local-variable 'compilation-error-screen-columns)
   (make-local-variable 'overlay-arrow-position)
@@ -1145,7 +1157,7 @@ The global commands next/previous/first-error/goto-error use this.")
        '(directory message help-echo mouse-face debug))
   (set (make-local-variable 'compilation-locs)
        (make-hash-table :test 'equal :weakness 'value))
-  ;; lazy-lock would never find the message unless it's scrolled to
+  ;; lazy-lock would never find the message unless it's scrolled to.
   ;; jit-lock might fontify some things too late.
   (set (make-local-variable 'font-lock-support-mode) nil)
   (set (make-local-variable 'font-lock-maximum-size) nil)
@@ -1193,7 +1205,7 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'."
     (font-lock-fontify-buffer)))
 
 (defun compilation-handle-exit (process-status exit-status msg)
-  "Write msg in the current buffer and hack its mode-line-process."
+  "Write MSG in the current buffer and hack its mode-line-process."
   (let ((buffer-read-only nil)
         (status (if compilation-exit-message-function
                     (funcall compilation-exit-message-function
@@ -1338,7 +1350,7 @@ select the source buffer."
   (pop-to-buffer compilation-last-buffer))
 
 (defun previous-error-no-select (n)
-  "Move point to the previous error in the compilation buffer and highlight match.
+  "Move point to previous error in compilation buffer and highlight match.
 Prefix arg N says how many error messages to move backwards (or
 forwards, if negative).
 Finds and highlights the source line like \\[previous-error], but does not
@@ -1449,7 +1461,7 @@ See variable `compilation-error-regexp-alist' for customization ideas."
     ;; If loc contains no marker, no error in that file has been visited.  If
     ;; the marker is invalid the buffer has been killed.  So, recalculate all
     ;; markers for that file.
-    (unless (and (nthcdr 3 loc) (marker-buffer (nth 3 loc)))
+    (unless (and (nth 3 loc) (marker-buffer (nth 3 loc)))
       (with-current-buffer (compilation-find-file marker (caar (nth 2 loc))
                                                   (or (cdar (nth 2 loc))
                                                       default-directory))
@@ -1472,7 +1484,7 @@ See variable `compilation-error-regexp-alist' for customization ideas."
                       (forward-char (car col))))
                 (beginning-of-line)
                 (skip-chars-forward " \t"))
-              (if (nthcdr 3 col)
+              (if (nth 3 col)
                   (set-marker (nth 3 col) (point))
                 (setcdr (nthcdr 2 col) `(,(point-marker)))))))))
     (compilation-goto-locus marker (nth 3 loc) (nth 3 end-loc))
@@ -1499,6 +1511,32 @@ This operates on the output from the \\[compile] command."
   (setq compilation-current-error nil)
   (next-error n))
 
+(defun compilation-fake-loc (marker file &optional line col)
+  "Preassociate MARKER with FILE.
+This is useful when you compile temporary files, but want
+automatic translation of the messages to the real buffer from
+which the temporary file came.  This only works if done before a
+message about FILE appears!
+
+Optional args LINE and COL default to 1 and beginning of
+indentation respectively.  The marker is expected to reflect
+this.  In the simplest case the marker points to the first line
+of the region that was saved to the temp file.
+
+If you concatenate several regions into the temp file (e.g. a
+header with variable assignments and a code region), you must
+call this several times, once each for the last line of one
+region and the first line of the next region."
+  (or (consp file) (setq file (list file)))
+  (setq file (or (gethash file compilation-locs)
+                 (puthash file (list file nil) compilation-locs)))
+  (let ((loc (compilation-assq (or line 1) (cdr file))))
+    (setq loc (compilation-assq col loc))
+    (if (cdr loc)
+        (setcdr (cddr loc) (list marker))
+      (setcdr loc (list (or line 1) file marker)))
+    loc))
+
 (defcustom compilation-context-lines next-screen-context-lines
   "*Display this many lines of leading context before message."
   :type 'integer
@@ -1506,7 +1544,7 @@ This operates on the output from the \\[compile] command."
   :version "21.4")
 
 (defsubst compilation-set-window (w mk)
-  ;; Align the compilation output window W with marker MK near top.
+  "Align the compilation output window W with marker MK near top."
   (set-window-start w (save-excursion
                         (goto-char mk)
                         (beginning-of-line (- 1 compilation-context-lines))
@@ -1514,8 +1552,8 @@ This operates on the output from the \\[compile] command."
   (set-window-point w mk))
 
 (defun compilation-goto-locus (msg mk end-mk)
-  "Jump to an error MESSAGE and SOURCE.
-All arguments are markers.  If SOURCE-END is non nil, mark is set there."
+  "Jump to an error corresponding to MSG at MK.
+All arguments are markers.  If END-MK is non nil, mark is set there."
   (if (eq (window-buffer (selected-window))
           (marker-buffer msg))
       ;; If the compilation buffer window is selected,
@@ -1623,7 +1661,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
       buffer)))
 
 (defun compilation-normalize-filename (filename)
-  "Convert a filename string found in an error message to make it usable."
+  "Convert FILENAME string found in an error message to make it usable."
 
   ;; Check for a comint-file-name-prefix and prepend it if
   ;; appropriate.  (This is very useful for
@@ -1691,7 +1729,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
 (defun compile-buffer-substring (n) (if n (match-string n)))
 
 (defun compilation-compat-error-properties (err)
-  ;; Map old-style ERROR to new-style MESSAGE.
+  "Map old-style error ERR to new-style message."
   (let* ((dst (cdr err))
          (loc (cond ((markerp dst) (list nil nil nil dst))
                     ((consp dst)
@@ -1701,6 +1739,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
     `(face nil
       message ,(list loc 2)
       help-echo "mouse-2: visit the source location"
+      keymap compilation-button-map
       mouse-face highlight)))
 
 (defun compilation-compat-parse-errors (limit)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 8446266b2f3..b33f8f3f239 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -222,6 +222,7 @@ speedbar."
 (defun gdb-goto-info ()
   (interactive)
   (select-frame (make-frame))
+  (require 'info)
   (Info-goto-node "(emacs)GDB Graphical Interface"))
 
 (defconst gdb-var-create-regexp
@@ -688,9 +689,9 @@ This filter may simply queue output for a later time."
          (string-to-int (match-string 2 args))))
   (setq gdb-current-address (match-string 3 args))
   (setq gdb-view-source t)
-;; cover for auto-display output which comes *before*
-;; stopped annotation
-    (if (eq (gdb-get-output-sink) 'inferior) (gdb-set-output-sink 'user)))
+  ;; cover for auto-display output which comes *before*
+  ;; stopped annotation
+  (if (eq (gdb-get-output-sink) 'inferior) (gdb-set-output-sink 'user)))
 
 (defun gdb-send-item (item)
   (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
@@ -1112,7 +1113,8 @@ static char *magick[] = {
                           (save-excursion
                             (goto-line (string-to-number line))
                             (gdb-put-breakpoint-icon (eq flag ?y)))))))))
-          (end-of-line))))))
+          (end-of-line)))))
+  (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
 
 (defun gdb-mouse-toggle-breakpoint (event)
   "Toggle breakpoint with mouse click in left margin."
@@ -1532,11 +1534,9 @@ the source buffer."
 
 (defun gdb-display-source-buffer (buffer)
   (if (eq gdb-selected-view 'source)
-      (progn
         (gdb-display-buffer buffer)
-        (get-buffer-window buffer))
-    (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer))
-    nil))
+    (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer)))
+    (get-buffer-window buffer))
 
 
 ;;; Shared keymap initialization:
@@ -1612,6 +1612,7 @@ the source buffer."
 (defun gdb-view-assembler()
   (interactive)
   (gdb-display-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
+  (gdb-invalidate-assembler)
   (setq gdb-selected-view 'assembler))
 
 ;(defun gdb-view-both()
@@ -1964,7 +1965,7 @@ BUFFER nil or omitted means use the current buffer."
   (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
     (goto-char (point-min))
     (forward-line)
-    (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*\\)")
+    (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ")
         (progn
           (setq gdb-current-frame (match-string 2))
           (let ((address (match-string 1)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index bfa507b851a..7a7e62d06ee 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003, 04  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
+;; Maintainer: FSF
 ;; Created: Nov 2003
 ;; Keywords: languages
 
@@ -66,10 +67,8 @@
 (require 'comint)
 (eval-when-compile
   (require 'compile)
-  (autoload 'Info-last "info")
-  (autoload 'Info-exit "info")
   (autoload 'info-lookup-maybe-add-help "info-look"))
-(autoload 'compilation-start "compile") ; spurious compiler warning anyway
+(autoload 'compilation-start "compile")
 
 (defgroup python nil
   "Silly walks in the Python language"
@@ -829,7 +828,8 @@ move and return nil.  Otherwise return t."
 Makes nested Imenu menus from nested `class' and `def' statements.
 The nested menus are headed by an item referencing the outer
 definition; it has a space prepended to the name so that it sorts
-first with `imenu--sort-by-name'."
+first with `imenu--sort-by-name' (though, unfortunately, sub-menus
+precede it)."
   (unless (boundp 'python-recursing)            ; dynamically bound below
     (goto-char (point-min)))            ; normal call from Imenu
   (let (index-alist                     ; accumulated value to return
@@ -937,32 +937,37 @@ Additional arguments are added when the command is used by `run-python'
 et al.")
 
 (defvar python-buffer nil
-  "*The current python process buffer.
-To run multiple Python processes, start the first with \\[run-python].
-It will be in a buffer named *Python*.  Rename that with
-\\[rename-buffer].  Now start a new process with \\[run-python].  It
-will be in a new buffer, named *Python*.  Switch between the different
-process buffers with \\[switch-to-buffer].
-
-Commands that send text from source buffers to Python processes have
-to choose a process to send to.  This is determined by global variable
-`python-buffer'.  Suppose you have three inferior Pythons running:
-    Buffer      Process
-    foo         python
-    bar         python<2>
-    *Python*    python<3>
-If you do a \\[python-send-region-and-go] command on some Python source
-code, what process does it go to?
-
-- In a process buffer (foo, bar, or *Python*), send it to that process.
-- In some other buffer (e.g. a source file), send it to the process
-  attached to `python-buffer'.
-Process selection is done by function `python-proc'.
-
-Whenever \\[run-python] starts a new process, it resets `python-buffer'
-to be the new process's buffer.  If you only run one process, this will
-do the right thing.  If you run multiple processes, you can change
-`python-buffer' to another process buffer with \\[set-variable].")
+  "The current python process buffer."
+  ;; Fixme: a single process is currently assumed, so that this doc
+  ;; is misleading.
+
+;;   "*The current python process buffer.
+;; To run multiple Python processes, start the first with \\[run-python].
+;; It will be in a buffer named *Python*.  Rename that with
+;; \\[rename-buffer].  Now start a new process with \\[run-python].  It
+;; will be in a new buffer, named *Python*.  Switch between the different
+;; process buffers with \\[switch-to-buffer].
+
+;; Commands that send text from source buffers to Python processes have
+;; to choose a process to send to.  This is determined by global variable
+;; `python-buffer'.  Suppose you have three inferior Pythons running:
+;;     Buffer   Process
+;;     foo              python
+;;     bar              python<2>
+;;     *Python*    python<3>
+;; If you do a \\[python-send-region-and-go] command on some Python source
+;; code, what process does it go to?
+
+;; - In a process buffer (foo, bar, or *Python*), send it to that process.
+;; - In some other buffer (e.g. a source file), send it to the process
+;;   attached to `python-buffer'.
+;; Process selection is done by function `python-proc'.
+
+;; Whenever \\[run-python] starts a new process, it resets `python-buffer'
+;; to be the new process's buffer.  If you only run one process, this will
+;; do the right thing.  If you run multiple processes, you can change
+;; `python-buffer' to another process buffer with \\[set-variable]."
+  )
 
 (defconst python-compilation-regexp-alist
   `((,(rx (and line-start (1+ (any " \t")) "File \""
@@ -971,6 +976,9 @@ do the right thing.  If you run multiple processes, you can change
      1 python-compilation-line-number))
   "`compilation-error-regexp-alist' for inferior Python.")
 
+;; Fixme: This should inherit some stuff from python-mode, but I'm not
+;; sure how much: at least some keybindings, like C-c C-f; syntax?;
+;; font-locking, e.g. for triple-quoted strings?
 (define-derived-mode inferior-python-mode comint-mode "Inferior Python"
   "Major mode for interacting with an inferior Python process.
 A Python process can be started with \\[run-python].
@@ -997,7 +1005,8 @@ For running multiple processes in multiple buffers, see `python-buffer'.
   (add-hook 'comint-input-filter-functions 'python-input-filter nil t)
   (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter
             nil t)
-  ;; Still required by `comint-redirect-send-command', for instance:
+  ;; Still required by `comint-redirect-send-command', for instance
+  ;; (and we need to match things like `>>> ... >>> '):
   (set (make-local-variable 'comint-prompt-regexp) "^\\([>.]\\{3\\} \\)+")
   (set (make-local-variable 'compilation-error-regexp-alist)
        python-compilation-regexp-alist)
@@ -1037,11 +1046,15 @@ Used as line-number hook function in `python-compilation-regexp-alist'."
     (cons (point-marker)
           (if (and (markerp python-orig-start)
                    (marker-buffer python-orig-start))
-              (with-current-buffer (marker-buffer python-orig-start)
-                (goto-char python-orig-start)
-                (forward-line (1- line)))
-            (list (if (stringp python-orig-start) python-orig-start file)
-                  line nil)))))
+              (let ((start python-orig-start))
+                (with-current-buffer (marker-buffer python-orig-start)
+                  (goto-char start)
+                  (forward-line (1- line))
+                  (point-marker)))
+            (list (if (stringp python-orig-start)
+                      (list python-orig-start default-directory)
+                    file)
+                  line col)))))
 
 (defvar python-preoutput-result nil
   "Data from output line last `_emacs_out' line seen by the preoutput filter.")
@@ -1234,17 +1247,17 @@ module-qualified names."
         ;; (set (make-local-variable 'compilation-old-error-list) nil)
         (let ((comint-input-filter-functions
                (delete 'python-input-filter comint-input-filter-functions)))
+          (set (make-local-variable 'python-orig-start) nil)
+          ;; Fixme: I'm not convinced by this logic from python-mode.el.
           (python-send-string
            (if (string-match "\\.py\\'" file-name)
                ;; Fixme: make sure the directory is in the path list
                (let ((module (file-name-sans-extension
                               (file-name-nondirectory file-name))))
-                 (set (make-local-variable 'python-orig-start) nil)
                  (format "\
 if globals().has_key(%S): reload(%s)
 else: import %s
 " module module module))
-             (set (make-local-variable 'python-orig-start) file-name)
              (format "execfile('%s')" file-name))))
         (set-marker compilation-parsing-end end)
         (setq compilation-last-buffer (current-buffer))))))
@@ -1329,13 +1342,14 @@ Used with `eval-after-load'."
                     (string-match "^Python \\([0-9]+\\.[0-9]+\\>\\)" s)
                     (match-string 1 s)))
          ;; Whether info files have a Python version suffix, e.g. in Debian.
-         (versioned
+         (versioned 
           (with-temp-buffer
-            (Info-mode)
+            (with-no-warnings (Info-mode))
             (condition-case ()
                 ;; Don't use `info' because it would pop-up a *info* buffer.
-                (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
-                                        version))
+                (with-no-warnings
+                 (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
+                                         version)))
               (error nil)))))
     (info-lookup-maybe-add-help
      :mode 'python-mode
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index b54d9f52c01..d6c5ffffa43 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -386,8 +386,7 @@ XML document."
         (overall-status nil))
     (when buffer
       (unwind-protect
-          (save-excursion
-            (set-buffer buffer)
+          (with-current-buffer buffer
             (goto-char url-http-end-of-headers)
             (setq overall-status url-http-response-status)
 
@@ -396,13 +395,13 @@ XML document."
             ;; them.
             (if (and
                  url-http-content-type
-                 (or (string-match "^text/xml" url-http-content-type)
-                     (string-match "^application/xml" url-http-content-type)))
+                 (string-match "\\`\\(text\\|application\\)/xml"
+                               url-http-content-type))
                 (setq tree (xml-parse-region (point) (point-max)))))
         ;; Clean up after ourselves.
-        '(kill-buffer buffer)))
+        (kill-buffer buffer)))
 
-    ;; We should now be 
+    ;; We should now be
     (if (eq (xml-node-name (car tree)) 'DAV:multistatus)
         (url-dav-dispatch-node (car tree))
       (url-debug 'dav "Got back singleton response for URL(%S)" url)
@@ -577,8 +576,7 @@ Returns t iff the lock was successfully released."
          (result nil))
     (when buffer
       (unwind-protect
-          (save-excursion
-            (set-buffer buffer)
+          (with-current-buffer buffer
             (setq result (url-dav-http-success-p url-http-response-status)))
         (kill-buffer buffer)))
     result))
@@ -627,7 +625,7 @@ Returns t iff the lock was successfully released."
 (autoload 'url-http-head-file-attributes "url-http")
 
 ;;;###autoload
-(defun url-dav-file-attributes (url)
+(defun url-dav-file-attributes (url &optional id-format)
   (let ((properties (cdar (url-dav-get-properties url)))
         (attributes nil))
     (if (and properties
@@ -679,7 +677,7 @@ Returns t iff the lock was successfully released."
                ;; device number - meaningless
                nil))
       ;; Fall back to just the normal http way of doing things.
-      (setq attributes (url-http-head-file-attributes url)))
+      (setq attributes (url-http-head-file-attributes url id-format)))
     attributes))
 
 ;;;###autoload
@@ -695,8 +693,7 @@ OBJ may be a buffer or a string."
         (url-request-data
          (cond
           ((bufferp obj)
-           (save-excursion
-             (set-buffer obj)
+           (with-current-buffer obj
              (buffer-string)))
           ((stringp obj)
            obj)
@@ -719,8 +716,7 @@ OBJ may be a buffer or a string."
     ;; Sanity checking
     (when buffer
       (unwind-protect
-          (save-excursion
-            (set-buffer buffer)
+          (with-current-buffer buffer
             (setq result (url-dav-http-success-p url-http-response-status)))
         (kill-buffer buffer)))
     result))
@@ -849,8 +845,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
          (result nil))
     (when buffer
       (unwind-protect
-          (save-excursion
-            (set-buffer buffer)
+          (with-current-buffer buffer
             (case url-http-response-status
               (201                      ; Collection created in its entirety
                (setq result t))
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 4dfac46b651..77c2e74555f 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -220,14 +220,14 @@ to them."
     buffer))
 
 (defmacro url-file-create-wrapper (method args)
-  (` (defalias (quote (, (intern (format "url-ftp-%s" method))))
-       (defun (, (intern (format "url-file-%s" method))) (, args)
-         (, (format "FTP/FILE URL wrapper around `%s' call." method))
-         (setq url (url-file-build-filename url))
-         (and url ((, method) (,@ (remove '&rest (remove '&optional args)))))))))
+  `(defalias ',(intern (format "url-ftp-%s" method))
+     (defun ,(intern (format "url-file-%s" method)) ,args
+       ,(format "FTP/FILE URL wrapper around `%s' call." method)
+       (setq url (url-file-build-filename url))
+       (and url (,method ,@(remove '&rest (remove '&optional args)))))))
 
 (url-file-create-wrapper file-exists-p (url))
-(url-file-create-wrapper file-attributes (url))
+(url-file-create-wrapper file-attributes (url &optional id-format))
 (url-file-create-wrapper file-symlink-p (url))
 (url-file-create-wrapper file-readable-p (url))
 (url-file-create-wrapper file-writable-p (url))
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index eb0bec9ae92..6c540e8d61b 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -225,7 +225,7 @@ accessible."
                 ,@(remove '&rest (remove '&optional args))))))
 
 (url-handlers-create-wrapper file-exists-p (url))
-(url-handlers-create-wrapper file-attributes (url))
+(url-handlers-create-wrapper file-attributes (url &optional id-format))
 (url-handlers-create-wrapper file-symlink-p (url))
 (url-handlers-create-wrapper file-writable-p (url))
 (url-handlers-create-wrapper file-directory-p (url))
@@ -244,7 +244,7 @@ accessible."
   (url-handlers-create-wrapper
    file-truename (url &optional counter prev-dirs)))
 
-(add-hook 'find-file-hooks 'url-handlers-set-buffer-mode)
+(add-hook 'find-file-hook 'url-handlers-set-buffer-mode)
 
 (defun url-handlers-set-buffer-mode ()
   "Set correct modes for the current buffer if visiting a remote file."
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b2f797d09c7..200025c3804 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -4,6 +4,7 @@
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
+
 ;; This file is part of GNU Emacs.
 ;;
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -1120,7 +1121,7 @@ CBARGS as the arguments."
 ;;;###autoload
 (defalias 'url-http-file-readable-p 'url-http-file-exists-p)
 
-(defun url-http-head-file-attributes (url)
+(defun url-http-head-file-attributes (url &optional id-format)
   (let ((buffer (url-http-head url))
         (attributes nil))
     (when buffer
@@ -1136,10 +1137,10 @@ CBARGS as the arguments."
     attributes))
 
 ;;;###autoload
-(defun url-http-file-attributes (url)
+(defun url-http-file-attributes (url &optional id-format)
   (if (url-dav-supported-p url)
-      (url-dav-file-attributes url)
-    (url-http-head-file-attributes url)))
+      (url-dav-file-attributes url id-format)
+    (url-http-head-file-attributes url id-format)))
 
 ;;;###autoload
 (defun url-http-options (url)
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
index 0ea11a45b79..11b2593ea80 100644
--- a/lisp/url/url-https.el
+++ b/lisp/url/url-https.el
@@ -1,26 +1,29 @@
 ;;; url-https.el --- HTTP over SSL routines
+
+;; Copyright (c) 1999, 2004 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1999 Free Software Foundation, Inc.
-;;;
-;;; 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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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:
+
+;;; Code:
 
 (require 'url-gw)
 (require 'url-util)
@@ -45,8 +48,9 @@
 (url-https-create-secure-wrapper nil (url callback cbargs))
 (url-https-create-secure-wrapper file-exists-p (url))
 (url-https-create-secure-wrapper file-readable-p (url))
-(url-https-create-secure-wrapper file-attributes (url))
+(url-https-create-secure-wrapper file-attributes (url &optional id-format))
 
 (provide 'url-https)
 
-;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19
+;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19
+;;; url-https.el ends here
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index c0ac4f5cb45..d068341b1c2 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,27 +1,30 @@
 ;;; url-nfs.el --- NFS URL interface
+
+;; Copyright (c) 1996,97,98,1999,2004  Free Software Foundation, Inc.
+;; Copyright (c) 1996 by William M. Perry <wmperry@cs.indiana.edu>
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 by William M. Perry <wmperry@cs.indiana.edu>
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; 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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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:
+
+;;; Code:
 
 (eval-when-compile (require 'cl))
 (require 'url-parse)
@@ -72,14 +75,14 @@ Each can be used any number of times.")
   (url-file (url-nfs-build-filename url) callback cbargs))
 
 (defmacro url-nfs-create-wrapper (method args)
-  (` (defun (, (intern (format "url-nfs-%s" method))) (, args)
-       (, (format "NFS URL wrapper around `%s' call." method))
-       (setq url (url-nfs-build-filename url))
-       (and url ((, (intern (format "url-file-%s" method)))
-                 (,@ (remove '&rest (remove '&optional args))))))))
+  `(defun ,(intern (format "url-nfs-%s" method)) ,args
+     ,(format "NFS URL wrapper around `%s' call." method)
+     (setq url (url-nfs-build-filename url))
+     (and url (,(intern (format "url-file-%s" method))
+               ,@(remove '&rest (remove '&optional args))))))
 
 (url-nfs-create-wrapper file-exists-p (url))
-(url-nfs-create-wrapper file-attributes (url))
+(url-nfs-create-wrapper file-attributes (url &optional id-format))
 (url-nfs-create-wrapper file-symlink-p (url))
 (url-nfs-create-wrapper file-readable-p (url))
 (url-nfs-create-wrapper file-writable-p (url))
@@ -93,4 +96,5 @@ Each can be used any number of times.")
 
 (provide 'url-nfs)
 
-;;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
+;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
+;;; url-nfs.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 49e805086fb..d4a3733eab5 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,28 +1,31 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
+
+;; Copyright (c) 1996,97,98,99,2001,2004  Free Software Foundation, Inc.
+;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu>
+
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu>
-;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc.
-;;;
-;;; 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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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:
+
+;;; Code:
 
 (require 'url-parse)
 (autoload 'timezone-parse-date "timezone")
@@ -63,8 +66,7 @@ If a list, it is a list of the types of messages to be logged."
   (if (or (eq url-debug t)
           (numberp url-debug)
           (and (listp url-debug) (memq tag url-debug)))
-      (save-excursion
-        (set-buffer (get-buffer-create "*URL-DEBUG*"))
+      (with-current-buffer (get-buffer-create "*URL-DEBUG*")
         (goto-char (point-max))
         (insert (symbol-name tag) " -> " (apply 'format args) "\n")
         (if (numberp url-debug)
@@ -173,7 +175,7 @@ Strips out default port numbers, etc."
 ;;;###autoload
 (defun url-lazy-message (&rest args)
   "Just like `message', but is a no-op if called more than once a second.
-Will not do anything if url-show-status is nil."
+Will not do anything if `url-show-status' is nil."
   (if (or (null url-show-status)
           (active-minibuffer-window)
           (= url-lazy-message-time
@@ -502,4 +504,5 @@ Has a preference for looking backward when not directly on a symbol."
 
 (provide 'url-util)
 
-;;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9
+;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9
+;;; url-util.el ends here
diff --git a/lisp/xml.el b/lisp/xml.el
index 408c13ab39b..ab87125356d 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -27,13 +27,13 @@
 
 ;; This file contains a somewhat incomplete non-validating XML parser.  It
 ;; parses a file, and returns a list that can be used internally by
-;; any other lisp libraries.
+;; any other Lisp libraries.
 
 ;;; FILE FORMAT
 
 ;; The document type declaration may either be ignored or (optionally)
 ;; parsed, but currently the parsing will only accept element
-;; declarations.  The XML file is assumed to be well-formed. In case
+;; declarations.  The XML file is assumed to be well-formed.  In case
 ;; of error, the parsing stops and the XML file is shown where the
 ;; parsing stopped.
 ;;
@@ -44,7 +44,7 @@
 ;;       <node2 attr3="name3" attr4="name4">value2</node2>
 ;;       <node3 attr5="name5" attr6="name6">value3</node3>
 ;;    </node1>
-;; Of course, the name of the nodes and attributes can be anything. There can
+;; Of course, the name of the nodes and attributes can be anything.  There can
 ;; be any number of attributes (or none), as well as any number of children
 ;; below the nodes.
 ;;
@@ -86,7 +86,18 @@
 
 (defsubst xml-node-name (node)
   "Return the tag associated with NODE.
-The tag is a lower-case symbol."
+Without namespace-aware parsing, the tag is a symbol.
+
+With namespace-aware parsing, the tag is a cons of a string
+representing the uri of the namespace with the local name of the
+tag.  For example,
+
+    <foo>
+
+would be represented by
+
+    '(\"\" . \"foo\")."
+
   (car node))
 
 (defsubst xml-node-attributes (node)
@@ -101,17 +112,17 @@ This is a list of nodes, and it can be nil."
 
 (defun xml-get-children (node child-name)
   "Return the children of NODE whose tag is CHILD-NAME.
-CHILD-NAME should be a lower case symbol."
+CHILD-NAME should match the value returned by `xml-node-name'."
   (let ((match ()))
     (dolist (child (xml-node-children node))
-      (if child
-          (if (equal (xml-node-name child) child-name)
-              (push child match))))
+      (if (and (listp child)
+               (equal (xml-node-name child) child-name))
+          (push child match)))
     (nreverse match)))
 
 (defun xml-get-attribute-or-nil (node attribute)
   "Get from NODE the value of ATTRIBUTE.
-Return `nil' if the attribute was not found.
+Return nil if the attribute was not found.
 
 See also `xml-get-attribute'."
   (cdr (assoc attribute (xml-node-attributes node))))
@@ -236,7 +247,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
             (nreverse xml)))))))
 
 (defun xml-maybe-do-ns (name default xml-ns)
-  "Perform any namespace expansion.  NAME is the name to perform the expansion on.
+  "Perform any namespace expansion.
+NAME is the name to perform the expansion on.
 DEFAULT is the default namespace.  XML-NS is a cons of namespace
 names to uris.  When namespace-aware parsing is off, then XML-NS
 is nil.
@@ -325,10 +337,8 @@ Returns one of:
               (push (cons (cdar attr) (intern (concat ":" (cdr attr))))
                     xml-ns))))
 
-        ;; expand element names
-        (setq node-name (list (xml-maybe-do-ns node-name "" xml-ns)))
+        (setq children (list attrs (xml-maybe-do-ns node-name "" xml-ns)))
 
-        (setq children (list attrs node-name))
         ;; is this an empty element ?
         (if (looking-at "/>")
         (progn
@@ -383,8 +393,8 @@ Returns one of:
       (error "XML: Invalid character")))))
 
 (defun xml-parse-attlist (&optional xml-ns)
-  "Return the attribute-list after point.  Leave point at the
-first non-blank character after the tag."
+  "Return the attribute-list after point.
+Leave point at the first non-blank character after the tag."
   (let ((attlist ())
         end-pos name)
     (skip-syntax-forward " ")
@@ -575,7 +585,7 @@ This follows the rule [28] in the XML specifications."
 
 ;; Fixme:  Take declared entities from the DTD when they're available.
 (defun xml-substitute-entity (match)
-  "Subroutine of xml-substitute-special."
+  "Subroutine of `xml-substitute-special'."
   (save-match-data
     (let ((match1 (match-string 1 str)))
       (cond ((string= match1 "lt") "<")