Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

2 files changed, 22 insertions, 4 deletions

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 6e7b2a9a51c..4ac96b2e4b0 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -453,10 +453,22 @@ Do \\[describe-key] on the following bindings to discover what they do.
   ;; recognized.
   (set (make-local-variable 'comment-start-skip) "\\(?:<!\\)?--[ \t]*")
   (set (make-local-variable 'comment-end-skip) "[ \t]*--\\([ \t\n]*>\\)?")
-  ;; This definition probably is not useful in derived modes.
-  (set (make-local-variable 'imenu-generic-expression)
-       (concat "<!\\(element\\|entity\\)[ \t\n]+%?[ \t\n]*\\("
-               sgml-name-re "\\)")))
+  ;; This definition has an HTML leaning but probably fits well for other modes.
+  (setq imenu-generic-expression
+        `((nil
+           ,(concat "<!\\(element\\|entity\\)[ \t\n]+%?[ \t\n]*\\("
+                    sgml-name-re "\\)")
+           2)
+          ("Id"
+           ,(concat "<[^>]+[ \t\n]+[Ii][Dd]=\\(['\"]"
+                    (if sgml-xml-mode "" "?")
+                    "\\)\\(" sgml-name-re "\\)\\1")
+           2)
+          ("Name"
+           ,(concat "<[^>]+[ \t\n]+[Nn][Aa][Mm][Ee]=\\(['\"]"
+                    (if sgml-xml-mode "" "?")
+                    "\\)\\(" sgml-name-re "\\)\\1")
+           2))))
 
 ;; Some programs (such as Glade 2) generate XML which has
 ;; -*- mode: xml -*-.
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 5c5e0a4d1c7..cb5bf24badd 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -468,6 +468,10 @@ An alternative value is \" . \", if you use a font with a narrow period."
            ;; (arg "\\(?:{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)\\|\\\\[a-z*]+\\)"))
            (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
+       ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
+       ;; highlighted as tex-verbatim-face.  Let's undo that.
+       ;; This is ugly and brittle :-(  --Stef
+       '("^\\(\\\\\\)end" (1 (get-text-property (match-end 1) 'face) t))
        ;; display $$ math $$
        ;; We only mark the match between $$ and $$ because the $$ delimiters
        ;; themselves have already been marked (along with $..$) by syntactic
@@ -619,6 +623,8 @@ An alternative value is \" . \", if you use a font with a narrow period."
       ;; 2 - font-lock considers the preceding \n as being part of the
       ;;     preceding line, so things gets screwed every time the previous
       ;;     line is re-font-locked on its own.
+      ;; There's a hack in tex-font-lock-keywords-1 to remove the verbatim
+      ;; face from the \ but C-M-f still jumps to the wrong spot :-(  --Stef
       (,(concat "^\\(\\\\\\)end *{" verbs "}\\(.?\\)") (1 "|") (3 "<"))
       ;; ("^\\(\\\\\\)begin *{comment}" 1 "< b")
       ;; ("^\\\\end *{comment}.*\\(\n\\)" 1 "> b")