[Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el

[Daniel Pfeiffer]

Index: emacs/lisp/textmodes/sgml-mode.el
diff -c emacs/lisp/textmodes/sgml-mode.el:1.99 
emacs/lisp/textmodes/sgml-mode.el:1.100
*** emacs/lisp/textmodes/sgml-mode.el:1.99      Mon Sep  1 15:45:40 2003
--- emacs/lisp/textmodes/sgml-mode.el   Tue Oct 26 21:38:57 2004
***************
*** 453,462 ****
    ;; 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 "\\)")))
  
  ;; Some programs (such as Glade 2) generate XML which has
  ;; -*- mode: xml -*-.
--- 453,474 ----
    ;; recognized.
    (set (make-local-variable 'comment-start-skip) "\\(?:<!\\)?--[ \t]*")
    (set (make-local-variable 'comment-end-skip) "[ \t]*--\\([ \t\n]*>\\)?")
!   ;; 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 -*-.