X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fnxml.el;h=f756d1e7256cf9f597b69b31562525e089e39ffe;hb=e85a749eb28898cc8c9cb65d7edc446bb849e57d;hp=d7ed93354b08a9d546ba777827d279a91b83a327;hpb=5909fea6b8ad5b95d9af7cad6824f11d944bdfd6;p=emacs-init.git

diff --git a/setup/nxml.el b/setup/nxml.el
index d7ed933..f756d1e 100644
--- a/setup/nxml.el
+++ b/setup/nxml.el
@@ -14,10 +14,14 @@
 						 (condition-case nil (progn (nxml-backward-up-element) t) (error nil)))
 			   (multiple-value-bind 
 				   (has-id step)
-				   (loop for att in xmltok-attributes
+				   (loop with has-id = nil
+                         with step = (xmltok-start-tag-local-name)
+					     for att in xmltok-attributes
 						 if (string= (xmltok-attribute-local-name att) "id")
 						 return (values t (concat "\"" (xmltok-attribute-value att) "\""))
-						 finally return (values nil (xmltok-start-tag-local-name)))
+						 else if (string= (xmltok-attribute-local-name att) "name")
+						 do (setq has-id t step (concat "\"" (xmltok-attribute-value att) "\""))
+						 finally return (values has-id step ))
 				 (if (or path-to-id has-id)
 					 (setq path-to-id (cons step path-to-id))
 				   (setq path-rest (cons step path-rest)))))))
@@ -38,3 +42,34 @@
 
 (add-to-list 'which-func-functions 'nxml-where)
 (add-to-list 'which-func-modes 'nxml-mode)
+(add-to-list 'which-func-non-auto-modes 'nxml-mode)
+
+(add-to-list 'auto-mode-alist '("\\.xslt?\\'" . nxml-mode))
+(add-to-list 'auto-mode-alist '("\\.xsd\\'" . nxml-mode))
+
+(require 'hideshow)
+
+(add-to-list 'hs-special-modes-alist '(nxml-mode ("\\(<[^/>]*>\\)$" 1)
+												 "</[^/>]*>$"))
+(defun nxml-enable-hs ()
+  (setq nxml-sexp-element-flag t)
+  (hs-minor-mode 1))
+
+(add-hook 'nxml-mode-hook 'nxml-enable-hs)
+
+(defun hs-nxml-enter ()
+  (interactive)
+  (when (hs-already-hidden-p)
+	(hs-show-block)
+	(hs-hide-level 1)
+	(nxml-forward-element)
+	(nxml-backward-element)))
+
+(defun hs-nxml-leave ()
+  (interactive)
+  (nxml-backward-up-element)
+  (hs-hide-block)
+  (nxml-backward-up-element))
+
+(define-key nxml-mode-map (kbd "\C-c <left>") 'hs-nxml-leave)
+(define-key nxml-mode-map (kbd "\C-c <right>") 'hs-nxml-enter)