diff --git a/.gitignore b/.gitignore
index df9101c40d..2d08f72d57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ oddmuse/*
 image-dired/
 elim/
 elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc~
-tramp
\ No newline at end of file
+tramp
+\#*
diff --git a/README.markdown b/README.markdown
index 387bcad2c4..1482720767 100644
--- a/README.markdown
+++ b/README.markdown
@@ -19,16 +19,19 @@ screencast](http://peepcode.com/products/meet-emacs) helpful. The
 
 ## Installation
 
-1. Install Emacs (at least version 22)
+1. Install GNU Emacs (at least version 22, 23 is preferred)
    Use your package manager if you have one.
    Otherwise, Mac users should get it [from Apple](http://www.apple.com/downloads/macosx/unix_open_source/carbonemacspackage.html).
    Windows users can get it [from GNU](http://ftp.gnu.org/gnu/emacs/windows/emacs-22.3-bin-i386.zip).
-2. Move the directory containing this file to ~/.emacs.d [1]
-   (If you already have a directory at ~/.emacs.d move it out of the way and put this there instead.)
+2. Move the directory containing this file to ~/.emacs.d
+   (If you already have a directory at ~/.emacs.d move it out of the
+   way and put this there instead.)
 3. Launch Emacs!
 
-If you are missing some autoloads after an update (should manifest
-itself as "void function: foobar" errors) try M-x regen-autoloads.
+If you find yourself missing some autoloads after an update (which
+should manifest itself as "void function: foobar" errors) try M-x
+regen-autoloads. After some updates an M-x recompile-init will be
+necessary; this should be noted in the commit messages.
 
 If you want to keep your regular ~/.emacs.d in place and just launch a
 single instance using the starter kit, try the following invocation:
@@ -86,6 +89,14 @@ packages. If you run into problems with such a package, try removing
 everything from inside the elpa/ directory and invoking M-x
 starter-kit-elpa-install in a fresh instance.
 
+## Variants of Emacs
+
+The Starter Kit is designed to work with GNU Emacs version 22 or
+greater. Using it with forks or other variants is not supported. It
+probably won't work with XEmacs, though some have reported getting it
+to work with Aquamacs. However, since Aquamacs is not portable,
+it's difficult to test in it.
+
 ## Contributing
 
 If you know your way around Emacs, please try out the starter kit as a
diff --git a/TODO b/TODO
index 709ada020b..0afd8d9764 100644
--- a/TODO
+++ b/TODO
@@ -2,15 +2,11 @@ TODO:
 
 Submit the packages in starter-kit-elpa.el to ELPA.
 
-Greg Newman is working on Python helpers.
-
-maybe include:
-* should yasnippet be included in rinari?
-
 to write/finish:
 * submit ruby fixes to flymake
 
 which-func-mode in ruby?
 
 Bug fixes:
-get jabber.el to automatically disconnect when suspending/hibernating (via dbus)
\ No newline at end of file
+get jabber.el to automatically disconnect when suspending/hibernating (via dbus)
+same with rcirc.el
\ No newline at end of file
diff --git a/elpa-to-submit/cssh.el b/elpa-to-submit/cssh.el
deleted file mode 100644
index 4fb01e4714..0000000000
--- a/elpa-to-submit/cssh.el
+++ /dev/null
@@ -1,428 +0,0 @@
-;;; cssh.el --- clusterssh implementation for emacs
-;;
-;; Copyright (C) 2008 Dimitri Fontaine
-;;
-;; Author: Dimitri Fontaine <dim@tapoueh.org>
-;; URL: http://pgsql.tapoueh.org/elisp
-;; Version: 0.1
-;; Created: 2008-09-26
-;; Keywords: ClusterSSH ssh cssh
-;;
-;; This file is NOT part of GNU Emacs.
-;;
-;; Emacs Integration:
-;; (require 'cssh)
-;;
-;; cssh bindings to open ClusterSSH controler in cssh-mode on some buffers:
-;;
-;;  C-=       asks remote hostname then opens a term and ssh to it
-;;  C-=       from IBuffer mode opens ClusterSSH controler on marked buffers
-;;  C-u C-=   asks for the name of the ClusterSSH controler buffer
-;;  C-M-=     matches given regexp against ssh known_hosts and open
-;;            buffers in which ssh <remote> is typed
-;;  C-u C-M-= asks for a name before 
-;;
-;;
-;; TODO
-;;  * add some more documentation
-;;  * implement a char mode where each key typed is directly sent
-;;  * implement a toggle to switch from and to char and line mode
-;;
-
-(require 'pcmpl-ssh)
-(require 'ibuffer)
-(require 'term)
-
-(defgroup cssh nil "ClusterSSH mode customization group"
-  :group 'convenience)
-
-(defcustom split-horizontally-first t
-  "Do we first split horizontally or vertically"
-  :group 'cssh
-  :options '(t nil))
-
-(defcustom cssh-prompt "cssh> "
-  "cssh buffer prompt"
-  :group 'cssh)
-
-(defcustom cssh-default-buffer-name "*cssh*"
-  "cssh default buffer name, the one in cssh major mode"
-  :group 'cssh)
-
-(defun turn-on-cssh-binding ()
-  (local-set-key (kbd "C-=") 'cssh-interactive-start))
-
-(add-hook 'ibuffer-mode-hook 'turn-on-cssh-binding)
-
-(global-set-key (kbd "C-M-=") 'cssh-regexp-host-start)
-
-(defun ssh-term-remote-open ()
-  "Opens a M-x term and type in ssh remotehost with given hostname"
-  (interactive) 
-  (let*
-      ((ssh-term-remote-host
-	(completing-read "Remote host: " (pcmpl-ssh-hosts)))
-       (ssh-command (concat "ssh " ssh-term-remote-host))
-       (ssh-buffer-name (concat "*" ssh-command "*")))
-
-    (if (get-buffer ssh-buffer-name)
-        (switch-to-buffer ssh-buffer-name)
-      
-      (ansi-term "/bin/bash" ssh-command)
-      (set-buffer (get-buffer ssh-buffer-name))
-      (insert (concat "TERM=screen " ssh-command))
-      (term-send-input))))
-
-(global-set-key (kbd "C-=") 'ssh-term-remote-open)
-
-
-;;;
-;;; open cssh windows and create buffers from a regexp
-;;; the regexp matches host names as in pcmpl-ssh-hosts
-;;;
-(defun cssh-regexp-host-start (&optional cssh-buffer-name)
-  "start ClusterSSH for all mathing hosts in  known_hosts"
-  (interactive
-   (list
-    (and current-prefix-arg
-	 (read-buffer "ClusterSSH buffer name: "
-		      (generate-new-buffer-name cssh-default-buffer-name)))))
-  (setq cssh-buffer-name
-	(or cssh-buffer-name cssh-default-buffer-name))
-  
-  (let* ((re (read-from-minibuffer "Host regexp: "))
-	 (cssh-buffer-list '()))
-
-    (dolist (elt (pcmpl-ssh-hosts) cssh-buffer-list)
-      (when (string-match re elt)
-	(let* ((buffer-ssh-command (concat "ssh " elt))
-	       (buffer-name (concat "*" buffer-ssh-command "*")))
-
-	  (unless (get-buffer buffer-name)
-	    (ansi-term "/bin/bash" buffer-ssh-command)
-	    (with-current-buffer buffer-name
-	      (insert (concat "TERM=screen " buffer-ssh-command))))
-	  
-	  (add-to-list 'cssh-buffer-list (get-buffer buffer-name)))))
-
-    (message "%S" cssh-buffer-list)
-
-    (cssh-open cssh-buffer-name cssh-buffer-list)
-    (cssh-send-string "")))
-
-;;;
-;;; ibuffer interaction: open cssh mode for marked buffers
-;;;
-(defun cssh-interactive-start (&optional cssh-buffer-name)
-  "start ClusterSSH from current iBuffer marked buffers list"
-  (interactive
-   (list
-    (and current-prefix-arg
-	 (read-buffer "ClusterSSH buffer name: "
-		      (generate-new-buffer-name cssh-default-buffer-name)))))
-  (setq cssh-buffer-name
-	(or cssh-buffer-name cssh-default-buffer-name))
-
-  (cssh-init-from-ibuffer-marked-buffers cssh-buffer-name))
-
-(defun cssh-init-from-ibuffer-marked-buffers (cssh-buffer-name)
-  "open cssh global input frame and the buffers windows from
-marked ibuffers buffers" 
-  (let* ((buffers-all-in-term-mode t)
-	 (marked-buffers (ibuffer-get-marked-buffers)))
-    
-    (dolist (elt marked-buffers)
-      (progn
-	(message (buffer-name elt))
-	;;(select-window (get-buffer-window elt))
-	(with-current-buffer elt
-	  (when (not (eq major-mode 'term-mode))
-	    (progn
-	      (setq buffers-all-in-term-mode nil)
-	      (message "ClusterSSH only supports Term mode buffers"))))))
-
-    (when buffers-all-in-term-mode
-      (cssh-open cssh-buffer-name marked-buffers))))
-
-;;;
-;;; Entry point
-;;;
-(defun cssh-open (cssh-buffer-name buffer-list)
-  "open the cssh global input frame then the ssh buffer windows"
-
-  (cond ((endp buffer-list)
-	 (ssh-term-remote-open))
-
-	((eq 1 (length buffer-list))
-	 (set-window-buffer (selected-window) (car buffer-list)))
-	  
-	(t
-	 (set-window-buffer 
-	  (selected-window) (get-buffer-create cssh-buffer-name))
-
-	 ;; make the controler buffer then split the window
-	 (let* ((cssh-controler (split-window-vertically -4)))
-	   ;; switch to css-mode, which make-local-variable cssh-buffer-list
-	   ;; which we overwrite
-	   (set-buffer cssh-buffer-name)
-	   (cssh-mode)
-	   (setq cssh-buffer-list buffer-list)
-
-	   ;; create the windows needed to host our buffer-list
-	   (cssh-nsplit-window buffer-list)
-
-	   ;; now place the user into the cssh-controler and prompt him
-	   (select-window cssh-controler)
-	   (insert (concat "\n" cssh-prompt))
-
-	   ;; return the buffer list
-	   cssh-buffer-list))))
-
-;;;
-;;; cssh editing mode
-;;;
-(defvar cssh-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [up]        'cssh-send-up)
-    (define-key map [down]      'cssh-send-down)
-    (define-key map [tab]       'cssh-send-tab)
-    (define-key map (kbd "RET") 'cssh-send-input)
-    (define-key map (kbd "C-j") 'cssh-send-input)
-    (define-key map (kbd "C-m") 'cssh-send-input)
-    (define-key map (kbd "C-c") 'cssh-cancel-input)
-    (define-key map (kbd "C-l") 'cssh-clear)    
-    (define-key map (kbd "C-d") 'cssh-eof)    
-    (define-key map (kbd "C-=") 'cssh-reopen)
-    (define-key map (kbd "C-!") 'cssh-reconnect-ssh)
-    map)
-  "Keymap for `cssh-mode'.")
-
-;;;###autoload
-(define-derived-mode cssh-mode fundamental-mode "ClusterSSH"
-  "A major mode for controlling multiple terms at once."
-  :group 'cssh
-  (make-local-variable 'cssh-buffer-list))
-
-;;
-;; Input functions
-;;
-(defun cssh-send-string (string)
-  "generic function to send input to the terms"
-
-  (dolist (elt cssh-buffer-list)
-    ;; FIXME: get rid of artefacts elements in cssh-buffer-list
-    (when (bufferp elt)
-      (with-current-buffer elt
-	(insert string)
-	(term-send-input)))))
-
-(defun cssh-send-defun (term-fun)
-  "generic function to apply term function to the terms"
-
-  (dolist (elt cssh-buffer-list)
-    ;; FIXME: get rid of artefacts elements in cssh-buffer-list
-    (when (bufferp elt)
-      (with-current-buffer elt
-	(funcall term-fun)))))
-
-(defun cssh-send-up ()
-  (interactive)
-  (cssh-send-defun 'term-send-up))
-
-(defun cssh-send-down ()
-  (interactive)
-  (cssh-send-defun 'term-send-down))
-
-(defun cssh-send-tab ()
-  (interactive)
-  (cssh-send-string
-   (buffer-substring (+ (length cssh-prompt) (line-beginning-position))
-		     (line-end-position)))
-  (cssh-send-string "\C-i"))
-
-(defun cssh-cancel-input ()
-  (interactive)
-  (cssh-send-string "\C-c")
-  (insert (concat "\n" cssh-prompt)))
-
-(defun cssh-send-input ()
-  "send current line content to all cssh-mode buffers"
-  (interactive)
-  (cssh-send-string
-   (buffer-substring (+ (length cssh-prompt) (line-beginning-position))
-		     (line-end-position)))
-  (insert (concat "\n" cssh-prompt)))
-
-(defun cssh-clear ()
-  (interactive)
-  (cssh-send-string "\C-l"))
-
-(defun cssh-eof ()
-  (interactive)
-  (cssh-send-string "\C-d"))
-
-(defun cssh-reopen ()
-  (interactive)
-  (cssh-open (buffer-name) cssh-buffer-list))
-
-(defun cssh-reconnect-ssh (&optional clear)
-  (interactive "P")
-  (when (consp clear) (cssh-clear))
-
-  (dolist (elt cssh-buffer-list)
-    ;; FIXME: get rid of artefacts elements in cssh-buffer-list
-    (when (bufferp elt)
-      (let* ((elt-name (buffer-name elt))
-	     (buffer-ssh-command (substring elt-name 1 -1)))
-	(with-current-buffer elt
-	  (insert (concat "TERM=screen " buffer-ssh-command))
-	  (term-send-input))))))
-
-;;;
-;;; Window splitting code
-;;;
-(defun cssh-split-window (&optional backward? &optional size)
-  "split current window either vertically or horizontally
-depending on split-preference value"
-  (let* ((go-horizontal
-	 (if backward? (not split-horizontally-first)
-	   split-horizontally-first)))
-
-    (if size
-	(if go-horizontal
-	    (split-window-horizontally size)
-	  (split-window-vertically size))
-
-      (if go-horizontal
-	  (split-window-horizontally)
-	(split-window-vertically)))))
-
-(defun cssh-get-third-size (backward? left top right bottom)
-  "Given a window edges and a direction" 
-  (let* ((go-horizontal
-	 (if backward? (not split-horizontally-first)
-	   split-horizontally-first)))
-
-    (/ (+ 1 (if go-horizontal (- right left) (- bottom top))) 3)))
-
-(defun cssh-nsplit-window (buffer-list &optional backward?)
-  "split current window into n windows"
-  (let* ((w (selected-window))
-	 (n (length buffer-list)))
-
-    (cond ((= n 2)
-	   ;; if at least one of the list elements is a buffer, it's final
-	   ;; recursion and we always prefer to maximize line length
-	   (let* ((w1 (cssh-split-window (if (or (bufferp (car buffer-list))
-						 (bufferp (cadr buffer-list)))
-					     ;; force to split horizontally first
-					     split-horizontally-first
-					   backward?))))
-
-	     (when (bufferp (car buffer-list))
-	       (set-window-buffer w (car buffer-list)))
-
-	     (when (bufferp (cadr buffer-list))
-	       (set-window-buffer w1 (cadr buffer-list)))
-
-  	     (list w w1)))
-
-	  ((= n 3)
-	   ;; if at least one of the list elements is a buffer, it's final
-	   ;; recursion and we always prefer to maximize line length
-	   (let* ((edges (window-edges))
-		  (direction (if (or (bufferp (car buffer-list))
-				     (bufferp (cadr buffer-list))
-				     (bufferp (cadr (cdr buffer-list))))
-				 ;; force to split horizontally first
-				 split-horizontally-first
-			       backward?))
-		  (size      (apply #'cssh-get-third-size
-				    (cons direction edges)))
-		  (w1        (cssh-split-window direction size))
-		  (w2        (progn (select-window w1) 
-				    (cssh-split-window direction size))))
-
-	     (when (bufferp (car buffer-list))
-	       (set-window-buffer w (car buffer-list)))
-
-	     (when (bufferp (cadr buffer-list))
-	       (set-window-buffer w1 (cadr buffer-list)))
-
-	     (when (bufferp (cadr (cdr buffer-list)))
-	       (set-window-buffer w2 (cadr (cdr buffer-list))))
-
-	     (list w w1 w2)))
-
-	  ((= n 5)
-	   ;; cut in half then split one half in 2 and the other in 3
-	   ;; cut in half then split other parts by n/2
-	   ;; gives cssh-nsplit-window any 2 elements list
-	   (let* ((halves (cssh-nsplit-window '(1 2) backward?)))
-
-	     (select-window (nth 1 halves))
-
-	     (let* ((h1l 
-		     (cssh-nsplit-window
-		      (butlast buffer-list 3) (not backward?))))
-
-	       (select-window w)
-	       (append h1l
-		       (cssh-nsplit-window 
-			(last buffer-list 3) (not backward?))))))
-
-	  ((= 0 (% n 2))
-	   ;; cut in half then split other parts by n/2
-	   ;; gives cssh-nsplit-window any 2 elements list
-	   (let* ((halves (cssh-nsplit-window '(1 2) backward?)))
-
-	     (select-window (nth 1 halves))
-
-	     (let* ((h1l 
-		     (cssh-nsplit-window
-		      (butlast buffer-list (/ n 2)) (not backward?))))
-
-	       (select-window w)
-	       (append h1l
-		       (cssh-nsplit-window 
-			(last buffer-list (/ n 2)) (not backward?))))))
-
-	  ((= 0 (% n 3))
-	   ;; cut in three parts then re split
-	   (let* ((thirds (cssh-nsplit-window '(1 2 3) backward?)))
-	     
-	     (select-window (nth 1 thirds))
-
-	     (let* ((t1l (cssh-nsplit-window
-			  ;; take the first third of the list
-			  (butlast (butlast buffer-list (/ n 3)) (/ n 3))
-			  (not backward?))))
-
-	       (select-window (nth 2 thirds))
-
-	       (let* ((t2l (cssh-nsplit-window
-			    ;; take the second third of the list
-			    (last (butlast buffer-list (/ n 3)) (/ n 3))
-			    (not backward?))))
-
-		 (select-window w)
-		 (append t1l
-			 t2l
-			 (cssh-nsplit-window
-			  ;; take the last third of the list
-			  (last buffer-list (/ n 3)) (not backward?)))))))
-
-	  ;; n is not divisible by either 2 or 3, produce some more windows
-	  ;; than necessary
-	  ((= 0 (% (+ 1 n) 2))
-	   (cssh-nsplit-window (cons 1 buffer-list)))
-
-	  ((= 0 (% (+ 1 n) 3))
-	   (cssh-nsplit-window (cons 1 buffer-list)))
-
-	  (t (message "error: number of windows not a multiple of 2 or 3."))
-    )
-  )
-)
-
-(provide 'cssh)
diff --git a/elpa-to-submit/espresso.el b/elpa-to-submit/espresso.el
index fb8addf651..34f84498db 100644
--- a/elpa-to-submit/espresso.el
+++ b/elpa-to-submit/espresso.el
@@ -4,8 +4,8 @@
 ;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
 ;; Author: Daniel Colascione <dan.colascione@gmail.com>
 ;; Maintainer: Daniel Colascione <dan.colascione@gmail.com>
-;; Version: 8
-;; Date: 2009-05-22
+;; Version: 9
+;; Date: 2009-07-25
 ;; Keywords: languages, oop, javascript
 
 ;; This file is free software; you can redistribute it and/or modify
@@ -507,7 +507,7 @@ messages."
   (let ((keymap (make-sparse-keymap)))
     (mapc (lambda (key)
             (define-key keymap key #'espresso-insert-and-indent))
-          '("+" "-" "/" "*" "{" "}" "(" ")" ":" ";" ","))
+          '("+" "-" "*" "{" "}" "(" ")" ":" ";" ","))
     (define-key keymap [(control ?c) (meta ?:)] #'espresso-js-eval)
     (define-key keymap [(control ?c) (control ?j)] #'espresso-set-js-context)
     (define-key keymap [(control meta ?x)] #'espresso-eval-defun)
@@ -910,22 +910,37 @@ pitem of the function we went to the beginning of."
     (when pstate
       (goto-char (espresso--pitem-h-begin (car pstate))))))
 
-(defun espresso--beginning-of-defun ()
+(defun espresso--beginning-of-defun (&optional arg)
   "Used as beginning-of-defun-function"
 
-  ;; If we're just past the end of a function, the user probably wants
-  ;; to go to the beginning of *that* function
-  (when (eq (char-before) ?})
-    (backward-char))
+  (setq arg (or arg 1))
+  (while (and (not (eobp)) (< arg 0))
+    (incf arg)
+    (when (and (not espresso-flat-functions)
+               (or (eq (espresso-syntactic-context) 'function)
+                   (espresso--function-prologue-beginning)))
+      (espresso--end-of-defun))
+
+    (if (espresso--re-search-forward
+         "\\_<function\\_>" nil t)
+        (goto-char (espresso--function-prologue-beginning))
+      (goto-char (point-max))))
+
+  (while (> arg 0)
+    (decf arg)
+    ;; If we're just past the end of a function, the user probably wants
+    ;; to go to the beginning of *that* function
+    (when (eq (char-before) ?})
+      (backward-char))
 
-  (let ((prologue-begin (espresso--function-prologue-beginning)))
-    (cond ((and prologue-begin (< prologue-begin (point)))
-           (goto-char prologue-begin))
+    (let ((prologue-begin (espresso--function-prologue-beginning)))
+      (cond ((and prologue-begin (< prologue-begin (point)))
+             (goto-char prologue-begin))
 
-          (espresso-flat-functions
-           (espresso--beginning-of-defun-flat))
-          (t
-           (espresso--beginning-of-defun-nested)))))
+            (espresso-flat-functions
+             (espresso--beginning-of-defun-flat))
+            (t
+             (espresso--beginning-of-defun-nested))))))
 
 (defun espresso--flush-caches (&optional beg ignored)
   "Flush syntax cache info after position BEG. BEG defaults to
@@ -1213,6 +1228,7 @@ given item ends instead of parsing all the way to LIMIT."
 
 (defun espresso--end-of-defun-nested ()
   "Internal helper for espresso--end-of-defun"
+  (message "test")
   (let* (pitem
          (this-end (save-excursion
                      (and (setq pitem (espresso--beginning-of-defun-nested))
@@ -1236,26 +1252,37 @@ given item ends instead of parsing all the way to LIMIT."
         ;; ... or eob.
         (goto-char (point-max))))))
 
-(defun espresso--end-of-defun ()
+(defun espresso--end-of-defun (&optional arg)
   "Used as end-of-defun-function"
-  ;; look for function backward. if we're inside it, go to that
-  ;; function's end. otherwise, search for the next function's end and
-  ;; go there
-  (if espresso-flat-functions
-      (espresso--end-of-defun-flat)
-
-    ;; if we're doing nested functions, see whether we're in the
-    ;; prologue. If we are, go to the end of the function; otherwise,
-    ;; call espresso--end-of-defun-nested to do the real work
-    (let ((prologue-begin (espresso--function-prologue-beginning)))
-      (cond ((and prologue-begin (<= prologue-begin (point)))
-             (goto-char prologue-begin)
-             (re-search-forward "\\_<function")
-             (goto-char (match-beginning 0))
-             (espresso--forward-function-decl)
-             (forward-list))
-
-            (t (espresso--end-of-defun-nested))))))
+  (setq arg (or arg 1))
+  (while (and (not (bobp)) (< arg 0))
+    (let (orig-pos (point))
+      (incf arg)
+      (espresso--beginning-of-defun)
+      (espresso--beginning-of-defun)
+      (unless (bobp)
+        (espresso--end-of-defun))))
+
+  (while (> arg 0)
+    (decf arg)
+    ;; look for function backward. if we're inside it, go to that
+    ;; function's end. otherwise, search for the next function's end and
+    ;; go there
+    (if espresso-flat-functions
+        (espresso--end-of-defun-flat)
+
+      ;; if we're doing nested functions, see whether we're in the
+      ;; prologue. If we are, go to the end of the function; otherwise,
+      ;; call espresso--end-of-defun-nested to do the real work
+      (let ((prologue-begin (espresso--function-prologue-beginning)))
+        (cond ((and prologue-begin (<= prologue-begin (point)))
+               (goto-char prologue-begin)
+               (re-search-forward "\\_<function")
+               (goto-char (match-beginning 0))
+               (espresso--forward-function-decl)
+               (forward-list))
+
+              (t (espresso--end-of-defun-nested)))))))
 
 (defun espresso--beginning-of-macro (&optional lim)
   (let ((here (point)))
@@ -1654,7 +1681,7 @@ interatively, also display a message with that context."
 ;; as the newline is escaped with \. Account for that in the regexp
 ;; below.
 (defconst espresso--regexp-literal
-  "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)[^/*]\\(?:.*?[^\\]\\)?\\(/\\)"
+  "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)"
   "Match a regular expression literal. Match groups 1 and 2 are
 the characters forming the beginning and end of the literal")
 
diff --git a/elpa-to-submit/htmlize.el b/elpa-to-submit/htmlize.el
index 9f22bb238c..89a57b4bee 100644
--- a/elpa-to-submit/htmlize.el
+++ b/elpa-to-submit/htmlize.el
@@ -1,6 +1,6 @@
 ;; htmlize.el -- Convert buffer text and decorations to HTML.
 
-;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005 Hrvoje Niksic
+;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005,2006,2009 Hrvoje Niksic
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: hypermedia, extensions
@@ -36,14 +36,17 @@
 ;; the same manner.  `M-x htmlize-many-files-dired' does the same for
 ;; files marked in a dired buffer.
 
-;; htmlize supports two types of HTML output, selected by setting
-;; `htmlize-output-type': `css' and `font'.  In `css' mode, htmlize
-;; uses cascading style sheets to specify colors; it generates classes
-;; that correspond to Emacs faces and uses <span class=FACE>...</span>
-;; to color parts of text.  In this mode, the produced HTML is valid
-;; under the 4.01 strict DTD, as confirmed by the W3C validator.  In
-;; `font' mode, htmlize uses <font color="...">...</font> to colorize
-;; HTML, which is not standard-compliant, but works better in older
+;; htmlize supports three types of HTML output, selected by setting
+;; `htmlize-output-type': `css', `inline-css', and `font'.  In `css'
+;; mode, htmlize uses cascading style sheets to specify colors; it
+;; generates classes that correspond to Emacs faces and uses <span
+;; class=FACE>...</span> to color parts of text.  In this mode, the
+;; produced HTML is valid under the 4.01 strict DTD, as confirmed by
+;; the W3C validator.  `inline-css' is like `css', except the CSS is
+;; put directly in the STYLE attribute of the SPAN element, making it
+;; possible to paste the generated HTML to other documents.  In `font'
+;; mode, htmlize uses <font color="...">...</font> to colorize HTML,
+;; which is not standard-compliant, but works better in older
 ;; browsers.  `css' mode is the default.
 
 ;; You can also use htmlize from your Emacs Lisp code.  When called
@@ -57,7 +60,7 @@
 ;; fix it.  I relied heavily on the presence of CL extensions,
 ;; especially for cross-emacs compatibility; please don't try to
 ;; remove that particular dependency.  When byte-compiling under GNU
-;; Emacs, you're likely to get lots of warnings; just ignore them.
+;; Emacs, you're likely to get some warnings; just ignore them.
 
 ;; The latest version should be available at:
 ;;
@@ -71,11 +74,12 @@
 ;; Thanks go to the multitudes of people who have sent reports and
 ;; contributed comments, suggestions, and fixes.  They include Ron
 ;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels, Juri
-;; Linkov, and many others.
+;; Linkov, Maciek Pasternacki, and many others.
 
 ;; User quotes: "You sir, are a sick, sick, _sick_ person. :)"
 ;;                  -- Bill Perry, author of Emacs/W3
 
+
 ;;; Code:
 
 (require 'cl)
@@ -92,7 +96,7 @@
     ;; `cl' is loaded.
     (load "cl-extra")))
 
-(defconst htmlize-version "1.30")
+(defconst htmlize-version "1.36")
 
 ;; Incantations to make custom stuff work without customize, e.g. on
 ;; XEmacs 19.14 or GNU Emacs 19.34.
@@ -121,18 +125,24 @@
   :group 'htmlize)
 
 (defcustom htmlize-output-type 'css
-  "*Output type of generated HTML.  Legal values are `css' and `font'.
+  "*Output type of generated HTML, one of `css', `inline-css', or `font'.
 When set to `css' (the default), htmlize will generate a style sheet
 with description of faces, and use it in the HTML document, specifying
 the faces in the actual text with <span class=\"FACE\">.
 
+When set to `inline-css', the style will be generated as above, but
+placed directly in the STYLE attribute of the span ELEMENT: <span
+style=\"STYLE\">.  This makes it easier to paste the resulting HTML to
+other documents.
+
 When set to `font', the properties will be set using layout tags
 <font>, <b>, <i>, <u>, and <strike>.
 
 `css' output is normally preferred, but `font' is still useful for
-supporting old, pre-CSS browsers, or for easy embedding of colorized
-text in foreign HTML documents (no style sheet to carry around)."
-  :type '(choice (const css) (const font))
+supporting old, pre-CSS browsers, and both `inline-css' and `font' for
+easier embedding of colorized text in foreign HTML documents (no style
+sheet to carry around)."
+  :type '(choice (const css) (const inline-css) (const font))
   :group 'htmlize)
 
 (defcustom htmlize-generate-hyperlinks t
@@ -160,11 +170,14 @@ do your own hyperlinkification from htmlize-after-hook.)"
 
 (defcustom htmlize-replace-form-feeds t
   "*Non-nil means replace form feeds in source code with HTML separators.
-Form feeds are the ^L characters sometimes used to separate sections of
-source code.  If this variable is set to `t', form feed characters are
-retained in HTML, but followed by the <hr> separator.  If this is a
-string, it specifies the replacement string, the default being
-\"\\^L\\n<hr />\".
+Form feeds are the ^L characters at line beginnings that are sometimes
+used to separate sections of source code.  If this variable is set to
+`t', form feed characters are replaced with the <hr> separator.  If this
+is a string, it specifies the replacement to use.  Note that <pre> is
+temporarily closed before the separator is inserted, so the default
+replacement is effectively \"</pre><hr /><pre>\".  If you specify
+another replacement, don't forget to close and reopen the <pre> if you
+want the output to remain valid HTML.
 
 If you need more elaborate processing, set this to nil and use
 htmlize-after-hook."
@@ -231,6 +244,16 @@ default setting; don't change it unless you know what you're doing."
   :type 'sexp
   :group 'htmlize)
 
+(defcustom htmlize-ignore-face-size 'absolute
+  "*Whether face size should be ignored when generating HTML.
+If this is nil, face sizes are used.  If set to t, sizes are ignored
+If set to `absolute', only absolute size specifications are ignored.
+Please note that font sizes only work with CSS-based output types."
+  :type '(choice (const :tag "Don't ignore" nil)
+		 (const :tag "Ignore all" t)
+		 (const :tag "Ignore absolute" absolute))
+  :group 'htmlize)
+
 (defcustom htmlize-css-name-prefix ""
   "*The prefix used for CSS names.
 The CSS names that htmlize generates from face names are often too
@@ -279,6 +302,8 @@ output.")
 
 (defvar htmlize-file-hook nil
   "Hook run by `htmlize-file' after htmlizing a file, but before saving it.")
+
+(defvar htmlize-buffer-places)
 
 ;;; Some cross-Emacs compatibility.
 
@@ -801,6 +826,7 @@ If no rgb.txt file is found, return nil."
 (defstruct htmlize-fstruct
   foreground				; foreground color, #rrggbb
   background				; background color, #rrggbb
+  size					; size
   boldp					; whether face is bold
   italicp				; whether face is italic
   underlinep				; whether face is underlined
@@ -816,6 +842,8 @@ If no rgb.txt file is found, return nil."
      (setf (htmlize-fstruct-foreground fstruct) (htmlize-color-to-rgb value)))
     (:background
      (setf (htmlize-fstruct-background fstruct) (htmlize-color-to-rgb value)))
+    (:height
+     (setf (htmlize-fstruct-size fstruct) value))
     (:weight
      (when (string-match (symbol-name value) "bold")
        (setf (htmlize-fstruct-boldp fstruct) t)))
@@ -833,6 +861,17 @@ If no rgb.txt file is found, return nil."
     (:strike-through
      (setf (htmlize-fstruct-strikep fstruct) value))))
 
+(defun htmlize-face-size (face)
+  ;; The size (height) of FACE, taking inheritance into account.
+  ;; Only works in Emacs 21 and later.
+  (let ((size-list
+	 (loop
+	  for f = face then (face-attribute f :inherit)
+	  until (or (not f) (eq f 'unspecified))
+	  for h = (face-attribute f :height)
+	  collect (if (eq h 'unspecified) nil h))))
+    (reduce 'htmlize-merge-size (cons nil size-list))))
+
 (defun htmlize-face-to-fstruct (face)
   "Convert Emacs face FACE to fstruct."
   (let ((fstruct (make-htmlize-fstruct
@@ -862,9 +901,19 @@ If no rgb.txt file is found, return nil."
 	     (let ((value (if (>= emacs-major-version 22)
 			      ;; Use the INHERIT arg in GNU Emacs 22.
 			      (face-attribute face attr nil t)
-			    (face-attribute face attr))))
+			    ;; Otherwise, fake it.
+			    (let ((face face))
+			      (while (and (eq (face-attribute face attr)
+					      'unspecified)
+					  (not (eq (face-attribute face :inherit)
+						   'unspecified)))
+				(setq face (face-attribute face :inherit)))
+			      (face-attribute face attr)))))
 	       (when (and value (not (eq value 'unspecified)))
-		 (htmlize-face-emacs21-attr fstruct attr value)))))
+		 (htmlize-face-emacs21-attr fstruct attr value))))
+	   (let ((size (htmlize-face-size face)))
+	     (unless (eql size 1.0) 	; ignore non-spec
+	       (setf (htmlize-fstruct-size fstruct) size))))
 	  (t
 	   ;; Older GNU Emacs.  Some of these functions are only
 	   ;; available under Emacs 20+, hence the guards.
@@ -901,6 +950,46 @@ If no rgb.txt file is found, return nil."
 	    name))
     fstruct))
 
+(defmacro htmlize-copy-attr-if-set (attr-list dest source)
+  ;; Expand the code of the type
+  ;; (and (htmlize-fstruct-ATTR source)
+  ;;      (setf (htmlize-fstruct-ATTR dest) (htmlize-fstruct-ATTR source)))
+  ;; for the given list of boolean attributes.
+  (cons 'progn
+	(loop for attr in attr-list
+	      for attr-sym = (intern (format "htmlize-fstruct-%s" attr))
+	      collect `(and (,attr-sym ,source)
+			    (setf (,attr-sym ,dest) (,attr-sym ,source))))))
+
+(defun htmlize-merge-size (merged next)
+  ;; Calculate the size of the merge of MERGED and NEXT.
+  (cond ((null merged)     next)
+	((integerp next)   next)
+	((null next)       merged)
+	((floatp merged)   (* merged next))
+	((integerp merged) (round (* merged next)))))
+
+(defun htmlize-merge-two-faces (merged next)
+  (htmlize-copy-attr-if-set
+   (foreground background boldp italicp underlinep overlinep strikep)
+   merged next)
+  (setf (htmlize-fstruct-size merged)
+	(htmlize-merge-size (htmlize-fstruct-size merged)
+			    (htmlize-fstruct-size next)))
+  merged)
+
+(defun htmlize-merge-faces (fstruct-list)
+  (cond ((null fstruct-list)
+	 ;; Nothing to do, return a dummy face.
+	 (make-htmlize-fstruct))
+	((null (cdr fstruct-list))
+	 ;; Optimize for the common case of a single face, simply
+	 ;; return it.
+	 (car fstruct-list))
+	(t
+	 (reduce #'htmlize-merge-two-faces
+		 (cons (make-htmlize-fstruct) fstruct-list)))))
+
 ;; GNU Emacs 20+ supports attribute lists in `face' properties.  For
 ;; example, you can use `(:foreground "red" :weight bold)' as an
 ;; overlay's "face", or you can even use a list of such lists, etc.
@@ -1139,13 +1228,63 @@ property and by buffer overlays that specify `face'."
   ;; Return METHOD's function definition for the current output type.
   ;; The returned object can be safely funcalled.
   (let ((sym (intern (format "htmlize-%s-%s" htmlize-output-type method))))
-    (indirect-function (if (fboundp sym) sym 'ignore))))
+    (indirect-function (if (fboundp sym)
+			   sym
+			 (let ((default (intern (concat "htmlize-default-"
+							(symbol-name method)))))
+			   (if (fboundp default)
+			       default
+			     'ignore))))))
+
+(defvar htmlize-memoization-table (make-hash-table :test 'equal))
+
+(defmacro htmlize-memoize (key generator)
+  "Return the value of GENERATOR, memoized as KEY.
+That means that GENERATOR will be evaluated and returned the first time
+it's called with the same value of KEY.  All other times, the cached
+\(memoized) value will be returned."
+  (let ((value (gensym)))
+    `(let ((,value (gethash ,key htmlize-memoization-table)))
+       (unless ,value
+	 (setq ,value ,generator)
+	 (setf (gethash ,key htmlize-memoization-table) ,value))
+       ,value)))
 
-;;; CSS based output support.
+;;; Default methods.
+
+(defun htmlize-default-doctype ()
+  nil					; no doc-string
+  ;; According to DTDs published by the W3C, it is illegal to embed
+  ;; <font> in <pre>.  This makes sense in general, but is bad for
+  ;; htmlize's intended usage of <font> to specify the document color.
+
+  ;; To make generated HTML legal, htmlize's `font' mode used to
+  ;; specify the SGML declaration of "HTML Pro" DTD here.  HTML Pro
+  ;; aka Silmaril DTD was a project whose goal was to produce a GPL'ed
+  ;; DTD that would encompass all the incompatible HTML extensions
+  ;; procured by Netscape, MSIE, and other players in the field.
+  ;; Apparently the project got abandoned, the last available version
+  ;; being "Draft 0 Revision 11" from January 1997, as documented at
+  ;; <http://imbolc.ucc.ie/~pflynn/articles/htmlpro.html>.
+
+  ;; Since by now HTML Pro is remembered by none but the most die-hard
+  ;; early-web-days nostalgics and used by not even them, there is no
+  ;; use in specifying it.  So we return the standard HTML 4.0
+  ;; declaration, which makes generated HTML technically illegal.  If
+  ;; you have a problem with that, use the `css' engine designed to
+  ;; create fully conforming HTML.
+
+  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"
+
+  ;; Now-abandoned HTML Pro declaration.
+  ;"<!DOCTYPE HTML PUBLIC \"+//Silmaril//DTD HTML Pro v0r11 19970101//EN\">"
+  )
 
-(defun htmlize-css-doctype ()
+(defun htmlize-default-body-tag (face-map)
   nil					; no doc-string
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">")
+  "<body>")
+
+;;; CSS based output support.
 
 ;; Internal function; not a method.
 (defun htmlize-css-specs (fstruct)
@@ -1157,6 +1296,12 @@ property and by buffer overlays that specify `face'."
       (push (format "background-color: %s;"
 		    (htmlize-fstruct-background fstruct))
 	    result))
+    (let ((size (htmlize-fstruct-size fstruct)))
+      (when (and size (not (eq htmlize-ignore-face-size t)))
+	(cond ((floatp size)
+	       (push (format "font-size: %d%%;" (* 100 size)) result))
+	      ((not (eq htmlize-ignore-face-size 'absolute))
+	       (push (format "font-size: %spt;" (/ size 10.0)) result)))))
     (when (htmlize-fstruct-boldp fstruct)
       (push "font-weight: bold;" result))
     (when (htmlize-fstruct-italicp fstruct)
@@ -1215,77 +1360,59 @@ property and by buffer overlays that specify `face'."
     (ignore fstruct)			; shut up the byte-compiler
     (princ "</span>" buffer)))
 
+;; `inline-css' output support.
+
+(defun htmlize-inline-css-body-tag (face-map)
+  (format "<body style=\"%s\">"
+	  (mapconcat #'identity (htmlize-css-specs (gethash 'default face-map))
+		     " ")))
+
+(defun htmlize-inline-css-insert-text (text fstruct-list buffer)
+  (let* ((merged (htmlize-merge-faces fstruct-list))
+	 (style (htmlize-memoize
+		 merged
+		 (let ((specs (htmlize-css-specs merged)))
+		   (and specs
+			(mapconcat #'identity (htmlize-css-specs merged) " "))))))
+    (when style
+      (princ "<span style=\"" buffer)
+      (princ style buffer)
+      (princ "\">" buffer))
+    (princ text buffer)
+    (when style
+      (princ "</span>" buffer))))
+
 ;;; `font' tag based output support.
 
-(defun htmlize-font-doctype ()
-  nil					; no doc-string
-
-  ;; According to DTDs published by the W3C, it is illegal to embed
-  ;; <font> in <pre>.  This makes sense in general, but is bad for
-  ;; htmlize's intended usage of <font> to specify the document color.
-
-  ;; To make generated HTML legal, htmlize.el used to specify the SGML
-  ;; declaration of "HTML Pro" DTD here.  HTML Pro aka Silmaril DTD
-  ;; was a project whose goal was to produce a GPL'ed DTD that would
-  ;; encompass all the incompatible HTML extensions procured by
-  ;; Netscape, MSIE, and other players in the field.  Apparently the
-  ;; project got abandoned, the last available version being "Draft 0
-  ;; Revision 11" from January 1997, as documented at
-  ;; <http://imbolc.ucc.ie/~pflynn/articles/htmlpro.html>.
-
-  ;; Since by now (2005) HTML Pro is remembered by none but the most
-  ;; die-hard early-web-days nostalgics and used by not even them,
-  ;; there is no use in specifying it.  So we return the standard HTML
-  ;; 4.0 declaration, which makes generated HTML technically illegal.
-  ;; If you have a problem with that, use the `css' generation engine
-  ;; which I believe creates fully conforming HTML.
-
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"
-
-  ;; Now-abandoned HTML Pro declaration.
-  ;"<!DOCTYPE HTML PUBLIC \"+//Silmaril//DTD HTML Pro v0r11 19970101//EN\">"
-  )
-
 (defun htmlize-font-body-tag (face-map)
   (let ((fstruct (gethash 'default face-map)))
     (format "<body text=\"%s\" bgcolor=\"%s\">"
 	    (htmlize-fstruct-foreground fstruct)
 	    (htmlize-fstruct-background fstruct))))
-
+       
 (defun htmlize-font-insert-text (text fstruct-list buffer)
   ;; In `font' mode, we use the traditional HTML means of altering
   ;; presentation: <font> tag for colors, <b> for bold, <u> for
   ;; underline, and <strike> for strike-through.
-  (let (bold italic underline strike fg)
-    ;; Merge the face attributes.
-    (dolist (fstruct fstruct-list)
-      ;; A non-null boolean attribute in any face sets the attribute.
-      (and (htmlize-fstruct-boldp fstruct)      (setq bold t))
-      (and (htmlize-fstruct-italicp fstruct)    (setq italic t))
-      (and (htmlize-fstruct-underlinep fstruct) (setq underline t))
-      (and (htmlize-fstruct-strikep fstruct)    (setq strike t))
-      ;; The foreground/background of the last face in the list wins.
-      (and (htmlize-fstruct-foreground fstruct)
-	   (setq fg (htmlize-fstruct-foreground fstruct))))
-
-    ;; Generate the markup that reflects the merged attributes.
-    (princ (concat
-	    (and fg        (format "<font color=\"%s\">" fg))
-	    (and bold      "<b>")
-	    (and italic    "<i>")
-	    (and underline "<u>")
-	    (and strike    "<strike>"))
-	   buffer)
-    ;; Print the text.
+  (let* ((merged (htmlize-merge-faces fstruct-list))
+	 (markup (htmlize-memoize
+		  merged
+		  (cons (concat
+			 (and (htmlize-fstruct-foreground merged)
+			      (format "<font color=\"%s\">" (htmlize-fstruct-foreground merged)))
+			 (and (htmlize-fstruct-boldp merged)      "<b>")
+			 (and (htmlize-fstruct-italicp merged)    "<i>")
+			 (and (htmlize-fstruct-underlinep merged) "<u>")
+			 (and (htmlize-fstruct-strikep merged)    "<strike>"))
+			(concat
+			 (and (htmlize-fstruct-strikep merged)    "</strike>")
+			 (and (htmlize-fstruct-underlinep merged) "</u>")
+			 (and (htmlize-fstruct-italicp merged)    "</i>")
+			 (and (htmlize-fstruct-boldp merged)      "</b>")
+			 (and (htmlize-fstruct-foreground merged) "</font>"))))))
+    (princ (car markup) buffer)
     (princ text buffer)
-    ;; Close the tags we've opened.
-    (princ (concat
-	    (and strike    "</strike>")
-	    (and underline "</u>")
-	    (and italic    "</i>")
-	    (and bold      "</b>")
-	    (and fg        "</font>"))
-	   buffer)))
+    (princ (cdr markup) buffer)))
 
 (defun htmlize-buffer-1 ()
   ;; Internal function; don't call it from outside this file.  Htmlize
@@ -1300,6 +1427,7 @@ property and by buffer overlays that specify `face'."
     ;; in advance.
     (htmlize-ensure-fontified)
     (clrhash htmlize-extended-character-cache)
+    (clrhash htmlize-memoization-table)
     (let* ((buffer-faces (htmlize-faces-in-buffer))
 	   (face-map (htmlize-make-face-map (adjoin 'default buffer-faces)))
 	   ;; Generate the new buffer.  It's important that it inherits
@@ -1309,6 +1437,9 @@ property and by buffer overlays that specify `face'."
 					      (file-name-nondirectory
 					       (buffer-file-name)))
 					   "*html*")))
+	   ;; Having a dummy value in the plist allows writing simply
+	   ;; (plist-put places foo bar).
+	   (places '(nil nil))
 	   (title (if (buffer-file-name)
 		      (file-name-nondirectory (buffer-file-name))
 		    (buffer-name))))
@@ -1318,7 +1449,9 @@ property and by buffer overlays that specify `face'."
 	(insert (htmlize-method doctype) ?\n
 		(format "<!-- Created by htmlize-%s in %s mode. -->\n"
 			htmlize-version htmlize-output-type)
-		"<html>\n  <head>\n"
+		"<html>\n  ")
+	(plist-put places 'head-start (point-marker))
+	(insert "<head>\n"
 		"    <title>" (htmlize-protect-string title) "</title>\n"
 		(if htmlize-html-charset
 		    (format (concat "    <meta http-equiv=\"Content-Type\" "
@@ -1327,11 +1460,14 @@ property and by buffer overlays that specify `face'."
 		  "")
 		htmlize-head-tags)
 	(htmlize-method insert-head buffer-faces face-map)
-	(insert "  </head>"
-		"\n  "
-		(or (htmlize-method body-tag face-map)
-		    "<body>")
-		"\n    <pre>\n"))
+	(insert "  </head>")
+	(plist-put places 'head-end (point-marker))
+	(insert "\n  ")
+	(plist-put places 'body-start (point-marker))
+	(insert (htmlize-method body-tag face-map)
+		"\n    ")
+	(plist-put places 'content-start (point-marker))
+	(insert "<pre>\n"))
       (let ((insert-text-method
 	     ;; Get the inserter method, so we can funcall it inside
 	     ;; the loop.  Not calling `htmlize-method' in the loop
@@ -1379,20 +1515,24 @@ property and by buffer overlays that specify `face'."
 
       ;; Insert the epilog and post-process the buffer.
       (with-current-buffer htmlbuf
-	(insert "</pre>\n  </body>\n</html>\n")
+	(insert "</pre>")
+	(plist-put places 'content-end (point-marker))
+	(insert "\n  </body>")
+	(plist-put places 'body-end (point-marker))
+	(insert "\n</html>\n")
 	(when htmlize-generate-hyperlinks
 	  (htmlize-make-hyperlinks))
 	(htmlize-defang-local-variables)
 	(when htmlize-replace-form-feeds
-	  ;; Change each "^L\n" to "^L\n<hr />".
+	  ;; Change each "\n^L" to "<hr />".
 	  (goto-char (point-min))
 	  (let ((source
 		 ;; ^L has already been escaped, so search for that.
-		 (htmlize-protect-string "\^L\n"))
+		 (htmlize-protect-string "\n\^L"))
 		(replacement
 		 (if (stringp htmlize-replace-form-feeds)
 		     htmlize-replace-form-feeds
-		   "\^L\n<hr />")))
+		   "</pre><hr /><pre>")))
 	    (while (search-forward source nil t)
 	      (replace-match replacement t t))))
 	(goto-char (point-min))
@@ -1400,6 +1540,7 @@ property and by buffer overlays that specify `face'."
 	  ;; What sucks about this is that the minor modes, most notably
 	  ;; font-lock-mode, won't be initialized.  Oh well.
 	  (funcall htmlize-html-major-mode))
+	(set (make-local-variable 'htmlize-buffer-places) places)
 	(run-hooks 'htmlize-after-hook)
 	(buffer-enable-undo))
       htmlbuf)))
@@ -1484,6 +1625,19 @@ See `htmlize-buffer' for details."
       (switch-to-buffer htmlbuf))
     htmlbuf))
 
+(defun htmlize-region-for-paste (beg end)
+  "Htmlize the region and return just the HTML as a string.
+This forces the `inline-css' style and only returns the HTML body,
+but without the BODY tag.  This should make it useful for inserting
+the text to another HTML buffer."
+  (let* ((htmlize-output-type 'inline-css)
+	 (htmlbuf (htmlize-region beg end)))
+    (unwind-protect
+	(with-current-buffer htmlbuf
+	  (buffer-substring (plist-get htmlize-buffer-places 'content-start)
+			    (plist-get htmlize-buffer-places 'content-end)))
+      (kill-buffer htmlbuf))))
+
 (defun htmlize-make-file-name (file)
   "Make an HTML file name from FILE.
 
diff --git a/elpa-to-submit/nxhtml/related/javascript-mozlab.el b/elpa-to-submit/nxhtml/alts/javascript-mozlab.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/javascript-mozlab.el
rename to elpa-to-submit/nxhtml/alts/javascript-mozlab.el
diff --git a/elpa-to-submit/nxhtml/related/js2-font-lock-new.el b/elpa-to-submit/nxhtml/alts/js2-font-lock-new.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/js2-font-lock-new.el
rename to elpa-to-submit/nxhtml/alts/js2-font-lock-new.el
diff --git a/elpa-to-submit/nxhtml/related/js2-font-lock.el b/elpa-to-submit/nxhtml/alts/js2-font-lock.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/js2-font-lock.el
rename to elpa-to-submit/nxhtml/alts/js2-font-lock.el
diff --git a/elpa-to-submit/nxhtml/related/js2-mumamo.el b/elpa-to-submit/nxhtml/alts/js2-mumamo.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/js2-mumamo.el
rename to elpa-to-submit/nxhtml/alts/js2-mumamo.el
diff --git a/elpa-to-submit/nxhtml/related/js2-new.el b/elpa-to-submit/nxhtml/alts/js2-new.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/js2-new.el
rename to elpa-to-submit/nxhtml/alts/js2-new.el
diff --git a/elpa-to-submit/nxhtml/alts/php-mode-1.5.0.el b/elpa-to-submit/nxhtml/alts/php-mode-1.5.0.el
new file mode 100644
index 0000000000..e5de2d7e4e
--- /dev/null
+++ b/elpa-to-submit/nxhtml/alts/php-mode-1.5.0.el
@@ -0,0 +1,319 @@
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- ViewVC - http://viewvc.org/
+by Greg Stein - mailto:gstein@lyra.org -->
+<!--
+~ SourceForge.net: Create, Participate, Evaluate
+~ Copyright (c) 1999-2008 SourceForge, Inc. All rights reserved.
+-->
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="description" content="The world's largest development and download repository of Open Source code and applications" />
+<meta name="keywords" content="Open Source, Development, Developers, Projects, Downloads, OSTG, VA Software, SF.net, SourceForge" />
+<title>SourceForge.net Repository - [php-mode] Index of /</title>
+<meta name="generator" content="ViewVC 1.0.5" />
+<link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/phoneix/style.php?secure=0&amp;20080417-1657" media="all" />
+<link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/phoneix/table.php?secure=0&amp;20080417-1657" media="all" />
+<link rel="stylesheet" type="text/css" href="/viewvc-static/styles.css" media="all" />
+<style type="text/css">
+#breadcrumb {margin: 0; padding: 0;}
+#breadcrumb li {list-style: none; padding: 0 .2em 0 0; display: inline; }
+#breadcrumb li:before {color: #aaa; content: "/"}
+#breadcrumb li:first-child:before {content: ""}
+h2 {margin: 0 0 -.5em;}
+table th.vc_header {background-color: #fff;}
+table th.vc_header_sort a {text-decoration: none; color: #000 !important;}
+hr {background: #ccc; border: none;}
+/* grr ie */
+#bd .titlebar, table tr th {_background: url("http://c.fsdn.com/sf/images/phoneix/gloss_ieblows.png");}
+table tbody tr td, .yui-gf.title .yui-u.first h2 {_background-image: none;}
+#bd { _background: #fff url("http://c.fsdn.com/sf/images/phoneix/grad_ieblows.png") repeat-x 0 6px;}
+#hd .yui-u.first h1 { _background: transparent; _filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (src='http://c.fsdn.com/sf/images/phoneix/sf_phoneix.png',sizingMethod='');}
+#hd {_background: none;}
+</style>
+<!-- BEGIN: AdSolution-Tag 4.2: Global-Code [PLACE IN HTML-HEAD-AREA!] -->
+<!-- DoubleClick Random Number -->
+<script language="JavaScript" type="text/javascript">
+dfp_ord=Math.random()*10000000000000000;
+dfp_tile = 1;
+</script>
+<!-- End DoubleClick Random Number -->
+<script type="text/javascript">
+var google_page_url = 'http://sourceforge.net/projects/php-mode/';
+var sourceforge_project_name = 'php-mode';
+var sourceforge_project_description = '';
+</script>
+<!-- END: AdSolution-Tag 4.2: Global-Code -->
+<!-- End OSDN NavBar gid: -->
+<!-- after META tags -->
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+</head>
+<body>
+<div id="doc3" class="yui-t6 login">
+<div id="hd">
+<div class="yui-gf">
+<div class="yui-u first">
+<h1>
+<a href="http://sourceforge.net/" title="">
+SourceForge.net
+</a>
+</h1>
+<ul class="jump">
+<li>
+<a href="#content">
+Jump to main content</a>
+</li>
+</ul>
+</div>
+<div class="yui-u">
+<a href="http://sourceforge.net/community/">
+Community</a><a href="http://jobs.sourceforge.net">Jobs</a><a href="http://sourceforge.net/support/getsupport.php" title="Get help and support on SourceForge.net">Help
+</a>
+<form action="http://sourceforge.net/search/" method="get" name="searchform">
+<input type="hidden" name="type_of_search" value="soft" />
+<input type="text" value="" name="words" tabindex="1" />
+<input type="submit" value="Search" tabindex="0" />
+</form>
+</div>
+</div>
+</div>
+<div id="bd">
+<!-- begin content -->
+<a name="content">
+</a>
+<!-- Breadcrumb Trail -->
+<br />
+
+<ul id="breadcrumb">
+<li class="begin"> <a href="http://sourceforge.net/">SF.net</a></li>
+<li> <a href="http://sourceforge.net/softwaremap/">Projects</a></li>
+<li> SCM Repositories</li>
+
+<li>
+
+
+php-mode
+</li>
+
+</ul>
+
+<div id="yui-main">
+<div class="yui-b">
+<h1>
+SCM Repositories -
+<a href="http://sourceforge.net/projects/php-mode">php-mode</a>
+</h1>
+
+
+<!-- you may insert repository access instructions here -->
+
+<table class="auto track" style="width: 30em;">
+<tr><td>Files shown:</td><td><strong>0</strong>
+
+
+</td></tr>
+
+<tr>
+<td>Directory revision:</td>
+<td><a href="/viewvc/php-mode?view=rev&amp;revision=96">96</a> (of <a href="/viewvc/php-mode?view=rev">96</a>)</td>
+</tr>
+
+<tr>
+<td>Sticky Revision:</td>
+<td><form method="get" action="/viewvc/php-mode" style="display: inline">
+<div style="display: inline">
+<input type="hidden" name="orig_pathtype" value="DIR" /><input type="hidden" name="orig_view" value="dir" /><input type="hidden" name="orig_path" value="" /><input type="hidden" name="view" value="redirect_pathrev" />
+
+<input type="text" name="pathrev" value="" size="6"/>
+
+<input type="submit" value="Set" />
+</div>
+</form>
+
+</td>
+</tr>
+
+
+</table>
+</div>
+</div>
+<div class="yui-b">
+<div id="fad83">
+<!-- DoubleClick Ad Tag -->
+<script type="text/javascript">
+//<![CDATA[
+document.write('<script src="http://ad.doubleclick.net/adj/ostg.sourceforge/pg_viewvc_p88_shortrec;pg=viewvc;tile='+dfp_tile+';tpc=php-mode;ord='+dfp_ord+'?" type="text/javascript"><\/script>');
+dfp_tile++;
+//]]>
+</script>
+<!-- End DoubleClick Ad Tag -->
+</div>
+</div>
+<br style="clear:both; margin-bottom: 1em; display: block;" />
+<h2>Index of /</h2>
+
+
+<p><a name="dirlist"></a></p>
+<hr />
+
+<table cellspacing="1" cellpadding="2">
+<thead>
+<tr>
+<th class="vc_header_sort" colspan="2">
+<a href="/viewvc/php-mode/?sortdir=down#dirlist">File
+
+<img class="vc_sortarrow" alt=""
+width="13" height="13"
+src="/viewvc-static/images/up.png" />
+
+</a>
+</th>
+<th class="vc_header">
+<a href="/viewvc/php-mode/?sortby=rev#dirlist">Rev.
+
+</a>
+</th>
+<th class="vc_header">
+<a href="/viewvc/php-mode/?sortby=date#dirlist">Age
+
+</a>
+</th>
+<th class="vc_header">
+<a href="/viewvc/php-mode/?sortby=author#dirlist">Author
+
+</a>
+</th>
+
+<th class="vc_header">
+<a href="/viewvc/php-mode/?sortby=log#dirlist">Last log entry
+
+</a>
+</th>
+
+</tr>
+</thead>
+<tbody>
+
+
+<tr class="vc_row_even">
+<td colspan="2">
+
+<a name="branches" href="/viewvc/php-mode/branches/" title="View directory contents">
+
+<img src="/viewvc-static/images/dir.png" alt="" width="16" height="16" />
+branches/</a>
+
+</td>
+
+
+
+<td>&nbsp;<a href="/viewvc/php-mode/branches/?view=log" title="View directory revision log"><strong>3</strong></a></td>
+
+<td>&nbsp;5 years</td>
+<td>&nbsp;turadg</td>
+
+
+<td>&nbsp;Initial import.
+</td>
+
+
+
+</tr>
+
+<tr class="vc_row_odd">
+<td colspan="2">
+
+<a name="tags" href="/viewvc/php-mode/tags/" title="View directory contents">
+
+<img src="/viewvc-static/images/dir.png" alt="" width="16" height="16" />
+tags/</a>
+
+</td>
+
+
+
+<td>&nbsp;<a href="/viewvc/php-mode/tags/?view=log" title="View directory revision log"><strong>94</strong></a></td>
+
+<td>&nbsp;3 weeks</td>
+<td>&nbsp;ashawley</td>
+
+
+<td>&nbsp;Remove typo tag.</td>
+
+
+
+</tr>
+
+<tr class="vc_row_even">
+<td colspan="2">
+
+<a name="trunk" href="/viewvc/php-mode/trunk/" title="View directory contents">
+
+<img src="/viewvc-static/images/dir.png" alt="" width="16" height="16" />
+trunk/</a>
+
+</td>
+
+
+
+<td>&nbsp;<a href="/viewvc/php-mode/trunk/?view=log" title="View directory revision log"><strong>96</strong></a></td>
+
+<td>&nbsp;3 weeks</td>
+<td>&nbsp;ashawley</td>
+
+
+<td>&nbsp;Makefile (version): Update to 1.6.0-alpha.
+(dist): This shouldn't be the default...</td>
+
+
+
+</tr>
+
+</tbody>
+</table>
+
+
+
+<p style="margin:0;"><a href="/viewvc/php-mode.tar.gz?view=tar">Download GNU tarball</a></p>
+
+
+</td></tr></table>
+<hr />
+<div class="yui-g">
+<div class="yui-u first">
+Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.0.5</a>
+</div>
+<div class="yui-u" style="text-align: right">
+<a href="/viewvc-static/help_log.html">ViewVC Help</a></strong>
+</div>
+</div>
+</div>
+<div id="ft">
+<div class="yui-g divider">
+<div class="yui-u first copyright">
+&copy;Copyright 1999-2008 -
+<a href="http://sourceforge.com" title="Network which provides and promotes Open Source software downloads, development, discussion and news.">SourceForge</a>, Inc., All Rights Reserved
+</div>
+<div class="yui-u">
+<a href="http://sourceforge.net/community/forum/forum.php?id=12">Feedback</a> <a href="http://sourceforge.net/tos/tos.php">Legal</a> <a href="http://sourceforge.net/support">Help</a>
+</div>
+</div>
+</div>
+</div>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-32013-37");
+pageTracker._setDomainName(".sourceforge.net");
+pageTracker._trackPageview();
+</script>
+</body>
+</html>
+
+
diff --git a/elpa-to-submit/nxhtml/alts/php-mode-2008-10-23.el b/elpa-to-submit/nxhtml/alts/php-mode-2008-10-23.el
new file mode 100644
index 0000000000..c0be94969d
--- /dev/null
+++ b/elpa-to-submit/nxhtml/alts/php-mode-2008-10-23.el
@@ -0,0 +1,1118 @@
+;;; php-mode.el --- major mode for editing PHP code
+
+;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
+;;               2008 Aaron S. Hawley
+
+;; Maintainer: Aaron S. Hawley <ashawley at users.sourceforge.net>
+;; Author: Turadg Aleahmad, 1999-2004
+;; Keywords: php languages oop
+;; Created: 1999-05-17
+;; Modified: 2008-10-20
+;; X-URL:   http://php-mode.sourceforge.net/
+
+(defconst php-mode-version-number "1.4.1-alpha"
+  "PHP Mode version number.")
+
+;;; License
+
+;; This file 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 3
+;; of the License, or (at your option) any later version.
+
+;; This file 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 this file; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Usage
+
+;; Put this file in your Emacs lisp path (eg. site-lisp) and add to
+;; your .emacs file:
+;;
+;;   (require 'php-mode)
+
+;; To use abbrev-mode, add lines like this:
+;;   (add-hook 'php-mode-hook
+;;     '(lambda () (define-abbrev php-mode-abbrev-table "ex" "extends")))
+
+;; To make php-mode compatible with html-mode, see http://php-mode.sf.net
+
+;; Many options available under Help:Customize
+;; Options specific to php-mode are in
+;;  Programming/Languages/Php
+;; Since it inherits much functionality from c-mode, look there too
+;;  Programming/Languages/C
+
+;;; Commentary:
+
+;; PHP mode is a major mode for editing PHP 3 and 4 source code.  It's
+;; an extension of C mode; thus it inherits all C mode's navigation
+;; functionality.  But it colors according to the PHP grammar and indents
+;; according to the PEAR coding guidelines.  It also includes a couple
+;; handy IDE-type features such as documentation search and a source
+;; and class browser.
+
+
+;;; Contributors: (in chronological order)
+
+;; Juanjo, Torsten Martinsen, Vinai Kopp, Sean Champ, Doug Marcey,
+;; Kevin Blake, Rex McMaster, Mathias Meyer, Boris Folgmann, Roland
+;; Rosenfeld, Fred Yankowski, Craig Andrews, John Keller, Ryan
+;; Sammartino, ppercot, Valentin Funk, Stig Bakken, Gregory Stark,
+;; Chris Morris, Nils Rennebarth, Gerrit Riessen, Eric Mc Sween,
+;; Ville Skytta, Giacomo Tesio, Lennart Borgman, Stefan Monnier,
+;; Aaron S. Hawley, Ian Eure, Bill Lovett, Dias Badekas
+
+;;; Changelog:
+
+;; 1.4
+;;   Updated GNU GPL to version 3.  Ported to Emacs 22 (CC mode
+;;   5.31). M-x php-mode-version shows version.  Provide end-of-defun
+;;   beginning-of-defun functionality. Support add-log library.
+;;   Fix __CLASS__ constant (Ian Eure).  Allow imenu to see visibility
+;;   declarations -- "private", "public", "protected". (Bill Lovett)
+;;
+;; 1.3
+;;   Changed the definition of # using a tip from Stefan
+;;   Monnier to correct highlighting and indentation. (Lennart Borgman)
+;;   Changed the highlighting of the HTML part. (Lennart Borgman)
+;;
+;; 1.2
+;;   Implemented php-show-arglist, C-. (Engelke Eschner)
+;;   Implemented php-complete-function, M-tab (Engelke Eschner)
+;;   Re-enabled # comment detection in GNU Emacs (Urban Müller)
+;;   Fixed some keybindings and default settings (Engelke Eschner)
+;;
+;; 1.1
+;;   Added PHP5 support (Giacomo Tesio)
+;;     known problem: doesn't highlight after first 'implements'
+;;   Better XEmacs compatibility (imenu, regexp, and comments!) (Ville Skytta)
+;;   Improvement to php-conditional-key regexp (Eric Mc Sween)
+
+;; 1.05
+;;   Incorporated speedbar defs by Gerrit Riessen
+;;   Add "foreach" to conditional introducing keywords (Nils Rennebarth)
+;;   Cleared the Changelog
+;;   Moved contribution credits into comments above
+
+
+;;; Code:
+
+(require 'speedbar)
+(require 'font-lock)
+(require 'cc-mode)
+(require 'custom)
+(require 'etags)
+(eval-when-compile
+  (require 'regexp-opt))
+
+;; Local variables
+(defgroup php nil
+  "Major mode `php-mode' for editing PHP code."
+  :prefix "php-"
+  :group 'languages)
+
+(defcustom php-default-face 'default
+  "Default face in `php-mode' buffers."
+  :type 'face
+  :group 'php)
+
+(defcustom php-speedbar-config t
+  "When set to true automatically configures Speedbar to observe PHP files.
+Ignores php-file patterns option; fixed to expression \"\\.\\(inc\\|php[s34]?\\)\""
+  :type 'boolean
+  :set (lambda (sym val)
+         (set-default sym val)
+         (if (and val (boundp 'speedbar))
+             (speedbar-add-supported-extension
+	      "\\.\\(inc\\|php[s34]?\\|phtml\\)")))
+  :group 'php)
+
+(defcustom php-mode-speedbar-open nil
+  "Normally `php-mode' starts with the speedbar closed.
+Turning this on will open it whenever `php-mode' is loaded."
+  :type 'boolean
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when val
+             (speedbar 1)))
+  :group 'php)
+
+(defvar php-imenu-generic-expression
+ '(
+   ("All Functions"
+    "^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1)
+   ("Classes"
+    "^\\s-*class\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*" 1)
+   ("Public Methods"
+    "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?public\\s-+\\(?:static\\s-+\\)?function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1)
+   ("Protected Methods"
+    "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?protected\\s-+\\(?:static\\s-+\\)?function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1)
+   ("Private Methods"
+    "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?private\\s-+\\(?:static\\s-+\\)?function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1)
+   )
+ "Imenu generic expression for PHP Mode. See `imenu-generic-expression'."
+ )
+
+(defcustom php-manual-url "http://www.php.net/manual/en/"
+  "URL at which to find PHP manual.
+You can replace \"en\" with your ISO language code."
+  :type 'string
+  :group 'php)
+
+(defcustom php-search-url "http://www.php.net/"
+  "URL at which to search for documentation on a word"
+  :type 'string
+  :group 'php)
+
+(defcustom php-completion-file ""
+  "Path to the file which contains the function names known to PHP"
+  :type 'string
+  :group 'php)
+
+(defcustom php-manual-path ""
+  "Path to the directory which contains the PHP manual"
+  :type 'string
+  :group 'php)
+
+;;;###NOautoload
+(defcustom php-file-patterns '("\\.php[s34]?\\'" "\\.phtml\\'" "\\.inc\\'")
+  "List of file patterns for which to automatically invoke `php-mode'."
+  :type '(repeat (regexp :tag "Pattern"))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (let ((php-file-patterns-temp val))
+           (while php-file-patterns-temp
+             (add-to-list 'auto-mode-alist
+                          (cons (car php-file-patterns-temp) 'php-mode))
+             (setq php-file-patterns-temp (cdr php-file-patterns-temp)))))
+  :group 'php)
+
+(defcustom php-mode-hook nil
+  "List of functions to be executed on entry to `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-pear-hook nil
+  "Hook called when a PHP PEAR file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-force-pear nil
+  "Normally PEAR coding rules are enforced only when the filename contains \"PEAR\"
+Turning this on will force PEAR rules on all PHP files."
+  :type 'boolean
+  :group 'php)
+
+(defconst php-mode-modified "2008-10-20"
+  "PHP Mode build date.")
+
+(defun php-mode-version ()
+  "Display string describing the version of PHP mode"
+  (interactive)
+  (message "PHP mode %s of %s"
+	   php-mode-version-number php-mode-modified))
+
+(defconst php-beginning-of-defun-regexp
+  "^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+&?\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("
+  "Regular expression for a PHP function.")
+
+(defun php-beginning-of-defun (&optional arg)
+  "Move to the beginning of the ARGth PHP function from point.
+Implements PHP version of `beginning-of-defun-function'."
+  (interactive "p")
+  (let ((arg (or arg 1)))
+    (while (> arg 0)
+      (re-search-backward php-beginning-of-defun-regexp
+			  nil 'noerror)
+      (setq arg (1- arg)))
+    (while (< arg 0)
+      (end-of-line 1)
+      (let ((opoint (point)))
+	(beginning-of-defun 1)
+	(forward-list 2)
+	(forward-line 1)
+	(if (eq opoint (point))
+	    (re-search-forward php-beginning-of-defun-regexp
+			       nil 'noerror))
+	(setq arg (1+ arg))))))
+
+(defun php-end-of-defun (&optional arg)
+  "Move the end of the ARGth PHP function from point.
+Implements PHP befsion of `end-of-defun-function'
+
+See `php-beginning-of-defun'."
+  (interactive "p")
+  (php-beginning-of-defun (- (or arg 1))))
+
+
+(defvar php-completion-table nil
+  "Obarray of tag names defined in current tags table and functions know to PHP.")
+
+(defvar php-warned-bad-indent nil)
+(make-variable-buffer-local 'php-warned-bad-indent)
+
+;; Do it but tell it is not good if html tags in buffer.
+(defun php-check-html-for-indentation ()
+  (let ((html-tag-re "^\\s-*</?\\sw+.*?>")
+        (here (point)))
+    (if (not (or (re-search-forward html-tag-re (line-end-position) t)
+                 (re-search-backward html-tag-re (line-beginning-position) t)))
+        t
+      (goto-char here)
+      (setq php-warned-bad-indent t)
+      (lwarn 'php-indent :warning
+	     "\n\t%s\n\t%s\n\t%s\n"
+	     "Indentation fails badly with mixed HTML and PHP."
+	     "Look for an Emacs Lisp library that supports \"multiple"
+	     "major modes\" like mumamo, mmm-mode or multi-mode.")
+      nil)))
+
+(defun php-cautious-indent-region (start end &optional quiet)
+  (if (or php-warned-bad-indent
+          (php-check-html-for-indentation))
+      (funcall 'c-indent-region start end quiet)))
+
+(defun php-cautious-indent-line ()
+  (if (or php-warned-bad-indent
+          (php-check-html-for-indentation))
+      (funcall 'c-indent-line)))
+
+(defconst php-tags '("<?php" "?>" "<?" "<?="))
+(defconst php-tags-key (regexp-opt php-tags))
+
+(defconst php-block-stmt-1-kwds '("do" "else" "finally" "try"))
+(defconst php-block-stmt-2-kwds
+  '("for" "if" "while" "switch" "foreach" "elseif"  "catch all"))
+
+(defconst php-block-stmt-1-key
+  (regexp-opt php-block-stmt-1-kwds))
+(defconst php-block-stmt-2-key
+  (regexp-opt php-block-stmt-2-kwds))
+
+(defconst php-class-decl-kwds '("class" "interface"))
+
+(defconst php-class-key
+  (concat
+   "\\(" (regexp-opt php-class-decl-kwds) "\\)\\s-+"
+   c-symbol-key                                 ;; Class name.
+   "\\(\\s-*extends\\s-*" c-symbol-key "\\)?"   ;; Name of superclass.
+   "\\(\\s-*implements\\s-*[^{]+{\\)?")) ;; List of any adopted protocols.
+
+;;;###NOautoload
+(define-derived-mode php-mode c-mode "PHP"
+  "Major mode for editing PHP code.\n\n\\{php-mode-map}"
+  (c-add-language 'php-mode 'c-mode)
+
+;; PHP doesn't have C-style macros.
+;; HACK: Overwrite this syntax with rules to match <?php and others.
+;;   (c-lang-defconst c-opt-cpp-start php php-tags-key)
+;;   (c-lang-defvar c-opt-cpp-start (c-lang-const c-opt-cpp-start))
+  (set (make-local-variable 'c-opt-cpp-start) php-tags-key)
+;;   (c-lang-defconst c-opt-cpp-start php php-tags-key)
+;;   (c-lang-defvar c-opt-cpp-start (c-lang-const c-opt-cpp-start))
+  (set (make-local-variable 'c-opt-cpp-prefix) php-tags-key)
+
+  (c-set-offset 'cpp-macro 0)
+  
+;;   (c-lang-defconst c-block-stmt-1-kwds php php-block-stmt-1-kwds)
+;;   (c-lang-defvar c-block-stmt-1-kwds (c-lang-const c-block-stmt-1-kwds))
+  (set (make-local-variable 'c-block-stmt-1-key) php-block-stmt-1-key)
+
+;;   (c-lang-defconst c-block-stmt-2-kwds php php-block-stmt-2-kwds)
+;;   (c-lang-defvar c-block-stmt-2-kwds (c-lang-const c-block-stmt-2-kwds))
+  (set (make-local-variable 'c-block-stmt-2-key) php-block-stmt-2-key)
+
+  ;; Specify that cc-mode recognize Javadoc comment style
+  (set (make-local-variable 'c-doc-comment-style)
+    '((php-mode . javadoc)))
+
+;;   (c-lang-defconst c-class-decl-kwds
+;;     php php-class-decl-kwds)
+  (set (make-local-variable 'c-class-key) php-class-key)
+
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults
+        '((php-font-lock-keywords-1
+           php-font-lock-keywords-2
+           ;; Comment-out the next line if the font-coloring is too
+           ;; extreme/ugly for you.
+           php-font-lock-keywords-3)
+          nil                               ; KEYWORDS-ONLY
+          t                                 ; CASE-FOLD
+          nil                               ; SYNTAX-ALIST
+          nil))                             ; SYNTAX-BEGIN
+
+  ;; Electric behaviour must be turned off, they do not work since
+  ;; they can not find the correct syntax in embedded PHP.
+  ;;
+  ;; Seems to work with narrowing so let it be on if the user prefers it.
+  ;;(setq c-electric-flag nil)
+
+  (setq font-lock-maximum-decoration t
+        case-fold-search t              ; PHP vars are case-sensitive
+        imenu-generic-expression php-imenu-generic-expression)
+
+  ;; Do not force newline at end of file.  Such newlines can cause
+  ;; trouble if the PHP file is included in another file before calls
+  ;; to header() or cookie().
+  (set (make-local-variable 'require-final-newline) nil)
+  (set (make-local-variable 'next-line-add-newlines) nil)
+
+  ;; PEAR coding standards
+  (add-hook 'php-mode-pear-hook
+	    (lambda ()
+	      (set (make-local-variable 'tab-width) 4)
+	      (set (make-local-variable 'c-basic-offset) 4)
+	      (set (make-local-variable 'indent-tabs-mode) nil)
+	      (c-set-offset 'block-open' - )
+	      (c-set-offset 'block-close' 0 )) nil t)
+
+  (if (or php-mode-force-pear
+          (and (stringp buffer-file-name)
+               (string-match "PEAR\\|pear"
+                             (buffer-file-name))
+               (string-match "\\.php$" (buffer-file-name))))
+      (run-hooks 'php-mode-pear-hook))
+
+  (setq indent-line-function 'php-cautious-indent-line)
+  (setq indent-region-function 'php-cautious-indent-region)
+  (setq c-special-indent-hook nil)
+
+  (set (make-local-variable 'beginning-of-defun-function)
+       'php-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'php-end-of-defun)
+  (set (make-local-variable 'open-paren-in-column-0-is-defun-start)
+       nil)
+  (set (make-local-variable 'defun-prompt-regexp)
+       "^\\s-*function\\s-+&?\\s-*\\(\\(\\sw\\|\\s_\\)+\\)\\s-*")
+  (set (make-local-variable 'add-log-current-defun-header-regexp)
+       php-beginning-of-defun-regexp)
+
+  (run-hooks 'php-mode-hook))
+
+;; Make a menu keymap (with a prompt string)
+;; and make it the menu bar item's definition.
+(define-key php-mode-map [menu-bar] (make-sparse-keymap))
+(define-key php-mode-map [menu-bar php]
+  (cons "PHP" (make-sparse-keymap "PHP")))
+
+;; Define specific subcommands in this menu.
+(define-key php-mode-map [menu-bar php complete-function]
+  '("Complete function name" . php-complete-function))
+(define-key php-mode-map
+  [menu-bar php browse-manual]
+  '("Browse manual" . php-browse-manual))
+(define-key php-mode-map
+  [menu-bar php search-documentation]
+  '("Search documentation" . php-search-documentation))
+
+;; Define function name completion function
+(defun php-complete-function ()
+  "Perform function completion on the text around point.
+Completes to the set of names listed in the current tags table
+and the standard php functions.
+The string to complete is chosen in the same way as the default
+for \\[find-tag] (which see)."
+  (interactive)
+  (let ((pattern (php-get-pattern))
+        beg
+        completion
+        (php-functions (php-completion-table)))
+    (if (not pattern) (message "Nothing to complete")
+        (search-backward pattern)
+        (setq beg (point))
+        (forward-char (length pattern))
+        (setq completion (try-completion pattern php-functions nil))
+        (cond ((eq completion t))
+              ((null completion)
+               (message "Can't find completion for \"%s\"" pattern)
+               (ding))
+              ((not (string= pattern completion))
+               (delete-region beg (point))
+               (insert completion))
+              (t
+               (message "Making completion list...")
+               (with-output-to-temp-buffer "*Completions*"
+                 (display-completion-list
+                  (all-completions pattern php-functions)))
+               (message "Making completion list...%s" "done"))))))
+
+;; Build php-completion-table on demand.  The table includes the
+;; PHP functions and the tags from the current tags-file-name
+(defun php-completion-table ()
+  (or (and tags-file-name
+           (save-excursion (tags-verify-table tags-file-name))
+           php-completion-table)
+      (let ((tags-table
+             (if (and tags-file-name
+                      (functionp 'etags-tags-completion-table))
+                 (with-current-buffer (get-file-buffer tags-file-name)
+                   (etags-tags-completion-table))
+               nil))
+            (php-table
+             (cond ((and (not (string= "" php-completion-file))
+                         (file-readable-p php-completion-file))
+                    (php-build-table-from-file php-completion-file))
+                   (php-manual-path
+                    (php-build-table-from-path php-manual-path))
+                   (t nil))))
+        (unless (or php-table tags-table)
+          (error
+           (concat "No TAGS file active nor are "
+                   "`php-completion-file' or `php-manual-path' set")))
+        (when tags-table
+          ;; Combine the tables.
+          (mapatoms (lambda (sym) (intern (symbol-name sym) php-table))
+                    tags-table))
+        (setq php-completion-table php-table))))
+
+(defun php-build-table-from-file (filename)
+  (let ((table (make-vector 1022 0))
+        (buf (find-file-noselect filename)))
+    (save-excursion
+      (set-buffer buf)
+      (goto-char (point-min))
+      (while (re-search-forward
+              "^\\([-a-zA-Z0-9_.]+\\)\n"
+              nil t)
+        (intern (buffer-substring (match-beginning 1) (match-end 1))
+                table)))
+    (kill-buffer buf)
+    table))
+
+(defun php-build-table-from-path (path)
+  (let ((table (make-vector 1022 0))
+        (files (directory-files
+                path
+                nil
+                "^function\\..+\\.html$")))
+    (mapc (lambda (file)
+            (string-match "\\.\\([-a-zA-Z_0-9]+\\)\\.html$" file)
+            (intern
+             (replace-regexp-in-string
+              "-" "_" (substring file (match-beginning 1) (match-end 1)) t)
+             table))
+          files)
+    table))
+
+;; Find the pattern we want to complete
+;; find-tag-default from GNU Emacs etags.el
+(defun php-get-pattern ()
+  (save-excursion
+    (while (looking-at "\\sw\\|\\s_")
+      (forward-char 1))
+    (if (or (re-search-backward "\\sw\\|\\s_"
+				(save-excursion (beginning-of-line) (point))
+				t)
+	    (re-search-forward "\\(\\sw\\|\\s_\\)+"
+			       (save-excursion (end-of-line) (point))
+			       t))
+	(progn (goto-char (match-end 0))
+	       (buffer-substring-no-properties
+                (point)
+                (progn (forward-sexp -1)
+                       (while (looking-at "\\s'")
+                         (forward-char 1))
+                       (point))))
+      nil)))
+
+
+(defun php-show-arglist ()
+  (interactive)
+  (let* ((tagname (php-get-pattern))
+         (buf (find-tag-noselect tagname nil nil))
+         arglist)
+    (save-excursion
+      (set-buffer buf)
+      (goto-char (point-min))
+      (when (re-search-forward
+             (format "function\\s-+%s\\s-*(\\([^{]*\\))" tagname)
+             nil t)
+        (setq arglist (buffer-substring-no-properties
+                       (match-beginning 1) (match-end 1)))))
+    (if arglist
+        (message "Arglist for %s: %s" tagname arglist)
+        (message "unknown function: %s" tagname))))
+
+;; Define function documentation function
+(defun php-search-documentation ()
+  "Search PHP documentation for the word at the point."
+  (interactive)
+  (browse-url (concat php-search-url (current-word t))))
+
+;; Define function for browsing manual
+(defun php-browse-manual ()
+  "Bring up manual for PHP."
+  (interactive)
+  (browse-url php-manual-url))
+
+;; Define shortcut
+(define-key php-mode-map
+  "\C-c\C-f"
+  'php-search-documentation)
+
+;; Define shortcut
+(define-key php-mode-map
+  [(meta tab)]
+  'php-complete-function)
+
+;; Define shortcut
+(define-key php-mode-map
+  "\C-c\C-m"
+  'php-browse-manual)
+
+;; Define shortcut
+(define-key php-mode-map
+  '[(control .)]
+  'php-show-arglist)
+
+(defconst php-constants
+  (eval-when-compile
+    (regexp-opt
+     '(;; core constants
+       "__LINE__" "__FILE__"
+       "__FUNCTION__" "__CLASS__" "__METHOD__"
+       "PHP_OS" "PHP_VERSION"
+       "TRUE" "FALSE" "NULL"
+       "E_ERROR" "E_NOTICE" "E_PARSE" "E_WARNING" "E_ALL" "E_STRICT"
+       "E_USER_ERROR" "E_USER_WARNING" "E_USER_NOTICE"
+       "DEFAULT_INCLUDE_PATH" "PEAR_INSTALL_DIR" "PEAR_EXTENSION_DIR"
+       "PHP_BINDIR" "PHP_LIBDIR" "PHP_DATADIR" "PHP_SYSCONFDIR"
+       "PHP_LOCALSTATEDIR" "PHP_CONFIG_FILE_PATH"
+       "PHP_EOL"
+
+
+       ;; date and time constants
+       "DATE_ATOM" "DATE_COOKIE" "DATE_ISO8601"
+       "DATE_RFC822" "DATE_RFC850" "DATE_RFC1036" "DATE_RFC1123"
+       "DATE_RFC2822" "DATE_RFC3339"
+       "DATE_RSS" "DATE_W3C"
+
+      ;; from ext/standard:
+       "EXTR_OVERWRITE" "EXTR_SKIP" "EXTR_PREFIX_SAME"
+       "EXTR_PREFIX_ALL" "EXTR_PREFIX_INVALID" "SORT_ASC" "SORT_DESC"
+       "SORT_REGULAR" "SORT_NUMERIC" "SORT_STRING" "ASSERT_ACTIVE"
+       "ASSERT_CALLBACK" "ASSERT_BAIL" "ASSERT_WARNING"
+       "ASSERT_QUIET_EVAL" "CONNECTION_ABORTED" "CONNECTION_NORMAL"
+       "CONNECTION_TIMEOUT" "M_E" "M_LOG2E" "M_LOG10E" "M_LN2"
+       "M_LN10" "M_PI" "M_PI_2" "M_PI_4" "M_1_PI" "M_2_PI"
+       "M_2_SQRTPI" "M_SQRT2" "M_SQRT1_2" "CRYPT_SALT_LENGTH"
+       "CRYPT_STD_DES" "CRYPT_EXT_DES" "CRYPT_MD5" "CRYPT_BLOWFISH"
+       "DIRECTORY_SEPARATOR" "SEEK_SET" "SEEK_CUR" "SEEK_END"
+       "LOCK_SH" "LOCK_EX" "LOCK_UN" "LOCK_NB" "HTML_SPECIALCHARS"
+       "HTML_ENTITIES" "ENT_COMPAT" "ENT_QUOTES" "ENT_NOQUOTES"
+       "INFO_GENERAL" "INFO_CREDITS" "INFO_CONFIGURATION"
+       "INFO_ENVIRONMENT" "INFO_VARIABLES" "INFO_LICENSE" "INFO_ALL"
+       "CREDITS_GROUP" "CREDITS_GENERAL" "CREDITS_SAPI"
+       "CREDITS_MODULES" "CREDITS_DOCS" "CREDITS_FULLPAGE"
+       "CREDITS_QA" "CREDITS_ALL" "PHP_OUTPUT_HANDLER_START"
+       "PHP_OUTPUT_HANDLER_CONT" "PHP_OUTPUT_HANDLER_END"
+       "STR_PAD_LEFT" "STR_PAD_RIGHT" "STR_PAD_BOTH"
+       "PATHINFO_DIRNAME" "PATHINFO_BASENAME" "PATHINFO_EXTENSION"
+       "CHAR_MAX" "LC_CTYPE" "LC_NUMERIC" "LC_TIME" "LC_COLLATE"
+       "LC_MONETARY" "LC_ALL" "LC_MESSAGES" "LOG_EMERG" "LOG_ALERT"
+       "LOG_CRIT" "LOG_ERR" "LOG_WARNING" "LOG_NOTICE" "LOG_INFO"
+       "LOG_DEBUG" "LOG_KERN" "LOG_USER" "LOG_MAIL" "LOG_DAEMON"
+       "LOG_AUTH" "LOG_SYSLOG" "LOG_LPR" "LOG_NEWS" "LOG_UUCP"
+       "LOG_CRON" "LOG_AUTHPRIV" "LOG_LOCAL0" "LOG_LOCAL1"
+       "LOG_LOCAL2" "LOG_LOCAL3" "LOG_LOCAL4" "LOG_LOCAL5"
+       "LOG_LOCAL6" "LOG_LOCAL7" "LOG_PID" "LOG_CONS" "LOG_ODELAY"
+       "LOG_NDELAY" "LOG_NOWAIT" "LOG_PERROR"
+
+       ;; Disabled by default because they slow buffer loading
+       ;; If you have use for them, uncomment the strings
+       ;; that you want colored.
+       ;; To compile, you may have to increase 'max-specpdl-size'
+
+       ;; from other bundled extensions:
+;        "CAL_EASTER_TO_xxx" "VT_NULL" "VT_EMPTY" "VT_UI1" "VT_I2"
+;        "VT_I4" "VT_R4" "VT_R8" "VT_BOOL" "VT_ERROR" "VT_CY" "VT_DATE"
+;        "VT_BSTR" "VT_DECIMAL" "VT_UNKNOWN" "VT_DISPATCH" "VT_VARIANT"
+;        "VT_I1" "VT_UI2" "VT_UI4" "VT_INT" "VT_UINT" "VT_ARRAY"
+;        "VT_BYREF" "CP_ACP" "CP_MACCP" "CP_OEMCP" "CP_SYMBOL"
+;        "CP_THREAD_ACP" "CP_UTF7" "CP_UTF8" "CPDF_PM_NONE"
+;        "CPDF_PM_OUTLINES" "CPDF_PM_THUMBS" "CPDF_PM_FULLSCREEN"
+;        "CPDF_PL_SINGLE" "CPDF_PL_1COLUMN" "CPDF_PL_2LCOLUMN"
+;        "CPDF_PL_2RCOLUMN" "CURLOPT_PORT" "CURLOPT_FILE"
+;        "CURLOPT_INFILE" "CURLOPT_INFILESIZE" "CURLOPT_URL"
+;        "CURLOPT_PROXY" "CURLOPT_VERBOSE" "CURLOPT_HEADER"
+;        "CURLOPT_HTTPHEADER" "CURLOPT_NOPROGRESS" "CURLOPT_NOBODY"
+;        "CURLOPT_FAILONERROR" "CURLOPT_UPLOAD" "CURLOPT_POST"
+;        "CURLOPT_FTPLISTONLY" "CURLOPT_FTPAPPEND" "CURLOPT_NETRC"
+;        "CURLOPT_FOLLOWLOCATION" "CURLOPT_FTPASCII" "CURLOPT_PUT"
+;        "CURLOPT_MUTE" "CURLOPT_USERPWD" "CURLOPT_PROXYUSERPWD"
+;        "CURLOPT_RANGE" "CURLOPT_TIMEOUT" "CURLOPT_POSTFIELDS"
+;        "CURLOPT_REFERER" "CURLOPT_USERAGENT" "CURLOPT_FTPPORT"
+;        "CURLOPT_LOW_SPEED_LIMIT" "CURLOPT_LOW_SPEED_TIME"
+;        "CURLOPT_RESUME_FROM" "CURLOPT_COOKIE" "CURLOPT_SSLCERT"
+;        "CURLOPT_SSLCERTPASSWD" "CURLOPT_WRITEHEADER"
+;        "CURLOPT_COOKIEFILE" "CURLOPT_SSLVERSION"
+;        "CURLOPT_TIMECONDITION" "CURLOPT_TIMEVALUE"
+;        "CURLOPT_CUSTOMREQUEST" "CURLOPT_STDERR" "CURLOPT_TRANSFERTEXT"
+;        "CURLOPT_RETURNTRANSFER" "CURLOPT_QUOTE" "CURLOPT_POSTQUOTE"
+;        "CURLOPT_INTERFACE" "CURLOPT_KRB4LEVEL"
+;        "CURLOPT_HTTPPROXYTUNNEL" "CURLOPT_FILETIME"
+;        "CURLOPT_WRITEFUNCTION" "CURLOPT_READFUNCTION"
+;        "CURLOPT_PASSWDFUNCTION" "CURLOPT_HEADERFUNCTION"
+;        "CURLOPT_MAXREDIRS" "CURLOPT_MAXCONNECTS" "CURLOPT_CLOSEPOLICY"
+;        "CURLOPT_FRESH_CONNECT" "CURLOPT_FORBID_REUSE"
+;        "CURLOPT_RANDOM_FILE" "CURLOPT_EGDSOCKET"
+;        "CURLOPT_CONNECTTIMEOUT" "CURLOPT_SSL_VERIFYPEER"
+;        "CURLOPT_CAINFO" "CURLOPT_BINARYTRANSER"
+;        "CURLCLOSEPOLICY_LEAST_RECENTLY_USED" "CURLCLOSEPOLICY_OLDEST"
+;        "CURLINFO_EFFECTIVE_URL" "CURLINFO_HTTP_CODE"
+;        "CURLINFO_HEADER_SIZE" "CURLINFO_REQUEST_SIZE"
+;        "CURLINFO_TOTAL_TIME" "CURLINFO_NAMELOOKUP_TIME"
+;        "CURLINFO_CONNECT_TIME" "CURLINFO_PRETRANSFER_TIME"
+;        "CURLINFO_SIZE_UPLOAD" "CURLINFO_SIZE_DOWNLOAD"
+;        "CURLINFO_SPEED_DOWNLOAD" "CURLINFO_SPEED_UPLOAD"
+;        "CURLINFO_FILETIME" "CURLE_OK" "CURLE_UNSUPPORTED_PROTOCOL"
+;        "CURLE_FAILED_INIT" "CURLE_URL_MALFORMAT"
+;        "CURLE_URL_MALFORMAT_USER" "CURLE_COULDNT_RESOLVE_PROXY"
+;        "CURLE_COULDNT_RESOLVE_HOST" "CURLE_COULDNT_CONNECT"
+;        "CURLE_FTP_WEIRD_SERVER_REPLY" "CURLE_FTP_ACCESS_DENIED"
+;        "CURLE_FTP_USER_PASSWORD_INCORRECT"
+;        "CURLE_FTP_WEIRD_PASS_REPLY" "CURLE_FTP_WEIRD_USER_REPLY"
+;        "CURLE_FTP_WEIRD_PASV_REPLY" "CURLE_FTP_WEIRD_227_FORMAT"
+;        "CURLE_FTP_CANT_GET_HOST" "CURLE_FTP_CANT_RECONNECT"
+;        "CURLE_FTP_COULDNT_SET_BINARY" "CURLE_PARTIAL_FILE"
+;        "CURLE_FTP_COULDNT_RETR_FILE" "CURLE_FTP_WRITE_ERROR"
+;        "CURLE_FTP_QUOTE_ERROR" "CURLE_HTTP_NOT_FOUND"
+;        "CURLE_WRITE_ERROR" "CURLE_MALFORMAT_USER"
+;        "CURLE_FTP_COULDNT_STOR_FILE" "CURLE_READ_ERROR"
+;        "CURLE_OUT_OF_MEMORY" "CURLE_OPERATION_TIMEOUTED"
+;        "CURLE_FTP_COULDNT_SET_ASCII" "CURLE_FTP_PORT_FAILED"
+;        "CURLE_FTP_COULDNT_USE_REST" "CURLE_FTP_COULDNT_GET_SIZE"
+;        "CURLE_HTTP_RANGE_ERROR" "CURLE_HTTP_POST_ERROR"
+;        "CURLE_SSL_CONNECT_ERROR" "CURLE_FTP_BAD_DOWNLOAD_RESUME"
+;        "CURLE_FILE_COULDNT_READ_FILE" "CURLE_LDAP_CANNOT_BIND"
+;        "CURLE_LDAP_SEARCH_FAILED" "CURLE_LIBRARY_NOT_FOUND"
+;        "CURLE_FUNCTION_NOT_FOUND" "CURLE_ABORTED_BY_CALLBACK"
+;        "CURLE_BAD_FUNCTION_ARGUMENT" "CURLE_BAD_CALLING_ORDER"
+;        "CURLE_HTTP_PORT_FAILED" "CURLE_BAD_PASSWORD_ENTERED"
+;        "CURLE_TOO_MANY_REDIRECTS" "CURLE_UNKOWN_TELNET_OPTION"
+;        "CURLE_TELNET_OPTION_SYNTAX" "CURLE_ALREADY_COMPLETE"
+;        "DBX_MYSQL" "DBX_ODBC" "DBX_PGSQL" "DBX_MSSQL" "DBX_PERSISTENT"
+;        "DBX_RESULT_INFO" "DBX_RESULT_INDEX" "DBX_RESULT_ASSOC"
+;        "DBX_CMP_TEXT" "DBX_CMP_NUMBER" "XML_ELEMENT_NODE"
+;        "XML_ATTRIBUTE_NODE" "XML_TEXT_NODE" "XML_CDATA_SECTION_NODE"
+;        "XML_ENTITY_REF_NODE" "XML_ENTITY_NODE" "XML_PI_NODE"
+;        "XML_COMMENT_NODE" "XML_DOCUMENT_NODE" "XML_DOCUMENT_TYPE_NODE"
+;        "XML_DOCUMENT_FRAG_NODE" "XML_NOTATION_NODE"
+;        "XML_HTML_DOCUMENT_NODE" "XML_DTD_NODE" "XML_ELEMENT_DECL_NODE"
+;        "XML_ATTRIBUTE_DECL_NODE" "XML_ENTITY_DECL_NODE"
+;        "XML_NAMESPACE_DECL_NODE" "XML_GLOBAL_NAMESPACE"
+;        "XML_LOCAL_NAMESPACE" "XML_ATTRIBUTE_CDATA" "XML_ATTRIBUTE_ID"
+;        "XML_ATTRIBUTE_IDREF" "XML_ATTRIBUTE_IDREFS"
+;        "XML_ATTRIBUTE_ENTITY" "XML_ATTRIBUTE_NMTOKEN"
+;        "XML_ATTRIBUTE_NMTOKENS" "XML_ATTRIBUTE_ENUMERATION"
+;        "XML_ATTRIBUTE_NOTATION" "XPATH_UNDEFINED" "XPATH_NODESET"
+;        "XPATH_BOOLEAN" "XPATH_NUMBER" "XPATH_STRING" "XPATH_POINT"
+;        "XPATH_RANGE" "XPATH_LOCATIONSET" "XPATH_USERS" "FBSQL_ASSOC"
+;        "FBSQL_NUM" "FBSQL_BOTH" "FDFValue" "FDFStatus" "FDFFile"
+;        "FDFID" "FDFFf" "FDFSetFf" "FDFClearFf" "FDFFlags" "FDFSetF"
+;        "FDFClrF" "FDFAP" "FDFAS" "FDFAction" "FDFAA" "FDFAPRef"
+;        "FDFIF" "FDFEnter" "FDFExit" "FDFDown" "FDFUp" "FDFFormat"
+;        "FDFValidate" "FDFKeystroke" "FDFCalculate"
+;        "FRIBIDI_CHARSET_UTF8" "FRIBIDI_CHARSET_8859_6"
+;        "FRIBIDI_CHARSET_8859_8" "FRIBIDI_CHARSET_CP1255"
+;        "FRIBIDI_CHARSET_CP1256" "FRIBIDI_CHARSET_ISIRI_3342"
+;        "FTP_ASCII" "FTP_BINARY" "FTP_IMAGE" "FTP_TEXT" "IMG_GIF"
+;        "IMG_JPG" "IMG_JPEG" "IMG_PNG" "IMG_WBMP" "IMG_COLOR_TILED"
+;        "IMG_COLOR_STYLED" "IMG_COLOR_BRUSHED"
+;        "IMG_COLOR_STYLEDBRUSHED" "IMG_COLOR_TRANSPARENT"
+;        "IMG_ARC_ROUNDED" "IMG_ARC_PIE" "IMG_ARC_CHORD"
+;        "IMG_ARC_NOFILL" "IMG_ARC_EDGED" "GMP_ROUND_ZERO"
+;        "GMP_ROUND_PLUSINF" "GMP_ROUND_MINUSINF" "HW_ATTR_LANG"
+;        "HW_ATTR_NR" "HW_ATTR_NONE" "IIS_READ" "IIS_WRITE"
+;        "IIS_EXECUTE" "IIS_SCRIPT" "IIS_ANONYMOUS" "IIS_BASIC"
+;        "IIS_NTLM" "NIL" "OP_DEBUG" "OP_READONLY" "OP_ANONYMOUS"
+;        "OP_SHORTCACHE" "OP_SILENT" "OP_PROTOTYPE" "OP_HALFOPEN"
+;        "OP_EXPUNGE" "OP_SECURE" "CL_EXPUNGE" "FT_UID" "FT_PEEK"
+;        "FT_NOT" "FT_INTERNAL" "FT_PREFETCHTEXT" "ST_UID" "ST_SILENT"
+;        "ST_SET" "CP_UID" "CP_MOVE" "SE_UID" "SE_FREE" "SE_NOPREFETCH"
+;        "SO_FREE" "SO_NOSERVER" "SA_MESSAGES" "SA_RECENT" "SA_UNSEEN"
+;        "SA_UIDNEXT" "SA_UIDVALIDITY" "SA_ALL" "LATT_NOINFERIORS"
+;        "LATT_NOSELECT" "LATT_MARKED" "LATT_UNMARKED" "SORTDATE"
+;        "SORTARRIVAL" "SORTFROM" "SORTSUBJECT" "SORTTO" "SORTCC"
+;        "SORTSIZE" "TYPETEXT" "TYPEMULTIPART" "TYPEMESSAGE"
+;        "TYPEAPPLICATION" "TYPEAUDIO" "TYPEIMAGE" "TYPEVIDEO"
+;        "TYPEOTHER" "ENC7BIT" "ENC8BIT" "ENCBINARY" "ENCBASE64"
+;        "ENCQUOTEDPRINTABLE" "ENCOTHER" "INGRES_ASSOC" "INGRES_NUM"
+;        "INGRES_BOTH" "IBASE_DEFAULT" "IBASE_TEXT" "IBASE_UNIXTIME"
+;        "IBASE_READ" "IBASE_COMMITTED" "IBASE_CONSISTENCY"
+;        "IBASE_NOWAIT" "IBASE_TIMESTAMP" "IBASE_DATE" "IBASE_TIME"
+;        "LDAP_DEREF_NEVER" "LDAP_DEREF_SEARCHING" "LDAP_DEREF_FINDING"
+;        "LDAP_DEREF_ALWAYS" "LDAP_OPT_DEREF" "LDAP_OPT_SIZELIMIT"
+;        "LDAP_OPT_TIMELIMIT" "LDAP_OPT_PROTOCOL_VERSION"
+;        "LDAP_OPT_ERROR_NUMBER" "LDAP_OPT_REFERRALS" "LDAP_OPT_RESTART"
+;        "LDAP_OPT_HOST_NAME" "LDAP_OPT_ERROR_STRING"
+;        "LDAP_OPT_MATCHED_DN" "LDAP_OPT_SERVER_CONTROLS"
+;        "LDAP_OPT_CLIENT_CONTROLS" "GSLC_SSL_NO_AUTH"
+;        "GSLC_SSL_ONEWAY_AUTH" "GSLC_SSL_TWOWAY_AUTH" "MCAL_SUNDAY"
+;        "MCAL_MONDAY" "MCAL_TUESDAY" "MCAL_WEDNESDAY" "MCAL_THURSDAY"
+;        "MCAL_FRIDAY" "MCAL_SATURDAY" "MCAL_JANUARY" "MCAL_FEBRUARY"
+;        "MCAL_MARCH" "MCAL_APRIL" "MCAL_MAY" "MCAL_JUNE" "MCAL_JULY"
+;        "MCAL_AUGUST" "MCAL_SEPTEMBER" "MCAL_OCTOBER" "MCAL_NOVEMBER"
+;        "MCAL_RECUR_NONE" "MCAL_RECUR_DAILY" "MCAL_RECUR_WEEKLY"
+;        "MCAL_RECUR_MONTHLY_MDAY" "MCAL_RECUR_MONTHLY_WDAY"
+;        "MCAL_RECUR_YEARLY" "MCAL_M_SUNDAY" "MCAL_M_MONDAY"
+;        "MCAL_M_TUESDAY" "MCAL_M_WEDNESDAY" "MCAL_M_THURSDAY"
+;        "MCAL_M_FRIDAY" "MCAL_M_SATURDAY" "MCAL_M_WEEKDAYS"
+;        "MCAL_M_WEEKEND" "MCAL_M_ALLDAYS" "MCRYPT_" "MCRYPT_"
+;        "MCRYPT_ENCRYPT" "MCRYPT_DECRYPT" "MCRYPT_DEV_RANDOM"
+;        "MCRYPT_DEV_URANDOM" "MCRYPT_RAND" "SWFBUTTON_HIT"
+;        "SUNFUNCS_RET_STRING" "SUNFUNCS_RET_DOUBLE"
+;        "SWFBUTTON_DOWN" "SWFBUTTON_OVER" "SWFBUTTON_UP"
+;        "SWFBUTTON_MOUSEUPOUTSIDE" "SWFBUTTON_DRAGOVER"
+;        "SWFBUTTON_DRAGOUT" "SWFBUTTON_MOUSEUP" "SWFBUTTON_MOUSEDOWN"
+;        "SWFBUTTON_MOUSEOUT" "SWFBUTTON_MOUSEOVER"
+;        "SWFFILL_RADIAL_GRADIENT" "SWFFILL_LINEAR_GRADIENT"
+;        "SWFFILL_TILED_BITMAP" "SWFFILL_CLIPPED_BITMAP"
+;        "SWFTEXTFIELD_HASLENGTH" "SWFTEXTFIELD_NOEDIT"
+;        "SWFTEXTFIELD_PASSWORD" "SWFTEXTFIELD_MULTILINE"
+;        "SWFTEXTFIELD_WORDWRAP" "SWFTEXTFIELD_DRAWBOX"
+;        "SWFTEXTFIELD_NOSELECT" "SWFTEXTFIELD_HTML"
+;        "SWFTEXTFIELD_ALIGN_LEFT" "SWFTEXTFIELD_ALIGN_RIGHT"
+;        "SWFTEXTFIELD_ALIGN_CENTER" "SWFTEXTFIELD_ALIGN_JUSTIFY"
+;        "UDM_FIELD_URLID" "UDM_FIELD_URL" "UDM_FIELD_CONTENT"
+;        "UDM_FIELD_TITLE" "UDM_FIELD_KEYWORDS" "UDM_FIELD_DESC"
+;        "UDM_FIELD_DESCRIPTION" "UDM_FIELD_TEXT" "UDM_FIELD_SIZE"
+;        "UDM_FIELD_RATING" "UDM_FIELD_SCORE" "UDM_FIELD_MODIFIED"
+;        "UDM_FIELD_ORDER" "UDM_FIELD_CRC" "UDM_FIELD_CATEGORY"
+;        "UDM_PARAM_PAGE_SIZE" "UDM_PARAM_PAGE_NUM"
+;        "UDM_PARAM_SEARCH_MODE" "UDM_PARAM_CACHE_MODE"
+;        "UDM_PARAM_TRACK_MODE" "UDM_PARAM_PHRASE_MODE"
+;        "UDM_PARAM_CHARSET" "UDM_PARAM_STOPTABLE"
+;        "UDM_PARAM_STOP_TABLE" "UDM_PARAM_STOPFILE"
+;        "UDM_PARAM_STOP_FILE" "UDM_PARAM_WEIGHT_FACTOR"
+;        "UDM_PARAM_WORD_MATCH" "UDM_PARAM_MAX_WORD_LEN"
+;        "UDM_PARAM_MAX_WORDLEN" "UDM_PARAM_MIN_WORD_LEN"
+;        "UDM_PARAM_MIN_WORDLEN" "UDM_PARAM_ISPELL_PREFIXES"
+;        "UDM_PARAM_ISPELL_PREFIX" "UDM_PARAM_PREFIXES"
+;        "UDM_PARAM_PREFIX" "UDM_PARAM_CROSS_WORDS"
+;        "UDM_PARAM_CROSSWORDS" "UDM_LIMIT_CAT" "UDM_LIMIT_URL"
+;        "UDM_LIMIT_TAG" "UDM_LIMIT_LANG" "UDM_LIMIT_DATE"
+;        "UDM_PARAM_FOUND" "UDM_PARAM_NUM_ROWS" "UDM_PARAM_WORDINFO"
+;        "UDM_PARAM_WORD_INFO" "UDM_PARAM_SEARCHTIME"
+;        "UDM_PARAM_SEARCH_TIME" "UDM_PARAM_FIRST_DOC"
+;        "UDM_PARAM_LAST_DOC" "UDM_MODE_ALL" "UDM_MODE_ANY"
+;        "UDM_MODE_BOOL" "UDM_MODE_PHRASE" "UDM_CACHE_ENABLED"
+;        "UDM_CACHE_DISABLED" "UDM_TRACK_ENABLED" "UDM_TRACK_DISABLED"
+;        "UDM_PHRASE_ENABLED" "UDM_PHRASE_DISABLED"
+;        "UDM_CROSS_WORDS_ENABLED" "UDM_CROSSWORDS_ENABLED"
+;        "UDM_CROSS_WORDS_DISABLED" "UDM_CROSSWORDS_DISABLED"
+;        "UDM_PREFIXES_ENABLED" "UDM_PREFIX_ENABLED"
+;        "UDM_ISPELL_PREFIXES_ENABLED" "UDM_ISPELL_PREFIX_ENABLED"
+;        "UDM_PREFIXES_DISABLED" "UDM_PREFIX_DISABLED"
+;        "UDM_ISPELL_PREFIXES_DISABLED" "UDM_ISPELL_PREFIX_DISABLED"
+;        "UDM_ISPELL_TYPE_AFFIX" "UDM_ISPELL_TYPE_SPELL"
+;        "UDM_ISPELL_TYPE_DB" "UDM_ISPELL_TYPE_SERVER" "UDM_MATCH_WORD"
+;        "UDM_MATCH_BEGIN" "UDM_MATCH_SUBSTR" "UDM_MATCH_END"
+;        "MSQL_ASSOC" "MSQL_NUM" "MSQL_BOTH" "MYSQL_ASSOC" "MYSQL_NUM"
+;        "MYSQL_BOTH" "MYSQL_USE_RESULT" "MYSQL_STORE_RESULT"
+;        "OCI_DEFAULT" "OCI_DESCRIBE_ONLY" "OCI_COMMIT_ON_SUCCESS"
+;        "OCI_EXACT_FETCH" "SQLT_BFILEE" "SQLT_CFILEE" "SQLT_CLOB"
+;        "SQLT_BLOB" "SQLT_RDD" "OCI_B_SQLT_NTY" "OCI_SYSDATE"
+;        "OCI_B_BFILE" "OCI_B_CFILEE" "OCI_B_CLOB" "OCI_B_BLOB"
+;        "OCI_B_ROWID" "OCI_B_CURSOR" "OCI_B_BIN" "OCI_ASSOC" "OCI_NUM"
+;        "OCI_BOTH" "OCI_RETURN_NULLS" "OCI_RETURN_LOBS"
+;        "OCI_DTYPE_FILE" "OCI_DTYPE_LOB" "OCI_DTYPE_ROWID" "OCI_D_FILE"
+;        "OCI_D_LOB" "OCI_D_ROWID" "ODBC_TYPE" "ODBC_BINMODE_PASSTHRU"
+;        "ODBC_BINMODE_RETURN" "ODBC_BINMODE_CONVERT" "SQL_ODBC_CURSORS"
+;        "SQL_CUR_USE_DRIVER" "SQL_CUR_USE_IF_NEEDED" "SQL_CUR_USE_ODBC"
+;        "SQL_CONCURRENCY" "SQL_CONCUR_READ_ONLY" "SQL_CONCUR_LOCK"
+;        "SQL_CONCUR_ROWVER" "SQL_CONCUR_VALUES" "SQL_CURSOR_TYPE"
+;        "SQL_CURSOR_FORWARD_ONLY" "SQL_CURSOR_KEYSET_DRIVEN"
+;        "SQL_CURSOR_DYNAMIC" "SQL_CURSOR_STATIC" "SQL_KEYSET_SIZE"
+;        "SQL_CHAR" "SQL_VARCHAR" "SQL_LONGVARCHAR" "SQL_DECIMAL"
+;        "SQL_NUMERIC" "SQL_BIT" "SQL_TINYINT" "SQL_SMALLINT"
+;        "SQL_INTEGER" "SQL_BIGINT" "SQL_REAL" "SQL_FLOAT" "SQL_DOUBLE"
+;        "SQL_BINARY" "SQL_VARBINARY" "SQL_LONGVARBINARY" "SQL_DATE"
+;        "SQL_TIME" "SQL_TIMESTAMP" "SQL_TYPE_DATE" "SQL_TYPE_TIME"
+;        "SQL_TYPE_TIMESTAMP" "SQL_BEST_ROWID" "SQL_ROWVER"
+;        "SQL_SCOPE_CURROW" "SQL_SCOPE_TRANSACTION" "SQL_SCOPE_SESSION"
+;        "SQL_NO_NULLS" "SQL_NULLABLE" "SQL_INDEX_UNIQUE"
+;        "SQL_INDEX_ALL" "SQL_ENSURE" "SQL_QUICK"
+;        "X509_PURPOSE_SSL_CLIENT" "X509_PURPOSE_SSL_SERVER"
+;        "X509_PURPOSE_NS_SSL_SERVER" "X509_PURPOSE_SMIME_SIGN"
+;        "X509_PURPOSE_SMIME_ENCRYPT" "X509_PURPOSE_CRL_SIGN"
+;        "X509_PURPOSE_ANY" "PKCS7_DETACHED" "PKCS7_TEXT"
+;        "PKCS7_NOINTERN" "PKCS7_NOVERIFY" "PKCS7_NOCHAIN"
+;        "PKCS7_NOCERTS" "PKCS7_NOATTR" "PKCS7_BINARY" "PKCS7_NOSIGS"
+;        "OPENSSL_PKCS1_PADDING" "OPENSSL_SSLV23_PADDING"
+;        "OPENSSL_NO_PADDING" "OPENSSL_PKCS1_OAEP_PADDING"
+;        "ORA_BIND_INOUT" "ORA_BIND_IN" "ORA_BIND_OUT"
+;        "ORA_FETCHINTO_ASSOC" "ORA_FETCHINTO_NULLS"
+;        "PREG_PATTERN_ORDER" "PREG_SET_ORDER" "PREG_SPLIT_NO_EMPTY"
+;        "PREG_SPLIT_DELIM_CAPTURE"
+;        "PGSQL_ASSOC" "PGSQL_NUM" "PGSQL_BOTH"
+;        "PRINTER_COPIES" "PRINTER_MODE" "PRINTER_TITLE"
+;        "PRINTER_DEVICENAME" "PRINTER_DRIVERVERSION"
+;        "PRINTER_RESOLUTION_Y" "PRINTER_RESOLUTION_X" "PRINTER_SCALE"
+;        "PRINTER_BACKGROUND_COLOR" "PRINTER_PAPER_LENGTH"
+;        "PRINTER_PAPER_WIDTH" "PRINTER_PAPER_FORMAT"
+;        "PRINTER_FORMAT_CUSTOM" "PRINTER_FORMAT_LETTER"
+;        "PRINTER_FORMAT_LEGAL" "PRINTER_FORMAT_A3" "PRINTER_FORMAT_A4"
+;        "PRINTER_FORMAT_A5" "PRINTER_FORMAT_B4" "PRINTER_FORMAT_B5"
+;        "PRINTER_FORMAT_FOLIO" "PRINTER_ORIENTATION"
+;        "PRINTER_ORIENTATION_PORTRAIT" "PRINTER_ORIENTATION_LANDSCAPE"
+;        "PRINTER_TEXT_COLOR" "PRINTER_TEXT_ALIGN" "PRINTER_TA_BASELINE"
+;        "PRINTER_TA_BOTTOM" "PRINTER_TA_TOP" "PRINTER_TA_CENTER"
+;        "PRINTER_TA_LEFT" "PRINTER_TA_RIGHT" "PRINTER_PEN_SOLID"
+;        "PRINTER_PEN_DASH" "PRINTER_PEN_DOT" "PRINTER_PEN_DASHDOT"
+;        "PRINTER_PEN_DASHDOTDOT" "PRINTER_PEN_INVISIBLE"
+;        "PRINTER_BRUSH_SOLID" "PRINTER_BRUSH_CUSTOM"
+;        "PRINTER_BRUSH_DIAGONAL" "PRINTER_BRUSH_CROSS"
+;        "PRINTER_BRUSH_DIAGCROSS" "PRINTER_BRUSH_FDIAGONAL"
+;        "PRINTER_BRUSH_HORIZONTAL" "PRINTER_BRUSH_VERTICAL"
+;        "PRINTER_FW_THIN" "PRINTER_FW_ULTRALIGHT" "PRINTER_FW_LIGHT"
+;        "PRINTER_FW_NORMAL" "PRINTER_FW_MEDIUM" "PRINTER_FW_BOLD"
+;        "PRINTER_FW_ULTRABOLD" "PRINTER_FW_HEAVY" "PRINTER_ENUM_LOCAL"
+;        "PRINTER_ENUM_NAME" "PRINTER_ENUM_SHARED"
+;        "PRINTER_ENUM_DEFAULT" "PRINTER_ENUM_CONNECTIONS"
+;        "PRINTER_ENUM_NETWORK" "PRINTER_ENUM_REMOTE" "PSPELL_FAST"
+;        "PSPELL_NORMAL" "PSPELL_BAD_SPELLERS" "PSPELL_RUN_TOGETHER"
+;        "SID" "SID" "AF_UNIX" "AF_INET" "SOCK_STREAM" "SOCK_DGRAM"
+;        "SOCK_RAW" "SOCK_SEQPACKET" "SOCK_RDM" "MSG_OOB" "MSG_WAITALL"
+;        "MSG_PEEK" "MSG_DONTROUTE" "SO_DEBUG" "SO_REUSEADDR"
+;        "SO_KEEPALIVE" "SO_DONTROUTE" "SO_LINGER" "SO_BROADCAST"
+;        "SO_OOBINLINE" "SO_SNDBUF" "SO_RCVBUF" "SO_SNDLOWAT"
+;        "SO_RCVLOWAT" "SO_SNDTIMEO" "SO_RCVTIMEO" "SO_TYPE" "SO_ERROR"
+;        "SOL_SOCKET" "PHP_NORMAL_READ" "PHP_BINARY_READ"
+;        "PHP_SYSTEM_READ" "SOL_TCP" "SOL_UDP" "MOD_COLOR" "MOD_MATRIX"
+;        "TYPE_PUSHBUTTON" "TYPE_MENUBUTTON" "BSHitTest" "BSDown"
+;        "BSOver" "BSUp" "OverDowntoIdle" "IdletoOverDown"
+;        "OutDowntoIdle" "OutDowntoOverDown" "OverDowntoOutDown"
+;        "OverUptoOverDown" "OverUptoIdle" "IdletoOverUp" "ButtonEnter"
+;        "ButtonExit" "MenuEnter" "MenuExit" "XML_ERROR_NONE"
+;        "XML_ERROR_NO_MEMORY" "XML_ERROR_SYNTAX"
+;        "XML_ERROR_NO_ELEMENTS" "XML_ERROR_INVALID_TOKEN"
+;        "XML_ERROR_UNCLOSED_TOKEN" "XML_ERROR_PARTIAL_CHAR"
+;        "XML_ERROR_TAG_MISMATCH" "XML_ERROR_DUPLICATE_ATTRIBUTE"
+;        "XML_ERROR_JUNK_AFTER_DOC_ELEMENT" "XML_ERROR_PARAM_ENTITY_REF"
+;        "XML_ERROR_UNDEFINED_ENTITY" "XML_ERROR_RECURSIVE_ENTITY_REF"
+;        "XML_ERROR_ASYNC_ENTITY" "XML_ERROR_BAD_CHAR_REF"
+;        "XML_ERROR_BINARY_ENTITY_REF"
+;        "XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF"
+;        "XML_ERROR_MISPLACED_XML_PI" "XML_ERROR_UNKNOWN_ENCODING"
+;        "XML_ERROR_INCORRECT_ENCODING"
+;        "XML_ERROR_UNCLOSED_CDATA_SECTION"
+;        "XML_ERROR_EXTERNAL_ENTITY_HANDLING" "XML_OPTION_CASE_FOLDING"
+;        "XML_OPTION_TARGET_ENCODING" "XML_OPTION_SKIP_TAGSTART"
+;        "XML_OPTION_SKIP_WHITE" "YPERR_BADARGS" "YPERR_BADDB"
+;        "YPERR_BUSY" "YPERR_DOMAIN" "YPERR_KEY" "YPERR_MAP"
+;        "YPERR_NODOM" "YPERR_NOMORE" "YPERR_PMAP" "YPERR_RESRC"
+;        "YPERR_RPC" "YPERR_YPBIND" "YPERR_YPERR" "YPERR_YPSERV"
+;        "YPERR_VERS" "FORCE_GZIP" "FORCE_DEFLATE"
+
+       ;; PEAR constants
+;        "PEAR_ERROR_RETURN" "PEAR_ERROR_PRINT" "PEAR_ERROR_TRIGGER"
+;        "PEAR_ERROR_DIE" "PEAR_ERROR_CALLBACK" "OS_WINDOWS" "OS_UNIX"
+;        "PEAR_OS" "DB_OK" "DB_ERROR" "DB_ERROR_SYNTAX"
+;        "DB_ERROR_CONSTRAINT" "DB_ERROR_NOT_FOUND"
+;        "DB_ERROR_ALREADY_EXISTS" "DB_ERROR_UNSUPPORTED"
+;        "DB_ERROR_MISMATCH" "DB_ERROR_INVALID" "DB_ERROR_NOT_CAPABLE"
+;        "DB_ERROR_TRUNCATED" "DB_ERROR_INVALID_NUMBER"
+;        "DB_ERROR_INVALID_DATE" "DB_ERROR_DIVZERO"
+;        "DB_ERROR_NODBSELECTED" "DB_ERROR_CANNOT_CREATE"
+;        "DB_ERROR_CANNOT_DELETE" "DB_ERROR_CANNOT_DROP"
+;        "DB_ERROR_NOSUCHTABLE" "DB_ERROR_NOSUCHFIELD"
+;        "DB_ERROR_NEED_MORE_DATA" "DB_ERROR_NOT_LOCKED"
+;        "DB_ERROR_VALUE_COUNT_ON_ROW" "DB_ERROR_INVALID_DSN"
+;        "DB_ERROR_CONNECT_FAILED" "DB_WARNING" "DB_WARNING_READ_ONLY"
+;        "DB_PARAM_SCALAR" "DB_PARAM_OPAQUE" "DB_BINMODE_PASSTHRU"
+;        "DB_BINMODE_RETURN" "DB_BINMODE_CONVERT" "DB_FETCHMODE_DEFAULT"
+;        "DB_FETCHMODE_ORDERED" "DB_FETCHMODE_ASSOC"
+;        "DB_FETCHMODE_FLIPPED" "DB_GETMODE_ORDERED" "DB_GETMODE_ASSOC"
+;        "DB_GETMODE_FLIPPED" "DB_TABLEINFO_ORDER"
+;        "DB_TABLEINFO_ORDERTABLE" "DB_TABLEINFO_FULL"
+
+       )))
+  "PHP constants.")
+
+(defconst php-keywords
+  (eval-when-compile
+    (regexp-opt
+     ;; "class", "new" and "extends" get special treatment
+     ;; "case" and  "default" get special treatment elsewhere
+     '("and" "as" "break" "continue" "declare" "do" "echo" "else" "elseif"
+       "endfor" "endforeach" "endif" "endswitch" "endwhile" "exit"
+       "extends" "for" "foreach" "global" "if" "include" "include_once"
+       "next" "or" "require" "require_once" "return" "static" "switch"
+       "then" "var" "while" "xor" "throw" "catch" "try"
+       "instanceof" "catch all" "finally")))
+  "PHP keywords.")
+
+(defconst php-identifier
+  (eval-when-compile
+    '"[a-zA-Z\_\x7f-\xff][a-zA-Z0-9\_\x7f-\xff]*")
+  "Characters in a PHP identifier.")
+
+(defconst php-types
+  (eval-when-compile
+    (regexp-opt '("array" "bool" "boolean" "char" "const" "double" "float"
+		  "int" "integer" "long" "mixed" "object" "real"
+		  "string")))
+  "PHP types.")
+
+(defconst php-superglobals
+  (eval-when-compile
+    (regexp-opt '("_GET" "_POST" "_COOKIE" "_SESSION" "_ENV" "GLOBALS"
+		  "_SERVER" "_FILES" "_REQUEST")))
+  "PHP superglobal variables.")
+
+;; Set up font locking
+(defconst php-font-lock-keywords-1
+  (list
+   ;; Fontify constants
+   (cons
+    (concat "[^_$]?\\<\\(" php-constants "\\)\\>[^_]?")
+    '(1 font-lock-constant-face))
+
+   ;; Fontify keywords
+   (cons
+    (concat "[^_$]?\\<\\(" php-keywords "\\)\\>[^_]?")
+    '(1 font-lock-keyword-face))
+
+   ;; Fontify keywords and targets, and case default tags.
+   (list "[^_$]?\\<\\(break\\|case\\|continue\\)\\>\\s-*\\(-?\\(?:\\sw\\|\\s_\\)+\\)?"
+	 '(1 font-lock-keyword-face) '(2 font-lock-constant-face t t))
+   ;; This must come after the one for keywords and targets.
+   '(":" ("^\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*:\\s-*$"
+	  (beginning-of-line) (end-of-line)
+	  (1 font-lock-constant-face)))
+
+   ;; treat 'print' as keyword only when not used like a function name
+   '("\\<print\\s-*(" . php-default-face)
+   '("[^_$]?\\<\\(print\\)\\>[^_]?" (1 font-lock-keyword-face))
+
+   ;; Fontify PHP tag
+   (cons php-tags-key font-lock-preprocessor-face)
+
+   ;; Fontify ASP-style tag
+   '("<\\%\\(=\\)?" . font-lock-preprocessor-face)
+   '("\\%>" . font-lock-preprocessor-face)
+
+   )
+  "Subdued level highlighting for PHP mode.")
+
+(defconst php-font-lock-keywords-2
+  (append
+   php-font-lock-keywords-1
+   (list
+
+    ;; class declaration
+    '("[^_]?\\<\\(class\\|interface\\)\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)?"
+      (1 font-lock-keyword-face) (2 font-lock-type-face nil t))
+    ;; handle several words specially, to include following word,
+    ;; thereby excluding it from unknown-symbol checks later
+    ;; FIX to handle implementing multiple
+    ;; currently breaks on "class Foo implements Bar, Baz"
+    '("\\<\\(new\\|extends\\|implements\\)\\s-+\\$?\\(\\(?:\\sw\\|\\s_\\)+\\)"
+      (1 font-lock-keyword-face) (2 font-lock-type-face))
+
+    ;; function declaration
+    '("\\<\\(function\\)\\s-+&?\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("
+      (1 font-lock-keyword-face)
+      (2 font-lock-function-name-face nil t))
+
+    ;; class hierarchy
+    '("[^_$]?\\<\\(self\\|parent\\)\\>[^_]?" (1 font-lock-constant-face nil nil))
+
+    ;; method and variable features
+    '("\\<\\(private\\|protected\\|public\\)\\s-+\\$?\\(?:\\sw\\|\\s_\\)+"
+      (1 font-lock-keyword-face))
+
+    ;; method features
+    '("^\\s-*\\(abstract\\|static\\|final\\)\\s-+\\$?\\(?:\\sw\\|\\s_\\)+"
+      (1 font-lock-keyword-face))
+
+    ;; variable features
+    '("^\\s-*\\(static\\|const\\)\\s-+\\$?\\(?:\\sw\\|\\s_\\)+"
+      (1 font-lock-keyword-face))
+    ))
+  "Medium level highlighting for PHP mode.")
+
+(defconst php-font-lock-keywords-3
+  (append
+   php-font-lock-keywords-2
+   (list
+
+    ;; <word> or </word> for HTML
+    ;;'("</?\\sw+[^> ]*>" . font-lock-constant-face)
+    ;;'("</?\\sw+[^>]*" . font-lock-constant-face)
+    ;;'("<!DOCTYPE" . font-lock-constant-face)
+    '("</?[a-z!:]+" . font-lock-constant-face)
+
+    ;; HTML >
+    '("<[^>]*\\(>\\)" (1 font-lock-constant-face))
+
+    ;; HTML tags
+    '("\\(<[a-z]+\\)[[:space:]]+\\([a-z:]+=\\)[^>]*?" (1 font-lock-constant-face) (2 font-lock-constant-face) )
+    '("\"[[:space:]]+\\([a-z:]+=\\)" (1 font-lock-constant-face))
+
+    ;; HTML entities
+    ;;'("&\\w+;" . font-lock-variable-name-face)
+
+    ;; warn about '$' immediately after ->
+    '("\\$\\(?:\\sw\\|\\s_\\)+->\\s-*\\(\\$\\)\\(\\(?:\\sw\\|\\s_\\)+\\)"
+      (1 font-lock-warning-face) (2 php-default-face))
+
+    ;; warn about $word.word -- it could be a valid concatenation,
+    ;; but without any spaces we'll assume $word->word was meant.
+    '("\\$\\(?:\\sw\\|\\s_\\)+\\(\\.\\)\\sw"
+      1 font-lock-warning-face)
+
+    ;; Warn about ==> instead of =>
+    '("==+>" . font-lock-warning-face)
+
+    ;; exclude casts from bare-word treatment (may contain spaces)
+    `(,(concat "(\\s-*\\(" php-types "\\)\\s-*)")
+      1 font-lock-type-face)
+
+    ;; PHP5: function declarations may contain classes as parameters type
+    `(,(concat "[(,]\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-+&?\\$\\(?:\\sw\\|\\s_\\)+\\>")
+      1 font-lock-type-face)
+
+    ;; Fontify variables and function calls
+    '("\\$\\(this\\|that\\)\\W" (1 font-lock-constant-face nil nil))
+    `(,(concat "\\$\\(" php-superglobals "\\)\\W")
+      (1 font-lock-constant-face nil nil)) ; $_GET & co
+    '("\\$\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face)) ; $variable
+    '("->\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face t t)) ; ->variable
+    '("->\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" . (1 php-default-face t t)) ; ->function_call
+    '("\\(\\(?:\\sw\\|\\s_\\)+\\)::\\(?:\\sw\\|\\s_\\)+\\s-*(?" . (1 font-lock-type-face)) ; class::member
+    '("::\\(\\(?:\\sw\\|\\s_\\)+\\>[^(]\\)" . (1 php-default-face)) ; class::constant
+    '("\\<\\(?:\\sw\\|\\s_\\)+\\s-*[[(]" . php-default-face)	; word( or word[
+    '("\\<[0-9]+" . php-default-face)		; number (also matches word)
+
+    ;; Warn on any words not already fontified
+    '("\\<\\(?:\\sw\\|\\s_\\)+\\>" . font-lock-warning-face)
+
+    ))
+  "Gauchy level highlighting for PHP mode.")
+
+;; Create "php-default-face" symbol for GNU Emacs so that both XEmacs
+;; and GNU emacs can refer to the default face.
+(unless (boundp 'php-default-face)
+   (defvar php-default-face 'php-default-face))
+
+;; Create faces for XEmacs
+(when (featurep 'xemacs)
+  (unless (boundp 'font-lock-keyword-face)
+    (copy-face 'bold 'font-lock-keyword-face))
+  (unless (boundp 'font-lock-constant-face)
+    (copy-face 'font-lock-keyword-face 'font-lock-constant-face)))
+
+(provide 'php-mode)
+
+;;; php-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/related/smarty-mode-vdebout.el b/elpa-to-submit/nxhtml/alts/smarty-mode-vdebout.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/smarty-mode-vdebout.el
rename to elpa-to-submit/nxhtml/alts/smarty-mode-vdebout.el
diff --git a/elpa-to-submit/nxhtml/related/snippet.el b/elpa-to-submit/nxhtml/alts/snippet.el
similarity index 100%
rename from elpa-to-submit/nxhtml/related/snippet.el
rename to elpa-to-submit/nxhtml/alts/snippet.el
diff --git a/elpa-to-submit/nxhtml/autostart.el b/elpa-to-submit/nxhtml/autostart.el
index a46c4bdb08..5e837de4a8 100644
--- a/elpa-to-submit/nxhtml/autostart.el
+++ b/elpa-to-submit/nxhtml/autostart.el
@@ -1,9 +1,11 @@
+(setq message-log-max t)
+(setq debug-on-error t)
 ;;; autostart.el --- Load nxhtml
 ;;
 ;; Author: By: Lennart Borgman
-;; Created: Fri Dec 15 10:22:41 2006
+;; Created: Fri Dec 15 2006
 ;; Version:
-;; Last-Updated: 2008-03-06T23:49:43+0100 Thu
+;; Last-Updated: 2009-04-30 Thu
 ;; Keywords:
 ;; Compatibility:
 ;;
@@ -40,45 +42,145 @@
 ;;; Code:
 
 (message "Nxml/Nxhtml Autostart.el loading ...")
+(defconst nxhtml-load-time-start (float-time))
 
-;; ;; In case an old Emacs 22 beta is used, ie mostly for Debian/Ubuntu
-;; ;; at the moment. Suggested by Hadron Quark, thanks.
-;; (unless (fboundp 'define-globalized-minor-mode)
-;;   (defalias 'define-globalized-minor-mode 'define-global-minor-mode))
-
-(defvar nxhtml-install-dir
-  (file-name-directory (if load-file-name load-file-name buffer-file-name))
+(defconst nxhtml-install-dir
+  (file-name-directory (or load-file-name
+                           (when (boundp 'bytecomp-filename) bytecomp-filename)
+                           buffer-file-name))
   "Installation directory for nXhtml.")
+;; (setq nxhtml-install-dir (file-name-directory
+;;                           (or load-file-name
+;;                               (when (boundp 'bytecomp-filename) bytecomp-filename)
+;;                               buffer-file-name)))
+
+;; (defun nxhtml-custom-load-and-get-value (symbol)
+;;   (custom-load-symbol symbol)
+;;   (symbol-value symbol))
+
+(defun nxhtml-custom-autoload (symbol load &optional noset)
+  "Like `custom-autoload', but also run :set for defcustoms etc."
+  ;; Fix-me: is-boundp is currently always t because of the order in
+  ;; loaddefs.
+  (let* ((is-boundp (prog1 (boundp symbol)
+                      (custom-autoload symbol load noset)))
+         (standard (get symbol 'standard-value))
+         (saved (get symbol 'saved-value))
+         ;; Fix-me: property custom-set etc are not available
+         (custom-set (get symbol 'custom-set))
+         (custom-initialize (get symbol 'custom-initialize))
+         (set (or custom-set 'custom-set-default))) ;; Fix-me: initialize
+    ;;(message "nx:symbol = %s, standard/saved=%s/%s, custom-set=%s, boundp=%s,val=%s" symbol standard saved custom-set is-boundp (when is-boundp (symbol-value symbol)))
+    (setq custom-set t) ;; Not available here
+    (when (or custom-initialize
+              (and saved
+                   (not (equal (car saved) (symbol-value symbol)))
+                   custom-set))
+      ;;(message "nx:custom-load-symbol %s" symbol)
+      (funcall set symbol (car saved))
+      (custom-load-symbol symbol)
+      )))
+
+(defun nxhtml-list-loaded-features ()
+  (interactive)
+  (let ((buf (when (called-interactively-p)
+               (get-buffer-create "*nXhtml loaded features*"))))
+    (if buf
+        (with-current-buffer buf (erase-buffer))
+      (message "")
+      (message "=== Loaded at nxhtml/autostart.el end:"))
+    (dolist (feature '(
+                       as-external
+                       html-chklnk
+                       html-imenu
+                       html-move
+                       html-pagetoc
+                       html-quote
+                       html-site
+                       html-toc
+                       html-upl
+                       html-wtoc
+                       inlimg
+                       mumamo
+                       nxhtml-bug
+                       nxhtml-menu
+                       nxhtml-mode
+                       nxhtml-mumamo
+                       nxhtml-strval
+                       nxhtml
+                       nxhtml-js
+                       nxml-where
+                       outline-magic
+                       rngalt
+                       tidy-xhtml
+                       xhtml-help
+                       ))
+      (when (featurep feature)
+        (if buf
+            (with-current-buffer buf
+              (insert (format "(feature '%s)=%s\n" feature (featurep feature))))
+          (message "(feature '%s)=%s" feature (featurep feature)))))
+    (if buf
+        (display-buffer buf)
+      (message ""))))
 
 (unless (featurep 'nxhtml-autostart)
-  ;; Provide the feature to avoid loading looping on error.
+  ;; Provide the feature here to avoid loading looping on error.
   (provide 'nxhtml-autostart)
-  ;; Use the css-mode that comes with Emacs if there is one.
-  ;; Fix-me: remove this loading later:
-  (when (fboundp 'css-mode) (require 'css-mode))
-  (let* ((util-dir (file-name-as-directory
-                    (expand-file-name "util"
-                                      nxhtml-install-dir)))
-         (related-dir (file-name-as-directory
-                       (expand-file-name "related"
-                                         nxhtml-install-dir))))
-    (add-to-list 'load-path util-dir)
+
+  (if (< emacs-major-version 23)
+      (load (expand-file-name "autostart22" nxhtml-install-dir))
+    ;; Check that the nxml-mode included with Emacs is used. There
+    ;; has been some problems on Debian with this.
+    (let ((nxml-mode-file (locate-library "nxml-mode"))
+          (help-file      (locate-library "help")))
+      (unless (string= (expand-file-name ".." help-file)
+                       (expand-file-name "../.." nxml-mode-file))
+        (error "Wrong nxml-mode=%s used, please use the one that comes with Emacs" nxml-mode-file))))
+
+  (let* ((util-dir (file-name-as-directory (expand-file-name "util" nxhtml-install-dir)))
+         (related-dir (file-name-as-directory (expand-file-name "related" nxhtml-install-dir)))
+         (nxhtml-dir (file-name-as-directory (expand-file-name "nxhtml" nxhtml-install-dir)))
+         (company-dir (file-name-as-directory (expand-file-name "util/company-mode" nxhtml-install-dir)))
+         (tests-dir (file-name-as-directory (expand-file-name "tests" nxhtml-install-dir))))
+    (add-to-list 'load-path nxhtml-dir)
     (add-to-list 'load-path related-dir)
+    (add-to-list 'load-path util-dir)
+    (add-to-list 'load-path nxhtml-install-dir)
+    (add-to-list 'load-path company-dir)
+    (add-to-list 'load-path tests-dir)
+
+    (message "... nXhtml loading %.1f seconds elapsed ..." (- (float-time) nxhtml-load-time-start))
 
     ;; Autoloading etc
-    (require 'as-external)
-    (load (expand-file-name "nxhtml-loaddefs.el" nxhtml-install-dir))
-    ;; Use the nxml-mode that comes with Emacs if available:
-    (unless (fboundp 'nxml-mode)
-      (load (expand-file-name "nxml-mode-20041004/rng-auto"
-                              nxhtml-install-dir)))
+
+    ;; Fix-me: Why must as-external be loaded? Why doesn't it work in batch?
+    ;;(unless noninteractive (require 'as-external))
+
+    (load (expand-file-name "nxhtml-loaddefs" nxhtml-install-dir))
+    (message "... nXhtml loading %.1f seconds elapsed ..." (- (float-time) nxhtml-load-time-start))
+
+    ;; Turn on `nxhtml-global-minor-mode' unconditionally
+    (nxhtml-global-minor-mode 1)
+    (message "... nXhtml loading %.1f seconds elapsed ..." (- (float-time) nxhtml-load-time-start))
+
     ;; Patch the rnc include paths
-    (load-file (expand-file-name "etc/schema/schema-path-patch.el"
-                                 nxhtml-install-dir))
-    (rncpp-patch-xhtml-loader)
+    (when (fboundp 'nxml-mode)
+      (load (expand-file-name "etc/schema/schema-path-patch"
+                              nxhtml-install-dir))
+      (rncpp-patch-xhtml-loader))
+    (message "... nXhtml loading %.1f seconds elapsed ..." (- (float-time) nxhtml-load-time-start))
+
     ;; Load nXhtml
-    (load (expand-file-name "nxhtml/nxhtml-autoload"
-                            nxhtml-install-dir))))
+    (load (expand-file-name "nxhtml/nxhtml-autoload" nxhtml-install-dir)))
+    (message "... nXhtml loading %.1f seconds elapsed ..." (- (float-time) nxhtml-load-time-start))
+
+  ;; Tell what have been loaded of nXhtml:
+  (nxhtml-list-loaded-features)
+
+  ;; How long time did it all take?
+  (message "Nxml/Nxhtml Autostart.el loaded in %.1f seconds" (- (float-time) nxhtml-load-time-start))
+  )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; autostart.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-anything-1.el b/elpa-to-submit/nxhtml/autostart22.el
similarity index 54%
rename from elpa-to-submit/nxhtml/nxhtml/nxhtml-anything-1.el
rename to elpa-to-submit/nxhtml/autostart22.el
index f6ff5a853c..5784add9c8 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-anything-1.el
+++ b/elpa-to-submit/nxhtml/autostart22.el
@@ -1,22 +1,26 @@
-;;; nxhtml-anything-1.el ---
+;;; autostart22.el --- Example of autostart file for Emacs22
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-08-07T14:34:20+0200 Thu
+;; Created: 2009-01-01 Thu
 ;; Version:
-;; Last-Updated:
+;; Last-Updated: 2009-01-05 Mon
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   None
+;;   This file is for Emacs 22 only.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
 ;;
+;; Change this file according to the path of your nxml-mode dir. If
+;; you do not use nxml-mode then just use autostart.el.
 ;;
+;; NOTICE: You need to enter the path to your nxml-mode installation
+;; below.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -44,30 +48,23 @@
 ;;
 ;;; Code:
 
-;; Found this on the web. Maybe this could be an alternative completion function?
-(require 'anything)
-(defmacro nxhtml-with-anything-sources (sources &rest body)
-  (let ((saved-anything-souces (gensym)))
-    `(let ((,saved-anything-souces anything-sources))
-       (unwind-protect
-           (let ((anything-sources ,sources))
-             ,@body)
-         (setq anything-sources ,saved-anything-souces)))))
+(let ((debug-on-error t))
+  (unless (= emacs-major-version 22)
+    (error "This file is for Emacs 22 only"))
 
-(defadvice popcmp-completing-read (around popcml-with-anything)
-  (let* ((table (ad-get-arg 1))
-         (alt-sets (apply 'append (mapcar 'cdr (ad-get-arg 9))));(apply 'append (mapcar 'cdr nxhtml-tag-sets)))
-         (cands (cond ((not (listp table)) alt-sets)
-                      (t table)))
-         (source
-          `((name . "nxhtml-completion")
-            (candidates . ,cands)
-            (action . (("select" . (lambda (candidate)
-                                     (setq ad-return-value candidate))))))))
-    (nxhtml-with-anything-sources (list source)
-      (anything))))
+  (defalias 'Custom-mode 'custom-mode)
 
+  (let* ((this-file (or load-file-name buffer-file-name))
+         (this-dir (file-name-directory this-file))
+         ;; FIX-ME: Download nXml (since it is not included in Emacs
+         ;; 22) and place the path to rng-auto.el in your downloaded
+         ;; nXml HERE:
+         (rng-auto-file (or (locate-library "rng-auto.el")
+                            (concat this-dir "../nxml-mode/rng-auto.el"))))
+    (unless (file-exists-p rng-auto-file)
+      (error "Can't find rng-auto.el, please edit %s" this-file))
+    (load rng-auto-file)))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; nxhtml-anything-1.el ends here
+;;; autostart22.el ends here
diff --git a/elpa-to-submit/nxhtml/emacs22.cmd b/elpa-to-submit/nxhtml/emacs22.cmd
new file mode 100644
index 0000000000..d50ac962c7
--- /dev/null
+++ b/elpa-to-submit/nxhtml/emacs22.cmd
@@ -0,0 +1 @@
+c:\emacs\emacs-22.3\bin\emacs.exe -Q --debug-init -l autostart.el
diff --git a/elpa-to-submit/nxhtml/etc/img/pause/pause.jpg b/elpa-to-submit/nxhtml/etc/img/pause/pause.jpg
new file mode 100644
index 0000000000..ff920756c4
Binary files /dev/null and b/elpa-to-submit/nxhtml/etc/img/pause/pause.jpg differ
diff --git a/elpa-to-submit/nxhtml/etc/img/pause/pause2.jpg b/elpa-to-submit/nxhtml/etc/img/pause/pause2.jpg
new file mode 100644
index 0000000000..6411344afe
Binary files /dev/null and b/elpa-to-submit/nxhtml/etc/img/pause/pause2.jpg differ
diff --git a/elpa-to-submit/nxhtml/etc/schema/rncpp-patch-files.done b/elpa-to-submit/nxhtml/etc/schema/rncpp-patch-files.done
deleted file mode 100644
index 2383bff5d8..0000000000
--- a/elpa-to-submit/nxhtml/etc/schema/rncpp-patch-files.done
+++ /dev/null
@@ -1 +0,0 @@
-2008-0818T16:43:47+0200
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/etc/schema/schema-path-patch.el b/elpa-to-submit/nxhtml/etc/schema/schema-path-patch.el
index d2962b9780..a6d59fc432 100644
--- a/elpa-to-submit/nxhtml/etc/schema/schema-path-patch.el
+++ b/elpa-to-submit/nxhtml/etc/schema/schema-path-patch.el
@@ -45,8 +45,6 @@
 ;;
 ;;; Code:
 
-;;(eval-when-compile (require 'cl))
-
 (defvar rncpp-this-dir
   (file-name-as-directory
    (file-name-directory
@@ -66,28 +64,6 @@
       (error "Can't find schema-dir=%s" schema-dir))
     schema-dir))
 
-;; (defun rncpp-patch-file (file)
-;;   (let ((schema-dir (rncpp-get-nxml-schema-dir))
-;;         relative-inc-file
-;;         absolute-inc-file
-;;         (buf (find-file-noselect file))
-;;         file-dir
-;;         )
-;;     (with-current-buffer buf
-;;       (setq file-dir (file-name-directory buffer-file-name))
-;;       (widen)
-;;       (goto-char (point-min))
-;;       (setq absolute-inc-file (expand-file-name "xhtml.rnc" schema-dir))
-;;       (assert (file-exists-p absolute-inc-file) t)
-;;       (setq relative-inc-file
-;;             (file-relative-name absolute-inc-file file-dir))
-;;       (assert (file-exists-p relative-inc-file) t)
-;;       (when (re-search-forward "include \"\\(.*[^a-zA-Z0-9-]xhtml.rnc\\)\"" nil t)
-;;         (replace-match relative-inc-file t t nil 1)
-;;         (basic-save-buffer)
-;;         (kill-buffer (current-buffer))
-;;         (message "Patched %s" file)))))
-
 ;; Use xhtml-loader.rnc (an idea from Bryan Waite):
 (defun rncpp-patch-xhtml-loader ()
   "Patch xhtml-loader.rnc so genshi and mjt rnc files works."
@@ -99,7 +75,7 @@
          (schema-relative-dir (file-relative-name schema-dir))
          (loader-string (concat "include \""
                                 schema-relative-dir
-                                "xhtml.rnc\"")))
+                                "xhtml.rnc\"\n")))
     (when loader-buf (kill-buffer loader-buf))
     (setq loader-buf (find-file-noselect loader-path))
     (with-current-buffer loader-buf
@@ -115,28 +91,5 @@
       (basic-save-buffer)
       (kill-buffer (current-buffer)))))
 
-;; (defun rncpp-patch-files (&optional no-check-done)
-;;   "Patch rnc files in this directory.
-;; This will make the includes from here point to those that
-;; `nxml-mode' use."
-;;   (interactive (list t))
-;;   (let ((default-directory rncpp-this-dir)
-;;         (done nil)
-;;         (done-mark "rncpp-patch-files.done"))
-;;     (message "Patching rnc files path in %s" default-directory)
-;;     (unless no-check-done
-;;       (setq done (file-exists-p done-mark)))
-;;     (if done
-;;         (message "... patching was already done")
-;;       (rncpp-patch-file "mjt.rnc")
-;;       (rncpp-patch-file "qtmstr-xhtml.rnc")
-;;       (with-current-buffer (find-file-noselect done-mark)
-;;         (insert (format-time-string "%Y-%m%dT%T%z"))
-;;         (basic-save-buffer)
-;;         (kill-buffer (current-buffer)))
-;;       (message "... ready patching"))))
-
-;;(rncpp-patch-files)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; schema-path-patch.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml-loaddefs.el b/elpa-to-submit/nxhtml/nxhtml-loaddefs.el
index da62fd54f3..3c4419161d 100644
--- a/elpa-to-submit/nxhtml/nxhtml-loaddefs.el
+++ b/elpa-to-submit/nxhtml/nxhtml-loaddefs.el
@@ -3,9 +3,31 @@
 ;; This file should be updated by `nxhtmlmaint-get-file-autoloads',
 ;; `nxhtmlmaint-get-dir-autoloads' or `nxhtmlmaint-get-all-autoloads'.
 
+;;;### (autoloads (html-pagetoc-rebuild-toc html-pagetoc-insert-toc)
+;;;;;;  "../nxhtml/html-pagetoc" "nxhtml/html-pagetoc.el" (18974
+;;;;;;  59066))
+;;; Generated autoloads from nxhtml/html-pagetoc.el
+
+(autoload 'html-pagetoc-insert-toc "../nxhtml/html-pagetoc" "\
+Inserts a table of contents for the current html file.
+The html header tags h1-h6 found in the file are inserted into
+this table.  MIN-LEVEL and MAX-LEVEL specifies the minimum and
+maximum level of h1-h6 to include.  They should be integers.
+
+\(fn &optional MIN-LEVEL MAX-LEVEL)" t nil)
+
+(autoload 'html-pagetoc-rebuild-toc "../nxhtml/html-pagetoc" "\
+Update the table of contents inserted by `html-pagetoc-insert-toc'.
+
+\(fn)" t nil)
+
+(defconst html-pagetoc-menu-map (let ((map (make-sparse-keymap))) (define-key map [html-pagetoc-rebuild-toc] (list 'menu-item "Update Page TOC" 'html-pagetoc-rebuild-toc)) (define-key map [html-pagetoc-insert-style-guide] (list 'menu-item "Insert CSS Style for Page TOC" 'html-pagetoc-insert-style-guide)) (define-key map [html-pagetoc-insert-toc] (list 'menu-item "Insert Page TOC" 'html-pagetoc-insert-toc)) map))
+
+;;;***
+
 ;;;### (autoloads (html-site-query-replace html-site-rgrep html-site-find-file
 ;;;;;;  html-site-dired-current html-site-set-site html-site-buffer-or-dired-file-name)
-;;;;;;  "../nxhtml/html-site" "nxhtml/html-site.el" (18658 47798))
+;;;;;;  "../nxhtml/html-site" "nxhtml/html-site.el" (18790 45398))
 ;;; Generated autoloads from nxhtml/html-site.el
 
 (autoload 'html-site-buffer-or-dired-file-name "../nxhtml/html-site" "\
@@ -41,33 +63,137 @@ Query replace in current site's files.
 
 ;;;***
 
-;;;### (autoloads (inlimg-toggle-img-display inlimg-mode) "../nxhtml/inlimg"
-;;;;;;  "nxhtml/inlimg.el" (18658 47798))
-;;; Generated autoloads from nxhtml/inlimg.el
+;;;### (autoloads nil "../nxhtml/html-toc" "nxhtml/html-toc.el" (18974
+;;;;;;  59066))
+;;; Generated autoloads from nxhtml/html-toc.el
 
-(autoload 'inlimg-mode "../nxhtml/inlimg" "\
-Display <img ...> images inline.
-Images are displayed below the <img ...> tag using the margins in
-`inlimg-margins'.  The whole image or a slice of it may be
-displayed, see `inlimg-slice'.
+(defconst html-toc-menu-map (let ((map (make-sparse-keymap))) (define-key map [html-toc-browse-frames-file] (list 'menu-item "Browse Frames File" 'html-toc-browse-frames-file)) (define-key map [html-toc-write-frames-file] (list 'menu-item "Write Frames File" 'html-toc-write-frames-file)) (define-key map [html-toc-write-toc-file] (list 'menu-item "Write TOC File for Frames" 'html-toc-write-toc-file)) (define-key map [html-toc-sep1] (list 'menu-item "--")) (define-key map [html-toc-edit-pages-file] (list 'menu-item "Edit List of Pages for TOC" 'html-site-edit-pages-file)) (define-key map [html-toc-create-pages-file] (list 'menu-item "Write List of Pages for TOC" 'html-toc-create-pages-file)) map))
 
-See also the command `inlimg-toggle-img-display'.
+;;;***
+
+;;;### (autoloads (html-upl-ediff-file html-upl-edit-remote-file-with-toc
+;;;;;;  html-upl-edit-remote-file html-upl-upload-file html-upl-remote-dired
+;;;;;;  html-upl-upload-site html-upl-upload-site-with-toc) "../nxhtml/html-upl"
+;;;;;;  "nxhtml/html-upl.el" (18969 63118))
+;;; Generated autoloads from nxhtml/html-upl.el
 
-\(fn &optional ARG)" t nil)
+(autoload 'html-upl-upload-site-with-toc "../nxhtml/html-upl" "\
+Not documented
 
-(autoload 'inlimg-toggle-img-display "../nxhtml/inlimg" "\
-Toggle display of img image at point POINT.
-See also the command `inlimg-mode'.
+\(fn)" t nil)
 
-\(fn POINT)" t nil)
+(autoload 'html-upl-upload-site "../nxhtml/html-upl" "\
+Not documented
+
+\(fn)" t nil)
+
+(autoload 'html-upl-remote-dired "../nxhtml/html-upl" "\
+Start dired for remote directory or its parent/ancestor.
+
+\(fn DIRNAME)" t nil)
+
+(autoload 'html-upl-upload-file "../nxhtml/html-upl" "\
+Upload a single file in a site.
+For the definition of a site see `html-site-current'.
+
+\(fn FILENAME)" t nil)
+
+(autoload 'html-upl-edit-remote-file "../nxhtml/html-upl" "\
+Not documented
+
+\(fn)" t nil)
+
+(autoload 'html-upl-edit-remote-file-with-toc "../nxhtml/html-upl" "\
+Not documented
+
+\(fn)" t nil)
+
+(autoload 'html-upl-ediff-file "../nxhtml/html-upl" "\
+Run ediff on local and remote file.
+FILENAME could be either the remote or the local file.
+
+\(fn FILENAME)" t nil)
 
 ;;;***
 
-;;;### (autoloads (nxhtml-validation-header-mode nxhtml-mode) "../nxhtml/nxhtml"
-;;;;;;  "nxhtml/nxhtml.el" (18735 15066))
+;;;### (autoloads (nxhtml-features-check nxhtml-customize) "../nxhtml/nxhtml"
+;;;;;;  "nxhtml/nxhtml.el" (19063 47343))
 ;;; Generated autoloads from nxhtml/nxhtml.el
 
-(autoload 'nxhtml-mode "../nxhtml/nxhtml" "\
+(autoload 'nxhtml-customize "../nxhtml/nxhtml" "\
+Customize nXhtml.
+
+\(fn)" t nil)
+
+(autoload 'nxhtml-features-check "../nxhtml/nxhtml" "\
+Check if external modules used by nXhtml are found.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (nxhtml-report-bug) "../nxhtml/nxhtml-bug" "nxhtml/nxhtml-bug.el"
+;;;;;;  (18775 60002))
+;;; Generated autoloads from nxhtml/nxhtml-bug.el
+
+(autoload 'nxhtml-report-bug "../nxhtml/nxhtml-bug" "\
+Report a bug in nXhtml.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (nxhtml-overview nxhtml-global-minor-mode nxhtml-browse-region
+;;;;;;  nxhtml-browse-file nxhtml-edit-with-gimp) "../nxhtml/nxhtml-menu"
+;;;;;;  "nxhtml/nxhtml-menu.el" (19064 18624))
+;;; Generated autoloads from nxhtml/nxhtml-menu.el
+
+(autoload 'nxhtml-edit-with-gimp "../nxhtml/nxhtml-menu" "\
+Edit with GIMP buffer or file at point.
+
+\(fn)" t nil)
+
+(autoload 'nxhtml-browse-file "../nxhtml/nxhtml-menu" "\
+View file in web browser.
+
+\(fn FILE)" t nil)
+
+(autoload 'nxhtml-browse-region "../nxhtml/nxhtml-menu" "\
+View region in web browser.
+
+\(fn)" t nil)
+
+(defvar nxhtml-global-minor-mode nil "\
+Non-nil if Nxhtml-Global minor mode is enabled.
+See the command `nxhtml-global-minor-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `nxhtml-global-minor-mode'.")
+
+(nxhtml-custom-autoload 'nxhtml-global-minor-mode "../nxhtml/nxhtml-menu" nil)
+
+(autoload 'nxhtml-global-minor-mode "../nxhtml/nxhtml-menu" "\
+Toggle Nxhtml minor mode in every possible buffer.
+With prefix ARG, turn Nxhtml-Global minor mode on if and only if ARG is positive.
+Nxhtml minor mode is enabled in all buffers where `nxhtml-maybe-turn-on-minor-mode' would do it.
+See `nxhtml-minor-mode' for more information on Nxhtml minor mode.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'nxhtml-overview "../nxhtml/nxhtml-menu" "\
+Show a HTML page with an overview of nXhtml.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (nxhtml-validation-header-mode nxhtml-short-tag-help
+;;;;;;  nxhtml-mode) "../nxhtml/nxhtml-mode" "nxhtml/nxhtml-mode.el"
+;;;;;;  (19061 60294))
+;;; Generated autoloads from nxhtml/nxhtml-mode.el
+
+(when (fboundp 'nxml-mode)
+(autoload 'nxhtml-mode "../nxhtml/nxhtml-mode" "\
 Major mode for editing XHTML documents.
 It is based on `nxml-mode' and adds some features that are useful
 when editing XHTML files.\\<nxhtml-mode-map>
@@ -169,9 +295,15 @@ point in the mumamo chunk you want to know the key bindings in.
   with this if you have followed the installation instructions
   for nXhtml.
 
-\(fn)" t nil)
+\(fn)" t nil))
 
-(autoload 'nxhtml-validation-header-mode "../nxhtml/nxhtml" "\
+(autoload 'nxhtml-short-tag-help "../nxhtml/nxhtml-mode" "\
+Display description of tag TAG.  If TAG is omitted, try tag at point.
+
+\(fn TAG)" t nil)
+
+(when (fboundp 'nxml-mode)
+(autoload 'nxhtml-validation-header-mode "../nxhtml/nxhtml-mode" "\
 If on use a Fictive XHTML Validation Header for the buffer.
 See `nxhtml-set-validation-header' for information about Fictive XHTML Validation Headers.
 
@@ -180,50 +312,10 @@ This mode may be turned on automatically in two ways:
   `nxthml-mode' may ask you if you want to turn this mode on if
   needed.
 - You can also choose to have it turned on automatically whenever
-  mumamo is used, see `nxhtml-validation-header-if-mumamo' for
-  further information.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (nxhtml-report-bug) "../nxhtml/nxhtml-bug" "nxhtml/nxhtml-bug.el"
-;;;;;;  (18654 33920))
-;;; Generated autoloads from nxhtml/nxhtml-bug.el
-
-(autoload 'nxhtml-report-bug "../nxhtml/nxhtml-bug" "\
-Report a bug in nXhtml.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (nxhtml-global-minor-mode nxhtml-minor-mode) "../nxhtml/nxhtml-menu"
-;;;;;;  "nxhtml/nxhtml-menu.el" (18671 42692))
-;;; Generated autoloads from nxhtml/nxhtml-menu.el
-
-(autoload 'nxhtml-minor-mode "../nxhtml/nxhtml-menu" "\
-Minor mode to turn on some key and menu bindings.
-See `nxhtml-mode' for more information.
-
-\(fn &optional ARG)" t nil)
-
-(defvar nxhtml-global-minor-mode nil "\
-Non-nil if Nxhtml-Global minor mode is enabled.
-See the command `nxhtml-global-minor-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `nxhtml-global-minor-mode'.")
-
-(custom-autoload 'nxhtml-global-minor-mode "../nxhtml/nxhtml-menu" nil)
-
-(autoload 'nxhtml-global-minor-mode "../nxhtml/nxhtml-menu" "\
-Toggle Nxhtml minor mode in every possible buffer.
-With prefix ARG, turn Nxhtml-Global minor mode on if and only if ARG is positive.
-Nxhtml minor mode is enabled in all buffers where `nxhtml-maybe-turn-on-minor-mode' would do it.
-See `nxhtml-minor-mode' for more information on Nxhtml minor mode.
+  a mumamo multi major mode is used, see
+  `nxhtml-validation-header-if-mumamo' for further information.
 
-\(fn &optional ARG)" t nil)
+\(fn &optional ARG)" t nil))
 
 ;;;***
 
@@ -231,12 +323,14 @@ See `nxhtml-minor-mode' for more information on Nxhtml minor mode.
 ;;;;;;  eruby-nxhtml-mumamo-mode jsp-nxhtml-mumamo-mode smarty-nxhtml-mumamo-mode
 ;;;;;;  mjt-nxhtml-mumamo-mode genshi-nxhtml-mumamo-mode django-nxhtml-mumamo-mode
 ;;;;;;  embperl-nxhtml-mumamo-mode nxhtml-mumamo-mode) "../nxhtml/nxhtml-mumamo"
-;;;;;;  "nxhtml/nxhtml-mumamo.el" (18764 14404))
+;;;;;;  "nxhtml/nxhtml-mumamo.el" (18982 33732))
 ;;; Generated autoloads from nxhtml/nxhtml-mumamo.el
 
 (autoload 'nxhtml-mumamo-mode "../nxhtml/nxhtml-mumamo" "\
 Turn on multiple major modes for (X)HTML with main mode `nxhtml-mode'.
-This covers inlined style and javascript and PHP." t)
+This covers inlined style and javascript and PHP.
+
+See also `mumamo-alt-php-tags-mode'." t)
 
 (autoload 'embperl-nxhtml-mumamo-mode "../nxhtml/nxhtml-mumamo" "\
 Turn on multiple major modes for Embperl files with main mode `nxhtml-mode'.
@@ -277,7 +371,7 @@ This also covers inlined style and javascript." t)
 ;;;***
 
 ;;;### (autoloads (nxml-where-global-mode nxml-where-mode) "../nxhtml/nxml-where"
-;;;;;;  "nxhtml/nxml-where.el" (18658 47798))
+;;;;;;  "nxhtml/nxml-where.el" (19061 60294))
 ;;; Generated autoloads from nxhtml/nxml-where.el
 
 (autoload 'nxml-where-mode "../nxhtml/nxml-where" "\
@@ -292,7 +386,7 @@ Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `nxml-where-global-mode'.")
 
-(custom-autoload 'nxml-where-global-mode "../nxhtml/nxml-where" nil)
+(nxhtml-custom-autoload 'nxml-where-global-mode "../nxhtml/nxml-where" nil)
 
 (autoload 'nxml-where-global-mode "../nxhtml/nxml-where" "\
 Toggle Nxml-Where mode in every possible buffer.
@@ -302,6 +396,51 @@ See `nxml-where-mode' for more information on Nxml-Where mode.
 
 \(fn &optional ARG)" t nil)
 
+;;;***
+
+;;;### (autoloads (rngalt-set-validation-header) "../nxhtml/rngalt"
+;;;;;;  "nxhtml/rngalt.el" (18982 33732))
+;;; Generated autoloads from nxhtml/rngalt.el
+
+(autoload 'rngalt-set-validation-header "../nxhtml/rngalt" "\
+Not documented
+
+\(fn START-OF-DOC)" nil nil)
+
+;;;***
+
+;;;### (autoloads (tidy-build-menu) "../nxhtml/tidy-xhtml" "nxhtml/tidy-xhtml.el"
+;;;;;;  (19039 48498))
+;;; Generated autoloads from nxhtml/tidy-xhtml.el
+
+(autoload 'tidy-build-menu "../nxhtml/tidy-xhtml" "\
+Set up the tidy menu in MAP.
+Used to set up a Tidy menu in your favourite mode.
+
+\(fn &optional MAP)" t nil)
+
+;;;***
+
+;;;### (autoloads (xhtml-help-show-tag-ref xhtml-help-tag-at-point
+;;;;;;  xhtml-help-show-css-ref) "../nxhtml/xhtml-help" "nxhtml/xhtml-help.el"
+;;;;;;  (19036 37218))
+;;; Generated autoloads from nxhtml/xhtml-help.el
+
+(autoload 'xhtml-help-show-css-ref "../nxhtml/xhtml-help" "\
+Show CSS reference for CSS property name at point.
+
+\(fn)" t nil)
+
+(autoload 'xhtml-help-tag-at-point "../nxhtml/xhtml-help" "\
+Get xhtml tag name at or before point.
+
+\(fn)" nil nil)
+
+(autoload 'xhtml-help-show-tag-ref "../nxhtml/xhtml-help" "\
+Show xhtml reference for tag name at or before point.
+
+\(fn)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (csharp-mode) "../related/csharp-mode" "related/csharp-mode.el"
@@ -321,18 +460,6 @@ Key bindings:
 
 \(fn)" t nil)
 
-;;;***
-
-;;;### (autoloads (css-mode) "../related/css-mode" "related/css-mode.el"
-;;;;;;  (18248 47980))
-;;; Generated autoloads from related/css-mode.el
- (add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
-
-(autoload 'css-mode "../related/css-mode" "\
-Major mode to edit Cascading Style Sheets.
-
-\(fn)" t nil)
-
 ;;;***
 
 ;;;### (autoloads (django-mode) "../related/django" "related/django.el"
@@ -347,26 +474,26 @@ This mode only provides syntax highlighting.
 
 ;;;***
 
-;;;### (autoloads (javascript-mode) "../related/javascript" "related/javascript.el"
-;;;;;;  (18418 45624))
-;;; Generated autoloads from related/javascript.el
+;;;### (autoloads (espresso-mode) "../related/espresso" "related/espresso.el"
+;;;;;;  (19039 48498))
+;;; Generated autoloads from related/espresso.el
 
-(autoload 'javascript-mode "../related/javascript" "\
+(autoload 'espresso-mode "../related/espresso" "\
 Major mode for editing JavaScript source text.
 
 Key bindings:
 
-\\{javascript-mode-map}
+\\{espresso-mode-map}
 
 \(fn)" t nil)
 
 ;;;***
 
-;;;### (autoloads (javascript-mode) "../related/javascript-mozlab"
-;;;;;;  "related/javascript-mozlab.el" (18562 39536))
-;;; Generated autoloads from related/javascript-mozlab.el
+;;;### (autoloads (javascript-mode) "../related/javascript" "related/javascript.el"
+;;;;;;  (18946 55162))
+;;; Generated autoloads from related/javascript.el
 
-(autoload 'javascript-mode "../related/javascript-mozlab" "\
+(autoload 'javascript-mode "../related/javascript" "\
 Major mode for editing JavaScript source text.
 
 Key bindings:
@@ -375,46 +502,10 @@ Key bindings:
 
 \(fn)" t nil)
 
-;;;***
-
-;;;### (autoloads (js2-mode) "../related/js2" "related/js2.el" (18624
-;;;;;;  30036))
-;;; Generated autoloads from related/js2.el
- (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-
-(autoload 'js2-mode "../related/js2" "\
-Major mode for editing JavaScript code.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (js2-mode) "../related/js2-mumamo" "related/js2-mumamo.el"
-;;;;;;  (18496 38616))
-;;; Generated autoloads from related/js2-mumamo.el
- (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-
-(autoload 'js2-mode "../related/js2-mumamo" "\
-Major mode for editing JavaScript code.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (js2-mode) "../related/js2-new" "related/js2-new.el"
-;;;;;;  (18455 47788))
-;;; Generated autoloads from related/js2-new.el
- (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-
-(autoload 'js2-mode "../related/js2-new" "\
-Major mode for editing JavaScript code.
-
-\(fn)" t nil)
-
 ;;;***
 
 ;;;### (autoloads (inferior-moz-mode moz-minor-mode) "../related/moz"
-;;;;;;  "related/moz.el" (18654 33920))
+;;;;;;  "related/moz.el" (19048 2102))
 ;;; Generated autoloads from related/moz.el
 
 (autoload 'moz-minor-mode "../related/moz" "\
@@ -441,443 +532,98 @@ Major mode for interacting with Firefox via MozRepl.
 
 ;;;***
 
-;;;### (autoloads (php-mode php-file-patterns) "../related/php-mode"
-;;;;;;  "related/php-mode.el" (18735 15066))
-;;; Generated autoloads from related/php-mode.el
-
-(defvar php-file-patterns '("\\.php[s34]?\\'" "\\.phtml\\'" "\\.inc\\'") "\
-List of file patterns for which to automatically invoke `php-mode'.")
-
-(custom-autoload 'php-file-patterns "../related/php-mode" nil)
-
-(autoload 'php-mode "../related/php-mode" "\
-Major mode for editing PHP code.
-
-\\{php-mode-map}
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (php-mode php-file-patterns) "../related/php-mode-2008-10-23"
-;;;;;;  "related/php-mode-2008-10-23.el" (18688 64648))
-;;; Generated autoloads from related/php-mode-2008-10-23.el
-
-(defvar php-file-patterns '("\\.php[s34]?\\'" "\\.phtml\\'" "\\.inc\\'") "\
-List of file patterns for which to automatically invoke `php-mode'.")
-
-(custom-autoload 'php-file-patterns "../related/php-mode-2008-10-23" nil)
-
-(autoload 'php-mode "../related/php-mode-2008-10-23" "\
-Major mode for editing PHP code.
-
-\\{php-mode-map}
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (smarty-mode) "../related/smarty-mode" "related/smarty-mode.el"
-;;;;;;  (18317 23898))
-;;; Generated autoloads from related/smarty-mode.el
-
-(autoload 'smarty-mode "../related/smarty-mode" "\
-Mode for editing php smarty files.
-Smarty Mode is a GNU XEmacs major mode for editing Smarty templates.
-
-1 Introduction
-**************
-
-Smarty-Mode is a mode allowing easy edit of Smarty templates:
-highlight, templates, navigation into source files...
-
-
-
-Features (new features in bold) :
-
-   * Completion
-
-   * Customizable
-
-   * Highlight
-
-   * Menu
-
-   * Stuttering
-
-   * Templates
-        - Built-in Functions
-
-        - User Functions
-
-        - Variable Modifiers
-
-        - Plugin (Functions)
-             * Smarty Formtool
-
-             * Smarty Paginate
-
-             * Smarty Validate
-
-        - Plugin (Variable Modifiers)
-             * AlternativeDateModifierPlugin
-
-             * B2Smilies
-
-             * BBCodePlugin
-
-        - Fonctions Non-Smarty
+;;;### (autoloads (global-mozadd-mirror-mode mozadd-mirror-mode global-mozadd-refresh-edited-on-save-mode
+;;;;;;  mozadd-refresh-edited-on-save-mode) "../related/mozadd" "related/mozadd.el"
+;;;;;;  (19063 53089))
+;;; Generated autoloads from related/mozadd.el
 
+(autoload 'mozadd-refresh-edited-on-save-mode "../related/mozadd" "\
+Refresh mozadd edited file in Firefox when saving file.
+The mozadd edited file is the file in the last buffer visited in
+`mozadd-mirror-mode'.
 
+You can use this for example when you edit CSS files.
 
-This manual describes Smarty Mode version 0.0.4.
-
-3 Customization
-***************
-
-This chapter describes the differents parameters and functions that
-you can change to customize Smarty Mode.  To do that, open a Smarty
-file, click on the Smarty menu and choose Options then Browse
-Options....
-
-3.1 Parameters
-==============
-
-3.1.1 Mode
-----------
-
-Smarty Mode has 2 modes allowing to simplify the writing of Smarty
-templates. You can enable/disable each mode individually.
-
-`smarty-electric-mode'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; enable automatic generation of template.
-     If `nil'; template generators can still be invoked through key
-     bindings and menu. Is indicated in the modeline by \"/e\" after
-     the mode name and can be toggled by `smarty-electric-mode'.
-
-`smarty-stutter-mode'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; enable the stuttering. Is indicated in the
-     modeline by \"/s\" after the mode name and can be toggled by
-     `smarty-stutter-mode'.
-
-3.1.2 Menu
-----------
-
-Smarty Mode has also 1 menu that you can enable/disable. The menu
-Sources is specific to each Smarty files opened.
-
-`smarty-source-file-menu'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; the Sources menu is enabled. This menu
-     contains the list of Smarty file located in the current
-     directory. The Sources menu scans the directory when a file is
-     opened.
-
-3.1.3 Menu
-----------
-
-`smarty-highlight-plugin-functions'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; the functions described in the smarty
-     plugins are highlighted.
-
-3.1.4 Templates
----------------
-
-3.1.4.1 Header
-..............
-
-`smarty-file-header'
-     Type: string
-     Default value: `\"\"'
-     Description: String or file to insert as file header. If the
-     string specifies an existing file name the contents of the file
-     is inserted; otherwise the string itself is inserted as file
-     header.
-     Type `C-j' for newlines.
-     The follonwing keywords are supported:
-     <filename>: replaced by the file name.
-     <author>: replaced by the user name and email address.
-     <login>: replaced by `user-login-name'.
-     <company>: replaced by `smarty-company-name' content.
-     <date>: replaced by the current date.
-     <year>: replaced by the current year.
-     <copyright>: replaced by `smarty-copyright-string' content.
-     <cursor>: final cursor position.
-
-`smarty-file-footer'
-     Type: string
-     Default value: `\"\"'
-     Description: String or file to insert as file footer.  See
-     `smarty-file-header'
-
-`smarty-company-name'
-     Type: string
-     Default value: `\"\"'
-     Description: Name of the company to insert in file header.
-
-`smarty-copyright-string'
-     Type: string
-     Default value: `\"\"'
-     Description: Coryright string to insert in file header.
-
-`smarty-date-format'
-     Type: string
-     Default value: `\"%Y-%m-%d\"'
-     Description: Date format.
-
-`smarty-modify-date-prefix-string'
-     Type: string
-     Default value: `\"\"'
-     Description: Prefix string of modification date in Smarty file
-     header.
-
-`smarty-modify-date-on-saving'
-     Type: bool
-     Default value: `nil'
-     Description: If `t'; update the modification date when the
-     buffer is saved.
-
-3.1.5 Miscellaneous
--------------------
-
-`smarty-left-delimiter'
-     Type: string
-     Default value: `\"\"'
-     Description: Left escaping delimiter for Smarty templates.
-
-`smarty-right-delimiter'
-     Type: string
-     Default value: `\"\"'
-     Description: Right escaping delimiter for Smarty templates.
-
-`smarty-intelligent-tab'
-     Type: bool
-     Default value: `t'
-     Description: If `t'; TAB does indentation; completion and insert
-     tabulations. If `nil'; TAB does only indentation.
-
-`smarty-word-completion-in-minibuffer'
-     Type: bool
-     Default value: `t'
-     Description: If `t'; enable completion in the minibuffer.
-
-`smarty-word-completion-case-sensitive'
-     Type: bool
-     Default value: `nil'
-     Description: If `t'; completion is case sensitive.
-
-3.2 Functions
-=============
-
-3.2.1 Mode
-----------
-
-`smarty-electric-mode'
-     Menu: Smarty -> Options -> Mode -> Electric Mode
-     Keybinding: `C-c C-m C-e'
-     Description: This functions is used to enable/disable the
-     electric mode.
-
-`smarty-stutter-mode'
-     Menu: Smarty -> Options -> Mode -> Stutter Mode
-     Keybinding: `C-c C-m C-s'
-     Description: This function is used to enable/disable the stutter
-     mode.
-
-4 Menus
-*******
-
-There are 2 menus: Smarty and Sources. All theses menus can be
-accessed from the menubar or from the right click. This chapter
-describes each menus.
-
-4.1 Smarty
-==========
-
-This is the main menu of Smarty Mode. It allows an easy access to the
-main features of the Smarty Mode: Templates (see *Note Templates::)
-and Options (see *Note Customization::).
-
-This menu contains also 3 functions that are discussed in the next
-part.
-
-4.1.1 Functions
----------------
-\\<smarty-mode-map>
-`smarty-show-messages'
-     Menu: Smarty -> Show Messages
-     Keybinding: `C-c M-m' \\[smarty-show-messages]
-     Description: This function opens the *Messages* buffer to
-     display previous error messages.
-
-`smarty-doc-mode'
-     Menu: Smarty -> Smarty Mode Documentation
-     Keybinding: `C-c C-h' \\[smarty-doc-mode]
-     Description: This function opens the *Help* buffer and prints in
-     it the Smarty Mode documentation.
-
-`smarty-version'
-     Menu: Smarty -> Version
-     Keybinding: `C-c C-v'
-     Description: This function displays in the minibuffer the
-     current Smarty Mode version with the timestamp.
-
-4.2 Sources
-===========
-
-The Sources menu shows the Smarty files in the current directory. If
-you add or delete a file in the current directory, you need to
-refresh the menu.
-
-4.2.1 Customization
--------------------
-
-`smarty-source-file-menu'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; the Sources menu is enabled. This menu
-     contains the list of Smarty file located in the current
-     directory. The Sources menu scans the directory when a file is
-     opened.
-
-4.2.2 Functions
----------------
-
-`smarty-add-source-files-menu'
-     Menu: Sources -> *Rescan*
-     Keybinding: `C-c C-s C-u'
-     Description: This function is used to refresh the Sources menu.
-
-5 Stuttering
-************
-
-The stutter mode is a mode that affects a function to a key. For
-example, when you use the `ENTER' key, the associated function will
-create a new line and indent it.
-
-5.1 Customization
-=================
-
-`smarty-stutter-mode'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; enable the stuttering. Is indicated in the
-     modeline by \"/s\" after the mode name and can be toggled by
-     `smarty-stutter-mode'.
-
-5.2 Functions
-=============
-
-`SPACE'
-     If in comment, indent the comment and add new line if necessary.
-     In other case, add a space.
-
-`('
-     If the previous character is a `(', the `((' will be replaced by
-     `['.
-     If the previous character is a `[', the `[(' will be replaced by
-     `{'.
-     In other case, insert a `('.
-
-`)'
-     If the previous character is a `)', the `))' will be replaced by
-     `]'.
-     If the previous character is a `]', the `])' will be replaced by
-     `}'.
-     In other case, insert a `)'.
-
-6 Templates
-***********
+The mozadd edited file must be shown in Firefox and visible.
 
-In the Smarty Mode, the Smarty functions (like if, while, for, fopen,
-fclose) are predefined in functions called \"Templates\".
+\(fn &optional ARG)" t nil)
 
-Each template can be invoked by the function name or by using the
-<SPACE> key after the Smarty function name in the buffer (Note, using
-`M-<SPACE>' disable the template).
+(defvar global-mozadd-refresh-edited-on-save-mode nil "\
+Non-nil if Global-Mozadd-Refresh-Edited-On-Save mode is enabled.
+See the command `global-mozadd-refresh-edited-on-save-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-mozadd-refresh-edited-on-save-mode'.")
 
-A template can be aborted by using the `C-g' or by lefting empty the
-tempate prompt (in the minibuffer).
+(nxhtml-custom-autoload 'global-mozadd-refresh-edited-on-save-mode "../related/mozadd" nil)
 
-6.1 Customization
-=================
+(autoload 'global-mozadd-refresh-edited-on-save-mode "../related/mozadd" "\
+Toggle Mozadd-Refresh-Edited-On-Save mode in every possible buffer.
+With prefix ARG, turn Global-Mozadd-Refresh-Edited-On-Save mode on if and only if ARG is positive.
+Mozadd-Refresh-Edited-On-Save mode is enabled in all buffers where `(lambda nil (when (or (derived-mode-p (quote css-mode)) (mozadd-html-buffer-file-p)) (mozadd-refresh-edited-on-save-mode 1)))' would do it.
+See `mozadd-refresh-edited-on-save-mode' for more information on Mozadd-Refresh-Edited-On-Save mode.
 
-`smarty-electric-mode'
-     Type: boolean
-     Default value: `t'
-     Description: If `t'; enable automatic generation of template.
-     If `nil'; template generators can still be invoked through key
-     bindings and menu. Is indicated in the modeline by \"/e\" after
-     the mode name and can be toggled by `smarty-electric-mode'.
+\(fn &optional ARG)" t nil)
 
-For a complete description of the template customizable variables,
-see *Note Cu01-Pa01-Template::
+(autoload 'mozadd-mirror-mode "../related/mozadd" "\
+Mirror content of current file buffer immediately in Firefox.
+When you turn on this mode the file will be opened in Firefox.
+Every change you make in the buffer will trigger a redraw in
+Firefox - regardless of if you save the file or not.
 
-6.2 Functions
-=============
+For the mirroring to work the edited file must be shown in
+Firefox and visible.
 
-6.2.1 Smarty Functions
-----------------------
+If `nxml-where-mode' is on the marks will also be shown in
+Firefox as CSS outline style.  You can customize the style
+through the option `mozadd-xml-path-outline-style'.
 
-For Smarty functions, see PDF or HTML documentation.
+See also `mozadd-refresh-edited-on-save-mode'.
 
-6.2.2 Non-Smarty Functions
---------------------------
+\(fn &optional ARG)" t nil)
 
-`smarty-template-header'
-     Menu: Smarty -> Templates -> Insert Header
-     Keybinding: `C-c C-t C-h'
-     Description: This function is used to insert a header in the
-     current buffer.
+(defvar global-mozadd-mirror-mode nil "\
+Non-nil if Global-Mozadd-Mirror mode is enabled.
+See the command `global-mozadd-mirror-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-mozadd-mirror-mode'.")
 
-`smarty-template-footer'
-     Menu: Smarty -> Templates -> Insert Footer
-     Keybinding: `C-c C-t C-f'
-     Description: This function is used to insert a footer in the
-     current buffer.
+(nxhtml-custom-autoload 'global-mozadd-mirror-mode "../related/mozadd" nil)
 
-`smarty-template-insert-date'
-     Menu: Smarty -> Templates -> Insert Date
-     Keybinding: `C-c C-t C-d i'
-     Description: This function is used to insert the date in the
-     current buffer.
+(autoload 'global-mozadd-mirror-mode "../related/mozadd" "\
+Toggle Mozadd-Mirror mode in every possible buffer.
+With prefix ARG, turn Global-Mozadd-Mirror mode on if and only if ARG is positive.
+Mozadd-Mirror mode is enabled in all buffers where `(lambda nil (when (mozadd-html-buffer-file-p) (mozadd-mirror-mode 1)))' would do it.
+See `mozadd-mirror-mode' for more information on Mozadd-Mirror mode.
 
-`smarty-template-modify'
-     Menu: Smarty -> Templates -> Modify Date
-     Keybinding: `C-c C-t C-d m'
-     Description: This function is used to modify the last
-     modification date in the current buffer.
+\(fn &optional ARG)" t nil)
 
-7 Bugs, Help
-************
+;;;***
+
+;;;### (autoloads (php-mode php-file-patterns) "../related/php-mode"
+;;;;;;  "related/php-mode.el" (19032 52516))
+;;; Generated autoloads from related/php-mode.el
 
-   * To report bugs: Bugtracker
-     (http://bugtracker.morinie.fr/lisp/set_project.php?project_id=2)
+(defvar php-file-patterns '("\\.php[s34]?\\'" "\\.phtml\\'" "\\.inc\\'") "\
+List of file patterns for which to automatically invoke `php-mode'.")
 
-   * To obtain help you can post on the dedicated forum: Forum
-     (http://forum.morinie.fr/lisp/)
+(nxhtml-custom-autoload 'php-file-patterns "../related/php-mode" nil)
 
-8 Key bindings
-**************
+(autoload 'php-mode "../related/php-mode" "\
+Major mode for editing PHP code.
 
-\\{smarty-mode-map}
+\\{php-mode-map}
 
 \(fn)" t nil)
 
 ;;;***
 
-;;;### (autoloads (smarty-mode) "../related/smarty-mode-vdebout"
-;;;;;;  "related/smarty-mode-vdebout.el" (18295 31440))
-;;; Generated autoloads from related/smarty-mode-vdebout.el
+;;;### (autoloads (smarty-mode) "../related/smarty-mode" "related/smarty-mode.el"
+;;;;;;  (19039 48498))
+;;; Generated autoloads from related/smarty-mode.el
 
-(autoload 'smarty-mode "../related/smarty-mode-vdebout" "\
+(autoload 'smarty-mode "../related/smarty-mode" "\
 Smarty Mode
 ***********
 
@@ -911,6 +657,10 @@ Features (new features in bold) :
         - Variable Modifiers
 
         - Plugin (Functions)
+             * BlockRepeatPlugin
+
+             * ClipCache
+
              * Smarty Formtool
 
              * Smarty Paginate
@@ -928,7 +678,7 @@ Features (new features in bold) :
 
 
 
-This manual describes Smarty Mode version 0.0.4.
+This manual describes Smarty Mode version 0.0.5.
 
 2 Installation
 **************
@@ -957,12 +707,12 @@ installed.
 
 Two internet address to download Smarty Mode :
 
-   * Principal: Smarty-Mode 0.0.4
-     (http://deboutv.free.fr/lisp/smarty/download/smarty-0.0.4.tar.gz)
+   * Principal: Smarty-Mode 0.0.5
+     (http://deboutv.free.fr/lisp/smarty/download/smarty-0.0.5.tar.gz)
      (http://deboutv.free.fr/lisp/smarty/)
 
-   * Secondary: Smarty-Mode 0.0.4
-     (http://www.morinie.fr/lisp/smarty/download/smarty-0.0.4.tar.gz)
+   * Secondary: Smarty-Mode 0.0.5
+     (http://www.morinie.fr/lisp/smarty/download/smarty-0.0.5.tar.gz)
      (http://www.morinie.fr/lisp/smarty/)
 
    * Old releases: Smarty-Mode
@@ -984,7 +734,7 @@ installation directory.
 
 Example:
      cd /usr/local/share/lisp
-     tar zxvf smarty-0.0.4.tar.gz
+     tar zxvf smarty-0.0.5.tar.gz
 Now you have a `smarty' directory in the installation directory. This
 directory contains 2 files `smarty-mode.el' and `smarty-mode.elc' and
 another directory `docs' containing the documentation.
@@ -1007,7 +757,7 @@ directory to remove the old release.
 Example:
      cd /usr/local/share/lisp
      rm -rf smarty
-     tar zxvf smarty-0.0.4.tar.gz
+     tar zxvf smarty-0.0.5.tar.gz
 
 2.4 Invoke Smarty-Mode
 ======================
@@ -1382,7 +1132,7 @@ Major mode for editing Template Toolkit files.
 
 ;;;### (autoloads (wikipedia-draft-buffer wikipedia-draft-page wikipedia-draft
 ;;;;;;  wikipedia-mode) "../related/wikipedia-mode" "related/wikipedia-mode.el"
-;;;;;;  (18401 44650))
+;;;;;;  (18790 45400))
 ;;; Generated autoloads from related/wikipedia-mode.el
 
 (autoload 'wikipedia-mode "../related/wikipedia-mode" "\
@@ -1488,7 +1238,7 @@ wikipedia-draft-data-file.
 ;;;***
 
 ;;;### (autoloads (ert-run-tests-interactively ert-deftest) "../tests/ert"
-;;;;;;  "tests/ert.el" (18614 1898))
+;;;;;;  "tests/ert.el" (18775 60002))
 ;;; Generated autoloads from tests/ert.el
 
 (autoload 'ert-deftest "../tests/ert" "\
@@ -1504,7 +1254,7 @@ Run the tests specified by SELECTOR and display the results in a buffer.
 ;;;***
 
 ;;;### (autoloads (nxhtmltest-run-Q) "../tests/nxhtmltest-Q" "tests/nxhtmltest-Q.el"
-;;;;;;  (18762 63688))
+;;;;;;  (18781 14068))
 ;;; Generated autoloads from tests/nxhtmltest-Q.el
 
 (autoload 'nxhtmltest-run-Q "../tests/nxhtmltest-Q" "\
@@ -1516,7 +1266,7 @@ See `nxhtmltest-run' for more information about the tests.
 ;;;***
 
 ;;;### (autoloads (nxhtmltest-run nxhtmltest-run-indent) "../tests/nxhtmltest-suites"
-;;;;;;  "tests/nxhtmltest-suites.el" (18764 7444))
+;;;;;;  "tests/nxhtmltest-suites.el" (19062 23630))
 ;;; Generated autoloads from tests/nxhtmltest-suites.el
 
 (autoload 'nxhtmltest-run-indent "../tests/nxhtmltest-suites" "\
@@ -1536,11 +1286,24 @@ fail (they corresponds to known errors in nXhtml/Emacs):
 
 \(fn)" t nil)
 
+;;;***
+
+;;;### (autoloads (appmenu-add) "appmenu" "util/appmenu.el" (18977
+;;;;;;  25246))
+;;; Generated autoloads from util/appmenu.el
+
+(autoload 'appmenu-add "appmenu" "\
+Add entry to `appmenu-alist'.
+Add an entry to this list with ID, PRIORITY, TEST, TITLE and
+DEFINITION as explained there.
+
+\(fn ID PRIORITY TEST TITLE DEFINITION)" nil nil)
+
 ;;;***
 
 ;;;### (autoloads (as-external-mode as-external-for-wiki as-external-for-mail
 ;;;;;;  as-external-for-xhtml) "as-external" "util/as-external.el"
-;;;;;;  (18686 30854))
+;;;;;;  (19063 48015))
 ;;; Generated autoloads from util/as-external.el
 
 (autoload 'as-external-for-xhtml "as-external" "\
@@ -1586,24 +1349,529 @@ Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `as-external-mode'.")
 
-(custom-autoload 'as-external-mode "as-external" nil)
+(nxhtml-custom-autoload 'as-external-mode "as-external" nil)
+
+(autoload 'as-external-mode "as-external" "\
+If non-nil check if Emacs is called as external editor.
+When Emacs is called as an external editor for example to edit
+text areas on a web page viewed with Firefox this library tries
+to help to setup the buffer in a useful way. It may for example
+set major and minor modes for the buffer.
+
+This can for example be useful when blogging or writing comments
+on blogs.
+
+See `as-external-alist' for more information.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (chart-make-chart chart-complete) "chart" "util/chart.el"
+;;;;;;  (19063 39536))
+;;; Generated autoloads from util/chart.el
+
+(autoload 'chart-complete "chart" "\
+Not documented
+
+\(fn)" t nil)
+
+(autoload 'chart-make-chart "chart" "\
+Try to make a new chart.
+If region is active then make a new chart from data in the
+selected region.
+
+Else if current buffer is in `chart-mode' then do it from the
+chart specifications in this buffer.  Otherwise create a new
+buffer and initialize it with `chart-mode'.
+
+If the chart specifications are complete enough to make a chart
+then do it and show the resulting chart image.  If not then tell
+user what is missing.
+
+NOTE: This is beta, no alpha code. It is not ready.
+
+Below are some examples.  To test them mark an example and do
+
+  M-x chart-make-chart
+
+* Example, simple x-y chart:
+
+  Output-file: \"~/temp-chart.png\"
+  Size: 200 200
+  Data: 3 8 5 | 10 20 30
+  Type: line-chart-xy
+
+* Example, pie:
+
+  Output-file: \"~/temp-depression.png\"
+  Size: 400 200
+  Data:
+  2,160,000
+  3,110,000
+  1,510,000
+  73,600
+  775,000
+  726,000
+  8,180,000
+  419,000
+  Type: pie-3-dimensional
+  Chart-title: \"Depression hits on Google\"
+  Legends:
+  \"SSRI\"
+  | \"Psychotherapy\"
+  | \"CBT\"
+  | \"IPT\"
+  | \"Psychoanalysis\"
+  | \"Mindfulness\"
+  | \"Meditation\"
+  | \"Exercise\"
+
+
+* Example, pie:
+
+  Output-file: \"~/temp-panic.png\"
+  Size: 400 200
+  Data:
+  979,000
+  969,000
+  500,000
+  71,900
+  193,000
+  154,000
+  2,500,000
+  9,310,000
+  Type: pie-3-dimensional
+  Chart-title: \"Depression hits on Google\"
+  Legends:
+  \"SSRI\"
+  | \"Psychotherapy\"
+  | \"CBT\"
+  | \"IPT\"
+  | \"Psychoanalysis\"
+  | \"Mindfulness\"
+  | \"Meditation\"
+  | \"Exercise\"
+
+
+* Example using raw:
+
+  Output-file: \"~/temp-chart-slipsen-kostar.png\"
+  Size: 400 130
+  Data: 300 1000 30000
+  Type: bar-chart-horizontal
+  Chart-title: \"Vad killen i slips tjänar jämfört med dig och mig\"
+  Google-chart-raw: \"&chds=0,30000&chco=00cd00|ff4500|483d8b&chxt=y,x&chxl=0:|Killen+i+slips|Partiledarna|Du+och+jag&chf=bg,s,ffd700\"
+
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (global-company-mode company-mode) "company-mode/company"
+;;;;;;  "util/company-mode/company.el" (19063 31164))
+;;; Generated autoloads from util/company-mode/company.el
+
+(autoload 'company-mode "company-mode/company" "\
+\"complete anything\"; in in-buffer completion framework.
+Completion starts automatically, depending on the values
+`company-idle-delay' and `company-minimum-prefix-length'.
+
+Completion can be controlled with the commands:
+`company-complete-common', `company-complete-selection', `company-complete',
+`company-select-next', `company-select-previous'.  If these commands are
+called before `company-idle-delay', completion will also start.
+
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.  These can be used while completion is
+inactive, as well.
+
+The completion data is retrieved using `company-backends' and displayed using
+`company-frontends'.  If you want to start a specific back-end, call it
+interactively or use `company-begin-backend'.
+
+regular keymap (`company-mode-map'):
+
+\\{company-mode-map}
+keymap during active completions (`company-active-map'):
+
+\\{company-active-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-company-mode nil "\
+Non-nil if Global-Company mode is enabled.
+See the command `global-company-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-company-mode'.")
+
+(nxhtml-custom-autoload 'global-company-mode "company-mode/company" nil)
+
+(autoload 'global-company-mode "company-mode/company" "\
+Toggle Company mode in every possible buffer.
+With prefix ARG, turn Global-Company mode on if and only if ARG is positive.
+Company mode is enabled in all buffers where `(lambda nil (when (catch (quote cm) (dolist (mode company-major-modes) (when (derived-mode-p mode) (throw (quote cm) t)))) (company-mode 1)))' would do it.
+See `company-mode' for more information on Company mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-abbrev) "company-mode/company-abbrev"
+;;;;;;  "util/company-mode/company-abbrev.el" (19039 49090))
+;;; Generated autoloads from util/company-mode/company-abbrev.el
+
+(autoload 'company-abbrev "company-mode/company-abbrev" "\
+A `company-mode' completion back-end for abbrev.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-css) "company-mode/company-css" "util/company-mode/company-css.el"
+;;;;;;  (19048 2102))
+;;; Generated autoloads from util/company-mode/company-css.el
+
+(autoload 'company-css "company-mode/company-css" "\
+A `company-mode' completion back-end for `css-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-dabbrev) "company-mode/company-dabbrev"
+;;;;;;  "util/company-mode/company-dabbrev.el" (19039 49092))
+;;; Generated autoloads from util/company-mode/company-dabbrev.el
+
+(autoload 'company-dabbrev "company-mode/company-dabbrev" "\
+A dabbrev-like `company-mode' completion back-end.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-dabbrev-code) "company-mode/company-dabbrev-code"
+;;;;;;  "util/company-mode/company-dabbrev-code.el" (19039 49092))
+;;; Generated autoloads from util/company-mode/company-dabbrev-code.el
+
+(autoload 'company-dabbrev-code "company-mode/company-dabbrev-code" "\
+A dabbrev-like `company-mode' back-end for code.
+The back-end looks for all symbols in the current buffer that aren't in
+comments or strings.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-elisp) "company-mode/company-elisp" "util/company-mode/company-elisp.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-elisp.el
+
+(autoload 'company-elisp "company-mode/company-elisp" "\
+A `company-mode' completion back-end for `emacs-lisp-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-etags) "company-mode/company-etags" "util/company-mode/company-etags.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-etags.el
+
+(autoload 'company-etags "company-mode/company-etags" "\
+A `company-mode' completion back-end for etags.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-files) "company-mode/company-files" "util/company-mode/company-files.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-files.el
+
+(autoload 'company-files "company-mode/company-files" "\
+a `company-mode' completion back-end existing file names.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-gtags) "company-mode/company-gtags" "util/company-mode/company-gtags.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-gtags.el
+
+(autoload 'company-gtags "company-mode/company-gtags" "\
+A `company-mode' completion back-end for GNU Global.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-ispell) "company-mode/company-ispell"
+;;;;;;  "util/company-mode/company-ispell.el" (19039 49092))
+;;; Generated autoloads from util/company-mode/company-ispell.el
+
+(autoload 'company-ispell "company-mode/company-ispell" "\
+A `company-mode' completion back-end using ispell.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-keywords) "company-mode/company-keywords"
+;;;;;;  "util/company-mode/company-keywords.el" (19039 49092))
+;;; Generated autoloads from util/company-mode/company-keywords.el
+
+(autoload 'company-keywords "company-mode/company-keywords" "\
+A `company-mode' back-end for programming language keywords.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-choose) "company-mode/company-nograb"
+;;;;;;  "util/company-mode/company-nograb.el" (19045 31314))
+;;; Generated autoloads from util/company-mode/company-nograb.el
+
+(autoload 'company-choose "company-mode/company-nograb" "\
+Not documented
+
+\(fn CANDIDATES)" nil nil)
+
+;;;***
+
+;;;### (autoloads (company-nxml) "company-mode/company-nxml" "util/company-mode/company-nxml.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-nxml.el
+
+(autoload 'company-nxml "company-mode/company-nxml" "\
+A `company-mode' completion back-end for `nxml-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-oddmuse) "company-mode/company-oddmuse"
+;;;;;;  "util/company-mode/company-oddmuse.el" (19039 49092))
+;;; Generated autoloads from util/company-mode/company-oddmuse.el
+
+(autoload 'company-oddmuse "company-mode/company-oddmuse" "\
+A `company-mode' completion back-end for `oddmuse-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-predictive) "company-mode/company-predictive"
+;;;;;;  "util/company-mode/company-predictive.el" (19060 15106))
+;;; Generated autoloads from util/company-mode/company-predictive.el
+
+(autoload 'company-predictive "company-mode/company-predictive" "\
+A predictive-like `company-mode' completion back-end.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-pysmell) "company-mode/company-pysmell"
+;;;;;;  "util/company-mode/company-pysmell.el" (19040 9010))
+;;; Generated autoloads from util/company-mode/company-pysmell.el
+
+(autoload 'company-pysmell "company-mode/company-pysmell" "\
+A `company-mode' completion back-end for pysmell.
+This requires pysmell.el and pymacs.el.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-semantic) "company-mode/company-semantic"
+;;;;;;  "util/company-mode/company-semantic.el" (19061 60296))
+;;; Generated autoloads from util/company-mode/company-semantic.el
+
+(autoload 'company-semantic "company-mode/company-semantic" "\
+A `company-mode' completion back-end using CEDET Semantic.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-tempo) "company-mode/company-tempo" "util/company-mode/company-tempo.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-tempo.el
+
+(autoload 'company-tempo "company-mode/company-tempo" "\
+A `company-mode' completion back-end for tempo.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-xcode) "company-mode/company-xcode" "util/company-mode/company-xcode.el"
+;;;;;;  (19039 49092))
+;;; Generated autoloads from util/company-mode/company-xcode.el
+
+(autoload 'company-xcode "company-mode/company-xcode" "\
+A `company-mode' completion back-end for Xcode projects.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (css-color-mode css-color-global-mode css-color)
+;;;;;;  "css-color" "util/css-color.el" (18969 63118))
+;;; Generated autoloads from util/css-color.el
+
+(let ((loads (get 'css-color 'custom-loads))) (if (member '"css-color" loads) nil (put 'css-color 'custom-loads (cons '"css-color" loads))))
+
+(defvar css-color-global-mode nil "\
+Non-nil if Css-Color-Global mode is enabled.
+See the command `css-color-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `css-color-global-mode'.")
+
+(nxhtml-custom-autoload 'css-color-global-mode "css-color" nil)
+
+(autoload 'css-color-global-mode "css-color" "\
+Toggle Css-Color mode in every possible buffer.
+With prefix ARG, turn Css-Color-Global mode on if and only if ARG is positive.
+Css-Color mode is enabled in all buffers where `css-color-turn-on-in-buffer' would do it.
+See `css-color-mode' for more information on Css-Color mode.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'css-color-mode "css-color" "\
+Show hex color literals with the given color as background.
+In this mode hexadecimal colour specifications like #3253ff are
+displayed with the specified colour as background.
+
+Certain keys are bound to special colour editing commands when
+point is at a hexadecimal colour:
+
+\\{css-color-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (css-palette-global-mode css-palette css-palette-mode)
+;;;;;;  "css-palette" "util/css-palette.el" (18795 27308))
+;;; Generated autoloads from util/css-palette.el
+
+(autoload 'css-palette-mode "css-palette" "\
+Minor mode for palettes in CSS.
+
+The mode `css-palette-mode' acts on the first COLORS declaration in your
+  file of the form:
+
+COLORS:
+\(
+c0 \"#6f5d25\"	;tainted sand
+c1 \"#000000\"	;Black
+c2 \"#cca42b\"	;goldenslumber
+c3 \"#6889cb\"	;far off sky
+c4 \"#fff\"	;strange aeons
+)
+
+Such declarations should appear inside a block comment, in order
+  to be parsed properly by the LISP reader.
+
+Type \\[css-palette-update-all], and any occurence of
+
+  color: #f55; /*[c3]*/
+
+will be updated with
+
+  color: #6899cb; /*[c3]*/
+
+The following commands are available to insert key-value pairs
+  and palette declarations:
+  \\{css-palette-mode-map}
+
+You can extend or redefine the types of palettes by defining a
+  new palette specification of the form (PATTERN REGEXP
+  REF-FOLLOWS-VALUE), named according to the naming scheme
+  css-palette:my-type, where
+
+PATTERN is a pattern containing two (%s) format directives which
+  will be filled in with the variable and its value,
+
+REGEXP is a regular expression to match a value - variable
+  pattern,
+
+and REF-FOLLOWS-VALUE defined whether or not the reference comes
+  after the value. This allows for more flexibility.
+
+Note that, although the w3c spec at URL
+  `http://www.w3.org/TR/CSS2/syndata.html#comments' says that
+  comments \" may occur anywhere between tokens, and their
+  contents have no influence on the rendering\", Internet
+  Explorer does not think so. Better keep all your comments after
+  a \"statement\", as per the default. This means `css-palette'
+  is ill-suited for use within shorthands.
+
+See variable `css-palette:colors' for an example of a palette
+  type.
+
+The extension mechanism means that palette types can be used to
+  contain arbitrary key-value mappings.
+
+Besides the colors palette, css-palette defines the palette
+  definition variables `css-palette:colors-outside' and
+  `css-palette:files', for colors with the reference outside and
+  for file url()'s respectively.
+
+You can fine-control which palette types css-palette should look
+  at via the variable `css-palette-types'.
+
+\(fn &optional ARG)" t nil)
+
+(let ((loads (get 'css-palette 'custom-loads))) (if (member '"css-palette" loads) nil (put 'css-palette 'custom-loads (cons '"css-palette" loads))))
+
+(defvar css-palette-global-mode nil "\
+Non-nil if Css-Palette-Global mode is enabled.
+See the command `css-palette-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `css-palette-global-mode'.")
+
+(nxhtml-custom-autoload 'css-palette-global-mode "css-palette" nil)
+
+(autoload 'css-palette-global-mode "css-palette" "\
+Toggle Css-Palette mode in every possible buffer.
+With prefix ARG, turn Css-Palette-Global mode on if and only if ARG is positive.
+Css-Palette mode is enabled in all buffers where `css-palette-turn-on-in-buffer' would do it.
+See `css-palette-mode' for more information on Css-Palette mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (cusnu-export-my-skin-options customize-for-new-user)
+;;;;;;  "cus-new-user" "util/cus-new-user.el" (19061 60294))
+;;; Generated autoloads from util/cus-new-user.el
 
-(autoload 'as-external-mode "as-external" "\
-If non-nil check for if Emacs is used as external editor.
-When Emacs is used as an external editor for example to edit text
-areas on a web page viewed with Firefox this library tries to
-help to setup the buffer in a useful way. It may for example set
-major and minor modes for the buffer.
+(autoload 'customize-for-new-user "cus-new-user" "\
+Show special customization page for new user.
 
-See `as-external-alist' for more information.
+\(fn &optional NAME)" t nil)
 
-\(fn &optional ARG)" t nil)
+(autoload 'cusnu-export-my-skin-options "cus-new-user" "\
+Export to file FILE custom options in `cusnu-my-skin-options'.
+The options is exported to elisp code that other users can run to
+set the options that you have added to `cusnu-my-skin-options'.
+
+For more information about this see `cusnu-export-cust-group'.
+
+\(fn FILE)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (freemind-to-org-mode freemind-from-org-sparse-tree
 ;;;;;;  freemind-from-org-mode freemind-from-org-mode-node freemind-show)
-;;;;;;  "freemind" "util/freemind.el" (18659 17016))
+;;;;;;  "freemind" "util/freemind.el" (19063 39026))
 ;;; Generated autoloads from util/freemind.el
 
 (autoload 'freemind-show "freemind" "\
@@ -1652,10 +1920,65 @@ Not documented
 
 \(fn FILE-NAME)" nil nil)
 
+;;;***
+
+;;;### (autoloads (gpl-mode) "gpl" "util/gpl.el" (18795 27308))
+;;; Generated autoloads from util/gpl.el
+
+(autoload 'gpl-mode "gpl" "\
+Mode for font-locking and editing color palettes of the GPL format.
+
+Such palettes are used and produced by free software applications
+such as the GIMP, Inkscape, Scribus, Agave and on-line tools such
+as http://colourlovers.com.
+
+You can also use
+URL `http://niels.kicks-ass.org/public/elisp/css-palette.el' to import
+such palette into a css-file as hexadecimal color palette.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (hfyview-frame hfyview-window hfyview-region hfyview-buffer)
+;;;;;;  "hfyview" "util/hfyview.el" (19063 39203))
+;;; Generated autoloads from util/hfyview.el
+
+(autoload 'hfyview-buffer "hfyview" "\
+Convert buffer to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window.
+
+\(fn ARG)" t nil)
+
+(autoload 'hfyview-region "hfyview" "\
+Convert region to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window.
+
+\(fn ARG)" t nil)
+
+(autoload 'hfyview-window "hfyview" "\
+Convert window to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window.
+
+\(fn ARG)" t nil)
+
+(autoload 'hfyview-frame "hfyview" "\
+Convert frame to html preserving faces and show in web browser.
+Make an XHTML view of the current Emacs frame. Put it in a buffer
+named *hfyview-frame* and show that buffer in a web browser.
+
+If WHOLE-BUFFERS is non-nil then the whole content of the buffers
+is shown in the XHTML page, otherwise just the part that is
+visible currently on the frame.
+
+With command prefix also show created HTML source in other window.
+
+\(fn WHOLE-BUFFERS)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (html-write-mode) "html-write" "util/html-write.el"
-;;;;;;  (18692 35034))
+;;;;;;  (18790 45400))
 ;;; Generated autoloads from util/html-write.el
 
 (autoload 'html-write-mode "html-write" "\
@@ -1672,6 +1995,11 @@ rendered text.
 See the customization group `html-write' for more information about
 faces.
 
+The following keys are defined when you are on a tag handled by
+this minor mode:
+
+\\{html-write-keymap}
+
 IMPORTANT: Most commands you use works also on the text that is
 hidden.  The movement commands is an exception, but as soon as
 you edit the buffer you may also change the hidden parts.
@@ -1680,11 +2008,88 @@ you edit the buffer you may also change the hidden parts.
 
 ;;;***
 
-;;;### (autoloads (majmodpri-apply-priorities majmodpri-sort-lists
-;;;;;;  majmodpri) "majmodpri" "util/majmodpri.el" (18654 33920))
-;;; Generated autoloads from util/majmodpri.el
+;;;### (autoloads (htmlfontify-buffer) "htmlfontify" "util/htmlfontify.el"
+;;;;;;  (18790 45400))
+;;; Generated autoloads from util/htmlfontify.el
 
-(let ((loads (get 'majmodpri 'custom-loads))) (if (member '"majmodpri" loads) nil (put 'majmodpri 'custom-loads (cons '"majmodpri" loads))))
+(autoload 'htmlfontify-buffer "htmlfontify" "\
+Create a new buffer, named for the current buffer + a .html extension,
+containing an inline css-stylesheet and formatted css-markup html
+that reproduces the look of the current emacs buffer as closely
+as possible.
+
+Dangerous characters in the existing buffer are turned into html
+entities, so you should even be able to do html-within-html
+fontified display.
+
+You should, however, note that random control or eight-bit
+characters such as ^L () or ¤ (\244) won't get mapped yet.
+
+If the SRCDIR and FILE arguments are set, lookup etags derived
+entries in the `hfy-tags-cache' and add html anchors and
+hyperlinks as appropriate.
+
+\(fn &optional SRCDIR FILE)" t nil)
+
+;;;***
+
+;;;### (autoloads (inlimg-toggle-slicing inlimg-toggle-display inlimg-global-mode
+;;;;;;  inlimg-mode) "inlimg" "util/inlimg.el" (19045 31314))
+;;; Generated autoloads from util/inlimg.el
+
+(autoload 'inlimg-mode "inlimg" "\
+Display images inline.
+Search buffer for image tags.  Display found images.
+
+Image tags are setup per major mode in `inlimg-mode-specs'.
+
+Images are displayed on a line below the tag referencing them.
+The whole image or a slice of it may be displayed, see
+`inlimg-slice'.  Margins relative text are specified in
+`inlimg-margins'.
+
+See also the commands `inlimg-toggle-display' and
+`inlimg-toggle-slicing'.
+
+Note: This minor mode uses `font-lock-mode'.
+
+\(fn &optional ARG)" t nil)
+
+(defvar inlimg-global-mode nil "\
+Non-nil if Inlimg-Global mode is enabled.
+See the command `inlimg-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `inlimg-global-mode'.")
+
+(nxhtml-custom-autoload 'inlimg-global-mode "inlimg" nil)
+
+(autoload 'inlimg-global-mode "inlimg" "\
+Toggle Inlimg mode in every possible buffer.
+With prefix ARG, turn Inlimg-Global mode on if and only if ARG is positive.
+Inlimg mode is enabled in all buffers where `inlimg--global-turn-on' would do it.
+See `inlimg-mode' for more information on Inlimg mode.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'inlimg-toggle-display "inlimg" "\
+Toggle display of image at point POINT.
+See also the command `inlimg-mode'.
+
+\(fn POINT)" t nil)
+
+(autoload 'inlimg-toggle-slicing "inlimg" "\
+Toggle slicing of image at point POINT.
+See also the command `inlimg-mode'.
+
+\(fn POINT)" t nil)
+
+;;;***
+
+;;;### (autoloads (majmodpri majmodpri-apply-priorities majmodpri-apply
+;;;;;;  majmodpri-sort-lists) "majmodpri" "util/majmodpri.el" (19061
+;;;;;;  60294))
+;;; Generated autoloads from util/majmodpri.el
 
 (autoload 'majmodpri-sort-lists "majmodpri" "\
 Sort the list used when selecting major mode.
@@ -1699,6 +2104,14 @@ See also `majmodpri-apply-priorities'.
 
 \(fn)" t nil)
 
+(autoload 'majmodpri-apply "majmodpri" "\
+Sort major mode lists and apply to existing buffers.
+Note: This function is suitable to add to
+`desktop-after-read-hook'. It will restore the multi major modes
+in buffers.
+
+\(fn)" nil nil)
+
 (autoload 'majmodpri-apply-priorities "majmodpri" "\
 Apply major mode priorities.
 First run `majmodpri-sort-lists' and then if CHANGE-MODES is
@@ -1707,10 +2120,12 @@ before applying.
 
 \(fn CHANGE-MODES)" t nil)
 
+(let ((loads (get 'majmodpri 'custom-loads))) (if (member '"majmodpri" loads) nil (put 'majmodpri 'custom-loads (cons '"majmodpri" loads))))
+
 ;;;***
 
-;;;### (autoloads (mlinks-mode) "mlinks" "util/mlinks.el" (18685
-;;;;;;  3334))
+;;;### (autoloads (mlinks-mode) "mlinks" "util/mlinks.el" (19061
+;;;;;;  60296))
 ;;; Generated autoloads from util/mlinks.el
 
 (autoload 'mlinks-mode "mlinks" "\
@@ -1742,15 +2157,33 @@ By default the link moved to will be active, see
 
 \(fn &optional ARG)" t nil)
 
+;;;***
+
+;;;### (autoloads (mumamo-multi-major-modep mumamo-mark-for-refontification)
+;;;;;;  "mumamo" "util/mumamo.el" (19064 6796))
+;;; Generated autoloads from util/mumamo.el
+
+(autoload 'mumamo-mark-for-refontification "mumamo" "\
+Mark region between MIN and MAX for refontification.
+
+\(fn MIN MAX)" nil nil)
+
+(autoload 'mumamo-multi-major-modep "mumamo" "\
+Return t if VALUE is a multi major mode function.
+
+\(fn VALUE)" nil nil)
+
 ;;;***
 
 ;;;### (autoloads (mako-html-mumamo-mode org-mumamo-mode asp-html-mumamo-mode
 ;;;;;;  noweb2-mumamo-mode csound-sgml-mumamo-mode laszlo-nxml-mumamo-mode
-;;;;;;  metapost-mumamo-mode cperl-mumamo-mode perl-mumamo-mode eruby-html-mumamo-mode
-;;;;;;  eruby-mumamo-mode jsp-html-mumamo-mode smarty-html-mumamo-mode
-;;;;;;  mjt-html-mumamo-mode genshi-html-mumamo-mode django-html-mumamo-mode
-;;;;;;  embperl-html-mumamo-mode nxml-mumamo-mode html-mumamo-mode)
-;;;;;;  "mumamo-fun" "util/mumamo-fun.el" (18764 14316))
+;;;;;;  metapost-mumamo-mode ruby-heredoc-mumamo-mode python-heredoc-mumamo-mode
+;;;;;;  cperl-heredoc-mumamo-mode perl-heredoc-mumamo-mode php-heredoc-mumamo-mode
+;;;;;;  sh-heredoc-mumamo-mode eruby-html-mumamo-mode eruby-mumamo-mode
+;;;;;;  jsp-html-mumamo-mode smarty-html-mumamo-mode mjt-html-mumamo-mode
+;;;;;;  genshi-html-mumamo-mode django-html-mumamo-mode embperl-html-mumamo-mode
+;;;;;;  nxml-mumamo-mode html-mumamo-mode) "mumamo-fun" "util/mumamo-fun.el"
+;;;;;;  (19061 60296))
 ;;; Generated autoloads from util/mumamo-fun.el
 
 (autoload 'html-mumamo-mode "mumamo-fun" "\
@@ -1759,7 +2192,9 @@ This covers inlined style and javascript and PHP." t)
 
 (autoload 'nxml-mumamo-mode "mumamo-fun" "\
 Turn on multiple major modes for (X)HTML with main mode `nxml-mode'.
-This covers inlined style and javascript and PHP." t)
+This covers inlined style and javascript and PHP.
+
+See also `mumamo-alt-php-tags-mode'." t)
 
 (autoload 'embperl-html-mumamo-mode "mumamo-fun" "\
 Turn on multiple major modes for Embperl files with main mode `html-mode'.
@@ -1802,11 +2237,32 @@ Current major-mode will be used as the main major mode." t)
 Turn on multiple major modes for eRuby with main mode `html-mode'.
 This also covers inlined style and javascript." t)
 
-(autoload 'perl-mumamo-mode "mumamo-fun" "\
-Turn on multiple major modes for Perl Here Document." t)
+(autoload 'sh-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for sh heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes." t)
+
+(autoload 'php-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for PHP heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes." t)
+
+(autoload 'perl-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes." t)
+
+(autoload 'cperl-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes.
 
-(autoload 'cperl-mumamo-mode "mumamo-fun" "\
-Turn on multiple major modes for Perl Here Document." t)
+Note: I have seen some problems with this.  Use
+`perl-mumamo-mode' instead for now." t)
+
+(autoload 'python-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes." t)
+
+(autoload 'ruby-heredoc-mumamo-mode "mumamo-fun" "\
+Turn on multiple major modes for Ruby heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes." t)
 
 (autoload 'metapost-mumamo-mode "mumamo-fun" "\
 Turn on multiple major modes for MetaPost." t)
@@ -1835,17 +2291,80 @@ This also covers inlined style and javascript." t)
 
 ;;;***
 
-;;;### (autoloads (info-open-file grep-query-replace emacs-Q-nxhtml
-;;;;;;  emacs-Q emacs--debug-init emacs-buffer-file emacs ourcomments-ido-buffer-raise-frame
+;;;### (autoloads (mumamo-add-region) "mumamo-regions" "util/mumamo-regions.el"
+;;;;;;  (19056 34298))
+;;; Generated autoloads from util/mumamo-regions.el
+
+(autoload 'mumamo-add-region "mumamo-regions" "\
+Add a mumamo region.
+Mumamo regions are like another layer of chunks above the normal chunks.
+They does not affect the normal chunks, but they overrides them.
+
+To create a mumamo region first select a visible region and then
+call this function.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (n-back-game) "n-back" "util/n-back.el" (19063
+;;;;;;  38663))
+;;; Generated autoloads from util/n-back.el
+
+(autoload 'n-back-game "n-back" "\
+Emacs n-Back game.
+This game is supposed to increase your working memory and fluid
+intelligence.
+
+In this game something is shown for half a second on the screen
+and maybe a sound is played.  You should then answer if parts of
+it is the same as you have seen or heard before.  This is
+repeated for about 20 trials.
+
+You answer with the keys shown in the bottom window.
+
+In the easiest version of the game you should answer if you have
+just seen or heard what is shown now.  By default the game gets
+harder as you play it with success.  Then first the number of
+items presented in a trial grows.  After that it gets harder by
+that you have to somehow remember not the last item, but the item
+before that (or even earlier). That is what \"n-Back\" stands
+for.
+
+Note that remember does not really mean remember clearly.  The
+game is for training your brain getting used to keep those things
+in the working memory, maybe as a cross-modal unit.  You are
+supposed to just nearly be able to do what you do in the game.
+And you are supposed to have fun, that is what your brain like.
+
+You should probably not overdue this. Half an hour a day playing
+might be an optimal time according to some people.
+
+The game is shamelessly modeled after Brain Workshop, see URL
+`http://brainworkshop.sourceforge.net/' just for the fun of
+getting it into Emacs.  The game resembles but it not the same as
+that used in the report by Jaeggi mentioned at the above URL.
+
+Not all features in Brain Workshop are implemented here, but some
+new are maybe ... - and you have it available here in Emacs.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (ourcomments-warning ourcomments-M-x-menu-mode
+;;;;;;  use-custom-style info-open-file grep-query-replace emacs-Q-nxhtml
+;;;;;;  emacs-Q emacs--no-desktop emacs--debug-init emacs-buffer-file
+;;;;;;  emacs emacs-restart ourcomments-ido-ctrl-tab ourcomments-ido-buffer-raise-frame
 ;;;;;;  ourcomments-ido-buffer-other-frame ourcomments-ido-buffer-other-window
 ;;;;;;  describe-symbol describe-defstruct describe-custom-group
-;;;;;;  describe-command ourcomments-ediff-files find-emacs-other-file
-;;;;;;  better-fringes-mode wrap-to-fill-column-mode wrap-to-fill-left-marg-modes
-;;;;;;  wrap-to-fill-left-marg describe-key-and-map-briefly ourcomments-move-end-of-line
-;;;;;;  ourcomments-move-beginning-of-line major-modep multi-major-modep
-;;;;;;  major-or-multi-majorp unfill-individual-paragraphs unfill-region
-;;;;;;  unfill-paragraph define-toggle popup-menu-at-point) "ourcomments-util"
-;;;;;;  "util/ourcomments-util.el" (18764 17429))
+;;;;;;  narrow-to-comment describe-command ourcomments-ediff-files
+;;;;;;  find-emacs-other-file better-fringes-mode wrap-to-fill-column-mode
+;;;;;;  wrap-to-fill-left-marg-modes wrap-to-fill-left-marg describe-key-and-map-briefly
+;;;;;;  ourcomments-move-end-of-line ourcomments-move-beginning-of-line
+;;;;;;  major-modep major-or-multi-majorp unfill-individual-paragraphs
+;;;;;;  unfill-region unfill-paragraph define-toggle popup-menu-at-point)
+;;;;;;  "ourcomments-util" "util/ourcomments-util.el" (19063 48876))
 ;;; Generated autoloads from util/ourcomments-util.el
 
 (autoload 'popup-menu-at-point "ourcomments-util" "\
@@ -1902,11 +2421,6 @@ Not documented
 
 \(fn VALUE)" nil nil)
 
-(autoload 'multi-major-modep "ourcomments-util" "\
-Return t if VALUE is a multi major mode function.
-
-\(fn VALUE)" nil nil)
-
 (autoload 'major-modep "ourcomments-util" "\
 Return t if VALUE is a major mode function.
 
@@ -1919,17 +2433,17 @@ A major mode lisp function." :complete-function (lambda nil (interactive) (lisp-
 Move point to beginning of line or indentation.
 See `beginning-of-line' for ARG.
 
-If `physical-line-mode' is on then the visual line beginning is
-first tried.
+If `line-move-visual' is non-nil then the visual line beginning
+is first tried.
 
 \(fn ARG)" t nil)
 
 (autoload 'ourcomments-move-end-of-line "ourcomments-util" "\
-Move point to end of line or indentation.
+Move point to end of line or after last non blank char.
 See `end-of-line' for ARG.
 
-If `physical-line-mode' is on then the visual line ending is
-first tried.
+Similar to `ourcomments-move-beginning-of-line' but for end of
+line.
 
 \(fn ARG)" t nil)
 
@@ -1953,12 +2467,12 @@ Used by `wrap-to-fill-column-mode'. If nil then center the
 display columns. Otherwise it should be a number which will be
 the left margin.")
 
-(custom-autoload 'wrap-to-fill-left-marg "ourcomments-util" t)
+(nxhtml-custom-autoload 'wrap-to-fill-left-marg "ourcomments-util" t)
 
 (defvar wrap-to-fill-left-marg-modes '(text-mode fundamental-mode) "\
 Major modes where `wrap-to-fill-left-margin' may be nil.")
 
-(custom-autoload 'wrap-to-fill-left-marg-modes "ourcomments-util" t)
+(nxhtml-custom-autoload 'wrap-to-fill-left-marg-modes "ourcomments-util" t)
 
 (autoload 'wrap-to-fill-column-mode "ourcomments-util" "\
 Use `fill-column' display columns in buffer windows.
@@ -1985,7 +2499,7 @@ Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `better-fringes-mode'.")
 
-(custom-autoload 'better-fringes-mode "ourcomments-util" nil)
+(nxhtml-custom-autoload 'better-fringes-mode "ourcomments-util" nil)
 
 (autoload 'better-fringes-mode "ourcomments-util" "\
 Choose another fringe bitmap color and bottom angle.
@@ -2010,7 +2524,13 @@ In directory DEF-DIR run `ediff-files' on files FILE-A and FILE-B.
 The purpose of this function is to make it eaiser to start
 `ediff-files' from a shell through Emacs Client.
 
-This is used in EmacsW32 in the file ediff.cmd.
+This is used in EmacsW32 in the file ediff.cmd where Emacs Client
+is called like this:
+
+  @%emacs_client% -e \"(setq default-directory \\\"%emacs_cd%\\\")\"
+  @%emacs_client% -n  -e \"(ediff-files \\\"%f1%\\\" \\\"%f2%\\\")\"
+
+It can of course be done in a similar way with other shells.
 
 \(fn DEF-DIR FILE-A FILE-B)" nil nil)
 
@@ -2019,6 +2539,11 @@ Like `describe-function', but prompts only for interactive commands.
 
 \(fn COMMAND)" t nil)
 
+(autoload 'narrow-to-comment "ourcomments-util" "\
+Not documented
+
+\(fn)" t nil)
+
 (autoload 'describe-custom-group "ourcomments-util" "\
 Describe customization group SYMBOL.
 
@@ -2051,6 +2576,30 @@ Raise frame showing buffer.
 
 \(fn)" t nil)
 
+(defvar ourcomments-ido-ctrl-tab nil "\
+Enable buffer switching using C-Tab with function `ido-mode'.
+This changes buffer switching with function `ido-mode' the
+following way:
+
+- You can use C-Tab.
+
+- You can show the selected buffer in three ways independent of
+  how you entered function `ido-mode' buffer switching:
+
+  * S-return: other window
+  * C-return: other frame
+  * M-return: raise frame
+
+Those keys are selected to at least be a little bit reminiscent
+of those in for example common web browsers.")
+
+(nxhtml-custom-autoload 'ourcomments-ido-ctrl-tab "ourcomments-util" nil)
+
+(autoload 'emacs-restart "ourcomments-util" "\
+Restart Emacs and start `server-mode' if on before.
+
+\(fn)" t nil)
+
 (autoload 'emacs "ourcomments-util" "\
 Start a new Emacs.
 
@@ -2058,7 +2607,8 @@ Start a new Emacs.
 
 (autoload 'emacs-buffer-file "ourcomments-util" "\
 Start a new Emacs showing current buffer file.
-If there is no buffer file start with `dired'.
+Go to the current line and column in that file.
+If there is no buffer file then instead start with `dired'.
 
 \(fn)" t nil)
 
@@ -2067,6 +2617,11 @@ Not documented
 
 \(fn)" t nil)
 
+(autoload 'emacs--no-desktop "ourcomments-util" "\
+Not documented
+
+\(fn)" t nil)
+
 (autoload 'emacs-Q "ourcomments-util" "\
 Start new Emacs without any customization whatsoever.
 
@@ -2090,10 +2645,93 @@ Open an info file in `Info-mode'.
 
 \(fn INFO-FILE)" t nil)
 
+(autoload 'use-custom-style "ourcomments-util" "\
+Setup like in `Custom-mode', but without things specific to Custom.
+
+\(fn)" nil nil)
+
+(defvar ourcomments-M-x-menu-mode nil "\
+Non-nil if Ourcomments-M-X-Menu mode is enabled.
+See the command `ourcomments-M-x-menu-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `ourcomments-M-x-menu-mode'.")
+
+(nxhtml-custom-autoload 'ourcomments-M-x-menu-mode "ourcomments-util" nil)
+
+(autoload 'ourcomments-M-x-menu-mode "ourcomments-util" "\
+Add commands started from Emacs menus to M-x history.
+The purpose of this is to make it easier to redo them and easier
+to learn how to do them from the command line (which is often
+faster if you know how to do it).
+
+Only commands that are not already in M-x history are added.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'ourcomments-warning "ourcomments-util" "\
+Not documented
+
+\(fn FORMAT-STRING &rest ARGS)" nil nil)
+
+;;;***
+
+;;;### (autoloads (pause-mode) "pause" "util/pause.el" (19064 18015))
+;;; Generated autoloads from util/pause.el
+
+(defvar pause-mode nil "\
+Non-nil if Pause mode is enabled.
+See the command `pause-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `pause-mode'.")
+
+(nxhtml-custom-autoload 'pause-mode "pause" nil)
+
+(autoload 'pause-mode "pause" "\
+This minor mode tries to make you take a break!
+To customize it see:
+
+ `pause-after-minutes'
+ `pause-text-color'
+ `pause-prompt1-color'
+ `pause-prompt2-color'
+ `pause-message-color'
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (global-pointback-mode pointback-mode) "pointback"
+;;;;;;  "util/pointback.el" (19023 47096))
+;;; Generated autoloads from util/pointback.el
+
+(autoload 'pointback-mode "pointback" "\
+Restore previous window point when switching back to a buffer.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-pointback-mode nil "\
+Non-nil if Global-Pointback mode is enabled.
+See the command `global-pointback-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-pointback-mode'.")
+
+(nxhtml-custom-autoload 'global-pointback-mode "pointback" nil)
+
+(autoload 'global-pointback-mode "pointback" "\
+Toggle Pointback mode in every possible buffer.
+With prefix ARG, turn Global-Pointback mode on if and only if ARG is positive.
+Pointback mode is enabled in all buffers where `pointback-on' would do it.
+See `pointback-mode' for more information on Pointback mode.
+
+\(fn &optional ARG)" t nil)
+
 ;;;***
 
-;;;### (autoloads (rnc-mode) "rnc-mode" "util/rnc-mode.el" (18654
-;;;;;;  33922))
+;;;### (autoloads (rnc-mode) "rnc-mode" "util/rnc-mode.el" (18775
+;;;;;;  60004))
 ;;; Generated autoloads from util/rnc-mode.el
 
 (autoload 'rnc-mode "rnc-mode" "\
@@ -2104,10 +2742,63 @@ Major mode for editing RELAX NG Compact Syntax schemas.
 
 ;;;***
 
-;;;### (autoloads (tabkey2-mode) "tabkey2" "util/tabkey2.el" (18662
-;;;;;;  2982))
+;;;### (autoloads (search-form) "search-form" "util/search-form.el"
+;;;;;;  (18778 14464))
+;;; Generated autoloads from util/search-form.el
+
+(autoload 'search-form "search-form" "\
+Display a form for search and replace.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (sex-mode) "sex-mode" "util/sex-mode.el" (19039
+;;;;;;  48498))
+;;; Generated autoloads from util/sex-mode.el
+
+(defvar sex-mode nil "\
+Non-nil if Sex mode is enabled.
+See the command `sex-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `sex-mode'.")
+
+(nxhtml-custom-autoload 'sex-mode "sex-mode" nil)
+
+(autoload 'sex-mode "sex-mode" "\
+Open certain files in external programs.
+See `sex-get-file-open-cmd' for how to determine which files to
+open by external applications.  Note that this selection is
+nearly the same as in `org-mode'.  The main difference is that
+the fallback always is to open a file in Emacs. (This is
+necessary to avoid to disturb many of Emacs operations.)
+
+This affects all functions that opens files, like `find-file',
+`find-file-noselect' etc.
+
+However it does not affect files opened through Emacs client.
+
+Urls can also be handled, see `sex-handle-urls'.
+
+When opening a file with the shell a (temporary) dummy buffer is
+created in Emacs with major mode `sex-file-mode' and an external
+program is called to handle the file.  How this dummy buffer is
+handled is governed by `sex-keep-dummy-buffer'.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (tabkey2-mode tabkey2-emma-without-tabkey2) "tabkey2"
+;;;;;;  "util/tabkey2.el" (19048 2102))
 ;;; Generated autoloads from util/tabkey2.el
 
+(autoload 'tabkey2-emma-without-tabkey2 "tabkey2" "\
+Not documented
+
+\(fn)" nil nil)
+
 (defvar tabkey2-mode nil "\
 Non-nil if Tabkey2 mode is enabled.
 See the command `tabkey2-mode' for a description of this minor mode.
@@ -2115,7 +2806,7 @@ Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `tabkey2-mode'.")
 
-(custom-autoload 'tabkey2-mode "tabkey2" nil)
+(nxhtml-custom-autoload 'tabkey2-mode "tabkey2" nil)
 
 (autoload 'tabkey2-mode "tabkey2" "\
 More fun with Tab key number two (completion etc).
@@ -2168,21 +2859,56 @@ be opened in your webbrowser with WORD looked up.
 
 ;;;***
 
-;;;### (autoloads (udev-cedet-update) "udev-cedet" "util/udev-cedet.el"
-;;;;;;  (18654 33922))
+;;;### (autoloads (udev-call-first-step) "udev" "util/udev.el" (19061
+;;;;;;  60296))
+;;; Generated autoloads from util/udev.el
+
+(autoload 'udev-call-first-step "udev" "\
+Set up and call first step.
+Set up buffer LOG-BUFFER to be used for log messages and
+controling of the execution of the functions in list STEPS which
+are executed one after another.
+
+Write HEADER at the end of LOG-BUFFER.
+
+Call first step.
+
+If FINISH-FUN non-nil it should be a function. This is called
+after last step with LOG-BUFFER as parameter.
+
+\(fn LOG-BUFFER STEPS HEADER FINISH-FUN)" nil nil)
+
+;;;***
+
+;;;### (autoloads (udev-cedet-utest udev-cedet-customize-startup
+;;;;;;  udev-cedet-update) "udev-cedet" "util/udev-cedet.el" (19061
+;;;;;;  38124))
 ;;; Generated autoloads from util/udev-cedet.el
 
 (autoload 'udev-cedet-update "udev-cedet" "\
-Fetch and install CEDET from the devel sources.
+Fetch and install CEDET from the development sources.
 To determine where to store the sources see `udev-cedet-dir'.
 For how to start CEDET see `udev-cedet-load-cedet'.
 
+Note that if you install CEDET yourself you should not use this function.
+
+\(fn)" t nil)
+
+(autoload 'udev-cedet-customize-startup "udev-cedet" "\
+Customize CEDET dev nXhtml startup group.
+
+\(fn)" t nil)
+
+(autoload 'udev-cedet-utest "udev-cedet" "\
+Start CEDET unit tests.
+These runs in a fresh Emacs.
+
 \(fn)" t nil)
 
 ;;;***
 
-;;;### (autoloads (udev-ecb-update) "udev-ecb" "util/udev-ecb.el"
-;;;;;;  (18654 33922))
+;;;### (autoloads (udev-ecb-customize-startup udev-ecb-update) "udev-ecb"
+;;;;;;  "util/udev-ecb.el" (19061 60296))
 ;;; Generated autoloads from util/udev-ecb.el
 
 (autoload 'udev-ecb-update "udev-ecb" "\
@@ -2192,10 +2918,15 @@ For how to start ECB see `udev-ecb-load-ecb'.
 
 \(fn)" t nil)
 
+(autoload 'udev-ecb-customize-startup "udev-ecb" "\
+Customize ECB dev nXhtml startup group.
+
+\(fn)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (udev-rinari-update) "udev-rinari" "util/udev-rinari.el"
-;;;;;;  (18654 44936))
+;;;;;;  (19025 6424))
 ;;; Generated autoloads from util/udev-rinari.el
 
 (autoload 'udev-rinari-update "udev-rinari" "\
@@ -2208,7 +2939,7 @@ see `udev-rinari-dir' and `udev-rinari-load-rinari'.
 ;;;***
 
 ;;;### (autoloads (viper-tutorial) "viper-tut" "util/viper-tut.el"
-;;;;;;  (18685 3334))
+;;;;;;  (19063 44564))
 ;;; Generated autoloads from util/viper-tut.el
 
 (autoload 'viper-tutorial "viper-tut" "\
@@ -2223,10 +2954,118 @@ later.
 
 \(fn PART &optional DONT-ASK-FOR-REVERT)" t nil)
 
+;;;***
+
+;;;### (autoloads (vline-global-mode vline-mode) "vline" "util/vline.el"
+;;;;;;  (18973 28380))
+;;; Generated autoloads from util/vline.el
+
+(autoload 'vline-mode "vline" "\
+Display vertical line mode.
+
+\(fn &optional ARG)" t nil)
+
+(defvar vline-global-mode nil "\
+Non-nil if Vline-Global mode is enabled.
+See the command `vline-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `vline-global-mode'.")
+
+(nxhtml-custom-autoload 'vline-global-mode "vline" nil)
+
+(autoload 'vline-global-mode "vline" "\
+Display vertical line mode as globally.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (winsav-switch-config winsav-save-full-config winsav-save-mode
+;;;;;;  winsav-put-window-tree) "winsav" "util/winsav.el" (19063
+;;;;;;  42266))
+;;; Generated autoloads from util/winsav.el
+
+(autoload 'winsav-put-window-tree "winsav" "\
+Put window structure SAVED-TREE into WINDOW.
+Restore a structure SAVED-TREE returned from
+`winsav-get-window-tree' into window WINDOW.
+
+If COPY-WIN-OVL is non-nil then overlays having a 'window
+property pointing to one of the windows in SAVED-TREE where this
+window still is shown will be copied to a new overlay with
+'window property pointing to the corresponding new window.
+
+If WIN-OVL-ALL-BUFS is non-nil then all buffers will be searched
+for overlays with a 'window property of the kind above.
+
+At the very end of this function the hook `winsav-after-put' is
+run.
+
+\(fn SAVED-TREE WINDOW &optional COPY-WIN-OVL WIN-OVL-ALL-BUFS)" nil nil)
+
+(defvar winsav-save-mode nil "\
+Non-nil if Winsav-Save mode is enabled.
+See the command `winsav-save-mode' for a description of this minor mode.")
+
+(nxhtml-custom-autoload 'winsav-save-mode "winsav" nil)
+
+(autoload 'winsav-save-mode "winsav" "\
+Toggle winsav configuration saving mode.
+With numeric ARG, turn winsav saving on if ARG is positive, off
+otherwise.
+
+When this mode is turned on, winsav configurations are saved from
+one session to another.  A winsav configuration consists of
+frames, windows and visible buffers configurations plus
+optionally buffers and files managed by the functions used by
+option `desktop-save-mode'
+
+By default this is integrated with `desktop-save-mode'.  If
+`desktop-save-mode' is on and `winsav-handle-also-desktop' is
+non-nil then save and restore also desktop.
+
+See the command `winsav-switch-config' for more information and
+other possibilities.
+
+Note: If you want to avoid saving when you exit just turn off
+this minor mode.
+
+For information about what is saved and restored and how to save
+and restore additional information see the function
+`winsav-save-configuration'.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'winsav-save-full-config "winsav" "\
+Saved current winsav configuration in directory DIRNAME.
+Then change to this configuration.
+
+See also `winsav-switch-config'.
+
+\(fn DIRNAME)" nil nil)
+
+(autoload 'winsav-switch-config "winsav" "\
+Change to winsav configuration in directory DIRNAME.
+If DIRNAME is the current winsav configuration directory then
+offer to save it or restore it from saved values.
+
+Otherwise, before switching offer to save the current winsav
+configuration.  Then finally switch to the new winsav
+configuration, creating it if it does not exist.
+
+If option `desktop-save-mode' is on then buffers and files are also
+restored and saved the same way.
+
+See also option `winsav-save-mode' and command
+`winsav-tell-configuration'.
+
+\(fn DIRNAME)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (winsize-save-window-configuration winsize-balance-siblings
-;;;;;;  resize-windows) "winsize" "util/winsize.el" (18761 37866))
+;;;;;;  resize-windows) "winsize" "util/winsize.el" (19063 37855))
 ;;; Generated autoloads from util/winsize.el
 
 (autoload 'resize-windows "winsize" "\
@@ -2298,12 +3137,12 @@ windows.  To make this indication more prominent the text in the
 selected window is marked with the face hold in the variable
 `winsize-selected-window-face'.
 
-The option `juris-way' decides how the borders to move are
-selected. If this option is non-nil then the right or bottom
+The option `winsize-juris-way' decides how the borders to move
+are selected. If this option is non-nil then the right or bottom
 border are the ones that are moved with the arrow keys and the
 opposite border with shift arrow keys.
 
-If `juris-way' is nil then the following apply:
+If `winsize-juris-way' is nil then the following apply:
 
 As you select other borders or move to new a window the mouse
 pointer is moved inside the selected window to show which borders
@@ -2427,45 +3266,52 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil nil ("autostart.el" "etc/schema/schema-path-patch.el"
-;;;;;;  "nxhtml/html-chklnk.el" "nxhtml/html-imenu.el" "nxhtml/html-move.el"
-;;;;;;  "nxhtml/html-pagetoc.el" "nxhtml/html-quote.el" "nxhtml/html-toc.el"
-;;;;;;  "nxhtml/html-upl.el" "nxhtml/html-wtoc.el" "nxhtml/nxhtml-anything-1.el"
-;;;;;;  "nxhtml/nxhtml-autoload.el" "nxhtml/nxhtml-js.el" "nxhtml/nxhtml-strval.el"
-;;;;;;  "nxhtml/outline-magic.el" "nxhtml/rngalt.el" "nxhtml/test-c-m.el"
-;;;;;;  "nxhtml/test-cust.el" "nxhtml/tests.el" "nxhtml/tidy-xhtml.el"
-;;;;;;  "nxhtml/wtest.el" "nxhtml/xhtml-help.el" "related/cgi+.el"
-;;;;;;  "related/find-recursive-orig.el" "related/find-recursive.el"
-;;;;;;  "related/flymake-helpers.el" "related/flymake-js.el" "related/flymake-keys.el"
-;;;;;;  "related/flymake-php.el" "related/flymu.el" "related/fold-dwim.el"
-;;;;;;  "related/js2-font-lock-new.el" "related/js2-font-lock.el"
-;;;;;;  "related/php-imenu.el" "related/php-mode-1.5.0.el" "related/snippet.el"
-;;;;;;  "tests/angus77-setup-jde.el" "tests/elunit.el" "tests/emacstest-suites.el"
-;;;;;;  "tests/ert-080729.el" "tests/ert2.el" "tests/inemacs/bug1013.el"
-;;;;;;  "tests/nxhtmltest-helpers.el" "tests/temp-test.el" "util/appmenu-fold.el"
-;;;;;;  "util/appmenu.el" "util/buffer-bg.el" "util/bw-rnc-load/schema-find.el"
-;;;;;;  "util/chart.el" "util/color-test-sent.el" "util/color-test.el"
-;;;;;;  "util/custsets.el" "util/ecb-batch-compile.el" "util/elunit.el"
-;;;;;;  "util/ffip.el" "util/fmode.el" "util/from-osxkeys.el" "util/fupd.el"
-;;;;;;  "util/half-qwerty.el" "util/hexcolor.el" "util/hfy-test.el"
-;;;;;;  "util/hfyview.el" "util/hl-needed.el" "util/htmlfontify.21.el"
-;;;;;;  "util/htmlfontify.el" "util/mumamo-aspnet.el" "util/mumamo-test.el"
-;;;;;;  "util/mumamo-trace.el" "util/mumamo.el" "util/new-key-seq-widget.el"
-;;;;;;  "util/nxml-mode-os-additions.el" "util/ocr-user.el" "util/org-panel.el"
-;;;;;;  "util/pause.el" "util/physical-line.el" "util/popcmp.el"
-;;;;;;  "util/rebind.el" "util/rxi.el" "util/search-form.el" "util/sex-mode.el"
-;;;;;;  "util/udev-nxhtml.el" "util/udev.el" "util/useful-commands.el"
-;;;;;;  "util/vline.el" "util/whelp.el" "util/winsav.el" "util/zen-mode.el")
-;;;;;;  (18766 53631 796000))
-
-;;;***
-
-;;;### (autoloads (nxhtmlmaint-get-all-autoloads) "../nxhtml-maintenance"
-;;;;;;  "nxhtml-maintenance.el" (18766 50614))
-;;; Generated autoloads from nxhtml-maintenance.el
-
-(autoload 'nxhtmlmaint-get-all-autoloads "../nxhtml-maintenance" "\
-Not documented
+;;;### (autoloads nil nil ("autostart.el" "autostart22.el" "etc/schema/schema-path-patch.el"
+;;;;;;  "nxhtml/doc/cedet-build.el" "nxhtml/html-chklnk.el" "nxhtml/html-imenu.el"
+;;;;;;  "nxhtml/html-move.el" "nxhtml/html-quote.el" "nxhtml/html-wtoc.el"
+;;;;;;  "nxhtml/nxhtml-autoload.el" "nxhtml/nxhtml-strval.el" "nxhtml/nxhtmljs.el"
+;;;;;;  "nxhtml/outline-magic.el" "nxhtml/wtest.el" "related/flymake-helpers.el"
+;;;;;;  "related/flymake-js.el" "related/flymake-keys.el" "related/flymake-php.el"
+;;;;;;  "related/flymu.el" "related/fold-dwim.el" "related/javascript-old.el"
+;;;;;;  "related/php-imenu.el" "tests/angus77-setup-jde.el" "tests/emacstest-suites.el"
+;;;;;;  "tests/ert2.el" "tests/hfy-test.el" "tests/inemacs/bug1013.el"
+;;;;;;  "tests/mumamo-test.el" "tests/nxhtmltest-helpers.el" "tests/temp-test.el"
+;;;;;;  "util/appmenu-fold.el" "util/buffer-bg.el" "util/company-mode/company-autoloads.el"
+;;;;;;  "util/company-mode/company-eclim.el" "util/company-mode/company-pkg.el"
+;;;;;;  "util/company-mode/company-ropemacs.el" "util/company-mode/company-start.el"
+;;;;;;  "util/custsets.el" "util/ecb-batch-compile.el" "util/ffip.el"
+;;;;;;  "util/fmode.el" "util/fupd.el" "util/hl-needed.el" "util/htmlfontify.21.el"
+;;;;;;  "util/key-cat.el" "util/mumamo-aspnet.el" "util/mumamo-trace.el"
+;;;;;;  "util/new-key-seq-widget.el" "util/nxml-mode-os-additions.el"
+;;;;;;  "util/ocr-user.el" "util/org-panel.el" "util/popcmp.el" "util/rebind.el"
+;;;;;;  "util/rxi.el" "util/udev-nxhtml.el" "util/useful-commands.el"
+;;;;;;  "util/whelp.el" "util/zen-mode.el") (19064 20991 718000))
+
+;;;***
+
+;;;### (autoloads (nxhtmlmaint-byte-uncompile-all nxhtmlmaint-start-byte-compilation)
+;;;;;;  "../nxhtmlmaint" "nxhtmlmaint.el" (19062 21392))
+;;; Generated autoloads from nxhtmlmaint.el
+
+(autoload 'nxhtmlmaint-start-byte-compilation "../nxhtmlmaint" "\
+Start byte compilation of nXhtml in new Emacs instance.
+Byte compiling in general makes elisp code run 5-10 times faster
+which is quite noticeable when you use nXhtml.
+
+This will also update the file nxhtml-loaddefs.el.
+
+You must restart Emacs to use the byte compiled files.
+
+If for some reason the byte compiled files does not work you can
+remove then with `nxhtmlmaint-byte-uncompile-all'.
+
+\(fn)" t nil)
+
+(autoload 'nxhtmlmaint-byte-uncompile-all "../nxhtmlmaint" "\
+Delete byte compiled files in nXhtml.
+This will also update the file nxhtml-loaddefs.el.
+
+See `nxhtmlmaint-start-byte-compilation' for byte compiling.
 
 \(fn)" t nil)
 
diff --git a/elpa-to-submit/nxhtml/nxhtml-maintenance.el b/elpa-to-submit/nxhtml/nxhtml-maintenance.el
deleted file mode 100644
index 397c6d06a2..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml-maintenance.el
+++ /dev/null
@@ -1,186 +0,0 @@
-;;; nxhtml-maintenance.el --- Some maintenance helpers
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-09-27T15:29:35+0200 Sat
-;; Version:
-;; Last-Updated:
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(defvar nxhtmlmaint-dir
-  (file-name-directory (if load-file-name load-file-name buffer-file-name))
-  "Maintenance directory for nXhtml.")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Autoload helpers
-
-(defun nxhtmlmaint-autoloads-file ()
-  (file-truename (expand-file-name "nxhtml-loaddefs.el" nxhtmlmaint-dir)))
-
-(defun nxhtmlmaint-util-dir ()
-  (file-truename (file-name-as-directory
-                  (expand-file-name "util" nxhtmlmaint-dir))))
-
-(defvar nxhtmlmaint-autoload-default-directory (nxhtmlmaint-util-dir))
-
-(defun nxhtmlmaint-initialize-autoloads-file ()
-  (with-current-buffer (find-file-noselect generated-autoload-file)
-    (when (= 0 (buffer-size))
-      (insert ";; Autoloads for nXthml
-;;
-;; This file should be updated by `nxhtmlmaint-get-file-autoloads',
-;; `nxhtmlmaint-get-dir-autoloads' or `nxhtmlmaint-get-all-autoloads'.")
-    (basic-save-buffer))))
-
-(defun nxmtmlmaint-advice-autoload (on)
-  (if on
-      (progn
-        (ad-activate 'autoload-file-load-name)
-        (ad-activate 'make-autoload))
-    (ad-deactivate 'autoload-file-load-name)
-    (ad-deactivate 'make-autoload)))
-
-(defun nxhtmlmaint-get-file-autoloads (file)
-  (interactive (list (buffer-file-name)))
-  (let* ((generated-autoload-file (nxhtmlmaint-autoloads-file))
-         (emacs-lisp-mode-hook nil)
-         (default-directory (nxhtmlmaint-util-dir)))
-    (nxhtmlmaint-initialize-autoloads-file)
-    ;; Get the autoloads using advice
-    (nxmtmlmaint-advice-autoload t)
-    (update-file-autoloads file nil)
-    (nxmtmlmaint-advice-autoload nil)
-    ;; Display
-    (display-buffer (find-file-noselect generated-autoload-file))))
-
-(defun nxhtmlmaint-get-dir-autoloads (dir)
-  (interactive (list (or (when (buffer-file-name)
-                           (file-name-directory (buffer-file-name)))
-                         default-directory)))
-  (let* ((generated-autoload-file (nxhtmlmaint-autoloads-file))
-         (emacs-lisp-mode-hook nil)
-         (auto-buf (find-file-noselect generated-autoload-file)))
-    (nxhtmlmaint-initialize-autoloads-file)
-    ;; Get the autoloads using advice
-    (nxmtmlmaint-advice-autoload t)
-    ;; Fix-me: Loop instead, some files must be avoided.
-    (update-directory-autoloads dir)
-    (nxmtmlmaint-advice-autoload nil)
-    ;; Display
-    (display-buffer (find-file-noselect generated-autoload-file))))
-
-(defun nxhtmlmaint-get-tree-autoloads (root)
-  (interactive (list (or (when (buffer-file-name)
-                           (file-name-directory (buffer-file-name)))
-                         default-directory)))
-  (nxhtmlmaint-get-dir-autoloads root)
-  (message "----- ROOT=%s" root)
-  (let* ((files (directory-files root))
-         (sub-dirs (mapcar (lambda (file)
-                             (when (and (not (member file '("." "..")))
-                                        (not (member file '("nxml-mode-20041004" "old")))
-                                        (not (member file '("in")))
-                                        (file-directory-p (expand-file-name file root)))
-                               file))
-                           files)))
-    (setq sub-dirs (delq nil sub-dirs))
-    (message "sub-dirs=%s" sub-dirs)
-    (dolist (dir sub-dirs)
-      (let ((full-dir (expand-file-name dir root)))
-        (unless (string= full-dir nxhtmlmaint-dir)
-          (nxhtmlmaint-get-tree-autoloads full-dir))))))
-
-;;;###autoload
-(defun nxhtmlmaint-get-all-autoloads ()
-  (interactive)
-  (let ((auto-buf (find-file-noselect (nxhtmlmaint-autoloads-file))))
-    (with-current-buffer auto-buf
-      (erase-buffer)
-      (basic-save-buffer)))
-  (nxhtmlmaint-get-tree-autoloads nxhtmlmaint-dir))
-
-(defun nxhtmlmaint-autoload-file-load-name (file)
-  (let ((name (if nxhtmlmaint-autoload-default-directory
-                  (file-relative-name
-                   file nxhtmlmaint-autoload-default-directory)
-                (file-name-nondirectory file))))
-    (if (string-match "\\.elc?\\(\\.\\|\\'\\)" name)
-        (substring name 0 (match-beginning 0))
-      name)))
-
-(defadvice autoload-file-load-name (around
-                                    nxhtmlmaint-advice-autoload-file-load-name
-                                    ;;activate
-                                    compile)
-  (setq ad-return-value (nxhtmlmaint-autoload-file-load-name (ad-get-arg 0))))
-
-(defun nxhtmlmaint-make-autoload (form file)
-  ;;(message "form=%S" form)
-  (if (or (not (listp form))
-          (not (eq 'define-mumamo-multi-major-mode (car form))))
-      ad-return-value
-    (if ad-return-value
-        ad-return-value
-      ;; Fix-me: Maybe expand??
-      (let ((name (nth 1 form))
-            (doc  (nth 2 form)))
-        `(autoload ',name ,file ,doc t)
-        ))))
-
-(defadvice make-autoload (after
-                          nxhtmlmaint-advice-make-autoload
-                          ;;activate
-                          compile)
-  (setq ad-return-value
-        (nxhtmlmaint-make-autoload (ad-get-arg 0)
-                                             (ad-get-arg 1))))
-
-(defun generate-library-autoloads (library)
-  "Insert at point autoloads for Emacs library LIBRARY.
-  Works like `generate-file-autoloads', but for a library."
-  (interactive
-   (list (completing-read "Generate autoloads for library: "
-                          'locate-file-completion
-                          (cons load-path (get-load-suffixes)))))
-  (let ((file (locate-library library)))
-    (generate-file-autoloads file)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; nxhtml-maintenance.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/cedet-build.el b/elpa-to-submit/nxhtml/nxhtml/doc/cedet-build.el
new file mode 100644
index 0000000000..f49197f8be
--- /dev/null
+++ b/elpa-to-submit/nxhtml/nxhtml/doc/cedet-build.el
@@ -0,0 +1,55 @@
+(setq debug-on-error t)
+(setq debug-on-error t)
+(setq debug-on-error t)
+(setq debug-on-error t)
+;;; cedet-build.el<2> --- 
+;; 
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-01-05 Mon
+;; Version: 
+;; Last-Updated: 
+;; URL: 
+;; Keywords: 
+;; Compatibility: 
+;; 
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Commentary: 
+;; 
+;; 
+;; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Change log:
+;; 
+;; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;; This program 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.
+;; 
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Code:
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; cedet-build.el<2> ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/Las_Medulas.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/Las_Medulas.jpg
new file mode 100644
index 0000000000..694a2c5a08
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/Las_Medulas.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/Thumbs.db b/elpa-to-submit/nxhtml/nxhtml/doc/img/Thumbs.db
index 3e94de46d0..60618792b1 100644
Binary files a/elpa-to-submit/nxhtml/nxhtml/doc/img/Thumbs.db and b/elpa-to-submit/nxhtml/nxhtml/doc/img/Thumbs.db differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/Toco_toucan.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/Toco_toucan.jpg
new file mode 100644
index 0000000000..269886c070
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/Toco_toucan.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/bacchante2.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/bacchante2.jpg
new file mode 100644
index 0000000000..a736099335
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/bacchante2.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.jpg
new file mode 100644
index 0000000000..a7352a686e
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.png b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.png
new file mode 100644
index 0000000000..8d606370bc
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.png differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.xcf b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.xcf
new file mode 100644
index 0000000000..9260725dde
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/butterflies.xcf differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/continue-play.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/continue-play.jpg
new file mode 100644
index 0000000000..587113ee38
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/continue-play.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/divine2.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/divine2.jpg
new file mode 100644
index 0000000000..6a8ea51584
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/divine2.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/fun-brain-2.png b/elpa-to-submit/nxhtml/nxhtml/doc/img/fun-brain-2.png
new file mode 100644
index 0000000000..a24f0f4730
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/fun-brain-2.png differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/giraffe.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/giraffe.jpg
new file mode 100644
index 0000000000..6bf9b57ef9
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/giraffe.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/healthy_feet2.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/healthy_feet2.jpg
new file mode 100644
index 0000000000..ed3ab6f8ee
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/healthy_feet2.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/raindrops2.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/raindrops2.jpg
new file mode 100644
index 0000000000..04d0610fe4
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/raindrops2.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/rembrandt-self-portrait.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/rembrandt-self-portrait.jpg
new file mode 100644
index 0000000000..26895984e0
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/rembrandt-self-portrait.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/img/volga.jpg b/elpa-to-submit/nxhtml/nxhtml/doc/img/volga.jpg
new file mode 100644
index 0000000000..c11e93cf24
Binary files /dev/null and b/elpa-to-submit/nxhtml/nxhtml/doc/img/volga.jpg differ
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml-changes.html b/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml-changes.html
index 27baab6dff..5e04c61b38 100644
--- a/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml-changes.html
+++ b/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml-changes.html
@@ -27,6 +27,9 @@
     background-position: 0 -35px;
     color: yellow;
 }
+.bugfix {
+    background-color: #ffd700;
+}
 
 </style>
   </head>
@@ -263,6 +266,38 @@ <h1 id="change-history">nXhtml Changes</h1>
           <a href="#v1.59">v1.59</a>
           <a href="#v1.60">v1.60</a>
           <a href="#v1.61">v1.61</a>
+          <a href="#v1.62">v1.62</a>
+          <a href="#v1.63">v1.63</a>
+          <a href="#v1.64">v1.64</a>
+          <a href="#v1.65">v1.65</a>
+          <a href="#v1.66">v1.66</a>
+          <a href="#v1.67">v1.67</a>
+          <a href="#v1.68">v1.68</a>
+          <a href="#v1.69">v1.69</a>
+          <a href="#v1.70">v1.70</a>
+          <a href="#v1.71">v1.71</a>
+          <a href="#v1.72">v1.72</a>
+          <a href="#v1.73">v1.73</a>
+          <a href="#v1.74">v1.74</a>
+          <a href="#v1.75">v1.75</a>
+          <a href="#v1.76">v1.76</a>
+          <a href="#v1.77">v1.77</a>
+          <a href="#v1.78">v1.78</a>
+          <a href="#v1.79">v1.79</a>
+          <a href="#v1.80">v1.80</a>
+          <a href="#v1.81">v1.81</a>
+          <a href="#v1.82">v1.82</a>
+          <a href="#v1.83">v1.83</a>
+          <a href="#v1.84">v1.84</a>
+          <a href="#v1.85">v1.85</a>
+          <a href="#v1.86">v1.86</a>
+          <a href="#v1.87">v1.87</a>
+          <a href="#v1.88">v1.88</a>
+          <a href="#v1.89">v1.89</a>
+          <a href="#v1.90">v1.90</a>
+          <a href="#v1.91">v1.91</a>
+          <a href="#v1.92">v1.92</a>
+          <a href="#v1.93">v1.93</a>
         </div>
 
         <dl>
@@ -1673,7 +1708,7 @@ <h1 id="change-history">nXhtml Changes</h1>
           <dd id="v1.34-dd">
             <ul>
               <li>
-                <span style="font-size: 1.2em; color: red ()"
+                <span style="font-size: 1.2em; color: red ()" 
                       >Changed top directory name from nxml to nxhtml</span>
                 <p>
                   This will of course case some problems if you do not
@@ -2264,8 +2299,10 @@ <h1 id="change-history">nXhtml Changes</h1>
                 Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/290364">290364</a>,
                 see below about MuMaMo important changes.
               </li>
-              <li>Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/304569">304569</a>.</li>
+              <li>Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/272526">272526</a>.</li>
               <li>Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/292393">292393</a>.</li>
+              <li>Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/300946">300946</a>.</li>
+              <li>Fixed bug <a href="https://bugs.launchpad.net/nxhtml/+bug/304569">304569</a>.</li>
               <li>
                 Added some support for editing gmail messages in
                 as-external.el (to be used with It's All Text for
@@ -2303,24 +2340,725 @@ <h1 id="change-history">nXhtml Changes</h1>
                   do.
                 </p>
                 <p>
-                  I have done first part of this rewrite. Chunk
-                  dividing is now always done from the beginning.
-                  However the routines actually finding the chunks
-                  still looks both upwards and downwards.  I will try
-                  to remove this unnecessary complexity later.
+                  I have done first part of this rewrite and I hope
+                  chunk dividing can not loop any more. Chunk dividing
+                  is now always done from the beginning.  However the
+                  routines actually finding the chunks still looks
+                  both upwards and downwards.  I will try to remove
+                  this unnecessary complexity later.
+                </p>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.62">1.62</dt>
+          <dd id="v1.62-dd">
+            <ul>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    Fixed bugs in chunk creation that caused args out
+                    of range at buffer end.
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Autoloading caused wrong libraries to load (for
+                example javascript from mozdev). Fixed.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.63">1.63</dt>
+          <dd id="v1.63-dd">
+            <ul>
+              <li>
+                Removed find-recursive.el since there is no use for it
+                any more and it interferes with emacs-rails.  (It was
+                initally a bug fixs for emacs-rails.)
+              </li>
+              <li>
+                Fixed bugs in <i>html-write-mode</i>.
+              </li>
+              <li>
+                Used the new routines for finding chunks also during
+                xml validation and syntax-ppss.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.64">1.64</dt>
+          <dd id="v1.64-dd">
+            <ul>
+              <li>
+                MuMaMo: nxml was not turned off properly when
+                switching from a multi major mode that used nxml-mode
+                or nxhtml-mode. Fixed. This was especially troublesome
+                for Emacs 22 users where multi major modes based on
+                nxhtml-mode does not always work.
+              </li>
+              <li>
+                Majmodpri.el: Added a defcustom to give multi major
+                modes based on nxhtm-mode or nxml-mode lower
+                priority. This is on by default in Emacs 22.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.65">1.65</dt>
+          <dd id="v1.65-dd">
+            <ul>
+              <li>Fixed a bug in nxml-where.el.</li>
+              <li>
+                Fixed a minor bug in majmodpri.el.  It did not work if
+                magic-mode-alist contained anonymous functions.
+                (Thanks from Niels Giesen.)
+              </li>
+              <li>
+                Fixed a bug in pause.el and added some mindfulness to it.
+              </li>
+              <li>
+                Adjusted <i>ourcomments-move-beginning-of-line</i> (and dito
+                for end) to the new <i>line-move-visual</i> in Emacs 23.
+                Moved physical-line.el to <i>old</i> subdir since it is now
+                obsolete.
+              </li>
+              <li>
+                Made it possible to byte compile nXhtml.
+                <p>
+                  To do that use
+                  <i>M-x nxhtmlmaint-start-byte-compilation</i>.
+                </p>
+                <p>
+                  A lot of code changes to make byte compilation
+                  possible without a lot of warnings.  Most changes
+                  where just moving code around, but some where bug
+                  fixes.
+                </p>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.66">1.66</dt>
+          <dd id="v1.66-dd">
+            <ul>
+              <li>
+                Further work on byte compiling.
+              </li>
+              <li>
+                Tried to fix some problem with defadvice in
+                ourcomments-util.el.
+              </li>
+              <li>
+                Tried to finish the command <i>M-x search-form</i>.
+              </li>
+              <li>
+                When no chunk is found (border case) then set the
+                major mode to the main major mode for the current
+                multi major mode.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.67">1.67</dt>
+          <dd id="v1.67-dd">
+            <ul>
+              <li>
+                Removed css.el since it is in Emacs 22.2 and later.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.68">1.68</dt>
+          <dd id="v1.68-dd">
+            <ul>
+              <li>
+                Fixed bugs related to byte compilation. This should
+                now work for both Emacs 22 and 23. Also added a menu
+                entry for byte compilation.
+              </li>
+              <li>
+                Removed nXml from the distribution to make it
+                smaller. nXml comes with Emacs 23 (not yet released of
+                course). For Emacs 22 users see EmacsWiki about where
+                to get nXml.
+                <p>
+                  Adding nXml to Emacs 22 startup should be done by
+                  using the file <i>nxhtml/autostart22.el</i>.
+                </p>
+                <p>
+                  NOTE 1: if you want to use <i>nxhtml-mode</i> in
+                  multi major modes in Emacs 22 (not recommended) you
+                  must also customize <i>majmodpri-no-nxml</i>.
+                </p>
+                <p>
+                  NOTE 2: The major mode <i>nxhtml-mode</i> as a
+                  major-mode works however very well also in Emacs 22.
+                </p>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.69">1.69</dt>
+          <dd id="v1.69-dd">
+            <ul>
+              <li>
+                Chunks were unnecessary deleted and recreated after a
+                change even if all changes where within one
+                chunk. This could make editing very slow. Fixed.
+              </li>
+              <li>
+                Search for rng-auto.el in path. (Emacs 22 only.)
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.70">1.70</dt>
+          <dd id="v1.70-dd">
+            <ul>
+              <li>
+                Validation could not be turned on in multi major
+                modes. Fixed.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.71">1.71</dt>
+          <dd id="v1.71-dd">
+            <ul>
+              <li>
+                Fixed the problem that showed up in the file
+                nxhtml/tests/in/kubica-freezing-i.html which could
+                make Emacs freeze.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.72">1.72</dt>
+          <dd id="v1.72-dd">
+            <ul>
+              <li>
+                Somehow I dropped this: Search for rng-auto.el in
+                path. (Emacs 22 only.) Don't ask me how. Fixed again.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.73">1.73</dt>
+          <dd id="v1.73-dd">
+            <ul>
+              <li>
+                Worked a bit more on byte compilation and elisp
+                libraries loading.  If you byte compile nXhtml it will
+                now load very few modules by default. It loads more
+                modules if you don't.
+              </li>
+              <li>
+                Added chart.el, a small elisp library to create charts.
+                This works by calling google charts library.
+                Chart.el is a bit beta, eh alpha, but still useful I believe.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.74">1.74</dt>
+          <dd id="v1.74-dd">
+            <ul>
+              <li>
+                Found and fixed a bug in <em>fictive XML validation
+                headers</em>. This bug depended on the load order of
+                libraries.
+              </li>
+              <li>
+                Fixed a small bug in <i>nxml-where-mode</i>.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.75">1.75</dt>
+          <dd id="v1.75-dd">
+            <ul>
+              <li>
+                Included css-color.el, css-palette.el and gpl.el from Niels Giesen.
+                (This replaces hexcolor.el which is no longer in nXhtml.)
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.76">1.76 -- Released 2009-02-26</dt>
+          <dd id="v1.76-dd">
+            <ul>
+              <li>
+                <span class="bugfix">Fixed a long standing bug in XML validation.</span> (I had
+                forgot to set the defadvice return value in defadvice
+                rng-set-initial-state in rngalt.el - I wonder why I
+                did not get any bug reports about this...)
+              </li>
+              <li>
+                <span class="bugfix">css-color.el: bug fix for mIxEd case color names.</span>
+              </li>
+              <li>
+                <span class="bugfix">freemind.el: bug fixes.</span>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.77">1.77 -- Never released!</dt>
+          <dd id="v1.77-dd">
+            <ul>
+              <li>
+                <span class="bugfix">Fixed numerous bugs</span>, please
+                see <a href="https://bugs.launchpad.net/nxhtml/">nXhtml bug tracker</a>
+                and dito <a href="https://answers.launchpad.net/nxhtml">question and answers</a>.
+              </li>
+              <li>
+                Added some missing autoloads.
+              </li>
+              <li>
+                <span class="bugfix">Tried to fix some smaller troubles with Viper when
+                changing chunk.</span>
+              </li>
+              <li>
+                <span class="bugfix">Menus for Tidy were broken. Fixed.</span>
+              </li>
+              <li>
+                Added a test that the <i>nxml-mode libraries included
+                in Emacs</i> are used and not the old ones.  (If I
+                understand it correctly this might have been a problem
+                for Debian/Ubuntu Emacs 23 snap-shots users where the
+                old nxml-mode has been a left over from earlier
+                snap-shots where it was needed.)
+              </li>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    Chunks are now always created from top to bottom.
+                    This should make chunk creation more stable.
+                    It also opens up for chunks in chunks in the future.
+                    (The code still needs work...)
+                  </li>
+                </ul>
+              </li>
+              <li>
+                majmodpri.el:
+                <ul>
+                  <li>
+                    To restore multi major modes in files loaded by
+                    desktop-save-mode the new
+                    function <i>majmodpri-apply</i> can be added
+                    to <i>desktop-after-read-hook</i>.
+                  </li>
+                  <li>
+                    New default for <i>majmodpri-sort-after-load</i>:
+                    Sort after loading certain features/libraries that
+                    are known to change <i>auto-mode-alist</i> and
+                    apply to current buffer.  This new default should
+                    hopefully make major mode selection less
+                    confusing.
+                  </li>
+                </ul>
+              </li>
+              <li>
+                winsav.el:
+                <ul>
+                  <li>
+                    Added save and restore between Emacs sessions for frame configuration.
+                    I am not sure how this works with special frames yet, but I have tested this with oneonone.el and it seems to work.
+                    Dedicated windows should also work.
+                  </li>
+                  <li>
+                    Added saving and restoring of named frame configurations.
+                  </li>
+                </ul>
+              </li>
+              <li>
+                javascript.el:
+                <ul>
+                  <li>
+                    Updated to Karl's newest version (and added my additions).
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Added library usb-setup.el that might help a bit with
+                using Emacs from an USB stick.
+              </li>
+              <li>
+                Updated smarty-mode.el to the latest version.
+              </li>
+              <li>
+                <img alt="Happy brain" src="img/fun-brain-2.png" width="131" height="119" />
+                Added an n-back game for your brain (and mine).
+                Just do <b>M-x n-back-game</b> to start it.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.78">1.78 -- Released 2009-05-28</dt>
+          <dd id="v1.78-dd">
+            <ul>
+              <li>
+                <span class="bugfix">nXhtml version 1.78 is the
+                release of the previous beta</span> (which had number
+                1.77 and existed in many versions).
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.79">1.79</dt>
+          <dd id="v1.79-dd">
+            <ul>
+              <li>
+                Added a function to simplify adding for example font
+                lock keywords for major modes used in multi major
+                mode: <i>mumamo-refresh-multi-font-lock</i>.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.80">1.80 -- Released 2009-06-02</dt>
+          <dd id="v1.80-dd">
+            <ul>
+              <li>
+                <span class="bugfix">Fixed a (rather serious) bug and cleaned up.</span>
+              </li>
+              <li>
+                Added mumamo regions. Mumamo regions are temporary
+                mumamo chunks that you set up by selecting a region
+                and telling you want that in a new major mode. To use
+                this feature look in the nXhtml menu under <i>Chunks -
+                Region Chunks</i>.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.81">1.81 -- Released 2009-06-19</dt>
+          <dd id="v1.81-dd">
+            <ul>
+              <li>
+                Added the minor mode <i>mumamo-alt-php-tags-mode</i>
+                that lets you work more easily with &lt;?php tags in
+                strings while you are still able to use XHTML
+                completion. (I added something looking rather similare
+                earlier, but removed it again because of difficulties
+                with undo. They are now fixed in Emacs and this should
+                be safe.)
+              </li>
+              <li>
+                Added support for hi-lock, but please be aware that
+                chunk overlays hides background marking that hi-lock
+                does... - so you must use marking that changes
+                foreground part of face.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.82">1.82 -- Released 2009-06-23</dt>
+          <dd id="v1.82-dd">
+            <ul>
+              <li>
+                <span class="bugfix">Find and fixed some bugs when
+                I tried to fix bug 388729.</span> Not sure I fixed that
+                bug though.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.83">1.83 -- Released 2009-06-24</dt>
+          <dd id="v1.83-dd">
+            <ul>
+              <li>
+                <span class="bugfix">Fontification disappeared for example in *grep* buffer. Fixed.</span>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.84">1.84 -- Released 2009-06-30</dt>
+          <dd id="v1.84-dd">
+            <ul>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    <span class="bugfix">Worked around bug in Emacs
+                    22.3 where c-after-change was left in
+                    after-change-functions.</span> (This makes no
+                    difference in Emacs 23.)
+                  </li>
+                  <li>
+                    <span class="bugfix">Fixed a bug that occured
+                    after deletion of whole chunks.</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.85">1.85 -- Released 2009-07-04</dt>
+          <dd id="v1.85-dd">
+            <ul>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    <span class="bugfix">Corrected various mostly
+                    minor bugs</span>, like indent-line-function which
+                    where globally set to
+                    mumamo-indent-line. Corrected.
+                  </li>
+                  <li>
+                    <span class="bugfix">Forgot to finish the implementation of support for
+                    font-lock-add-keywords. Done.</span>
+                  </li>
+                  <li>
+                    Added some faces hi-mumamo-* to use with hi-lock,
+                    but unfortunately they are not very
+                    visible. Suggestions are welcome.
+                  </li>
+                </ul>
+              </li>
+              <li>
+                CEDET and ECB:
+                <ul>
+                  <li>
+                    <span class="bugfix">Made the routines for fetching and installing CEDET and ECB
+                    from the development sources work again.</span>
+                  </li>
+                  <li>
+                    Added support for ECB in <i>winsav-save-mode</i>. Though I suspect it need some rework...
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Added pointback.el, found on EmacsWiki. This is just
+                so missing in Emacs...
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.86">1.86 -- Released 2009-07-05</dt>
+          <dd id="v1.86-dd">
+            <ul>
+              <li>
+                Made the fetching and installing of CEDET and ECB a
+                bit better.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.87">1.87 -- Released 2009-07-08</dt>
+          <dd id="v1.87-dd">
+            <ul>
+              <li>
+                Some enhancements to winsav.el and menuacc.el.
+              </li>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    Added heredoc for some modes. They are currently
+                    kind of hidden since they are only available in
+                    multiple major modes that offer just heredocs.
+                    The implemented heredoc multi major modes are
+
+                    sh-mumamo-heredoc-mode,
+                    php-mumamo-heredoc-mode,
+                    perl-mumamo-heredoc-mode,
+                    cperl-mumamo-heredoc-mode,
+                    python-mumamo-heredoc-mode and
+                    ruby-mumamo-heredoc-mode.
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.88">1.88 -- Never released, only betas</dt>
+          <dd id="v1.88-dd">
+            <ul>
+              <li>
+                MuMaMo:
+                <ul>
+                  <li>
+                    <span class="bugfix">
+                      Background colors could not be removed by
+                      setting <i>mumamo-background-coloring</i>.
+                      Fixed, but please notice that this variable now
+                      is a number.
+                    </span>
+                  </li>
+                  <li>
+                    <span class="bugfix">Support for chunks in chunks.</span>
+                  </li>
+                  <li>
+                    <span class="bugfix">Removed string-match-p which does not exist in Emacs 22.</span>
+                  </li>
+                  <li>
+                    <span class="bugfix">
+                      mumamo-alt-php-tags-mode hardly survived major mode
+                      changes. Rescued.
+                    </span>
+                  </li>
+                  <li>
+                    <span class="bugfix">
+                      Added possibility to display chunk info in
+                      window margins as an alternative/addon to
+                      colored chunks.
+                    </span>
+                  </li>
+                  <li>
+                    <span class="bugfix">
+                      Fixed a bug in n-back.el that prevented the game to be used on Emacs 22.
+                    </span>
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Bug fixes and changes to udev for CEDET and ECB. (Udev
+                is a little utility to fetch and install dev sources.)
+                <ul>
+                  <li>
+                    <span class="bugfix">
+                      Changed default directory for installing CEDET and
+                      ECB to be under <i>~/.emacs.d/udev/</i>.
+                    </span>
+                  </li>
+                  <li>
+                    <span class="bugfix">
+                      Several bug fixes for udev.
+                      It should now work again (it did not if you compiled nXhtml).
+                    </span>
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Added support
+                for <a href="http://www.emacswiki.org/emacs/CompanyMode">Company
+                Mode</a> style completion.  Temporary included a copy
+                of Company Mode with bug fixes and changes needed for
+                nXhtml and Viper.  It also include a lot of other
+                small features (which I hope can be included in
+                Company Mode).  On of these is integration
+                with <a href="http://www.emacswiki.org/emacs/PredictiveMode">Predictive
+                Mode</a>. (You have to get Predictive Mode
+                yourself. If you want to install it on MS Windows I
+                recommend using the latest version of Cygwin. A
+                smaller change to the Makefile is required, there is
+                one absolute path you probably want to remove.)
+                <p class="bugfix">
+                  Note: I thought that I should make Company Mode the default completion style.
+                  However there are still some problem so I kept the old default completion style.
+                </p>
+              </li>
+              <li>
+                TabKey2:
+                <ul>
+                  <li>
+                    Added support for Company Mode.
+                  </li>
+                  <li>
+                    Made completion only occur at word ends.
+                  </li>
+                </ul>
+              </li>
+              <li>
+                Added support
+                for <a href="http://www.emacswiki.org/emacs/Anything">anything
+                style completion</a> in XHTML completion.
+              </li>
+              <li>
+                Added support in inlimg-mode to show images in org-mode.
+                (Also made inlimg-mode use font lock which makes it more reliable.)
+              </li>
+              <li>
+                Included espresso-mode (with some possible bug fixes).  Not yet the default for Javascript.
+              </li>
+              <li>
+                <p class="bugfix">
+                  Added simple functions for mirroring html files in
+                  Firefox as typing.  This works - at least for small
+                  files.  There is also support for automatic update
+                  of Firefox when saving CSS files.
+                </p>
+                <p>
+                  This is a simple framework for communicating with
+                  MozRepl which enqueues requests, waiting for
+                  response prompt before sending next requests.
+                  <span class="bugfix">Maybe this can be used to make
+                  some more efficient routines than those I have
+                  written here.  Any takers?</span>
                 </p>
+                <p>
+                  For larger files (like this one) this version is
+                  rather slow since it always changes the whole DOM.
+                </p>
+              </li>
+              <li>
+                <span class="bugfix">
+                  Rewrote <i>nxml-where-mode</i> to be more efficient and
+                  fixed some minor bugs.  It can now also be used with
+                  MozRepl to track position in file.
+                </span>
+              </li>
+              <li>
+                <span class="bugfix">
+                  Made <i>winsav-save-mode</i> remember maximized state and
+                  forget about empty non-file buffers.
+                </span>
+              </li>
+              <li>
+                <span class="bugfix">
+                  Added workaround for <a
+                  href="http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4015"
+                  >Emacs bug 4015 on w32</a>.
+                </span>
+              </li>
+              <li>
+                Added <i>ourcomments-M-x-menu-mode</i> which <a
+                href="http://lists.gnu.org/archive/html/emacs-devel/2009-07/msg01025.html">adds
+                menu commands to M-x history</a>.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.89">1.89 -- Released 2009-08-04</dt>
+          <dd id="v1.89-dd">
+            <ul>
+              <li>
+                The release version of all the fixes in beta 1.88.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.90">1.90 -- Released 2009-08-04</dt>
+          <dd id="v1.90-dd">
+            <ul>
+              <li>
+                <span class="bugfix">
+                  Made wrap-to-fill-column-mode cooperate a bit with
+                  mumamo-margin-info-mode.
+                </span>
+              </li>
+              <li>
+                Made an inventory of utilities in nXhtml and made some
+                of them more visible in the menus.
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.91">1.91 -- Released 2009-08-04</dt>
+          <dd id="v1.91-dd">
+            <ul>
+              <li>
+                <span class="bugfix">
+                  Mumamo bug fix for bug reported on Emacs wiki today.
+                  Inline scripts end tag could not be in column one if
+                  previous line had a // style js comment.
+                </span>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.92">1.92 -- Released 2009-08-04</dt>
+          <dd id="v1.92-dd">
+            <ul>
+              <li>
+                <span class="bugfix">
+                  An Emacs bug that sometimes prevent changing local keymap in a timer hit us.
+                  Made a workaround.
+                </span>
+              </li>
+            </ul>
+          </dd>
+          <dt id="v1.93">1.93 -- Released 2009-08-04</dt>
+          <dd id="v1.93-dd">
+            <ul>
+              <li>
+                <span class="bugfix">
+                  Minor bug in menus gave major problem. Fixed - I hope.
+                </span>
               </li>
             </ul>
           </dd>
         </dl>
       </div>
+
+      <hr class="footer"/>
+      <p class="footer">
+        <span id="latest">Copyright &copy; <!-- this year -->2009<!-- end this year --> OurComments.org</span>
+      </p>
     </div>
 
-    <hr class="footer"/>
-    <p class="footer">
-      Copyright &copy; <!-- this year -->2008<!-- end this year --> OurComments.org
-      --
-      Latest update <!-- today -->2008-09-06<!-- end today -->
-    </p>
   </body>
 </html>
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml.html b/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml.html
index 3c1b9118a0..1438fb32b0 100644
--- a/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml.html
+++ b/elpa-to-submit/nxhtml/nxhtml/doc/nxhtml.html
@@ -104,13 +104,13 @@
       <div id="lftcol">
         <!-- Table of contents BEGIN -->
         <!-- Table of contents min=2 max=3 -->
-        <div id="PAGETOC">
-          <span class="tochead"> On THIS Page: </span>
+        <table id="PAGETOC"><tr><td>
+          <span class="tochead">On THIS Page:</span>
           <ul>
             <li><a href="#summary">Introduction to nXhtml</a></li>
             <li class="liul"><ul>
               <li><a href="#featsum">Features</a></li>
-              <li id="quicklnk"><a href="#qg">The Quick Guide</a></li>
+              <li><a href="#qg">The Quick Guide</a></li>
               <li><a href="#toolset">What you may use more</a></li>
             </ul></li>
             <li><a href="#completion">Completion</a></li>
@@ -134,8 +134,9 @@
             </ul></li>
             <li><a href="#file-assoc">File Associations within Emacs</a></li>
             <li><a href="#bloggin">Not for Me, I Am Only Blogging</a></li>
+            <li><a href="#bloggin">And Other Goodies...</a></li>
           </ul>
-        </div>
+        </td></tr></table>
         <!-- END of Table of contents -->
       </div>
 
@@ -298,6 +299,10 @@ <h3 id="qg">The Quick Guide</h3>
             <p>
               After this files with extensions for example .html will open in nxhtml-mode.
             </p>
+            <p>
+              To make nXhtml run faster you can also byte compile the files.
+              You do that with <i>M-x nxhtmlmaint-start-byte-compilation</i>.
+            </p>
           </dd>
 
           <dt id="nxhtml-menu">The nXhtml Menu</dt>
@@ -412,6 +417,32 @@ <h3 id="qg">The Quick Guide</h3>
               for this in the <a href="#nxhtml-menu">nXhtml menu</a>.
             </p>
           </dd>
+          <dt>Keyboard shortcuts (aka keybindings in Emacs)</dt>
+          <dd>
+            <p>
+              When you start to use a new program you often wonder
+              about which keybindings there are to use.  If you have
+              not used Emacs before you may feel quite lost because
+              you have looked in all documentation and you have not
+              seen any list of keybindings.
+            </p>
+            <p>
+              Well, that is how it often is in Emacs. Get use to it ...
+            </p>
+            <p>
+              But do not panic. Because there is help, probably even
+              better than you are used to - in Emacs dynamic help
+              system. A help system that change if you for example add
+              a keybinding yourself.  Try the command <i>C-h b</i> (or <i>F1
+              b</i>). This list all the keybindings (in their priority
+              order) that are active where you are in Emacs.
+            </p>
+            <p>
+              You can also try <i>C-h m</i> which gives information about
+              minor modes and the current major mode. There is
+              sometimes information about the keybindings there too.
+            </p>
+          </dd>
           <dt>Some More You Can Do ...</dt>
           <dd>
             <p>
@@ -778,7 +809,8 @@ <h3 id="multi-colors">Why Are Colors Different in Multiple Modes?</h3>
 
         <h3 id="part2">More Multiple Modes</h3>
         <p>
-          nXhtml handles for example embedded style sheets the same way as PHP:
+          nXhtml mode handles for example embedded style sheets the
+          same way as it handles PHP chunks:
         </p>
         <!--
         <img alt="CSS embedded in XHTML" src="img/embedded-xhtml.png" width="448" height="294" />
@@ -913,6 +945,14 @@ <h2 id="bloggin">Not for Me, I Am Only Blogging</h2>
 
 <!--         <img alt="Edit part of an XHTML file" src="img/edit-part.png" width="448" height="390" /> -->
 
+        <h2 id="bloggin">And Other Goodies...</h2>
+        <p>
+          There are a lot of other things in the package too, please
+          see the nXhtml menu in Emacs.  You can for example find a
+          n-back-game (if you do not know what it is now, do not
+          worry, just try it and you will learn - and understand why I
+          put it there).
+        </p>
       </div>
 
       <hr align="left" class="footer" />
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/test.html b/elpa-to-submit/nxhtml/nxhtml/doc/test.html
new file mode 100644
index 0000000000..4bb801d020
--- /dev/null
+++ b/elpa-to-submit/nxhtml/nxhtml/doc/test.html
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title></title>
+    <style type="text/css"><!--
+      body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+    --></style>
+    <style type="text/css"><!--
+      body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+      span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+      span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+      span.comment-face-1419   { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+      span.comment-face-1419 a { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+      span.comment-delimiter-face-1418   { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+      span.comment-delimiter-face-1418 a { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+      --></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.help-argument-name-1420   { color: rgb(0, 0, 255);  font-style: italic;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-size: 10pt;  text-decoration: none; }
+span.help-argument-name-1420 a { color: rgb(0, 0, 255);  font-style: italic;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-size: 10pt;  text-decoration: underline; }
+span.button-0004   { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+span.button-0004 a { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.completion-tooltip-face-1437   { color: rgb(0, 0, 0);  background: rgb(255, 255, 255);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.completion-tooltip-face-1437 a { color: rgb(0, 0, 0);  background: rgb(255, 255, 255);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.completion-dynamic-face-1436   { color: rgb(0, 0, 0);  background: rgb(255, 165, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.completion-dynamic-face-1436 a { color: rgb(0, 0, 0);  background: rgb(255, 165, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.compilation-warning-1435   { color: rgb(255, 165, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.compilation-warning-1435 a { color: rgb(255, 165, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.compilation-line-number-1434   { color: rgb(184, 134, 11);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.compilation-line-number-1434 a { color: rgb(184, 134, 11);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.compilation-info-1433   { color: rgb(0, 205, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.compilation-info-1433 a { color: rgb(0, 205, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.compilation-error-1430   { color: rgb(255, 0, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.compilation-error-1430 a { color: rgb(255, 0, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.compilation-column-number-1429   { color: rgb(34, 139, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.compilation-column-number-1429 a { color: rgb(34, 139, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.comint-highlight-prompt-1428   { color: rgb(0, 0, 139);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.comint-highlight-prompt-1428 a { color: rgb(0, 0, 139);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.button-0004   { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+span.button-0004 a { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.default-0273   { color: rgb(250, 235, 215);  font-size: 105%;  text-decoration: none; }
+span.default-0273 a { color: rgb(250, 235, 215);  font-size: 105%;  text-decoration: underline; }
+span.default-0272   { background: rgb(250, 235, 215);  font-size: 105%;  text-decoration: none; }
+span.default-0272 a { background: rgb(250, 235, 215);  font-size: 105%;  text-decoration: underline; }
+span.default-0271   { color: rgb(250, 240, 230);  font-size: 105%;  text-decoration: none; }
+span.default-0271 a { color: rgb(250, 240, 230);  font-size: 105%;  text-decoration: underline; }
+span.default-0270   { background: rgb(250, 240, 230);  font-size: 105%;  text-decoration: none; }
+span.default-0270 a { background: rgb(250, 240, 230);  font-size: 105%;  text-decoration: underline; }
+span.default-0269   { color: rgb(253, 245, 230);  font-size: 105%;  text-decoration: none; }
+span.default-0269 a { color: rgb(253, 245, 230);  font-size: 105%;  text-decoration: underline; }
+span.default-0268   { background: rgb(253, 245, 230);  font-size: 105%;  text-decoration: none; }
+span.default-0268 a { background: rgb(253, 245, 230);  font-size: 105%;  text-decoration: underline; }
+span.default-0267   { color: rgb(255, 250, 240);  font-size: 105%;  text-decoration: none; }
+span.default-0267 a { color: rgb(255, 250, 240);  font-size: 105%;  text-decoration: underline; }
+span.default-0266   { background: rgb(255, 250, 240);  font-size: 105%;  text-decoration: none; }
+span.default-0266 a { background: rgb(255, 250, 240);  font-size: 105%;  text-decoration: underline; }
+span.default-0265   { color: rgb(220, 220, 220);  font-size: 105%;  text-decoration: none; }
+span.default-0265 a { color: rgb(220, 220, 220);  font-size: 105%;  text-decoration: underline; }
+span.default-0264   { background: rgb(220, 220, 220);  font-size: 105%;  text-decoration: none; }
+span.default-0264 a { background: rgb(220, 220, 220);  font-size: 105%;  text-decoration: underline; }
+span.default-0263   { color: rgb(245, 245, 245);  font-size: 105%;  text-decoration: none; }
+span.default-0263 a { color: rgb(245, 245, 245);  font-size: 105%;  text-decoration: underline; }
+span.default-0262   { background: rgb(245, 245, 245);  font-size: 105%;  text-decoration: none; }
+span.default-0262 a { background: rgb(245, 245, 245);  font-size: 105%;  text-decoration: underline; }
+span.default-0261   { color: rgb(248, 248, 255);  font-size: 105%;  text-decoration: none; }
+span.default-0261 a { color: rgb(248, 248, 255);  font-size: 105%;  text-decoration: underline; }
+span.default-0260   { background: rgb(248, 248, 255);  font-size: 105%;  text-decoration: none; }
+span.default-0260 a { background: rgb(248, 248, 255);  font-size: 105%;  text-decoration: underline; }
+span.default-0259   { color: rgb(255, 250, 250);  font-size: 105%;  text-decoration: none; }
+span.default-0259 a { color: rgb(255, 250, 250);  font-size: 105%;  text-decoration: underline; }
+span.default-0258   { background: rgb(255, 250, 250);  font-size: 105%;  text-decoration: none; }
+span.default-0258 a { background: rgb(255, 250, 250);  font-size: 105%;  text-decoration: underline; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.default-1432   { text-decoration: underline;  color: rgb(176, 48, 96);  font-weight: 700;  font-size: 164%; }
+span.default-1432 a { text-decoration: underline;  color: rgb(176, 48, 96);  font-weight: 700;  font-size: 164%; }
+span.default-1431   { color: rgb(176, 48, 96);  font-weight: 700;  font-size: 164%;  text-decoration: none; }
+span.default-1431 a { color: rgb(176, 48, 96);  font-weight: 700;  font-size: 164%;  text-decoration: underline; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.custom-button-0022   { border-width: 1px;  border-style: outset;  color: rgb(0, 0, 0);  background: rgb(211, 211, 211);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.custom-button-0022 a { border-width: 1px;  border-style: outset;  color: rgb(0, 0, 0);  background: rgb(211, 211, 211);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.bold-0248   { background: rgb(173, 255, 47);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.bold-0248 a { background: rgb(173, 255, 47);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.match-1438   { background: rgb(255, 255, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.match-1438 a { background: rgb(255, 255, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.underline-1413   { color: rgb(184, 134, 11);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  text-decoration: underline;  font-size: 10pt; }
+span.underline-1413 a { color: rgb(184, 134, 11);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  text-decoration: underline;  font-size: 10pt; }
+span.underline-0219   { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+span.underline-0219 a { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+span.underline-1412   { color: rgb(0, 205, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  text-decoration: underline;  font-size: 10pt; }
+span.underline-1412 a { color: rgb(0, 205, 0);  font-weight: 700;  font-family: outline-courier new;  font-stretch: normal;  font-style: normal;  text-decoration: underline;  font-size: 10pt; }
+--></style><style type="text/css"><!--
+body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.comment-face-1419   { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.comment-face-1419 a { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.comment-delimiter-face-1418   { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.comment-delimiter-face-1418 a { color: rgb(178, 34, 34);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.string-face-1441   { color: rgb(188, 143, 143);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.string-face-1441 a { color: rgb(188, 143, 143);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.match-1438   { background: rgb(255, 255, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: none; }
+span.match-1438 a { background: rgb(255, 255, 0);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt;  text-decoration: underline; }
+span.keyword-face-1440   { color: rgb(160, 32, 240);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: none; }
+span.keyword-face-1440 a { color: rgb(160, 32, 240);  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  font-size: 10pt;  text-decoration: underline; }
+span.underline-1439   { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+span.underline-1439 a { text-decoration: underline;  font-family: outline-courier new;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: rgb(0, 0, 0);  font-size: 10pt; }
+    --></style>
+  </head>
+  <body style="background: #000000; color: #ff9900; padding:2em; margin:4em; margin-top:2em;">
+
+    <h1>Example of htmlfontify.el output</h1>
+
+    <p style="font-size: 1.3em; width: 35em;">
+      The following is an example of the output you can get with htmlfontify.el.
+      The version used here is shipped with <a href="nxhtml.html" style="color: #ffbb33; ">nXhtml</a>.
+      (A new version from the original author is on its way.)
+    </p>
+
+    <table border="0" cellpadding="0" cellspacing="0" style="border: solid rgb(0, 84, 227); width:44.800000000000004em; background:white;">
+      <tr>
+        <td style="background-color:rgb(0, 84, 227); color:rgb(255, 255, 255);border: none; padding:4px; vertical-align: middle;"><img alt="Emacs Icon (patched)" src="img/emacsP16.png" width="16" height="16" />&nbsp;&nbsp;Emacs - Frame Dump</td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;"><table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+            <td style="vertical-align:top;"><table border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td style="vertical-align:top;"><div style="width:22em; height:15em; border: 1px solid rgb(212, 208, 200); overflow:auto; padding:4px;">
+
+                  <pre>
+                    <span class="comment-delimiter-face-1418">;; </span><span class="comment-face-1419">This buffer is for notes you don't want to save, and for Lisp evaluation.</span>
+                    <span class="comment-delimiter-face-1418">;; </span><span class="comment-face-1419">If you want to create a file, visit that file with C-x C-f,</span>
+                    <span class="comment-delimiter-face-1418">;; </span><span class="comment-face-1419">then enter the text in that file's own buffer.</span>
+                  </pre>
+                </div>
+                <div style="width:22em; color:rgb(51, 51, 51); background:rgb(229, 229, 229); white-space:pre; overflow:hidden; font-family:monospace;">-- (Unix)--   <b>*scratch*</b>    (Lisp Interaction w32 Abbrev hs) --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</div>
+                </td>
+                <td style="vertical-align:top;"><div style="width:23em; height:15em; border: 1px solid rgb(212, 208, 200); overflow:auto; padding:4px;">
+
+
+                <script type="text/javascript">
+                  // <![CDATA[
+
+function getObj(name) {
+    if (document.getElementById) {
+        this.obj = document.getElementById(name);
+        this.style = document.getElementById(name).style;
+    }
+}
+function hfy_toggle_display(name) {
+    var x = new getObj("hfy_invis_" + name);
+    var flag = x.style.display == 'inline';
+    x.style.display = (flag) ? 'none' : 'inline'
+}
+
+// ]]>
+                </script>
+
+                <pre>cadr is a compiled Lisp function in `<span class="button-0004">subr.el</span>'.
+                (cadr <span class="help-argument-name-1420">x</span>)
+
+                Return the car of the cdr of <span class="help-argument-name-1420">x</span>.
+
+                <span class="button-0004">[back]</span>
+                </pre>
+
+              </div>
+              <div style="color:rgb(51, 51, 51); background:rgb(229, 229, 229); white-space:pre; overflow:hidden; font-family:monospace;">-- (Unix)%%   <b>*Help*</b>    (Help w32 View Abbrev) --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</div></td>
+              </tr>
+            </table>
+            </td>
+          </tr>
+
+        </table>
+        </td>
+      </tr>
+      <tr>
+        <td style="padding:1px;">
+        <span style="background:rgb(255, 215, 0); ">&nbsp;M-x </span>&nbsp;hfyview-frame</td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/nxhtml/doc/wd/grapes/nxhtml-grapes.css b/elpa-to-submit/nxhtml/nxhtml/doc/wd/grapes/nxhtml-grapes.css
index 863040f462..a241c1e38a 100644
--- a/elpa-to-submit/nxhtml/nxhtml/doc/wd/grapes/nxhtml-grapes.css
+++ b/elpa-to-submit/nxhtml/nxhtml/doc/wd/grapes/nxhtml-grapes.css
@@ -72,6 +72,10 @@ acronym {font-weight: bold; border-bottom: 1px dashed #000; cursor: help}
 p, li, dt, dd {
     margin-right: 1em;
 }
+dt {
+    margin-top:    1em;
+    margin-bottom: 0.5em;
+}
 li ul li {
     margin-right: 0;
 }
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-chklnk.el b/elpa-to-submit/nxhtml/nxhtml/html-chklnk.el
index 312f6d414e..9e84d27ac9 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-chklnk.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-chklnk.el
@@ -47,14 +47,17 @@
 
 (eval-when-compile (add-to-list 'load-path default-directory load-path))
 (eval-when-compile
-  (let ((load-path load-path)
-        (this-dir (file-name-directory
-                   (if load-file-name load-file-name buffer-file-name))))
-    (add-to-list 'load-path (expand-file-name "../../lisp" this-dir))
-    (require 'w32shell nil t)))
+  (when (> emacs-major-version 22)
+    (let* ((load-path load-path)
+           (this-file (or load-file-name
+                          (when (boundp 'bytecomp-filename) bytecomp-filename)
+                          buffer-file-name))
+           (this-dir (file-name-directory this-file)))
+      (add-to-list 'load-path (expand-file-name "../../lisp" this-dir))
+      (require 'w32shell nil t))))
 
 
-(require 'html-site)
+(eval-when-compile (require 'html-site))
 (require 'compile)
 
 (defgroup html-chklnk nil
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-imenu.el b/elpa-to-submit/nxhtml/nxhtml/html-imenu.el
index b26558f36c..98cccce783 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-imenu.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-imenu.el
@@ -38,6 +38,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'imenu))
+
 (defvar html-imenu-title "Index"
   "*Title of the menu which will be added to the menubar.")
 
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-move.el b/elpa-to-submit/nxhtml/nxhtml/html-move.el
index 0942f8c478..3a2c88fb63 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-move.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-move.el
@@ -55,7 +55,7 @@
 ;;; Code:
 
 (eval-when-compile (add-to-list 'load-path default-directory load-path))
-(require 'html-site)
+(eval-when-compile (require 'html-site))
 (require 'url-parse)
 
 (defun html-move-make-new-url (old-url from-dir to-dir)
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-pagetoc.el b/elpa-to-submit/nxhtml/nxhtml/html-pagetoc.el
index 73ad4282ff..43c8fd8a95 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-pagetoc.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-pagetoc.el
@@ -115,6 +115,7 @@ See `html-pagetoc-tocheads'."
           (setq header (cdr th))))
       header)))
 
+;;;###autoload
 (defun html-pagetoc-insert-toc (&optional min-level max-level)
   "Inserts a table of contents for the current html file.
 The html header tags h1-h6 found in the file are inserted into
@@ -285,6 +286,7 @@ the table of contents."
   (message "Please edit the style guide!")
   )
 
+;;;###autoload
 (defun html-pagetoc-rebuild-toc ()
   "Update the table of contents inserted by `html-pagetoc-insert-toc'."
   (interactive)
@@ -319,6 +321,7 @@ the table of contents."
 	      (delete-region start-toc end-toc)
 	      (html-pagetoc-insert-toc old-min old-max ))))))))
 
+;;;###autoload
 (defconst html-pagetoc-menu-map
   (let ((map (make-sparse-keymap)))
     (define-key map [html-pagetoc-rebuild-toc]
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-site.el b/elpa-to-submit/nxhtml/nxhtml/html-site.el
index e8540fadb8..2c37cd2048 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-site.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-site.el
@@ -52,8 +52,11 @@
 
 ;; TODO: maybe use browse-url-filename-alist
 
+(eval-when-compile (require 'ourcomments-util))
 (eval-when-compile (require 'cl))
-;;(eval-when-compile (load-library "cl-macs"))
+(eval-when-compile (require 'dired))
+(eval-when-compile (require 'ffip))
+(eval-when-compile (require 'grep))
 ;;(defvar html-site-list) ;; Silence compiler
 ;;(defvar html-site-current) ;; Silence compiler
 
@@ -209,9 +212,9 @@ See `rgrep' for the arguments REGEXP and FILES."
   (interactive
    (let ((parameters (dir-replace-read-parameters t t)))
      ;; Delete element 3
-     (length parameters)
+     ;;(length parameters)
      (setcdr (nthcdr 2 parameters) (nthcdr 4 parameters))
-     (length parameters)
+     ;;(length parameters)
      parameters))
   ;; fix-me: ask for site
   (when (called-interactively-p)
@@ -719,7 +722,9 @@ Use the entry with this name in `html-site-list'."
 
 ;; Provide here to be able to load the files in any order
 (provide 'html-site)
-(require 'html-upl nil t)
+
+(eval-when-compile (require 'html-upl nil t))
+
 (defvar html-site-mode-menu-map
   (let ((map (make-sparse-keymap "html-site-mode-menu-map")))
 
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-toc.el b/elpa-to-submit/nxhtml/nxhtml/html-toc.el
index 2c18840ebe..6a9db1a76d 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-toc.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-toc.el
@@ -52,9 +52,9 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (add-to-list 'load-path default-directory load-path))
-(require 'fupd)
+(eval-when-compile (require 'fupd))
 ;;(require 'html-move)
-(require 'html-site)
+(eval-when-compile (require 'html-site))
 ;;(require 'dom)
 (require 'xml)
 
@@ -341,6 +341,7 @@ You may also want to look at `html-wtoc-write-pages-with-toc'."
         (save-buffer))
       frames-file)))
 
+;;;###autoload
 (defconst html-toc-menu-map
   (let ((map (make-sparse-keymap)))
     (define-key map [html-toc-browse-frames-file]
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-upl.el b/elpa-to-submit/nxhtml/nxhtml/html-upl.el
index d0fc3daf74..47ef108b04 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-upl.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-upl.el
@@ -46,7 +46,7 @@
 ;;
 ;;; Code:
 (eval-when-compile (add-to-list 'load-path default-directory load-path))
-(require 'html-site)
+(eval-when-compile (require 'html-site))
 
 (defgroup html-upl nil
   "Customization group for html-upl."
@@ -89,9 +89,12 @@ The tools for html-upl includes:
                                      nil)))
     (browse-url url)))
 
+;;;###autoload
 (defun html-upl-upload-site-with-toc ()
   (interactive)
   (html-upl-upload-site1 t))
+
+;;;###autoload
 (defun html-upl-upload-site ()
   (interactive)
   (html-upl-upload-site1 nil))
@@ -139,6 +142,7 @@ The tools for html-upl includes:
     (unless (and host (< 0 (length host)))
       (error "Site %s has no ftp host defined" html-site-current))))
 
+;;;###autoload
 (defun html-upl-remote-dired (dirname)
   "Start dired for remote directory or its parent/ancestor."
   (interactive (list
@@ -187,6 +191,7 @@ The tools for html-upl includes:
       (when to-parent
         (message "Remote dir not found, showing ancestor %s" to-parent)))))
 
+;;;###autoload
 (defun html-upl-upload-file (filename)
   "Upload a single file in a site.
 For the definition of a site see `html-site-current'."
@@ -227,9 +232,12 @@ For the definition of a site see `html-site-current'."
       (message "Upload ready")
       )))
 
+;;;###autoload
 (defun html-upl-edit-remote-file ()
   (interactive)
   (html-upl-edit-remote-file1 nil))
+
+;;;###autoload
 (defun html-upl-edit-remote-file-with-toc ()
   (interactive)
   (html-upl-edit-remote-file1 t))
@@ -251,6 +259,7 @@ For the definition of a site see `html-site-current'."
          )
     (find-file remote-file)))
 
+;;;###autoload
 (defun html-upl-ediff-file (filename)
   "Run ediff on local and remote file.
 FILENAME could be either the remote or the local file."
diff --git a/elpa-to-submit/nxhtml/nxhtml/html-wtoc.el b/elpa-to-submit/nxhtml/nxhtml/html-wtoc.el
index 0bae4914c7..42472a6996 100644
--- a/elpa-to-submit/nxhtml/nxhtml/html-wtoc.el
+++ b/elpa-to-submit/nxhtml/nxhtml/html-wtoc.el
@@ -46,7 +46,7 @@
 ;;; Code:
 
 (eval-when-compile (add-to-list 'load-path default-directory load-path))
-(require 'html-toc)
+(eval-when-compile (require 'html-toc))
 
 (defgroup html-wtoc nil
   "Customization group for html-wtoc."
diff --git a/elpa-to-submit/nxhtml/nxhtml/inlimg.el b/elpa-to-submit/nxhtml/nxhtml/inlimg.el
deleted file mode 100644
index a6b1fba0c6..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/inlimg.el
+++ /dev/null
@@ -1,335 +0,0 @@
-;;; inlimg.el --- Display images inline
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-09-27
-(defconst inlimg:version "0.5") ;; Version:
-;; Last-Updated: 2008-09-27T13:26:46+0200 Sat
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Display images inline. By default it can handle image referenced in
-;; <img src="..." /> inline.
-;;
-;; See `inlimg-mode' and `inlimg-toggle-img-display'.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(defvar inlimg-img-regexp
-  (rx (or (and "<img"
-               (1+ space)
-               (0+ (1+ (not (any " <>")))
-                   (1+ space))
-               "src=\""
-               (group (1+ (not (any "\""))))
-               "\""
-               (*? anything)
-               "/>")
-          (and "url("
-               ?\"
-               (group (1+ (not (any "\""))))
-               ?\"
-               ")"
-               )
-          )))
-
-(defgroup inlimg nil
-  "Customization group for inlimg."
-  :group 'nxhtml)
-
-(defcustom inlimg-margins '(50 . 5)
-  "Margins when displaying image."
-  :type '(cons (integer :tag "Left margin")
-               (integer :tag "Top margin"))
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when (fboundp 'inlimg-update-all-buffers)
-           (inlimg-update-all-buffers)))
-  :group 'inlimg)
-
-(defcustom inlimg-slice '(0 0 400 100)
-  "How to slice images."
-  :type '(choice (const :tag "Show whole images" nil)
-                 (list :tag "Show slice of image"
-                       (integer :tag "Top")
-                       (integer :tag "Left")
-                       (integer :tag "Width")
-                       (integer :tag "Height")))
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when (fboundp 'inlimg-update-all-buffers)
-           (inlimg-update-all-buffers)))
-  :group 'inlimg)
-
-(defface inlimg-img-tag '((t :inherit 'lazy-highlight))
-  "Face added to img tag when displaying image."
-  :group 'inlimg)
-
-(defface inlimg-img-remote '((t :inherit 'isearch-fail))
-  "Face used for notes telling image is remote."
-  :group 'inlimg)
-
-(defface inlimg-img-missing '((t :inherit 'trailing-whitespace))
-  "Face used for notes telling image is missing."
-  :group 'inlimg)
-
-(defun inlimg-next (pt display-image)
-  "Display or hide next image after point PT.
-If DISPLAY-IMAGE is non-nil then display image, otherwise hide it.
-
-Return non-nil if an img tag was found."
-  (let (src beg end end-str img ovl remote beg-face)
-    (goto-char pt)
-    (when (setq res (re-search-forward inlimg-img-regexp nil t))
-      (setq src (or (match-string-no-properties 1)
-                    (match-string-no-properties 2)))
-      (setq beg (match-beginning 0))
-      (setq end (match-end 0))
-      (setq end-str (buffer-substring-no-properties (- end 2) end))
-      (setq beg-face (get-text-property beg 'face))
-      (setq remote (string-match "^https?://" src))
-      (if display-image
-          (unless (memq beg-face '(font-lock-comment-face font-lock-string-face))
-            (setq ovl (make-overlay beg end))
-            (overlay-put ovl 'inlimg-img t)
-            (overlay-put ovl 'priority 100)
-            (overlay-put ovl 'face 'inlimg-img-tag)
-            (overlay-put ovl 'keymap inlimg-img-keymap)
-            (overlay-put ovl 'image-file (expand-file-name src))
-            (if (or remote (not (file-exists-p src)))
-                (mumamo-with-buffer-prepared-for-jit-lock
-                 (put-text-property (- end 2) (- end 1)
-                                    'display
-                                    end-str ;;"/>"
-                                    )
-                 (put-text-property (- end 1) end
-                                    'display
-                                    (propertize (if remote
-                                                    " Image is on the web "
-                                                  " Image not found ")
-                                                'face
-                                                (if remote
-                                                    'inlimg-img-remote
-                                                  ;;'custom-invalid
-                                                  ;;'match
-                                                  'inlimg-img-missing))))
-              ;; Get src value before macro since buffer-file-name is nil inside.
-              (setq src (expand-file-name
-                         src
-                         (file-name-directory (buffer-file-name))))
-              (mumamo-with-buffer-prepared-for-jit-lock
-               (put-text-property (- end 2) (- end 1)
-                                  'display
-                                  ;;"/>\n"
-                                  (concat end-str "\n")
-                                  )
-               (setq img (create-image src nil nil
-                                       :relief 5
-                                       :margin inlimg-margins))
-               (when inlimg-slice
-                 (let* ((sizes (image-size img t))
-                        (width  (car sizes))
-                        (height (cdr sizes))
-                        (sl-left (nth 0 inlimg-slice))
-                        (sl-top (nth 1 inlimg-slice))
-                        (sl-width (nth 2 inlimg-slice))
-                        (sl-height (nth 3 inlimg-slice))
-                        )
-                   (when (> sl-left width) (setq sl-left 0))
-                   (when (> (+ sl-left sl-width) width)
-                     (setq sl-width (- width sl-left)))
-                   (when (> sl-top height) (setq sl-top 0))
-                   (when (> (+ sl-top sl-height) height)
-                     (setq sl-height (- height sl-top)))
-                   (setq img (list img))
-                   (setq img (cons
-                              (append '(slice)
-                                      inlimg-slice
-                                      (list sl-top sl-left sl-width sl-height)
-                                      nil)
-                              img))))
-               (put-text-property (- end 1) end
-                                  'display img))))
-        (mumamo-with-buffer-prepared-for-jit-lock
-         (put-text-property (- end 2) end
-                            'display nil)))
-      (mumamo-with-buffer-prepared-for-jit-lock
-       (put-text-property (- end 2) end
-                          'inlimg-display display-image)))
-    res))
-
-(defvar inlimg-img-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [(control ?c) ?+] 'inlimg-toggle-img-display)
-    map))
-
-(eval-after-load 'gimp
-  '(gimp-add-point-bindings inlimg-img-keymap))
-
-(defvar inlimg-timer nil)
-(make-variable-buffer-local 'inlimg-timer)
-(put 'inlimg-timer 'permanent-local t)
-
-(defun inlimg-cancel-timer ()
-  "Cancel timer for displaying/hiding images."
-  (when inlimg-timer
-    (cancel-timer inlimg-timer)
-    (setq inlimg-timer nil)))
-
-(defun inlimg-request-update (start end)
-  "Request update of images display between START and END."
-  (inlimg-cancel-timer)
-  (setq inlimg-timer
-        (run-with-idle-timer idle-update-delay
-                             nil
-                             'inlimg-update-in-timer
-                             start
-                             end
-                             (current-buffer))))
-
-(defun inlimg-update-in-timer (start end buffer)
-  "Update image display between START and END in buffer BUFFER."
-  (with-current-buffer buffer
-    (let ((here (point))
-          res
-          ovls
-          prop-pos1
-          prop-pos2)
-      (save-restriction
-        (widen)
-        (goto-char start)
-        (setq ovls (overlays-in start end))
-        (dolist (ovl ovls)
-          (when (overlay-get ovl 'inlimg-img)
-            (delete-overlay ovl)))
-        (goto-char start)
-        (setq prop-pos1 start)
-        (mumamo-with-buffer-prepared-for-jit-lock
-         (while (setq prop-pos1
-                      (next-single-property-change prop-pos1 'inlimg-display))
-           (put-text-property prop-pos1 (+ 2 prop-pos1) 'inlimg-display nil)
-           (put-text-property prop-pos1 (+ 2 prop-pos1) 'display nil)))
-        (goto-char start)
-        (setq res (save-match-data
-                    (inlimg-next (point) inlimg-mode))))
-      (when (and res
-                 (< res end))
-        (inlimg-request-update res end))
-      (goto-char here))))
-
-(defun inlimg-after-change (beg end pre-len)
-  "Actions to take after a change in buffer.
-This is put in `after-change-functions'.  For BEG, END and
-PRE-LEN see that function."
-  (let ((here (point)))
-    (goto-char beg)
-    (setq beg (line-beginning-position -2))
-    (goto-char end)
-    (setq end (line-end-position 3))
-    (inlimg-request-update beg end)))
-
-(defun inlimg-update-whole-buffer ()
-  "Request update of image display in the current buffer."
-  (save-restriction
-    (widen)
-    (inlimg-request-update (point-min) (point-max))))
-
-(defun inlimg-update-all-buffers ()
-  "Request update of image display in all buffers.
-Update image display in all buffers where the option
-`inlimg-mode' is on."
-  (dolist (buff (buffer-list))
-    (with-current-buffer buff
-      (when inlimg-mode
-        (inlimg-update-whole-buffer)))))
-
-;;;###autoload
-(define-minor-mode inlimg-mode
-  "Display <img ...> images inline.
-Images are displayed below the <img ...> tag using the margins in
-`inlimg-margins'.  The whole image or a slice of it may be
-displayed, see `inlimg-slice'.
-
-See also the command `inlimg-toggle-img-display'."
-  :keymap nil
-  :group 'inlimg
-  (if inlimg-mode
-      (add-hook 'after-change-functions 'inlimg-after-change nil t)
-    (remove-hook 'after-change-functions 'inlimg-after-change t))
-  (inlimg-cancel-timer)
-  (inlimg-update-whole-buffer))
-(put 'inlimg-mode 'permanent-local t)
-
-;;;###autoload
-(defun inlimg-toggle-img-display (point)
-  "Toggle display of img image at point POINT.
-See also the command `inlimg-mode'."
-  (interactive (list (point)))
-  (save-match-data
-    (let ((here (point))
-          img-start
-          img-end
-          (ovls (overlays-at (point)))
-          iovl
-          )
-      (dolist (ovl ovls)
-        (when (overlay-get ovl 'inlimg-img)
-          (setq iovl ovl)))
-      (if iovl
-          (progn
-            (setq img-start (overlay-start iovl))
-            (setq img-end (- (overlay-end iovl) 2)))
-        (skip-chars-backward "^<")
-        (unless (and (> (point) (point-min))
-                     (= ?\< (char-before))
-                     (progn
-                       (backward-char)
-                       (looking-at inlimg-img-regexp)))
-          (goto-char here)
-          (error "No image here"))
-        (setq img-start (point))
-        (setq img-end (- (match-end 0) 2)))
-      (setq is-displayed (get-text-property img-end 'inlimg-display))
-      (inlimg-next img-start (not is-displayed))
-      (when (and iovl
-                 (not inlimg-mode)
-                 is-displayed)
-        (delete-overlay iovl))
-      (goto-char here))))
-
-
-(provide 'inlimg)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; inlimg.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-autoload.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml-autoload.el
index 9d840c4c2f..6cd46294ec 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-autoload.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml-autoload.el
@@ -45,123 +45,45 @@
 ;;
 ;;; Code:
 
-;;(require 'ourcomments-util)
-
-(unless (featurep 'nxml-enc)
-  ;; This is for the case when nXml is included in Emacs
-  (require 'nxml-mode))
-
-(if (not (or (featurep 'nxml-enc) ;; nXml not in Emacs
-             (featurep 'nxml-mode))) ;; nXml in Emacs
-    (progn
-      (lwarn
-       '(nxhtml-autoload)
-       :emergency
-       (concat
-        "\n\n\nERROR: nxml not loaded!\n\n"
-        "    Please load nxml before loading nxhtml!\n"
-        "    Load nxml by loading rng-auto.el in the nxml distribution.\n\n\n\n"))
-      (sit-for 10))
-
-  (add-to-list 'load-path
-               (file-name-directory
-                (if load-file-name load-file-name buffer-file-name)))
-
-  ;;(autoload 'nxhtml-report-bug "nxhtml-bug" "Report a bug in nXhtml." t)
-  ;;(autoload 'nxhtml-mode "nxhtml" "Major mode for editing XHTML documents." t)
-  ;;(autoload 'nxhtml-global-minor-mode "nxhtml-menu" "Toggle `nxhtml-minor-mode' in every buffer." t)
-  ;;(autoload 'gimp-edit-buffer "gimp" "Edit image file in current buffer with GIMP." t)
-  ;;(autoload 'gimp-edit-file "gimp" "Edit file with GIMP." t)
-  ;; Testing
-  (let* ((this-dir (file-name-directory (if load-file-name load-file-name buffer-file-name)))
-         (test-q-file (expand-file-name "../tests/nxhtmltest-Q.el" this-dir))
-         (test-file (expand-file-name "../tests/nxhtmltest-suites.el" this-dir)))
-    ;;(autoload 'nxhtmltest-run-Q      test-q-file "Run all tests defined for nXhtml in fresh Emacs." t)
-    ;;(autoload 'nxhtmltest-run        test-file   "Run all tests defined for nXhtml." t)
-    ;;(autoload 'nxhtmltest-run-indent test-file   "Run all indentation tests defined for nXhtml." t)
-    )
-
-  ;;   (require 'fmode)
-  ;;   (fmode-replace-default-mode 'html-mode 'nxhtml-mode)
-  ;;   (fmode-replace-default-mode 'xml-mode 'nxml-mode)
-
-  ;; Replaced all the major mode file stuff here with majmodpri and
-  ;; just adding to auto-mode-alist etc:
-  ;;(require 'majmodpri)
-
-  ;; Add entries similar to those that are already there for html-mode
-  ;; and xml-mode.
-  (dolist (mode-list '(auto-mode-alist magic-fallback-mode-alist))
-    (dolist (rec (symbol-value mode-list))
-      (when (eq (cdr rec) 'html-mode)
-        (add-to-list mode-list (cons (car rec) 'nxhtml-mode)))
-      (when (eq (cdr rec) 'html-mode)
-        (add-to-list mode-list (cons (car rec) 'nxhtml-mumamo-mode)))
-      (when (eq (cdr rec) 'html-mode)
-        (add-to-list mode-list (cons (car rec) 'html-mumamo-mode)))
-      (when (eq (cdr rec) 'xml-mode)
-        (add-to-list mode-list (cons (car rec) 'nxml-mode)))
-      ))
-
-  ;;(require 'html-site)
-  ;;(require 'nxhtml-menu)
-
-  ;;; Change below if you need to:
-  ;;(autoload 'rnc-mode "rnc-mode" "Major mode for editing RELAX NG" t)
-  ;;(autoload 'css-mode "css-mode" "Mode for editing css files" t)
-  ;;(autoload 'javascript-mode "javascript" "Mode for JavaScript" t)
-  ;;(autoload 'js2-fl-mode "js2-font-lock-new" "Mode for JavaScript" t)
-  ;;(autoload 'php-mode "php-mode" "Mode for editing php files" t)
-  ;;(autoload 'smarty-mode "smarty-mode" "Mode for editing php smarty files" t)
-  ;;(autoload 'csharp-mode "csharp-mode" "Mode for editing C# code" t)
-  ;;(autoload 'django-mode "django" "Simple Django mode for use with mumamo." t)
-  (eval-after-load 'nxml-mode
-    '(progn
-      (define-key nxml-mode-map [C-M-left]  'nxml-backward-element)
-      (define-key nxml-mode-map [C-M-right] 'nxml-forward-element)
-      (define-key nxml-mode-map [C-M-up]    'nxml-backward-up-element)
-      (define-key nxml-mode-map [C-M-down]  'nxml-down-element)))
-
-  ;; MozLab support, for more info see moz.el
-  ;;(autoload 'inferior-moz-mode "moz" "MozRepl Inferior Mode" t)
-  ;;(autoload 'moz-minor-mode "moz" "MozRepl Minor Mode" t)
-  (defun javascript-moz-setup () (moz-minor-mode 1))
-  (add-hook 'javascript-mode-hook 'javascript-moz-setup)
-  (add-hook 'js2-fl-mode          'javascript-moz-setup)
-
-  ;; Development versions support
-  ;;(autoload 'udev-rinari-update "udev-rinari" "Fetch and install rinari from the devel sources." t)
-  ;;(autoload 'udev-cedet-update "udev-cedet" "Fetch and install CEDET from the devel sources." t)
-  ;;(autoload 'udev-ecb-update "udev-ecb" "Fetch and install ECB from the devel sources." t)
-
-  ;;(require 'mumamo-fun)
-  ;;(require 'nxhtml-mumamo)
-  ;;(require 'as-external)
-  )
-
-;; (setq magic-mode-alist nil)
-;; (defcustom nxhtml-magic-mode-alist
-;;   '(
-
+(message "nxhtml-autoload starting ... (hm, should maybe be renamed ...)")
+
+(eval-when-compile (require 'majmodpri))
+(eval-when-compile (require 'moz))
+
+;;; Convenient moving by tags:
+(eval-after-load 'nxml-mode
+  '(progn
+     (define-key nxml-mode-map [C-M-left]  'nxml-backward-element)
+     (define-key nxml-mode-map [C-M-right] 'nxml-forward-element)
+     (define-key nxml-mode-map [C-M-up]    'nxml-backward-up-element)
+     (define-key nxml-mode-map [C-M-down]  'nxml-down-element)))
+
+;; MozLab support, for more info see moz.el
+;;(autoload 'inferior-moz-mode "moz" "MozRepl Inferior Mode" t)
+;;(autoload 'moz-minor-mode "moz" "MozRepl Minor Mode" t)
+(defun javascript-moz-setup () (moz-minor-mode 1))
+(add-hook 'javascript-mode-hook 'javascript-moz-setup)
+;;(add-hook 'js2-fl-mode-hook     'javascript-moz-setup)
+
+
+;; Add nXhtml entries similar to those that are already there for
+;; html-mode and xml-mode.
+(dolist (mode-list '(auto-mode-alist magic-fallback-mode-alist magic-mode-alist))
+  (dolist (rec (symbol-value mode-list))
+    (when (eq (cdr rec) 'html-mode)
+      (add-to-list mode-list (cons (car rec) 'nxhtml-mode)))
+    (when (eq (cdr rec) 'html-mode)
+      (add-to-list mode-list (cons (car rec) 'nxhtml-mumamo-mode)))
+    ;; (when (eq (cdr rec) 'html-mode)
+    ;;   (add-to-list mode-list (cons (car rec) 'html-mumamo-mode)))
+    (when (eq (cdr rec) 'xml-mode)
+      (add-to-list mode-list (cons (car rec) 'nxml-mode)))
+    ))
+
+;; Add multi major mode entries.
 (add-to-list 'magic-mode-alist
              '("\\(?:.\\|\n\\)\\{,200\\}xmlns:py=\"http://genshi.edgewall.org/\""
                . genshi-nxhtml-mumamo-mode))
-;;;     )
-;;;   "List to add to `magic-mode-alist'.
-;;; Works similar to `nxhtml-auto-mode-alist'.  Note that
-;;; `magic-mode-alist' is the first thing tried when choosing a major
-;;; mode."
-;;;   :type '(repeat (cons :tag "Enter file name pattern and major mode"
-;;;                        (regexp :tag "Regexp for file name")
-;;;                        (major-mode-function :tag "Major mode")))
-;;;   :set (lambda (sym val)
-;;;          (set-default sym val)
-;;;          (dolist (v val)
-;;;            (add-to-list 'magic-mode-alist v)))
-;;;   :group 'nxhtml)
-
-;; (defcustom nxhtml-auto-mode-alist
-;;   '(
 (add-to-list 'auto-mode-alist '("\\.htm\\'"      . nxhtml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.html\\'"     . nxhtml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.xhtm\\'"     . nxhtml-mumamo-mode))
@@ -179,50 +101,34 @@
 (add-to-list 'auto-mode-alist '("\\.erb\\'"      . eruby-nxhtml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.phps\\'"     . smarty-nxhtml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.epl\\'"      . embperl-nxhtml-mumamo-mode))
-(add-to-list 'auto-mode-alist '("\\.lzx\\'"       . laszlo-nxml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.ghtml\\'"     . genshi-nxhtml-mumamo-mode))
+
+;; Add html-mumamo style entry if there is an nxhtml-mumamo style entry.
+(save-match-data
+  (dolist (mode-list '(auto-mode-alist magic-fallback-mode-alist magic-mode-alist))
+    (dolist (rec (symbol-value mode-list))
+      (let* ((mode (cdr rec))
+             (name (when (symbolp mode) (symbol-name mode)))
+             nxmode)
+        (when (and name
+                   (string-match "nxhtml-mumamo" name))
+          (setq name (replace-regexp-in-string "nxhtml-mumamo" "html-mumamo" name t t))
+          (setq nxmode (intern-soft name))
+          (when nxmode
+            (add-to-list mode-list (cons (car rec) nxmode))))))))
+
+(add-to-list 'auto-mode-alist '("\\.lzx\\'"       . laszlo-nxml-mumamo-mode))
 (add-to-list 'auto-mode-alist '("\\.js\\'"       . javascript-mode))
 (add-to-list 'auto-mode-alist '("\\.css\\'"      . css-mode))
 (add-to-list 'auto-mode-alist '("\\.rnc\\'"      . rnc-mode))
-;;;     )
-;;;   "List to add to `auto-mode-alist'.
-;;; This list is added to `auto-mode-alist' when loading
-;;; nxhtml-autostart.el and will therefore help Emacs to determine
-;;; which major mode a file will be opened in.
-
-;;; Please notice that `mumamo-mode' may override this choice of
-;;; major mode when setting the chunk family.  The chunk family then
-;;; determines the major mode.  The chunk family is set from
-;;; `mumamo-filenames-list'.  You may want to synch the two list, but
-;;; it is not necessary.  However not synching may perhaps lead to
-;;; surpricing results.  To synch the lists means that the mode in
-;;; this list should correspond to the main major mode in the mumamo
-;;; chunk family.
-
-;;; * Note: This variable (nxhtml-auto-mode-alist) is just for your
-;;;   convenience.  Probably most users normally just adds to
-;;;   `auto-mode-alist' in their .emacs with lines like
-
-;;;     \(add-to-list 'auto-mode-alist '(\"\\.x?html?\\'\"  . nxhtml-mode))
-
-;;;   but doing something like that here would make it impossible to
-;;;   customize that easily for you."
-;;;   ;;:type '(alist :key-type regexp :tag "hej" :value-type major-mode-function)
-;;;   :type '(repeat (cons :tag "Enter file name pattern and major mode"
-;;;                        (regexp :tag "Regexp for file name")
-;;;                        (major-mode-function :tag "Major mode")))
-;;;                        ;;(command :tag "Major mode")))
-;;;   :set (lambda (sym val)
-;;;          (set-default sym val)
-;;;          (dolist (v val)
-;;;            (add-to-list 'auto-mode-alist v)))
-;;;   :group 'nxhtml)
 
 (majmodpri-sort-lists)
 
 (defvar nxhtml-src-dir (file-name-directory
                         (if load-file-name load-file-name buffer-file-name)))
 
-(provide `nxhtml-autoload)
+(message "nxhtml-autoload finished")
+
+(provide 'nxhtml-autoload)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; nxhtml-autoload.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-bug.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml-bug.el
index a1820294e2..c415332fb4 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-bug.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml-bug.el
@@ -44,6 +44,8 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'nxhtml-menu))
+
 (require 'sendmail)
 
 ;;(require 'emacsbug)
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-menu.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml-menu.el
index c57568cafc..7cf6a01002 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-menu.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml-menu.el
@@ -1,1121 +1,1390 @@
-;;; nxhtml-menu.el --- Defines menus for nXhtml
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: Sat Apr 21 13:49:41 2007
-(defconst nxhtml-menu:version "1.61") ;;Version:
-;; Last-Updated: 2008-08-26T23:28:00+0200 Tue
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   `compile', `flymake', `flymake-js', `flymake-php', `hexcolor',
-;;   `tool-bar', `xhtml-help'.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Menus for nXhtml to be used in different major modes.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(require 'hexcolor)
-(require 'flymake)
-(require 'flymake-php)
-(require 'flymake-js)
-
-(defun nxhtml-nxhtml-in-buffer ()
-  ;;(message "nxhtml-nxhtml-in-buffer ()")
-  (or (derived-mode-p 'nxhtml-mode)
-      (when (and (boundp 'mumamo-multi-major-mode)
-                 mumamo-multi-major-mode)
-        (let ((major-mode (mumamo-main-major-mode)))
-          (derived-mode-p 'nxhtml-mode)))))
-
-(defun nxhtml-nxml-in-buffer ()
-  ;;(message "nxhtml-nxml-in-buffer ()")
-  (or (derived-mode-p 'nxml-mode)
-      (when (and (boundp 'mumamo-multi-major-mode)
-                 mumamo-multi-major-mode)
-        (let ((major-mode (mumamo-main-major-mode)))
-          (derived-mode-p 'nxml-mode)))))
-
-(defun nxhtml-html-in-buffer ()
-  ;;(message "nxhtml-html-in-buffer ()")
-  (or (derived-mode-p 'html-mode)
-      (when (and (boundp 'mumamo-multi-major-mode)
-                 mumamo-multi-major-mode)
-        (let ((major-mode (mumamo-main-major-mode)))
-          (derived-mode-p 'html-mode)))
-      (nxhtml-nxhtml-in-buffer)))
-
-(defun nxhtml-nxml-html-in-buffer ()
-  ;;(message "nxhtml-nxml-html-in-buffer")
-  (or (derived-mode-p 'html-mode)
-      (when (and (boundp 'mumamo-multi-major-mode)
-                 mumamo-multi-major-mode)
-        (let ((major-mode (mumamo-main-major-mode)))
-          (derived-mode-p 'html-mode)))
-      (nxhtml-nxml-in-buffer)))
-
-(defun nxhtml-this-file-can-have-toc (&optional file)
-  (unless file
-    (setq file (html-site-buffer-or-dired-file-name)))
-  (and (nxhtml-buffer-possibly-local-viewable file)
-       (html-site-current-merge-dir)
-       (html-site-current-ensure-file-in-site file)))
-
-(defun nxhtml-buffer-possibly-local-viewable (&optional file)
-  ;;(message "nxhtml-buffer-possibly-local-viewable ()")
-  (unless file
-    (setq file (html-site-buffer-or-dired-file-name)))
-  (or (and file
-           (member (file-name-extension file)
-                   '("html" "htm" "gif" "png")))))
-
-(defun nxhtml-buffer-possibly-remote-viewable ()
-  ;;(message "nxhtml-buffer-possibly-remote-viewable ()")
-  ;; Fix-me
-  (let* ((fmt "nxhtml-buffer-possibly-remote-viewable.dgffv: %s")
-         (file (or buffer-file-name
-                   (and (derived-mode-p 'dired-mode)
-                        (condition-case err
-                            (dired-get-file-for-visit)
-                          (error
-                           (message fmt (error-message-string err))
-                           nil))))))
-    (and (featurep 'html-upl)
-         file
-         (member (downcase (file-name-extension file))
-                 '("html" "htm" "gif" "png" "pl" "php")))))
-
-(defun nxhtml-insert-menu-dynamically (real-binding)
-  ;;(message "nxhtml-insert-menu-dynamically (%s)" real-binding)
-  (when (and (symbolp real-binding)
-             (boundp real-binding))
-    (symbol-value real-binding)))
-
-(defun nxhtml-menu-image-file ()
-  (or (get-char-property (point) 'image-file)
-      buffer-file-name))
-
-(defun nxhtml-gimp-can-edit ()
-  (gimp-can-edit (nxhtml-menu-image-file)))
-
-(defun nxhtml-edit-with-gimp ()
-  "Edit with GIMP buffer or file at point."
-  (interactive)
-  (gimp-edit-file (nxhtml-menu-image-file)))
-
-(defconst nxhtml-minor-mode-menu-map
-  (let ((map (make-sparse-keymap "nxhtml-minor-mode-menu")))
-
-    (let ((help-map (make-sparse-keymap)))
-      (define-key help-map [emacs-Q-nxhtml]
-        (list 'menu-item "Start 'emacs -Q' and load nXhtml" 'emacs-Q-nxhtml))
-      (define-key help-map [nxhtmltest-run]
-        (list 'menu-item "Run nXhtml Tests in Current Emacs" 'nxhtmltest-run))
-      (define-key help-map [nxhtmltest-run-Q]
-        (list 'menu-item "Run nXhtml Tests in a Fresh Emacs" 'nxhtmltest-run-Q))
-      (define-key help-map [nxhtml-report-bug]
-        (list 'menu-item "Report a Bug in nXhtml ..." 'nxhtml-report-bug))
-      (define-key help-map [nxhtml-help-separator2] (list 'menu-item "--"))
-      (define-key help-map [nxhtml-features-check]
-        (list 'menu-item "Check Optional Features" 'nxhtml-features-check))
-      (define-key help-map [nxhtml-customize]
-        (list 'menu-item "Customize nXhtml ..." 'nxhtml-customize))
-;;;       (define-key help-map [nxhtml-quick-customize]
-;;;         (list 'menu-item "Quick Customize nXhtml ..." 'nxhtml-quick-customize))
-      (define-key help-map [nxhtml-help-separator3] (list 'menu-item "--"))
-;;;       (define-key help-map [nxhtml-help]
-;;;         (list 'menu-item "nXhtml Help" 'nxhtml-help))
-      (define-key help-map [nxhtml-tutorials]
-        (list 'menu-item "nXhtml Tutorials" 'nxhtml-tutorials))
-      (define-key help-map [nxhtml-overview]
-        (list 'menu-item (concat "nXhtml Version " nxhtml-menu:version " Overview") 'nxhtml-overview))
-      (define-key help-map [nxhtml-welcome]
-        (list 'menu-item "Welcome to nXhtml" 'nxhtml-welcome))
-      (define-key map [nxhtml-help-map]
-        (list 'menu-item "nXhtml Help and Setup" help-map))
-      (define-key map [nxhtml-info-separator] (list 'menu-item "--"))
-      )
-
-
-
-
-    (let ((tools-map (make-sparse-keymap)))
-      (define-key map [nxhtml-tools-map]
-        (list 'menu-item "Tools" tools-map
-              :visible `(not (derived-mode-p 'dired-mode))
-              ))
-      (let ((fill-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-filling]
-          (list 'menu-item "Writing Text" fill-map))
-        (define-key fill-map [nxhtml-unfill-paragraph]
-          (list 'menu-item "Unfill Paragraph" 'unfill-paragraph))
-        (define-key fill-map [nxhtml-fill-paragraph]
-          (list 'menu-item "Fill Paragraph" 'fill-paragraph))
-        (define-key fill-map [nxhtml-wrap-to-fill-separator]
-          (list 'menu-item "--" nil))
-        (define-key fill-map [nxhtml-html-write-mode]
-          (list 'menu-item "HTML Write Mode"
-                'html-write-mode
-                :button '(:toggle . (and (boundp 'html-write-mode)
-                                         html-write-mode))))
-        (define-key fill-map [nxhtml-wrap-to-fill-column-mode]
-          (list 'menu-item "Wrap To Fill Column Mode"
-                'wrap-to-fill-column-mode
-                :button '(:toggle . wrap-to-fill-column-mode)))
-        )
-      (define-key tools-map [nxhtml-ecb-separator]
-        (list 'menu-item "--" nil))
-      (let ((ecb-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-ecb-map]
-          (list 'menu-item "ECB" ecb-map))
-        (define-key ecb-map [nxhtml-rinari-homepage]
-          (list 'menu-item "ECB Home Page"
-                (lambda ()
-                  "Open ECB home page in your web browser."
-                  (interactive)
-                  (browse-url "http://ecb.sourceforge.net/"))))
-        (define-key ecb-map [nxhtml-ecb-home-separator]
-          (list 'menu-item "--" nil))
-        (define-key ecb-map [nxhtml-update-ecb]
-          (list 'menu-item "Fetch/update ECB dev sources"
-                'udev-ecb-update))
-        (define-key ecb-map [nxhtml-custom-ecb]
-          (list 'menu-item "Customize ECB dev startup"
-                (lambda () (interactive)
-                  (require 'udev-ecb)
-                  (customize-group-other-window 'udev-ecb))))
-        (define-key ecb-map [nxhtml-custom-important-ecb]
-          (list 'menu-item "Customize important ECB things"
-                (lambda () (interactive)
-                  (customize-group-other-window 'ecb-most-important))
-                :enable (featurep 'ecb)))
-        )
-      ;;(define-key tools-map [nxhtml-cedet-separator] (list 'menu-item "--" nil))
-      (let ((cedet-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-cedet-map]
-          (list 'menu-item "CEDET" cedet-map))
-        (define-key cedet-map [nxhtml-rinari-homepage]
-          (list 'menu-item "CEDET Home Page"
-                (lambda ()
-                  "Open CEDET home page in your web browser."
-                  (interactive)
-                  (browse-url "http://cedet.sourceforge.net/"))))
-        (define-key cedet-map [nxhtml-cedet-home-separator]
-          (list 'menu-item "--" nil))
-        (define-key cedet-map [nxhtml-update-cedet]
-          (list 'menu-item "Fetch/update CEDET dev sources"
-                'udev-cedet-update))
-        (define-key cedet-map [nxhtml-custom-cedet]
-          (list 'menu-item "Customize CEDET dev startup"
-                (lambda () (interactive)
-                  (require 'udev-cedet)
-                  (customize-group-other-window 'udev-cedet))))
-        )
-      (let ((rinari-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-rinari-map]
-          (list 'menu-item "Rinari" rinari-map))
-        (define-key rinari-map [nxhtml-rinari-homepage]
-          (list 'menu-item "Rinari Home Page"
-                (lambda ()
-                  "Open Rinari home page in your web browser."
-                  (interactive)
-                  (browse-url "http://rubyforge.org/projects/rinari/"))))
-        (define-key rinari-map [nxhtml-rinari-home-separator]
-          (list 'menu-item "--" nil))
-        (define-key rinari-map [nxhtml-update-rinari]
-          (list 'menu-item "Fetch/update Rinari dev sources"
-                'udev-rinari-update))
-        (define-key rinari-map [nxhtml-custom-rinari]
-          (list 'menu-item "Customize Rinari startup"
-                (lambda () (interactive)
-                  (require 'udev-rinari)
-                  (customize-group-other-window 'udev-rinari))))
-        )
-      (let ((mozrepl-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-mozrepl-map]
-          (list 'menu-item "MozRepl for Javascript" mozrepl-map
-              ))
-        (define-key mozrepl-map [nxhtml-mozrepl-home-page]
-          (list 'menu-item "MozLab/MozRepl Home Page"
-                (lambda ()
-                  "Open MozLab/MozRepl home page in your web browser."
-                  (interactive)
-                  (browse-url "http://hyperstruct.net/projects/mozlab"))))
-        (define-key mozrepl-map [nxhtml-mozrepl-separator2]
-          (list 'menu-item "--" nil))
-        (define-key mozrepl-map [nxhtml-mozrepl-run-mozilla]
-          (list 'menu-item "Display/Start MozRepl Process" 'run-mozilla
-              :enable '(and (boundp 'moz-minor-mode) moz-minor-mode)))
-        (define-key mozrepl-map [nxhtml-mozrepl-separator1]
-          (list 'menu-item "--" nil))
-        (define-key mozrepl-map [nxhtml-mozrepl-save-and-send]
-          (list 'menu-item "Save Buffer and Send it" 'moz-save-buffer-and-send
-                :enable '(or (not (boundp 'mumamo-multi-major-mode))
-                             (not mumamo-multi-major-mode))))
-
-
-
-        (define-key mozrepl-map [nxhtml-mozrepl-send-defun-and-go]
-          (list 'menu-item "Send Current Function, Go to MozRepl"
-                'moz-send-defun-and-go
-                :enable '(and (boundp 'moz-minor-mode) moz-minor-mode)))
-        (define-key mozrepl-map [nxhtml-mozrepl-send-defun]
-          (list 'menu-item "Send Current Function" 'moz-send-defun
-                :enable '(and (boundp 'moz-minor-mode) moz-minor-mode)))
-        (define-key mozrepl-map [nxhtml-mozrepl-send-region]
-          (list 'menu-item "Send the Region" 'moz-send-region
-                :enable '(and mark-active
-                              (boundp 'moz-minor-mode) moz-minor-mode)))
-        )
-      (define-key tools-map [nxhtml-majpri-separator]
-        (list 'menu-item "--" nil))
-      (let ((majpri-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-majpri-map]
-          (list 'menu-item "Major Modes Priorities" majpri-map))
-        (define-key majpri-map [nxhtml-majpri-act]
-          (list 'menu-item "Apply Major Modes Priorities"
-                'majmodpri-apply-priorities))
-        (define-key majpri-map [nxhtml-majpri-cust]
-          (list 'menu-item "Customize Major Mode Priorities"
-                (lambda () (interactive)
-                  (customize-group-other-window 'majmodpri))))
-        )
-      (define-key tools-map [nxhtml-tidy-separator]
-        (list 'menu-item "--" nil))
-      (define-key tools-map [nxhtml-tidy-map]
-        (list 'menu-item "Tidy XHTML" 'tidy-menu-symbol
-              :filter 'nxhtml-insert-menu-dynamically
-              :visible '(featurep 'tidy-xhtml)
-              :enable '(and (featurep 'tidy-xhtml)
-                            (or (derived-mode-p 'html-mode)
-                                (nxhtml-nxhtml-in-buffer)))))
-      (define-key tools-map [nxhtml-flymake]
-        (list 'menu-item "Flymake Mode" 'flymake-mode
-              :button '(:toggle . flymake-mode)
-              :enable '(and buffer-file-name
-                            (flymake-get-init-function buffer-file-name)
-                            )))
-      (let ((flyspell-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-flyspell-map]
-          (list 'menu-item "Flyspell" flyspell-map))
-        (define-key flyspell-map [nxhtml-flyspell-goto-next]
-          (list 'menu-item "Flyspell Go To Next Error" 'flyspell-goto-next-error
-                :enable 'flyspell-mode))
-        (define-key flyspell-map [nxhtml-flyspell-region]
-          (list 'menu-item "Flyspell Region" 'flyspell-region
-                :enable 'flyspell-mode))
-        (define-key flyspell-map [nxhtml-flyspell-div-1]
-          (list 'menu-item "--"))
-        (define-key flyspell-map [nxhtml-flyspell]
-          (list 'menu-item "Flyspell Mode" 'flyspell-mode
-                :button '(:toggle . flyspell-mode)))
-        )
-      (define-key tools-map [nxhtml-flyspell-separator]
-        (list 'menu-item "--"))
-      (let ((img-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-img-map]
-          (list 'menu-item "Images" img-map))
-        (define-key img-map [nxhtml-gimp-edit]
-          (list 'menu-item "Edit with GIMP" 'nxhtml-edit-with-gimp
-                :enable '(nxhtml-gimp-can-edit)))
-        (define-key img-map [nxhtml-gimp-separator]
-          (list 'menu-item "--"))
-        (define-key img-map [nxhtml-inlimg-toggle-img]
-          (list 'menu-item "Toggle Display of Image" 'inlimg-toggle-img-display))
-        (define-key img-map [nxhtml-inlimg-mode]
-          (list 'menu-item "Show <img ...> Images" 'inlimg-mode
-                :button '(:toggle . (and (boundp 'inlimg-mode) inlimg-mode)))))
-      (define-key tools-map [nxhtml-img-separator]
-        (list 'menu-item "--"))
-      (let ((some-help-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-some-help-map]
-          (list 'menu-item "Help for Item at Point" some-help-map))
-        (define-key some-help-map [nxhtml-css-help]
-          (list 'menu-item "CSS Help" 'xhtml-help-show-css-ref
-                :enable '(featurep 'xhtml-help)))
-        (define-key some-help-map [nxhtml-tag-help]
-          (list 'menu-item "XHTML Tag Help" 'nxhtml-short-tag-help
-                :enable '(featurep 'xhtml-help))))
-
-      (let ((hexclr-map (make-sparse-keymap)))
-        (define-key tools-map [nxhtml-hexcolor]
-          (list 'menu-item "Color Help" hexclr-map))
-        (define-key hexclr-map [nxhtml-hexcolor-mode]
-          (list 'menu-item "Hex Color Mode"
-                'hexcolor-mode
-                :filter 'nxhtml-insert-menu-dynamically
-                :enable '(and font-lock-mode
-                              (or (not (boundp 'mumamo-multi-major-mode))
-                                  (not mumamo-multi-major-mode))
-                              (featurep 'hexcolor))
-                :button '(:toggle . (and (boundp 'hexcolor-mode) hexcolor-mode))))
-        (define-key hexclr-map [nxhtml-hexcolor-test]
-          (list 'menu-item "Color Test" 'hexcolor-test
-                :enable '(featurep 'hexcolor))))
-
-      (let ((where-map (make-sparse-keymap)))
-        (define-key tools-map [nxml-where]
-          (list 'menu-item "XML Path" where-map
-                :enable '(and (fboundp 'nxml-where-mode)
-                              (or (derived-mode-p 'nxml-mode)
-                                  (nxhtml-nxhtml-in-buffer)))))
-        (define-key where-map [nxml-where-id]
-          (list 'menu-item "Show tag ids in path" 'nxml-where-tag+id-toggle
-                :enable '(boundp 'nxml-where-tag+id)
-                :button '(:toggle . (and (boundp 'nxml-where-tag+id)
-                                         nxml-where-tag+id))))
-        (define-key where-map [nxml-where-header]
-          (list 'menu-item "Show XML path in header" 'nxml-where-header-toggle
-                :enable '(boundp 'nxml-where-header)
-                :button '(:toggle . (and (boundp 'nxml-where-header)
-                                         'nxml-where-header))))
-        (define-key where-map [nxml-where-marks]
-          (list 'menu-item "Show XML path marks" 'nxml-where-marks-toggle
-                :enable '(boundp 'nxml-where-marks)
-                :button '(:toggle . (and (boundp 'nxml-where-marks)
-                                         nxml-where-marks))))
-        (define-key where-map [where-separator] (list 'menu-item "--"))
-        (define-key where-map [nxml-where-global-toggle]
-          (list 'menu-item "Show XML path" 'nxml-where-global-mode
-                :button '(:toggle . nxml-where-global-mode)))
-        (define-key where-map [nxml-where-toggle]
-          (list 'menu-item "Show XML path in buffer" 'nxml-where-mode
-                :button '(:toggle . (and (boundp 'nxml-where-mode)
-                                         nxml-where-mode))))
-        ))
-
-    (let ((quick-map (make-sparse-keymap)))
-      (define-key map [nxhtml-quick-map]
-        (list 'menu-item "Quick Inserts etc" quick-map
-              :visible '(or (derived-mode-p 'html-mode)
-                            (nxhtml-nxhtml-in-buffer))))
-      (let ((sometoc-map (make-sparse-keymap)))
-        (let ((toc-map (make-sparse-keymap)))
-          (define-key sometoc-map [nxhtml-toc-map]
-            (list 'menu-item "For Site" toc-map
-                  :enable '(featurep 'html-toc)))
-          (define-key toc-map [nxhtml-html-wtoc]
-            (list 'menu-item "Merge Pages and TOC"
-                  'html-wtoc-write-pages-with-toc
-                  :enable '(and (html-site-current-page-list))))
-          (define-key toc-map [nxthml-html-toc]
-            (list 'menu-item "With Frames" 'html-toc-menu-map
-                  :filter 'nxhtml-insert-menu-dynamically)))
-        (define-key sometoc-map [nxhtml-html-pagetoc]
-          (list 'menu-item "For Page" 'html-pagetoc-menu-map
-                :filter 'nxhtml-insert-menu-dynamically
-                :enable '(featurep 'html-pagetoc)))
-        (define-key quick-map [nxhtml-sometoc-map]
-          (list 'menu-item "Table of Contents" sometoc-map
-                :visible '(or (derived-mode-p 'html-mode)
-                              (nxhtml-nxhtml-in-buffer)))))
-      (define-key quick-map [nxhtml-quick-sep-1]
-        (list 'menu-item "--"))
-      (define-key quick-map [nxhtml-spec-chars]
-        (list 'menu-item "Insert special character"
-              'nxml-insert-named-char))
-      (define-key quick-map [nxhtml-css-rollover]
-        (list 'menu-item "Insert CSS Rollover Images"
-              'nxhtml-rollover-insert-2v)))
-
-    (define-key map [nxhtml-help-tools-separator]
-      ;; Notice that removing nil below gives an error that is quite
-      ;; hard to catch:
-      ;;
-      ;; Wrong type argument: arrayp, not
-      (list 'menu-item "--" nil
-            :visible `(not (derived-mode-p 'dired-mode))
-            ))
-
-
-    (let ((upl-map (make-sparse-keymap "html-upl")))
-      (define-key map [nxhtml-upl-map]
-        (list 'menu-item "File Transfer" upl-map
-              :enable '(featurep 'html-upl)))
-      (define-key upl-map [nxhtml-upl-remote-dired]
-        (list 'menu-item "Remote Dired" 'html-upl-remote-dired))
-      (define-key upl-map [nxhtml-upl-dired-sep] (list 'menu-item "--"))
-      (define-key upl-map [nxhtml-upl-edit-remote-wtoc]
-        (list 'menu-item "Edit Remote File With TOC" 'html-upl-edit-remote-file-with-toc
-              :visible '(nxhtml-this-file-can-have-toc)))
-      (define-key upl-map [nxhtml-upl-edit-remote]
-        (list 'menu-item "Edit Remote File" 'html-upl-edit-remote-file))
-      (define-key upl-map [nxhtml-upl-ediff-file]
-        (list 'menu-item "Ediff Remote/Local Files" 'html-upl-ediff-file))
-      (define-key upl-map [nxhtml-upl-sep] (list 'menu-item "--"))
-      (define-key upl-map [nxhtml-upl-upload-site-with-toc]
-        (list 'menu-item "Upload Site with TOC" 'html-upl-upload-site-with-toc
-              :visible '(and (html-site-current-merge-dir)
-                             (html-site-current-ensure-file-in-site file))))
-      (define-key upl-map [nxhtml-upl-upload-site]
-        (list 'menu-item "Upload Site" 'html-upl-upload-site))
-      (define-key upl-map [nxhtml-upl-upload-file]
-        (list 'menu-item "Upload Single File" 'html-upl-upload-file))
-      )
-
-
-    (let ((browse-map (make-sparse-keymap)))
-      (define-key map [nxhtml-browse-map]
-        (list 'menu-item "Browse" browse-map
-              '(or buffer-file-name
-                   (eq major-mode 'nxhtml-mode))
-              :enable '(nxhtml-buffer-possibly-local-viewable)))
-      (define-key browse-map [nxhtml-browse-region]
-        (list 'menu-item "Browse the Region Only" 'nxhtml-browse-region
-              :enable 'mark-active))
-      (define-key browse-map [nxhtml-upl-sep3] (list 'menu-item "--"))
-      (define-key browse-map [nxhtml-upl-browse-remote-wtoc]
-        (list 'menu-item "Browse Uploaded File With TOC" 'html-upl-browse-remote-with-toc
-              :visible '(and (nxhtml-buffer-possibly-local-viewable)
-                             (featurep 'html-wtoc)
-                             (html-site-current-merge-dir)
-                             (html-site-current-ensure-file-in-site file)
-                             (nxhtml-buffer-possibly-remote-viewable)
-                             )))
-      (define-key browse-map [nxhtml-upl-browse-remote-frame-file]
-        (list 'menu-item "Browse Uploaded Frames File" 'html-upl-browse-remote-frames
-              :enable '(nxhtml-buffer-possibly-remote-viewable)))
-      (define-key browse-map [nxhtml-upl-browse-remote]
-        (list 'menu-item "Browse Uploaded File" 'html-upl-browse-remote
-              :enable '(nxhtml-buffer-possibly-remote-viewable)))
-      (define-key browse-map [nxhtml-upl-sep2]
-        (list 'menu-item "--"))
-      (define-key browse-map [nxhtml-browse-merged-file]
-        (list 'menu-item "Browse File With TOC" 'html-wtoc-browse-page-with-toc
-              :visible '(and (nxhtml-buffer-possibly-local-viewable)
-                             (featurep 'html-wtoc)
-                             (html-site-current-merge-dir)
-                             (html-site-current-ensure-file-in-site file)
-                             )))
-      (define-key browse-map [nxhtml-browse-frame-file]
-        (list 'menu-item "Browse Frames File" 'html-toc-browse-frames-file
-              :enable '(and (featurep 'html-toc)
-                            (nxhtml-buffer-possibly-local-viewable))))
-      (define-key browse-map [nxhtml-browse-file]
-        (list 'menu-item "Browse File" 'nxhtml-browse-file
-              :enable '(nxhtml-buffer-possibly-local-viewable)))
-      )
-
-
-    (let ((link-map (make-sparse-keymap)))
-
-      (define-key link-map [nxhtml-chklnk]
-        (list 'menu-item "Check Links" 'html-chklnk-check-site-links
-              :enable '(featurep 'html-chklnk)))
-
-      (let ((move-map (make-sparse-keymap)))
-        (define-key move-map [html-move-buffer-file]
-          (list 'menu-item "Move Buffer File" 'html-move-buffer-file
-                :help "Move buffer file and update links"
-                :enable '(and buffer-file-name
-                              (featurep 'html-move))))
-        (define-key link-map [move-map]
-          (list 'menu-item "Moving Files" move-map))
-        (define-key link-map [move-map-separator] (list 'menu-item "--"))
-        )
-
-
-      (define-key link-map [nxhtml-paste-link]
-        (list 'menu-item "Paste Saved Relative Link" 'nxhtml-paste-link
-              :help "Paste link"
-              :enable '(and (boundp 'nxhtml-saved-link-file)
-                                    nxhtml-saved-link-file)))
-      (define-key link-map [nxhtml-paste-link-as-a-tag]
-        (list 'menu-item "Paste Saved Relative Link as <a href=...>" 'nxhtml-paste-link-as-a-tag
-              :help "Paste link as <a ...> tag"
-              :enable '(and (boundp 'nxhtml-saved-link-file)
-                            nxhtml-saved-link-file
-                            (nxhtml-nxml-html-in-buffer))))
-      (define-key link-map [nxhtml-save-link-to-here]
-        (list 'menu-item "Save Relative Link to Current File" 'nxhtml-save-link-to-here
-              :help "Save link info for current file"
-              :enable 'buffer-file-name))
-
-      (define-key link-map [nxhtml-separator-1] (list 'menu-item "--"))
-      (define-key link-map [mlinks-goto-link-other-frame]
-        (list 'menu-item "Follow MLink Link in New Frame" 'mlinks-goto-other-frame
-              :enable '(and (boundp 'mlinks-mode)
-                            mlinks-mode)
-              :help "Follow MLinks Link in New Frame"))
-      (define-key link-map [mlinks-goto-link-other-window]
-        (list 'menu-item "Follow MLink Link in Other Window" 'mlinks-goto-other-window
-              :enable '(and (boundp 'mlinks-mode)
-                            mlinks-mode)
-              :help "Follow MLinks Link in Other Window"))
-      (define-key link-map [mlinks-goto-link]
-        (list 'menu-item "Follow MLink Link" 'mlinks-goto
-              :enable '(and (boundp 'mlinks-mode)
-                            mlinks-mode)
-              :help "Follow MLinks Link"))
-      (define-key link-map [nxhtml-separator-follow-mlink] (list 'menu-item "--"))
-      (define-key link-map [mlinks-next-link]
-        (list 'menu-item "Next MLink Link" 'mlinks-forward-link
-              :enable '(and (boundp 'mlinks-mode)
-                            mlinks-mode)
-              :help "Go to next MLinks link"))
-      (define-key link-map [mlinks-prev-link]
-        (list 'menu-item "Previous MLink Link" 'mlinks-backward-link
-              :enable '(and (boundp 'mlinks-mode)
-                            mlinks-mode)
-              :help "Go to previous MLinks link"))
-
-;;       (define-key link-map [nxhtml-next-href]
-;;         (list 'menu-item "Next Link" 'nxhtml-next-href
-;;          :help "Go to next href field"))
-;;       (define-key link-map [nxhtml-prev-href]
-;;         (list 'menu-item "Previous Link" 'nxhtml-prev-href
-;;          :help "Go to previous href field"))
-
-      (define-key map [nxhtml-link-map]
-        (list 'menu-item "Links" link-map
-              :visible `(not (derived-mode-p 'dired-mode))
-              )))
-
-
-    (let ((site-map (make-sparse-keymap)))
-      (define-key map [nxhtml-site-map]
-        (list 'menu-item "Site" site-map))
-      (define-key site-map [html-site-global-mode]
-        (list 'menu-item "HTML Site Global Mode"
-              'html-site-global-mode
-              :button '(:toggle . (and (boundp 'html-site-global-mode)
-                                       html-site-global-mode))))
-      (define-key site-map [nxhtml-site-separator] (list 'menu-item "--"))
-      (define-key site-map [nxhtml-customize-site-list]
-        (list 'menu-item "Edit Sites" (lambda () (interactive)
-                                        (customize-option-other-window 'html-site-list))))
-      (define-key site-map [nxhtml-set-site]
-        (list 'menu-item "Set Current Site" 'html-site-set-site))
-      (define-key site-map [nxhtml-site-separator-1] (list 'menu-item "--"))
-      (define-key site-map [nxhtml-dired-site-top]
-        (list 'menu-item "Dired Site" 'html-site-dired-current))
-      (define-key site-map [nxhtml-find-site-file]
-        (list 'menu-item "Find File in Site" 'html-site-find-file))
-      (define-key site-map [nxhtml-site-search-separator]
-        (list 'menu-item "--" nil))
-      (define-key site-map [nxhtml-replace-in-site]
-        (list 'menu-item "Replace in Site Files" 'html-site-query-replace))
-      (define-key site-map [nxhtml-rgrep-in-site]
-        (list 'menu-item "Search Site Files" 'html-site-rgrep))
-      )
-
-    (define-key map [nxhtml-insert-separator]
-      (list 'menu-item "--" nil
-            :visible `(not (derived-mode-p 'dired-mode))
-            ))
-    (let ((chunk-map (make-sparse-keymap)))
-      (define-key map [nxhtml-chunk-map]
-        (list 'menu-item "Chunk" chunk-map
-              :visible `(not (derived-mode-p 'dired-mode))
-              :enable '(and (boundp 'mumamo-multi-major-mode)
-                            mumamo-multi-major-mode)))
-      (define-key chunk-map [mumamo-mark-chunk]
-        (list 'menu-item "Mark Chunk"
-              'mumamo-mark-chunk))
-      (define-key chunk-map [nxhtml-separator-mark-chunk] (list 'menu-item "--"))
-      (define-key chunk-map [mumamo-backward-chunk]
-        (list 'menu-item "Backward Chunk"
-              'mumamo-backward-chunk))
-      (define-key chunk-map [mumamo-forward-chunk]
-        (list 'menu-item "Forward Chunk"
-              'mumamo-forward-chunk)))
-    (let ((tag-map (make-sparse-keymap)))
-      (define-key map [nxhtml-tag-map]
-        (list 'menu-item "Move by Tag" tag-map
-              :visible '(or (derived-mode-p 'nxml-mode)
-                            (derived-mode-p 'sgml-mode))
-              :enable '(or (derived-mode-p 'nxml-mode)
-                           (nxhtml-nxhtml-in-buffer))))
-      (define-key tag-map [nxml-forward-par]
-          (list 'menu-item "Forward Paragraph"
-                'nxml-forward-paragraph))
-      (define-key tag-map [nxml-backward-par]
-          (list 'menu-item "Backward Paragraph"
-                'nxml-backward-paragraph))
-      (define-key tag-map [nxml-insert-separator-move2] (list 'menu-item "--"))
-      (define-key tag-map [nxml-down]
-          (list 'menu-item "Forward Into Tag"
-                'nxml-down-element))
-      (define-key tag-map [nxml-backward-up]
-          (list 'menu-item "Backward Out of Tag"
-                'nxml-backward-up-element))
-      (define-key tag-map [nxml-insert-separator-move] (list 'menu-item "--"))
-      (define-key tag-map [nxml-forward]
-          (list 'menu-item "Forward Balanced Tag"
-                'nxml-forward-element))
-      (define-key tag-map [nxml-backward]
-          (list 'menu-item "Backward Balanced Tag"
-                'nxml-backward-element))
-      )
-
-    (let ((cmpl-map (make-sparse-keymap)))
-      (define-key map [nxhtml-cmpl-map]
-        (list 'menu-item "Completion and Validation" cmpl-map
-              ;; :enable '(or (derived-mode-p 'nxml-mode) (nxhtml-nxhtml-in-buffer))
-              :visible `(not (derived-mode-p 'dired-mode))
-              ))
-      (let ((val-map (make-sparse-keymap)))
-        (define-key cmpl-map [nxhtml-cmpl-val-map]
-          (list 'menu-item "Validation Helpers (for php etc)" val-map
-                :enable '(nxhtml-nxhtml-in-buffer)
-                :visible '(nxhtml-nxml-html-in-buffer)))
-;;;         (define-key val-map [nxhtml-strval-mode]
-;;;           (list 'menu-item "Allow attr=\"<?php...?>\" etc"
-;;;                 'nxhtml-strval-mode
-;;;                 :button '(:toggle . nxhtml-strval-mode)))
-        (define-key val-map [nxhtml-toggle-warnings]
-          (list 'menu-item "Hide Validation Errors"
-                'nxhtml-toggle-visible-warnings
-                :button '(:toggle . (not (nxhtml-warnings-are-visible)))
-                ))
-        (define-key val-map [nxhtml-error-separator] (list 'menu-item "--"))
-        (define-key val-map [nxhtml-remove-saved-validation-header]
-          (list 'menu-item "Remove File's Fictive XHTML Validation Header"
-                'nxhtml-remove-saved-validation-header
-                ;; Fix-me: maybe a better enable here?
-                :enable 'nxhtml-validation-header-mode))
-        (define-key val-map [nxhtml-save-validation-header]
-          (list 'menu-item "Save File's Fictive XHTML Validation Header"
-                'nxhtml-save-validation-header
-                :enable 'nxhtml-validation-header-mode))
-        (define-key val-map [nxhtml-set-validation-header]
-          (list 'menu-item "Choose Fictive XHTML Validation Header for Buffer"
-                'nxhtml-set-validation-header))
-        (define-key val-map [nxhtml-update-validation-header]
-          (list 'menu-item "Update Fictive XHTML Validation Header for Buffer"
-                'nxhtml-update-validation-header))
-        (define-key val-map [nxhtml-use-saved-val-separator] (list 'menu-item "--"))
-;;;         (let ((afic-map (make-sparse-keymap)))
-;;;           (define-key val-map [nxhtml-afic-map]
-;;;             (list 'menu-item "Automatic Fictive XHTML Validation Header" afic-map))
-;;;           (define-key afic-map [nxhtml-validation-header-mumamo-set]
-;;;             (list 'menu-item "Customize Automatic XHTML Validation Turn On"
-;;;                   (lambda () (interactive) (customize-option 'nxhtml-validation-header-mumamo-modes))))
-;;;           (define-key afic-map [nxhtml-validation-header-mumamo]
-;;;             (list 'menu-item "Turn on Fictive XHTML Validation Header with MuMaMo"
-;;;                   'nxhtml-validation-header-if-mumamo-toggle
-;;;                   :button '(:toggle . nxhtml-validation-header-if-mumamo))))
-        (define-key val-map [nxhtml-show-validation-header]
-          (list 'menu-item "Display Fictive XHTML Validation Header"
-                'rngalt-display-validation-header-toggle
-                :help-echo "Displays the Fictive XHTML validation header (if any) at top of buffer"
-                :button '(:toggle . rngalt-display-validation-header)))
-        (define-key val-map [nxhtml-recheck-validation-header]
-          (list 'menu-item "Recheck Fictive XHTML Validation Header in Buffer"
-                'nxhtml-recheck-validation-header
-                :enable 'nxhtml-validation-header-mode))
-        (define-key val-map [nxhtml-validation-header-mode]
-          (list 'menu-item "Use Fictive XHTML Validation Header in Buffer"
-                'nxhtml-validation-header-mode
-                :button '(:toggle . nxhtml-validation-header-mode)))
-      )
-      (define-key cmpl-map [nxhtml-validation-separator]
-        (list 'menu-item "--" nil
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (let ((style-map (make-sparse-keymap)))
-        (define-key cmpl-map [nxhtml-cmpl-style-map]
-          (list 'menu-item "Completion Style" style-map
-                :visible '(nxhtml-nxml-html-in-buffer)
-                :enable '(nxhtml-nxhtml-in-buffer)))
-        ;;(defun nxhtml-nxml-html-in-buffer ()
-        (define-key style-map [popcmp-with-help]
-          (list 'menu-item "Show Short Help Beside Alternatives"
-                'popcmp-short-help-beside-alts-toggle
-                :button '(:toggle . popcmp-short-help-beside-alts)))
-        (define-key style-map [nxhtml-tag-do-also]
-          (list 'menu-item "Complete Tag Extras"
-                'nxhtml-tag-do-also-toggle
-                :button '(:toggle . nxhtml-tag-do-also)))
-        (define-key style-map [popcmp-group-alternatives]
-          (list 'menu-item "Group Alternatives"
-                'popcmp-group-alternatives-toggle
-                :button '(:toggle . popcmp-group-alternatives)))
-        (define-key style-map [popcmp-popup-completion]
-          (list 'menu-item "Popup Style Completion"
-                'popcmp-popup-completion-toggle
-                :button '(:toggle . popcmp-popup-completion)))
-        )
-      (define-key cmpl-map [nxhtml-cmpl-separator]
-        (list 'menu-item "--" nil
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (define-key cmpl-map [nxhtml-untag-element]
-        (list 'menu-item "Untag Element" 'nxml-untag-element
-              :enable '(nxhtml-nxhtml-in-buffer)
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (define-key cmpl-map [rngalt-finish-element]
-        (list 'menu-item "Insert End Tag" 'rngalt-finish-element
-              :enable '(nxhtml-nxhtml-in-buffer)
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (define-key cmpl-map [nxhtml-complete]
-        (list 'menu-item "Complete tag, attribute etc" 'nxml-complete
-              :enable '(nxhtml-nxml-in-buffer)
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (define-key cmpl-map [nxhtml-tab-complete-div]
-        (list 'menu-item "--" nil
-              :visible '(nxhtml-nxml-html-in-buffer)))
-      (define-key cmpl-map [nxhtml-tab-complete]
-        (list 'menu-item "Indent and then Complete" 'tabkey2-first))
-      )
-
-    map))
-
-(defvar nxhtml-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (require 'xhtml-help nil t)
-    (when (featurep 'xhtml-help)
-      (define-key map [(control ?c) ?? ?x] 'nxhtml-short-tag-help)
-      (define-key map [(control ?c) ?? ?c] 'xhtml-help-show-css-ref)
-      )
-    (define-key map [(control ?c) ?_] 'nxhtml-toggle-visible-warnings)
-    (define-key map [menu-bar nxhtml-minor-mode]
-      (list 'menu-item "nXhtml" nxhtml-minor-mode-menu-map))
-    map))
-
-;;;###autoload
-(define-minor-mode nxhtml-minor-mode
-  "Minor mode to turn on some key and menu bindings.
-See `nxhtml-mode' for more information."
-  :keymap nxhtml-minor-mode-map
-  :group 'nxhtml
-  ;;(if nxhtml-minor-mode (message "+++> Turning on nxhtml-minor-mode") (message "---> Turning off nxhtml-minor-mode"))
-  )
-;;(put 'nxhtml-minor-mode 'permanent-local t)
-
-(defcustom nxhtml-minor-mode-modes
-  '(
-    nxhtml-mode
-    nxml-mode
-    html-mode
-    sgml-mode
-    xml-mode
-    php-mode
-    css-mode
-    javascript-mode
-    java-mode ;; jsp
-    image-mode
-    ;;
-    dired-mode
-    )
-  "List for turning on `nxhtml-minor-mode'.
-If the buffer's major modes is any of those in this list then
-`nxhtml-global-minor-mode' will turn on `nxhtml-minor-mode' in
-the buffer."
-  :type '(repeat (symbol :tag "Major mode"))
-  :group 'nxhtml)
-
-(defun nxhtml-maybe-turn-on-minor-mode ()
-  "Maybe turn on `nxhtml-minor-mode'.
-See `nxhtml-minor-mode-modes'."
-  (unless (or (minibufferp (current-buffer))
-              (string= " " (substring (buffer-name) 0 1))
-              (string= "*" (substring (buffer-name) 0 1))
-              )
-    (let ((on (and (boundp 'mumamo-multi-major-mode)
-                   mumamo-multi-major-mode)))
-      (dolist (major nxhtml-minor-mode-modes)
-        (when (derived-mode-p major)
-          (setq on t)))
-;;       (when (string= "php" (file-name-extension (buffer-file-name)))
-;;         (lwarn 't :warning "on=%s, major-mode=%s" on major-mode))
-      (when on
-        (nxhtml-minor-mode 1)))))
-
-;;;###autoload
-(define-globalized-minor-mode nxhtml-global-minor-mode
-  nxhtml-minor-mode
-  nxhtml-maybe-turn-on-minor-mode
-  :require 'nxhtml-menu
-  :group 'nxhtml)
-(custom-reevaluate-setting 'nxhtml-global-minor-mode)
-(when nxhtml-global-minor-mode (nxhtml-global-minor-mode 1))
-
-
-(defun nxhtml-docfile ()
-  (let* ((libfile (locate-library "nxhtml"))
-         (docfile (expand-file-name "doc/nxhtml.html"
-                                    (file-name-directory libfile))))
-    docfile))
-
-(defun nxhtml-docfile-url ()
-  (concat "file://" (nxhtml-docfile)))
-
-(defun nxhtml-overview ()
-  "Show a HTML page with an overview of nXhtml."
-  (interactive)
-  (browse-url (nxhtml-docfile-url)))
-
-(defun nxhtml-tutorials ()
-  "Show a HTML page with a list of tutorials for nXhtml'."
-  (interactive)
-  (browse-url "http://ourcomments.org/Emacs/nXhtml/tut/tutorials.html"))
-
-(defun nxhtml-custom-valfaced (value &optional bgcolor)
-  (let ((v (if (sequencep value)
-               (copy-seq value)
-             value))
-        (bgcolor (if bgcolor bgcolor "RGB:FF/FF/AA")))
-    (put-text-property 0 (length v)
-                       'face (list
-                              'bold
-                               (cons 'background-color bgcolor)
-                               )
-                       v)
-    v))
-(defun nxhtml-custom-insert-nxhtml-row (symbol nxhtml-value description)
-  (let ((desc (if description
-                   (format "%s (%s)" description symbol)
-                 (format "%s" (custom-unlispify-tag-name symbol)))))
-    (widget-insert "  " description " (")
-    (nxhtml-custom-describe-defun symbol)
-    (widget-insert "): "
-                   (nxhtml-custom-valfaced
-                    (format "%s" (symbol-value symbol))
-                    (if (eq (symbol-value symbol)
-                            nxhtml-value)
-                        "GreenYellow"
-                      "gainsboro"))
-                   "\n")))
-
-(defun nxhtml-custom-h1(title &optional divider top-newline)
-  (let ((s title))
-    (put-text-property 0 (length s)
-                       'face '(:weight bold
-                               :height 1.4
-                               :foreground "DarkGreen"
-                               ;;:underline t
-                               )
-                       s)
-    (when top-newline (widget-insert "\n"))
-    ;;(when divider (widget-insert (nxhtml-custom-divider (length s))))
-    (widget-insert s)
-    ))
-
-(defun widget-button-notify (widget &rest ignore)
-  (apply (widget-get widget 'function) (widget-get widget 'data)))
-
-(defun widget-insert-link (txt function data)
-  (widget-insert-button txt function data
-                        :button-face 'link
-                        :mouse-face 'highlight
-                        :button-prefix ""
-                        :button-suffix ""))
-
-(defun widget-insert-button (txt function data &rest keywords)
-  (let ((btn (apply 'widget-create
-                    (append
-                     '(push-button
-                       :notify
-                       widget-button-notify)
-                     keywords
-                     (list txt)))))
-    (widget-put btn 'data data)
-    (widget-put btn 'function function)))
-
-(defun nxhtml-custom-url-link (txt url)
-  (let ((plain-url (substring-no-properties url)))
-    (unless (equal txt url)
-      (put-text-property 0 (length txt) 'help-echo plain-url txt))
-    (put-text-property 0 (length txt) 'mouse-face 'highlight txt)
-    (widget-insert-link txt 'browse-url (list url))))
-
-(defun nxhtml-custom-describe-defun (sym &optional help)
-  (let ((txt (symbol-name sym)))
-    (when help
-      (put-text-property 0 (length txt) 'help-echo help txt))
-    (put-text-property 0 (length txt) 'mouse-face 'highlight txt)
-    (widget-insert-link txt 'describe-function (list sym))))
-
-;; (defun nxhtml-quick-customize (&optional same-window)
-;;   "Show page for Quick Customize of nXhtml."
-;;   (interactive)
-;;   (require 'nxhtml)
-;;   (require 'custom)
-;;   (require 'cus-edit)
-;;   (if same-window
-;;       (switch-to-buffer "*Quick Customize nXhtml*")
-;;     (switch-to-buffer-other-window "*Quick Customize nXhtml*"))
-;;   (kill-all-local-variables)
-;;   (custom-mode)
-;;   (let ((inhibit-read-only t))
-;;     (erase-buffer))
-;;   (let ((sFound "found")
-;;         (sError "error"))
-;;     (put-text-property 0 (length sFound)
-;;                        'face '(bold
-;;                                (foreground-color . "green")) sFound)
-;;     (put-text-property 0 (length sError)
-;;                        'face '(bold
-;;                                (foreground-color . "red")) sError)
-;;     (let* (
-;;            (default-used "(not set yet - default used)")
-;;            )
-;;       (nxhtml-custom-h1 "Quick Customize for nXhtml" t)
-;;       (widget-insert "
-
-;; This page is for a quick and easy setup of some ")
-;;       (nxhtml-custom-url-link "nXhtml" (nxhtml-docfile-url))
-;;       (widget-insert " features
-;; that I did not want to turn on by default since they alter what
-;; happens when you open a file.  I suggest however that you turn
-;; them on since they are quite useful if you just understands what
-;; is happening.
-
-;; The values you set here are saved so that they will be used next
-;; time you start Emacs too.")
-;;       ;;(widget-insert-link "customize nXhtml" 'customize-group (list 'nxhtml))
-;;       (widget-insert "\n\n")
-
-;;       (nxhtml-custom-insert-nxhtml-row 'nxhtml-global-minor-mode t "Show the nXhtml menu in all relevant buffers\n\t")
-;;       ;;(nxhtml-custom-insert-nxhtml-row 'mumamo-global-mode t "Turn on Multiple Major Mode in all relevant buffers\n\t")
-;;       ;;(nxhtml-custom-insert-nxhtml-row 'mlinks-global-mode t "Make link of lins, for example href=\"...\"\n\t")
-;;       ;;(nxhtml-custom-insert-nxhtml-row 'indent-region-mode t "Use TAB to indent region when it is selected\n\t")
-
-;;       (widget-insert "\n")
-;;       (widget-insert-button " Turn them all on "
-;;                           (lambda ()
-;;                             (nxhtml-quick-all t)
-;;                             (nxhtml-quick-customize t))
-;;                           nil)
-;;       (widget-insert "  ")
-;;       (widget-insert-button " Turn them all off "
-;;                           (lambda ()
-;;                             (nxhtml-quick-all nil)
-;;                             (nxhtml-quick-customize t))
-;;                           nil)
-;;       (beginning-of-line)
-;;       )))
-
-;; (defun nxhtml-quick-all (on)
-;;   (custom-set-and-prepare-save 'nxhtml-global-minor-mode on)
-;;   ;;(custom-set-and-prepare-save 'mumamo-global-mode on)
-;;   (custom-set-and-prepare-save 'indent-region-mode on)
-;;   (when custom-file
-;;     (custom-save-all)))
-
-(defun custom-set-and-prepare-save (symbol value)
-  "Set SYMBOL to VALUE and add to customize.
-Both the current value and the value to save is set, but
-`custom-save-all' must be called to save customization."
-  (customize-set-variable symbol value)
-  (customize-set-value symbol value)
-  (customize-mark-to-save symbol))
-
-
-;;(nxhtml-quick-customize)
-
-(defun nxhtml-welcome ()
-  "Show welcome information."
-  (interactive)
-  (require 'cus-edit)
-  (let* ((bufnam "*nXhtml Welcome*")
-         (oldbuf (get-buffer bufnam))
-         (curwin (selected-window)))
-    (switch-to-buffer-other-window bufnam)
-    (unless oldbuf
-      (let ((inhibit-read-only t)
-            (here (point)))
-        (custom-mode)
-        (setq cursor-in-non-selected-windows nil)
-        (nxhtml-custom-h1 "Welcome to nXhtml - a package for web editing" t)
-        (insert "\n\n")
-        (setq here (point))
-        (insert "If you have not done it already it might "
-                "be a good time to read at least The Quick Guide in the ")
-        (nxhtml-custom-url-link "nXhtml overview" (nxhtml-docfile-url))
-        (insert " now.\n\n")
-        (fill-region here (point))
-        (setq here (point))
-        (insert "And oh, wait! If you are new to Emacs too you might want "
-                "to take a quick ")
-        (nxhtml-custom-url-link
-         "Emacs tour"
-         "http://www.gnu.org/software/emacs/tour/")
-        (insert ".  And then perhaps the Emacs tutorial "
-                "(which is in the Help menu above).\n\n")
-        (fill-region here (point))
-        (setq here (point))
-
-;;;         (insert "
-
-;;; To make the use of nXhtml as smooth as possible I also recommend
-;;; that you go to ")
-
-;;;         (widget-insert-link "Quick Customize nXhtml"
-;;;                             (lambda ()
-;;;                               (nxhtml-quick-customize))
-;;;                             nil)
-
-;;;         (insert " and follow the instructions
-;;; there.")
-
-        (unless (nxhtml-skip-welcome)
-          (insert "Click to ")
-          (widget-insert-link "remove this message"
-                              (lambda ()
-                                (customize-option 'nxhtml-skip-welcome))
-                              nil)
-          (insert " at startup.  (This page is still "
-                  "available in the nXhtml menu, at the bottom.)"))
-        (fill-region here (point))
-        (setq here (point))
-        (goto-char (point-min))))
-    (select-window curwin)))
-
-(defcustom nxhtml-skip-welcome nil
-  "Turn this on to always skip the nXhtml welcome message."
-  :type 'boolean
-  :group 'nxhtml)
-
-(defun nxhtml-skip-welcome ()
-  "Return t if nXhtml welcome message should be skipped.
-If nil then the message will be shown when you open the first
-file using nxhtml-mode."
-   (or nxhtml-skip-welcome
-       (and nxhtml-global-minor-mode
-            ;;mumamo-global-mode
-            ;;indent-region-mode
-            )))
-
-(defun nxhtml-say-welcome-unless-skip ()
-  (unless (nxhtml-skip-welcome)
-    (nxhtml-welcome)))
-
-;; Show welcome screen once after loading nxhtml:
-(eval-after-load 'nxhtml
-  ;; Use a short delay if something like desktop is used:
-  '(run-with-idle-timer 0.5 nil 'nxhtml-say-welcome-unless-skip))
-
-(provide 'nxhtml-menu)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; nxhtml-menu.el ends here
+;;; nxhtml-menu.el --- Defines menus for nXhtml
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: Sat Apr 21 2007
+(defconst nxhtml-menu:version "1.93") ;;Version:
+;; Last-Updated: 2009-05-29 Fri
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+  ;; `appmenu', `appmenu-fold', `apropos', `backquote', `button',
+  ;; `bytecomp', `cl', `comint', `compile', `css-color', `cus-edit',
+  ;; `cus-face', `cus-load', `cus-start', `dired', `easymenu',
+  ;; `ediff', `ediff-diff', `ediff-help', `ediff-init', `ediff-merg',
+  ;; `ediff-mult', `ediff-util', `ediff-wind', `ffip', `flymake',
+  ;; `flymake-js', `flymake-php', `flyspell', `fold-dwim', `gimp',
+  ;; `grep', `help-mode', `hideshow', `html-imenu', `html-quote',
+  ;; `html-site', `html-upl', `ido', `ietf-drums', `imenu', `ispell',
+  ;; `loadhist', `mail-parse', `mail-prsvr', `mailcap', `mlinks',
+  ;; `mm-util', `mumamo', `nxhtml-mode', `nxml-enc', `nxml-glyph',
+  ;; `nxml-mode', `nxml-ns', `nxml-outln', `nxml-parse', `nxml-rap',
+  ;; `nxml-util', `ourcomments-util', `outline', `popcmp', `qp',
+  ;; `recentf', `rfc2045', `rfc2047', `rfc2231', `ring', `rng-dt',
+  ;; `rng-loc', `rng-match', `rng-nxml', `rng-parse', `rng-pttrn',
+  ;; `rng-uri', `rng-util', `rng-valid', `rngalt', `rx',
+  ;; `setup-helper', `sgml-mode', `tidy-xhtml', `time-date', `timer',
+  ;; `timezone', `tls', `tool-bar', `tree-widget', `typesetter',
+  ;; `udev', `udev-cedet', `udev-ecb', `udev-rinari', `url',
+  ;; `url-auth', `url-c', `url-cookie', `url-expand', `url-gw',
+  ;; `url-history', `url-http', `url-methods', `url-parse',
+  ;; `url-privacy', `url-proxy', `url-util', `url-vars', `view',
+  ;; `w32-reg-iface', `w32-regdat', `wid-edit', `xmltok'.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Menus for nXhtml to be used in different major modes.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cus-edit))
+(eval-when-compile (require 'dired))
+(eval-when-compile (require 'gimp))
+(eval-when-compile (require 'html-site))
+(eval-when-compile (when (fboundp 'nxml-mode) (require 'nxhtml-mode)))
+(eval-when-compile (require 'css-color))
+(eval-when-compile (require 'flymake))
+(eval-when-compile (require 'flymake-php))
+(eval-when-compile (require 'flymake-js))
+(eval-when-compile (require 'udev-ecb))
+(eval-when-compile (require 'udev-cedet))
+(eval-when-compile (require 'udev-rinari))
+
+(defun nxhtml-nxhtml-in-buffer ()
+  (or (derived-mode-p 'nxhtml-mode)
+      (when (and (boundp 'mumamo-multi-major-mode)
+                 mumamo-multi-major-mode)
+        (let ((major-mode (mumamo-main-major-mode)))
+          (derived-mode-p 'nxhtml-mode)))))
+
+(defun nxhtml-nxml-in-buffer ()
+  (or (derived-mode-p 'nxml-mode)
+      (when (and (boundp 'mumamo-multi-major-mode)
+                 mumamo-multi-major-mode)
+        (let ((major-mode (mumamo-main-major-mode)))
+          (derived-mode-p 'nxml-mode)))))
+
+(defun nxhtml-html-in-buffer ()
+  (or (derived-mode-p 'html-mode)
+      (when (and (boundp 'mumamo-multi-major-mode)
+                 mumamo-multi-major-mode)
+        (let ((major-mode (mumamo-main-major-mode)))
+          (derived-mode-p 'html-mode)))
+      (nxhtml-nxhtml-in-buffer)))
+
+(defun nxhtml-nxml-html-in-buffer ()
+  (or (derived-mode-p 'html-mode)
+      (when (and (boundp 'mumamo-multi-major-mode)
+                 mumamo-multi-major-mode)
+        (let ((major-mode (mumamo-main-major-mode)))
+          (derived-mode-p 'html-mode)))
+      (nxhtml-nxml-in-buffer)))
+
+(defun nxhtml-this-file-can-have-toc (&optional file)
+  (unless file
+    (setq file (html-site-buffer-or-dired-file-name)))
+  (and (nxhtml-buffer-possibly-local-viewable file)
+       (html-site-current-merge-dir)
+       (html-site-current-ensure-file-in-site file)))
+
+(defun nxhtml-buffer-possibly-local-viewable (&optional file)
+  (unless file
+    (setq file (html-site-buffer-or-dired-file-name)))
+  (or (and file
+           (member (file-name-extension file)
+                   '("html" "htm" "gif" "png")))))
+
+(defun nxhtml-buffer-possibly-remote-viewable ()
+  ;; Fix-me
+  (let* ((fmt "nxhtml-buffer-possibly-remote-viewable.dgffv: %s")
+         (file (or buffer-file-name
+                   (and (derived-mode-p 'dired-mode)
+                        (condition-case err
+                            (dired-get-file-for-visit)
+                          (error
+                           (message fmt (error-message-string err))
+                           nil))))))
+    (and (featurep 'html-upl)
+         file
+         (member (downcase (file-name-extension file))
+                 '("html" "htm" "gif" "png" "pl" "php")))))
+
+(defun nxhtml-insert-menu-dynamically (real-binding)
+  (when (and (symbolp real-binding)
+             (boundp real-binding))
+    (symbol-value real-binding)))
+
+(defun nxhtml-menu-image-file ()
+  (or (get-char-property (point) 'image-file)
+      buffer-file-name))
+
+(defun nxhtml-gimp-can-edit ()
+  (gimp-can-edit (nxhtml-menu-image-file)))
+
+;;;###autoload
+(defun nxhtml-edit-with-gimp ()
+  "Edit with GIMP buffer or file at point."
+  (interactive)
+  (gimp-edit-file (nxhtml-menu-image-file)))
+
+;;;###autoload
+(defun nxhtml-browse-file (file)
+  "View file in web browser."
+  (interactive (list
+                (or (html-site-buffer-or-dired-file-name)
+                    (read-file-name "File: "))))
+  (let* ((buf (if (buffer-file-name)
+                  (current-buffer)
+                (find-buffer-visiting file)))
+         (use-temp (and (buffer-file-name)
+                        (or (and (boundp 'nxhtml-current-validation-header)
+                                 nxhtml-current-validation-header)
+                            (buffer-modified-p)
+                            (not buffer-file-name)
+                            (not (file-exists-p buffer-file-name)))))
+         (file-to-browse file))
+    (when use-temp
+      (setq file-to-browse (nxhtml-save-browseable-temp-file nil nil use-temp)))
+    ;; Fix-me: Workaround for Emacs bug on w32
+    ;; http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4015
+    (if (eq system-type 'windows-nt)
+        (w32-shell-execute "open" file nil 1)
+      (browse-url-of-file file))
+    ))
+
+;;;###autoload
+(defun nxhtml-browse-region ()
+  "View region in web browser."
+  (interactive)
+  (unless mark-active
+    (error "The region is not active"))
+  (browse-url (nxhtml-save-browseable-temp-file (region-beginning) (region-end))))
+
+;;(defvar nxhtml-browseable-buffer-name "*nXhtml Browsing Buffer*")
+(defvar nxhtml-browseable-buffer-file "~/.temp-nxhtml-browse.htm")
+;; Fix-me: Handle base href here!
+(defun nxhtml-save-browseable-temp-file (start end &optional doit-anyway)
+  "Return a temporary file for viewing in web browser."
+  ;; When using this either region should be active or there should be
+  ;; a validation header or both.
+  (or doit-anyway
+      (and start end) ;mark-active
+      (and (boundp 'nxhtml-validation-header-mode)
+           nxhtml-validation-header-mode
+           nxhtml-current-validation-header)
+      (error "Neither region nor validation header"))
+  (save-excursion
+    (let ((curbuf (current-buffer))
+          (view-buffer (find-file-noselect nxhtml-browseable-buffer-file))
+          header
+          content)
+      ;; Get header and content
+      (save-restriction
+        (widen)
+        (setq header
+              (if nxhtml-validation-header-mode
+                  (let* ((key nxhtml-current-validation-header)
+                         (rec (unless (listp key)
+                                (assoc key nxhtml-validation-headers)))
+                         (header (cdr rec)))
+                    header)
+                (if (and doit-anyway (not start))
+                    ""
+                  (goto-char (point-min))
+                  (save-match-data
+                    (let ((body (re-search-forward "<body[^>]*>")))
+                      (if body
+                          (buffer-substring-no-properties (point-min) (match-end 0))
+                        ""))))))
+        (setq content
+              (if start
+                  (buffer-substring-no-properties start end)
+                (buffer-substring-no-properties (point-min) (point-max))))
+        )
+      ;; Switch to view buffer
+      (set-buffer view-buffer)
+      ;;       (unless buffer-file-name
+      ;;         (set-visited-file-name nxhtml-browseable-buffer-file)
+      ;;         (rename-buffer nxhtml-valhead-view-buffer-name))
+      (erase-buffer)
+      (insert header content)
+      ;;(when (fboundp 'emacsw32-eol-set) (emacsw32-eol-set nil))
+      (nxhtml-mode)
+      (save-buffer)
+      ;;(current-buffer)
+      (kill-buffer view-buffer)
+      (expand-file-name nxhtml-browseable-buffer-file)
+      )))
+
+
+
+(defconst nxhtml-minor-mode-menu-map
+  (let ((map (make-sparse-keymap "nxhtml-minor-mode-menu")))
+
+    (let ((help-map (make-sparse-keymap)))
+      (define-key help-map [emacs-Q-nxhtml]
+        (list 'menu-item "Start 'emacs -Q' and load nXhtml" 'emacs-Q-nxhtml))
+      (define-key help-map [nxhtmltest-run]
+        (list 'menu-item "Run nXhtml Tests in Current Emacs" 'nxhtmltest-run))
+      (define-key help-map [nxhtmltest-run-Q]
+        (list 'menu-item "Run nXhtml Tests in a Fresh Emacs" 'nxhtmltest-run-Q))
+      (define-key help-map [nxhtml-report-bug]
+        (list 'menu-item "Report a Bug in nXhtml ..." 'nxhtml-report-bug))
+      (define-key help-map [nxhtml-help-separator2] (list 'menu-item "--"))
+      (define-key help-map [nxhtml-byte-compile-nxhtml]
+        (list 'menu-item "Byte Compile nXhtml" 'nxhtmlmaint-start-byte-compilation))
+      (define-key help-map [nxhtml-features-check]
+        (list 'menu-item "Check Optional Features" 'nxhtml-features-check))
+      (define-key help-map [nxhtml-customize]
+        (list 'menu-item "Customize nXhtml ..." 'nxhtml-customize))
+;;;       (define-key help-map [nxhtml-quick-customize]
+;;;         (list 'menu-item "Quick Customize nXhtml ..." 'nxhtml-quick-customize))
+      (define-key help-map [nxhtml-help-separator3] (list 'menu-item "--"))
+;;;       (define-key help-map [nxhtml-help]
+;;;         (list 'menu-item "nXhtml Help" 'nxhtml-help))
+      (define-key help-map [nxhtml-tutorials]
+        (list 'menu-item "nXhtml Tutorials" 'nxhtml-tutorials))
+      (define-key help-map [nxhtml-overview]
+        (list 'menu-item (concat "nXhtml Version " nxhtml-menu:version " Overview") 'nxhtml-overview))
+      (define-key help-map [nxhtml-welcome]
+        (list 'menu-item "Welcome to nXhtml" 'nxhtml-welcome))
+      (define-key map [nxhtml-help-map]
+        (list 'menu-item "nXhtml Help and Setup" help-map))
+      (define-key map [nxhtml-info-separator] (list 'menu-item "--"))
+      )
+
+
+
+
+    (let ((tools-map (make-sparse-keymap)))
+      (define-key map [nxhtml-tools-map]
+        (list 'menu-item "Tools" tools-map
+              :visible `(not (derived-mode-p 'dired-mode))
+              ))
+      (define-key tools-map [nxhtml-last-resort]
+        (list 'menu-item "Last Resort" 'n-back-game))
+      (define-key tools-map [nxhtml-pause]
+        (list 'menu-item "Life Reminder" 'pause-mode
+              :button '(:toggle . (and (boundp 'pause-mode)
+                                       pause-mode))))
+      (define-key tools-map [nxhtml-last-resort-separator]
+        (list 'menu-item "--" nil))
+      (define-key tools-map [nxhtml-viper-tut]
+        (list 'menu-item "Viper try-out tutorial"
+              'viper-tutorial))
+      (define-key tools-map [nxhtml-menu-to-m-x]
+        (list 'menu-item "Add Menu Commands to M-x history"
+              'ourcomments-M-x-menu-mode
+              :button '(:toggle . (and (boundp 'ourcomments-M-x-menu-mode)
+                                       ourcomments-M-x-menu-mode))))
+      (define-key tools-map [nxhtml-next-last-resort-separator]
+        (list 'menu-item "--" nil))
+      (let ((fill-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-filling]
+          (list 'menu-item "Writing Text" fill-map))
+        (define-key fill-map [nxhtml-unfill-paragraph]
+          (list 'menu-item "Unfill Paragraph" 'unfill-paragraph))
+        (define-key fill-map [nxhtml-fill-paragraph]
+          (list 'menu-item "Fill Paragraph" 'fill-paragraph))
+        (define-key fill-map [nxhtml-wrap-to-fill-separator]
+          (list 'menu-item "--" nil))
+        (define-key fill-map [nxhtml-html-write-mode]
+          (list 'menu-item "HTML Write Mode"
+                'html-write-mode
+                :button '(:toggle . (and (boundp 'html-write-mode)
+                                         html-write-mode))))
+        (define-key fill-map [nxhtml-wrap-to-fill-column-mode]
+          (list 'menu-item "Wrap To Fill Column Mode"
+                'wrap-to-fill-column-mode
+                :button '(:toggle . (and (boundp 'wrap-to-fill-column-mode)
+                                         wrap-to-fill-column-mode))))
+        )
+
+      (define-key tools-map [nxhtml-ecb-separator]
+        (list 'menu-item "--" nil))
+
+
+      (let ((ecb-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-ecb-map]
+          (list 'menu-item "ECB" ecb-map))
+        (define-key ecb-map [nxhtml-custom-important-ecb]
+          (list 'menu-item "Customize important ECB things"
+                (lambda ()
+                  "Customize group `ecb-most-important'."
+                  (interactive)
+                  (customize-group-other-window 'ecb-most-important))
+                :enable '(featurep 'ecb)))
+        (define-key ecb-map [nxhtml-ecb-mode]
+          (list 'menu-item "ECB Minor Mode"
+                'ecb-minor-mode
+                :button '(:toggle . (and (boundp 'ecb-minor-mode)
+                                         ecb-minor-mode))
+                :enable '(boundp 'ecb-minor-mode)))
+        (define-key ecb-map [nxhtml-ecb-show-help]
+          (list 'menu-item "ECB Help"
+                'ecb-show-help
+                :enable '(fboundp 'ecb-show-help)))
+        (define-key ecb-map [nxhtml-ecb-custom-separator]
+          (list 'menu-item "--" nil))
+        (define-key ecb-map [nxhtml-custom-ecb]
+          (list 'menu-item "Customize ECB dev startup from nXhtml"
+                'udev-ecb-customize-startup))
+        (define-key ecb-map [nxhtml-update-ecb]
+          (list 'menu-item "Fetch/update ECB dev sources"
+                'udev-ecb-update))
+        (define-key ecb-map [nxhtml-ecb-home-separator]
+          (list 'menu-item "--" nil))
+        (define-key ecb-map [nxhtml-rinari-homepage]
+          (list 'menu-item "ECB Home Page"
+                (lambda ()
+                  "Open ECB home page in your web browser."
+                  (interactive)
+                  (browse-url "http://ecb.sourceforge.net/"))))
+        )
+
+
+      (let ((cedet-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-cedet-map]
+          (list 'menu-item "CEDET" cedet-map))
+        (define-key cedet-map [nxhtml-custom-cedet]
+          (list 'menu-item "Customize CEDET dev startup from nXhtml"
+                'udev-cedet-customize-startup))
+        (define-key cedet-map [nxhtml-cedet-utest]
+          (list 'menu-item "Run CEDET unit tests"
+                'udev-cedet-utest))
+        (define-key cedet-map [nxhtml-update-cedet]
+          (list 'menu-item "Fetch/update and install CEDET dev sources"
+                'udev-cedet-update))
+        (define-key cedet-map [nxhtml-cedet-home-separator]
+          (list 'menu-item "--" nil))
+        (define-key cedet-map [nxhtml-rinari-homepage]
+          (list 'menu-item "CEDET Home Page"
+                (lambda ()
+                  "Open CEDET home page in your web browser."
+                  (interactive)
+                  (browse-url "http://cedet.sourceforge.net/"))))
+        )
+
+
+      (let ((rinari-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-rinari-map]
+          (list 'menu-item "Rinari" rinari-map))
+        (define-key rinari-map [nxhtml-custom-rinari]
+          (list 'menu-item "Customize Rinari startup from nXhtml"
+                (lambda ()
+                  "Customize Rinari dev nXhtml startup options."
+                  (interactive)
+                  (customize-group-other-window 'udev-rinari))))
+        (define-key rinari-map [nxhtml-update-rinari]
+          (list 'menu-item "Fetch/update Rinari dev sources"
+                'udev-rinari-update))
+        (define-key rinari-map [nxhtml-rinari-home-separator]
+          (list 'menu-item "--" nil))
+        (define-key rinari-map [nxhtml-rinari-homepage]
+          (list 'menu-item "Rinari Home Page"
+                (lambda ()
+                  "Open Rinari home page in your web browser."
+                  (interactive)
+                  (browse-url "http://rubyforge.org/projects/rinari/"))))
+        )
+      (let ((mozrepl-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-mozrepl-map]
+          (list 'menu-item "MozRepl - control Firefox" mozrepl-map))
+
+        (let ((mozrepl-low-map (make-sparse-keymap)))
+          (define-key mozrepl-map [nxhtml-mozrepl-map]
+            (list 'menu-item "MozRepl Basic Functions" mozrepl-low-map))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-run-mozilla]
+            (list 'menu-item "Display/Start MozRepl Process" 'run-mozilla
+                  :enable '(fboundp 'moz-minor-mode)))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-separator1]
+            (list 'menu-item "--" nil))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-save-and-send]
+            (list 'menu-item "Save Buffer and Send it" 'moz-save-buffer-and-send
+                  :enable '(or (not (boundp 'mumamo-multi-major-mode))
+                               (not mumamo-multi-major-mode))))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-send-defun-and-go]
+            (list 'menu-item "Send Current Function, Go to MozRepl"
+                  'moz-send-defun-and-go
+                  :enable '(and (boundp 'moz-minor-mode) moz-minor-mode)))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-send-defun]
+            (list 'menu-item "Send Current Function" 'moz-send-defun
+                  :enable '(and (boundp 'moz-minor-mode) moz-minor-mode)))
+          (define-key mozrepl-low-map [nxhtml-mozrepl-send-region]
+            (list 'menu-item "Send the Region" 'moz-send-region
+                  :enable '(and mark-active
+                                (boundp 'moz-minor-mode) moz-minor-mode))))
+
+        (define-key mozrepl-map [nxhtml-mozrepl-separator2]
+          (list 'menu-item "--" nil))
+        (define-key mozrepl-map [nxhtml-mozrepl-refresh]
+          (list 'menu-item "Refresh Firefox on Save" 'mozadd-refresh-edited-on-save-mode
+                :button '(:toggle . (and (boundp 'mozadd-refresh-edited-on-save-mode)
+                                         mozadd-refresh-edited-on-save-mode))))
+        (define-key mozrepl-map [nxhtml-mozrepl-mirror]
+          (list 'menu-item "Mirror Buffer in Firefox" 'mozadd-mirror-mode
+                :button '(:toggle . (and (boundp 'mozadd-mirror-mode)
+                                         mozadd-mirror-mode))))
+        (define-key mozrepl-map [nxhtml-mozrepl-separator3]
+          (list 'menu-item "--" nil))
+        (define-key mozrepl-map [nxhtml-mozrepl-home-page]
+          (list 'menu-item "MozLab/MozRepl Home Page"
+                (lambda ()
+                  "Open MozLab/MozRepl home page in your web browser."
+                  (interactive)
+                  (browse-url "http://hyperstruct.net/projects/mozlab"))))
+        )
+
+      (define-key tools-map [nxhtml-frame-win-separator]
+        (list 'menu-item "--" nil))
+      (let ((frame-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-frame-map]
+          (list 'menu-item "Windows and Frames" frame-map))
+        (define-key frame-map [nxhtml-winsav-mode]
+          (list 'menu-item "Save/restore Frames and Windows"
+                'winsav-save-mode
+                :button '(:toggle . (and (boundp 'winsav-save-mode)
+                                         winsav-save-mode))))
+        (define-key frame-map [nxhtml-resize-windows]
+          (list 'menu-item "Resize Windows"
+                'resize-windows)))
+
+      (define-key tools-map [nxhtml-majpri-separator]
+        (list 'menu-item "--" nil))
+      (define-key tools-map [nxhtml-as-external]
+        (list 'menu-item "External Editor Setup"
+              'as-external-mode
+              :button '(:toggle . (and (boundp 'as-external-mode)
+                                       as-external-mode))))
+      (define-key tools-map [nxhtml-sex-mode]
+        (list 'menu-item "Open files in External Apps"
+              'sex-mode
+              :button '(:toggle . (and (boundp 'sex-mode)
+                                       sex-mode))))
+      (let ((majpri-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-majpri-map]
+          (list 'menu-item "Major Modes Priorities" majpri-map))
+        (define-key majpri-map [nxhtml-majpri-act]
+          (list 'menu-item "Apply Major Modes Priorities"
+                'majmodpri-apply-priorities))
+        (define-key majpri-map [nxhtml-majpri-cust]
+          (list 'menu-item "Customize Major Mode Priorities"
+                (lambda ()
+                  "Customize group Major Mode priorities."
+                  (interactive)
+                  (customize-group-other-window 'majmodpri))))
+        )
+      (define-key tools-map [nxhtml-tidy-separator]
+        (list 'menu-item "--" nil))
+      (define-key tools-map [nxhtml-tidy-map]
+        (list 'menu-item "Tidy XHTML" 'tidy-menu-symbol
+              :filter 'nxhtml-insert-menu-dynamically
+              :visible '(and (fboundp 'tidy-build-menu)
+                             (tidy-build-menu))
+              :enable '(and (fboundp 'tidy-build-menu)
+                            (tidy-build-menu)
+                            (or (derived-mode-p 'html-mode)
+                                (nxhtml-nxhtml-in-buffer)))))
+      (define-key tools-map [nxhtml-flymake]
+        (list 'menu-item "Flymake Mode" 'flymake-mode
+              :button '(:toggle . (and (boundp 'flymake-mode)
+                                       flymake-mode))
+              :enable '(and buffer-file-name
+                            (fboundp 'flymake-get-init-function)
+                            (flymake-get-init-function buffer-file-name)
+                            )))
+      (let ((flyspell-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-flyspell-map]
+          (list 'menu-item "Flyspell" flyspell-map))
+        (define-key flyspell-map [nxhtml-flyspell-goto-next]
+          (list 'menu-item "Flyspell Go To Next Error" 'flyspell-goto-next-error
+                :enable 'flyspell-mode))
+        (define-key flyspell-map [nxhtml-flyspell-region]
+          (list 'menu-item "Flyspell Region" 'flyspell-region
+                :enable 'flyspell-mode))
+        (define-key flyspell-map [nxhtml-flyspell-div-1]
+          (list 'menu-item "--"))
+        (define-key flyspell-map [nxhtml-flyspell]
+          (list 'menu-item "Flyspell Mode" 'flyspell-mode
+                :button '(:toggle . (and (boundp flyspell-mode)
+                                         flyspell-mode))))
+        )
+      (define-key tools-map [nxhtml-flyspell-separator]
+        (list 'menu-item "--"))
+      (let ((img-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-img-map]
+          (list 'menu-item "Images" img-map))
+        (define-key img-map [nxhtml-chart]
+          (list 'menu-item "Make Chart" 'chart-make-chart))
+        (define-key img-map [nxhtml-chart-separator] (list 'menu-item "--"))
+        (define-key img-map [nxhtml-gimp-edit]
+          (list 'menu-item "Edit with GIMP" 'nxhtml-edit-with-gimp
+                :enable '(nxhtml-gimp-can-edit)))
+        (define-key img-map [nxhtml-gimp-separator] (list 'menu-item "--"))
+        (define-key img-map [nxhtml-inlimg-toggle-display]
+          (list 'menu-item "Toggle Display of Image" 'inlimg-toggle-display))
+        (define-key img-map [nxhtml-inlimg-toggle-slicing]
+          (list 'menu-item "Toggle Slicing of Image" 'inlimg-toggle-slicing))
+        (define-key img-map [nxhtml-inlimg-mode]
+          (list 'menu-item "Show <img ...> Images" 'inlimg-mode
+                :button '(:toggle . (and (boundp 'inlimg-mode)
+                                         inlimg-mode)))))
+      (define-key tools-map [nxhtml-img-separator]
+        (list 'menu-item "--"))
+      (let ((some-help-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-some-help-map]
+          (list 'menu-item "Help for Item at Point" some-help-map))
+        (define-key some-help-map [nxhtml-css-help]
+          (list 'menu-item "CSS Help" 'xhtml-help-show-css-ref))
+        (define-key some-help-map [nxhtml-tag-help]
+          (list 'menu-item "XHTML Tag Help" 'nxhtml-short-tag-help)))
+
+      (let ((cssclr-map (make-sparse-keymap)))
+        (define-key tools-map [nxhtml-css-color]
+          (list 'menu-item "Color Help" cssclr-map))
+        (define-key cssclr-map [nxhtml-css-color-mode]
+          (list 'menu-item "Css Color Mode" 'css-color-mode
+		:enable '(and font-lock-mode
+                              (or (not (boundp 'mumamo-multi-major-mode))
+                                  (not mumamo-multi-major-mode))
+                              (featurep 'css-color))
+                :button '(:toggle . (and (boundp 'css-color-mode)
+                                         css-color-mode))))
+        (define-key cssclr-map [nxhtml-css-color-test]
+          (list 'menu-item "Color Test" 'css-color-test
+                :enable '(featurep 'css-color))))
+
+      (let ((where-map (make-sparse-keymap)))
+        (define-key tools-map [nxml-where]
+          (list 'menu-item "XML Path" where-map
+                :enable '(and (fboundp 'nxml-where-mode)
+                              (or (derived-mode-p 'nxml-mode)
+                                  (nxhtml-nxhtml-in-buffer)))))
+        (define-key where-map [nxhtml-nxml-where-cust]
+          (list 'menu-item "Customize display of XML Path"
+                (lambda ()
+                  "Customize XML path, ie group `nxml-where'."
+                  (interactive)
+                  (customize-group-other-window 'nxml-where))))
+        (define-key where-map [where-separator-2] (list 'menu-item "--"))
+        (define-key where-map [nxml-where-inner]
+          (list 'menu-item "Show inly inner tag" 'nxml-where-only-inner-toggle
+                :enable '(boundp 'nxml-where-only-inner)
+                :button '(:toggle . (and (boundp 'nxml-where-only-inner)
+                                         nxml-where-only-inner))))
+        (define-key where-map [nxml-where-id]
+          (list 'menu-item "Show tag ids in path" 'nxml-where-tag+id-toggle
+                :enable '(boundp 'nxml-where-tag+id)
+                :button '(:toggle . (and (boundp 'nxml-where-tag+id)
+                                         nxml-where-tag+id))))
+        (define-key where-map [nxml-where-header]
+          (list 'menu-item "Show XML path in header" 'nxml-where-header-toggle
+                :enable '(boundp 'nxml-where-header)
+                :button '(:toggle . (and (boundp 'nxml-where-header)
+                                         'nxml-where-header))))
+        (define-key where-map [nxml-where-marks]
+          (list 'menu-item "Show XML path marks" 'nxml-where-marks-toggle
+                :enable '(boundp 'nxml-where-marks)
+                :button '(:toggle . (and (boundp 'nxml-where-marks)
+                                         nxml-where-marks))))
+        (define-key where-map [where-separator] (list 'menu-item "--"))
+        (define-key where-map [nxml-where-global-toggle]
+          (list 'menu-item "Show XML path" 'nxml-where-global-mode
+                :button '(:toggle . (and (boundp 'nxml-where-global-mode)
+                                         nxml-where-global-mode))))
+        (define-key where-map [nxml-where-toggle]
+          (list 'menu-item "Show XML path in buffer" 'nxml-where-mode
+                :button '(:toggle . (and (boundp 'nxml-where-mode)
+                                         nxml-where-mode))))
+        ))
+
+    (let ((quick-map (make-sparse-keymap)))
+      (define-key map [nxhtml-quick-map]
+        (list 'menu-item "Quick Inserts etc" quick-map
+              :visible '(or (derived-mode-p 'html-mode)
+                            (nxhtml-nxhtml-in-buffer))))
+      (let ((sometoc-map (make-sparse-keymap)))
+        (let ((toc-map (make-sparse-keymap)))
+          (define-key sometoc-map [nxhtml-toc-map]
+            (list 'menu-item "For Site" toc-map
+                  :enable '(featurep 'html-toc)))
+          (define-key toc-map [nxhtml-html-wtoc]
+            (list 'menu-item "Merge Pages and TOC"
+                  'html-wtoc-write-pages-with-toc
+                  :enable '(and (html-site-current-page-list))))
+          (define-key toc-map [nxthml-html-toc]
+            (list 'menu-item "With Frames" 'html-toc-menu-map
+                  :filter 'nxhtml-insert-menu-dynamically)))
+        (define-key sometoc-map [nxhtml-html-pagetoc]
+          (list 'menu-item "For Page" 'html-pagetoc-menu-map
+                :enable (boundp 'html-pagetoc-menu-map)
+                :filter 'nxhtml-insert-menu-dynamically
+                ))
+        (define-key quick-map [nxhtml-sometoc-map]
+          (list 'menu-item "Table of Contents" sometoc-map
+                :visible '(or (derived-mode-p 'html-mode)
+                              (nxhtml-nxhtml-in-buffer)))))
+      (define-key quick-map [nxhtml-quick-sep-1]
+        (list 'menu-item "--"))
+      (define-key quick-map [nxhtml-spec-chars]
+        (list 'menu-item "Insert special character"
+              'nxml-insert-named-char))
+      (define-key quick-map [nxhtml-css-rollover]
+        (list 'menu-item "Insert CSS Rollover Images"
+              'nxhtml-rollover-insert-2v)))
+
+    (define-key map [nxhtml-help-tools-separator]
+      ;; Notice that removing nil below gives an error that is quite
+      ;; hard to catch:
+      ;;
+      ;; Wrong type argument: arrayp, not
+      (list 'menu-item "--" nil
+            :visible `(not (derived-mode-p 'dired-mode))
+            ))
+
+
+    (let ((upl-map (make-sparse-keymap "html-upl")))
+      (define-key map [nxhtml-upl-map]
+        (list 'menu-item "File Transfer" upl-map
+              ;;:enable '(featurep 'html-upl)))
+              :enable '(fboundp 'html-upl-upload-file)))
+      (define-key upl-map [nxhtml-upl-remote-dired]
+        (list 'menu-item "Remote Dired" 'html-upl-remote-dired))
+      (define-key upl-map [nxhtml-upl-dired-sep] (list 'menu-item "--"))
+      (define-key upl-map [nxhtml-upl-edit-remote-wtoc]
+        (list 'menu-item "Edit Remote File With TOC" 'html-upl-edit-remote-file-with-toc
+              :visible '(nxhtml-this-file-can-have-toc)))
+      (define-key upl-map [nxhtml-upl-edit-remote]
+        (list 'menu-item "Edit Remote File" 'html-upl-edit-remote-file))
+      (define-key upl-map [nxhtml-upl-ediff-file]
+        (list 'menu-item "Ediff Remote/Local Files" 'html-upl-ediff-file))
+      (define-key upl-map [nxhtml-upl-sep] (list 'menu-item "--"))
+      (define-key upl-map [nxhtml-upl-upload-site-with-toc]
+        (list 'menu-item "Upload Site with TOC" 'html-upl-upload-site-with-toc
+              :visible '(and (html-site-current-merge-dir)
+                             (html-site-current-ensure-file-in-site file))))
+      (define-key upl-map [nxhtml-upl-upload-site]
+        (list 'menu-item "Upload Site" 'html-upl-upload-site))
+      (define-key upl-map [nxhtml-upl-upload-file]
+        (list 'menu-item "Upload Single File" 'html-upl-upload-file))
+      )
+
+
+    (let ((browse-map (make-sparse-keymap)))
+      (define-key map [nxhtml-browse-map]
+        (list 'menu-item "Browse" browse-map
+              '(or buffer-file-name
+                   (eq major-mode 'nxhtml-mode))
+              :enable '(nxhtml-buffer-possibly-local-viewable)))
+      (define-key browse-map [nxhtml-browse-region]
+        (list 'menu-item "Browse the Region Only" 'nxhtml-browse-region
+              :enable 'mark-active))
+      (define-key browse-map [nxhtml-upl-sep3] (list 'menu-item "--"))
+      (define-key browse-map [nxhtml-upl-browse-remote-wtoc]
+        (list 'menu-item "Browse Uploaded File With TOC" 'html-upl-browse-remote-with-toc
+              :visible '(and (nxhtml-buffer-possibly-local-viewable)
+                             (featurep 'html-wtoc)
+                             (html-site-current-merge-dir)
+                             (html-site-current-ensure-file-in-site file)
+                             (nxhtml-buffer-possibly-remote-viewable)
+                             )))
+      (define-key browse-map [nxhtml-upl-browse-remote-frame-file]
+        (list 'menu-item "Browse Uploaded Frames File" 'html-upl-browse-remote-frames
+              :enable '(nxhtml-buffer-possibly-remote-viewable)))
+      (define-key browse-map [nxhtml-upl-browse-remote]
+        (list 'menu-item "Browse Uploaded File" 'html-upl-browse-remote
+              :enable '(nxhtml-buffer-possibly-remote-viewable)))
+      (define-key browse-map [nxhtml-upl-sep2]
+        (list 'menu-item "--"))
+      (define-key browse-map [nxhtml-browse-merged-file]
+        (list 'menu-item "Browse File With TOC" 'html-wtoc-browse-page-with-toc
+              :visible '(and (nxhtml-buffer-possibly-local-viewable)
+                             (featurep 'html-wtoc)
+                             (html-site-current-merge-dir)
+                             (html-site-current-ensure-file-in-site file)
+                             )))
+      (define-key browse-map [nxhtml-browse-frame-file]
+        (list 'menu-item "Browse Frames File" 'html-toc-browse-frames-file
+              :enable '(and (featurep 'html-toc)
+                            (nxhtml-buffer-possibly-local-viewable))))
+      (define-key browse-map [nxhtml-browse-file]
+        (list 'menu-item "Browse File" 'nxhtml-browse-file
+              :enable '(nxhtml-buffer-possibly-local-viewable)))
+      )
+
+
+    (let ((link-map (make-sparse-keymap)))
+
+      (define-key link-map [nxhtml-chklnk]
+        (list 'menu-item "Check Links" 'html-chklnk-check-site-links
+              :enable '(featurep 'html-chklnk)))
+
+      (let ((move-map (make-sparse-keymap)))
+        (define-key move-map [html-move-buffer-file]
+          (list 'menu-item "Move Buffer File" 'html-move-buffer-file
+                :help "Move buffer file and update links"
+                :enable '(and buffer-file-name
+                              (featurep 'html-move))))
+        (define-key link-map [move-map]
+          (list 'menu-item "Moving Files" move-map))
+        (define-key link-map [move-map-separator] (list 'menu-item "--"))
+        )
+
+
+      (define-key link-map [nxhtml-paste-link]
+        (list 'menu-item "Paste Saved Relative Link" 'nxhtml-paste-link
+              :help "Paste link"
+              :enable '(and (boundp 'nxhtml-saved-link-file)
+                                    nxhtml-saved-link-file)))
+      (define-key link-map [nxhtml-paste-link-as-a-tag]
+        (list 'menu-item "Paste Saved Relative Link as <a href=...>" 'nxhtml-paste-link-as-a-tag
+              :help "Paste link as <a ...> tag"
+              :enable '(and (boundp 'nxhtml-saved-link-file)
+                            nxhtml-saved-link-file
+                            (nxhtml-nxml-html-in-buffer))))
+      (define-key link-map [nxhtml-save-link-to-here]
+        (list 'menu-item "Save Relative Link to Current File" 'nxhtml-save-link-to-here
+              :help "Save link info for current file"
+              :enable 'buffer-file-name))
+
+      (define-key link-map [nxhtml-separator-1] (list 'menu-item "--"))
+      (define-key link-map [mlinks-goto-link-other-frame]
+        (list 'menu-item "Follow MLink Link in New Frame" 'mlinks-goto-other-frame
+              :enable '(and (boundp 'mlinks-mode)
+                            mlinks-mode)
+              :help "Follow MLinks Link in New Frame"))
+      (define-key link-map [mlinks-goto-link-other-window]
+        (list 'menu-item "Follow MLink Link in Other Window" 'mlinks-goto-other-window
+              :enable '(and (boundp 'mlinks-mode)
+                            mlinks-mode)
+              :help "Follow MLinks Link in Other Window"))
+      (define-key link-map [mlinks-goto-link]
+        (list 'menu-item "Follow MLink Link" 'mlinks-goto
+              :enable '(and (boundp 'mlinks-mode)
+                            mlinks-mode)
+              :help "Follow MLinks Link"))
+      (define-key link-map [nxhtml-separator-follow-mlink] (list 'menu-item "--"))
+      (define-key link-map [mlinks-next-link]
+        (list 'menu-item "Next MLink Link" 'mlinks-forward-link
+              :enable '(and (boundp 'mlinks-mode)
+                            mlinks-mode)
+              :help "Go to next MLinks link"))
+      (define-key link-map [mlinks-prev-link]
+        (list 'menu-item "Previous MLink Link" 'mlinks-backward-link
+              :enable '(and (boundp 'mlinks-mode)
+                            mlinks-mode)
+              :help "Go to previous MLinks link"))
+
+;;       (define-key link-map [nxhtml-next-href]
+;;         (list 'menu-item "Next Link" 'nxhtml-next-href
+;;          :help "Go to next href field"))
+;;       (define-key link-map [nxhtml-prev-href]
+;;         (list 'menu-item "Previous Link" 'nxhtml-prev-href
+;;          :help "Go to previous href field"))
+
+      (define-key map [nxhtml-link-map]
+        (list 'menu-item "Links" link-map
+              :visible `(not (derived-mode-p 'dired-mode))
+              )))
+
+
+    (let ((site-map (make-sparse-keymap)))
+      (define-key map [nxhtml-site-map]
+        (list 'menu-item "Site" site-map))
+      (define-key site-map [html-site-global-mode]
+        (list 'menu-item "HTML Site Global Mode"
+              'html-site-global-mode
+              :button '(:toggle . (and (boundp 'html-site-global-mode)
+                                       html-site-global-mode))))
+      (define-key site-map [nxhtml-site-separator] (list 'menu-item "--"))
+      (define-key site-map [nxhtml-customize-site-list]
+        (list 'menu-item "Edit Sites" (lambda ()
+                                        "Customize option `html-size-list'."
+                                        (interactive)
+                                        (customize-option-other-window 'html-site-list))))
+      (define-key site-map [nxhtml-set-site]
+        (list 'menu-item "Set Current Site" 'html-site-set-site))
+      (define-key site-map [nxhtml-site-separator-1] (list 'menu-item "--"))
+      (define-key site-map [nxhtml-dired-site-top]
+        (list 'menu-item "Dired Site" 'html-site-dired-current))
+      (define-key site-map [nxhtml-find-site-file]
+        (list 'menu-item "Find File in Site" 'html-site-find-file))
+      (define-key site-map [nxhtml-site-search-separator]
+        (list 'menu-item "--" nil))
+      (define-key site-map [nxhtml-replace-in-site]
+        (list 'menu-item "Replace in Site Files" 'html-site-query-replace))
+      (define-key site-map [nxhtml-rgrep-in-site]
+        (list 'menu-item "Search Site Files" 'html-site-rgrep))
+      )
+
+    (define-key map [nxhtml-insert-separator]
+      (list 'menu-item "--" nil
+            :visible `(not (derived-mode-p 'dired-mode))
+            ))
+    (let ((chunk-map (make-sparse-keymap)))
+      (define-key map [nxhtml-chunk-map]
+        (list 'menu-item "Chunks" chunk-map
+              :visible `(not (derived-mode-p 'dired-mode))
+              :enable '(and (boundp 'mumamo-multi-major-mode)
+                            mumamo-multi-major-mode)))
+      (define-key chunk-map [nxhtml-customize-mumamo]
+        (list 'menu-item "Customize MuMaMo"
+              (lambda () (interactive) (customize-group-other-window 'mumamo))))
+      (define-key chunk-map [nxhtml-list-mumamo]
+        (list 'menu-item "List defined Multi Major Modes"
+              'mumamo-list-defined-multi-major-modes))
+      (define-key chunk-map [nxhtml-chunks-separator2]
+        (list 'menu-item "--" nil))
+      (define-key chunk-map [nxhtml-chunk-margin-info]
+        (list 'menu-item "Display chunk info in margin"
+              'mumamo-margin-info-global-mode
+              :button '(:toggle . (and (boundp 'mumamo-margin-info-global-mode)
+                                       mumamo-margin-info-global-mode))))
+      (define-key chunk-map [nxhtml-chunks-separator1]
+        (list 'menu-item "--" nil))
+      (let ((region-map (make-sparse-keymap)))
+        (define-key chunk-map [nxhtml-region-map]
+          (list 'menu-item "Make Chunks from Visible Region" region-map))
+        (define-key region-map [mumamo-clear-all-regions]
+          (list 'menu-item "Clear Region Chunks"
+                'mumamo-clear-all-regions
+                :enable '(fboundp 'mumamo-clear-all-regions)))
+        (define-key region-map [mumamo-add-region]
+          (list 'menu-item "Add Region Chunk"
+                'mumamo-add-region)))
+      (define-key chunk-map [nxhtml-region-separator]
+        (list 'menu-item "--" nil))
+      (define-key chunk-map [mumamo-mark-chunk]
+        (list 'menu-item "Mark Chunk"
+              'mumamo-mark-chunk))
+      (define-key chunk-map [nxhtml-separator-mark-chunk] (list 'menu-item "--"))
+      (define-key chunk-map [mumamo-backward-chunk]
+        (list 'menu-item "Backward Chunk"
+              'mumamo-backward-chunk))
+      (define-key chunk-map [mumamo-forward-chunk]
+        (list 'menu-item "Forward Chunk"
+              'mumamo-forward-chunk)))
+    (let ((tag-map (make-sparse-keymap)))
+      (define-key map [nxhtml-tag-map]
+        (list 'menu-item "Move by Tag" tag-map
+              :visible '(or (derived-mode-p 'nxml-mode)
+                            (derived-mode-p 'sgml-mode))
+              :enable '(or (derived-mode-p 'nxml-mode)
+                           (nxhtml-nxhtml-in-buffer))))
+      (define-key tag-map [nxml-forward-par]
+          (list 'menu-item "Forward Paragraph"
+                'nxml-forward-paragraph))
+      (define-key tag-map [nxml-backward-par]
+          (list 'menu-item "Backward Paragraph"
+                'nxml-backward-paragraph))
+      (define-key tag-map [nxml-insert-separator-move2] (list 'menu-item "--"))
+      (define-key tag-map [nxml-down]
+          (list 'menu-item "Forward Into Tag"
+                'nxml-down-element))
+      (define-key tag-map [nxml-backward-up]
+          (list 'menu-item "Backward Out of Tag"
+                'nxml-backward-up-element))
+      (define-key tag-map [nxml-insert-separator-move] (list 'menu-item "--"))
+      (define-key tag-map [nxml-forward]
+          (list 'menu-item "Forward Balanced Tag"
+                'nxml-forward-element))
+      (define-key tag-map [nxml-backward]
+          (list 'menu-item "Backward Balanced Tag"
+                'nxml-backward-element))
+      )
+
+    (let ((cmpl-map (make-sparse-keymap)))
+      (define-key map [nxhtml-cmpl-map]
+        (list 'menu-item "Completion and Validation" cmpl-map
+              ;; :enable '(or (derived-mode-p 'nxml-mode) (nxhtml-nxhtml-in-buffer))
+              :visible `(not (derived-mode-p 'dired-mode))
+              ))
+      (let ((val-map (make-sparse-keymap)))
+        (define-key cmpl-map [nxhtml-cmpl-val-map]
+          (list 'menu-item "Validation Helpers (for php etc)" val-map
+                :enable '(nxhtml-nxhtml-in-buffer)
+                :visible '(nxhtml-nxml-html-in-buffer)))
+;;;         (define-key val-map [nxhtml-strval-mode]
+;;;           (list 'menu-item "Allow attr=\"<?php...?>\" etc"
+;;;                 'nxhtml-strval-mode
+;;;                 :button '(:toggle . nxhtml-strval-mode)))
+        (define-key val-map [mumamo-alt-php-tags]
+          (list 'menu-item "Use <?php -> (?php"
+                'mumamo-alt-php-tags-mode
+                :button '(:toggle . (and (boundp 'mumamo-alt-php-tags-mode)
+                                         mumamo-alt-php-tags-mode))))
+        (define-key val-map [mumamo-alt-tags-separator] (list 'menu-item "--"))
+        (define-key val-map [nxhtml-toggle-warnings]
+          (list 'menu-item "Hide Validation Errors"
+                'nxhtml-toggle-visible-warnings
+                :button '(:toggle . (not (nxhtml-warnings-are-visible)))
+                ))
+        (define-key val-map [nxhtml-error-separator] (list 'menu-item "--"))
+        (define-key val-map [nxhtml-remove-saved-validation-header]
+          (list 'menu-item "Remove File's Fictive XHTML Validation Header"
+                'nxhtml-remove-saved-validation-header
+                ;; Fix-me: maybe a better enable here?
+                :enable 'nxhtml-validation-header-mode))
+        (define-key val-map [nxhtml-save-validation-header]
+          (list 'menu-item "Save File's Fictive XHTML Validation Header"
+                'nxhtml-save-validation-header
+                :enable 'nxhtml-validation-header-mode))
+        (define-key val-map [nxhtml-set-validation-header]
+          (list 'menu-item "Choose Fictive XHTML Validation Header for Buffer"
+                'nxhtml-set-validation-header))
+        (define-key val-map [nxhtml-update-validation-header]
+          (list 'menu-item "Update Fictive XHTML Validation Header for Buffer"
+                'nxhtml-update-validation-header))
+        (define-key val-map [nxhtml-use-saved-val-separator] (list 'menu-item "--"))
+;;;         (let ((afic-map (make-sparse-keymap)))
+;;;           (define-key val-map [nxhtml-afic-map]
+;;;             (list 'menu-item "Automatic Fictive XHTML Validation Header" afic-map))
+;;;           (define-key afic-map [nxhtml-validation-header-mumamo-set]
+;;;             (list 'menu-item "Customize Automatic XHTML Validation Turn On"
+;;;                   (lambda () (interactive) (customize-option 'nxhtml-validation-header-mumamo-modes))))
+;;;           (define-key afic-map [nxhtml-validation-header-mumamo]
+;;;             (list 'menu-item "Turn on Fictive XHTML Validation Header with MuMaMo"
+;;;                   'nxhtml-validation-header-if-mumamo-toggle
+;;;                   :button '(:toggle . nxhtml-validation-header-if-mumamo))))
+        (define-key val-map [nxhtml-show-validation-header]
+          (list 'menu-item "Display Fictive XHTML Validation Header"
+                'rngalt-display-validation-header-toggle
+                :help-echo "Displays the Fictive XHTML validation header (if any) at top of buffer"
+                :button '(:toggle . (and (boundp 'rngalt-display-validation-header)
+                                         rngalt-display-validation-header))))
+        (define-key val-map [nxhtml-recheck-validation-header]
+          (list 'menu-item "Recheck Fictive XHTML Validation Header in Buffer"
+                'nxhtml-recheck-validation-header
+                :enable 'nxhtml-validation-header-mode))
+        (define-key val-map [nxhtml-validation-header-mode]
+          (list 'menu-item "Use Fictive XHTML Validation Header in Buffer"
+                'nxhtml-validation-header-mode
+                :button '(:toggle . (and (boundp 'nxhtml-validation-header-mode)
+                                         nxhtml-validation-header-mode))))
+      )
+      (define-key cmpl-map [nxhtml-validation-separator]
+        (list 'menu-item "--" nil
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (let ((style-map (make-sparse-keymap)))
+        (define-key cmpl-map [nxhtml-cmpl-style-map]
+          (list 'menu-item "Completion Style" style-map
+                :visible '(nxhtml-nxml-html-in-buffer)
+                :enable '(nxhtml-nxhtml-in-buffer)))
+        (define-key style-map [popcmp-customize]
+          (list 'menu-item "Customize Completion Style"
+                (lambda () (interactive) (customize-group-other-window 'popcmp))))
+        (define-key style-map [popcmp-style-div2]
+          (list 'menu-item "--"))
+        ;;(defun nxhtml-nxml-html-in-buffer ()
+        (define-key style-map [popcmp-with-help]
+          (list 'menu-item "Show Short Help Beside Alternatives"
+                'popcmp-short-help-beside-alts-toggle
+                :button '(:toggle . (and (boundp 'popcmp-short-help-beside-alts)
+                                         popcmp-short-help-beside-alts))))
+        (define-key style-map [nxhtml-tag-do-also]
+          (list 'menu-item "Complete Tag Extras"
+                'nxhtml-tag-do-also-toggle
+                :button '(:toggle . (and (boundp 'nxhtml-tag-do-also)
+                                         nxhtml-tag-do-also))))
+        (define-key style-map [popcmp-group-alternatives]
+          (list 'menu-item "Group Alternatives"
+                'popcmp-group-alternatives-toggle
+                :button '(:toggle . (and (boundp 'popcmp-group-alternatives)
+                                         popcmp-group-alternatives))))
+        (define-key style-map [popcmp-style-div1]
+          (list 'menu-item "--"))
+        (define-key style-map [popcmp-anything-completion]
+          (list 'menu-item "Anything Style Completion"
+                (lambda () (interactive) (customize-set-variable 'popcmp-completion-style 'anything))
+                :enable `(fboundp 'anything)
+                :button `(:radio . (eq popcmp-completion-style 'anything))))
+        (define-key style-map [popcmp-emacs-completion]
+          (list 'menu-item "Emacs Default Style Completion"
+                (lambda () (interactive) (customize-set-variable 'popcmp-completion-style 'emacs-default))
+                :button `(:radio . (eq popcmp-completion-style 'emacs-default))))
+        (define-key style-map [popcmp-popup-completion]
+          (list 'menu-item "Popup Style Completion"
+                (lambda () (interactive) (customize-set-variable 'popcmp-completion-style 'popcmp-popup))
+                :button `(:radio . (eq popcmp-completion-style 'popcmp-popup))))
+        (define-key style-map [popcmp-company-completion]
+          (list 'menu-item "Company Mode Style Completion"
+                (lambda () (interactive) (customize-set-variable 'popcmp-completion-style 'company-mode))
+                :enable `(fboundp 'company-mode)
+                :button `(:radio . (eq popcmp-completion-style 'company-mode))))
+        )
+      (define-key cmpl-map [nxhtml-cmpl-separator]
+        (list 'menu-item "--" nil
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (define-key cmpl-map [nxhtml-untag-element]
+        (list 'menu-item "Untag Element" 'nxml-untag-element
+              :enable '(nxhtml-nxhtml-in-buffer)
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (define-key cmpl-map [rngalt-finish-element]
+        (list 'menu-item "Insert End Tag" 'rngalt-finish-element
+              :enable '(nxhtml-nxhtml-in-buffer)
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (define-key cmpl-map [nxhtml-complete]
+        (list 'menu-item "Complete tag, attribute etc" 'nxml-complete
+              :enable '(nxhtml-nxml-in-buffer)
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (define-key cmpl-map [nxhtml-tab-complete-div]
+        (list 'menu-item "--" nil
+              :visible '(nxhtml-nxml-html-in-buffer)))
+      (define-key cmpl-map [nxhtml-tab-complete]
+        (list 'menu-item "Indent and then Complete" 'tabkey2-first))
+      )
+
+    map))
+
+(defvar nxhtml-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [(control ?c) ?? ?x] 'nxhtml-short-tag-help)
+    (define-key map [(control ?c) ?? ?c] 'xhtml-help-show-css-ref)
+    (define-key map [(control ?c) ?_] 'nxhtml-toggle-visible-warnings)
+    (define-key map [menu-bar nxhtml-minor-mode]
+      (list 'menu-item "nXhtml" nxhtml-minor-mode-menu-map))
+    map))
+
+(define-minor-mode nxhtml-minor-mode
+  "Minor mode to turn on some key and menu bindings.
+See `nxhtml-mode' for more information."
+  :keymap nxhtml-minor-mode-map
+  :group 'nxhtml
+  )
+;;(put 'nxhtml-minor-mode 'permanent-local t)
+
+(defcustom nxhtml-minor-mode-modes
+  '(
+    nxhtml-mode
+    nxml-mode
+    html-mode
+    sgml-mode
+    xml-mode
+    php-mode
+    css-mode
+    javascript-mode
+    java-mode ;; jsp
+    image-mode
+    ;;
+    dired-mode
+    )
+  "List for turning on `nxhtml-minor-mode'.
+If the buffer's major modes is any of those in this list then
+`nxhtml-global-minor-mode' will turn on `nxhtml-minor-mode' in
+the buffer."
+  :type '(repeat (symbol :tag "Major mode"))
+  :group 'nxhtml)
+
+(defun nxhtml-maybe-turn-on-minor-mode ()
+  "Maybe turn on `nxhtml-minor-mode'.
+See `nxhtml-minor-mode-modes'."
+  (unless (or (minibufferp (current-buffer))
+              (string= " " (substring (buffer-name) 0 1))
+              (string= "*" (substring (buffer-name) 0 1))
+              )
+    (let ((on (and (boundp 'mumamo-multi-major-mode)
+                   mumamo-multi-major-mode)))
+      (dolist (major nxhtml-minor-mode-modes)
+        (when (derived-mode-p major)
+          (setq on t)))
+;;       (when (string= "php" (file-name-extension (buffer-file-name)))
+;;         (lwarn 't :warning "on=%s, major-mode=%s" on major-mode))
+      (when on
+        (nxhtml-minor-mode 1)))))
+
+;;;###autoload
+(define-globalized-minor-mode nxhtml-global-minor-mode
+  nxhtml-minor-mode
+  nxhtml-maybe-turn-on-minor-mode
+  ;;:require 'nxhtml-menu
+  :group 'nxhtml)
+;;(message "nxhtml-menu:here A")
+;;(custom-reevaluate-setting 'nxhtml-global-minor-mode)
+;;(message "nxhtml-menu:here B")
+;;(when nxhtml-global-minor-mode (nxhtml-global-minor-mode 1))
+;;(message "nxhtml-menu:here C")
+
+
+(defun nxhtml-docfile ()
+  (let* ((libfile (locate-library "nxhtml"))
+         (docfile (expand-file-name "doc/nxhtml.html"
+                                    (file-name-directory libfile))))
+    docfile))
+
+(defun nxhtml-docfile-url ()
+  (concat "file://" (nxhtml-docfile)))
+
+;;;###autoload
+(defun nxhtml-overview ()
+  "Show a HTML page with an overview of nXhtml."
+  (interactive)
+  (browse-url (nxhtml-docfile-url)))
+
+(defun nxhtml-tutorials ()
+  "Show a HTML page with a list of tutorials for nXhtml'."
+  (interactive)
+  (browse-url "http://ourcomments.org/Emacs/nXhtml/tut/tutorials.html"))
+
+(defun nxhtml-custom-valfaced (value &optional bgcolor)
+  (let ((v (if (sequencep value)
+               (copy-seq value)
+             value))
+        (bgcolor (if bgcolor bgcolor "RGB:FF/FF/AA")))
+    (put-text-property 0 (length v)
+                       'face (list
+                              'bold
+                               (cons 'background-color bgcolor)
+                               )
+                       v)
+    v))
+(defun nxhtml-custom-insert-nxhtml-row (symbol nxhtml-value description)
+  (let ((desc (if description
+                   (format "%s (%s)" description symbol)
+                 (format "%s" (custom-unlispify-tag-name symbol)))))
+    (widget-insert "  " description " (")
+    (nxhtml-custom-describe-defun symbol)
+    (widget-insert "): "
+                   (nxhtml-custom-valfaced
+                    (format "%s" (symbol-value symbol))
+                    (if (eq (symbol-value symbol)
+                            nxhtml-value)
+                        "GreenYellow"
+                      "gainsboro"))
+                   "\n")))
+
+(defun nxhtml-custom-h1(title &optional divider top-newline)
+  (let ((s title))
+    (put-text-property 0 (length s)
+                       'face '(:weight bold
+                               :height 1.4
+                               :foreground "DarkGreen"
+                               ;;:underline t
+                               )
+                       s)
+    (when top-newline (widget-insert "\n"))
+    ;;(when divider (widget-insert (nxhtml-custom-divider (length s))))
+    (widget-insert s)
+    ))
+
+(defun widget-button-notify (widget &rest ignore)
+  (apply (widget-get widget 'function) (widget-get widget 'data)))
+
+(defun widget-insert-link (txt function data)
+  (widget-insert-button txt function data
+                        :button-face 'link
+                        :mouse-face 'highlight
+                        :button-prefix ""
+                        :button-suffix ""))
+
+(defun widget-insert-button (txt function data &rest keywords)
+  (let ((btn (apply 'widget-create
+                    (append
+                     '(push-button
+                       :notify
+                       widget-button-notify)
+                     keywords
+                     (list txt)))))
+    (widget-put btn 'data data)
+    (widget-put btn 'function function)))
+
+(defun nxhtml-custom-url-link (txt url)
+  (let ((plain-url (substring-no-properties url)))
+    (unless (equal txt url)
+      (put-text-property 0 (length txt) 'help-echo plain-url txt))
+    (put-text-property 0 (length txt) 'mouse-face 'highlight txt)
+    (widget-insert-link txt 'browse-url (list url))))
+
+(defun nxhtml-custom-describe-defun (sym &optional help)
+  (let ((txt (symbol-name sym)))
+    (when help
+      (put-text-property 0 (length txt) 'help-echo help txt))
+    (put-text-property 0 (length txt) 'mouse-face 'highlight txt)
+    (widget-insert-link txt 'describe-function (list sym))))
+
+;; (defun nxhtml-quick-customize (&optional same-window)
+;;   "Show page for Quick Customize of nXhtml."
+;;   (interactive)
+;;   (require 'nxhtml)
+;;   (require 'custom)
+;;   (require 'cus-edit)
+;;   (if same-window
+;;       (switch-to-buffer "*Quick Customize nXhtml*")
+;;     (switch-to-buffer-other-window "*Quick Customize nXhtml*"))
+;;   (kill-all-local-variables)
+;;   (custom-mode)
+;;   (let ((inhibit-read-only t))
+;;     (erase-buffer))
+;;   (let ((sFound "found")
+;;         (sError "error"))
+;;     (put-text-property 0 (length sFound)
+;;                        'face '(bold
+;;                                (foreground-color . "green")) sFound)
+;;     (put-text-property 0 (length sError)
+;;                        'face '(bold
+;;                                (foreground-color . "red")) sError)
+;;     (let* (
+;;            (default-used "(not set yet - default used)")
+;;            )
+;;       (nxhtml-custom-h1 "Quick Customize for nXhtml" t)
+;;       (widget-insert "
+
+;; This page is for a quick and easy setup of some ")
+;;       (nxhtml-custom-url-link "nXhtml" (nxhtml-docfile-url))
+;;       (widget-insert " features
+;; that I did not want to turn on by default since they alter what
+;; happens when you open a file.  I suggest however that you turn
+;; them on since they are quite useful if you just understands what
+;; is happening.
+
+;; The values you set here are saved so that they will be used next
+;; time you start Emacs too.")
+;;       ;;(widget-insert-link "customize nXhtml" 'customize-group (list 'nxhtml))
+;;       (widget-insert "\n\n")
+
+;;       (nxhtml-custom-insert-nxhtml-row 'nxhtml-global-minor-mode t "Show the nXhtml menu in all relevant buffers\n\t")
+;;       ;;(nxhtml-custom-insert-nxhtml-row 'mumamo-global-mode t "Turn on Multiple Major Mode in all relevant buffers\n\t")
+;;       ;;(nxhtml-custom-insert-nxhtml-row 'mlinks-global-mode t "Make link of lins, for example href=\"...\"\n\t")
+;;       ;;(nxhtml-custom-insert-nxhtml-row 'indent-region-mode t "Use TAB to indent region when it is selected\n\t")
+
+;;       (widget-insert "\n")
+;;       (widget-insert-button " Turn them all on "
+;;                           (lambda ()
+;;                             (nxhtml-quick-all t)
+;;                             (nxhtml-quick-customize t))
+;;                           nil)
+;;       (widget-insert "  ")
+;;       (widget-insert-button " Turn them all off "
+;;                           (lambda ()
+;;                             (nxhtml-quick-all nil)
+;;                             (nxhtml-quick-customize t))
+;;                           nil)
+;;       (beginning-of-line)
+;;       )))
+
+;; (defun nxhtml-quick-all (on)
+;;   (custom-set-and-prepare-save 'nxhtml-global-minor-mode on)
+;;   ;;(custom-set-and-prepare-save 'mumamo-global-mode on)
+;;   (custom-set-and-prepare-save 'indent-region-mode on)
+;;   (when custom-file
+;;     (custom-save-all)))
+
+(defun custom-set-and-prepare-save (symbol value)
+  "Set SYMBOL to VALUE and add to customize.
+Both the current value and the value to save is set, but
+`custom-save-all' must be called to save customization."
+  (customize-set-variable symbol value)
+  (customize-set-value symbol value)
+  (customize-mark-to-save symbol))
+
+
+;;(nxhtml-quick-customize)
+
+(defun nxhtml-welcome ()
+  "Show welcome information."
+  (interactive)
+  (require 'cus-edit)
+  (let* ((bufnam "*nXhtml Welcome*")
+         (oldbuf (get-buffer bufnam))
+         (curwin (selected-window)))
+    (switch-to-buffer-other-window bufnam)
+    (unless oldbuf
+      (let ((inhibit-read-only t)
+            (here (point)))
+        (Custom-mode)
+        (nxhtml-minor-mode 1)
+        (setq cursor-in-non-selected-windows nil)
+        (nxhtml-custom-h1 "Welcome to nXhtml - a package for web editing" t)
+        (insert "\n\n")
+        (setq here (point))
+        (insert "If you have not done it already it might "
+                "be a good time to read at least The Quick Guide in the ")
+        (nxhtml-custom-url-link "nXhtml overview" (nxhtml-docfile-url))
+        (insert " now.\n\n")
+        (fill-region here (point))
+        (setq here (point))
+        (insert "And oh, wait! If you are new to Emacs too you might want "
+                "to take a quick ")
+        (nxhtml-custom-url-link
+         "Emacs tour"
+         "http://www.gnu.org/software/emacs/tour/")
+        (insert ".  And then perhaps the Emacs tutorial "
+                "(which is in the Help menu above).\n\n")
+        (fill-region here (point))
+        (setq here (point))
+
+        (unless (nxhtml-skip-welcome)
+          (insert "Click to ")
+          (widget-insert-link "remove this message"
+                              (lambda ()
+                                "Customize `nxhtml-skip-welcome'."
+                                (customize-option 'nxhtml-skip-welcome))
+                              nil)
+          (insert " at startup.  (This page is still "
+                  "available in the nXhtml menu, at the bottom.)"))
+        (fill-region here (point))
+        (setq here (point))
+        (goto-char (point-min))))
+    (select-window curwin)))
+
+(defcustom nxhtml-skip-welcome nil
+  "Turn this on to always skip the nXhtml welcome message."
+  :type 'boolean
+  :group 'nxhtml)
+
+(defun nxhtml-skip-welcome ()
+  "Return t if nXhtml welcome message should be skipped.
+If nil then the message will be shown when you open the first
+file using nxhtml-mode."
+   (or nxhtml-skip-welcome
+       (and nxhtml-global-minor-mode
+            ;;mumamo-global-mode
+            ;;indent-region-mode
+            )))
+
+(defun nxhtml-say-welcome-unless-skip ()
+  (condition-case err
+      (unless (nxhtml-skip-welcome)
+        (save-match-data
+          (nxhtml-welcome)))
+    (error (message "ERROR nxhtml-say-welcome-unless-skip: %s" err))))
+
+;; Show welcome screen once after loading nxhtml:
+;;(unless (boundp 'bytecomp-filename)
+(eval-when '(load)
+  (eval-after-load 'nxhtml
+    ;; Use a short delay if something like desktop is used:
+    '(run-with-idle-timer 0.5 nil 'nxhtml-say-welcome-unless-skip)))
+
+(provide 'nxhtml-menu)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; nxhtml-menu.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-mode.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml-mode.el
new file mode 100644
index 0000000000..9b1ab802bf
--- /dev/null
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml-mode.el
@@ -0,0 +1,2779 @@
+;;; nxhtml-mode.el --- Edit XHTML files
+
+;; Copyright (C) 2005-2008 by Lennart Borgman
+;; Parts are from Peter Heslin (see below)
+
+;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
+;; Created: 2005-08-05
+;;Version:
+;; Last-Updated: 2008-12-28 Sun
+;; Keywords: languages
+;;
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;  The purpose of nxhtml.el is to add some features that are useful
+;;  when editing XHTML files to nxml-mode.  For more information see
+;;  `nxhtml-mode'.
+;;
+;;
+;;  Usage:
+;;
+;;  See the file readme.txt in the directory above this file. Or, if
+;;  you do not have that follow the instructions below.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; History:
+;;
+;; 2006-04-25: Added completion for href, src etc. Removed xhtmlin.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This file is not part of Emacs
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (require 'mumamo))
+(eval-when-compile
+  (require 'cl)
+  (require 'appmenu-fold)
+  (require 'xhtml-help)
+  ;;(require 'nxhtml-menu)
+  (require 'fold-dwim)
+  (require 'typesetter nil t)
+  ;;(require 'outline)
+  (unless (or (< emacs-major-version 23)
+              (featurep 'nxhtml-autostart))
+    (let ((efn (expand-file-name
+                "../autostart.el"
+                (file-name-directory
+                 (or load-file-name
+                     (when (boundp 'bytecomp-filename) bytecomp-filename)
+                     buffer-file-name)))))
+      (message "efn=%s" efn)
+      (load efn))
+    (require 'rng-valid)
+    (require 'rng-nxml)
+    (require 'html-toc nil t)
+    (require 'html-pagetoc nil t)))
+
+(require 'typesetter nil t)
+(require 'button)
+(require 'loadhist)
+(require 'nxml-mode)
+
+;; Require nxml things conditionally to silence byte compiler under
+;; Emacs 22.
+(require 'rngalt)
+
+(require 'url-parse)
+(require 'url-expand)
+(require 'popcmp)
+(eval-when-compile (require 'html-imenu))
+(eval-when-compile (require 'tidy-xhtml))
+(eval-when-compile (require 'html-quote))
+
+(defun nxhtml-version ()
+  "Show nxthml version."
+  (interactive)
+  (message "nXhtml mode version %s" nxhtml-menu:version))
+
+;;(defun nxhtml-nxml-fontify-attribute (att &optional namespace-declaration)
+;;"Holds the original `nxml-fontify-attribute' function.")
+;;(fset 'nxhtml-nxml-fontify-attribute (symbol-function 'nxml-fontify-attribute))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Folding etc. This part is taken from
+;; http://www.emacswiki.org/cgi-bin/wiki/NxmlModeForXHTML and was
+;; originally written by Peter Heslin. It requires fold-dwim.el.
+
+(defun nxhtml-setup-for-fold-dwim ()
+  (make-local-variable 'outline-regexp)
+  (setq outline-regexp "\\s *<\\([h][1-6]\\|html\\|body\\|head\\)\\b")
+  (make-local-variable 'outline-level)
+  (setq outline-level 'nxhtml-outline-level)
+  (outline-minor-mode 1)
+  (hs-minor-mode 1)
+  (add-to-list 'hs-special-modes-alist
+               '(nxhtml-mode
+                 "<!--\\|<[^/>]>\\|<[^/][^>]*[^/]>"
+                 "</\\|-->"
+                 "<!--" ;; won't work on its own; uses syntax table
+                 (lambda (arg) (nxhtml-hs-forward-element))
+                 nil))
+  (when (featurep 'appmenu-fold)
+    (appmenu-fold-setup))
+  )
+
+(defun nxhtml-outline-level ()
+  ;;(message "nxhtml-outline-level=%s" (buffer-substring (match-beginning 0) (match-end 0)))(sit-for 2)
+  ;; Fix-me: What did I intend to do???
+  ;; (let ((tag (buffer-substring (match-beginning 1) (match-end 1))))
+  ;;   (if (eq (length tag) 2)
+  ;;       (- (aref tag 1) ?0)
+  ;;     0))
+  8)
+
+
+(defun nxhtml-hs-forward-element ()
+  (let ((nxml-sexp-element-flag))
+    (setq nxml-sexp-element-flag (not (looking-at "<!--")))
+    (unless (looking-at outline-regexp)
+      (condition-case nil
+          (nxml-forward-balanced-item 1)
+        (error nil)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+(defcustom nxhtml-use-imenu t
+  "Use imenu in nxhtml-mode."
+  :type 'boolean
+  :group 'nxhtml)
+
+
+
+(defcustom nxhtml-default-encoding 'iso-8859-1
+  "Default encoding."
+  :type 'coding-system
+  :group 'nxhtml)
+
+(defun nxhtml-insert-empty-frames-page ()
+  "Insert an empty frames page."
+  (interactive)
+  ;;(unless (= 0 (buffer-size))
+  (unless (nxhtml-can-insert-page-here)
+    (error "Buffer is not empty"))
+  (insert
+   "<?xml version=\"1.0\" encoding=\""
+   (symbol-name nxhtml-default-encoding)
+   "\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
+          \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title></title>
+  </head>
+  <frameset cols=\"50%, 50%\">
+    <frame src=\"about:blank\" />
+    <frame src=\"about:blank\" />
+  </frameset>
+</html>")
+  (search-backward "</title>"))
+
+(defun nxhtml-insert-empty-page ()
+  "Insert an empty XHTML page."
+  (interactive)
+  ;;(unless (= 0 (buffer-size))
+  (unless (nxhtml-can-insert-page-here)
+    (error "Buffer is not empty"))
+  (insert
+   "<?xml version=\"1.0\" encoding=\""
+   (symbol-name nxhtml-default-encoding)
+   "\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title></title>
+  </head>
+  <body>
+  </body>
+</html>")
+  (search-backward "</title>"))
+
+(defun nxhtml-empty-page-completion ()
+  ;;(unless (= 0 (buffer-size)) (error "Buffer is not empty"))
+  (let* ((frames "Frameset page")
+         (normal "Normal page")
+         ;;(vlhead "Validation header")
+         ;;popcmp-popup-completion
+         (initial nil) ;;(unless popcmp-popup-completion normal))
+         (hist (if (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+                   ;;(list vlhead frames normal)
+                   (list frames normal)
+                 (list frames normal)))
+         res
+         (completion-ignore-case t))
+    (setq res (popcmp-completing-read "Insert: " hist nil t initial (cons 'hist (length hist))))
+    (cond ((string= res frames)
+           (nxhtml-insert-empty-frames-page))
+          ((string= res normal)
+           (nxhtml-insert-empty-page))
+          ;;((string= res vlhead)
+          ;; (nxhtml-validation-header-mode))
+          (t
+           (error "Bad res=%s" res))))
+  (rng-auto-set-schema))
+
+
+
+(defvar nxhtml-mode-hook nil)
+;;(add-hook 'nxhtml-mode-hook 'nxml-fontify-buffer)
+
+(defun nxhtml-help ()
+  (interactive)
+  (describe-function 'nxhtml-mode))
+
+(defvar nxhtml-current-validation-header nil)
+(make-variable-buffer-local 'nxhtml-current-validation-header)
+(put 'nxhtml-current-validation-header 'permanent-local t)
+
+
+;; FIX-ME: When should this be done? Get tidy-menu-symbol:
+(when (featurep 'tidy-xhtml)
+  (tidy-build-menu))
+
+
+;; (eval-after-load 'css-mode
+;;   '(when (featurep 'xhtml-help)
+;;     (define-key css-mode-map [(control ?c) ?? ?c] 'xhtml-help-show-css-ref)
+;;     ))
+;; (add-hook 'css-mode-hook
+;;           (lambda ()
+;;             (and (featurep 'xhtml-help)
+;;                  (boundp 'css-mode-map)
+;;                  (define-key css-mode-map [(control ?c) ?? ?c]
+;;                    'xhtml-help-show-css-ref))))
+
+;; This should be run in `change-major-mode-hook'."
+(defun nxhtml-change-mode ()
+  (when (fboundp 'mlinks-mode)
+    (mlinks-mode 0)))
+
+(when (< emacs-major-version 23)
+  (defun nxml-change-mode ()
+    ;; Remove overlays used by nxml-mode.
+    (save-excursion
+      (save-restriction
+        (widen)
+        (rng-validate-mode -1)
+        (let ((inhibit-read-only t)
+              (buffer-undo-list t)
+              (modified (buffer-modified-p)))
+          (nxml-with-invisible-motion
+            (remove-text-properties (point-min) (point-max) '(face nil)))
+          (set-buffer-modified-p modified))))))
+
+(defcustom nxhtml-heading-element-name-regexp "[a-z]*"
+  "Used for `nxml-heading-element-name-regexp."
+  :type 'regexp
+  :group 'nxhtml)
+
+;; Fix-me: Put this is a separate file and load it only if nxml is
+;; availabe.
+(put 'nxhtml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
+;;;###autoload
+(define-derived-mode nxhtml-mode nxml-mode "nXhtml"
+  "Major mode for editing XHTML documents.
+It is based on `nxml-mode' and adds some features that are useful
+when editing XHTML files.\\<nxhtml-mode-map>
+
+To see an overview in html format do \\[nxhtml-overview].
+
+* Note: Please observe that when loading nXhtml some file
+  associations are done, see `nxhtml-auto-mode-alist'.
+
+The nXhtml menu is added by this mode \(or actually the minor
+mode `nxhtml-minor-mode') and gives quick access and an overview
+of some other important features. These includes:
+
+- multiple major modes, see `define-mumamo-multi-major-mode'
+- easy uploading and viewing of files, see for example
+  `html-upl-upload-file'
+- validation in XHTML part for php etc, see
+  `nxhtml-validation-header-mode' (you probably also want to know about
+  `nxhtml-toggle-visible-warnings' for this!)
+- converting of html to xhtml, see `tidy-buffer'
+
+The XML menu contains functionality added by `nxml-mode' \(on
+which this major mode is based).  There is also a popup menu
+added to the \[apps] key.
+
+The most important features are probably completion and
+validation, which is inherited from `nxml-mode' with some small
+addtions.  In very many situation you can use completion. To
+access it type \\[nxml-complete]. Completion has been enhanced in
+the following way:
+
+- If region is active and visible then completion will surround the
+  region with the chosen tag's start and end tag.  However only the
+  starting point is checked for validity. If something is wrong after
+  insertion you will however immediately see it if you have validation
+  on.
+- It can in some cases give assistance with attribute values.
+- Completion can be customized, see the menus XHTML - Completion:
+  * You can use a menu popup style completion.
+  * You can have alternatives grouped.
+  * You can get a short help text shown for each alternative.
+- There does not have to be a '<' before point for tag name
+  completion. (`nxml-mode' requires a '<' before point for tag name
+  completion.)
+- Completes xml version and encoding.
+- Completes in an empty buffer, ie inserts a skeleton.
+
+Some smaller, useful, but easy-to-miss features:
+
+* Following links. The href and src attribute names are
+  underlined and a special keymap is bound to
+  them:\\<mlinks-mode-map>
+
+    \\[mlinks-backward-link], \\[mlinks-forward-link] Move
+        between underlined href/src attributes
+
+    \\[mlinks-goto], Mouse-1 Follow link inside Emacs
+        (if possible)
+
+  It is even a little bit quicker when the links are in an active
+  state (marked with the face `isearch'):\\<mlinks-active-hilight-keymap>
+
+    \\[mlinks-backward-link], \\[mlinks-forward-link] Move
+        between underlined href/src attributes
+    \\[mlinks-goto], Mouse-1  Follow link inside Emacs (if possible)
+
+  If the link is not into a file that you can edit (a mailto link
+  for example) you will be prompted for an alternative action.
+
+* Creating links. To make it easier to create links to id/name
+  attribute in different files there are two special
+  functions:\\<nxhtml-mode-map>
+
+    \\[nxhtml-save-link-to-here] copy link to id/name (you must
+        be in the tag to get the link)
+    \\[nxhtml-paste-link-as-a-tag] paste this as an a-tag.
+
+Here are all key bindings in nxhtml-mode itself:
+
+\\{nxhtml-mode-map}
+
+The minor mode `nxhtml-minor-mode' adds some bindings:
+
+\\{nxhtml-minor-mode-map}
+
+Notice that other minor mode key bindings may also be active, as
+well as emulation modes. Do \\[describe-bindings] to get a list
+of all active key bindings. Also, *VERY IMPORTANT*, if mumamo is
+used in the buffer each mumamo chunk has a different major mode
+with different key bindings. You can however still see all
+bindings with \\[describe-bindings], but you have to do that with
+point in the mumamo chunk you want to know the key bindings in.
+
+---------
+* Note: Some of the features supported by this mode are optional
+  and available only if other Emacs modules are found.  Use
+  \\[nxhtml-features-check] to get a list of these optional
+  features and modules needed. You should however have no problem
+  with this if you have followed the installation instructions
+  for nXhtml."
+  (set (make-local-variable 'nxml-heading-element-name-regexp)
+       nxhtml-heading-element-name-regexp)
+  (when (fboundp 'nxml-change-mode)
+    (add-hook 'change-major-mode-hook 'nxml-change-mode nil t))
+  (add-hook 'change-major-mode-hook 'nxhtml-change-mode nil t)
+  (when (featurep 'rngalt)
+    (add-hook 'nxml-completion-hook 'rngalt-complete nil t))
+  ;;(define-key nxhtml-mode-map [(meta tab)] 'nxml-complete)
+  (nxhtml-minor-mode 1)
+  (when (and nxhtml-use-imenu
+             (featurep 'html-imenu))
+    (add-hook 'nxhtml-mode-hook 'html-imenu-setup nil t))
+  (mlinks-mode 1)
+  (nxhtml-setup-for-fold-dwim)
+  (when (featurep 'rngalt)
+    (set (make-local-variable 'rngalt-completing-read-tag) 'nxhtml-completing-read-tag)
+    (set (make-local-variable 'rngalt-completing-read-attribute-name) 'nxhtml-completing-read-attribute-name)
+    (set (make-local-variable 'rngalt-completing-read-attribute-value) 'nxhtml-completing-read-attribute-value)
+    (set (make-local-variable 'rngalt-complete-first-try) 'nxhtml-complete-first-try)
+    (set (make-local-variable 'rngalt-complete-last-try) 'nxhtml-complete-last-try)
+    ))
+
+;; Fix-me: The nxhtml-mode-map is define by define-derived-mode, but
+;; how should keys be added?
+
+;; Replace the Insert End Tag function:
+(define-key nxhtml-mode-map [(control ?c) (control ?f)] 'rngalt-finish-element)
+
+;; Put completion on the normal key?
+(define-key nxhtml-mode-map [(meta tab)] 'nxml-complete)
+;; Paragraphs (C-p mnemonic for paragraph)
+(define-key nxhtml-mode-map [(control ?c) (control ?p) ?l] 'longlines-mode)
+(define-key nxhtml-mode-map [(control ?c) (control ?p) ?f] 'fill-paragraph)
+(define-key nxhtml-mode-map [(control ?c) (control ?p) ?u] 'unfill-paragraph)
+;; Html related (C-h mnemonic for html)
+(define-key nxhtml-mode-map [(control ?c) (control ?h) ?c] 'nxhtml-save-link-to-here)
+(define-key nxhtml-mode-map [(control ?c) (control ?h) ?v] 'nxhtml-paste-link-as-a-tag)
+(define-key nxhtml-mode-map [(control ?c) (control ?h) ?b] 'nxhtml-browse-file)
+(define-key nxhtml-mode-map [(control ?c) ?<] 'nxml-untag-element)
+(when (featurep 'html-quote)
+  (define-key nxhtml-mode-map [(control ?c) (control ?q)] 'nxhtml-quote-html)
+  )
+;; Fix-me: Is pagetoc really that important to have its own keybindings?
+(when (featurep 'html-pagetoc)
+  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?i] 'html-pagetoc-insert-toc)
+  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?r] 'html-pagetoc-rebuild-toc)
+  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?s] 'html-pagetoc-insert-style-guide)
+  )
+
+(defun nxhtml-quote-html()
+  "Quote character(s) unsafe in html text parts.
+If region is visible quote all characters in region. Otherwise
+just quote current char.
+
+Note to CUA users: See `cua-mode' for how to prevent CUA from
+just copying region when you press C-c."
+  (interactive)
+  (if (and mark-active
+           transient-mark-mode)
+      (let* ((rb (region-beginning))
+             (re (region-end))
+             (qr (html-quote-html-string
+                  (buffer-substring-no-properties rb re))))
+        (delete-region rb re)
+        (insert qr))
+    (let ((cs (html-quote-html-char (char-after))))
+      (delete-char 1)
+      (insert cs))))
+
+(defvar nxhtml-single-tags
+  '("base"
+    "meta"
+    "link"
+    "br"
+    "hr"
+    "frame"
+    "img"
+    "input"
+    "option"
+    "param"))
+
+(defun nxthml-is-single-tag (tag)
+  (member tag nxhtml-single-tags))
+
+(defvar nxhtml-help-attribute-name
+  '(("title"    "Element title")
+    ("class"   "Style class of element")
+    ("charset"  "Encoding of target")
+    ("coords"   "Defining shape")
+    ("href"   "Target URL")
+    ("hreflang"   "Language of target")
+    ("name"   "(DEPRECEATED)")
+    ("rel"   "Target's relation to document")
+    ("rev"   "Document's relation to target")
+    ("shape"   "Area shape")
+    ("target"   "Where to open target")
+    ("type"   "MIME type of target")
+
+    ("id"   "Unique id of element")
+    ("lang"   "Language code")
+    ("dir"   "Text direction")
+    ("accesskey"   "Keyboard shortcut")
+    ("tabindex"   "Tab order of element")
+
+    ("style"   "Inline style")
+    ("disabled"   "Tag initially disabled")
+    ("readonly"   "User can not modify")
+    ;;(""   "")
+
+    ("alink" "(DEPRECEATED)")
+    ("background" "(DEPRECEATED)")
+    ("bgcolor" "(DEPRECEATED)")
+    ("link" "(DEPRECEATED)")
+    ("text" "(DEPRECEATED)")
+    ("vlink" "(DEPRECEATED)")
+    ("xml:lang" "Tag content language")
+    ("cite" "URL with more info")
+    ("method" "HTTP method for sending")
+    ("accept" "Content types")
+    ("accept-charset" "Character sets")
+    ("enctype" "Encoding")
+    ))
+(defvar nxhtml-help-attribute-name-tag
+  '(("textarea"
+     ("name" "Name for textarea")
+     )
+    ))
+
+(defvar nxhtml-help-tag
+  (let ((h (make-hash-table :test 'equal)))
+    (puthash "html"     "Document" h)
+    (puthash "head"     "Document head" h)
+    (puthash "title"    "Document title" h)
+    (puthash "base"     "Base URL/target" h)
+    (puthash "meta"     "Meta information" h)
+    (puthash "style"    "Inline style sheet" h)
+    (puthash "link"     "Style sheet etc" h)
+    (puthash "script"   "(Java)Script code" h)
+    (puthash "noscript" "Script disabled part" h)
+    (puthash "isindex"  "(DEPRECEATED)" h)
+
+    (puthash "iframe"   "Inline frame" h)
+    (puthash "frameset" "Organize frames" h)
+    (puthash "frame"    "Sub window" h)
+    (puthash "noframes" "Substitute for frames" h)
+
+    (puthash "bdo"      "Text direction" h)
+
+    (puthash "body"     "Document body" h)
+    (puthash "a"        "Link" h)
+    (puthash "p"        "Paragraph" h)
+    (puthash "span"     "Group inline elements" h)
+    (puthash "br"       "Line break" h)
+    (puthash "hr"       "Horizontal rule" h)
+    (puthash "div"      "Division/section" h)
+    (puthash "img"      "Image" h)
+    (puthash "h1"       "Header 1" h)
+    (puthash "del"      "Deleted text" h)
+    (puthash "strike"   "(DEPRECEATED)" h)
+    (puthash "u"        "(DEPRECEATED)" h)
+    (puthash "s"        "(DEPRECEATED)" h)
+    (puthash "ins"      "Inserted text" h)
+    (puthash "sup"      "Superscript text" h)
+    (puthash "center"   "(DEPRECEATED)" h)
+    (puthash "dir"      "(DEPRECEATED)" h)
+
+    (puthash "blockquote" "Long quotation" h)
+    (puthash "q"          "Short quotation" h)
+    (puthash "pre"      "Preformatted text" h)
+    (puthash "applet"   "(DEPRECEATED)" h)
+    (puthash "basefont" "(DEPRECEATED)" h)
+    (puthash "font"     "(DEPRECEATED)" h)
+
+    ;; The following elements are all font style elements. They are
+    ;; not deprecated, but it is possible to achieve richer effects
+    ;; using style sheets.
+    (puthash "tt"       "Renders as teletype or mono spaced text" h)
+    (puthash "i"        "Renders as italic text" h)
+    (puthash "b"        "Renders as bold text" h)
+    (puthash "big"      "Renders as bigger text" h)
+    (puthash "small"    "Renders as smaller text" h)
+
+
+    ;; The following tags are not deprecated, but it is possible to
+    ;; achieve a much richer effect using style sheets:
+    (puthash "em"       "Renders as emphasized text" h)
+    (puthash "strong"   "Renders as strong emphasized text" h)
+    (puthash "dfn"      "Defines a definition term" h)
+    (puthash "code"     "Defines computer code text" h)
+    (puthash "samp"     "Defines sample computer code" h)
+    (puthash "kbd"      "Defines keyboard text" h)
+    (puthash "var"      "Defines a variable" h)
+    (puthash "cite"     "Defines a citation" h)
+
+    (puthash "ul"       "Unordered list" h)
+    (puthash "ol"       "Ordered list" h)
+    (puthash "li"       "List element" h)
+    (puthash "dl"       "Definition list" h)
+    (puthash "dt"       "Definition term" h)
+    (puthash "dd"       "Definition description" h)
+
+
+    (puthash "fieldset" "Draw box around" h)
+    (puthash "form"     "User input form" h)
+    (puthash "input"    "Input field/checkbox etc" h)
+    (puthash "textarea" "Input multiline field" h)
+    (puthash "button"   "Push button" h)
+    (puthash "label"    "Label for control" h)
+    (puthash "map"      "Client side image map" h)
+    (puthash "select"   "Drop down list" h)
+    (puthash "option"   "Option in drop down list" h)
+    (puthash "menu"     "(DEPRECEATED)" h)
+
+    (puthash "object"   "Embedded object" h)
+    (puthash "param"    "Object settings" h)
+
+    (puthash "abbr"     "Abbreviation" h)
+    (puthash "address"  "For addresses etc" h)
+    (puthash "acronym"  "May be used for lookup etc" h)
+
+    (puthash "table"    "Table" h)
+    (puthash "caption"  "Table caption" h)
+    (puthash "col"      "Table column attributes" h)
+    (puthash "colgroup"  "Table column group" h)
+    (puthash "thead"    "Table header" h)
+    (puthash "tbody"    "Table body" h)
+    (puthash "tfoot"    "Table footer" h)
+    (puthash "tr"       "Table row" h)
+    (puthash "td"       "Table cell" h)
+
+    h))
+
+;;;###autoload
+(defun nxhtml-short-tag-help (tag)
+  "Display description of tag TAG.  If TAG is omitted, try tag at point."
+  (interactive
+   (let ((tag (xhtml-help-tag-at-point)))
+     (unless (stringp tag)
+       (setq tag (read-string "No tag at point. Give tag name: ")))
+     (list tag)))
+  (setq tag (downcase tag))
+  (let ((desc (gethash tag nxhtml-help-tag))
+        (use-dialog-box nil))
+    (unless desc
+      (setq desc (concat tag " -- No short description available")))
+    (when (y-or-n-p (concat desc ". Fetch more information from the Internet? "))
+      ;; Loaded by the autoloading of `xhtml-help-tag-at-point' above:
+      (xhtml-help-browse-tag tag))))
+
+(defvar nxhtml-no-single-tags nil)
+(defvar nxhtml-no-end-tags nil)
+
+(defadvice rng-complete-qname-function (around nxhtml-rng-complete-qname-function-ad
+                                               (string predicate flag)
+                                               disable)
+  ;;(if (not (eq major-mode 'nxhtml-mode))
+  (if (not nxhtml-completing-with-help)
+      ad-do-it
+    (setq ad-return-value
+          (let ((alist (mapcar (lambda (name) (cons name nil))
+                               (nxhtml-rng-generate-qname-list string))))
+            (cond ((not flag)
+                   (try-completion string alist predicate))
+                  ((eq flag t)
+                   (all-completions string alist predicate))
+                  ((eq flag 'lambda)
+                   (and (assoc string alist) t)))))))
+
+
+
+
+(defvar nxhtml-predicate-error nil)
+
+(defun nxhtml-find-ids (file)
+  (let ((buf (find-file-noselect file)))
+    (when buf
+      (with-current-buffer buf
+        (when (eq major-mode 'nxhtml-mode)
+          (save-excursion
+            (let ((ids nil)
+                  (id-ptrn
+                   (rx space
+                       "id"
+                       (0+ space)
+                       ?=
+                       (0+ space)
+                       ?\"
+                       (submatch
+                        (1+ (not (any ?\")))
+                        )
+                       ?\"
+                       )))
+              (goto-char (point-min))
+              (while (re-search-forward id-ptrn nil t)
+                (add-to-list 'ids (match-string-no-properties 1)))
+              ids)))))))
+
+(defun nxhtml-read-url (&optional allowed-types initial-contents extra-predicate prompt-prefix)
+  (popcmp-mark-completing initial-contents)
+  (let ((local-ovl popcmp-mark-completing-ovl))
+    (setq popcmp-mark-completing-ovl nil)
+    (unwind-protect
+        (let* ((url-type (nxhtml-read-url-type allowed-types initial-contents))
+               (base-prompt (cond ((eq url-type 'local-file-url)
+                                   "File: ")
+                                  ((eq url-type 'id-url)
+                                   "Id: ")
+                                  ((eq url-type 'web-url)
+                                   "Web URL: ")
+                                  ((eq url-type 'mail-url)
+                                   "e-Mail address: ")
+                                  ((eq url-type 'any-url)
+                                   "Any URL-type: ")
+                                  (t
+                                   ;;(error "Internal error: bad url-type=%s" url-type)
+                                   "Unknown URL-type: ")
+                                  ))
+               prompt
+               type-predicate
+               url
+               (bad-url initial-contents)
+               (default-directory (if buffer-file-name
+                                      (file-name-directory buffer-file-name)
+                                    default-directory)))
+          (when prompt-prefix
+            (setq base-prompt (concat prompt-prefix " " base-prompt)))
+          (setq nxhtml-predicate-error "")
+          (cond ((eq url-type 'local-file-url)
+                 )
+                ((eq url-type 'web-url)
+                 )
+                ((eq url-type 'mail-url)
+                 (setq type-predicate 'nxhtml-mailto-predicate)
+                 (when (and (stringp bad-url)
+                            (<= 7 (length bad-url))
+                            (string= "mailto:" (substring bad-url 0 7)))
+                   (setq bad-url (substring bad-url 7)))))
+          (while (not url)
+            (setq prompt (concat nxhtml-predicate-error " " base-prompt))
+            (cond ((eq url-type 'local-file-url)
+                   (setq url (read-file-name prompt nil "" nil bad-url extra-predicate))
+                   (when (< 0 (length url))
+                     ;; Fix-me: prompt for id here
+                     (setq url (file-relative-name
+                                (expand-file-name url)))))
+                  ((eq url-type 'id-url)
+                   (setq url (completing-read prompt (nxhtml-find-ids buffer-file-name)))
+                   (when url
+                     (setq url (concat "#" url))))
+                  ((eq url-type 'web-url)
+                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
+                                                          'nxhtml-read-web-url-history
+                                                          t)))
+                  ((eq url-type 'mail-url)
+                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
+                                                          'nxhtml-read-mail-url-history
+                                                          t)))
+                  (t
+                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
+                                                          'nxhtml-read-url-history
+                                                          t))))
+            (when (or (and type-predicate
+                           (not (funcall type-predicate url)))
+                      (and extra-predicate
+                           (not (funcall extra-predicate url))))
+              (setq bad-url url)
+              (setq url)))
+          (when (eq url-type 'mail-url)
+            (setq url (concat "mailto:" url)))
+          url)
+      (delete-overlay local-ovl)
+      )))
+
+(defun nxhtml-read-url-type (allowed url-beginning)
+  (assert (or (listp allowed) (eq t allowed)) t)
+  (let* ((prompt "URL-type: ")
+         (parsed-url (url-generic-parse-url url-beginning))
+         (beg-type (url-type parsed-url))
+         (allowed-u allowed)
+         (completion-ignore-case t)
+         choices
+         choice)
+    ;; (url-type (url-generic-parse-url "#some-id"))
+    ;;(lwarn t :warning "url-type=%s, pu=%s" (url-type parsed-url) parsed-url)
+    ;; Emacs 23 bug workaround Sat Jan 26 2008
+    ;;(when (eq beg-type 'cl-struct-url) (setq beg-type (elt parsed-url 1)))
+    (cond ((string= "mailto" beg-type)
+           (setq allowed-u '(?m)))
+          ((or (string= "http"  beg-type)
+               (string= "https" beg-type)
+               (string= "ftp"   beg-type))
+           (setq allowed-u '(?w)))
+          ((= 1 (length beg-type)) ;; w32
+           (setq allowed-u '(?f)))
+          ((and (null beg-type)
+                url-beginning
+                (= ?# (string-to-char url-beginning)))
+           (setq allowed-u '(?i)))
+          )
+    ;; Be a bit picky and hopefully helpful, check if really allowed:
+    (unless (or (eq allowed t)
+                (equal allowed allowed-u))
+      (let ((temp-u (copy-sequence allowed-u)))
+        (dolist (a allowed)
+          (setq temp-u (delq a temp-u)))
+        (dolist (u temp-u)
+          (setq allowed-u (delq u allowed-u)))))
+    (if allowed-u
+        (when (eq allowed-u t)
+          (setq allowed-u '(?f ?i ?w ?m)))
+      (setq allowed-u '(?f ?w)))
+    (dolist (a allowed-u)
+      (cond
+       ((= a ?f)
+        (setq choices (cons "File" choices)))
+       ((= a ?i)
+        (setq choices (cons "Id" choices)))
+       ((= a ?w) (setq choices (cons "Url" choices)))
+       ((= a ?m) (setq choices (cons "Mail" choices)))
+       ))
+    (if (= 1 (length allowed-u))
+        (setq choice (car choices))
+      (setq choice (popcmp-completing-read prompt choices nil t
+                                           "" nil nil t)))
+    (cond ((string= choice "Id")
+           'id-url)
+          ((string= choice "File")
+           'local-file-url)
+          ((string= choice "Url")
+           'web-url)
+          ((string= choice "Mail")
+           'mail-url)
+          )))
+
+(defvar nxhtml-read-url-history nil)
+(defvar nxhtml-read-web-url-history nil)
+(defvar nxhtml-read-mail-url-history nil)
+
+(defconst nxhtml-in-xml-attribute-value-regex
+  (replace-regexp-in-string
+   "w"
+   xmltok-ncname-regexp
+   ;;"<w\\(?::w\\)?\
+   "<\\?xml\
+\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
+\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
+\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
+\\(\"[^\"]*\\|'[^']*\\)\\="
+   t
+   t))
+
+(defun nxhtml-mailto-predicate (url)
+  "Tries to match a mailto url.
+This is not supposed to be entirely correct."
+  (setq nxhtml-predicate-error nil)
+  ;; Local pattern copied from gnus.
+  (let ((r (concat "^"
+                   ;;"mailto:"
+                   "[a-z0-9$%(*-=?[_][^<>\")!;:,{}]*"
+                   "\@"
+                   "\\(?:[a-z0-9\-]+\.\\)+[a-z0-9]\\{2,4\\}$"))
+        (case-fold-search t))
+    ;;(message "mailpred") (sit-for 1)
+    (if (string-match r url)
+        t
+      (setq nxhtml-predicate-error "Malformed email address.")
+      nil)))
+
+(defcustom nxhtml-image-completion-pattern
+  "\\.\\(?:png\\|jpg\\|jpeg\\|gif\\)$"
+  "Pattern for matching image URLs in completion."
+  :type 'regexp
+  :group 'nxhtml)
+
+(defun nxhtml-image-url-predicate (url)
+  (setq nxhtml-predicate-error nil)
+  (if (or (file-directory-p url)
+          (string-match nxhtml-image-completion-pattern url))
+      t
+    (setq nxhtml-predicate-error "Does not match image file name pattern.")
+    nil
+    ))
+
+(defcustom nxhtml-css-completion-pattern
+  "\\.\\(?:css\\)$"
+  "Pattern for matching css URLs in completion."
+  :type 'regexp
+  :group 'nxhtml)
+
+(defun nxhtml-css-url-predicate (url)
+  (setq nxhtml-predicate-error nil)
+  (if (or (file-directory-p url)
+          (string-match nxhtml-css-completion-pattern url))
+      t
+    (setq nxhtml-predicate-error "Does not match css file name pattern.")
+    nil
+    ))
+
+(defcustom nxhtml-script-completion-pattern
+  "\\.\\(?:js\\)$"
+  "Pattern for matching src URLs in completion in script tags."
+  :type 'regexp
+  :group 'nxhtml)
+
+(defun nxhtml-script-url-predicate (url)
+  (setq nxhtml-predicate-error nil)
+  (if (or (file-directory-p url)
+          (string-match nxhtml-script-completion-pattern url))
+      t
+    (setq nxhtml-predicate-error "Does not match script file name pattern.")
+    nil
+    ))
+
+(defun nxhtml-coding-systems-complete (init default)
+  (let (coding-systems
+        hist-num
+        (n 0)
+        hist)
+    (unless (and init (< 0 (length init)))
+      (setq init default))
+    (mapc (lambda (coding-system)
+            (let ((mime-charset (coding-system-get coding-system 'mime-charset)))
+              (when mime-charset
+                (setq coding-systems (cons
+                                      (symbol-name mime-charset)
+                                      coding-systems)))))
+          (coding-system-list t))
+    (setq coding-systems (sort coding-systems 'string=))
+    (mapc (lambda (coding-system)
+            (unless (< 0 (length coding-system))
+              (error "len=0"))
+            (setq n (1+ n))
+            (when (string= coding-system init) (setq hist-num n)))
+          coding-systems)
+    (if hist-num
+        (setq hist (cons 'coding-systems hist-num))
+      (setq hist 'coding-systems))
+    (completing-read "Encoding (coding system): "
+                     coding-systems nil t init hist)))
+
+
+;; Note: This function does not currently use the state provided by
+;; the nxml and rng functions directly.  Instead it searches the
+;; environment near point to decide what to do.
+;; (defun nxhtml-complete-and-insert ()
+;;   "Perform XHTML completion at point.
+;; This is merely an extended version of `nxml-complete' with the following changes:
+
+;; - If region is visible and active then completion will surround the
+;;   region with the chosen tag's start and end tag.  However only the
+;;   starting point is checked for validity. If something is wrong after
+;;   insertion you will however immediately see it if you have validation
+;;   on.
+;; - Can in some cases give completion help inside attribute values.
+;; - There does not have to be a '<' before point for tag name
+;;   completion. (`nxml-mode' requires a '<' before point for tag name
+;;   completion.)
+;; - For tag names there is a popup style completion available. This
+;;   gives a bit more guiding since it groups the alternative tags. Set
+;;   `popcmp-popup-completion' to use this.
+;; - Completes xml version and encoding.
+;; - Completes an empty file, ie inserts a skeleton."
+;;   (interactive)
+;;   (let (res
+;;         (where (nxhtml-check-where)))
+;;     (or (when (eq where 'in-empty-page)
+;;           (nxhtml-empty-page-completion))
+;;         (when (and mark-active
+;;                    transient-mark-mode
+;;                    (eq where 'in-text))
+;;           (nxhtml-insert-tag))
+;;         (progn
+;;           (cond ((memq where '(in-start-tag in-closed-start-tag in-end-tag))
+;;                  (re-search-forward "\\=/?[a-z]*" nil t))
+;;                 ((memq where '(in-attr))
+;;                  (re-search-forward "\\=[a-z]*=" nil t))
+;;                 ((memq where '(in-attr-val in-xml-attr-val))
+;;                  (re-search-forward "\\=[^<>\" \t\r\n]*" nil t))
+;;                 )
+;;           (when (run-hook-with-args-until-success 'nxml-completion-hook)
+;;             (when (re-search-backward "[^=]\"\\=" nil t)
+;;               (forward-char) (delete-char 1)
+;;               ;;(undo-start) (undo-more 1)
+;;               )
+;;             t))
+;;         (when (and (not where)
+;;                    (char-before)
+;;                    (= ?\" (char-before)))
+;;           nil)
+;;         (when (or (when (char-before) (= ?> (char-before)))
+;;                   (eq where 'in-text))
+;;           (setq res t)
+;;           (nxhtml-insert-tag))
+;;         ;; Eventually we will complete on entity names here.
+;;         res
+;;         (progn
+;;           (ding)
+;;           (message "Cannot complete in this context")))))
+
+(defvar nxhtml-in-proc-instr-back-regex "<\\?[^<>]*\\=")
+(defvar nxhtml-in-proc-instr-forw-regex "\\=[^<>]*\\?>")
+
+(defconst rngalt-in-pre-attribute-value-regex
+  (replace-regexp-in-string
+   "w"
+   xmltok-ncname-regexp
+   "<w\\(?::w\\)?\
+\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
+\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
+\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
+\\="
+   t
+   t))
+
+(defun nxhtml-check-where ()
+  "Get a state for `nxhtml-complete-last-try'."
+  (let ((p (point))
+        (lt-pos (save-excursion (search-backward "<" nil t)))
+        res)
+    (cond ((= 0 (buffer-size))
+           (setq res 'in-empty-page))
+          ((looking-back "<!--[^<>]*\\=" 1 t)
+           (setq res 'in-comment))
+          ((let ((face (get-char-property (point) 'face)))
+             (when (memq face '(nxml-comment-content-face
+                                nxml-comment-delimiter-face))
+               (setq res 'in-comment)))
+           t)
+          ((looking-back nxhtml-in-xml-attribute-value-regex lt-pos t)
+           (setq res 'in-xml-attr-val))
+          ((looking-back nxhtml-in-proc-instr-back-regex 1 t)
+           (setq res 'in-proc-instr))
+          ((looking-back "<!D[^>]*\\=" 1 t)
+           (setq res 'in-doctype))
+          ((looking-back ">[^<]*" 1 t)
+           (setq res 'in-text))
+          ((looking-back rng-in-start-tag-name-regex 1 t)
+           (setq res 'in-tag-start)
+           (when (looking-at "\\=[^<]*>")
+             (setq res 'in-closed-start-tag)))
+          ((looking-back rng-in-end-tag-name-regex 1 t)
+           (setq res 'in-tag-end))
+          ((looking-back rng-in-attribute-regex 1 t)
+           (setq res 'in-attr))
+          ((looking-back rng-in-attribute-value-regex 1 t)
+           (setq res 'in-attr-val))
+          ((looking-back rngalt-in-pre-attribute-value-regex 1 t)
+           (setq res 'in-pre-attr-val))
+          ((looking-back "\"")
+           (setq res 'after-attr-val))
+          ((and rngalt-validation-header
+                (looking-back "\\`[^<]*"))
+           ;; FIX-ME: This is treated the same as in text currently,
+           ;; but this should be checked. Maybe it is best to test
+           ;; this here and return the relevant value?
+           (setq res 'after-validation-header))
+          )
+    ;;(message "res=%s" res)(sit-for 1)
+    (unless res
+      (error "Could not find a state for completion"))
+    res))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Make the completions additions cleaner:
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defconst nxhtml-tag-sets
+  '(("logical"
+     "del"
+     "ins"
+     "abbr"
+     "acronym"
+     "fieldset"
+     "blockquote"
+     "q"
+     "code"
+     "samp"
+     "cite"
+     "kbd"
+     "var"
+     "dfn"
+     "address"
+     "em"
+     "strong"
+     "pre"
+     )
+    ("physical"
+     "hr"
+     "sup"
+     "sub"
+     "font"
+     "basefont"
+     "br"
+     "big"
+     "small"
+     "strike"
+     "u"
+     "i"
+     "b"
+     "s"
+     "tt"
+     "center"
+     "bdo"
+     )
+    ("scripting"
+     "script"
+     "noscript"
+     "object"
+     "applet"
+     )
+    ("structure"
+     "iframe"
+     "p"
+     "div"
+     "span"
+     "h6"
+     "h5"
+     "h4"
+     "h3"
+     "h2"
+     "h1"
+     )
+
+    ("form"
+     "isindex"
+     "label"
+     "button"
+     "option"
+     "select"
+     "input"
+     "textarea"
+     "form"
+     )
+
+    ("list"
+     "dt"
+     "dd"
+     "li"
+     "dir"
+     "menu"
+     "ol"
+     "dl"
+     "ul"
+     )
+
+    ("link"
+     "a"
+     )
+
+    ("image"
+     "img"
+     "map"
+     )
+
+    ("table"
+     "table"
+     "tr"
+     "th"
+     "td"
+     "caption"
+     "col"
+     "colgroup"
+     "thead"
+     "tbody"
+     "tfoot"
+     )
+
+    ("document"
+     "base"
+     "style"
+     "link"
+     "head"
+     "body"
+     "frame"
+     "frameset"
+     "noframes"
+     "isindex"
+     "nextid"
+     "meta"
+     "title"
+     )
+    ))
+
+(defvar nxhtml-attr-sets
+  '(("scripting"
+     "onblur"
+     "onchange"
+     "onclick"
+     "ondblclick"
+     "onfocus"
+     "onkeydown"
+     "onkeypress"
+     "onkeyup"
+     "onload"
+     "onunload"
+     "onmousedown"
+     "onmousemove"
+     "onmouseout"
+     "onmouseover"
+     "onmouseup"
+     "onreset"
+     "onselect"
+     "onsubmit"
+     )
+    ("form"
+     "method"
+     "accept"
+     "accept-charset"
+     "enctype"
+     )
+    ("access"
+     "id"
+     "name"
+     "disabled"
+     "readonly")
+    ("layout"
+     "accesskey"
+     "class"
+     "coords"
+     "shape"
+     "style"
+     "tabindex"
+     "title"
+     "align"
+     "valign"
+     "alink"
+     "background"
+     "bgcolor"
+     "link"
+     "text"
+     "vlink"
+     "compact"
+     )
+    ("target"
+     "charset"
+     "href"
+     "hreflang"
+     "rel"
+     "rev"
+     "target"
+     "type"
+     )
+    ("language"
+     "dir"
+     "lang"
+     "xml:lang"
+     )
+    ;; id
+    ;; name
+    ;; xml:lang
+    ))
+
+(defun nxhtml-complete-last-try ()
+  (when rng-current-schema-file-name
+    (let ((where (nxhtml-check-where)))
+      (cond
+       ;;((eq where 'after-attr-val)
+       ;;(insert " ")
+       ;;)
+       ((eq where 'in-pre-attr-val)
+        (insert ?\"))
+       ((eq where 'in-comment)
+        (if (not (looking-at "[^>]*<"))
+            nil
+          (insert " -->")
+          t))
+       ((eq where 'in-xml-attr-val)
+        (let (attr
+              delimiter
+              val)
+          (save-excursion
+            (save-match-data
+              (re-search-forward "\\=[^<> \t\r\n\"]*" nil t)))
+          (let* ((name-start (match-beginning 1))
+                 (name-end (match-end 1))
+                 (colon (match-beginning 2))
+                 (attr (buffer-substring-no-properties name-start
+                                                       (or colon name-end)))
+                 (value-start (1+ (match-beginning 3)))
+                 (tag (save-excursion
+                        (when (search-backward-regexp "<[[:alpha:]]+" nil t)
+                          (match-string 0))))
+                 (init (buffer-substring-no-properties value-start (point))))
+            (setq delimiter (char-before value-start))
+            (cond ((string= "encoding" attr)
+                   ;; Give a default that works in browsers today
+                   (setq val (nxhtml-coding-systems-complete
+                              init
+                              (symbol-name nxhtml-default-encoding))))
+                  ((string= "version" attr)
+                   (setq val "1.0")))
+            (when val
+              (insert val)
+              t)
+            )))
+       ((or (memq where '(in-text
+                          after-validation-header
+                          in-empty-page)))
+        (rngalt-complete-tag-region-prepare)
+        (insert "<")
+        (condition-case err
+            (nxhtml-redisplay-complete)
+          (quit
+           (message "%s" (error-message-string err))
+           (undo-start)
+           (undo-more 1)
+           (rngalt-complete-tag-region-cleanup)))
+        t)
+       (t
+        ;;(message "LAST TRY where=%s" (nxhtml-check-where))(sit-for 1)
+        nil)
+       ))))
+
+(defun nxhtml-img-tag-do-also ()
+  (insert "alt=\"")
+  (rngalt-validate)
+  (insert (read-string "Alt attribute: ")
+          "\" ")
+  (insert "src=\"")
+  (rngalt-validate)
+  (let ((src (nxhtml-read-url nil nil 'nxhtml-image-url-predicate "Image")))
+    (insert src)
+    (insert "\"")
+    (when (file-exists-p src)
+      (let ((sizes (image-size (create-image (expand-file-name src)) t)))
+        (insert
+         " width=\""  (format "%d" (car sizes)) "\""
+         " height=\"" (format "%d" (cdr sizes)) "\"")
+        )))
+  (unless (save-match-data (looking-at "[^<]\\{,200\\}>"))
+    (insert " />")))
+
+(defun nxhtml-redisplay-complete ()
+  (rngalt-validate)
+  (rng-cancel-timers)
+  (message "")
+  (redisplay t)
+  (nxml-complete)
+  (rng-activate-timers))
+
+(defun nxhtml-read-from-minibuffer (prompt &optional
+                                           initial-contents keymap
+                                           read hist default-value
+                                           inherit-input-method)
+  (rng-cancel-timers)
+  (message "")
+  (let ((res (read-from-minibuffer prompt initial-contents keymap
+                                   read hist default-value inherit-input-method)))
+    (rng-activate-timers)
+    res))
+
+(defun nxhtml-meta-tag-do-also ()
+  (let ((type (popcmp-completing-read
+               "Type: "
+               '(
+                 ;;"Refresh/Redirect"
+                 "HTTP Message Headers"
+                 "Robot Rules"
+                 "Description for Search Engines"
+                 ))))
+    (cond
+     ((string= type "Description for Search Engines")
+      (insert " name=\"Description\"")
+      (insert " content=\"")
+      (insert (nxhtml-read-from-minibuffer "Description: "))
+      (insert "\" />"))
+     ((string= type "Robot Rules")
+      (insert " name=\"Robots\"")
+      (insert " content=\"")
+      (nxhtml-redisplay-complete)
+      (insert " />"))
+     ((string= type "HTTP Message Headers")
+      (insert " http-equiv=\"")
+      (nxhtml-redisplay-complete)
+      (insert " content=\"")
+      (insert (nxhtml-read-from-minibuffer "Content: "))
+      (insert "\" />")))))
+
+(defun nxhtml-style-tag-do-also ()
+  (insert "type=\"text/css\"")
+  (insert " media=\"")
+  (nxhtml-redisplay-complete)
+  (insert ">")
+  (indent-according-to-mode)
+  (insert "\n/* <![CDATA[ */")
+  (indent-according-to-mode)
+  (insert "\n")
+  (indent-according-to-mode)
+  (insert "\n/* ]] */")
+  (indent-according-to-mode)
+  (insert "\n</style>")
+  (indent-according-to-mode)
+  (insert "\n")
+  (end-of-line -2))
+
+(defun nxhtml-script-tag-do-also ()
+  (let ((type (popcmp-completing-read
+               "Type: "
+               '("Inlined"
+                 "Linked"))))
+    (cond
+     ((string= type "Inlined")
+      (insert "type=\"text/javascript\">")
+      (indent-according-to-mode)
+      (insert "\n// <![CDATA[")
+      (indent-according-to-mode)
+      (insert "\n")
+      (indent-according-to-mode)
+      (insert "\n// ]]>")
+      (indent-according-to-mode)
+      (insert "\n</script>")
+      (indent-according-to-mode)
+      (end-of-line -1))
+     ((string= type "Linked")
+      (insert "type=\"text/javascript\"")
+      (insert " src=\"")
+      (nxhtml-redisplay-complete)
+      (insert "></script>")))))
+
+(defun nxhtml-link-tag-do-also ()
+  (let ((type (popcmp-completing-read "Type: "
+                                      '(
+                                        "Other"
+                                        "Shortcut icon"
+                                        "Style sheet"
+                                        ))))
+    (cond
+     ((string= type "Style sheet")
+      (insert " rel=\"Stylesheet\" ")
+      (insert "type=\"text/css\" ")
+      (insert "href=\"")
+      (nxhtml-redisplay-complete)
+      (insert " media=\"")
+      (nxhtml-redisplay-complete)
+      (insert " />"))
+     ((string= type "Shortcut icon")
+      (insert " rel=\"Shortcut Icon\" ")
+      (insert "href=\"")
+      (nxhtml-redisplay-complete)
+      (insert " />"))
+     (t
+      (insert " ")
+      (nxhtml-redisplay-complete)
+      ))))
+
+(defun nxhtml-input-tag-do-also ()
+  (insert " ")
+  (rngalt-validate)
+  ;; type=
+  (insert "type=\"")
+  (nxhtml-redisplay-complete)
+  (insert " ")
+
+  (let* ((choice (save-match-data
+                   (when (looking-back "type=\"\\(.*\\)\" ")
+                     (match-string 1)))))
+    ;;(insert "type=\"" choice "\" ")
+    (rngalt-validate)
+    ;;(message "choice=%s" choice)(sit-for 2)
+    ;; name=
+    (when (member choice '("button" "checkbox" "file" "hidden" "image"
+                           "password" "radio" "text"))
+      (insert "name=\""
+              (read-string "Name (name): ")
+              "\" ")
+      (rngalt-validate))
+    ;; checked=
+    (when (member choice '("checkbox" "radio"))
+      (when (y-or-n-p "Checked? (checked): ")
+        (insert "checked=\"checked\" ")
+        (rngalt-validate)))
+    ;; disabled=
+    (unless (string= choice "hidden")
+      (unless (y-or-n-p "Enabled? : ")
+        (insert "disabled=\"disabled\" ")
+        (rngalt-validate)))
+    ;; readonly=
+    (when (string= choice "text")
+      (when (y-or-n-p "Readonly? (readonly): ")
+        (insert "readonly=\"readonly\" "))
+      (rngalt-validate))
+    (when (string= choice "file")
+      ;; accept=
+      (require 'mailcap)
+      (condition-case err
+          (let ((prompt (concat
+                         "Accept mime type, RET to stop ("
+                         "C-g to skip"
+                         "): "))
+                (mime " ")
+                mimes
+                (types (when (boundp 'mailcap-mime-extensions)
+                         (mapcar (lambda (elt)
+                                   (cdr elt))
+                                 mailcap-mime-extensions))))
+            (while (< 0 (length mime))
+              (setq mime
+                    (if types
+                        (completing-read prompt types)
+                      (read-string prompt)))
+              (when (< 0 (length mime))
+                (if mimes
+                    (setq mimes (concat mimes "," mime))
+                  (setq mimes mime))))
+            (when (and mimes
+                       (< 0 (length mimes)))
+              (insert "accept=\"" mimes "\" ")))
+        (quit (message "Skipped accept attribute")))
+      (rngalt-validate))
+    (when (string= choice "image")
+      ;; alt=
+      (insert "alt=\"")
+      (rngalt-validate)
+      (insert (read-string "Alt attribute: ")
+              "\" ")
+      (rngalt-validate)
+      ;; src=
+      (insert "src=\"")
+      (rngalt-validate)
+      (let ((src (nxhtml-read-url nil nil 'nxhtml-image-url-predicate "Image")))
+        (insert src)
+        (insert "\" "))
+      (rngalt-validate))
+    ;; value=
+    (cond
+     ((member choice '("button" "reset" "submit"))
+      (nxhtml-do-also-value "Label"))
+     ((member choice '("checkbox" "radio"))
+      (nxhtml-do-also-value "Result"))
+     ((member choice '("hidden" "password" "text"))
+      (nxhtml-do-also-value "Value"))
+     )
+    (insert "/>")
+    ;;(message "type=%s" choice)(sit-for 2)
+    ))
+
+(defun nxhtml-do-also-value (label)
+  (let ((v (read-string (concat label " (value): "))))
+    (when (and v
+               (< 0 (length v)))
+      (insert " value=\"" v "\" "))))
+
+(defun nxhtml-form-tag-do-also ()
+  (insert "action=\"")
+  (rngalt-validate)
+  (let ((src (nxhtml-read-url nil nil nil "Action")))
+    (insert src "\" "))
+  )
+
+(defconst nxhtml-complete-tag-do-also
+  '(("a"
+     (lambda ()
+       (insert " href=\"")
+       (rngalt-validate)
+       (insert (nxhtml-read-url t))
+       (insert "\"")))
+    ("form" nxhtml-form-tag-do-also)
+    ("img" nxhtml-img-tag-do-also)
+    ("input" nxhtml-input-tag-do-also)
+    ("link" nxhtml-link-tag-do-also)
+    ("script" nxhtml-script-tag-do-also)
+    ("style" nxhtml-style-tag-do-also)
+    ("meta" nxhtml-meta-tag-do-also)
+    )
+  "List of functions to call at tag completion.
+Each element of the list have the form
+
+  \(TAG-NAME TAG-FUN)
+
+If `nxhtml-tag-do-also' is non-nil then TAG-FUN is called after
+by `nxml-complete' (with the special setup of this function for
+`nxhtml-mode') when completing a tag with the name TAG-NAME.
+
+The list is handled as an association list, ie only the first
+occurence of a tag name is used.")
+
+(defun nxhtml-complete-tag-do-also-for-state-completion (dummy-completed)
+  "Add this to state completion functions completed hook."
+  (when (and nxhtml-tag-do-also
+             (derived-mode-p 'nxhtml-mode))
+    ;; Find out tag
+    (let ((tag nil))
+      (save-match-data
+        ;;(when (looking-back "<\\([a-z]+\\)[[:blank:]]+")
+        (when (looking-back "<\\([a-z]+\\)")
+          (setq tag (match-string 1))))
+      (when tag
+        (insert " ")
+        (nxhtml-complete-tag-do-also tag)))))
+
+(defun nxhtml-complete-tag-do-also (tag)
+  ;; First required attributes:
+  (let ((tagrec (assoc tag nxhtml-complete-tag-do-also)))
+    (when tagrec
+      (funcall (cadr tagrec))))
+  )
+
+(defun nxhtml-turn-onoff-tag-do-also (on)
+  (add-hook 'nxhtml-mode-hook 'nxhtml-check-tag-do-also)
+  (dolist (b (buffer-list))
+    (when (with-current-buffer b
+            (eq major-mode 'nxhtml-mode))
+      (if on
+          (progn
+            (add-hook 'rngalt-complete-tag-hooks 'nxhtml-complete-tag-do-also t t)
+            )
+        (remove-hook 'rngalt-complete-tag-hooks 'nxhtml-complete-tag-do-also t)
+        ))))
+
+(define-toggle nxhtml-tag-do-also t
+  "When completing tag names do some more if non-nil.
+For some tag names additional things can be done at completion to
+speed writing up.  For example for an <img ...> tag `nxhtml-mode'
+can prompt for src attribute and add width and height attributes
+if this attribute points to a local file.
+
+You can add additional elisp code for completing to
+`nxhtml-complete-tag-do-also'."
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (nxhtml-turn-onoff-tag-do-also value))
+  :group 'nxhtml)
+
+(defun nxhtml-check-tag-do-also ()
+  (when nxhtml-tag-do-also
+    (nxhtml-turn-onoff-tag-do-also t)))
+
+
+;;;###autoload
+(define-minor-mode nxhtml-validation-header-mode
+  "If on use a Fictive XHTML Validation Header for the buffer.
+See `nxhtml-set-validation-header' for information about Fictive XHTML Validation Headers.
+
+This mode may be turned on automatically in two ways:
+- If you try to do completion of a XHTML tag or attribute then
+  `nxthml-mode' may ask you if you want to turn this mode on if
+  needed.
+- You can also choose to have it turned on automatically whenever
+  a mumamo multi major mode is used, see
+  `nxhtml-validation-header-if-mumamo' for further information."
+  :global nil
+  :lighter " VH"
+  :group 'nxhtml
+  (if nxhtml-validation-header-mode
+      (progn
+        (unless nxhtml-current-validation-header
+          (setq nxhtml-current-validation-header
+                (nxhtml-get-default-validation-header)))
+        ;;(message "nxhtml-current-validation-header=%s" nxhtml-current-validation-header)
+        (if nxhtml-current-validation-header
+            (progn
+              (nxhtml-apply-validation-header)
+              (add-hook 'change-major-mode-hook 'nxhtml-vhm-change-major nil t)
+              (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+                (add-hook 'mumamo-change-major-mode-hook 'nxhtml-vhm-mumamo-change-major nil t)
+                (add-hook 'mumamo-after-change-major-mode-hook 'nxhtml-vhm-mumamo-after-change-major nil t)))
+          (run-with-idle-timer 0 nil 'nxhtml-validation-header-empty (current-buffer))))
+    (rngalt-set-validation-header nil)
+    (setq nxhtml-current-validation-header nil)
+    (remove-hook 'after-change-major-mode-hook 'nxhtml-vhm-after-change-major t)
+    (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+      (remove-hook 'mumamo-change-major-mode-hook 'nxhtml-vhm-mumamo-change-major t)
+      (remove-hook 'mumamo-after-change-major-mode-hook 'nxhtml-vhm-mumamo-after-change-major t))))
+
+(defun nxhtml-can-insert-page-here ()
+  (and (not nxhtml-validation-header-mode)
+       (= 1 (point))
+       (or (= 0 (buffer-size))
+           (save-restriction
+             (widen)
+             (save-match-data
+               (looking-at (rx buffer-start
+                               (0+ space)
+                               buffer-end)))))))
+
+(defun nxhtml-complete-first-try ()
+  (when (nxhtml-can-insert-page-here)
+    (nxhtml-empty-page-completion)))
+
+(defun nxhtml-completing-read-tag (prompt
+                                   table
+                                   &optional predicate require-match
+                                   initial-input hist def inherit-input-method)
+  (let ((popcmp-in-buffer-allowed t))
+    (popcmp-completing-read prompt
+                            table
+                            predicate require-match
+                            initial-input hist def inherit-input-method
+                            nxhtml-help-tag
+                            nxhtml-tag-sets)))
+
+(defun nxhtml-add-required-to-attr-set (tag)
+  (let ((missing (when tag
+                   (rngalt-get-missing-required-attr
+                    (nxthml-is-single-tag tag)))))
+    (if (not missing)
+        nxhtml-attr-sets
+      (cons (cons "Required" missing)
+            nxhtml-attr-sets))))
+
+(defun nxhtml-get-tag-specific-attr-help (tag)
+  (append (cdr (assoc tag nxhtml-help-attribute-name-tag)) nxhtml-help-attribute-name)
+  )
+
+(defconst nxhtml-in-start-tag-regex
+  ;;(defconst rng-in-start-tag-name-regex
+  (replace-regexp-in-string
+   "w"
+   xmltok-ncname-regexp
+   ;; Not entirely correct since < could be part of attribute value:
+   "<\\(w\\(?::w?\\)?\\)+ [^<]*"
+   t
+   t))
+
+(defun nxhtml-completing-read-attribute-name (prompt
+                                              table
+                                              &optional predicate require-match
+                                              initial-input hist def inherit-input-method)
+  (let* ((tag (save-match-data
+                ;;(when (looking-back "<\\([a-z1-6]+\\) [^<]*")
+                (when (looking-back nxhtml-in-start-tag-regex)
+                  (match-string 1))))
+         (attr-sets (nxhtml-add-required-to-attr-set tag))
+         (help-attr (nxhtml-get-tag-specific-attr-help tag))
+         (popcmp-in-buffer-allowed t)
+         )
+    (popcmp-completing-read prompt
+                            table
+                            predicate require-match
+                            initial-input hist def inherit-input-method
+                            help-attr
+                            attr-sets)))
+
+(defun nxhtml-completing-read-attribute-value (prompt
+                                               table
+                                               &optional predicate require-match
+                                               initial-input hist def inherit-input-method)
+  (let (val)
+    (if table
+        (let ((popcmp-in-buffer-allowed t))
+          (setq val (popcmp-completing-read prompt table
+                                            predicate require-match
+                                            initial-input hist def inherit-input-method)))
+      (let* (init
+             delimiter
+             (lt-pos (save-excursion (search-backward "<" nil t)))
+             (in-attr-val
+              (save-excursion
+                (re-search-backward rng-in-attribute-value-regex lt-pos t)))
+             (in-xml-attr-val
+              (unless in-attr-val
+                (save-excursion
+                  (re-search-backward nxhtml-in-xml-attribute-value-regex lt-pos t))))
+             )
+        (when (or in-attr-val in-xml-attr-val)
+          ;;(save-match-data (save-excursion (re-search-forward "\\=[^<> \t\r\n\"]*" nil t)))
+          (let* ((name-start (match-beginning 1))
+                 (name-end (match-end 1))
+                 (colon (match-beginning 2))
+                 (attr (buffer-substring-no-properties name-start
+                                                       (or colon name-end)))
+                 (value-start (1+ (match-beginning 3)))
+                 tag-start-end
+                 (tag (save-excursion
+                        (when (search-backward-regexp "<[[:alpha:]]+" nil t)
+                          (setq tag-start-end (match-end 0))
+                          (match-string-no-properties 0)))))
+            (setq init (buffer-substring-no-properties value-start (point)))
+            (setq delimiter (char-before value-start))
+            (if in-xml-attr-val
+                (error "in-xml-attr-val should not be true here!")
+              ;;             (cond ((string= "encoding" attr)
+              ;;                    ;; Give a default that works in browsers today
+              ;;                    (setq val (nxhtml-coding-systems-complete
+              ;;                               init
+              ;;                               (symbol-name nxhtml-default-encoding))))
+              ;;                   ((string= "version" attr)
+              ;;                    (setq val "1.0")))
+              (cond ((string= "rel" attr)
+                     (cond ((string= "<link" tag)
+                            (setq val (nxhtml-read-link-rel))
+                            )))
+                    ((string= "media" attr)
+                     (cond ((string= "<link" tag)
+                            (setq val (nxhtml-read-link-media)))
+                           ((string= "<style" tag)
+                            (setq val (nxhtml-read-link-media)))
+                           ))
+                    ((string= "type" attr)
+                     (cond ((string= "<link" tag)
+                            (setq val (nxhtml-read-link-type))
+                            )))
+                    ((string= "http-equiv" attr)
+                     (cond ((string= "<meta" tag)
+                            (setq val (nxhtml-read-meta-http-equiv)))))
+                    ((string= "content" attr)
+                     (cond ((string= "<meta" tag)
+                            (setq val (nxhtml-read-meta-content)))))
+                    ((string= "scheme" attr)
+                     (cond ((string= "<meta" tag)
+                            (setq val (nxhtml-read-meta-scheme)))))
+                    ((string= "name" attr)
+                     (cond ((string= "<meta" tag)
+                            (setq val (nxhtml-read-meta-name)))))
+                    ((string= "href" attr)
+                     (cond ((string= "<a" tag)
+                            (setq val (nxhtml-read-url t init)))
+                           ((string= "<base" tag)
+                            (setq val (nxhtml-read-url nil init nil "Base")))
+                           ((string= "<area" tag)
+                            (setq val (nxhtml-read-url nil init)))
+                           ((string= "<link" tag)
+                            (let (predicate
+                                  (here (point)))
+                              (save-excursion
+                                (goto-char tag-start-end)
+                                (cond
+                                 ((search-forward "text/css" here nil)
+                                  (setq predicate 'nxhtml-css-url-predicate))
+                                 ))
+                              (setq val (nxhtml-read-url nil init predicate))))
+                           (t
+                            (setq val (nxhtml-read-url nil init)))))
+                    ((string= "src" attr)
+                     (cond ((string= "<img" tag)
+                            (setq val (nxhtml-read-url nil init 'nxhtml-image-url-predicate "Image")))
+                           ((string= "<script" tag)
+                            (setq val (nxhtml-read-url nil init 'nxhtml-script-url-predicate "Script")))
+                           ((string= "<input" tag)
+                            (setq val (nxhtml-read-url nil init 'nxhtml-image-url-predicate "Image")))
+                           ((string= "<frame" tag)
+                            (setq val (nxhtml-read-url nil init nil "Frame Source")))
+                           ((string= "<iframe" tag)
+                            (setq val (nxhtml-read-url nil init nil "Frame Source")))
+                           (t
+                            (setq val (nxhtml-read-url nil init)))))))))))
+    ;;(unless val (setq val (read-from-minibuffer prompt init)))
+    (if (not val)
+        (progn
+          (message "No completion of attribute value available here")
+          nil)
+      val)))
+
+(defun nxhtml-read-link-type ()
+  (require 'mailcap)
+  (let ((types (when (boundp 'mailcap-mime-extensions)
+                 (mapcar (lambda (elt)
+                           (cdr elt))
+                         mailcap-mime-extensions))))
+    (completing-read "Link type: " types nil t)))
+
+(defun nxhtml-read-link-media ()
+  (let ((types '(
+                 "screen"
+                 "tty"
+                 "tv"
+                 "projection"
+                 "handheld"
+                 "print"
+                 "braille"
+                 "aural"
+                 "all"
+                 )))
+    (popcmp-completing-read "For media type: " types nil t)))
+
+(defun nxhtml-read-link-rel ()
+  (let ((predefined-linktypes '(
+                                "Alternate"
+                                "Appendix"
+                                "Bookmark"
+                                "Chapter"
+                                "Contents"
+                                "Copyright"
+                                "Glossary"
+                                "Help"
+                                "Index"
+                                "Next"
+                                "Prev"
+                                "Section"
+                                "Shortcut Icon"
+                                "Start"
+                                "Stylesheet"
+                                "Subsection"
+                                )))
+    (popcmp-completing-read "Predefined LinkTypes: " predefined-linktypes nil t)))
+
+(defun nxhtml-read-meta-name ()
+  (let ((types '(
+                 "author"
+                 "description"
+                 "keywords"
+                 "generator"
+                 "revised"
+                 ;;"others"
+                 )))
+    (popcmp-completing-read "Meta name: " types nil t)))
+
+(defun nxhtml-read-meta-content ()
+  (nxhtml-read-from-minibuffer "Meta content: "))
+
+(defun nxhtml-read-meta-scheme ()
+  (nxhtml-read-from-minibuffer "Meta scheme: "))
+
+(defun nxhtml-read-meta-http-equiv ()
+  (let ((types '(
+                 "content-type"
+                 "expires"
+                 "refresh"
+                 "set-cookie"
+                 )))
+    (popcmp-completing-read "Meta http-equiv: " types nil t)))
+
+(when nil
+  (setq rngalt-completing-read-tag nil)
+  (setq rngalt-complete-last-try nil)
+  )
+
+
+(when (featurep 'typesetter)
+  (defun typesetter-init-nxhtml-mode ()
+    (typesetter-init-html-mode))
+  )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Validation start state
+
+(defcustom nxhtml-validation-headers
+  '(
+    ("body-iso-8859-1" .
+     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title>Fictive XHTML Validation Header</title>
+  </head>
+  <body>
+"
+     )
+    ("head-iso-8859-1" .
+     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+"
+     )
+    ("html-iso-8859-1" .
+     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+"
+     )
+    ;;     ("doctype-iso-8859-1" .
+    ;;      "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+    ;; <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+    ;; \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+    ;; "
+    ;;      )
+    ;;     ("xml-iso-8859-1" .
+    ;;      "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+    ;; "
+    ;;      )
+
+    ("body-utf-8" .
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title>Fictive XHTML Validation Header</title>
+  </head>
+  <body>
+"
+     )
+    ("head-utf-8" .
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+"
+     )
+    ("head-closed-utf-8" .
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title></title>
+  </head>
+"
+     )
+    ("html-utf-8" .
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+"
+     )
+    ;;     ("doctype-utf-8" .
+    ;;      "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+    ;; <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
+    ;; \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+    ;; "
+    ;;      )
+    ;;     ("xml-utf-8" .
+    ;;      "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+    ;; "
+    ;;      )
+    )
+  "Fictive XHTML validation headers.
+Used by `nxhtml-set-validation-header'."
+  :type '(alist :key-type string :value-type string)
+  :group 'nxhtml)
+
+(defcustom nxhtml-default-validation-header nil
+  "Default Fictive XHTML validation header.
+Must be nil or one of the key values in
+`nxhtml-validation-headers'."
+  :type 'string
+  :set (lambda (sym val)
+         (if (or (null val)
+                 (assoc val nxhtml-validation-headers))
+             (set-default sym val)
+           (lwarn 'nxhtml-default-validation-header
+                  :warning "There is no Fictive XHTML Validation Header named %s" val)))
+  :group 'nxhtml)
+
+(defun nxhtml-must-have-validation-headers ()
+  (unless nxhtml-validation-headers
+    (error
+     "No XHTML validation headers. Please customize nxhtml-validation-headers.")))
+
+(defvar nxhtml-set-validation-header-hist nil)
+
+(defcustom nxhtml-guess-validation-header-alist
+  ;;(rx line-start (0+ blank) "<body")
+  '(
+    ("^[[:blank:]]*<body"   . "body-utf-8")
+    ("^[[:blank:]]*</head>" . "head-closed-utf-8")
+    ("^[[:blank:]]*<head"   . "head-utf-8")
+    ("^[[:blank:]]*<html"   . "html-utf-8")
+    )
+  "Alist used by `nxhtml-guess-validation-header'.
+Alternatives are tried from top to bottom until one fits."
+  :type '(alist :key-type (regexp :tag "If NOT found in buffer")
+                :value-type (string :tag "Use Fictive XHTML Validation Header"))
+  :group 'nxhtml)
+
+(defun nxhtml-guess-validation-header ()
+  "Return Fictive XHTML validation that could fit current buffer.
+This guess is made by matching the entries in
+`nxhtml-guess-validation-header-alist' against the buffer."
+  (nxhtml-must-have-validation-headers)
+  (save-excursion
+    (save-restriction
+      (save-match-data
+        (widen)
+        (let (rec
+              regexp
+              key
+              (guesses nxhtml-guess-validation-header-alist))
+          (goto-char (point-min))
+          (if (not (search-forward "</" 2000 t))
+              (progn
+                (setq rec (car guesses))
+                (setq key (cdr rec)))
+            (while (and guesses
+                        (not key))
+              (setq rec (car guesses))
+              (setq guesses (cdr guesses))
+              (setq regexp (car rec))
+              (goto-char (point-min))
+              ;; Fix-me: check for chunk and check if in string.
+              (let (found)
+                (while (and (not found)
+                            (re-search-forward regexp nil t))
+                  ;; ensure fontified, but how?
+                  (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+                    (let ((mumamo-just-changed-major nil))
+                      ;;(unless (and (mumamo-get-existing-chunk-at (point))
+                      (unless (and (mumamo-find-chunks (point) "guess-validation-header")
+                                   (eq t (get-text-property (point) 'fontified)))
+                        (mumamo-fontify-region (point-min) (+ 1000 (point))))))
+                  (unless (memq (get-text-property (point) 'face)
+                                '(font-lock-comment-face
+                                  font-lock-comment-delimiter-face
+                                  font-lock-doc-face
+                                  font-lock-string-face
+                                  ))
+                    (setq found t)))
+                (unless found
+                  (setq key (cdr rec))))))
+          ;;(unless (re-search-forward regexp nil t) (setq key (cdr rec)))))
+          key)))))
+
+(defun nxhtml-open-dir-saved-validation-headers (must-exist)
+  "Open file with saved validation headers and return buffer."
+  ;;(lwarn 't :warning "must-exist=%s" must-exist)
+  (when (buffer-file-name)
+    (let* ((dir-name (file-name-directory (buffer-file-name)))
+           (file-name (expand-file-name "nxhtml-val-headers.el"))
+           emacs-lisp-mode-hook)
+      (when (or (not must-exist)
+                (file-exists-p file-name))
+        (find-file-noselect file-name)))))
+
+(defun nxhtml-get-saved-validation-header ()
+  (when (buffer-file-name)
+    (let* ((val-buf (nxhtml-open-dir-saved-validation-headers t))
+           (file-name (file-name-nondirectory (buffer-file-name)))
+           validation-headers)
+      (when val-buf
+        (with-current-buffer val-buf
+          (eval-buffer))
+        (cadr (assoc file-name validation-headers))))))
+
+(defun nxhtml-remove-saved-validation-header ()
+  "Removed the saved validation header.
+Reverse the action done by `nxhtml-save-validation-header'."
+  (interactive)
+  (nxhtml-update-saved-validation-header nil))
+
+(defun nxhtml-save-validation-header ()
+  "Save the current validation header.
+The current validation is saved for the next time you open the
+current file.  It is then used by `nxhtml-validation-header-mode'
+and `nxhtml-set-validation-header'. This means that if you have
+turned on `nxhtml-global-validation-header-mode' this validation
+header will be set automatically.
+
+The saved validation header can be removed with
+`nxhtml-remove-saved-validation-header'.
+
+* Note: There is normally no need to save the validation headers
+  since `nxhtml-global-validation-header-mode' will add
+  validation headers as needed most of the time."
+  (interactive)
+  (nxhtml-update-saved-validation-header t))
+
+(defun nxhtml-update-saved-validation-header (save)
+  (unless (buffer-file-name)
+    (error "Validation Header can only be saved if buffer contains a file."))
+  (let* ((val-buf (nxhtml-open-dir-saved-validation-headers nil))
+         ;;(get-buffer-create "temp val head"))
+         validation-headers
+         (file-name (file-name-nondirectory (buffer-file-name)))
+         (entry (list file-name nxhtml-current-validation-header))
+         ;;entry-list
+         removed
+         )
+    ;; Get old headers
+    (with-current-buffer val-buf
+      (eval-buffer))
+    ;; Remove old value
+    (setq validation-headers
+          (delq nil
+                (mapcar (lambda (elt)
+                          (if (string= file-name (car elt))
+                              (progn
+                                (setq removed t)
+                                nil)
+                            elt))
+                        validation-headers)))
+    ;; Add new value
+    (when save
+      (setq validation-headers (cons entry validation-headers)))
+    (with-current-buffer val-buf
+      (erase-buffer)
+      ;;(print file-name val-buf)
+      ;;(print nxhtml-current-validation-header val-buf)
+      ;;(print entry val-buf)
+      (insert "(setq validation-headers (quote")
+      (print validation-headers val-buf)
+      (insert "))")
+      (basic-save-buffer)
+      )
+    (if save
+        (message "Current validation header for file saved")
+      (if removed
+          (message "Removed saved validation header")
+        (message "There was no saved validation header")))))
+
+(defun nxhtml-get-default-validation-header ()
+  "Return default Fictive XHTML validation header key for current buffer.
+If `nxhtml-default-validation-header' is non-nil then return
+this.  Otherwise return saved validation header if there is one
+or guess using `nxhtml-guess-validation-header'."
+  (or nxhtml-default-validation-header
+      (nxhtml-get-saved-validation-header)
+      (nxhtml-guess-validation-header)))
+
+(defun nxhtml-set-validation-header (&optional key)
+  "Set a Fictive XHTML validation header in the buffer.
+Such a header is not inserted in the buffer, but is only used by
+validation and XHTML completion by `nxhtml-mode'.
+
+The header is active for validation and completion if and only if
+`nxhtml-validation-header-mode' is on.
+
+Note that Fictive XHTML Validation Headers are normally chosen
+automatically, but you can use this function to override that choice.
+
+The header is chosen from `nxhtml-validation-headers'. If there
+is more than one you will be prompted. To set the default fictive
+XHTML validation header customize `nxhtml-validation-headers'.
+
+If called non-interactive then the header corresponding to key
+KEY will be used.  If KEY is nil then it is set to
+`nxhtml-default-validation-header'.
+
+This header can be visible or invisible in the buffer, for more
+information see `rngalt-show-validation-header'."
+  (interactive
+   (list
+    (let ((nh (length nxhtml-validation-headers))
+          (default (nxhtml-get-default-validation-header)))
+      (if (> nh 1)
+          (completing-read "XHTML validation header: "
+                           nxhtml-validation-headers
+                           nil
+                           t
+                           default
+                           nxhtml-set-validation-header-hist)
+        (if (not (y-or-n-p "Only one XHTML validation header is defined. Define more? "))
+            default
+          (customize-option 'nxhtml-validation-headers)
+          'adding)))))
+  ;;(lwarn 'svh2 :warning "key=%s" key)
+  (or key
+      (setq key (nxhtml-get-default-validation-header))
+      (setq key (cons 'schema "XHTML")))
+  (unless (eq key 'adding)
+    (setq nxhtml-current-validation-header key)
+    (nxhtml-validation-header-mode 1)
+    (nxhtml-apply-validation-header)))
+
+(defun nxhtml-apply-validation-header ()
+  (when nxhtml-current-validation-header
+    (setq rngalt-major-mode
+          (if (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+              (mumamo-main-major-mode)
+            major-mode))
+    (let* ((key nxhtml-current-validation-header)
+           (rec (unless (listp key)
+                  (assoc key nxhtml-validation-headers)))
+           (header (cdr rec)))
+      (if (listp key)
+          (let ((schema-file (rng-locate-schema-file (cdr key))))
+            (unless schema-file
+              (error "Could not locate schema for type id `%s'" key)) ;type-id))
+            (rng-set-schema-file-1 schema-file))
+        (rngalt-set-validation-header header)
+        ))))
+
+(defun nxhtml-update-validation-header ()
+  "Update the validation header in the buffer as needed."
+  (interactive)
+  (let ((mode-on nxhtml-validation-header-mode))
+    (when mode-on (nxhtml-validation-header-mode 0))
+    (setq nxhtml-current-validation-header nil)
+    (when mode-on (nxhtml-validation-header-mode 1))))
+
+(defun nxhtml-vhm-change-major ()
+  "Turn off `nxhtml-validation-header-mode' after change major."
+  ;;(message "nxhtml-vhm-change-major here")
+  (unless (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+    (setq nxhtml-current-validation-header nil))
+  (run-with-idle-timer 0 nil 'nxhtml-validation-header-empty (current-buffer)))
+(put 'nxhtml-vhm-change-mode 'permanent-local-hook t)
+
+(defun nxhtml-recheck-validation-header ()
+  "Just turn off and on again `nxhtml-validation-header-mode'.
+This will adjust the XHTML validation to the code currently in
+the buffer."
+  (interactive)
+  (nxhtml-validation-header-mode -1)
+  (nxhtml-validation-header-mode 1))
+
+(defun nxhtml-validation-header-empty (buffer)
+  "Turn off validation header mode.
+This is called because there was no validation header."
+  (with-current-buffer buffer
+    (unless nxhtml-current-validation-header
+      ;;(message "nxhtml-validation-header-empty")
+      (save-match-data ;; runs in timer
+        (nxhtml-validation-header-mode -1))
+      ;;(message "No validation header was needed")
+      )))
+
+(defun nxhtml-turn-on-validation-header-mode ()
+  "Turn on `nxhtml-validation-header-mode'."
+  (nxhtml-validation-header-mode 1))
+
+
+(defun nxhtml-vhm-mumamo-change-major ()
+  (put 'rngalt-validation-header 'permanent-local t)
+  (put 'nxhtml-validation-header-mode 'permanent-local t)
+  (put 'nxhtml-current-validation-header 'permanent-local t)
+  ;;(put 'nxhtml-validation-header-mode-major-mode 'permanent-local t)
+  ;;(setq nxhtml-validation-header-mode-major-mode mumamo-set-major-running)
+  )
+
+(defun nxhtml-vhm-mumamo-after-change-major ()
+  (put 'rngalt-validation-header 'permanent-local nil)
+  (put 'nxhtml-validation-header-mode 'permanent-local nil)
+  (put 'nxhtml-current-validation-header 'permanent-local nil)
+  ;;(put 'nxhtml-validation-header-mode-major-mode 'permanent-local nil)
+  )
+
+(defcustom nxhtml-validation-headers-check 'html
+  "Defines what check the function with the same name does.
+The function returns true if the condition here is met."
+  :type '(choice :tag "Add Fictive XHTML Validation Header if:"
+                 (const :tag "If buffer contains html" html)
+                 (const :tag "If buffer contains html or is empty" html-empty))
+  :group 'nxhtml)
+
+;; (defun nxhtml-validation-headers-check (buffer)
+;;   "Return non-nil if buffer contains a html tag or is empty.
+;; This is for use with `nxhtml-validation-header-filenames'.
+
+;; The variable `nxhtml-validation-headers-check' determines how the
+;; check is made."
+;;   (if (= 0 (buffer-size buffer))
+;;       (eq 'html-empty nxhtml-validation-headers-check)
+;;     (save-match-data
+;;       (save-restriction
+;;         (let ((here (point))
+;;               (html nil))
+;;           (goto-char (point-min))
+;;           (setq html (re-search-forward "</?[a-z]+>" nil t))
+;;           (goto-char here)
+;;           html)))))
+
+;; (defcustom nxhtml-validation-header-filenames
+;;   '(
+;;     ("\.php\\'" nxhtml-validation-headers-check)
+;;     ("\.rhtml\\'" nxhtml-validation-headers-check)
+;;     ("\.jsp\\'" nxhtml-validation-headers-check)
+;;     )
+;;   "Alist for turning on `nxhtml-validation-mode'.
+;; The entries in the list should have the form
+
+;;   \(FILE-REGEXP CHECK-FUNCION)
+
+;; If buffer file name matches the regexp FILE-REGEXP and the
+;; function CHECK-FUNCTION returns non-nil when called with the
+;; buffer as an argument \(or CHECK-FUNCTION is nil) then
+;; `nxhtml-global-validation-header-mode' will turn on
+;; `nxhtml-validation-header-mode' in buffer.
+
+;; The function `nxhtml-validation-headers-check' may be a useful
+;; value for CHECK-FUNCTION.
+
+;; See also `nxhtml-maybe-turn-on-validation-header'."
+;;   :type '(alist :key-type regexp :tag "File name regexp"
+;;                 :value-type (group (choice (const :tag "No more check" nil)
+;;                                            (function :tag "Check buffer with"))))
+;;   :group 'nxhtml)
+
+
+
+;; (defun nxhtml-maybe-turn-on-validation-header ()
+;;   "Maybe turn on `nxhtml-validation-header-mode' in buffer.
+;; This is called by `nxhtml-global-validation-header-mode'.
+
+;; See `nxhtml-validation-header-filenames' for how the check
+;; is made."
+;;   (or (and (or (and mumamo-mode
+;;                     (eq (mumamo-main-major-mode) 'nxhtml-mode))
+;;                (eq major-mode 'nxhtml-mode))
+;;            rngalt-validation-header
+;;            nxhtml-current-validation-header
+;;            nxhtml-validation-header-mode
+;;            (progn
+;;              ;;(lwarn 'maybe :warning "quick, buffer=%s" (current-buffer))
+;;              (nxhtml-validation-header-mode 1)
+;;              t))
+;;       (when (buffer-file-name)
+;;         (unless (or ;;nxhtml-validation-header-mode
+;;                  (minibufferp (current-buffer))
+;;                  (string= " " (substring (buffer-name) 0 1))
+;;                  (string= "*" (substring (buffer-name) 0 1))
+;;                  )
+;;           (when (catch 'turn-on
+;;                   (save-match-data
+;;                     (dolist (rec nxhtml-validation-header-filenames)
+;;                       (when (string-match (car rec) (buffer-file-name))
+;;                         (let ((fun (nth 1 rec)))
+;;                           (if (not fun)
+;;                               (progn
+;;                                 ;;(lwarn 't :warning "matched %s to %s, nil" (car rec) (buffer-file-name))
+;;                                 (throw 'turn-on t))
+;;                             (when (funcall fun (current-buffer))
+;;                               ;;(lwarn 't :warning "matched %s to %s" (car rec) (buffer-file-name))
+;;                               (throw 'turn-on t))))))))
+;;             ;;(lwarn 't :warning "turn on %s, buffer=%s" major-mode (current-buffer))
+;;             (nxhtml-validation-header-mode 1))))))
+
+
+;; ;; Fix-me: Is this really the way to do it? Would it not be better to
+;; ;; tie this to mumamo-mode in the turn on hook there? After all
+;; ;; validation headers are probably not used unless mumamo-mode is on.
+;; (define-globalized-minor-mode nxhtml-global-validation-header-mode
+;;   nxhtml-validation-header-mode
+;;   nxhtml-maybe-turn-on-validation-header
+;;   :group 'nxhtml)
+;; ;; The problem with global minor modes:
+;; (when (and nxhtml-global-validation-header-mode
+;;            (not (boundp 'define-global-minor-mode-bug)))
+;;   (nxhtml-global-validation-header-mode 1))
+
+
+(defcustom nxhtml-validation-header-mumamo-modes
+  '(nxhtml-mode)
+  "Main major modes for which to turn on validation header.
+Turn on Fictive XHTML Validation Header if main major mode for the
+used mumamo multi major mode is any of those in this list.
+
+See `mumamo-defined-turn-on-functions' for information about
+mumamo multi major modes."
+  :type '(repeat (function :tag "Main major mode in mumamo"))
+  :group 'nxhtml)
+
+(defun nxhtml-add-validation-header-if-mumamo ()
+  "Maybe turn on validation header.
+See `nxhtml-validation-header-if-mumamo' for more information."
+  ;;(nxhtml-validation-headers-check (current-buffer))
+  (when (and (fboundp 'mumamo-main-major-mode)
+             (memq (mumamo-main-major-mode) nxhtml-validation-header-mumamo-modes))
+    (nxhtml-validation-header-mode 1)))
+
+(define-toggle nxhtml-validation-header-if-mumamo nil
+  "Add a fictive validation header when mumamo is used.
+If this variable is t then add a Fictive XHTML Validation Header
+\(see `nxhtml-validation-header-mode') in buffer when mumamo is
+used. However do this only if `mumamo-main-major-mode' is one of
+those in `nxhtml-validation-header-mumamo-modes'.
+
+Changing this variable through custom adds/removes the function
+`nxhtml-add-validation-header-if-mumamo' to
+`mumamo-turn-on-hook'."
+  :set '(lambda (sym val)
+          (set-default sym val)
+          (if val
+              (add-hook 'mumamo-turn-on-hook 'nxhtml-add-validation-header-if-mumamo)
+            (remove-hook 'mumamo-turn-on-hook 'nxhtml-add-validation-header-if-mumamo)))
+  :group 'nxhtml)
+
+(defun nxhtml-warnings-are-visible ()
+  (get 'rng-error 'face))
+
+(defvar nxhtml-old-rng-error-face nil)
+(defun nxhtml-toggle-visible-warnings ()
+  "Toggle the red underline on validation errors.
+Those can be quite disturbing when using mumamo multi major modes
+because there will probably be many validation errors in for
+example a php buffer, since unfortunately the validation routines
+in `rng-validate-mode' from `nxml-mode' tries to validate the
+whole buffer as XHTML.
+
+Also, because of a \(normally unimportant) bug in Emacs 22,
+the red underline that marks an error will sometimes span several
+lines instead of just marking a single character as it
+should. \(This bug is a problem with overlays in Emacs 22.)"
+  (interactive)
+  (let ((face (get 'rng-error 'face)))
+    (if face
+        (progn
+          (setq nxhtml-old-rng-error-face (get 'rng-error 'face))
+          (put 'rng-error 'face nil))
+      (put 'rng-error 'face nxhtml-old-rng-error-face))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Bug corrections
+;; (defun nxml-indent-line ()
+;;   "Indent current line as XML."
+;;   (let ((indent (nxml-compute-indent))
+;;         (from-end (- (point-max) (point))))
+;;     (when indent
+;;       (beginning-of-line)
+;;       (let ((bol (point)))
+;;         (skip-chars-forward " \t")
+;;         ;; There is a problem with some lines, try a quick fix:
+;;         (when (and (= 0 indent)
+;;                    (not (eq (char-after) ?<)))
+;;           (save-excursion
+;;             (save-match-data
+;;               (when (re-search-backward "^<" nil t)
+;;                 (when (search-forward " ")
+;;                   (setq indent (current-column))))))
+;;           (when (= 0 indent)
+;;             (setq indent nxml-child-indent)))
+;;         ;; And sometimes nxml-compute-indent get very upset, check for
+;;         ;; that:
+;;         (let ((here (point)))
+;;           (beginning-of-line 0)
+;;           (back-to-indentation)
+;;           (when (and (= indent (current-column))
+;;                      (eq (char-after) ?\"))
+;;             (setq indent 0))
+;;           (goto-char here))
+;;         (unless (= (current-column) indent)
+;;           (delete-region bol (point))
+;;           (indent-to indent)))
+;;       (when (> (- (point-max) from-end) (point))
+;;         (goto-char (- (point-max) from-end))))))
+
+
+;; FIX-ME: untag should be in nxml-mode.el since it is in no way
+;; specific to nxhtml-mode, but I do not want to change nxml-mode.el
+;; at the moment.
+
+(defcustom nxml-untag-select 'yes
+  "Decide whether to select an element untagged by `nxml-untag-element'.
+If this variable is 'yes the element is selected after untagging
+the element. The mark is set at the end of the element and point
+at the beginning of the element.
+
+If this variable is 'no then the element is not selected and
+point is not moved. If it is 'ask the user is asked what to do."
+  :type '(choice (const :tag "Yes" yes)
+                 (const :tag "No" no)
+                 (const :tag "Ask" ask))
+  :group 'nxml)
+
+(defun nxml-untag-element (arg)
+  "Remove start and end tag from current element.
+The mark is by default set to the end of the former element and
+point is moved to the beginning. Mark is also activated so that
+it is easy to surround the former element with a new tag.
+
+Whether to select the old element is controlled by
+`nxml-untag-select'. The meaning of the values 'yes and 'no for
+this variable is flipped by using a universal argument.
+
+Note: If you want to `undo' the untag and you use
+`transient-mark-mode' then you must first do something so that
+the region is not highlighted (for example C-g)."
+  (interactive "*P")
+  (let ((here (point-marker))
+        el-start
+        el-start-end
+        el-end
+        el-end-end
+        (select t))
+    (nxml-backward-up-element)
+    (setq el-start (point))
+    (nxml-forward-balanced-item)
+    (setq el-start-end (point))
+    (goto-char el-start)
+    (nxml-forward-element)
+    (setq el-end-end (point-marker))
+    (nxml-backward-single-balanced-item)
+    (setq el-end (point))
+    (delete-region el-end el-end-end)
+    (delete-region el-start el-start-end)
+    ;; Select the element or not?
+    (if (eq nxml-untag-select 'ask)
+        (setq select (y-or-n-p "Select the old element? "))
+      (when (eq nxml-untag-select 'no)
+        (setq select nil))
+      (when arg
+        (setq select (not select))))
+    (if (not select)
+        (goto-char here)
+      (goto-char el-end-end)
+      (push-mark nil t t)
+      (setq mark-active t)
+      (setq deactivate-mark nil)
+      (goto-char el-start))))
+
+(defun nxhtml-rollover-insert-2v ()
+  "Insert CSS rollover images.
+The upper half of the image will be used when mouse is out and
+the lower half when mouse is over the image.
+
+Only CSS is used for the rollover. The CSS code is written to the
+header part of the file if possible, otherwise it is copied to
+the kill ring/clipboard.
+
+The CSS code is built from a template file and the image size.
+
+This might be used for example for creating a menu with
+alternatives vertically or horizontally.
+
+Usage example:
+
+  If you want to make a small button style menu with images you
+  can start like this:
+
+      <div id=\"mylinks\">
+        <ul>
+          <li>
+     X      <a href=\"news.html\">News and Notes</a>
+          </li>
+          <li>
+            <a href=\"doc.html\">Documentation</a>
+          </li>
+        <ul>
+      </div>
+
+  Then put point at the X above (this is just a mark, should not
+  be in your code) and call this function.
+
+  It will add some CSS code to in the header of your file. You
+  may want to tweak this a little bit, see below (or place it
+  somewhere else). It may look like this:
+
+    #mylinks a {
+        /* Image */
+        display: block;
+        background: transparent url(\"img/mybutton.png\") 0 0 no-repeat;
+        overflow: hidden;
+        width: 200px;
+        /* Text placement and size, etc */
+        text-align: center;
+        /* You may need to change top and bottom padding depending
+           on font size. */
+        padding-top: 11px;
+        font-size: 12px;
+        padding-bottom: 9px;
+        text-decoration: none;
+        white-space: nowrap;
+        border: none;
+    }
+    #mylinks a:hover {
+        background-position: 0 -35px;
+    }
+    #mylinks li {
+        display: inline;
+        padding: 0;
+        margin: 0;
+        float: none;
+    }
+
+For an example of usage see the file nxhtml.html that comes with
+nXhtml and can be opened from the nXhtml menu under
+
+  nXhtml / nXhtml Help and Setup / nXhtml version nn Overview"
+  (interactive)
+  ;; Fix-me: not quite ready yet, but should work OK."
+  (save-excursion
+    (let* ((tag (progn
+                  (search-forward ">" nil t)
+                  (unless (re-search-backward (rx "<"
+                                                  (1+ (any "a-zA-Z:"))
+                                                  (1+ (not (any ">")))
+                                                  " id=\""
+                                                  (submatch (+? anything))
+                                                  "\"")
+                                              nil t)
+                    (error "Can't find tag with id backwards"))
+                  (match-string-no-properties 0)))
+           (tagid (match-string-no-properties 1))
+           (tagovl (let ((ovl (make-overlay
+                               (match-beginning 0) (match-end 0))))
+                     (overlay-put ovl 'face 'highlight)
+                     ovl))
+           (head-end (save-excursion (search-backward "</head" nil t))))
+      (unless head-end
+        (error "Can't find end of head tag. Need this to insert css."))
+      (sit-for 1)
+      (unwind-protect
+          (condition-case err
+              (let* ((img-src (nxhtml-read-url
+                               '(?f) nil 'nxhtml-image-url-predicate
+                               (concat "Rollover image for \"" tag "\",")))
+                     (img-sizes (when (file-exists-p img-src)
+                                  (image-size (create-image
+                                               (expand-file-name img-src))
+                                              t)))
+                     (class (read-string
+                             (concat
+                              "Class name for rollover (empty to use id="
+                              tagid "): ")))
+                     (rollover-spec (if (< 0 (length class))
+                                        (concat "." class)
+                                      (concat "#" tagid)))
+                     img-width img-height
+                     img-h2
+                     img-w2
+                     padding-top
+                     padding-bottom
+                     (font-size (read-number "Font size (px): " 12))
+                     (css-template-file (read-file-name
+                                         "CSS template file: "
+                                         (expand-file-name
+                                          "../etc/templates/"
+                                          nxhtml-src-dir)
+                                         nil
+                                         t
+                                         "rollover-2v.css"
+                                         ))
+                     (center-or-pad
+                      (if (y-or-n-p "Do you want to center the text? ")
+                          "text-align: center"
+                        (format "padding: %spx" (/ font-size 2))))
+                     (hor-or-ver
+                      (if (y-or-n-p "Do you want the alternatives shown in a vertical list? ")
+                          "float: none"
+                        "float: left"))
+                     (css-template-buffer (find-file-noselect
+                                           css-template-file))
+                     (css-template (with-current-buffer css-template-buffer
+                                     ;; Do not widen, let user decide.
+                                     (buffer-substring-no-properties
+                                      (point-min) (point-max))))
+                     (css css-template))
+                (unless (file-exists-p css-template-file)
+                  (error "Can't find file %s" css-template-file))
+                (if img-sizes
+                    (progn
+                      (setq img-width (car img-sizes))
+                      (setq img-height (cdr img-sizes)))
+                  (setq img-width (read-number "Width: "))
+                  (setq img-height (read-number "Width: ")))
+                (setq img-h2 (/ img-height 2))
+                (setq img-w2 (/ img-width 2))
+                (setq padding-top (/ (- img-h2 font-size) 2))
+                ;; Fix-me: I have no idea why I have to subtract 3
+                ;; from bottom, but inspection with Firebug seems to
+                ;; say so:
+                (setq padding-bottom (- img-h2 padding-top font-size 3))
+                (setq css (replace-regexp-in-string "ROLLOVER_SPEC" rollover-spec css t t))
+                (setq css (replace-regexp-in-string "IMG_WIDTH_2" (number-to-string img-h2) css t t))
+                (setq css (replace-regexp-in-string "IMG_HEIGHT_2" (number-to-string img-h2) css t t))
+                (setq css (replace-regexp-in-string "IMG_WIDTH" (number-to-string img-width) css t t))
+                (setq css (replace-regexp-in-string "IMG_HEIGHT" (number-to-string img-height) css t t))
+                (setq css (replace-regexp-in-string "IMG_URL" img-src css t t))
+                (setq css (replace-regexp-in-string "FONT_SIZE" (number-to-string font-size) css t t))
+                (setq css (replace-regexp-in-string "PADDING_TOP" (number-to-string padding-top) css t t))
+                (setq css (replace-regexp-in-string "PADDING_BOTTOM" (number-to-string padding-bottom) css t t))
+                (setq css (replace-regexp-in-string "CENTER_OR_PAD" center-or-pad css t t))
+                (setq css (replace-regexp-in-string "HOR_OR_VER" hor-or-ver css t t))
+                (if head-end
+                    (let ((this-window (selected-window)))
+                      (find-file-other-window buffer-file-name)
+                      (goto-char head-end)
+                      (beginning-of-line)
+                      (insert "<style type=\"text/css\">\n"
+                              css
+                              "\n</style>\n")
+                      (select-window this-window))
+                  (kill-new css)
+                  (message "No place to insert CSS, copied to clipboard instead"))))
+        (delete-overlay tagovl)
+        ))))
+
+;; Fix-me: image border 0
+;; Fix-me: SSI <!--#include file="file:///C|/EmacsW32/nxml/nxhtml/bug-tests/bug-080609.html" -->
+;; Fix-me: Better a tag completion, target etc.
+;; Fix-me: image map - is that possible now?
+;; Fix-me: Special chars - completing on &? Or popup? Use nxml-insert-named-char
+;; Fix-me: Quick table insert? A form?
+;; Fix-me: Quick object insert? (applet is depreceated)
+;; Fix-me: Better meta insert? Quick meta?
+;; Fix-me: Quick div! Better div completion with position: static,
+;;         relative, absolute and fixed - with some explanations.
+;; Fix-me: Quick hr?
+;; Fix-me: Import CSS? Export CSS?
+;; Fix-me: Use nxhtml-js.el?
+;; Fix-me: Scroll bar colors etc? See 1stPage.
+;;   body {
+;;     scrollbar-arrow-color: #FF6699;
+;;     scrollbar-3dlight-color: #00FF33;
+;;     scrollbar-highlight-color: #66FFFF;
+;;     scrollbar-face-color: #6699FF;
+;;     scrollbar-shadow-color: #6633CC;
+;;     scrollbar-darkshadow-color: #660099;
+;;     scrollbar-track-color: #CC6633;
+;;     }
+;; Fix-me: More quick menus: http://www.cssplay.co.uk/menus/
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(provide 'nxhtml-mode)
+
+;;; nxhtml-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-mumamo.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml-mumamo.el
index 32459f1835..91a2e89b4a 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-mumamo.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml-mumamo.el
@@ -3,14 +3,14 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-03-10T19:04:20+0100 Mon
 (defconst nxhtml-mumamo:version "0.5")
-;; Last-Updated: x
+;; Last-Updated: 2009-01-06 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   None
+  ;; `backquote', `bytecomp', `mumamo', `mumamo-fun'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -44,6 +44,9 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'nxhtml))
+(eval-when-compile (require 'rng-valid nil t))
 (require 'mumamo-fun)
 
 ;; (defgroup nxhtml-auto-val-head nil
@@ -75,10 +78,12 @@
 ;;;###autoload
 (define-mumamo-multi-major-mode nxhtml-mumamo-mode
   "Turn on multiple major modes for (X)HTML with main mode `nxhtml-mode'.
-This covers inlined style and javascript and PHP."
+This covers inlined style and javascript and PHP.
+
+See also `mumamo-alt-php-tags-mode'."
   ("nXhtml Family" nxhtml-mode
    (mumamo-chunk-xml-pi
-    ;;mumamo-chunk-xml-pi2
+    mumamo-chunk-alt-php
     mumamo-chunk-inlined-style
     mumamo-chunk-inlined-script
     mumamo-chunk-style=
@@ -150,6 +155,7 @@ This also covers inlined style and javascript."
    (mumamo-chunk-genshi%
     mumamo-chunk-genshi$
     mumamo-chunk-xml-pi
+    mumamo-chunk-alt-php
     mumamo-chunk-inlined-style
     mumamo-chunk-inlined-script
     mumamo-chunk-style=
@@ -191,7 +197,6 @@ This also covers inlined style and javascript."
    (
     mumamo-chunk-mjt$
     mumamo-chunk-xml-pi
-    ;;mumamo-chunk-xml-pi2
     mumamo-chunk-inlined-style
     mumamo-chunk-inlined-script
     mumamo-chunk-style=
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml.el b/elpa-to-submit/nxhtml/nxhtml/nxhtml.el
index 2a8848ea43..5658bf37f1 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtml.el
@@ -1,115 +1,64 @@
-;;; nxhtml.el --- Edit XHTML files
-
-;; Copyright (C) 2005-2008 by Lennart Borgman
-;; Parts are from Peter Heslin (see below)
-
-;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
-;; Created: 2005-08-05
-;;(defconst nxhtml:version "1.45") ;;Version:
-;; Last-Updated: 2008-09-30T11:46:26+0200 Tue
-;; Keywords: languages
+;;; nxhtml.el --- Keeping nXhtml together
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-01-01 Thu
+;; Version:
+;; Last-Updated:
+;; URL:
+;; Keywords:
+;; Compatibility:
 ;;
+;; Features that might be required by this library:
 ;;
+;;   None
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
 ;;
-;;  The purpose of nxhtml.el is to add some features that are useful
-;;  when editing XHTML files to nxml-mode.  For more information see
-;;  `nxhtml-mode'.
-;;
-;;
-;;  Usage:
-;;
-;;  See the file readme.txt in the directory above this file. Or, if
-;;  you do not have that follow the instructions below.
-;;
-;;  Put this file in `load-path'. In your .emacs:
-;;
-;;     ;; Load nxml according to the instructions, ie something like:
-;;     (load "your-path/nxml-mode-20041004/rng-auto.el")
-;;
-;;     ;; Then autoload nxhtml-mode:
-;;     (autoload 'nxhtml-mode "nxhtml" "Mode for editing XHTML files - based on nxml-mode." t)
-;;
-;;     ;; For file associations you can use:
-;;     (majmodpri-apply-priorities t)
 ;;
 ;;
-;;  Tip: Why not put all these in a .nxml file that you load in your
-;;  .emacs?
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;;; History:
+;;; Change log:
 ;;
-;; 2006-04-25: Added completion for href, src etc. Removed xhtmlin.
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; This file is not part of Emacs
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; This program 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.
+;; published by the Free Software Foundation; either version 2, or
+;; (at your option) any later version.
 ;;
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl)
-  (unless (featurep 'nxhtml-autostart)
-    (let ((efn (expand-file-name
-                "../autostart.el"
-                (file-name-directory
-                 (if load-file-name
-                     load-file-name
-                   (buffer-file-name))))))
-      (load efn))
-    (require 'rng-valid)
-    (require 'rng-nxml)
-    (require 'html-toc nil t)
-    (require 'html-pagetoc nil t)))
-
-(require 'button)
-(require 'loadhist)
-(require 'nxml-mode)
-(require 'url-parse)
-(require 'url-expand)
-(require 'popcmp)
-(require 'rngalt)
-(require 'html-imenu)
-(require 'fold-dwim)
-(require 'tidy-xhtml)
-;;(require 'nxhtml-menu)
-(require 'html-quote)
-;;(require 'nxhtml-mumamo)
+(defgroup nxhtml nil
+  "Customization of `nxhtml-mode'."
+  :group 'nxml)
 
-(defun nxhtml-version ()
-  "Show nxthml version."
+;;;###autoload
+(defun nxhtml-customize ()
+  "Customize nXhtml."
   (interactive)
-  (message "nXhtml mode version %s" nxhtml-menu:version))
+  (customize-group 'nxhtml))
 
-(defgroup nxhtml nil
-  "Customization of nxhtml-mode."
-  :group 'nxml)
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Features
+
+;; Fix-me: add help links
 (defvar nxhtml-req-features
   (let ((req-features
          '(
@@ -128,6 +77,7 @@
            (html-move    "Moving files in web sites" "html-move.el" "0.31")
            (html-toc     "Web site TOC" "html-toc.el" "0.4")
            (html-wtoc    "Merge pages and web Site TOC" "html-wtoc.el" "0.2")
+           (html-write   "Show <i> as italic etc" "html-write.el" "0.6")
            "General"
            (mumamo       "Multiple major modes in buffer" "mumamo.el" "0.73")
            (majmodpri    "Major mode priorities" "majmodpri.el" "0.5")
@@ -135,17 +85,29 @@
            (fold-dwim    "Folding on headers and tags" "fold-dwim.el" "1.3")
            (appmenu      "General popup menu" "appmenu.el" "0.53")
            (appmenu-fold "Popup menu entries for folding" "appmenu-fold.el" "0.51" appmenu fold-dwim)
+           (winsize      "Resizing and window handling" "winsize.el" "0.98")
+           (winsav       "Save/restore for windows/frames" "winsav.el" "0.77")
+           (viper-tut    "Viper try-out tutorial" "viper-tut.el" "0.2")
+           (ourcomments-util "Some minor utilities" "ourcomments-util.el" "0.25")
            "External applications / Emacs as dito"
            (as-external  "Emacs as an external editor" "as-external.el" "0.5")
            (sex-mode     "Send to EXternal program" "sex-mode.el" "0.71")
+           (freemind     "Export/import freemind maps" "freemind.el" "0.60")
+           (hfyview      "Print with browser/copy to html" "hfyview.el" "0.63")
+           (mozadd       "Mirroring in Firefox" "mozadd.el" "0.2")
            "Images and Colors"
            (gimp         "Edit images with GIMP" "gimp.el" "0.2")
-           (hexcolor     "Hex color help functions" "hexcolor.el" "0.51")
+           (inlimg       "Inline images" "inlimg.el" "0.7")
+	   (css-color 	 "Css color help functions" "css-color.el" "0.02")
+           (chart        "Easy google charts" "chart.el" "0.2")
            "Fetching and using elisp from repositories"
-           (udev         "Fetch and load from elisp repostories" "udev.el" "0.5")
+           (udev         "Fetch and from elisp repostories" "udev.el" "0.5")
            (udev-cedet   "CEDET fetcher and loader" "udev-cedet.el" "0.2")
            (udev-ecb     "ECB fetcher and loader" "udev-ecb.el" "0.2")
            (udev-rinari  "Rinari fetcher and loader" "udev-rinari.el" "0.2")
+           "Games and life"
+           (pause        "Take a break! I wish you some fun!" "pause.el" "0.64")
+           (n-back       "n-back game for fun and brain" "n-back.el" "0.5")
            )
          ))
     req-features))
@@ -169,14 +131,12 @@
 
 (defun nxhtml-feature-insert (ok msg)
   (put-text-property 0 (length msg)
-                     'face (list
-                            (cons 'foreground-color
-                                  (if ok "RGB:00/cc/00"
-                                    "RGB:cc/00/00")))
+                     'face (if ok font-lock-type-face font-lock-warning-face)
                      msg)
   (insert msg))
 
 (defun nxhtml-feature-check (feat-entry silent)
+  (require 'loadhist)
   (let ((feature     (nth 0 feat-entry))
         (description (nth 1 feat-entry))
         (file        (nth 2 feat-entry))
@@ -229,31 +189,37 @@
                      description file))))
     ok))
 
+;; Fix-me: move help here from `nxhtml-mode'?
+
+;;;###autoload
 (defun nxhtml-features-check ()
   "Check if external modules used by nXhtml are found."
   (interactive)
-  (switch-to-buffer-other-window (get-buffer-create "*nXhtml Optional Features Check*") t)
-  (help-mode)
-  (setq buffer-read-only t)
-  (let ((inhibit-read-only t))
-    (erase-buffer)
-    (let ((s (concat "Elisp modules used by nXhtml version " nxhtml-menu:version ":")))
-      (put-text-property 0 (length s)
-                         'face '( :weight bold :height 1.4)
-                         s)
-      (insert s "\n\n"))
-    ;;(nxhtml-load-req-features)
-    (dolist (feat-entry nxhtml-req-features)
-      (if (stringp feat-entry)
-          (insert "==== " (propertize feat-entry 'face 'font-lock-comment-face 'face '(:weight bold)) "\n")
-        (nxhtml-feature-check feat-entry nil)))
-    (goto-char (point-min))
-    (while (search-forward-regexp "[-a-zA-Z0-9]+\\.el" nil t)
-      (nxhtml-make-library-link
-       (match-beginning 0)
-       (match-end 0)))
-    (goto-char (point-min)))
-  (set-buffer-modified-p nil))
+  (with-output-to-temp-buffer (help-buffer)
+    (help-setup-xref (list #'nxhtml-features-check) (interactive-p))
+    (with-current-buffer (help-buffer)
+      (nxhtml-minor-mode 1)
+      (erase-buffer)
+      (let ((s (concat "Elisp modules used by nXhtml version " nxhtml-menu:version ":")))
+        (put-text-property 0 (length s)
+                           'face '( :weight bold :height 1.4)
+                           s)
+        (insert s "\n\n"))
+      (nxhtml-load-req-features)
+      (nxhtml-load-req-features)
+      (nxhtml-load-req-features)
+      (nxhtml-load-req-features)
+      (dolist (feat-entry nxhtml-req-features)
+        (if (stringp feat-entry)
+            (insert "==== " (propertize feat-entry 'face 'font-lock-comment-face 'face '(:weight bold)) "\n")
+          (nxhtml-feature-check feat-entry nil)))
+      (goto-char (point-min))
+      (while (search-forward-regexp "[-a-zA-Z0-9]+\\.el" nil t)
+        (nxhtml-make-library-link
+         (match-beginning 0)
+         (match-end 0)))
+      (goto-char (point-min)))
+    (set-buffer-modified-p nil)))
 
 (defun nxhtml-all-features-found ()
   (let ((all t))
@@ -264,59 +230,9 @@
           (setq all nil))))
     all))
 
-;;(defun nxhtml-nxml-fontify-attribute (att &optional namespace-declaration)
-;;"Holds the original `nxml-fontify-attribute' function.")
-;;(fset 'nxhtml-nxml-fontify-attribute (symbol-function 'nxml-fontify-attribute))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Folding etc. This part is taken from
-;; http://www.emacswiki.org/cgi-bin/wiki/NxmlModeForXHTML and was
-;; originally written by Peter Heslin. It requires fold-dwim.el.
-
-(when (featurep 'fold-dwim)
-
-  (defun nxhtml-setup-for-fold-dwim ()
-    (make-local-variable 'outline-regexp)
-    (setq outline-regexp "\\s *<\\([h][1-6]\\|html\\|body\\|head\\)\\b")
-    (make-local-variable 'outline-level)
-    (setq outline-level 'nxhtml-outline-level)
-    (outline-minor-mode 1)
-    (hs-minor-mode 1)
-    (add-to-list 'hs-special-modes-alist
-                 '(nxhtml-mode
-                   "<!--\\|<[^/>]>\\|<[^/][^>]*[^/]>"
-                   "</\\|-->"
-                   "<!--" ;; won't work on its own; uses syntax table
-                   (lambda (arg) (nxhtml-hs-forward-element))
-                   nil))
-    (when (featurep 'appmenu-fold)
-      (appmenu-fold-setup))
-    )
-
-  (defun nxhtml-outline-level ()
-    ;;(message "nxhtml-outline-level=%s" (buffer-substring (match-beginning 0) (match-end 0)))(sit-for 2)
-    ;; Fix-me: What did I intend to do???
-    (let ((tag (buffer-substring (match-beginning 1) (match-end 1))))
-      (if (eq (length tag) 2)
-          (- (aref tag 1) ?0)
-        0))
-    8)
-
-
-  (defun nxhtml-hs-forward-element ()
-    (let ((nxml-sexp-element-flag))
-      (setq nxml-sexp-element-flag (not (looking-at "<!--")))
-      (unless (looking-at outline-regexp)
-        (condition-case nil
-            (nxml-forward-balanced-item 1)
-          (error nil)))))
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Link saving and pasting
 
 (defun nxhtml-find-base-href ()
   "Return base href found in the current file."
@@ -393,2481 +309,8 @@ Takes into account the relative position of the saved link."
     nil))
 
 
-(defcustom nxhtml-use-imenu t
-  "Use imenu in nxhtml-mode."
-  :type 'boolean
-  :group 'nxhtml)
-
-
-
-(defcustom nxhtml-default-encoding 'iso-8859-1
-  "Default encoding."
-  :type 'coding-system
-  :group 'nxhtml)
-
-(defun nxhtml-insert-empty-frames-page ()
-  "Insert an empty frames page."
-  (interactive)
-  ;;(unless (= 0 (buffer-size))
-  (unless (nxhtml-can-insert-page-here)
-    (error "Buffer is not empty"))
-  (insert
-   "<?xml version=\"1.0\" encoding=\""
-   (symbol-name nxhtml-default-encoding)
-   "\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
-          \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title></title>
-  </head>
-  <frameset cols=\"50%, 50%\">
-    <frame src=\"about:blank\" />
-    <frame src=\"about:blank\" />
-  </frameset>
-</html>")
-  (search-backward "</title>"))
-
-(defun nxhtml-insert-empty-page ()
-  "Insert an empty XHTML page."
-  (interactive)
-  ;;(unless (= 0 (buffer-size))
-  (unless (nxhtml-can-insert-page-here)
-    (error "Buffer is not empty"))
-  (insert
-   "<?xml version=\"1.0\" encoding=\""
-   (symbol-name nxhtml-default-encoding)
-   "\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title></title>
-  </head>
-  <body>
-  </body>
-</html>")
-  (search-backward "</title>"))
-
-(defun nxhtml-empty-page-completion ()
-  ;;(unless (= 0 (buffer-size)) (error "Buffer is not empty"))
-  (let* ((frames "Frameset page")
-         (normal "Normal page")
-         ;;(vlhead "Validation header")
-         ;;popcmp-popup-completion
-         (initial (unless popcmp-popup-completion normal))
-         (hist (if mumamo-multi-major-mode
-                   ;;(list vlhead frames normal)
-                   (list frames normal)
-                 (list frames normal)))
-         res)
-    (setq res (popcmp-completing-read "Insert: " hist nil t initial (cons 'hist (length hist))))
-    (cond ((string= res frames)
-           (nxhtml-insert-empty-frames-page))
-          ((string= res normal)
-           (nxhtml-insert-empty-page))
-          ((string= res vlhead)
-           (nxhtml-validation-header-mode))
-          (t
-           (error "Bad res=%s" res))))
-  (rng-auto-set-schema))
-
-
-
-(defvar nxhtml-mode-hook nil)
-;;(add-hook 'nxhtml-mode-hook 'nxml-fontify-buffer)
-
-(defun nxhtml-help ()
-  (interactive)
-  (describe-function 'nxhtml-mode))
-
-
-(defun nxhtml-browse-file (file)
-  "View file in web browser."
-  (interactive (list
-                (or (html-site-buffer-or-dired-file-name)
-                    (read-file-name "File: "))))
-  (let* ((buf (if (buffer-file-name)
-                  (current-buffer)
-                (find-buffer-visiting file)))
-         (use-temp (and (buffer-file-name)
-                        (or nxhtml-current-validation-header
-                            (buffer-modified-p)
-                            (not buffer-file-name)
-                            (not (file-exists-p buffer-file-name))))))
-    (if use-temp
-        (browse-url (nxhtml-save-browseable-temp-file nil nil use-temp))
-      (browse-url-of-file file))))
-
-(defun nxhtml-browse-region ()
-  "View region in web browser."
-  (interactive)
-  (unless mark-active
-    (error "The region is not active"))
-  (browse-url (nxhtml-save-browseable-temp-file (region-beginning) (region-end))))
-
-(defun nxhtml-customize ()
-  "Customize nXhtml."
-  (interactive)
-  (customize-group 'nxhtml))
-
-;; FIX-ME: When should this be done? Get tidy-menu-symbol:
-(when (featurep 'tidy-xhtml)
-  (tidy-build-menu))
-
-
-;; (eval-after-load 'css-mode
-;;   '(when (featurep 'xhtml-help)
-;;     (define-key css-mode-map [(control ?c) ?? ?c] 'xhtml-help-show-css-ref)
-;;     ))
-;; (add-hook 'css-mode-hook
-;;           (lambda ()
-;;             (and (featurep 'xhtml-help)
-;;                  (boundp 'css-mode-map)
-;;                  (define-key css-mode-map [(control ?c) ?? ?c]
-;;                    'xhtml-help-show-css-ref))))
-
-;; This should be run in `change-major-mode-hook'."
-(defun nxhtml-change-mode ()
-  (when (fboundp 'mlinks-mode)
-    (mlinks-mode 0)))
-
-;; This should be run in `change-major-mode-hook'."
-;; Should be part of nxml.el IMO
-(defun nxml-change-mode ()
-  ;; Remove overlays used by nxml-mode.
-  (save-excursion
-    (save-restriction
-      (widen)
-      (rng-validate-mode -1)
-      (let ((inhibit-read-only t)
-            (buffer-undo-list t)
-            (modified (buffer-modified-p)))
-        (nxml-with-invisible-motion
-          (remove-text-properties (point-min) (point-max) '(face nil)))
-        (set-buffer-modified-p modified)))))
-
-(defcustom nxhtml-heading-element-name-regexp "[a-z]*"
-  "Used for `nxml-heading-element-name-regexp."
-  :type 'regexp
-  :group 'nxhtml)
-
-(put 'nxhtml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
-;;;###autoload
-(define-derived-mode nxhtml-mode nxml-mode "nXhtml"
-  "Major mode for editing XHTML documents.
-It is based on `nxml-mode' and adds some features that are useful
-when editing XHTML files.\\<nxhtml-mode-map>
-
-To see an overview in html format do \\[nxhtml-overview].
-
-* Note: Please observe that when loading nXhtml some file
-  associations are done, see `nxhtml-auto-mode-alist'.
-
-The nXhtml menu is added by this mode \(or actually the minor
-mode `nxhtml-minor-mode') and gives quick access and an overview
-of some other important features. These includes:
-
-- multiple major modes, see `define-mumamo-multi-major-mode'
-- easy uploading and viewing of files, see for example
-  `html-upl-upload-file'
-- validation in XHTML part for php etc, see
-  `nxhtml-validation-header-mode' (you probably also want to know about
-  `nxhtml-toggle-visible-warnings' for this!)
-- converting of html to xhtml, see `tidy-buffer'
-
-The XML menu contains functionality added by `nxml-mode' \(on
-which this major mode is based).  There is also a popup menu
-added to the \[apps] key.
-
-The most important features are probably completion and
-validation, which is inherited from `nxml-mode' with some small
-addtions.  In very many situation you can use completion. To
-access it type \\[nxml-complete]. Completion has been enhanced in
-the following way:
-
-- If region is active and visible then completion will surround the
-  region with the chosen tag's start and end tag.  However only the
-  starting point is checked for validity. If something is wrong after
-  insertion you will however immediately see it if you have validation
-  on.
-- It can in some cases give assistance with attribute values.
-- Completion can be customized, see the menus XHTML - Completion:
-  * You can use a menu popup style completion.
-  * You can have alternatives grouped.
-  * You can get a short help text shown for each alternative.
-- There does not have to be a '<' before point for tag name
-  completion. (`nxml-mode' requires a '<' before point for tag name
-  completion.)
-- Completes xml version and encoding.
-- Completes in an empty buffer, ie inserts a skeleton.
-
-Some smaller, useful, but easy-to-miss features:
-
-* Following links. The href and src attribute names are
-  underlined and a special keymap is bound to
-  them:\\<mlinks-mode-map>
-
-    \\[mlinks-backward-link], \\[mlinks-forward-link] Move
-        between underlined href/src attributes
-
-    \\[mlinks-goto], Mouse-1 Follow link inside Emacs
-        (if possible)
-
-  It is even a little bit quicker when the links are in an active
-  state (marked with the face `isearch'):\\<mlinks-active-hilight-keymap>
-
-    \\[mlinks-backward-link], \\[mlinks-forward-link] Move
-        between underlined href/src attributes
-    \\[mlinks-goto], Mouse-1  Follow link inside Emacs (if possible)
-
-  If the link is not into a file that you can edit (a mailto link
-  for example) you will be prompted for an alternative action.
-
-* Creating links. To make it easier to create links to id/name
-  attribute in different files there are two special
-  functions:\\<nxhtml-mode-map>
-
-    \\[nxhtml-save-link-to-here] copy link to id/name (you must
-        be in the tag to get the link)
-    \\[nxhtml-paste-link-as-a-tag] paste this as an a-tag.
-
-Here are all key bindings in nxhtml-mode itself:
-
-\\{nxhtml-mode-map}
-
-The minor mode `nxhtml-minor-mode' adds some bindings:
-
-\\{nxhtml-minor-mode-map}
-
-Notice that other minor mode key bindings may also be active, as
-well as emulation modes. Do \\[describe-bindings] to get a list
-of all active key bindings. Also, *VERY IMPORTANT*, if mumamo is
-used in the buffer each mumamo chunk has a different major mode
-with different key bindings. You can however still see all
-bindings with \\[describe-bindings], but you have to do that with
-point in the mumamo chunk you want to know the key bindings in.
-
----------
-* Note: Some of the features supported by this mode are optional
-  and available only if other Emacs modules are found.  Use
-  \\[nxhtml-features-check] to get a list of these optional
-  features and modules needed. You should however have no problem
-  with this if you have followed the installation instructions
-  for nXhtml."
-  (set (make-local-variable 'nxml-heading-element-name-regexp)
-       nxhtml-heading-element-name-regexp)
-  (add-hook 'change-major-mode-hook 'nxml-change-mode nil t)
-  (add-hook 'change-major-mode-hook 'nxhtml-change-mode nil t)
-  (when (featurep 'rngalt)
-    (add-hook 'nxml-completion-hook 'rngalt-complete nil t))
-  ;;(define-key nxhtml-mode-map [(meta tab)] 'nxml-complete)
-  (nxhtml-minor-mode 1)
-  (when (and nxhtml-use-imenu
-             (featurep 'html-imenu))
-    (add-hook 'nxhtml-mode-hook 'html-imenu-setup nil t))
-  (when (fboundp 'mlinks-mode)
-    (mlinks-mode 1))
-  (when (featurep 'fold-dwim)
-    (nxhtml-setup-for-fold-dwim))
-  (when (featurep 'rngalt)
-    (set (make-local-variable 'rngalt-completing-read-tag) 'nxhtml-completing-read-tag)
-    (set (make-local-variable 'rngalt-completing-read-attribute-name) 'nxhtml-completing-read-attribute-name)
-    (set (make-local-variable 'rngalt-completing-read-attribute-value) 'nxhtml-completing-read-attribute-value)
-    (set (make-local-variable 'rngalt-complete-first-try) 'nxhtml-complete-first-try)
-    (set (make-local-variable 'rngalt-complete-last-try) 'nxhtml-complete-last-try)
-    ))
-
-;; Fix-me: The nxhtml-mode-map is define by define-derived-mode, but
-;; how should keys be added?
-
-;; Replace the Insert End Tag function:
-(define-key nxhtml-mode-map [(control ?c) (control ?f)] 'rngalt-finish-element)
-
-;; Put completion on the normal key?
-(define-key nxhtml-mode-map [(meta tab)] 'nxml-complete)
-;; Paragraphs (C-p mnemonic for paragraph)
-(define-key nxhtml-mode-map [(control ?c) (control ?p) ?l] 'longlines-mode)
-(define-key nxhtml-mode-map [(control ?c) (control ?p) ?f] 'fill-paragraph)
-(define-key nxhtml-mode-map [(control ?c) (control ?p) ?u] 'unfill-paragraph)
-;; Html related (C-h mnemonic for html)
-(define-key nxhtml-mode-map [(control ?c) (control ?h) ?c] 'nxhtml-save-link-to-here)
-(define-key nxhtml-mode-map [(control ?c) (control ?h) ?v] 'nxhtml-paste-link-as-a-tag)
-(define-key nxhtml-mode-map [(control ?c) (control ?h) ?b] 'nxhtml-browse-file)
-(define-key nxhtml-mode-map [(control ?c) ?<] 'nxml-untag-element)
-(when (featurep 'html-quote)
-  (define-key nxhtml-mode-map [(control ?c) (control ?q)] 'nxhtml-quote-html)
-  )
-;; Fix-me: Is pagetoc really that important to have its own keybindings?
-(when (featurep 'html-pagetoc)
-  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?i] 'html-pagetoc-insert-toc)
-  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?r] 'html-pagetoc-rebuild-toc)
-  (define-key nxhtml-mode-map [(control ?c) (control ?h) ?t ?s] 'html-pagetoc-insert-style-guide)
-  )
-
-(defun nxhtml-quote-html()
-  "Quote character(s) unsafe in html text parts.
-If region is visible quote all characters in region. Otherwise
-just quote current char.
-
-Note to CUA users: See `cua-mode' for how to prevent CUA from
-just copying region when you press C-c."
-  (interactive)
-  (if (and mark-active
-           transient-mark-mode)
-      (let* ((rb (region-beginning))
-             (re (region-end))
-             (qr (html-quote-html-string
-                  (buffer-substring-no-properties rb re))))
-        (delete-region rb re)
-        (insert qr))
-    (let ((cs (html-quote-html-char (char-after))))
-      (delete-char 1)
-      (insert cs))))
-
-(defvar nxhtml-single-tags
-  '("base"
-    "meta"
-    "link"
-    "br"
-    "hr"
-    "frame"
-    "img"
-    "input"
-    "option"
-    "param"))
-
-(defun nxthml-is-single-tag (tag)
-  (member tag nxhtml-single-tags))
-
-(defvar nxhtml-help-attribute-name
-  '(("title"    "Element title")
-    ("class"   "Style class of element")
-    ("charset"  "Encoding of target")
-    ("coords"   "Defining shape")
-    ("href"   "Target URL")
-    ("hreflang"   "Language of target")
-    ("name"   "(DEPRECEATED)")
-    ("rel"   "Target's relation to document")
-    ("rev"   "Document's relation to target")
-    ("shape"   "Area shape")
-    ("target"   "Where to open target")
-    ("type"   "MIME type of target")
-
-    ("id"   "Unique id of element")
-    ("lang"   "Language code")
-    ("dir"   "Text direction")
-    ("accesskey"   "Keyboard shortcut")
-    ("tabindex"   "Tab order of element")
-
-    ("style"   "Inline style")
-    ("disabled"   "Tag initially disabled")
-    ("readonly"   "User can not modify")
-    ;;(""   "")
-
-    ("alink" "(DEPRECEATED)")
-    ("background" "(DEPRECEATED)")
-    ("bgcolor" "(DEPRECEATED)")
-    ("link" "(DEPRECEATED)")
-    ("text" "(DEPRECEATED)")
-    ("vlink" "(DEPRECEATED)")
-    ("xml:lang" "Tag content language")
-    ("cite" "URL with more info")
-    ("method" "HTTP method for sending")
-    ("accept" "Content types")
-    ("accept-charset" "Character sets")
-    ("enctype" "Encoding")
-    ))
-(defvar nxhtml-help-attribute-name-tag
-  '(("textarea"
-     ("name" "Name for textarea")
-     )
-    ))
-
-(defvar nxhtml-help-tag
-  (let ((h (make-hash-table :test 'equal)))
-    (puthash "html"     "Document" h)
-    (puthash "head"     "Document head" h)
-    (puthash "title"    "Document title" h)
-    (puthash "base"     "Base URL/target" h)
-    (puthash "meta"     "Meta information" h)
-    (puthash "style"    "Inline style sheet" h)
-    (puthash "link"     "Style sheet etc" h)
-    (puthash "script"   "(Java)Script code" h)
-    (puthash "noscript" "Script disabled part" h)
-    (puthash "isindex"  "(DEPRECEATED)" h)
-
-    (puthash "iframe"   "Inline frame" h)
-    (puthash "frameset" "Organize frames" h)
-    (puthash "frame"    "Sub window" h)
-    (puthash "noframes" "Substitute for frames" h)
-
-    (puthash "bdo"      "Text direction" h)
-
-    (puthash "body"     "Document body" h)
-    (puthash "a"        "Link" h)
-    (puthash "p"        "Paragraph" h)
-    (puthash "span"     "Group inline elements" h)
-    (puthash "br"       "Line break" h)
-    (puthash "hr"       "Horizontal rule" h)
-    (puthash "div"      "Division/section" h)
-    (puthash "img"      "Image" h)
-    (puthash "h1"       "Header 1" h)
-    (puthash "del"      "Deleted text" h)
-    (puthash "strike"   "(DEPRECEATED)" h)
-    (puthash "u"        "(DEPRECEATED)" h)
-    (puthash "s"        "(DEPRECEATED)" h)
-    (puthash "ins"      "Inserted text" h)
-    (puthash "sup"      "Superscript text" h)
-    (puthash "center"   "(DEPRECEATED)" h)
-    (puthash "dir"      "(DEPRECEATED)" h)
-
-    (puthash "blockquote" "Long quotation" h)
-    (puthash "q"          "Short quotation" h)
-    (puthash "pre"      "Preformatted text" h)
-    (puthash "applet"   "(DEPRECEATED)" h)
-    (puthash "basefont" "(DEPRECEATED)" h)
-    (puthash "font"     "(DEPRECEATED)" h)
-
-    ;; The following elements are all font style elements. They are
-    ;; not deprecated, but it is possible to achieve richer effects
-    ;; using style sheets.
-    (puthash "tt"       "Renders as teletype or mono spaced text" h)
-    (puthash "i"        "Renders as italic text" h)
-    (puthash "b"        "Renders as bold text" h)
-    (puthash "big"      "Renders as bigger text" h)
-    (puthash "small"    "Renders as smaller text" h)
-
-
-    ;; The following tags are not deprecated, but it is possible to
-    ;; achieve a much richer effect using style sheets:
-    (puthash "em"       "Renders as emphasized text" h)
-    (puthash "strong"   "Renders as strong emphasized text" h)
-    (puthash "dfn"      "Defines a definition term" h)
-    (puthash "code"     "Defines computer code text" h)
-    (puthash "samp"     "Defines sample computer code" h)
-    (puthash "kbd"      "Defines keyboard text" h)
-    (puthash "var"      "Defines a variable" h)
-    (puthash "cite"     "Defines a citation" h)
-
-    (puthash "ul"       "Unordered list" h)
-    (puthash "ol"       "Ordered list" h)
-    (puthash "li"       "List element" h)
-    (puthash "dl"       "Definition list" h)
-    (puthash "dt"       "Definition term" h)
-    (puthash "dd"       "Definition description" h)
-
-
-    (puthash "fieldset" "Draw box around" h)
-    (puthash "form"     "User input form" h)
-    (puthash "input"    "Input field/checkbox etc" h)
-    (puthash "textarea" "Input multiline field" h)
-    (puthash "button"   "Push button" h)
-    (puthash "label"    "Label for control" h)
-    (puthash "map"      "Client side image map" h)
-    (puthash "select"   "Drop down list" h)
-    (puthash "option"   "Option in drop down list" h)
-    (puthash "menu"     "(DEPRECEATED)" h)
-
-    (puthash "object"   "Embedded object" h)
-    (puthash "param"    "Object settings" h)
-
-    (puthash "abbr"     "Abbreviation" h)
-    (puthash "address"  "For addresses etc" h)
-    (puthash "acronym"  "May be used for lookup etc" h)
-
-    (puthash "table"    "Table" h)
-    (puthash "caption"  "Table caption" h)
-    (puthash "col"      "Table column attributes" h)
-    (puthash "colgroup"  "Table column group" h)
-    (puthash "thead"    "Table header" h)
-    (puthash "tbody"    "Table body" h)
-    (puthash "tfoot"    "Table footer" h)
-    (puthash "tr"       "Table row" h)
-    (puthash "td"       "Table cell" h)
-
-    h))
-
-(defun nxhtml-short-tag-help (tag)
-  "Display description of tag TAG.  If TAG is omitted, try tag at point."
-  (interactive
-   (let ((tag (xhtml-help-tag-at-point)))
-     (unless (stringp tag)
-       (setq tag (read-string "No tag at point. Give tag name: ")))
-     (list tag)))
-  (setq tag (downcase tag))
-  (let ((desc (gethash tag nxhtml-help-tag))
-        (use-dialog-box nil))
-    (unless desc
-      (setq desc (concat tag " -- No short description available")))
-    (when (y-or-n-p (concat desc ". Fetch more information from the Internet? "))
-      (xhtml-help-browse-tag tag))))
-
-(defvar nxhtml-no-single-tags nil)
-(defvar nxhtml-no-end-tags nil)
-
-(defadvice rng-complete-qname-function (around nxhtml-rng-complete-qname-function-ad
-                                               (string predicate flag)
-                                               disable)
-  ;;(if (not (eq major-mode 'nxhtml-mode))
-  (if (not nxhtml-completing-with-help)
-      ad-do-it
-    (setq ad-return-value
-          (let ((alist (mapcar (lambda (name) (cons name nil))
-                               (nxhtml-rng-generate-qname-list string))))
-            (cond ((not flag)
-                   (try-completion string alist predicate))
-                  ((eq flag t)
-                   (all-completions string alist predicate))
-                  ((eq flag 'lambda)
-                   (and (assoc string alist) t)))))))
-
-
-
-
-(defvar nxhtml-predicate-error nil)
-
-(defun nxhtml-find-ids (file)
-  (let ((buf (find-file-noselect file)))
-    (when buf
-      (with-current-buffer buf
-        (when (eq major-mode 'nxhtml-mode)
-          (save-excursion
-            (let ((ids nil)
-                  (id-ptrn
-                   (rx space
-                       "id"
-                       (0+ space)
-                       ?=
-                       (0+ space)
-                       ?\"
-                       (submatch
-                        (1+ (not (any ?\")))
-                        )
-                       ?\"
-                       )))
-              (goto-char (point-min))
-              (while (re-search-forward id-ptrn nil t)
-                (add-to-list 'ids (match-string-no-properties 1)))
-              ids)))))))
-
-(defun nxhtml-read-url (&optional allowed-types initial-contents extra-predicate prompt-prefix)
-  (popcmp-mark-completing initial-contents)
-  (let ((local-ovl popcmp-mark-completing-ovl))
-    (setq popcmp-mark-completing-ovl nil)
-    (unwind-protect
-        (let* ((url-type (nxhtml-read-url-type allowed-types initial-contents))
-               (base-prompt (cond ((eq url-type 'local-file-url)
-                                   "File: ")
-                                  ((eq url-type 'id-url)
-                                   "Id: ")
-                                  ((eq url-type 'web-url)
-                                   "Web URL: ")
-                                  ((eq url-type 'mail-url)
-                                   "e-Mail address: ")
-                                  ((eq url-type 'any-url)
-                                   "Any URL-type: ")
-                                  (t
-                                   ;;(error "Internal error: bad url-type=%s" url-type)
-                                   "Unknown URL-type: ")
-                                  ))
-               prompt
-               type-predicate
-               url
-               (bad-url initial-contents)
-               (default-directory (if buffer-file-name
-                                      (file-name-directory buffer-file-name)
-                                    default-directory)))
-          (when prompt-prefix
-            (setq base-prompt (concat prompt-prefix " " base-prompt)))
-          (setq nxhtml-predicate-error "")
-          (cond ((eq url-type 'local-file-url)
-                 )
-                ((eq url-type 'web-url)
-                 )
-                ((eq url-type 'mail-url)
-                 (setq type-predicate 'nxhtml-mailto-predicate)
-                 (when (and (stringp bad-url)
-                            (<= 7 (length bad-url))
-                            (string= "mailto:" (substring bad-url 0 7)))
-                   (setq bad-url (substring bad-url 7)))))
-          (while (not url)
-            (setq prompt (concat nxhtml-predicate-error " " base-prompt))
-            (cond ((eq url-type 'local-file-url)
-                   (setq url (read-file-name prompt nil "" nil bad-url extra-predicate))
-                   (when (< 0 (length url))
-                     ;; Fix-me: prompt for id here
-                     (setq url (file-relative-name
-                                (expand-file-name url)))))
-                  ((eq url-type 'id-url)
-                   (setq url (completing-read prompt (nxhtml-find-ids buffer-file-name)))
-                   (when url
-                     (setq url (concat "#" url))))
-                  ((eq url-type 'web-url)
-                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
-                                                          'nxhtml-read-web-url-history
-                                                          t)))
-                  ((eq url-type 'mail-url)
-                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
-                                                          'nxhtml-read-mail-url-history
-                                                          t)))
-                  (t
-                   (setq url (nxhtml-read-from-minibuffer prompt bad-url nil nil
-                                                          'nxhtml-read-url-history
-                                                          t))))
-            (when (or (and type-predicate
-                           (not (funcall type-predicate url)))
-                      (and extra-predicate
-                           (not (funcall extra-predicate url))))
-              (setq bad-url url)
-              (setq url)))
-          (when (eq url-type 'mail-url)
-            (setq url (concat "mailto:" url)))
-          url)
-      (delete-overlay local-ovl)
-      )))
-
-(defun nxhtml-read-url-type (allowed url-beginning)
-  (assert (or (listp allowed) (eq t allowed)) t)
-  (let* ((prompt "URL-type: ")
-         (parsed-url (url-generic-parse-url url-beginning))
-         (beg-type (url-type parsed-url))
-         (allowed-u allowed)
-         choices
-         choice)
-    ;; (url-type (url-generic-parse-url "#some-id"))
-    ;;(lwarn t :warning "url-type=%s, pu=%s" (url-type parsed-url) parsed-url)
-    ;; Emacs 23 bug workaround Sat Jan 26 2008
-    ;;(when (eq beg-type 'cl-struct-url) (setq beg-type (elt parsed-url 1)))
-    (cond ((string= "mailto" beg-type)
-           (setq allowed-u '(?m)))
-          ((or (string= "http"  beg-type)
-               (string= "https" beg-type)
-               (string= "ftp"   beg-type))
-           (setq allowed-u '(?w)))
-          ((= 1 (length beg-type)) ;; w32
-           (setq allowed-u '(?f)))
-          ((and (null beg-type)
-                url-beginning
-                (= ?# (string-to-char url-beginning)))
-           (setq allowed-u '(?i)))
-          )
-    ;; Be a bit picky and hopefully helpful, check if really allowed:
-    (unless (or (eq allowed t)
-                (equal allowed allowed-u))
-      (let ((temp-u (copy-sequence allowed-u)))
-        (dolist (a allowed)
-          (setq temp-u (delq a temp-u)))
-        (dolist (u temp-u)
-          (setq allowed-u (delq u allowed-u)))))
-    (if allowed-u
-        (when (eq allowed-u t)
-          (setq allowed-u '(?f ?i ?w ?m)))
-      (setq allowed-u '(?f ?w)))
-    (dolist (a allowed-u)
-      (cond
-       ((= a ?f)
-        (setq choices (cons "File" choices)))
-       ((= a ?i)
-        (setq choices (cons "Id" choices)))
-       ((= a ?w) (setq choices (cons "Url" choices)))
-       ((= a ?m) (setq choices (cons "Mail" choices)))
-       ))
-    (if (= 1 (length allowed-u))
-        (setq choice (car choices))
-    (setq choice (popcmp-completing-read prompt choices nil t
-                                           "" nil nil t)))
-    (cond ((string= choice "Id")
-           'id-url)
-          ((string= choice "File")
-           'local-file-url)
-          ((string= choice "Url")
-           'web-url)
-          ((string= choice "Mail")
-           'mail-url)
-          )))
-
-(defvar nxhtml-read-url-history nil)
-(defvar nxhtml-read-web-url-history nil)
-(defvar nxhtml-read-mail-url-history nil)
-
-(defconst nxhtml-in-xml-attribute-value-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   ;;"<w\\(?::w\\)?\
-   "<\\?xml\
-\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
-\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
-\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
-\\(\"[^\"]*\\|'[^']*\\)\\="
-   t
-   t))
-
-(defun nxhtml-mailto-predicate (url)
-  "Tries to match a mailto url.
-This is not supposed to be entirely correct."
-  (setq nxhtml-predicate-error nil)
-  ;; Local pattern copied from gnus.
-  (let ((r (concat "^"
-                   ;;"mailto:"
-                   "[a-z0-9$%(*-=?[_][^<>\")!;:,{}]*"
-                   "\@"
-                   "\\(?:[a-z0-9\-]+\.\\)+[a-z0-9]\\{2,4\\}$"))
-        (case-fold-search t))
-    ;;(message "mailpred") (sit-for 1)
-    (if (string-match r url)
-        t
-      (setq nxhtml-predicate-error "Malformed email address.")
-      nil)))
-
-(defcustom nxhtml-image-completion-pattern
-  "\\.\\(?:png\\|jpg\\|jpeg\\|gif\\)$"
-  "Pattern for matching image URLs in completion."
-  :type 'regexp
-  :group 'nxhtml)
-
-(defun nxhtml-image-url-predicate (url)
-  (setq nxhtml-predicate-error nil)
-  (if (or (file-directory-p url)
-          (string-match nxhtml-image-completion-pattern url))
-      t
-    (setq nxhtml-predicate-error "Does not match image file name pattern.")
-    nil
-    ))
-
-(defcustom nxhtml-css-completion-pattern
-  "\\.\\(?:css\\)$"
-  "Pattern for matching css URLs in completion."
-  :type 'regexp
-  :group 'nxhtml)
-
-(defun nxhtml-css-url-predicate (url)
-  (setq nxhtml-predicate-error nil)
-  (if (or (file-directory-p url)
-          (string-match nxhtml-css-completion-pattern url))
-      t
-    (setq nxhtml-predicate-error "Does not match css file name pattern.")
-    nil
-    ))
-
-(defcustom nxhtml-script-completion-pattern
-  "\\.\\(?:js\\)$"
-  "Pattern for matching src URLs in completion in script tags."
-  :type 'regexp
-  :group 'nxhtml)
-
-(defun nxhtml-script-url-predicate (url)
-  (setq nxhtml-predicate-error nil)
-  (if (or (file-directory-p url)
-          (string-match nxhtml-script-completion-pattern url))
-      t
-    (setq nxhtml-predicate-error "Does not match script file name pattern.")
-    nil
-    ))
-
-(defun nxhtml-coding-systems-complete (init default)
-  (let (coding-systems
-        hist-num
-        (n 0)
-        hist)
-    (unless (and init (< 0 (length init)))
-      (setq init default))
-    (mapc (lambda (coding-system)
-            (let ((mime-charset (coding-system-get coding-system 'mime-charset)))
-              (when mime-charset
-                (setq coding-systems (cons
-                                      (symbol-name mime-charset)
-                                      coding-systems)))))
-          (coding-system-list t))
-    (setq coding-systems (sort coding-systems 'string=))
-    (mapc (lambda (coding-system)
-            (unless (< 0 (length coding-system))
-              (error "len=0"))
-            (setq n (1+ n))
-            (when (string= coding-system init) (setq hist-num n)))
-          coding-systems)
-    (if hist-num
-        (setq hist (cons 'coding-systems hist-num))
-      (setq hist 'coding-systems))
-    (completing-read "Encoding (coding system): "
-                     coding-systems nil t init hist)))
-
-
-;; Note: This function does not currently use the state provided by
-;; the nxml and rng functions directly.  Instead it searches the
-;; environment near point to decide what to do.
-;; (defun nxhtml-complete-and-insert ()
-;;   "Perform XHTML completion at point.
-;; This is merely an extended version of `nxml-complete' with the following changes:
-
-;; - If region is visible and active then completion will surround the
-;;   region with the chosen tag's start and end tag.  However only the
-;;   starting point is checked for validity. If something is wrong after
-;;   insertion you will however immediately see it if you have validation
-;;   on.
-;; - Can in some cases give completion help inside attribute values.
-;; - There does not have to be a '<' before point for tag name
-;;   completion. (`nxml-mode' requires a '<' before point for tag name
-;;   completion.)
-;; - For tag names there is a popup style completion available. This
-;;   gives a bit more guiding since it groups the alternative tags. Set
-;;   `popcmp-popup-completion' to use this.
-;; - Completes xml version and encoding.
-;; - Completes an empty file, ie inserts a skeleton."
-;;   (interactive)
-;;   (let (res
-;;         (where (nxhtml-check-where)))
-;;     (or (when (eq where 'in-empty-page)
-;;           (nxhtml-empty-page-completion))
-;;         (when (and mark-active
-;;                    transient-mark-mode
-;;                    (eq where 'in-text))
-;;           (nxhtml-insert-tag))
-;;         (progn
-;;           (cond ((memq where '(in-start-tag in-closed-start-tag in-end-tag))
-;;                  (re-search-forward "\\=/?[a-z]*" nil t))
-;;                 ((memq where '(in-attr))
-;;                  (re-search-forward "\\=[a-z]*=" nil t))
-;;                 ((memq where '(in-attr-val in-xml-attr-val))
-;;                  (re-search-forward "\\=[^<>\" \t\r\n]*" nil t))
-;;                 )
-;;           (when (run-hook-with-args-until-success 'nxml-completion-hook)
-;;             (when (re-search-backward "[^=]\"\\=" nil t)
-;;               (forward-char) (delete-char 1)
-;;               ;;(undo-start) (undo-more 1)
-;;               )
-;;             t))
-;;         (when (and (not where)
-;;                    (char-before)
-;;                    (= ?\" (char-before)))
-;;           nil)
-;;         (when (or (when (char-before) (= ?> (char-before)))
-;;                   (eq where 'in-text))
-;;           (setq res t)
-;;           (nxhtml-insert-tag))
-;;         ;; Eventually we will complete on entity names here.
-;;         res
-;;         (progn
-;;           (ding)
-;;           (message "Cannot complete in this context")))))
-
-(defvar nxhtml-in-proc-instr-back-regex "<\\?[^<>]*\\=")
-(defvar nxhtml-in-proc-instr-forw-regex "\\=[^<>]*\\?>")
-
-(defconst rngalt-in-pre-attribute-value-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   "<w\\(?::w\\)?\
-\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
-\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
-\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
-\\="
-   t
-   t))
-
-(defun nxhtml-check-where ()
-  "Get a state for `nxhtml-complete-last-try'."
-  (let ((p (point))
-        (lt-pos (save-excursion (search-backward "<" nil t)))
-        res)
-    (cond ((= 0 (buffer-size))
-           (setq res 'in-empty-page))
-          ((looking-back "<!--[^<>]*\\=" 1 t)
-           (setq res 'in-comment))
-          ((let ((face (get-char-property (point) 'face)))
-             (when (memq face '(nxml-comment-content-face
-                                nxml-comment-delimiter-face))
-               (setq res 'in-comment)))
-           t)
-          ((looking-back nxhtml-in-xml-attribute-value-regex lt-pos t)
-           (setq res 'in-xml-attr-val))
-          ((looking-back nxhtml-in-proc-instr-back-regex 1 t)
-           (setq res 'in-proc-instr))
-          ((looking-back "<!D[^>]*\\=" 1 t)
-           (setq res 'in-doctype))
-          ((looking-back ">[^<]*" 1 t)
-           (setq res 'in-text))
-          ((looking-back rng-in-start-tag-name-regex 1 t)
-           (setq res 'in-tag-start)
-           (when (looking-at "\\=[^<]*>")
-             (setq res 'in-closed-start-tag)))
-          ((looking-back rng-in-end-tag-name-regex 1 t)
-           (setq res 'in-tag-end))
-          ((looking-back rng-in-attribute-regex 1 t)
-           (setq res 'in-attr))
-          ((looking-back rng-in-attribute-value-regex 1 t)
-           (setq res 'in-attr-val))
-          ((looking-back rngalt-in-pre-attribute-value-regex 1 t)
-           (setq res 'in-pre-attr-val))
-          ((looking-back "\"")
-           (setq res 'after-attr-val))
-          ((and rngalt-validation-header
-                (looking-back "\\`[^<]*"))
-           ;; FIX-ME: This is treated the same as in text currently,
-           ;; but this should be checked. Maybe it is best to test
-           ;; this here and return the relevant value?
-           (setq res 'after-validation-header))
-          )
-    ;;(message "res=%s" res)(sit-for 1)
-    (unless res
-      (error "Could not find a state for completion"))
-    res))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Make the completions additions cleaner:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconst nxhtml-tag-sets
-  '(("logical"
-     "del"
-     "ins"
-     "abbr"
-     "acronym"
-     "fieldset"
-     "blockquote"
-     "q"
-     "code"
-     "samp"
-     "cite"
-     "kbd"
-     "var"
-     "dfn"
-     "address"
-     "em"
-     "strong"
-     "pre"
-     )
-    ("physical"
-     "hr"
-     "sup"
-     "sub"
-     "font"
-     "basefont"
-     "br"
-     "big"
-     "small"
-     "strike"
-     "u"
-     "i"
-     "b"
-     "s"
-     "tt"
-     "center"
-     "bdo"
-     )
-    ("scripting"
-     "script"
-     "noscript"
-     "object"
-     "applet"
-     )
-   ("structure"
-    "iframe"
-    "p"
-    "div"
-    "span"
-    "h6"
-    "h5"
-    "h4"
-    "h3"
-    "h2"
-    "h1"
-    )
-
-   ("form"
-    "isindex"
-    "label"
-    "button"
-    "option"
-    "select"
-    "input"
-    "textarea"
-    "form"
-    )
-
-   ("list"
-    "dt"
-    "dd"
-    "li"
-    "dir"
-    "menu"
-    "ol"
-    "dl"
-    "ul"
-    )
-
-   ("link"
-    "a"
-    )
-
-   ("image"
-    "img"
-    "map"
-    )
-
-   ("table"
-    "table"
-    "tr"
-    "th"
-    "td"
-    "caption"
-    "col"
-    "colgroup"
-    "thead"
-    "tbody"
-    "tfoot"
-    )
-
-   ("document"
-    "base"
-    "style"
-    "link"
-    "head"
-    "body"
-    "frame"
-    "frameset"
-    "noframes"
-    "isindex"
-    "nextid"
-    "meta"
-    "title"
-    )
-   ))
-
-(defvar nxhtml-attr-sets
-  '(("scripting"
-     "onblur"
-     "onchange"
-     "onclick"
-     "ondblclick"
-     "onfocus"
-     "onkeydown"
-     "onkeypress"
-     "onkeyup"
-     "onload"
-     "onunload"
-     "onmousedown"
-     "onmousemove"
-     "onmouseout"
-     "onmouseover"
-     "onmouseup"
-     "onreset"
-     "onselect"
-     "onsubmit"
-     )
-    ("form"
-     "method"
-     "accept"
-     "accept-charset"
-     "enctype"
-     )
-    ("access"
-     "id"
-     "name"
-     "disabled"
-     "readonly")
-    ("layout"
-     "accesskey"
-     "class"
-     "coords"
-     "shape"
-     "style"
-     "tabindex"
-     "title"
-     "align"
-     "valign"
-     "alink"
-     "background"
-     "bgcolor"
-     "link"
-     "text"
-     "vlink"
-     "compact"
-     )
-    ("target"
-     "charset"
-     "href"
-     "hreflang"
-     "rel"
-     "rev"
-     "target"
-     "type"
-     )
-    ("language"
-     "dir"
-     "lang"
-     "xml:lang"
-     )
-    ;; id
-    ;; name
-    ;; xml:lang
-    ))
-
-(defun nxhtml-complete-last-try ()
-  (when rng-current-schema-file-name
-    (let ((where (nxhtml-check-where)))
-      (cond
-       ;;((eq where 'after-attr-val)
-        ;;(insert " ")
-        ;;)
-       ((eq where 'in-pre-attr-val)
-        (insert ?\"))
-       ((eq where 'in-comment)
-        (if (not (looking-at "[^>]*<"))
-            nil
-          (insert " -->")
-          t))
-       ((eq where 'in-xml-attr-val)
-        (let (attr
-              delimiter
-              val)
-        (save-excursion
-          (save-match-data
-            (re-search-forward "\\=[^<> \t\r\n\"]*" nil t)))
-        (let* ((name-start (match-beginning 1))
-               (name-end (match-end 1))
-               (colon (match-beginning 2))
-               (attr (buffer-substring-no-properties name-start
-                                                     (or colon name-end)))
-               (value-start (1+ (match-beginning 3)))
-               (tag (save-excursion
-                      (when (search-backward-regexp "<[[:alpha:]]+" nil t)
-                        (match-string 0))))
-               (init (buffer-substring-no-properties value-start (point))))
-          (setq delimiter (char-before value-start))
-          (cond ((string= "encoding" attr)
-                 ;; Give a default that works in browsers today
-                 (setq val (nxhtml-coding-systems-complete
-                            init
-                            (symbol-name nxhtml-default-encoding))))
-                ((string= "version" attr)
-                 (setq val "1.0")))
-          (when val
-            (insert val)
-            t)
-          )))
-       ((or (memq where '(in-text
-                          after-validation-header
-                          in-empty-page)))
-        (rngalt-complete-tag-region-prepare)
-        (insert "<")
-        (condition-case err
-            (nxhtml-redisplay-complete)
-          (quit
-           (message "%s" (error-message-string err))
-           (undo-start)
-           (undo-more 1)
-           (rngalt-complete-tag-region-cleanup)))
-        t)
-       (t
-        ;;(message "LAST TRY where=%s" (nxhtml-check-where))(sit-for 1)
-        nil)
-       ))))
-
-(defun nxhtml-img-tag-do-also ()
-  (insert "alt=\"")
-  (rngalt-validate)
-  (insert (read-string "Alt attribute: ")
-          "\" ")
-  (insert "src=\"")
-  (rngalt-validate)
-  (let ((src (nxhtml-read-url nil nil 'nxhtml-image-url-predicate "Image")))
-    (insert src)
-    (insert "\"")
-    (when (file-exists-p src)
-           (let ((sizes (image-size (create-image (expand-file-name src)) t)))
-             (insert
-              " width=\""  (format "%d" (car sizes)) "\""
-              " height=\"" (format "%d" (cdr sizes)) "\"")
-             )))
-  (unless (save-match-data (looking-at "[^<]\\{,200\\}>"))
-    (insert " />")))
-
-(defun nxhtml-redisplay-complete ()
-  (rngalt-validate)
-  (rng-cancel-timers)
-  (message "")
-  (redisplay t)
-  (nxml-complete)
-  (rng-activate-timers))
-
-(defun nxhtml-read-from-minibuffer (prompt &optional
-                                          initial-contents keymap
-                                          read hist default-value
-                                          inherit-input-method)
-  (rng-cancel-timers)
-  (message "")
-  (let ((res (read-from-minibuffer prompt initial-contents keymap
-              read hist default-value inherit-input-method)))
-    (rng-activate-timers)
-    res))
-
-(defun nxhtml-meta-tag-do-also ()
-  (let ((type (popcmp-completing-read
-               "Type: "
-               '(
-                 ;;"Refresh/Redirect"
-                 "HTTP Message Headers"
-                 "Robot Rules"
-                 "Description for Search Engines"
-                 ))))
-    (cond
-     ((string= type "Description for Search Engines")
-      (insert " name=\"Description\"")
-      (insert " content=\"")
-      (insert (nxhtml-read-from-minibuffer "Description: "))
-      (insert "\" />"))
-     ((string= type "Robot Rules")
-      (insert " name=\"Robots\"")
-      (insert " content=\"")
-      (nxhtml-redisplay-complete)
-      (insert " />"))
-     ((string= type "HTTP Message Headers")
-      (insert " http-equiv=\"")
-      (nxhtml-redisplay-complete)
-      (insert " content=\"")
-      (insert (nxhtml-read-from-minibuffer "Content: "))
-      (insert "\" />")))))
-
-(defun nxhtml-style-tag-do-also ()
-  (insert "type=\"text/css\"")
-  (insert " media=\"")
-  (nxhtml-redisplay-complete)
-  (insert ">")
-  (indent-according-to-mode)
-  (insert "\n/* <![CDATA[ */")
-  (indent-according-to-mode)
-  (insert "\n")
-  (indent-according-to-mode)
-  (insert "\n/* ]] */")
-  (indent-according-to-mode)
-  (insert "\n</style>")
-  (indent-according-to-mode)
-  (insert "\n")
-  (end-of-line -2))
-
-(defun nxhtml-script-tag-do-also ()
-  (let ((type (popcmp-completing-read
-               "Type: "
-               '("Inlined"
-                 "Linked"))))
-    (cond
-     ((string= type "Inlined")
-      (insert "type=\"text/javascript\">")
-      (indent-according-to-mode)
-      (insert "\n// <![CDATA[")
-      (indent-according-to-mode)
-      (insert "\n")
-      (indent-according-to-mode)
-      (insert "\n// ]]>")
-      (indent-according-to-mode)
-      (insert "\n</script>")
-      (indent-according-to-mode)
-      (end-of-line -1))
-     ((string= type "Linked")
-      (insert "type=\"text/javascript\"")
-      (insert " src=\"")
-      (nxhtml-redisplay-complete)
-      (insert "></script>")))))
-
-(defun nxhtml-link-tag-do-also ()
-  (let ((type (popcmp-completing-read "Type: "
-                          '(
-                            "Other"
-                            "Shortcut icon"
-                            "Style sheet"
-                            ))))
-    (cond
-     ((string= type "Style sheet")
-      (insert " rel=\"Stylesheet\" ")
-      (insert "type=\"text/css\" ")
-      (insert "href=\"")
-      (nxhtml-redisplay-complete)
-      (insert " media=\"")
-      (nxhtml-redisplay-complete)
-      (insert " />"))
-     ((string= type "Shortcut icon")
-      (insert " rel=\"Shortcut Icon\" ")
-      (insert "href=\"")
-      (nxhtml-redisplay-complete)
-      (insert " />"))
-     (t
-      (insert " ")
-      (nxhtml-redisplay-complete)
-      ))))
-
-(defun nxhtml-input-tag-do-also ()
-  (insert " ")
-  (rngalt-validate)
-  ;; type=
-  (insert "type=\"")
-  (nxhtml-redisplay-complete)
-  (insert " ")
-
-  (let* ((choice (save-match-data
-                   (when (looking-back "type=\"\\(.*\\)\" ")
-                     (match-string 1)))))
-    ;;(insert "type=\"" choice "\" ")
-    (rngalt-validate)
-    ;;(message "choice=%s" choice)(sit-for 2)
-    ;; name=
-    (when (member choice '("button" "checkbox" "file" "hidden" "image"
-                           "password" "radio" "text"))
-      (insert "name=\""
-              (read-string "Name (name): ")
-              "\" ")
-      (rngalt-validate))
-    ;; checked=
-    (when (member choice '("checkbox" "radio"))
-      (when (y-or-n-p "Checked? (checked): ")
-        (insert "checked=\"checked\" ")
-        (rngalt-validate)))
-    ;; disabled=
-    (unless (string= choice "hidden")
-      (unless (y-or-n-p "Enabled? : ")
-        (insert "disabled=\"disabled\" ")
-        (rngalt-validate)))
-    ;; readonly=
-    (when (string= choice "text")
-      (when (y-or-n-p "Readonly? (readonly): ")
-        (insert "readonly=\"readonly\" "))
-      (rngalt-validate))
-    (when (string= choice "file")
-      ;; accept=
-      (require 'mailcap)
-      (condition-case err
-          (let ((prompt (concat
-                         "Accept mime type, RET to stop ("
-                         "C-g to skip"
-                         "): "))
-                (mime " ")
-                mimes
-                (types (when (boundp 'mailcap-mime-extensions)
-                         (mapcar (lambda (elt)
-                                   (cdr elt))
-                                 mailcap-mime-extensions))))
-            (while (< 0 (length mime))
-              (setq mime
-                    (if types
-                        (completing-read prompt types)
-                      (read-string prompt)))
-              (when (< 0 (length mime))
-                (if mimes
-                    (setq mimes (concat mimes "," mime))
-                  (setq mimes mime))))
-            (when (and mimes
-                       (< 0 (length mimes)))
-              (insert "accept=\"" mimes "\" ")))
-        (quit (message "Skipped accept attribute")))
-      (rngalt-validate))
-    (when (string= choice "image")
-      ;; alt=
-      (insert "alt=\"")
-      (rngalt-validate)
-      (insert (read-string "Alt attribute: ")
-              "\" ")
-      (rngalt-validate)
-      ;; src=
-      (insert "src=\"")
-      (rngalt-validate)
-      (let ((src (nxhtml-read-url nil nil 'nxhtml-image-url-predicate "Image")))
-        (insert src)
-        (insert "\" "))
-      (rngalt-validate))
-    ;; value=
-    (cond
-     ((member choice '("button" "reset" "submit"))
-      (nxhtml-do-also-value "Label"))
-     ((member choice '("checkbox" "radio"))
-      (nxhtml-do-also-value "Result"))
-     ((member choice '("hidden" "password" "text"))
-      (nxhtml-do-also-value "Value"))
-     )
-    (insert "/>")
-    ;;(message "type=%s" choice)(sit-for 2)
-  ))
-
-(defun nxhtml-do-also-value (label)
-  (let ((v (read-string (concat label " (value): "))))
-    (when (and v
-               (< 0 (length v)))
-      (insert " value=\"" v "\" "))))
-
-(defun nxhtml-form-tag-do-also ()
-  (insert "action=\"")
-  (rngalt-validate)
-  (let ((src (nxhtml-read-url nil nil nil "Action")))
-    (insert src "\" "))
-  )
-
-(defconst nxhtml-complete-tag-do-also
-  '(("a"
-     (lambda ()
-       (insert " href=\"")
-       (rngalt-validate)
-       (insert (nxhtml-read-url t))
-       (insert "\"")))
-    ("form" nxhtml-form-tag-do-also)
-    ("img" nxhtml-img-tag-do-also)
-    ("input" nxhtml-input-tag-do-also)
-    ("link" nxhtml-link-tag-do-also)
-    ("script" nxhtml-script-tag-do-also)
-    ("style" nxhtml-style-tag-do-also)
-    ("meta" nxhtml-meta-tag-do-also)
-    )
-  "List of functions to call at tag completion.
-Each element of the list have the form
-
-  \(TAG-NAME TAG-FUN)
-
-If `nxhtml-tag-do-also' is non-nil then TAG-FUN is called after
-by `nxml-complete' (with the special setup of this function for
-`nxhtml-mode') when completing a tag with the name TAG-NAME.
-
-The list is handled as an association list, ie only the first
-occurence of a tag name is used.")
-
-
-(defun nxhtml-complete-tag-do-also (tag)
-  ;; First required attributes:
-  (let ((tagrec (assoc tag nxhtml-complete-tag-do-also)))
-    (when tagrec
-      (funcall (cadr tagrec))))
-  )
-
-(defun nxhtml-check-tag-do-also ()
-  (when nxhtml-tag-do-also
-    (nxhtml-turn-onoff-tag-do-also t)))
-
-(defun nxhtml-turn-onoff-tag-do-also (on)
-  (add-hook 'nxhtml-mode-hook 'nxhtml-check-tag-do-also)
-  (dolist (b (buffer-list))
-    (when (with-current-buffer b
-            (eq major-mode 'nxhtml-mode))
-      (if on
-          (progn
-            (add-hook 'rngalt-complete-tag-hooks 'nxhtml-complete-tag-do-also t t)
-            )
-          (remove-hook 'rngalt-complete-tag-hooks 'nxhtml-complete-tag-do-also t)
-        ))))
-
-(define-toggle nxhtml-tag-do-also t
-  "When completing tag names do some more if non-nil.
-For some tag names additional things can be done at completion to
-speed writing up.  For example for an <img ...> tag `nxhtml-mode'
-can prompt for src attribute and add width and height attributes
-if this attribute points to a local file.
-
-You can add additional elisp code for completing to
-`nxhtml-complete-tag-do-also'."
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (nxhtml-turn-onoff-tag-do-also value))
-  :group 'nxhtml)
-
-(defun nxhtml-can-insert-page-here ()
-   (and (not nxhtml-validation-header-mode)
-        (= 1 (point))
-       (or (= 0 (buffer-size))
-           (save-restriction
-             (widen)
-             (save-match-data
-               (looking-at (rx buffer-start
-                               (0+ space)
-                               buffer-end)))))))
-
-(defun nxhtml-complete-first-try ()
-  (when (nxhtml-can-insert-page-here)
-    (nxhtml-empty-page-completion)))
-
-(defun nxhtml-completing-read-tag (prompt
-                                  table
-                                  &optional predicate require-match
-                                  initial-input hist def inherit-input-method)
-  (popcmp-completing-read prompt
-                          table
-                          predicate require-match
-                          initial-input hist def inherit-input-method
-                          nxhtml-help-tag
-                          nxhtml-tag-sets))
-
-(defun nxhtml-add-required-to-attr-set (tag)
-  (let ((missing (when tag
-                   (rngalt-get-missing-required-attr
-                    (nxthml-is-single-tag tag)))))
-    (if (not missing)
-        nxhtml-attr-sets
-      (cons (cons "Required" missing)
-            nxhtml-attr-sets))))
-
-(defun nxhtml-get-tag-specific-attr-help (tag)
-  (append (cdr (assoc tag nxhtml-help-attribute-name-tag)) nxhtml-help-attribute-name)
-  )
-
-(defconst nxhtml-in-start-tag-regex
-;;(defconst rng-in-start-tag-name-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   ;; Not entirely correct since < could be part of attribute value:
-   "<\\(w\\(?::w?\\)?\\)+ [^<]*"
-   t
-   t))
-
-(defun nxhtml-completing-read-attribute-name (prompt
-                                              table
-                                              &optional predicate require-match
-                                              initial-input hist def inherit-input-method)
-  (let* ((tag (save-match-data
-                ;;(when (looking-back "<\\([a-z1-6]+\\) [^<]*")
-                (when (looking-back nxhtml-in-start-tag-regex)
-                  (match-string 1))))
-         (attr-sets (nxhtml-add-required-to-attr-set tag))
-         (help-attr (nxhtml-get-tag-specific-attr-help tag))
-         )
-    (popcmp-completing-read prompt
-                            table
-                            predicate require-match
-                            initial-input hist def inherit-input-method
-                            help-attr
-                            attr-sets)))
-
-(defun nxhtml-completing-read-attribute-value (prompt
-                                               table
-                                               &optional predicate require-match
-                                               initial-input hist def inherit-input-method)
-  (let (val)
-    (if table
-        (setq val (popcmp-completing-read prompt table
-                                          predicate require-match
-                                          initial-input hist def inherit-input-method))
-      (let* (init
-             delimiter
-             (lt-pos (save-excursion (search-backward "<" nil t)))
-             (in-attr-val
-              (save-excursion
-                (re-search-backward rng-in-attribute-value-regex lt-pos t)))
-             (in-xml-attr-val
-              (unless in-attr-val
-                (save-excursion
-                  (re-search-backward nxhtml-in-xml-attribute-value-regex lt-pos t))))
-         )
-        (when (or in-attr-val in-xml-attr-val)
-          ;;(save-match-data (save-excursion (re-search-forward "\\=[^<> \t\r\n\"]*" nil t)))
-          (let* ((name-start (match-beginning 1))
-                 (name-end (match-end 1))
-                 (colon (match-beginning 2))
-                 (attr (buffer-substring-no-properties name-start
-                                                       (or colon name-end)))
-                 (value-start (1+ (match-beginning 3)))
-                 tag-start-end
-                 (tag (save-excursion
-                        (when (search-backward-regexp "<[[:alpha:]]+" nil t)
-                          (setq tag-start-end (match-end 0))
-                          (match-string-no-properties 0)))))
-            (setq init (buffer-substring-no-properties value-start (point)))
-            (setq delimiter (char-before value-start))
-            (if in-xml-attr-val
-                (error "in-xml-attr-val should not be true here!")
-              ;;             (cond ((string= "encoding" attr)
-              ;;                    ;; Give a default that works in browsers today
-              ;;                    (setq val (nxhtml-coding-systems-complete
-              ;;                               init
-              ;;                               (symbol-name nxhtml-default-encoding))))
-              ;;                   ((string= "version" attr)
-              ;;                    (setq val "1.0")))
-              (cond ((string= "rel" attr)
-                     (cond ((string= "<link" tag)
-                            (setq val (nxhtml-read-link-rel))
-                            )))
-                    ((string= "media" attr)
-                     (cond ((string= "<link" tag)
-                            (setq val (nxhtml-read-link-media)))
-                           ((string= "<style" tag)
-                            (setq val (nxhtml-read-link-media)))
-                           ))
-                    ((string= "type" attr)
-                     (cond ((string= "<link" tag)
-                            (setq val (nxhtml-read-link-type))
-                            )))
-                    ((string= "http-equiv" attr)
-                     (cond ((string= "<meta" tag)
-                            (setq val (nxhtml-read-meta-http-equiv)))))
-                    ((string= "content" attr)
-                     (cond ((string= "<meta" tag)
-                            (setq val (nxhtml-read-meta-content)))))
-                    ((string= "scheme" attr)
-                     (cond ((string= "<meta" tag)
-                            (setq val (nxhtml-read-meta-scheme)))))
-                    ((string= "name" attr)
-                     (cond ((string= "<meta" tag)
-                            (setq val (nxhtml-read-meta-name)))))
-                    ((string= "href" attr)
-                     (cond ((string= "<a" tag)
-                            (setq val (nxhtml-read-url t init)))
-                           ((string= "<base" tag)
-                            (setq val (nxhtml-read-url nil init nil "Base")))
-                           ((string= "<area" tag)
-                            (setq val (nxhtml-read-url nil init)))
-                           ((string= "<link" tag)
-                            (let (predicate
-                                  (here (point)))
-                              (save-excursion
-                                (goto-char tag-start-end)
-                                (cond
-                                 ((search-forward "text/css" here nil)
-                                  (setq predicate 'nxhtml-css-url-predicate))
-                                 ))
-                              (setq val (nxhtml-read-url nil init predicate))))
-                           (t
-                            (setq val (nxhtml-read-url nil init)))))
-                    ((string= "src" attr)
-                     (cond ((string= "<img" tag)
-                            (setq val (nxhtml-read-url nil init 'nxhtml-image-url-predicate "Image")))
-                           ((string= "<script" tag)
-                            (setq val (nxhtml-read-url nil init 'nxhtml-script-url-predicate "Script")))
-                           ((string= "<input" tag)
-                            (setq val (nxhtml-read-url nil init 'nxhtml-image-url-predicate "Image")))
-                           ((string= "<frame" tag)
-                            (setq val (nxhtml-read-url nil init nil "Frame Source")))
-                           ((string= "<iframe" tag)
-                            (setq val (nxhtml-read-url nil init nil "Frame Source")))
-                           (t
-                            (setq val (nxhtml-read-url nil init)))))))))))
-    ;;(unless val (setq val (read-from-minibuffer prompt init)))
-    (if (not val)
-        (progn
-          (message "No completion of attribute value available here")
-          nil)
-      val)))
-
-(defun nxhtml-read-link-type ()
-  (require 'mailcap)
-  (let ((types (when (boundp 'mailcap-mime-extensions)
-                 (mapcar (lambda (elt)
-                           (cdr elt))
-                         mailcap-mime-extensions))))
-  (completing-read "Link type: " types nil t)))
-
-(defun nxhtml-read-link-media ()
-  (let ((types '(
-                 "screen"
-                 "tty"
-                 "tv"
-                 "projection"
-                 "handheld"
-                 "print"
-                 "braille"
-                 "aural"
-                 "all"
-                 )))
-    (popcmp-completing-read "For media type: " types nil t)))
-
-(defun nxhtml-read-link-rel ()
-  (let ((predefined-linktypes '(
-                               "Alternate"
-                               "Appendix"
-                               "Bookmark"
-                               "Chapter"
-                               "Contents"
-                               "Copyright"
-                               "Glossary"
-                               "Help"
-                               "Index"
-                               "Next"
-                               "Prev"
-                               "Section"
-                               "Shortcut Icon"
-                               "Start"
-                               "Stylesheet"
-                               "Subsection"
-                               )))
-    (popcmp-completing-read "Predefined LinkTypes: " predefined-linktypes nil t)))
-
-(defun nxhtml-read-meta-name ()
-  (let ((types '(
-                 "author"
-                 "description"
-                 "keywords"
-                 "generator"
-                 "revised"
-                 ;;"others"
-                 )))
-    (popcmp-completing-read "Meta name: " types nil t)))
-
-(defun nxhtml-read-meta-content ()
-  (nxhtml-read-from-minibuffer "Meta content: "))
-
-(defun nxhtml-read-meta-scheme ()
-  (nxhtml-read-from-minibuffer "Meta scheme: "))
-
-(defun nxhtml-read-meta-http-equiv ()
-  (let ((types '(
-                 "content-type"
-                 "expires"
-                 "refresh"
-                 "set-cookie"
-                 )))
-    (popcmp-completing-read "Meta http-equiv: " types nil t)))
-
-(when nil
-  (setq rngalt-completing-read-tag nil)
-  (setq rngalt-complete-last-try nil)
-  )
-
-
-(require 'typesetter nil t)
-(when (featurep 'typesetter)
-  (defun typesetter-init-nxhtml-mode ()
-    (typesetter-init-html-mode))
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Validation start state
-
-(defcustom nxhtml-validation-headers
-  '(
-    ("body-iso-8859-1" .
-     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title>Fictive XHTML Validation Header</title>
-  </head>
-  <body>
-"
-     )
-    ("head-iso-8859-1" .
-     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-"
-     )
-    ("html-iso-8859-1" .
-     "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-"
-     )
-;;     ("doctype-iso-8859-1" .
-;;      "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-;; <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-;; \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-;; "
-;;      )
-;;     ("xml-iso-8859-1" .
-;;      "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-;; "
-;;      )
-
-    ("body-utf-8" .
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title>Fictive XHTML Validation Header</title>
-  </head>
-  <body>
-"
-     )
-    ("head-utf-8" .
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-"
-     )
-    ("head-closed-utf-8" .
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title></title>
-  </head>
-"
-     )
-    ("html-utf-8" .
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-"
-     )
-;;     ("doctype-utf-8" .
-;;      "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-;; <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-;; \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-;; "
-;;      )
-;;     ("xml-utf-8" .
-;;      "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-;; "
-;;      )
-    )
-  "Fictive XHTML validation headers.
-Used by `nxhtml-set-validation-header'."
-  :type '(alist :key-type string :value-type string)
-  :group 'nxhtml)
-
-(defcustom nxhtml-default-validation-header nil
-  "Default Fictive XHTML validation header.
-Must be nil or one of the key values in
-`nxhtml-validation-headers'."
-  :type 'string
-  :set (lambda (sym val)
-         (if (or (null val)
-                 (assoc val nxhtml-validation-headers))
-             (set-default sym val)
-           (lwarn 'nxhtml-default-validation-header
-                  :warning "There is no Fictive XHTML Validation Header named %s" val)))
-  :group 'nxhtml)
-
-(defun nxhtml-must-have-validation-headers ()
-  (unless nxhtml-validation-headers
-    (error
-     "No XHTML validation headers. Please customize nxhtml-validation-headers.")))
-
-(defvar nxhtml-set-validation-header-hist nil)
-
-(defvar nxhtml-current-validation-header nil)
-(make-variable-buffer-local 'nxhtml-current-validation-header)
-(put 'nxhtml-current-validation-header 'permanent-local t)
-
-(defcustom nxhtml-guess-validation-header-alist
-  ;;(rx line-start (0+ blank) "<body")
-  '(
-    ("^[[:blank:]]*<body"   . "body-utf-8")
-    ("^[[:blank:]]*</head>" . "head-closed-utf-8")
-    ("^[[:blank:]]*<head"   . "head-utf-8")
-    ("^[[:blank:]]*<html"   . "html-utf-8")
-    )
-  "Alist used by `nxhtml-guess-validation-header'.
-Alternatives are tried from top to bottom until one fits."
-  :type '(alist :key-type (regexp :tag "If NOT found in buffer")
-                :value-type (string :tag "Use Fictive XHTML Validation Header"))
-  :group 'nxhtml)
-
-(defun nxhtml-guess-validation-header ()
-  "Return Fictive XHTML validation that could fit current buffer.
-This guess is made by matching the entries in
-`nxhtml-guess-validation-header-alist' against the buffer."
-  (nxhtml-must-have-validation-headers)
-  (save-excursion
-    (save-restriction
-      (save-match-data
-        (widen)
-        (let (rec
-              regexp
-              key
-              (guesses nxhtml-guess-validation-header-alist))
-          (goto-char (point-min))
-          (if (not (search-forward "</" 2000 t))
-              (progn
-                (setq rec (car guesses))
-                (setq key (cdr rec)))
-            (while (and guesses
-                        (not key))
-              (setq rec (car guesses))
-              (setq guesses (cdr guesses))
-              (setq regexp (car rec))
-              (goto-char (point-min))
-              ;; Fix-me: check for chunk and check if in string.
-              (let (found)
-                (while (and (not found)
-                            (re-search-forward regexp nil t))
-                  ;; ensure fontified, but how?
-                  (when mumamo-multi-major-mode
-                    (let ((mumamo-just-changed-major nil))
-                      (unless (and (mumamo-get-existing-chunk-at (point))
-                                   (eq t (get-text-property (point) 'fontified)))
-                        (mumamo-fontify-region (point-min) (+ 1000 (point))))))
-                  (unless (memq (get-text-property (point) 'face)
-                                '(font-lock-comment-face
-                                  font-lock-comment-delimiter-face
-                                  font-lock-doc-face
-                                  font-lock-string-face
-                                  ))
-                    (setq found t)))
-                (unless found
-                  (setq key (cdr rec))))))
-          ;;(unless (re-search-forward regexp nil t) (setq key (cdr rec)))))
-          key)))))
-
-(defun nxhtml-open-dir-saved-validation-headers (must-exist)
-  "Open file with saved validation headers and return buffer."
-  ;;(lwarn 't :warning "must-exist=%s" must-exist)
-  (when (buffer-file-name)
-    (let* ((dir-name (file-name-directory (buffer-file-name)))
-           (file-name (expand-file-name "nxhtml-val-headers.el"))
-           emacs-lisp-mode-hook)
-      (when (or (not must-exist)
-                (file-exists-p file-name))
-        (find-file-noselect file-name)))))
-
-(defun nxhtml-get-saved-validation-header ()
-  (when (buffer-file-name)
-    (let* ((val-buf (nxhtml-open-dir-saved-validation-headers t))
-           (file-name (file-name-nondirectory (buffer-file-name)))
-           validation-headers)
-      (when val-buf
-        (with-current-buffer val-buf
-          (eval-buffer))
-        (cadr (assoc file-name validation-headers))))))
-
-(defun nxhtml-remove-saved-validation-header ()
-  "Removed the saved validation header.
-Reverse the action done by `nxhtml-save-validation-header'."
-  (interactive)
-  (nxhtml-update-saved-validation-header nil))
-
-(defun nxhtml-save-validation-header ()
-  "Save the current validation header.
-The current validation is saved for the next time you open the
-current file.  It is then used by `nxhtml-validation-header-mode'
-and `nxhtml-set-validation-header'. This means that if you have
-turned on `nxhtml-global-validation-header-mode' this validation
-header will be set automatically.
-
-The saved validation header can be removed with
-`nxhtml-remove-saved-validation-header'.
-
-* Note: There is normally no need to save the validation headers
-  since `nxhtml-global-validation-header-mode' will add
-  validation headers as needed most of the time."
-  (interactive)
-  (nxhtml-update-saved-validation-header t))
-
-(defun nxhtml-update-saved-validation-header (save)
-  (unless (buffer-file-name)
-    (error "Validation Header can only be saved if buffer contains a file."))
-  (let* ((val-buf (nxhtml-open-dir-saved-validation-headers nil))
-          ;;(get-buffer-create "temp val head"))
-         validation-headers
-         (file-name (file-name-nondirectory (buffer-file-name)))
-         (entry (list file-name nxhtml-current-validation-header))
-         ;;entry-list
-         removed
-         )
-    ;; Get old headers
-    (with-current-buffer val-buf
-      (eval-buffer))
-    ;; Remove old value
-    (setq validation-headers
-          (delq nil
-                (mapcar (lambda (elt)
-                          (if (string= file-name (car elt))
-                              (progn
-                                (setq removed t)
-                                nil)
-                            elt))
-                        validation-headers)))
-    ;; Add new value
-    (when save
-      (setq validation-headers (cons entry validation-headers)))
-    (with-current-buffer val-buf
-      (erase-buffer)
-      ;;(print file-name val-buf)
-      ;;(print nxhtml-current-validation-header val-buf)
-      ;;(print entry val-buf)
-      (insert "(setq validation-headers (quote")
-      (print validation-headers val-buf)
-      (insert "))")
-      (basic-save-buffer)
-      )
-    (if save
-        (message "Current validation header for file saved")
-      (if removed
-          (message "Removed saved validation header")
-        (message "There was no saved validation header")))))
-
-(defun nxhtml-get-default-validation-header ()
-  "Return default Fictive XHTML validation header key for current buffer.
-If `nxhtml-default-validation-header' is non-nil then return
-this.  Otherwise return saved validation header if there is one
-or guess using `nxhtml-guess-validation-header'."
-  (or nxhtml-default-validation-header
-      (nxhtml-get-saved-validation-header)
-      (nxhtml-guess-validation-header)))
-
-(defun nxhtml-set-validation-header (&optional key)
-  "Set a Fictive XHTML validation header in the buffer.
-Such a header is not inserted in the buffer, but is only used by
-validation and XHTML completion by `nxhtml-mode'.
-
-The header is active for validation and completion if and only if
-`nxhtml-validation-header-mode' is on.
-
-Note that Fictive XHTML Validation Headers are normally chosen
-automatically, but you can use this function to override that choice.
-
-The header is chosen from `nxhtml-validation-headers'. If there
-is more than one you will be prompted. To set the default fictive
-XHTML validation header customize `nxhtml-validation-headers'.
-
-If called non-interactive then the header corresponding to key
-KEY will be used.  If KEY is nil then it is set to
-`nxhtml-default-validation-header'.
-
-This header can be visible or invisible in the buffer, for more
-information see `rngalt-show-validation-header'."
-  (interactive
-   (list
-    (let ((nh (length nxhtml-validation-headers))
-          (default (nxhtml-get-default-validation-header)))
-      (if (> nh 1)
-          (completing-read "XHTML validation header: "
-                           nxhtml-validation-headers
-                           nil
-                           t
-                           default
-                           nxhtml-set-validation-header-hist)
-        (if (not (y-or-n-p "Only one XHTML validation header is defined. Define more? "))
-            default
-          (customize-option 'nxhtml-validation-headers)
-          'adding)))))
-  ;;(lwarn 'svh2 :warning "key=%s" key)
-  (or key
-      (setq key (nxhtml-get-default-validation-header))
-      (setq key (cons 'schema "XHTML")))
-  (unless (eq key 'adding)
-    (setq nxhtml-current-validation-header key)
-    (nxhtml-validation-header-mode 1)
-    (nxhtml-apply-validation-header)))
-
-(defun nxhtml-apply-validation-header ()
-  (when nxhtml-current-validation-header
-    (setq rngalt-major-mode
-          (if mumamo-multi-major-mode
-              (mumamo-main-major-mode)
-            major-mode))
-    (let* ((key nxhtml-current-validation-header)
-           (rec (unless (listp key)
-                  (assoc key nxhtml-validation-headers)))
-           (header (cdr rec)))
-      (if (listp key)
-          (let ((schema-file (rng-locate-schema-file (cdr key))))
-            (unless schema-file
-              (error "Could not locate schema for type id `%s'" key)) ;type-id))
-            (rng-set-schema-file-1 schema-file))
-        (rngalt-set-validation-header header)
-        ))))
-
-(defun nxhtml-update-validation-header ()
-  "Update the validation header in the buffer as needed."
-  (interactive)
-  (let ((mode-on nxhtml-validation-header-mode))
-    (when mode-on (nxhtml-validation-header-mode 0))
-    (setq nxhtml-current-validation-header nil)
-    (when mode-on (nxhtml-validation-header-mode 1))))
-
-;;;###autoload
-(define-minor-mode nxhtml-validation-header-mode
-  "If on use a Fictive XHTML Validation Header for the buffer.
-See `nxhtml-set-validation-header' for information about Fictive XHTML Validation Headers.
-
-This mode may be turned on automatically in two ways:
-- If you try to do completion of a XHTML tag or attribute then
-  `nxthml-mode' may ask you if you want to turn this mode on if
-  needed.
-- You can also choose to have it turned on automatically whenever
-  mumamo is used, see `nxhtml-validation-header-if-mumamo' for
-  further information."
-  :global nil
-  :lighter " VH"
-  :group 'nxhtml
-  (if nxhtml-validation-header-mode
-      (progn
-        (unless nxhtml-current-validation-header
-          (setq nxhtml-current-validation-header
-                (nxhtml-get-default-validation-header)))
-        ;;(message "nxhtml-current-validation-header=%s" nxhtml-current-validation-header)
-        (if nxhtml-current-validation-header
-            (progn
-              (nxhtml-apply-validation-header)
-              (add-hook 'change-major-mode-hook 'nxhtml-vhm-change-major nil t)
-              (when (featurep 'mumamo)
-                (add-hook 'mumamo-change-major-mode-hook 'nxhtml-vhm-mumamo-change-major nil t)
-                (add-hook 'mumamo-after-change-major-mode-hook 'nxhtml-vhm-mumamo-after-change-major nil t)))
-          (run-with-idle-timer 0 nil 'nxhtml-validation-header-empty (current-buffer))))
-    (rngalt-set-validation-header nil)
-    (setq nxhtml-current-validation-header nil)
-    (remove-hook 'after-change-major-mode-hook 'nxhtml-vhm-after-change-major t)
-    (when (featurep 'mumamo)
-      (remove-hook 'mumamo-change-major-mode-hook 'nxhtml-vhm-mumamo-change-major t)
-      (remove-hook 'mumamo-after-change-major-mode-hook 'nxhtml-vhm-mumamo-after-change-major t))))
-
-(defun nxhtml-vhm-change-major ()
-  "Turn off `nxhtml-validation-header-mode' after change major."
-  ;;(message "nxhtml-vhm-change-major here")
-  (unless mumamo-multi-major-mode
-    (setq nxhtml-current-validation-header nil))
-  (run-with-idle-timer 0 nil 'nxhtml-validation-header-empty (current-buffer)))
-(put 'nxhtml-vhm-change-mode 'permanent-local-hook t)
-
-(defun nxhtml-recheck-validation-header ()
-  "Just turn off and on again `nxhtml-validation-header-mode'.
-This will adjust the XHTML validation to the code currently in
-the buffer."
-  (interactive)
-  (nxhtml-validation-header-mode -1)
-  (nxhtml-validation-header-mode 1))
-
-(defun nxhtml-validation-header-empty (buffer)
-  "Turn off validation header mode.
-This is called because there was no validation header."
-  (with-current-buffer buffer
-    (unless nxhtml-current-validation-header
-      ;;(message "nxhtml-validation-header-empty")
-      (nxhtml-validation-header-mode -1)
-      ;;(message "No validation header was needed")
-      )))
-
-(defun nxhtml-turn-on-validation-header-mode ()
-  "Turn on `nxhtml-validation-header-mode'."
-  (nxhtml-validation-header-mode 1))
-
-;;(defvar nxhtml-browseable-buffer-name "*nXhtml Browsing Buffer*")
-(defvar nxhtml-browseable-buffer-file "~/.temp-nxhtml-browse.htm")
-;; Fix-me: Handle base href here!
-(defun nxhtml-save-browseable-temp-file (start end &optional doit-anyway)
-  "Return a temporary file for viewing in web browser."
-  ;; When using this either region should be active or there should be
-  ;; a validation header or both.
-  (or doit-anyway
-      (and start end) ;mark-active
-      (and nxhtml-validation-header-mode
-           nxhtml-current-validation-header)
-      (error "Neither region nor validation header"))
-  (save-excursion
-    (let ((curbuf (current-buffer))
-          (view-buffer (find-file-noselect nxhtml-browseable-buffer-file))
-          header
-          content)
-      ;; Get header and content
-      (save-restriction
-        (widen)
-        (setq header
-              (if nxhtml-validation-header-mode
-                  (let* ((key nxhtml-current-validation-header)
-                         (rec (unless (listp key)
-                                (assoc key nxhtml-validation-headers)))
-                         (header (cdr rec)))
-                    header)
-                (goto-char (point-min))
-                (save-match-data
-                  (let ((body (re-search-forward "<body[^>]*>")))
-                    (if body
-                        (buffer-substring-no-properties (point-min) (match-end 0))
-                      "")))))
-        (setq content
-              (if start
-                  (buffer-substring-no-properties start end)
-                (buffer-substring-no-properties (point-min) (point-max))))
-        )
-      ;; Switch to view buffer
-      (set-buffer view-buffer)
-;;       (unless buffer-file-name
-;;         (set-visited-file-name nxhtml-browseable-buffer-file)
-;;         (rename-buffer nxhtml-valhead-view-buffer-name))
-      (erase-buffer)
-      (insert header content)
-      ;;(when (fboundp 'emacsw32-eol-set) (emacsw32-eol-set nil))
-      (nxhtml-mode)
-      (save-buffer)
-      ;;(current-buffer)
-      (kill-buffer view-buffer)
-      (expand-file-name nxhtml-browseable-buffer-file)
-      )))
-
-
-(defun nxhtml-vhm-mumamo-change-major ()
-  (put 'rngalt-validation-header 'permanent-local t)
-  (put 'nxhtml-validation-header-mode 'permanent-local t)
-  (put 'nxhtml-current-validation-header 'permanent-local t)
-  (put 'nxhtml-validation-header-mode-major-mode 'permanent-local t)
-  (setq nxhtml-validation-header-mode-major-mode mumamo-set-major-running)
-  )
-
-(defun nxhtml-vhm-mumamo-after-change-major ()
-  (put 'rngalt-validation-header 'permanent-local nil)
-  (put 'nxhtml-validation-header-mode 'permanent-local nil)
-  (put 'nxhtml-current-validation-header 'permanent-local nil)
-  (put 'nxhtml-validation-header-mode-major-mode 'permanent-local nil)
-  )
-
-(defcustom nxhtml-validation-headers-check 'html
-  "Defines what check the function with the same name does.
-The function returns true if the condition here is met."
-  :type '(choice :tag "Add Fictive XHTML Validation Header if:"
-                (const :tag "If buffer contains html" html)
-                (const :tag "If buffer contains html or is empty" html-empty))
-  :group 'nxhtml)
-
-;; (defun nxhtml-validation-headers-check (buffer)
-;;   "Return non-nil if buffer contains a html tag or is empty.
-;; This is for use with `nxhtml-validation-header-filenames'.
-
-;; The variable `nxhtml-validation-headers-check' determines how the
-;; check is made."
-;;   (if (= 0 (buffer-size buffer))
-;;       (eq 'html-empty nxhtml-validation-headers-check)
-;;     (save-match-data
-;;       (save-restriction
-;;         (let ((here (point))
-;;               (html nil))
-;;           (goto-char (point-min))
-;;           (setq html (re-search-forward "</?[a-z]+>" nil t))
-;;           (goto-char here)
-;;           html)))))
-
-;; (defcustom nxhtml-validation-header-filenames
-;;   '(
-;;     ("\.php\\'" nxhtml-validation-headers-check)
-;;     ("\.rhtml\\'" nxhtml-validation-headers-check)
-;;     ("\.jsp\\'" nxhtml-validation-headers-check)
-;;     )
-;;   "Alist for turning on `nxhtml-validation-mode'.
-;; The entries in the list should have the form
-
-;;   \(FILE-REGEXP CHECK-FUNCION)
-
-;; If buffer file name matches the regexp FILE-REGEXP and the
-;; function CHECK-FUNCTION returns non-nil when called with the
-;; buffer as an argument \(or CHECK-FUNCTION is nil) then
-;; `nxhtml-global-validation-header-mode' will turn on
-;; `nxhtml-validation-header-mode' in buffer.
-
-;; The function `nxhtml-validation-headers-check' may be a useful
-;; value for CHECK-FUNCTION.
-
-;; See also `nxhtml-maybe-turn-on-validation-header'."
-;;   :type '(alist :key-type regexp :tag "File name regexp"
-;;                 :value-type (group (choice (const :tag "No more check" nil)
-;;                                            (function :tag "Check buffer with"))))
-;;   :group 'nxhtml)
-
-
-
-;; (defun nxhtml-maybe-turn-on-validation-header ()
-;;   "Maybe turn on `nxhtml-validation-header-mode' in buffer.
-;; This is called by `nxhtml-global-validation-header-mode'.
-
-;; See `nxhtml-validation-header-filenames' for how the check
-;; is made."
-;;   (or (and (or (and mumamo-mode
-;;                     (eq (mumamo-main-major-mode) 'nxhtml-mode))
-;;                (eq major-mode 'nxhtml-mode))
-;;            rngalt-validation-header
-;;            nxhtml-current-validation-header
-;;            nxhtml-validation-header-mode
-;;            (progn
-;;              ;;(lwarn 'maybe :warning "quick, buffer=%s" (current-buffer))
-;;              (nxhtml-validation-header-mode 1)
-;;              t))
-;;       (when (buffer-file-name)
-;;         (unless (or ;;nxhtml-validation-header-mode
-;;                  (minibufferp (current-buffer))
-;;                  (string= " " (substring (buffer-name) 0 1))
-;;                  (string= "*" (substring (buffer-name) 0 1))
-;;                  )
-;;           (when (catch 'turn-on
-;;                   (save-match-data
-;;                     (dolist (rec nxhtml-validation-header-filenames)
-;;                       (when (string-match (car rec) (buffer-file-name))
-;;                         (let ((fun (nth 1 rec)))
-;;                           (if (not fun)
-;;                               (progn
-;;                                 ;;(lwarn 't :warning "matched %s to %s, nil" (car rec) (buffer-file-name))
-;;                                 (throw 'turn-on t))
-;;                             (when (funcall fun (current-buffer))
-;;                               ;;(lwarn 't :warning "matched %s to %s" (car rec) (buffer-file-name))
-;;                               (throw 'turn-on t))))))))
-;;             ;;(lwarn 't :warning "turn on %s, buffer=%s" major-mode (current-buffer))
-;;             (nxhtml-validation-header-mode 1))))))
-
-
-;; ;; Fix-me: Is this really the way to do it? Would it not be better to
-;; ;; tie this to mumamo-mode in the turn on hook there? After all
-;; ;; validation headers are probably not used unless mumamo-mode is on.
-;; (define-globalized-minor-mode nxhtml-global-validation-header-mode
-;;   nxhtml-validation-header-mode
-;;   nxhtml-maybe-turn-on-validation-header
-;;   :group 'nxhtml)
-;; ;; The problem with global minor modes:
-;; (when (and nxhtml-global-validation-header-mode
-;;            (not (boundp 'define-global-minor-mode-bug)))
-;;   (nxhtml-global-validation-header-mode 1))
-
-
-(defcustom nxhtml-validation-header-mumamo-modes
-  '(nxhtml-mode)
-  "Main major modes for which to turn on validation header.
-Turn on Fictive XHTML Validation Header if main major mode for the
-used mumamo chunk family is any of those in this list.
-
-See `mumamo-set-chunk-family' for information about mumamo chunk
-families."
-  :type '(repeat (function :tag "Main major mode in mumamo"))
-  :group 'nxhtml)
-
-(defun nxhtml-add-validation-header-if-mumamo ()
-  "Maybe turn on validation header.
-See `nxhtml-validation-header-if-mumamo' for more information."
-  ;;(nxhtml-validation-headers-check (current-buffer))
-  (when (memq (mumamo-main-major-mode) nxhtml-validation-header-mumamo-modes)
-    (nxhtml-validation-header-mode 1)))
-
-(define-toggle nxhtml-validation-header-if-mumamo nil
-  "Add a fictive validation header when mumamo is used.
-If this variable is t then add a Fictive XHTML Validation Header
-\(see `nxhtml-validation-header-mode') in buffer when mumamo is
-used. However do this only if `mumamo-main-major-mode' is one of
-those in `nxhtml-validation-header-mumamo-modes'.
-
-Changing this variable through custom adds/removes the function
-`nxhtml-add-validation-header-if-mumamo' to
-`mumamo-turn-on-hook'."
-  :set '(lambda (sym val)
-          (set-default sym val)
-          (if val
-              (add-hook 'mumamo-turn-on-hook 'nxhtml-add-validation-header-if-mumamo)
-            (remove-hook 'mumamo-turn-on-hook 'nxhtml-add-validation-header-if-mumamo)))
-  :group 'nxhtml)
-
-(defun nxhtml-warnings-are-visible ()
-  (get 'rng-error 'face))
-
-(defvar nxhtml-old-rng-error-face nil)
-(defun nxhtml-toggle-visible-warnings ()
-  "Toggle the red underline on validation errors.
-Those can be quite disturbing when using mumamo because there
-will probably be many validation errors in for example a php
-buffer, since unfortunately the validation routines in
-`rng-validate-mode' from `nxml-mode' tries to validate the whole
-buffer as XHTML.
-
-Also, because of a \(normally unimportant) bug in Emacs 22,
-the red underline that marks an error will sometimes span several
-lines instead of just marking a single character as it
-should. \(This bug is a problem with overlays in Emacs 22.)"
-  (interactive)
-  (let ((face (get 'rng-error 'face)))
-    (if face
-        (progn
-          (setq nxhtml-old-rng-error-face (get 'rng-error 'face))
-          (put 'rng-error 'face nil))
-      (put 'rng-error 'face nxhtml-old-rng-error-face))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Bug corrections
-;; (defun nxml-indent-line ()
-;;   "Indent current line as XML."
-;;   (let ((indent (nxml-compute-indent))
-;;         (from-end (- (point-max) (point))))
-;;     (when indent
-;;       (beginning-of-line)
-;;       (let ((bol (point)))
-;;         (skip-chars-forward " \t")
-;;         ;; There is a problem with some lines, try a quick fix:
-;;         (when (and (= 0 indent)
-;;                    (not (eq (char-after) ?<)))
-;;           (save-excursion
-;;             (save-match-data
-;;               (when (re-search-backward "^<" nil t)
-;;                 (when (search-forward " ")
-;;                   (setq indent (current-column))))))
-;;           (when (= 0 indent)
-;;             (setq indent nxml-child-indent)))
-;;         ;; And sometimes nxml-compute-indent get very upset, check for
-;;         ;; that:
-;;         (let ((here (point)))
-;;           (beginning-of-line 0)
-;;           (back-to-indentation)
-;;           (when (and (= indent (current-column))
-;;                      (eq (char-after) ?\"))
-;;             (setq indent 0))
-;;           (goto-char here))
-;;         (unless (= (current-column) indent)
-;;           (delete-region bol (point))
-;;           (indent-to indent)))
-;;       (when (> (- (point-max) from-end) (point))
-;;         (goto-char (- (point-max) from-end))))))
-
-
-;; FIX-ME: untag should be in nxml-mode.el since it is in no way
-;; specific to nxhtml-mode, but I do not want to change nxml-mode.el
-;; at the moment.
-
-(defcustom nxml-untag-select 'yes
-  "Decide whether to select an element untagged by `nxml-untag-element'.
-If this variable is 'yes the element is selected after untagging
-the element. The mark is set at the end of the element and point
-at the beginning of the element.
-
-If this variable is 'no then the element is not selected and
-point is not moved. If it is 'ask the user is asked what to do."
-  :type '(choice (const :tag "Yes" yes)
-                 (const :tag "No" no)
-                 (const :tag "Ask" ask))
-  :group 'nxml)
-
-(defun nxml-untag-element (arg)
-  "Remove start and end tag from current element.
-The mark is by default set to the end of the former element and
-point is moved to the beginning. Mark is also activated so that
-it is easy to surround the former element with a new tag.
-
-Whether to select the old element is controlled by
-`nxml-untag-select'. The meaning of the values 'yes and 'no for
-this variable is flipped by using a universal argument.
-
-Note: If you want to `undo' the untag and you use
-`transient-mark-mode' then you must first do something so that
-the region is not highlighted (for example C-g)."
-  (interactive "*P")
-  (let ((here (point-marker))
-        el-start
-        el-start-end
-        el-end
-        el-end-end
-        (select t))
-    (nxml-backward-up-element)
-    (setq el-start (point))
-    (nxml-forward-balanced-item)
-    (setq el-start-end (point))
-    (goto-char el-start)
-    (nxml-forward-element)
-    (setq el-end-end (point-marker))
-    (nxml-backward-single-balanced-item)
-    (setq el-end (point))
-    (delete-region el-end el-end-end)
-    (delete-region el-start el-start-end)
-    ;; Select the element or not?
-    (if (eq nxml-untag-select 'ask)
-        (setq select (y-or-n-p "Select the old element? "))
-      (when (eq nxml-untag-select 'no)
-        (setq select nil))
-      (when arg
-        (setq select (not select))))
-    (if (not select)
-        (goto-char here)
-      (goto-char el-end-end)
-      (push-mark nil t t)
-      (setq mark-active t)
-      (setq deactivate-mark nil)
-      (goto-char el-start))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Misc
 
 (defun nxhtml-update-mark-today (date-str)
   "Update marks for today's date.
@@ -2882,213 +325,9 @@ The mark has this form
                                (submatch (0+ anything))
                                "<!-- end today -->")
                               nil t)
-      (replace-match date-str nil nil nil 1))
-    (goto-char here)))
-
-(defun nxhtml-rollover-insert-2v ()
-  "Insert CSS rollover images.
-The upper half of the image will be used when mouse is out and
-the lower half when mouse is over the image.
-
-Only CSS is used for the rollover. The CSS code is written to the
-header part of the file if possible, otherwise it is copied to
-the kill ring/clipboard.
-
-The CSS code is built from a template file and the image size.
-
-This might be used for example for creating a menu with
-alternatives vertically or horizontally.
-
-Usage example:
-
-  If you want to make a small button style menu with images you
-  can start like this:
-
-      <div id=\"mylinks\">
-        <ul>
-          <li>
-     X      <a href=\"news.html\">News and Notes</a>
-          </li>
-          <li>
-            <a href=\"doc.html\">Documentation</a>
-          </li>
-        <ul>
-      </div>
+      (replace-match date-str nil nil nil 1))))
 
-  Then put point at the X above (this is just a mark, should not
-  be in your code) and call this function.
 
-  It will add some CSS code to in the header of your file. You
-  may want to tweak this a little bit, see below (or place it
-  somewhere else). It may look like this:
-
-    #mylinks a {
-        /* Image */
-        display: block;
-        background: transparent url(\"img/mybutton.png\") 0 0 no-repeat;
-        overflow: hidden;
-        width: 200px;
-        /* Text placement and size, etc */
-        text-align: center;
-        /* You may need to change top and bottom padding depending
-           on font size. */
-        padding-top: 11px;
-        font-size: 12px;
-        padding-bottom: 9px;
-        text-decoration: none;
-        white-space: nowrap;
-        border: none;
-    }
-    #mylinks a:hover {
-        background-position: 0 -35px;
-    }
-    #mylinks li {
-        display: inline;
-        padding: 0;
-        margin: 0;
-        float: none;
-    }
-
-For an example of usage see the file nxhtml.html that comes with
-nXhtml and can be opened from the nXhtml menu under
-
-  nXhtml / nXhtml Help and Setup / nXhtml version nn Overview"
-  (interactive)
-;; Fix-me: not quite ready yet, but should work OK."
-  (save-excursion
-    (let* ((tag (progn
-                  (search-forward ">" nil t)
-                  (unless (re-search-backward (rx "<"
-                                                  (1+ (any "a-zA-Z:"))
-                                                  (1+ (not (any ">")))
-                                                  " id=\""
-                                                  (submatch (+? anything))
-                                                  "\"")
-                                              nil t)
-                    (error "Can't find tag with id backwards"))
-                  (match-string-no-properties 0)))
-           (tagid (match-string-no-properties 1))
-           (tagovl (let ((ovl (make-overlay
-                               (match-beginning 0) (match-end 0))))
-                     (overlay-put ovl 'face 'highlight)
-                     ovl))
-           (head-end (save-excursion (search-backward "</head" nil t))))
-      (unless head-end
-        (error "Can't find end of head tag. Need this to insert css."))
-      (sit-for 1)
-      (unwind-protect
-          (condition-case err
-              (let* ((img-src (nxhtml-read-url
-                           '(?f) nil 'nxhtml-image-url-predicate
-                           (concat "Rollover image for \"" tag "\",")))
-                     (img-sizes (when (file-exists-p img-src)
-                                  (image-size (create-image
-                                               (expand-file-name img-src))
-                                              t)))
-                     (class (read-string
-                             (concat
-                              "Class name for rollover (empty to use id="
-                              tagid "): ")))
-                     (rollover-spec (if (< 0 (length class))
-                                        (concat "." class)
-                                      (concat "#" tagid)))
-                     img-width img-height
-                     img-h2
-                     img-w2
-                     padding-top
-                     padding-bottom
-                     (font-size (read-number "Font size (px): " 12))
-                     (css-template-file (read-file-name
-                                         "CSS template file: "
-                                         (expand-file-name
-                                          "../etc/templates/"
-                                          nxhtml-src-dir)
-                                         nil
-                                         t
-                                         "rollover-2v.css"
-                                         ))
-                     (center-or-pad
-                      (if (y-or-n-p "Do you want to center the text? ")
-                          "text-align: center"
-                        (format "padding: %spx" (/ font-size 2))))
-                     (hor-or-ver
-                      (if (y-or-n-p "Do you want the alternatives shown in a vertical list? ")
-                          "float: none"
-                        "float: left"))
-                     (css-template-buffer (find-file-noselect
-                                           css-template-file))
-                     (css-template (with-current-buffer css-template-buffer
-                                     ;; Do not widen, let user decide.
-                                     (buffer-substring-no-properties
-                                      (point-min) (point-max))))
-                     (css css-template))
-                (unless (file-exists-p css-template-file)
-                  (error "Can't find file %s" css-template-file))
-                (if img-sizes
-                    (progn
-                      (setq img-width (car img-sizes))
-                      (setq img-height (cdr img-sizes)))
-                  (setq img-width (read-number "Width: "))
-                  (setq img-height (read-number "Width: ")))
-                (setq img-h2 (/ img-height 2))
-                (setq img-w2 (/ img-width 2))
-                (setq padding-top (/ (- img-h2 font-size) 2))
-                ;; Fix-me: I have no idea why I have to subtract 3
-                ;; from bottom, but inspection with Firebug seems to
-                ;; say so:
-                (setq padding-bottom (- img-h2 padding-top font-size 3))
-                (setq css (replace-regexp-in-string "ROLLOVER_SPEC" rollover-spec css t t))
-                (setq css (replace-regexp-in-string "IMG_WIDTH_2" (number-to-string img-h2) css t t))
-                (setq css (replace-regexp-in-string "IMG_HEIGHT_2" (number-to-string img-h2) css t t))
-                (setq css (replace-regexp-in-string "IMG_WIDTH" (number-to-string img-width) css t t))
-                (setq css (replace-regexp-in-string "IMG_HEIGHT" (number-to-string img-height) css t t))
-                (setq css (replace-regexp-in-string "IMG_URL" img-src css t t))
-                (setq css (replace-regexp-in-string "FONT_SIZE" (number-to-string font-size) css t t))
-                (setq css (replace-regexp-in-string "PADDING_TOP" (number-to-string padding-top) css t t))
-                (setq css (replace-regexp-in-string "PADDING_BOTTOM" (number-to-string padding-bottom) css t t))
-                (setq css (replace-regexp-in-string "CENTER_OR_PAD" center-or-pad css t t))
-                (setq css (replace-regexp-in-string "HOR_OR_VER" hor-or-ver css t t))
-                (if head-end
-                    (let ((this-window (selected-window)))
-                      (find-file-other-window buffer-file-name)
-                      (goto-char head-end)
-                      (beginning-of-line)
-                      (insert "<style type=\"text/css\">\n"
-                              css
-                              "\n</style>\n")
-                      (select-window this-window))
-                  (kill-new css)
-                  (message "No place to insert CSS, copied to clipboard instead"))))
-        (delete-overlay tagovl)
-        ))))
-
-;; Fix-me: image border 0
-;; Fix-me: SSI <!--#include file="file:///C|/EmacsW32/nxml/nxhtml/bug-tests/bug-080609.html" -->
-;; Fix-me: Better a tag completion, target etc.
-;; Fix-me: image map - is that possible now?
-;; Fix-me: Special chars - completing on &? Or popup? Use nxml-insert-named-char
-;; Fix-me: Quick table insert? A form?
-;; Fix-me: Quick object insert? (applet is depreceated)
-;; Fix-me: Better meta insert? Quick meta?
-;; Fix-me: Quick div! Better div completion with position: static,
-;;         relative, absolute and fixed - with some explanations.
-;; Fix-me: Quick hr?
-;; Fix-me: Import CSS? Export CSS?
-;; Fix-me: Use nxhtml-js.el?
-;; Fix-me: Scroll bar colors etc? See 1stPage.
-;;   body {
-;;     scrollbar-arrow-color: #FF6699;
-;;     scrollbar-3dlight-color: #00FF33;
-;;     scrollbar-highlight-color: #66FFFF;
-;;     scrollbar-face-color: #6699FF;
-;;     scrollbar-shadow-color: #6633CC;
-;;     scrollbar-darkshadow-color: #660099;
-;;     scrollbar-track-color: #CC6633;
-;;     }
-;; Fix-me: Built with nXhtml button!
-;; Fix-me: More quick menus: http://www.cssplay.co.uk/menus/
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (provide 'nxhtml)
-
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; nxhtml.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxhtml-js.el b/elpa-to-submit/nxhtml/nxhtml/nxhtmljs.el
similarity index 87%
rename from elpa-to-submit/nxhtml/nxhtml/nxhtml-js.el
rename to elpa-to-submit/nxhtml/nxhtml/nxhtmljs.el
index 8eed104bcb..b7f3a67f9f 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxhtml-js.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxhtmljs.el
@@ -1,9 +1,9 @@
 ;;; nxhtml-js.el --- Javascript support functions
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: Sat Apr 28 01:51:17 2007
-;; Version: 0.0
-;; Lxast-Updated:
+;; Created: Sat Apr 28 2007
+;; Version: 0.1
+;; Last-Updated: 2008-12-28 Sun
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
@@ -44,6 +44,9 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'nxhtml))
+(eval-when-compile (require 'nxhtml-mode))
+
 (defun nxhtml-add-link (type src silent)
   ;;<script type="text/javascript" src="EmacsW32.js"></script>
   (catch 'exit
@@ -122,13 +125,23 @@ files that comes with nXhtml are linked to directly."
       (goto-char (point-min))
       (when  (search-forward nxhtml-smoothgallery-mark nil t)
         (back-to-indentation)
-        (when (looking-at (rx
-                           "<div id=\""
-                           (submatch
-                            (1+ (not (any ">")))
-                            )
-                           "\">" (eval nxhtml-smoothgallery-mark)
-                           ))
+        (when (looking-at
+               ;; (rx
+               ;;  "<div id=\""
+               ;;  (submatch
+               ;;   (1+ (not (any ">")))
+               ;;   )
+               ;;  "\">" (eval nxhtml-smoothgallery-mark))
+               ;;(concat "<div id=\"\\([^>]+\\)\">" nxhtml-smoothgallery-mark)
+               (rx-to-string
+                `(and
+                  "<div id=\""
+                  (submatch
+                   (1+ (not (any ">")))
+                   )
+                  "\">"
+                  ,nxhtml-smoothgallery-mark))
+               )
           (cons
            (copy-marker (match-beginning 0))
            (buffer-substring-no-properties
@@ -143,11 +156,11 @@ files that comes with nXhtml are linked to directly."
     (search-forward jsmark nil t)))
 
 (defun nxhtml-smoothgallery-add (point-name)
-  (interactive (list
-                (let ((old-name (nxhtml-smoothgallery-find)))
-                  (if old-name
-                      old-name
-                    "myGallery"))))
+  (interactive "i")
+  (unless point-name
+    (setq point-name (nxhtml-smoothgallery-find))
+    (unless point-name
+      (setq point-name "myGallery")))
   (let ((name (if (consp point-name)
                   (cdr point-name)
                 point-name))
@@ -195,7 +208,7 @@ files that comes with nXhtml are linked to directly."
   (unless thumbsrc (setq thumbsrc imgsrc))
   (let ((gallery (nxhtml-smoothgallery-find)))
     (unless gallery
-      (setq gallery (nxhtml-smoothgallery-add)))
+      (setq gallery (nxhtml-smoothgallery-add nil)))
     (goto-char (car gallery))
     (end-of-line)
     (insert-and-indent "
diff --git a/elpa-to-submit/nxhtml/nxhtml/nxml-where.el b/elpa-to-submit/nxhtml/nxhtml/nxml-where.el
index ba10c889fd..0625cb8a56 100644
--- a/elpa-to-submit/nxhtml/nxhtml/nxml-where.el
+++ b/elpa-to-submit/nxhtml/nxhtml/nxml-where.el
@@ -48,113 +48,108 @@
 ;; If you want to create a file, visit that file with C-x C-f,
 ;; then enter the text in that file's own buffer.
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'mumamo))
 (eval-when-compile
-  (require 'cl)
   (unless (featurep 'nxhtml-autostart)
     (let ((efn (expand-file-name "../autostart.el")))
       (load efn))
     (require 'nxml-mode)))
 
-(defvar nxml-where-once-update-timer nil)
-(make-variable-buffer-local 'nxml-where-once-update-timer)
-(put 'nxml-where-once-update-timer 'permanent-local t)
+(defun nxml-where-error-message (format-string &rest args)
+  (with-current-buffer (get-buffer-create "*Messages*")
+    (let ((start (1+ (point-max))))
+      (apply 'message format-string args)
+      (goto-char (point-max))
+      (backward-char)
+      ;; fix-me: got some error here:
+      ;;(put-text-property start (point) 'face 'highlight)
+      )))
+
+(defvar nxml-where-last-point nil
+  "Where point was last time marking finished.
+Ie we should not restart marking if point is still there and no
+changes have occured.")
+(make-variable-buffer-local 'nxml-where-last-point)
+(put 'nxml-where-last-point 'permanent-local t)
 
-(defun nxml-where-cancel-once ()
-  (when (timerp nxml-where-once-update-timer)
-    (cancel-timer nxml-where-once-update-timer)
-    (setq nxml-where-once-update-timer nil)))
+(defvar nxml-where-last-finished nil
+  "Non-nil then marking is finished.")
+(make-variable-buffer-local 'nxml-where-last-finished)
+(put 'nxml-where-last-finished 'permanent-local t)
 
-(defun nxml-where-start-second-in-timer (next-point buffer)
-  ;;(message "start second")
-  (condition-case err
-      (setq nxml-where-once-update-timer
-            (run-with-idle-timer idle-update-delay
-                                 nil
-                                 'nxml-where-do-marking-in-timer
-                                 next-point
-                                 buffer))
-    (error
-     (nxml-where-error-message
-            "nxml-where-start-second error %s" err))))
+(defvar nxml-where-last-added nil)
+(make-variable-buffer-local 'nxml-where-last-added)
+(put 'nxml-where-last-added 'permanent-local t)
 
-(defun nxml-where-update-buffers ()
-  (when (boundp 'nxml-where-mode)
-    (dolist (buf (buffer-list))
-      (when nxml-where-mode
-        (nxml-where-mode -1)
-        (nxml-where-mode 1)))))
+(defvar nxml-where-path nil
+  "The current where path.
+This is a list where the records have the form
 
-(defun nxml-where-restart-update ()
-  (condition-case err
-      (unless (and nxml-where-last-point
-                   (= nxml-where-last-point (point)))
-        ;;(message "\n restart-update: this-command=%s, nxml-where-last-point=%s, point=%s" this-command nxml-where-last-point (point))
-        (setq nxml-where-last-point nil)
-        (setq nxml-where-last-finished nil)
-        (nxml-where-cancel-once)
-        (setq nxml-where-once-update-timer
-              (run-with-idle-timer
-               (* 0.2 idle-update-delay)
-               nil
-               'nxml-where-start-update-in-timer
-               (current-buffer))))
-    (error
-     (nxml-where-error-message
-      "%s" (error-message-string err)))))
-(put 'nxml-where-restart-update 'permanent-local-hook t)
+   \(START END TAG-STR OVERLAY)")
+(make-variable-buffer-local 'nxml-where-path)
+(put 'nxml-where-path 'permanent-local t)
 
-(defun nxml-where-stop-updating ()
-  (remove-hook 'post-command-hook 'nxml-where-restart-update t))
+(defvar nxml-where-new-path nil
+  "The new where path.
+This is a list where the records have the form
 
-(defun nxml-where-setup-updating ()
-  (nxml-where-clear-path)
-  (setq nxml-where-last-added nil)
-  (setq nxml-where-last-point nil)
-  (when (and nxml-where-header
-             (not nxml-where-only-inner))
-    (setq header-line-format "Started nxml-where-mode ..."))
-  ;;(nxml-where-restart-update)
-  (add-hook 'post-command-hook 'nxml-where-restart-update nil t))
+   \(START END TAG-STR OVERLAY)")
+(make-variable-buffer-local 'nxml-where-new-path)
+(put 'nxml-where-new-path 'permanent-local t)
+
+(defvar nxml-where-once-update-timer nil)
+(make-variable-buffer-local 'nxml-where-once-update-timer)
+(put 'nxml-where-once-update-timer 'permanent-local t)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Custom options
 
 (defgroup nxml-where nil
   "Customization group for nxml-where."
   :group 'nxhtml
   :group 'nxml)
 
-(define-toggle nxml-where-tag+id t
-  "Show tags + id in path if non-nil.
-If nil show only tag names."
+(define-toggle nxml-where-only-inner nil
+  "Mark only inner-most tag."
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
 (define-toggle nxml-where-header t
   "Show header with XML-path if non-nil."
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
-(define-toggle nxml-where-marks t
-  "Show marks in buffer for XML-path if non-nil."
+(define-toggle nxml-where-tag+id t
+  "Show tags + id in path if non-nil.
+If nil show only tag names."
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
-(define-toggle nxml-where-only-inner nil
-  "Mark only inner-most tag."
+(define-toggle nxml-where-marks t
+  "Show marks in buffer for XML-path if non-nil."
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
 (define-toggle nxml-where-only-tags-with-id t
   "Show only tags with id in the header line."
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
 (defface nxml-where-marking
@@ -167,7 +162,8 @@ If nil show only tag names."
   :type 'face
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
 (defcustom nxml-where-header-attributes '("id" "name")
@@ -175,7 +171,8 @@ If nil show only tag names."
   :type '(repeat string)
   :set (lambda (sym val)
          (set-default sym val)
-         (nxml-where-update-buffers))
+         (when (fboundp 'nxml-where-update-buffers)
+           (nxml-where-update-buffers)))
   :group 'nxml-where)
 
 (defcustom nxml-where-widen t
@@ -184,16 +181,11 @@ If nil show only tag names."
   :group 'nxml-where)
 
 
-(defvar nxml-where-saved-header-line-format nil)
-(make-variable-buffer-local 'nxml-where-saved-header-line-format)
-(put 'nxml-where-saved-header-line-format 'permanent-local t)
 
-(defun nxml-where-save-header-line-format ()
-  (unless nxml-where-saved-header-line-format
-    (setq nxml-where-saved-header-line-format header-line-format)))
 
-(defun nxml-where-restore-header-line-format ()
-  (setq header-line-format nxml-where-saved-header-line-format))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Modes
 
 (defvar nxml-where-modes '(nxml-mode nxhtml-mode))
 
@@ -204,21 +196,33 @@ If nil show only tag names."
            (let ((major-mode (mumamo-main-major-mode)))
              (derived-mode-p 'nxml-mode)))))
 
+(defun nxml-where-setup-updating ()
+  (nxml-where-clear-old-path 0 "setup")
+  (setq nxml-where-last-added nil)
+  (setq nxml-where-last-point nil)
+  (when (and nxml-where-header
+             (not nxml-where-only-inner))
+    (setq header-line-format "Started nxml-where-mode ..."))
+  ;;(nxml-where-restart-update)
+  (add-hook 'post-command-hook 'nxml-where-restart-update nil t))
+
 (defun nxml-where-mode-start ()
   ;;(message "START")
   (unless (nxml-where-is-nxml)
     (error "Can't display XML path since major mode is not nxml-mode child."))
-  (add-hook 'after-change-major-mode-hook
-            'nxml-where-turn-off-unless-nxml nil t)
+  (add-hook 'after-change-major-mode-hook 'nxml-where-turn-off-unless-nxml nil t)
+  (add-hook 'after-change-functions 'nxml-where-after-change nil t)
   (nxml-where-save-header-line-format)
   (nxml-where-setup-updating))
 
 (defun nxml-where-mode-stop ()
   ;;(message "STOP")
+  (remove-hook 'after-change-major-mode-hook 'nxml-where-turn-off-unless-nxml t)
+  (remove-hook 'after-change-functions 'nxml-where-after-change t)
   (nxml-where-stop-updating)
   (nxml-where-unmark-forward-element)
   (nxml-where-restore-header-line-format)
-  (nxml-where-clear-path))
+  (nxml-where-clear-old-path 0 "stop"))
 
 (defun nxml-where-turn-off-unless-nxml ()
   (unless (nxml-where-is-nxml)
@@ -242,8 +246,12 @@ If nil show only tag names."
   "Turn on `nxml-where-mode' if possible.
 This is possible if `major-mode' in the buffer is derived from
 `nxml-mode'."
-  (when (derived-mode-p 'nxml-mode)
-    (nxml-where-mode 1)))
+  (when (or (derived-mode-p 'nxml-mode)
+            (and mumamo-multi-major-mode
+                 (let ((major-mode (mumamo-main-major-mode)))
+                   (derived-mode-p 'nxml-mode))))
+    (unless nxml-where-mode
+      (nxml-where-mode 1))))
 
 ;;;###autoload
 (define-globalized-minor-mode nxml-where-global-mode nxml-where-mode
@@ -254,34 +262,130 @@ This is possible if `major-mode' in the buffer is derived from
            (not (boundp 'define-global-minor-mode-bug)))
   (nxml-where-global-mode 1))
 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Auto updating
+
+(defvar nxhtml-where-hook nil
+  "Normal hook run when marking has changed.")
+
 (defun nxml-where-start-update-in-timer (buffer)
+  "First checks post command."
   ;;(message "nxml-where-start-update buffer=%s (bufferp buffer)=%s" buffer (bufferp buffer))
+  (when (and (bufferp buffer)
+             (buffer-live-p buffer))
+    (with-current-buffer buffer
+      (let ((here (point)))
+        (save-match-data
+          (condition-case err
+              (progn
+                ;;(unless nxml-where-marks (nxml-where-clear-old-path))
+                (unless (and nxml-where-header
+                             (not nxml-where-only-inner))
+                  (setq header-line-format nil))
+                (when (and nxml-where-mode
+                           (or nxml-where-header nxml-where-marks))
+                  (nxml-where-do-marking nil buffer)))
+            (error
+             (nxml-where-error-message
+              "nxml-where-start-update-in-timer error: %s" err)))
+          (goto-char here))))))
+
+(defun nxml-where-continue-marking-in-timer (this-point buffer)
+  "Continue unfinished marking after last restart.
+Ie we have run at least once post command."
+  ;;(message "continue-marking-in-timer %s %s" this-point buffer)
+  (with-current-buffer buffer
+    (let ((here (point)))
+      (condition-case err
+          (save-match-data ;; runs in timer
+            (nxml-where-do-marking this-point buffer))
+        (error
+         (nxml-where-error-message
+          "nxml-where-do-marking error: %s"
+          err)))
+      (goto-char here))))
+
+(defun nxml-where-start-continue-in-timer (next-point buffer)
+  ;;(message "start second")
+  (condition-case err
+      (setq nxml-where-once-update-timer
+            (run-with-idle-timer idle-update-delay
+                                 nil
+                                 'nxml-where-continue-marking-in-timer
+                                 next-point
+                                 buffer))
+    (error
+     (nxml-where-error-message
+      "nxml-where-start-second error %s" err))))
+
+(defun nxml-where-restart-update ()
+  "Restart update, runs in `post-command-hook'."
+  ;;(message "restart-update")
   (condition-case err
-      (when (and (bufferp buffer)
-                 (buffer-live-p buffer))
-        (with-current-buffer buffer
-          (unless nxml-where-marks (nxml-where-clear-path))
-          (unless nxml-where-header (setq header-line-format nil))
-          (when (and nxml-where-mode
-                     (or nxml-where-header nxml-where-marks))
-            (nxml-where-do-marking nil buffer))))
+      (save-match-data ;; runs in timer
+        (unless (and nxml-where-last-point
+                     (= nxml-where-last-point (point)))
+          (setq nxml-where-last-point nil)
+          (setq nxml-where-last-finished nil)
+          (nxml-where-cancel-once)
+          (setq nxml-where-once-update-timer
+                (run-with-idle-timer
+                 (* 0.2 idle-update-delay)
+                 nil
+                 'nxml-where-start-update-in-timer
+                 (current-buffer)))))
     (error
      (nxml-where-error-message
-      "nxml-where-start-update-in-timer error: %s" err))))
+      "%s" (error-message-string err)))))
+(put 'nxml-where-restart-update 'permanent-local-hook t)
 
-(defvar nxml-where-get-id-pattern
-  (rx space
-      (eval (cons 'or nxml-where-header-attributes))
-      (0+ space)
-      ?=
-      (0+ space)
-      ?\"
-      (0+ (not (any ?\")))
-      ?\"
-      ))
+(defvar nxml-where-first-change-pos nil)
+(make-variable-buffer-local 'nxml-where-first-change-pos)
+(put 'nxml-where-first-change-pos 'permanent-local t)
+
+(defun nxml-where-after-change (beg end len)
+  (setq nxml-where-last-point nil)
+  (setq nxml-where-first-change-pos
+        (min beg
+             (or nxml-where-first-change-pos
+                 beg))))
+
+(defun nxml-where-cancel-once ()
+  (when (timerp nxml-where-once-update-timer)
+    (cancel-timer nxml-where-once-update-timer)
+    (setq nxml-where-once-update-timer nil)))
+
+(defun nxml-where-update-buffers ()
+  (when (boundp 'nxml-where-mode)
+    (dolist (buf (buffer-list))
+      (with-current-buffer buf
+        (when nxml-where-mode
+          (nxml-where-mode -1)
+          (nxml-where-mode 1))))))
+
+(defun nxml-where-stop-updating ()
+  (remove-hook 'post-command-hook 'nxml-where-restart-update t))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Marking
+
+(defconst nxml-where-get-id-pattern
+  (rx-to-string
+   `(and
+     space
+     ,(cons 'or nxml-where-header-attributes)
+     (0+ space)
+     ?=
+     (0+ space)
+     ?\"
+     (0+ (not (any ?\")))
+     ?\")
+   t))
 
 (defvar nxml-where-tag+id-pattern
-  ;;(insert ;; -------------------
   (rx ?<
       (submatch
        (1+ (char "-a-z0-9:"))
@@ -297,46 +401,35 @@ This is possible if `major-mode' in the buffer is derived from
           )
       (0+ space)
       (opt ?/)
-      ?>)
-  ;;) ;; -------------------
-  )
+      ?>))
 
-;; (defun nxml-where-mark (start end)
-;;   (let (ovl
-;;         (ovls (overlays-at start)))
-;;     (dolist (o ovls)
-;;       (when (and (eq (overlay-get o 'face) nxml-where-marking)
-;;                  (= start (overlay-start o))
-;;                  (= end   (overlay-end o)))
-;;         (setq ovl o)))
-;;     (unless ovl
-;;       (setq ovl (make-overlay start end))
-;;       (overlay-put ovl 'face nxml-where-marking)
-;;       (move-overlay ovl start end))
-;;     ovl))
 
 (defvar nxml-where-forward-element nil)
 (make-variable-buffer-local 'nxml-where-forward-element)
 (put 'nxml-where-forward-element 'permanent-local t)
 
 (defun nxml-where-unmark-forward-element ()
-  ;;(message "unmark-for %s" nxml-where-forward-element)
+  "Unmark currently marked end tag."
   (when nxml-where-forward-element
-    (let ((ovl (nth 1 nxml-where-forward-element)))
-      (when (overlayp ovl) (delete-overlay ovl)))
+    (let* ((ovl (nth 1 nxml-where-forward-element))
+           (str (when ovl (buffer-substring-no-properties (overlay-start ovl) (overlay-end ovl)))))
+      (when (overlayp ovl)
+        ;;(message "unmark-forward-element:delete-overlay %s %s" str ovl)
+        (delete-overlay ovl)))
     (setq nxml-where-forward-element nil)))
 
 (defun nxml-where-mark-forward-element (start-tag)
-  ;;(message "point 0 = %s, start-tag=%s fe=%s" (point) start-tag nxml-where-forward-element)
-  ;;(message "  path=%s" nxml-where-path)
-  (unless (and nxml-where-forward-element
+  "Mark the end tag matching START-TAG."
+  ;;(message "nxml-where-forward-element=%s" nxml-where-forward-element)
+  (unless (and start-tag
+               nxml-where-forward-element
                (nth 1 nxml-where-forward-element)
                (= (nth 0 nxml-where-forward-element)
                   start-tag))
-    ;;(message "h3re")
+    ;;(message "before unmark")
     (nxml-where-unmark-forward-element)
-    (save-restriction
-      ;;(message "point 1 = %s" (point))
+    ;;(message "after unmark")
+    (when start-tag
       (let ((here (point))
             (end-of-narrow
              (progn
@@ -348,300 +441,224 @@ This is possible if `major-mode' in the buffer is derived from
                                  end-of-narrow))
         (setq end-of-narrow (min (point-max)
                                  end-of-narrow))
-        (narrow-to-region here end-of-narrow)
-        (condition-case err
-            (progn
-              ;;(message "point X forw= %s" (point))
-              (nxml-forward-element)
-              (when (looking-back "</[a-z0-9]+>")
-                (setq start (match-beginning 0))
-                (setq end (point))
-                (setq ovl (make-overlay start end))
-                (overlay-put ovl 'face nxml-where-marking)))
-          (error
-           (let ((msg (error-message-string err)))
-             (unless (string= msg "Start-tag has no end-tag")
-               (message "nxml-where-mark-forw: %s" str)))))
-        (widen)
+        (save-restriction
+          (narrow-to-region start-tag end-of-narrow)
+          (condition-case err
+              (progn
+                (goto-char start-tag)
+                (nxml-forward-element)
+                (when (looking-back "</[a-z0-9]+>")
+                  (setq start (match-beginning 0))
+                  (setq end (point))
+                  (setq ovl (make-overlay start end))
+                  (overlay-put ovl 'nxml-where t)
+                  (overlay-put ovl 'face nxml-where-marking)))
+            (error
+             (let ((msg (error-message-string err)))
+               (unless (string= msg "Start-tag has no end-tag")
+                 (message "nxml-where-mark-forw: %s" msg))))))
         (goto-char here)
         ;;(message "point 2 = %s" (point))
         (setq nxml-where-forward-element (list start-tag ovl))))))
 
-(defvar nxml-where-path nil)
-(make-variable-buffer-local 'nxml-where-path)
-(put 'nxml-where-path 'permanent-local t)
 
 (defun nxml-where-make-rec (tag-start tag-end tag-str buf)
   ;;(message "nxml-where-make-rec %s %s %s %s" tag-start tag-end tag-str buf)
-  (let ((ovls (overlays-at tag-start)))
+  (let ((ovls (overlays-at tag-start))
+        str)
     (dolist (ovl ovls)
-      (when (equal (overlay-get ovl 'face) nxml-where-marking)
-        (nxml-where-error-message "old ovl=%s" ovl))))
+      (when (overlay-get ovl 'nxml-where)
+        (setq str (buffer-substring-no-properties (overlay-start ovl) (overlay-end ovl)))
+        (message "==================================================")
+        (nxml-where-error-message "old ovl=%s    %S" ovl str)
+        (message "old: nxml-where-path=%s" nxml-where-path)
+        (message "old: nxml-where-new-path=%s" nxml-where-new-path)
+        )))
   (let ((ovl (when buf (make-overlay tag-start tag-end))))
-    (when ovl (overlay-put ovl 'face nxml-where-marking))
+    (when ovl
+      (overlay-put ovl 'nxml-where t)
+      (overlay-put ovl 'face nxml-where-marking))
     (list tag-start tag-end tag-str ovl)))
 
-(defun nxml-where-delete-rec (rec)
-  ;;(message "delete-overlay rec=%s" rec)
-  (let ((ovl (nth 3 rec)))
-    (when ovl
+(defun nxml-where-delete-rec (rec from)
+  (let* ((ovl (nth 3 rec))
+         (str (when ovl
+                (buffer-substring-no-properties (overlay-start ovl) (overlay-end ovl)))))
+    (when (and ovl (overlay-buffer ovl))
       (assert (overlayp ovl) t)
-      ;;(message "delete-overlay %s" ovl)
-      (delete-overlay ovl))))
-
-(defvar nxml-where-last-point nil)
-(make-variable-buffer-local 'nxml-where-last-point)
-(put 'nxml-where-last-point 'permanent-local t)
+      ;;(message "delete-rec:delete-overlay %s %s (%s)" str ovl from)
+      (delete-overlay ovl)
+      ;;(message "after delete=%s" ovl)
+      )))
 
-(defvar nxml-where-last-finished nil)
-(make-variable-buffer-local 'nxml-where-last-finished)
-(put 'nxml-where-last-finished 'permanent-local t)
-
-(defvar nxml-where-last-added nil)
-(make-variable-buffer-local 'nxml-where-last-added)
-(put 'nxml-where-last-added 'permanent-local t)
 
-(defun nxml-where-clear-path ()
+(defun nxml-where-clear-old-path (end-of-interest from)
+  "Clear all marking below END-OF-INTEREST.
+Update `nxml-where-path accordingly."
   (setq nxml-where-last-added nil)
-  (nxml-where-update-where-path -1 nil nil nil))
-
-(defun nxml-where-update-where-path (tag-start tag-end tag-str buffer)
-  ;;(message "nxml-where-last-added=%s" nxml-where-last-added)
-  ;;
-  ;; Fix-me: Deletion is not handled correctly when moving quickly.
-  (when nxml-where-only-inner
-    (setq nxml-where-path
-          (mapcar (lambda (rec)
-                    (if (and (= tag-start (nth 0 rec))
-                             (= tag-end   (nth 0 rec))
-                             (string= tag-str (nth 2 rec)))
-                        rec
-                      (nxml-where-delete-rec rec)
-                      nil))
-                  nxml-where-path))
-    (setq nxml-where-path (delq nil nxml-where-path)))
-  (unless nxml-where-last-added
-    ;; Trim off everything below tag-start.
-    (let ((ptr nxml-where-path)
-          prev-ptr
-          old-rec
-          tail)
-      (while (and ptr
-                  (<= (nth 0 (car ptr)) (1+ tag-start)))
-        (setq prev-ptr ptr)
-        (setq ptr (cdr ptr)))
-      ;;(message "trimming tag-start=%s, tag-end=%s, tail ptr at=%s, nxml-where-last-added=%s" tag-start tag-end (caar ptr) nxml-where-last-added)
-      (when ptr
-        ;;(setq tail (cdr ptr))
-          (setq tail ptr)
-          (if prev-ptr
-              (setcdr prev-ptr nil)
-            (setq nxml-where-path nil)))
-      ;; Clean up tail
-      ;;(message "tail=%s" tail)
-      (dolist (rec tail)
-        (nxml-where-delete-rec rec))))
-  ;; If tag-end is nil we are just clearing
-  (when tag-end
-    (let (result)
-      ;; Check we are sane
-      (if (or (not nxml-where-last-added)
-              (< tag-start (nth 0 nxml-where-last-added)))
-          (setq nxml-where-last-added t)
-        ;;(message "nxml-where internal error: tag-start below last added, %s < %s" tag-start nxml-where-last-added)
-        (setq nxml-where-last-added nil))
-      (when nxml-where-last-added
-        ;; Find out where to insert
-        (let ((ptr nxml-where-path)
-              prev-ptr
-              old-rec
-              new-rec)
-          ;;(message "before while ptr=%s" ptr)
-          (while (and ptr (< (nth 0 (car ptr)) tag-start))
-            (setq prev-ptr ptr)
-            (setq ptr (cdr ptr))
-            )
-          ;; Is this now the same as the old value?
-          ;;(message "Same? ptr=%s" ptr)
-          (if (and ptr
-                   (= tag-start (nth 0 (car ptr)))
-                   (= tag-end   (nth 1 (car ptr))))
-              (progn
-                ;;(message "vvvvvvvvvvvvvvvvv")
-                ;;(message "ready tag-start=%s-%s tag-str=%s nxml-where-last-added=%s" tag-start tag-end tag-str nxml-where-last-added)
-                (when (eq nxml-where-last-added t)
-                  (setq nxml-where-last-added (car (last nxml-where-path))))
-                ;; Clean up between here and last added. Unfortunately
-                ;; we can't catch everything here. We need to walk up
-                ;; the list to check, but that takes some time so do
-                ;; not do that here.
-                ;;
-                ;; Fix-me: implement the walk up above.
-
-                ;;(message "trimming 2 tag-start=%s, tag-end=%s, ptr at=%s, nxml-where-last-added=%s" tag-start tag-end (caar ptr) nxml-where-last-added)
-                ;;(message "ptr 1=%s" ptr)
-                (while (and ptr ;; Not needed, but just in case to prevent looping ...
-                            (cdr ptr)
-                            (not (eq nxml-where-last-added (cadr ptr))))
-                  ;; Delete entry after ptr.
-                  ;;(message "ptr=%s" ptr)
-                  (setq old-rec (cadr ptr))
-                  (nxml-where-delete-rec old-rec)
-                  (setcdr ptr (cddr ptr))
-                  )
-                (setq nxml-where-last-finished t)
-                (setq result 'ready))
-            (setq new-rec (nxml-where-make-rec tag-start tag-end tag-str buffer))
-            (setq nxml-where-last-added new-rec)
-            (if (not prev-ptr)
-                  (setq nxml-where-path (cons new-rec nxml-where-path))
-                (setcdr prev-ptr (cons new-rec (cdr prev-ptr))))
-            (setq result 'continue))))
-      ;;(message "Mark forward path=%s" nxml-where-path)
-      (nxml-where-mark-forward-element (caar (last nxml-where-path)))
-      result)))
-
-;;(nxhtmltest-nxml-where-adding)
-;;(global-set-key [f9] 'nxhtmltest-nxml-where-adding)
-(defun nxhtmltest-nxml-where-add1 (rec)
-  (let* ((tag-start (nth 0 rec))
-         (tag-end   (nth 1 rec))
-         (tag-str   (nth 2 rec))
-         (res
-          (nxml-where-update-where-path tag-start tag-end tag-str nil)))
-    (message "*** (%s %s %s) => %s, last=%s" tag-start tag-end tag-str res nxml-where-last-added)
-    (message "nxml-where-path=%s" nxml-where-path)
-    ))
-
-(defun nxhtmltest-nxml-where-adding ()
-  (interactive)
-  (let ((nxml-where-path nil)
-        (nxml-where-last-added nil)
-        rec)
-    (message "=====================")
-    (assert (equal nxml-where-path nil) t)
-    (nxhtmltest-nxml-where-add1 (setq rec '(50 55 "<sub>" nil)))
-    (assert (equal nxml-where-path `(,rec)) t)
-    (nxhtmltest-nxml-where-add1 (setq rec '(30 35 "<bla>" nil)))
-    (assert (equal nxml-where-path `(,rec
-                                     (50 55 "<sub>" nil))) t)
-    (message "------ A") (setq nxml-where-last-added nil)
-    (nxhtmltest-nxml-where-add1 (setq rec '(50 55 "<sub>" nil)))
-    (assert (equal nxml-where-path `((30 35 "<bla>" nil)
-                                     (50 55 "<sub>" nil))) t)
-    (message "------ B") (setq nxml-where-last-added nil)
-    (nxhtmltest-nxml-where-add1 (setq rec '(50 55 "<sub>")))
-    (assert (equal nxml-where-path `((30 35 "<bla>" nil)
-                                     (50 55 "<sub>" nil))) t)
-    (nxhtmltest-nxml-where-add1 (setq rec '(30 35 "<bla>" nil)))
-    (assert (equal nxml-where-path `((30 35 "<bla>" nil)
-                                     (50 55 "<sub>" nil))) t)
-    (message "------ C") (setq nxml-where-last-added nil)
-    (nxhtmltest-nxml-where-add1 (setq rec '(40 45 "<bla>" nil)))
-    (assert (equal nxml-where-path `((30 35 "<bla>" nil)
-                                     ,rec)) t)
-    (nxhtmltest-nxml-where-add1 (setq rec '(50 55 "<bla>" nil)))
-    (assert (eq nxml-where-last-added nil) t)
-    (message "---- Clear")
-    (nxml-where-clear-path)
-    (assert (eq nxml-where-path nil) t)
-    ))
+  ;;(message "++++++ clear A: %s (%s)" end-of-interest from)
+  (setq nxml-where-path (cons 'dummy nxml-where-path))
+  (let ((path nxml-where-path))
+    ;;(message "path 1=%s" path)
+    (while (cdr path)
+      ;;(message "path 2=%s" path)
+      (when (> (nth 1 (cadr path)) end-of-interest)
+        (dolist (p (cdr path))
+          (nxml-where-delete-rec p "clear"))
+        (setcdr path nil))
+      (setq path (cdr path))))
+  (setq nxml-where-path (cdr nxml-where-path)))
+
+(defun nxml-where-clear-new-path ()
+  (dolist (new nxml-where-new-path)
+    (nxml-where-delete-rec new "clear new"))
+  (setq nxml-where-new-path nil)
+  ;;(message "clear B:nxml-where-path=%s" nxml-where-path)
+  )
 
-(defun nxml-where-do-marking-in-timer (this-point buffer)
-  (condition-case err
-      (nxml-where-do-marking this-point buffer)
-    (error
-     (nxml-where-error-message
-      "nxml-where-do-marking error: %s"
-      err))))
 
-;; (nxml-where-error-message "%s" "something")
-(defun nxml-where-error-message (format-string &rest args)
-  (with-current-buffer (get-buffer-create "*Messages*")
-    (let ((start (1+ (point-max))))
-      (apply 'message format-string args)
-      (goto-char (point-max))
-      (backward-char)
-      (put-text-property start (point)
-                         'face 'highlight))))
+(defun nxml-where-update-where-path (tag-start tag-end tag-str buffer)
+  "Update where path with given tag.
+The tag is between TAG-START and TAG-END and the string to
+display for it in the header-line is TAG-STR.  This is in buffer
+BUFFER."
+  ;; Delete old marks below tag-start:
+  (nxml-where-clear-old-path (+ tag-end 0) (format "update-where-path, tag-start=%s" tag-start))
+  ;; Is this now the same as the old value?
+  (let ((last-old (last nxml-where-path))
+        new-rec
+        result)
+    ;;(message "update: %s %s %s %s, last-old=%s" tag-start tag-end tag-str buffer last-old)
+    (if (and last-old
+             (= tag-start (nth 0 (car last-old)))
+             (= tag-end   (nth 1 (car last-old))))
+        (progn
+          (setq result 'ready))
+      (when nxml-where-only-inner
+        ;;(message "last-old=%S, nwp=%S, nwnp=%S" last-old nxml-where-path nxml-where-new-path)
+        (setq last-old (car (last nxml-where-path)))
+        (when last-old
+          (setq nxml-where-path nil)
+          (nxml-where-delete-rec last-old "only-inner")))
+      (setq new-rec (nxml-where-make-rec tag-start tag-end tag-str buffer))
+      (setq nxml-where-last-added new-rec)
+      (setq nxml-where-new-path (cons new-rec nxml-where-new-path))
+      (setq result 'continue))
+    result))
 
 (defun nxml-where-do-marking (this-point buffer)
-  ;;(message "nxml-where-do-marking %s %s, point=%s" this-point buffer (point))
-  (with-current-buffer buffer
-    (save-restriction
-      (when nxml-where-widen (widen))
-      (let (ovl
-            (here (point))
-            next-point
-            (is-first (not this-point))
-            same-as-last)
-        ;; If on beginning of tag step forward one char.
-        (unless (or (eobp)
-                    this-point
-                    (not (eq  ?< (char-after))))
-          (forward-char))
-        (unless this-point (setq nxml-where-last-added nil))
-        (unless this-point (setq this-point (point)))
-        (goto-char this-point)
-        (setq next-point
-              (catch 'cnext-point
-                ;; Are we ready?
-                (condition-case err
-                    (nxml-backward-up-element)
-                  (error
-                   (if (equal err '(error "No parent element"))
-                       (throw 'cnext-point nil)
-                     (nxml-where-error-message "nxml-where error: %S" err)
-                     (throw 'cnext-point "uh?"))))
-                ;; Is this the first call
-                (when is-first
-                  ;;(message "is-first=%s, (last nxml-where-path=%s" is-first (last nxml-where-path))
-                  (setq same-as-last
-                        (and nxml-where-path
-                             nxml-where-last-finished
-                             (= (point) (caar (last nxml-where-path)))))
-                  (when same-as-last
-                    (throw 'cnext-point 'same-as-last)))
-                (save-match-data
-                  (when (looking-at nxml-where-tag+id-pattern)
-                    (let ((start (point))
-                          (end (match-end 0))
-                          (tag (match-string-no-properties 1))
-                          (all (match-string-no-properties 0))
-                          result)
-                      (when nxml-where-tag+id
-                        (when (string-match nxml-where-get-id-pattern all)
-                          (setq tag (concat tag (match-string 0 all)))))
-                      (setq tag (concat "<" tag ">"))
-                      (setq result (nxml-where-update-where-path start end tag t))
-                      (when (or (eq result 'ready)
-                                nxml-where-only-inner)
-                        (throw 'cnext-point nil))
-                      ;;(message "here 2")
-                      )))
-                (throw 'cnext-point (max (1- (point)) (point-min)))))
-                                        ;)
-        (goto-char here)
-        ;;(message "next-point=%s" next-point)
-        (if next-point
-            (cond
-             ((stringp next-point) (message "%s" next-point) ;; Some error
-              (when nxml-where-header (setq header-line-format next-point)))
-             ((eq 'same-as-last next-point)
-              nil)
-             (t
-              (unless nxml-where-only-inner
-                (setq nxml-where-once-update-timer
-                      (run-with-timer (* 0.2 idle-update-delay)
-                                      nil
-                                      'nxml-where-start-second-in-timer
-                                      next-point (current-buffer))))))
-          (setq nxml-where-last-point (point))
-          (when (and nxml-where-header
-                     (not nxml-where-only-inner))
-            (nxml-where-write-header)))))))
-
-(defun nxml-where-write-header ()
+  "Do marking.
+If THIS-POINT is nil then it is the first marking post command in
+buffer BUFFER.  In that case start from current point, otherwise
+from THIS-POINT.
+
+Go up to previous tag.  Then check if this is the same tag where
+we started last time and ran to completion.  If so just finish.
+
+Otherwise check this tag.  If not ready after that then restart
+this command with arg THIS-POINT set to right before this tag."
+  ;;(message "****************nxml-where-do-marking %s %s, point=%s" this-point buffer (point))
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (save-restriction
+        (when nxml-where-widen (widen))
+        (let ((here (point))
+              next-point
+              (is-first (not this-point))
+              (end-of-interest (if nxml-where-first-change-pos
+                                   (min (point) nxml-where-first-change-pos)
+                                 ;; Check for tag at point
+                                 (catch 'eoi
+                                   (let (ovl)
+                                     (dolist (ovl (overlays-at (point)))
+                                       (when (overlay-get ovl 'nxml-where)
+                                         (throw 'eoi (overlay-end ovl)))))
+                                   (point)))))
+          ;; If on beginning of tag step forward one char.
+          (unless (or (eobp)
+                      this-point
+                      (not (eq  ?< (char-after))))
+            (forward-char))
+          (when this-point (goto-char this-point))
+          (setq next-point
+                (catch 'cnext-point
+                  (progn
+                    (condition-case err
+                        (nxml-backward-up-element)
+                      (error
+                       (if (equal err '(error "No parent element"))
+                           (let (rec)
+                             ;;(message "------------ No parent element")
+                             (dolist (rec nxml-where-path)
+                               (nxml-where-delete-rec rec "no parent"))
+                             (setq nxml-where-path nil)
+                             (throw 'cnext-point nil)) ;; <---- remember...
+                         (nxml-where-error-message "nxml-where error: %S" err)
+                         (throw 'cnext-point "uh?"))))
+                    ;; Is this the first call
+                    ;;(message ";; Is this the first call, %s" is-first)
+                    (when is-first
+                      (when (and nxml-where-path
+                                 nxml-where-last-finished
+                                 (= (point) (caar (last nxml-where-path))))
+                        (throw 'cnext-point 'same-as-last))
+                      ;;(setq nxml-where-new-path nil)
+                      (setq nxml-where-last-added nil)
+                      ;; Delete those parts we can't trust or don't
+                      ;; need any more. Fix-me, Note: this is different
+                      ;; dependent on if some buffer changes occured.
+                      (nxml-where-clear-old-path end-of-interest (format "is-first,p=%s" (point)))
+                      (nxml-where-clear-new-path))
+                    ;;(message "looking-at")
+                    (when (looking-at nxml-where-tag+id-pattern)
+                      (let ((start (point))
+                            (end (match-end 0))
+                            (tag (match-string-no-properties 1))
+                            (all (match-string-no-properties 0)))
+                        (when nxml-where-tag+id
+                          (when (string-match nxml-where-get-id-pattern all)
+                            (setq tag (concat tag (match-string 0 all)))))
+                        (setq tag (concat "<" tag ">"))
+                        (when (or (eq 'ready
+                                      (nxml-where-update-where-path start end tag t))
+                                  nxml-where-only-inner)
+                          ;;(message "throw 'cp nil")
+                          (throw 'cnext-point nil))))
+                    (throw 'cnext-point (max (1- (point)) (point-min))))))
+          (goto-char here)
+          (if next-point
+              (cond
+               ((stringp next-point) (message "%s" next-point) ;; Some error
+                (when nxml-where-header (setq header-line-format next-point)))
+               ((eq 'same-as-last next-point)
+                nil)
+               (t
+                (unless nxml-where-only-inner
+                  (setq nxml-where-once-update-timer
+                        (run-with-timer (* 0.2 idle-update-delay)
+                                        nil
+                                        'nxml-where-start-continue-in-timer
+                                        next-point (current-buffer))))))
+            (if nxml-where-path
+                (setcdr (last nxml-where-path) nxml-where-new-path)
+              (setq nxml-where-path nxml-where-new-path))
+            (setq nxml-where-new-path nil)
+            ;;(message "nxml-where-path=%s" nxml-where-path)
+            (nxml-where-mark-forward-element (caar (last nxml-where-path)))
+            (setq nxml-where-last-finished t)
+            (setq nxml-where-first-change-pos nil)
+            (run-hooks 'nxhtml-where-hook)
+            (setq nxml-where-last-point (point))
+            (when (and nxml-where-header
+                       (not nxml-where-only-inner))
+              (nxml-where-insert-header))))))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Header path
+
+(defun nxml-where-insert-header ()
   (let ((path (mapcar (lambda (elt)
                         (nth 2 elt))
                       nxml-where-path)))
@@ -672,6 +689,18 @@ This is possible if `major-mode' in the buffer is derived from
       (when nxml-where-header
         (setq header-line-format header)))))
 
+(defvar nxml-where-saved-header-line-format nil)
+(make-variable-buffer-local 'nxml-where-saved-header-line-format)
+(put 'nxml-where-saved-header-line-format 'permanent-local t)
+
+(defun nxml-where-save-header-line-format ()
+  (unless nxml-where-saved-header-line-format
+    (setq nxml-where-saved-header-line-format header-line-format)))
+
+(defun nxml-where-restore-header-line-format ()
+  (setq header-line-format nxml-where-saved-header-line-format))
+
+
 
 (provide 'nxml-where)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/.nosearch b/elpa-to-submit/nxhtml/nxhtml/old/.nosearch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/html-inlined.el b/elpa-to-submit/nxhtml/nxhtml/old/html-inlined.el
deleted file mode 100644
index a73a4217c8..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/html-inlined.el
+++ /dev/null
@@ -1,356 +0,0 @@
-;; html-inlined.el --- narrow/widen embedded blocks of css etc
-;;
-;; Copyright (C) 2005 by P J Heslin
-;;
-;; Author: Peter Heslin <p.j.heslin@dur.ac.uk>
-;; Additions by: Lennart Borgman
-(defconst html-inlined:version "2.2") ;; Version:
-;;
-;; This program 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.
-;;
-;; This program 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, 675 Massachusettes Ave,
-;; Cambridge, MA 02139, USA.
-
-;;; Commentary:
-;;
-;; When using html-mode, nxhtml-mode or nxml-mode to edit (X)HTML,
-;; this file enables you to narrow the visible buffer to show just a
-;; php/javascript/visual basic script block, or a css style block, and
-;; then to switch from html-mode or nxml-mode to the appropriate mode
-;; for that block.  When finished editing that block, it enables you
-;; easily to show the whole buffer and switch back to the original
-;; mode again.
-;;
-;; The user interface consists of a single keystroke: by default, C-c %.
-;; To change it, customize the value of 'html-inlined-key.  In html-mode
-;; or nxml-mode, this key looks to see if the cursor is inside a
-;; script/style block, and if it is, it narrows the buffer to that
-;; block and switches to the appropriate mode.  Hit the same key again
-;; to go back to editing the whole file in the original mode.
-;;
-;; This file used to be called nxml-script.el, when it only supported
-;; nxml-mode; now it has been completely rewritten and made a bit more
-;; general, so it can be used with any major mode for editing (X)HTML.
-;;
-;; Based on html-script.el:
-;; URL: http://www.dur.ac.uk/p.j.heslin/Software/Emacs/Download/html-script.el
-;; The original idea was taken from html-helper-mode.el
-
-;;; Installation:
-;;
-;; To install, put this file in your load-path, and require it via
-;; your .emacs.
-;;
-;;  (require 'html-inlined)
-;;  (html-inlined-add-key-to-modes)
-;;
-;; There are various customizations available, including a list of
-;; modes in which to install html-inlined (defaults to html-mode and
-;; nxml-mode).
-;;
-;; You also need to have the relevant autoloads set up for the script
-;; modes you want to use, like so:
-;;
-;;  (autoload 'php-mode "php-mode" "PHP mode" t)
-;;
-;; Supported major modes for script/style blocks include php-mode,
-;; css-mode, javascript-generic-mode, jde-mode, visual-basic-mode.
-;;
-;; You might also need to tell emacs to open .php, .jsp and such files
-;; in html-mode or nxml-mode, like so:
-;;
-;;  (setq auto-mode-alist (cons '("\\.php[34]?$" . nxml-mode) auto-mode-alist))
-;;
-;; BUGS:
-;;
-;; I regularly use only CSS and PHP, very occasionally Javascript, and
-;; Visual Basic not at all, and so the code for these last two has not
-;; been tested.
-;;
-;; Changes:
-;;
-;; 1.0 First public release of nxml-script.el
-;;
-;; 2.0 Changed name to html-inlined.el and completely rewritten.
-;; Removed 'nxml-script-function and 'nxml-script-region-function, as
-;; too confusing.  Various user customization variables have changed.
-;;
-;; 2.1 Bugfix for javascript and vbscript and added ecmascript mode --
-;; thanks to Mark Takacs.
-;;
-;; 2.2
-;; 2006-02-08  Lennart Borgman
-;;   * Renamed to html-inlined.el
-;;   * (html-inlined-install-modes): Added nxhtml-mode
-;;   * (html-inlined-narrow, html-inlined-narrow-handler):
-;;      Only inner part of script or css tag shown in narrowed state.
-;;   * (html-inlined-indentation, html-inlined-indent-line-function-orig,
-;;      html-inlined-indent-line): Support for indentation
-
-(eval-when-compile (require 'cl))
-
-(defgroup html-inlined nil
-  "Narrow \(X)HTML documents to script blocks and widen again"
-  :tag "Narrow (X)HTML documents to script blocks and widen again"
-  :group 'hypermedia
-  :prefix "html-inlined-")
-
-(defcustom html-inlined-install-modes '(nxml-mode nxhtmlmode html-mode)
-  "A list of modes in which to install a binding for html-inlined.
-The key to bind is defined by html-inlined-key"
-  :group 'html-inlined)
-
-(defvar html-inlined-inlined-keymap nil)
-
-(defun html-inlined-make-inlined-keymap(inlined-key)
-  (let ((m (make-sparse-keymap)))
-    (define-key m inlined-key 'html-inlined-widen)
-    (define-key m [(control ?x) ?n ?w] 'html-inlined-widen)
-    (setq html-inlined-inlined-keymap m)))
-
-(defcustom html-inlined-key [(control c) ?%]
-  "Key to use to toggle narrowing and widening"
-  :set (lambda(symbol value)
-         (set-default symbol value)
-         (html-inlined-make-inlined-keymap value))
-  :group 'html-inlined)
-
-(defcustom html-inlined-regions
-  '(
-    ;; Those two seems better to handle other ways:
-    ;;("<%" "%>" visual-basic-mode)
-    ;;("<\\?" "\\?>" php-mode c-mode)
-
-    ("<style[ \t]+type=\"text/css\".*>" "</style>" css-mode c-mode)
-    ("<style[ \t]+type=\"css\".*>" "</style>" css-mode c-mode)
-    ("[ \t]style=\"" "\"" css-mode c-mode)
-    ("<script[ \t]+language=\"vbscript\"[ \t]*>" "</script>" visual-basic-mode)
-    ("<script[ \t]+type=\"text/vbscript\"[ \t]*>" "</script>" visual-basic-mode)
-    ("<script[ \t]+language=\"javascript\"[ \t]*>" "</script>"
-     ecmascript-mode jde-mode java-mode javascript-generic-mode c-mode)
-    ("<script[ \t]+type=\"text/javascript\"[ \t]*>" "</script>"
-     ecmascript-mode jde-mode java-mode javascript-generic-mode c-mode)
-    ;;("\s-on[a-z]+=\"javascript:" "\""
-    ("[ \t]on[a-z]+=\"javascript:" "\""
-     ecmascript-mode jde-mode java-mode javascript-generic-mode c-mode)
-    )
-  "Define script regions.  Each entry should consist of a list of
-  a starting regexp, an ending regexp, and a list of modes to try
-  for that region in that order."
-  :group 'html-inlined)
-
-(defvar html-inlined-start-regexp
-  (concat "\\(" (mapconcat (lambda (x) (car x)) html-inlined-regions "\\|") "\\)"))
-
-(defvar html-inlined-original-mode nil)
-(make-variable-buffer-local 'html-inlined-original-mode)
-;; This immunizes it against kill-all-local-variables, which is run
-;; when the new major-mode is called.
-(put 'html-inlined-original-mode 'permanent-local t)
-
-(defvar html-inlined-original-header nil)
-(make-variable-buffer-local 'html-inlined-original-header)
-(put 'html-inlined-original-header 'permanent-local t)
-
-
-(defvar html-inlined-indentation nil)
-(make-variable-buffer-local 'html-inlined-indentation)
-(put 'html-inlined-indentation 'permanent-local t)
-
-
-(defun html-inlined-find-indentation(narrow-start)
-  (setq html-inlined-indentation 0)
-  (save-excursion
-    (goto-char narrow-start)
-    (setq html-inlined-indentation (current-indentation)))
-  html-inlined-indentation)
-
-(defvar html-inlined-indent-line-function-orig nil)
-(make-variable-buffer-local 'html-inlined-indent-line-function-orig)
-(put 'html-inlined-indent-line-function-orig 'permanent-local t)
-
-(defcustom html-indent-inline-indentation 4
-  "Extra indentation for inlined part."
-  :group 'html-inlined
-  :type 'integer)
-
-(fset 'html-inlined-indent-to-orig (symbol-function 'indent-to))
-(defun html-inlined-indent-line(&optional something)
-  (interactive)
-  (let ((is-first-line
-         (save-excursion
-           (beginning-of-line)
-           (string-match "\\`[ \n\r]*\\'"
-                         (buffer-substring-no-properties
-                          (point-min)(point))))))
-    (if is-first-line
-        (save-excursion
-          (beginning-of-line)
-          (let ((start-of-line (point)))
-            (skip-syntax-forward "\\s-")
-            (delete-region start-of-line (point)))
-          (indent-to (+ html-inlined-indentation html-inlined-indentation) 0))
-;;       ;; This does not work??
-;;       (flet ((indent-to (column &optional minimum)
-;;                         (let ((colnew
-;;                                (if (= 0 column)
-;;                                    (+ column html-inlined-indentation html-inlined-indentation)
-;;                                  column)))
-;;                           (message "flet ind-to: cn=%s" colnew)(sit-for 2)
-;;                           (html-inlined-indent-to-orig colnew))))
-      (beginning-of-line)
-      (funcall html-inlined-indent-line-function-orig)
-      ;; If 0 then it was not a relative indentation:
-      (when (= 0 (current-indentation))
-        (indent-to (+ html-inlined-indentation
-                      html-indent-inline-indentation))))))
-
-(defvar html-inlined-mode-map
-  (let ((map (make-sparse-keymap))
-        (menu-map (make-sparse-keymap)))
-    (define-key map [tab] 'html-inlined-indent-line)
-    (define-key menu-map [html-inlined-back]
-      (list 'menu-item "Back to whole file" 'html-inlined-widen))
-    (define-key map [menu-bar inlined-mode]
-      (list 'menu-item "Inlined" menu-map))
-    map))
-
-(define-minor-mode html-inlined-mode
-  "Temporary mode for keymap when editing inlined code."
-  :keymap 'html-inlined-mode-map)
-
-(defun html-inlined-narrow ()
-  (interactive)
-  (save-match-data
-    (let* ((orig (point))
-           (case-fold-search t)
-           (handler-list
-            (if (re-search-backward html-inlined-start-regexp nil t)
-                (loop for x in html-inlined-regions
-                      when (looking-at (car x)) return x
-                      finally return nil)
-              nil)))
-      (if handler-list
-          (progn
-            (html-inlined-find-indentation (point))
-            (html-inlined-narrow-handler orig handler-list (match-beginning 0)))
-        (message "Not in an inlined region.")
-        (goto-char orig)))))
-
-(defvar html-inlined-overlay nil)
-(make-variable-buffer-local 'html-inlined-overlay)
-(put 'html-inlined-overlay 'permanent-local t)
-(defvar html-inlined-overlay-markers-face
-  (list
-   (cons 'background-color "OliveDrab3")))
-
-(defun html-inlined-narrow-handler (orig arg-list start)
-  (let ((is-attr (not (memq ?< (append (car arg-list) nil)))))
-    (if is-attr
-        (beginning-of-line 1)
-      (beginning-of-line 2))
-    (let ((start-str
-           (if is-attr
-               (buffer-substring (point) (match-end 0))
-             (buffer-substring (match-beginning 0) (point))))
-          end-str
-          (ending-re (cadr arg-list))
-          (modes (cddr arg-list))
-          (beg (if is-attr
-                   (match-end 0)
-                 (point)))
-          end
-          (case-fold-search t))
-      (when is-attr (goto-char orig))
-      (if (re-search-forward ending-re nil t)
-          (if (>= (point) orig)
-              (progn
-                (setq html-inlined-original-mode major-mode)
-                (setq html-inlined-original-header header-line-format)
-                (when (overlayp html-inlined-overlay)
-                  (delete-overlay html-inlined-overlay))
-                (if is-attr
-                    (setq end (1- (point)))
-                  (beginning-of-line)
-                  (setq end (point)))
-                (goto-char orig)
-                (setq html-inlined-overlay (make-overlay
-                                            beg end
-                                            nil
-                                            nil t))
-                (let ((s start-str))
-                  (put-text-property 0 (length s)
-                                     'face html-inlined-overlay-markers-face
-                                     s)
-                  (overlay-put html-inlined-overlay 'before-string s))
-                ;; Add to blanks to avoid a bug that lets the cursor pass the after-string
-                ;; Suggested by Kim Storm 2006-03-21
-                (let ((s (concat (buffer-substring (match-beginning 0)
-                                                   (save-excursion
-                                                     (goto-char (match-end 0))
-                                                     (beginning-of-line 2)
-                                                     (point)))
-                                 "  ")))
-                  (put-text-property 0 (- (length s) 2)
-                                     'face html-inlined-overlay-markers-face
-                                     s)
-                  ;;(put-text-property 0 1 'cursor t s)
-                  (overlay-put html-inlined-overlay 'after-string s))
-                ;; Kim suggests that this should hold the cursor in the "after-string", but it does not work
-                ;; (though Kim's example work???):
-                (put-text-property 0 1 'cursor t (overlay-get html-inlined-overlay 'after-string))
-                (overlay-put html-inlined-overlay 'keymap html-inlined-inlined-keymap)
-                ;;(narrow-to-region beg end)
-                (loop for x in modes when (fboundp x) do (funcall x) and return nil
-                      finally do (error "html-inlined: no relevant mode found."))
-                (narrow-to-region beg end)
-                (setq html-inlined-indent-line-function-orig indent-line-function)
-                (setq indent-line-function 'html-inlined-indent-line)
-                (setq indent-region-function nil)
-                (html-inlined-mode t)
-                (setq header-line-format
-                      (replace-regexp-in-string
-                       "%" "%%"
-                       (concat
-                        "%%%% Editing inlined code -- use "
-                        (key-description html-inlined-key)
-                        " to edit whole file again %%%%  ")))
-                )
-            (message "No inlined code or style found here."))
-        (message "No inlined code or style here."))
-      (goto-char orig)
-      )))
-
-(defun html-inlined-widen ()
-  (interactive)
-  (when (overlayp html-inlined-overlay)
-    (delete-overlay html-inlined-overlay))
-  (widen)
-  (scroll-down 1)
-  (html-inlined-mode 0)
-  (funcall html-inlined-original-mode)
-  (setq header-line-format html-inlined-original-header)
-  (setq html-inlined-original-mode nil))
-
-(defun html-inlined-install-narrow-key ()
-  (local-set-key html-inlined-key 'html-inlined-narrow))
-
-(defun html-inlined-add-key-to-modes()
-  "Add `html-inlined-key' to supported major modes."
-  (dolist (x html-inlined-install-modes)
-    (add-hook
-     (intern (concat (symbol-name x) "-hook"))
-     'html-inlined-install-narrow-key)))
-
-(provide 'html-inlined)
-
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/nxhpcmpl.el b/elpa-to-submit/nxhtml/nxhtml/old/nxhpcmpl.el
deleted file mode 100644
index 7ab47bfe3d..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/nxhpcmpl.el
+++ /dev/null
@@ -1,477 +0,0 @@
-;;; nxhpcmpl.el --- Popup completion
-;;
-;; Author: Lennart Borgman
-;; Created: Thu Dec 28 23:23:21 2006
-(setq nxhpcmpl:version "0.50") ;; Version:
-;; Lxast-Updated: Fri Dec 29 01:42:55 2006 (3600 +0100)
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Functions for pop style completion for nxhtml-mode.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(require 'appmenu)
-
-(defun nxhpcmpl-complete ()
-  "Complete the string before point using the current schema.
-Return non-nil if in a context it understands."
-  (interactive)
-  ;;(message "where=%s" (nxhtml-check-where)) (sit-for 1)
-  (unless (eq 'in-tag-start (nxhtml-check-where))
-    (error "Not in start tag"))
-  (and rng-validate-mode
-       (let ((lt-pos (save-excursion (search-backward "<" nil t)))
-	     xmltok-dtd)
-	 (and lt-pos
-	      (= (rng-set-state-after lt-pos) lt-pos)
-	      (or (nxhpcmpl-complete-tag lt-pos)
-;;                   t
-;; 		  (rng-complete-end-tag lt-pos)
-;; 		  (rng-complete-attribute-name lt-pos)
-;; 		  (rng-complete-attribute-value lt-pos)
-                  )))))
-
-(defun nxhpcmpl-complete-tag (lt-pos)
-  (let (rng-complete-extra-strings)
-    (when (and (= lt-pos (1- (point)))
-	       rng-complete-end-tags-after-<
-	       rng-open-elements
-	       (not (eq (car rng-open-elements) t))
-	       (or rng-collecting-text
-		   (rng-match-save
-		     (rng-match-end-tag))))
-      (setq rng-complete-extra-strings
-	    (cons (concat "/"
-			  (if (caar rng-open-elements)
-			      (concat (caar rng-open-elements)
-				      ":"
-				      (cdar rng-open-elements))
-			    (cdar rng-open-elements)))
-		  rng-complete-extra-strings)))
-    (when (save-excursion
-	    (re-search-backward rng-in-start-tag-name-regex
-				lt-pos
-				t))
-      (and rng-collecting-text (rng-flush-text))
-;;       (let ((completion
-;; 	     (let ((rng-complete-target-names
-;; 		    (rng-match-possible-start-tag-names))
-;; 		   (rng-complete-name-attribute-flag nil))
-      (let* ((orig (buffer-substring-no-properties (1+ lt-pos) (point)))
-             (rng-complete-target-names
-              (rng-match-possible-start-tag-names))
-             (rng-complete-name-attribute-flag nil)
-             my-list
-             (olen (length orig)))
-        ;;(message "orig=%s, l=%s" orig olen)(sit-for 1)
-        (dolist (alt (rng-generate-qname-list))
-          (when (string= orig
-                         (if (> (length alt) olen)
-                             (substring alt 0 olen)
-                           alt))
-            (setq my-list (cons alt my-list))))
-        ;;(message "qnl=%s" (rng-generate-qname-list))(sit-for 2)
-        ;;(message "myl=%s" my-list)
-        ;;(message "%s" (try-completion "a" 'rng-complete-qname-function nil))(sit-for 2)
-        ;;(rng-complete-before-point (1+ lt-pos) 'rng-complete-qname-function "Tag: " nil 'rng-tag-history)
-        (let ((sets nil)
-              s-cdr)
-          (dolist (tg my-list)
-            (let (found)
-              (dolist (s nxhpcmpl-tag-sets)
-                (when (member tg (cdr s))
-                  (setq found t)
-                  (let ((sets-entry (assq (car s) sets)))
-                    (unless sets-entry
-                      (setq sets (cons (list (car s)) sets))
-                      (setq sets-entry (assq (car s) sets)))
-                    (setcdr sets-entry (cons tg (cdr sets-entry))))))
-              (unless found
-                  (let ((sets-entry (assq 'unsorted sets)))
-                    (unless sets-entry
-                      (setq sets (cons (list 'unsorted) sets))
-                      (setq sets-entry (assq 'unsorted sets)))
-                    (setcdr sets-entry (cons tg (cdr sets-entry)))))))
-          (setq sets (sort sets (lambda(a b)
-                                  (string< (format "%s" b)
-                                           (format "%s" a)))))
-          (dolist (s sets)
-            (setcdr s (reverse (cdr s))))
-          ;;(message "sets=%s" sets)
-          (let ((pop-map (make-sparse-keymap "Insert Tag")))
-            (dolist (s sets)
-              (let ((k (make-sparse-keymap)))
-                (dolist (tg (cdr s))
-                  ;;(message "tg=%s" tg)
-                  (define-key k
-                    (read (format "[nx-%s]" tg))
-                    (list 'menu-item
-                          (format "%s" (let ((h (gethash tg nxhtml-completion-hash)))
-                                         (if h h tg)))
-                          `(lambda()
-                             (interactive)
-                             (unless (looking-back (concat "<" ,orig))
-                               (error "Not looking at %s" ,orig))
-                             (delete-char (- (length (match-string 0))))
-                             (insert "<" ,tg)
-                             ;;(message "e=%s" ,tg)
-                             )
-                          :value tg)))
-                (define-key pop-map
-                  (read (format "[nxp-%s]" (car s)))
-                  (list 'menu-item
-                        (capitalize (format "%s" (car s)))
-                        k))))
-            ;;(message "pm=%s" pop-map)
-            (let ((where (appmenu-point-to-coord (point)))
-                  (ret t))
-              (condition-case err
-                  (progn
-                    (popup-menu pop-map where)
-                    t)
-                (quit nil)))))))))
-
-(defconst nxhpcmpl-tag-sets nil)
-
-(defun nxhpcmpl-make-tag-sets(elt)
-  (let* ((group (nth 0 elt))
-         (tag   (nth 2 elt))
-         (saved-grp (assq group nxhpcmpl-tag-sets))
-         tmp
-         name
-         )
-    (dolist (c (cdr (append tag nil)))
-      (unless name
-        (if (memq c '(?\  ?>))
-            (setq name (concat (reverse tmp)))
-          (setq tmp (cons c tmp)))))
-    (unless name
-      (setq name (concat (reverse tmp))))
-    ;;(message "group=%s, sg=%s, name=%s, tag=%s" group saved-grp name tag)
-    (if saved-grp
-        (let ((saved-cdr (cdr saved-grp)))
-          (unless (member name saved-cdr)
-            (setcdr saved-grp (cons name (cdr saved-grp)))))
-      (setq nxhpcmpl-tag-sets (cons (list group name) nxhpcmpl-tag-sets)))
-    ))
-
-(mapcar
- 'nxhpcmpl-make-tag-sets
- '(
-   ;;entities
-   (entity  "\C-c#"   "&#"              "Ascii Code"      ("&#" (r "Ascii: ") ";"))
-   (entity  "\C-c\""  "&quot;"          "Quotation mark"  ("&quot;"))
-   (entity  "\C-c$"   "&reg;"           "Registered"      ("&reg;"))
-   (entity  "\C-c@"   "&copy;"          "Copyright"       ("&copy;"))
-   (entity  "\C-c-"   "&shy;"           "Soft Hyphen"     ("&shy;"))
-   (entity  "\C-c "   "&nbsp;"		"Nonbreaking Space"  ("&nbsp;"))
-   (entity  "\C-c&"   "&amp;"		"Ampersand"	  ("&amp;"))
-   (entity  "\C-c>"   "&gt;"	  	"Greater Than"       ("&gt;"))
-   (entity  "\C-c<"   "&lt;"		"Less Than"	  ("&lt;"))
-   ;; letters with accents common in italian
-   (entity  nil   "&agrave;"        "a` (&&agrave;)"          ("&agrave;"))
-   (entity  nil   "&egrave;"        "e` (&&egrave;)"          ("&egrave;"))
-   (entity  nil   "&eacute;"        "e' (&&eacute;)"          ("&eacute;"))
-   (entity  nil   "&ograve;"        "o` (&&ograve;)"          ("&ograve;"))
-   (entity  nil   "&igrave;"        "i` (&&igrave;)"          ("&igrave;"))
-   (entity  nil   "&ugrave;"        "u` (&&ugrave;)"          ("&ugrave;"))
-
-   ;; logical styles
-   (logical nil "<q")
-   (logical nil "<del")
-   (logical nil "<ins")
-   (logical nil "<abbr")
-   (logical nil "<acronym")
-   (logical nil "<fieldset")
-   (logical "b"       "<blockquote>"	"Blockquote"
-	    ("<blockquote>" (r "Quote: ") "</blockquote>"))
-   (logical "c"       "<code>"		"Code"
-	    ("<code>" (r "Code: ") "</code>"))
-   (logical "x"       "<samp>"		"Sample"
-	    ("<samp>" (r "Sample code") "</samp>"))
-   (logical "r"       "<cite>"		"Citation"
-	    ("<cite>" (r "Citation: ") "</cite>"))
-   (logical "k"       "<kbd>"		"Keyboard Input"
-	    ("<kbd>" (r "Keyboard: ") "</kbd>"))
-   (logical "v"       "<var>"		"Variable"
-	    ("<var>" (r "Variable: ") "</var>"))
-   (logical "d"       "<dfn>"		"Definition"
-	    ("<dfn>" (r "Definition: ") "</dfn>"))
-   (logical "a"	      "<address>"	"Address"
-	    ("<address>" r "</address>"))
-   (logical "e"       "<em>"		"Emphasized"
-	    ("<em>" (r "Text: ") "</em>"))
-   (logical "s"       "<strong>"	"Strong"
-	    ("<strong>" (r "Text: ") "</strong>"))
-   (logical "p"       "<pre>"		"Preformatted"
-	    ("<pre>" (r "Text: ") "</pre>"))
-
-   ;;physical styles
-   (physical    nil       "<hr")
-   (physical    nil       "<sup")
-   (physical    nil       "<sub")
-   (physical    nil       "<font")
-   (physical    nil       "<br")
-   (physical    nil       "<big>")
-   (physical    nil       "<small>")
-   (physical    "s"       "<strike>"	"Strikethru"
-	    ("<strike>" (r "Text: ") "</strike>"))
-   (physical    "u"       "<u>"		"Underline"
-	    ("<u>" (r "Text: ") "</u>"))
-   (physical    "i"       "<i>"		"Italic"
-	    ("<i>" (r "Text: ") "</i>"))
-   (physical    "b"	      "<b>"    		"Bold"
-	    ("<b>" (r "Text: ") "</b>"))
-   (physical    "f"       "<tt>"		"Fixed"
-	    ("<tt>" (r "Text: ") "</tt>"))
-   (physical    "c"       "<center>"        "Center"
-	    ("<center>" (r "Text: ") "</center>"))
-
-;; html4.0 stuff, omitted
-
-;    (physical    "5" "<span style=" "Spanning style"
-; 	     ("<span style=\"" (p "style: ") "\">" 'r "</span>"))
-;    (physical    "l" "<span class=" "Spanning class"
-; 	     ("<span class=\"" (p "class: ") "\">" 'r "</span>"))
-
-
-   (scripting nil "<script")
-   (scripting nil "<noscript")
-   (scripting nil "<object")
-   (scripting nil "<applet")
-
-
-   ;;headers
-   (structure  nil "<iframe")
-   (structure  nil "<p")
-   (structure  nil "<div")
-   (structure  nil "<span")
-   (structure  "6"       "<h6>"		"Header 6"
-	    ("<h6>" (r "Header: ") "</h6>"))
-   (structure  "5"       "<h5>"		"Header 5"
-	    ("<h5>" (r "Header: ") "</h5>"))
-   (structure  "4"       "<h4>"		"Header 4"
-	    ("<h4>" (r "Header: ") "</h4>"))
-   (structure  "3"       "<h3>"		"Header 3"
-	    ("<h3>" (r "Header: ") "</h3>"))
-   (structure  "2"       "<h2>"		"Header 2"
-	    ("<h2>" (r "Header: ") "</h2>"))
-   (structure  "1"	      "<h1>"     	"Header 1"
-	    ("<h1>" (r "Header: ") "</h1>"))
-
-   ;; forms
-   (form    nil "<isindex")
-   (form    nil "<label")
-   (form    nil "<button")
-   (form    "o"       "<option>"        "Option"
-	    (& "<option>" > ))
-   (form    "v"       "<option value"   "Option with Value"
-	    (& "<option value=\"" (r "Value: ") "\">" >))
-   (form    "s"       "<select"		"Selections"
-	    ("<select"
-	     (html-helper-insert-or-wipe "name") ">\n<option>" > "\n</select>")"<select")
-   (form    "z"	      "<input"		"Reset Form"
-	    ("<input type=\"RESET\""
-	     (html-helper-insert-or-wipe "value") ">"))
-   (form    "m"	      "<input"		"Submit Form"
-	    ("<input type=\"SUBMIT\""
-	     (html-helper-insert-or-wipe "value") ">"))
-   (form    "b"       "<input"          "Button"
-	    ("<input type=\"BUTTON\""
-	     (html-helper-insert-or-wipe "value")
-	     (html-helper-insert-or-wipe "name") ">"))
-   (form    "i"	      "<input"		"Image Field"
-	    ("<input type=\"IMAGE\""
-	     (html-helper-insert-or-wipe "Name")
-	     (html-helper-insert-or-wipe "src") ">"))
-   (form    "h"       "<input"          "Hidden Field"
-	    ("<input type=\"HIDDEN\""
-	     (html-helper-insert-or-wipe "name")
-	     (html-helper-insert-or-wipe "value") ">"))
-   (form    "p"	      "<textarea"	"Text Area"
-	    ("<textarea"
-	     (html-helper-insert-or-wipe "name")
-	     (html-helper-insert-or-wipe "rows")
-	     (html-helper-insert-or-wipe "cols") ">" r "</textarea>"))
-   (form    "c"	      "<input"		"Checkbox"
-	    ("<input type=\"CHECKBOX\""
-	     (html-helper-insert-or-wipe "name") ">"))
-   (form    "r"	      "<input"		"Radiobutton"
-	    ("<input type=\"RADIO\""
-	     (html-helper-insert-or-wipe "Name") ">"))
-   (form    "t"	      "<input"		"Text Field"
-	    ("<input type=\"TEXT\""
-	     (html-helper-insert-or-wipe "name")
-	     (html-helper-insert-or-wipe "size") ">"))
-   (form    "f"	      "<form"           "Form"
-	    ("<form"
-	     (html-helper-insert-or-wipe "action")
-	     (html-helper-insert-or-wipe "method") ">\n</form>\n"))
-
-   ;;lists
-   (list    "t"       "<dt>"            "Definition Item"
-	    (& "<dt>" > (r "Term: ") "\n<dd>" >
-	       (r "Definition: ")))
-   (list    "l"       "<li>"            "List Item"
-	    (& "<li>" > (r "Item: ") > "</li>"))
-   (list    "r"	      "<dir>"		"DirectoryList"
-	    (& "<dir>" > "\n<li>" > (r "Item: ") "\n</li>" > "\n</dir>" >))
-   (list    "m"	      "<menu>"		"Menu List"
-	    (& "<menu>" > "\n<li>" > (r "Item: ") "\n</li>" > "\n</menu>" >))
-   (list    "o"	      "<ol>"		"Ordered List"
-	    (& "<ol>" > "\n<li>" > (r "Item: ") "\n</li>" > "\n</ol>" >))
-   (list    "d"	      "<dl>"		"Definition List"
-	    (& "<dl>" > "\n<dt>" >
-	       (p "Term: ") "\n<dd>" >
-	       (r "Definition: ") "\n</dl>" >))
-   (list    "u"	      "<ul>"		"Unordered List"
-	    (& "<ul>" > "\n<li>" > (r "Item: ") "\n</li>\n</ul>" >))
-
-   ;;anchors
-   (link  "n"	      "<a name="	"Link Target"
-	    ("<a " (html-helper-insert-or-wipe "name") ">"
-	     (r "Anchor text: ") "</a>"))
-   (link  "l"	      "<a href="        "Hyperlink"
-	    ("<a href=\"" (p "href: ") "\" >"
-	     (r "Anchor text: ") "</a>"))
-
-   ;;graphics
-;    (image   "a"       nil               "Aligned Image"
-; 	    ("<img align=\""
-; 	     (r "Alignment: ") "\" src=\"" (r "Image URL: ") "\">"))
-;    (image   "i"       "<img src="	"Image"
-; 	    ("<img src=\""
-; 	     (r "Image URL: ") "\">"))
-;    (image   "e"       "<img align="     "Aligned Image With Alt. Text"
-; 	    ("<img align=\""
-; 	     (r "Alignment: ") "\" src=\""
-; 	     (r "Image URL: ") "\" alt=\""
-; 	     (r "Text URL: ") "\">"))
-;    (image   "t"       "<img alt="	"Image With Alternate Text"
-; 	    ("<img alt=\""
-; 	     (r "Text URL: ") "\" src=\""
-; 	     (r "Image URL: ") "\">"))
-;; New, (almost) all including, single menu item entry
-;; src has to be there!
-   (image   nil "<img")
-   (image   nil "<map")
-   (image	"a"	nil	"Image"
-		("<img src=\""
-		 (p "src" ) "\" "
-		 (html-helper-insert-or-wipe  "alt" )
-		 (html-helper-insert-or-wipe  "height" )
-		 (html-helper-insert-or-wipe  "width" )
-		 (html-helper-insert-or-wipe  "align" )
-		 ">"))
-   ;; table
-   (table   "t"       "<table>"         "Table"
-	    ("<table"
-	     (html-helper-insert-or-wipe  "border" )
-	     (html-helper-insert-or-wipe "width" )">\n</table>"))
-   (table   "r"       "<tr>"         "Table Row"
-	    ("<TR>\n</TR>"))
-   (table   "h"       "<th>"         "Table Header"
-	    ("<TH"
-	     (html-helper-insert-or-wipe "rowspan" )
-	     (html-helper-insert-or-wipe "colspan")">\n</TH>"))
-   (table   "d"       "<td>"         "Table Data"
-	    ("<TD"
-	     (html-helper-insert-or-wipe "align" )
-	     (html-helper-insert-or-wipe "colspan")"></TD>"))
-   (table   "p"	"<caption>"	"html table caption"
-	    ("<caption>" (r . "Table: ") "</caption>"))
-   ;;text elements
-   (textel  "\C-c="    nil		"Horizontal Line"
-	    (& "<hr>\n"))
-   (textel  "\C-c\C-m" nil		"Line Break"
-	    ("<br>\n"))
-   (textel  "\e\C-m"  nil		"Paragraph"
-	    ("<p>"
-	     (r "Text: ") "</p>"))
-
-   ;;head elements
-   ;;(document    "isindex"    "<isindex>")
-   (document    "base"    "<base>")
-   (document    "style"    "<style>")
-   (document    "link"    "<link>")
-
-   (document    "H"       "<head>"          "Head"
-	    ("<head>\n" "</head>\n"))
-   (document    "B"       "<body>"          "Body"
-	    ("<body>\n" "</body>\n"))
-;;    (document    "i"	      "<isindex>"	"Isindex"
-;; 	    ("<isindex>\n"))
-   (document    "n"	      "<nextid>"	"Nextid"
-	    ("<nextid>\n"))
-   (document    "h"       "<meta http-equiv=" "HTTP Equivalent"
-	    ("<meta"
-	     (html-helper-insert-or-wipe "http-equiv") " content=\""
-	     (r "Content: ") "\">\n"))
-   (document    "m"       "<meta name="     "Meta Name"
-	    ("<meta"
-	     (html-helper-insert-or-wipe "name") " content=\""
-	     (r "Content: ") "\">\n"))
-   (document    "l"	      "<link"		"Link"
-	    ("<link href=\"" p "\">"))
-   (document    "b"       "<base"		"Base"
-	    ("<base href=\"" r "\">"))
-   (document    "t"	      "<title>"		"Title"
-	    ("<title>" (r "Document title: ") "</title>"))
-   ;; scripting elements
-   (script  "j"    "<SCRIPT>"       "JavaScript"
-	    ("<SCRIPT TYPE=\"text/javascript\">\n"
-	     (r "Script") "</SCRIPT>"))
-   (script  "v"    "<SCRIPT>"       "VBScript"
-	    ("<SCRIPT TYPE=\"text/vbscript\">\n"
-	     (r "Script") "</SCRIPT>"))
-   (script  "%"    "<%="            "ASP output"
-	    ("<%="(p " Variabile: ")"%>"))
-   (script  "a"    "<%xx%>"         "JSP/ASP code"
-	    ("<%\n"(r "Code: " )"\n%>"))
-   (script  "<"    "<%xx%>"         "JSP/ASP break"
-	    ("%>\n"(r "Code: " )"\n<%"))
-   (script  "="    "<?="            "PHP output"
-	    ("<?="(p " Variabile: ")"?>"))
-   (script  "p"    "<?xx?>"         "PHP code"
-	    ("<? PHP\n"(r "Code: " )"\n?>"))
-   (script  "?"    "<?xx?>"         "PHP break"
-	    ("?>\n"(r " Code: " )"\n<? PHP"))
-   ))
-
-
-(provide 'nxhpcmpl)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; nxhpcmpl.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.css b/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.css
deleted file mode 100644
index bb29f9bdef..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.css
+++ /dev/null
@@ -1,21 +0,0 @@
-body, td {
-    font-size: 0.9em;
-    font-family: Arial, sans-serif;
-    background-color: #ace8ff;
-}
-body {
-    max-width: 40em;
-    margin: 2em;
-}
-blockquote {
-    margin-left: 2em;
-    font-style: italic;
-}
-p.says cite {
-    color: #b8860b;
-}
-p.says {
-    margin-left: 1em;
-    margin-top: 0;
-    margin-bottom: 0;
-}
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.el b/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.el
deleted file mode 100644
index 39d2bf0db7..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/nxhtml-part.el
+++ /dev/null
@@ -1,616 +0,0 @@
-;;; nxhtml-part.el --- edit fragments of XHTML/XML with nxhtml/nxml-mode
-
-;; Copyright (C) 2005, 2006, 2007 by Lennart Borgman
-
-;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
-;; Created: 2007-02-27
-(defconst nxhtml-part:version "0.58") ;; Version:
-;; Lxast-Updated: Tue Feb 27 23:55:23 2007 (3600 +0100)
-;; Keywords: languages
-;; -Features that might be required by this library:
-;;
-;;   `browse-url', `cl'.
-;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; This file contains two minor modes `nxml-part-mode' and
-;; `nxhtml-part-mode' that can be used to edit part of an XML/XHTML
-;; file using `nxml-mode' / `nxhtml-mode' features.  This is
-;; accomplished by adding a header and a footer so that the part to
-;; edit is in the correct XML context.
-;;
-;; When saving the file the header and footer part is not saved.
-;;
-;; The header and the footer XML parts can be customized.  Default
-;; values are chosen so that the XML context is inside the <body>-tag
-;; in an XHTML document.
-;;
-;; ***Note***: If you use this for XHTML (blogging for example) you
-;; may want to put the file nxhtml-part.css in the same directory as
-;; nxhtml-part.el.
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; History:
-;;
-;; 2005-12-25: Tried to use correct coding system for write.
-;; 2005-12-27: Better view functions.
-;;             Saving does not screw up undos now.
-;; 2006-01-23: Added `xmlpe-auto-mode'. Removed several functions.
-;;             Removed `xmlpe-extension-list'.
-;;             Added `xmlpe-mode-alist'.
-;;             New way to choose mode, more like `auto-mode-alist'.
-;; 2006-03-27: Corrected bugs in use of `xmlpe-mode-alist'.
-;;
-;; 2007-02-26: Removed 'intangible property. I believe this caused the
-;;             fontification to loop and it was not used any more.
-;; 2007-02-27: Moved this from xmlpe.el to nxhtml-part.el.
-;;             Added `nxml-part-mode' and `nxhtml-part-mode'.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is not part of Emacs
-
-;; This program 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.
-
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(require 'browse-url)
-(eval-when-compile (require 'cl))
-(eval-when-compile
-  (unless (featurep 'nxml-nxhtml-autostart)
-    (let ((efn (expand-file-name "../autostart.el")))
-      (load efn))
-    (require 'rng-valid)
-    (require 'nxml-mode)
-    ;;(require 'rng-nxml)
-    ))
-
-
-(defgroup nxhtml-part nil
-  "Customization group for `nxhtml-part-mode' and `nxml-part-mode'."
-  :group 'languages
-  :group 'nxhtml)
-
-(defcustom nxhtml-part-header-footer-alist
-  '(
-    ;;;;;; XHTML iso-8859-1
-    ("xhtml-iso-8859-1"
-    "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <base href=\"\" />
-    <link href=\"nxhtml-part.css\" rel=\"StyleSheet\" />
-    <title></title>
-  </head>
-  <body>
-"
-  "
-  </body>
-</html>\n")
-
-    ;;;;;; XHTML utf-8
-    ("xhtml-utf-8"
-    "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <base href=\"\" />
-    <link href=\"nxhtml-part.css\" rel=\"StyleSheet\" />
-    <title></title>
-  </head>
-  <body>
-"
-  "
-  </body>
-</html>\n")
-
-    )
-
-  "Available headers+footers to insert in buffer around XML code.
-Each entry in the list has the form
-
-   (key header footer)
-
-KEY is used by `nxhtml-part-header-footer-name' to find an entry in the
-list.  The value of HEADER and FOOTER in this entry is used by
-`nxhtml-part-mode' to temporary insert headers and footers in the
-buffer edited.
-
-Default header is a header for XHTML upto and including the
-<body> starting tag.
-
-Default is footer for XHTML, ie </body></html>."
-  :type '(repeat
-          (list
-           (string :tag "Key")
-           (string :tag "Header")
-           (string :tag "Footer")))
-  :group 'nxhtml-part)
-
-(defvar nxhtml-part-header-footer-hist nil)
-
-(defcustom nxhtml-part-header-footer-name "xhtml-iso-8859-1"
-  "Name of header+footer to use.
-This should be a key name in the association list
-`nxhtml-part-header-footer-alist'.
-
-Note that this is buffer local.  What you change here is the
-global value that is inherited when you start `nxhtml-part-mode'."
-  :type 'string
-  :set (lambda(symbol value)
-         (unless (assoc value nxhtml-part-header-footer-alist)
-           (lwarn '(nxhtml-part-header-footer-name) :error "Can not find %s in nxhtml-part-header-footer-alist" value))
-         (set-default symbol value))
-  :group 'nxhtml-part)
-(make-variable-buffer-local 'nxhtml-part-header-footer-name)
-(put 'nxhtml-part-header-footer-name 'permanent-local t)
-
-(defun nxhtml-part-switch-header-footer-name(name)
-  (interactive (list
-                (let ((names))
-                  (unless nxhtml-part-mode
-                    (error "This can only be done in nxhtml-part-mode!"))
-                  (dolist (entry nxhtml-part-header-footer-alist)
-                    (add-to-list 'names (car entry)))
-                  (completing-read "Header-footer name: " names nil nil nxhtml-part-header-footer-name 'nxhtml-part-header-footer-hist ""))))
-  (if (string= nxhtml-part-header-footer-name name)
-      (message "Not changed (same as before)")
-    (fundamental-mode)
-    (setq nxhtml-part-header-footer-name name)
-    (nxhtml-part-mode)))
-
-
-(defcustom nxhtml-part-invisible-hf t
-  "When non-nil header and footer are invisible.
-
-Note that this is buffer local. What you change here is the
-global value that is inherited when you start `nxhtml-part-mode'."
-  :type 'boolean
-  :group 'nxhtml-part)
-(make-variable-buffer-local 'nxhtml-part-invisible-hf)
-(put 'nxhtml-part-invisible-hf 'permanent-local t)
-
-(defcustom nxhtml-part-hf-bgcolor "RGB:87/CE/FA"
-  "Background color for header and footer."
-  :type 'color
-  :group 'nxhtml-part)
-
-(defcustom nxhtml-part-base-bgcolor "RGB:A7/EE/FA"
-  "Background color for <base>-tag."
-  :type 'color
-  :group 'nxhtml-part)
-
-(defvar nxhtml-part-header-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-header-overlay)
-(put 'nxhtml-part-header-overlay 'permanent-local t)
-
-(defvar nxhtml-part-footer-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-footer-overlay)
-(put 'nxhtml-part-footer-overlay 'permanent-local t)
-
-(defvar nxhtml-part-base-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-base-overlay)
-(put 'nxhtml-part-base-overlay 'permanent-local t)
-
-(defvar nxhtml-part-base-href-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-base-href-overlay)
-(put 'nxhtml-part-base-href-overlay 'permanent-local t)
-
-(defvar nxhtml-part-css-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-css-overlay)
-(put 'nxhtml-part-css-overlay 'permanent-local t)
-
-(defvar nxhtml-part-css-href-overlay nil)
-(make-variable-buffer-local 'nxhtml-part-css-href-overlay)
-(put 'nxhtml-part-css-href-overlay 'permanent-local t)
-
-
-(defun nxhtml-part-edit-min()
-  (1+ (overlay-end nxhtml-part-header-overlay)))
-
-(defun nxhtml-part-edit-max()
-  (- (overlay-start nxhtml-part-footer-overlay) 2))
-
-(defun nxhtml-part--post-command()
-  "Function for `post-command-hook'."
-  (condition-case err
-      (let ((edit-min (nxhtml-part-edit-min))
-            (edit-max (nxhtml-part-edit-max)))
-        (when (< (point) edit-min)
-          (goto-char edit-min))
-        (when (> (point) edit-max)
-          (goto-char edit-max))
-        (when mark-active
-          (when (< (mark) edit-min)
-            (set-mark edit-min))
-          (when (> (mark) edit-max)
-            (set-mark edit-max))
-          )
-        (when (< (point) edit-min)
-          (insert "\n")
-          (goto-char edit-min)))
-    (error (message "%s" (error-message-string err)))))
-
-(defun nxhtml-part-toggle-invisible-hf()
-  "Toggle visibilty of the XML header and footer inserted by nxhtml-part-mode."
-  (interactive)
-  (setq nxhtml-part-invisible-hf (not nxhtml-part-invisible-hf))
-;;   (let ((empty-line-char (1+ (overlay-end nxhtml-part-header-overlay))))
-;;     (put-text-property (- empty-line-char 1) (+ empty-line-char 0) 'invisible nxhtml-part-invisible-hf))
-  (when (and nxhtml-part-header-overlay (overlay-buffer nxhtml-part-header-overlay))
-    (overlay-put nxhtml-part-header-overlay 'invisible nxhtml-part-invisible-hf))
-  (when (and nxhtml-part-footer-overlay (overlay-buffer nxhtml-part-footer-overlay))
-    (overlay-put nxhtml-part-footer-overlay 'invisible nxhtml-part-invisible-hf)))
-
-
-
-;;;;;;;;;;;;;;;;
-;;; Viewing
-(defvar nxhtml-part-view-buffer-name "*nxhtml-part View Buffer*")
-;; Fix-me: Handle base href here!
-(defun nxhtml-part-view-save-temp-file()
-  "Save a temporary file for viewing in web browser."
-  (let ((curbuf (current-buffer))
-        (view-buffer (get-buffer-create nxhtml-part-view-buffer-name)))
-    (save-excursion
-      (set-buffer view-buffer)
-      (unless buffer-file-name
-        (set-visited-file-name "~/.temp-nxhtml-part-view.htm")
-        (rename-buffer nxhtml-part-view-buffer-name))
-      (erase-buffer)
-      (insert
-       (with-current-buffer curbuf
-           (buffer-substring-no-properties (point-min) (point-max))))
-      ;;(when (fboundp 'emacsw32-eol-set) (emacsw32-eol-set nil))
-      (save-buffer)
-      (current-buffer))))
-
-(defcustom nxhtml-part-view-region-hf-name "xhtml-iso-8859-1"
-  "Header-footer key name for `nxhtml-part-view-region'."
-  :type 'string
-  :group 'nxhtml-part)
-
-(defun nxhtml-part-view-region(start end)
-  "View the region in a web browser."
-  (interactive "r")
-  (unless mark-active
-    (error "The Region is not active"))
-  (let ((view-buffer (find-file-noselect "~/.temp-nxhtml-part-view-region.htm"))
-        (region (buffer-substring-no-properties start end)))
-    (with-current-buffer view-buffer
-      (erase-buffer)
-      (let* ((hf (assoc nxhtml-part-view-region-hf-name nxhtml-part-header-footer-alist))
-             (header (nth 1 hf))
-             (footer (nth 2 hf)))
-        (insert header)
-        (insert region)
-        (insert footer))
-      (save-buffer))
-    (browse-url (buffer-file-name view-buffer))
-    ;;(kill-buffer view-buffer)
-    ))
-
-(defun nxhtml-part-view()
-  "View file in web browser."
-  (interactive)
-  (let ((view-buffer (nxhtml-part-view-save-temp-file)))
-    (browse-url (buffer-file-name view-buffer))
-    ;;(kill-buffer view-buffer)
-    ))
-
-;;;;;;;;;;;;;;;;;
-;;; Base hrefs
-(defcustom nxhtml-part-base-href ""
-  "URL to insert in <base href=\"\">-tag."
-  :type 'string
-  :group 'nxhtml-part)
-
-;;(setq nxhtml-part-base-hrefs '("some base" "some other base"))
-(defcustom nxhtml-part-base-hrefs nil
-  "List of hrefs to be used for <base>-tag when viewing.
-This list is used by `nxhtml-part-set-base' and is displayed as choices when reading the base URL."
-  :type '(repeat string)
-  :group 'nxhtml-part)
-
-(defvar nxhtml-part-set-base-hist nil)
-
-
-(defun nxhtml-part-set-base()
-  (interactive)
-  (let ((base (completing-read "Base href URL: " nxhtml-part-base-hrefs nil nil nxhtml-part-base-href 'nxhtml-part-set-base-hist "")))
-    (setq nxhtml-part-base-href base))
-  (nxhtml-part-update-header-hrefs))
-
-
-
-(defconst nxhtml-part-standard-css-href
-  (let* ((el-file (if load-file-name
-                      load-file-name
-                    (buffer-file-name)))
-         (el-dir (file-name-directory el-file)))
-    (concat el-dir "nxhtml-part.css")))
-
-(defcustom nxhtml-part-css-href nxhtml-part-standard-css-href
-  "URL to insert in <link href=\"\" rel=\"StyleSheet\">-tag."
-  :type 'string
-  :group 'nxhtml-part)
-
-
-(defcustom nxhtml-part-css-hrefs nil
-  "List of hrefs to be used for CSS <link>-tag when viewing.
-This list is used by `nxhtml-part-set-css' and is displayed as choices when reading the base URL."
-  :type '(repeat string)
-  :group 'nxhtml-part)
-
-(defvar nxhtml-part-set-css-hist nil)
-
-(defun nxhtml-part-set-css()
-  (interactive)
-  (setq nxhtml-part-css-href
-        (let* ((new-loc-map (copy-keymap minibuffer-local-completion-map))
-               (minibuffer-local-completion-map new-loc-map)
-               (hrefs nxhtml-part-css-hrefs))
-          (add-to-list 'hrefs nxhtml-part-standard-css-href)
-          (add-to-list 'hrefs nxhtml-part-css-href)
-          (message "hrefs=%S" hrefs)(sit-for 4)
-          (define-key minibuffer-local-completion-map [(control ?x) (control ?f)]
-            (lambda()
-              "Choose a file."
-              (interactive)
-              (throw 'file nil)))
-          (let (f)
-            (catch 'file
-              (setq f
-                    (completing-read "CSS URL (C-x C-f to browse files): "
-                                     hrefs nil nil nxhtml-part-css-href
-                                     'nxhtml-part-set-css-hist "")))
-            (unless f
-              (setq f (read-file-name "CSS file: ")))
-            f)))
-  (let ((hrefs nxhtml-part-css-hrefs))
-    (unless (string= nxhtml-part-standard-css-href
-                     nxhtml-part-css-href)
-      (add-to-list 'hrefs nxhtml-part-css-href)
-      (customize-set-value 'nxhtml-part-css-hrefs hrefs)
-      (customize-set-variable 'nxhtml-part-css-hrefs hrefs)
-      (customize-save-variable 'nxhtml-part-css-hrefs hrefs)))
-  (nxhtml-part-update-header-hrefs))
-
-;;(nxhtml-part-update-header-hrefs nxhtml-part-base-href))
-(defun nxhtml-part-update-header-hrefs()
-  (when nxhtml-part-base-overlay
-    (remove-hook 'post-command-hook 'nxhtml-part--post-command t)
-    ;;(overlay-put nxhtml-part-header-overlay 'intangible nil)
-    (let ((inhibit-read-only t)
-	  (old-modified (buffer-modified-p))
-	  )
-      (delete-region (+ (overlay-start nxhtml-part-base-href-overlay) 1) (- (overlay-end nxhtml-part-base-href-overlay) 1))
-      (delete-region (+ (overlay-start nxhtml-part-css-href-overlay) 1) (- (overlay-end nxhtml-part-css-href-overlay) 1))
-      (save-excursion
-	(goto-char (+ (overlay-start nxhtml-part-base-href-overlay) 1))
-	(insert (browse-url-file-url nxhtml-part-base-href))
-	(goto-char (+ (overlay-start nxhtml-part-css-href-overlay) 1))
-	(insert (browse-url-file-url nxhtml-part-css-href)))
-      (set-buffer-modified-p old-modified))
-    (add-hook 'post-command-hook 'nxhtml-part--post-command nil t)
-    ;;(overlay-put nxhtml-part-header-overlay 'intangible t)
-    ))
-
-
-
-;;;;;;;;;;;;;;;;;;;;
-;;; File extensions
-
-
-
-
-
-
-(defun nxml-part-mode-enter()
-  (add-hook 'post-command-hook 'nxhtml-part--post-command t t)
-  (add-hook 'change-major-mode-hook 'nxml-part-change-mode nil t)
-  (add-hook 'write-contents-functions 'nxhtml-part-write-file-function t t)
-  (put 'write-contents-functions 'permanent-local t)
-  ;; Remove hook for coding system:
-  (remove-hook 'write-contents-functions 'nxml-prepare-to-save t)
-  (let* ((here (point-marker))
-	(old-modified (buffer-modified-p))
-        (header-footer (assoc nxhtml-part-header-footer-name nxhtml-part-header-footer-alist))
-        (header-string (nth 1 header-footer))
-        (footer-string (nth 2 header-footer))
-	)
-    (unless nxhtml-part-header-overlay
-      (goto-char (point-min))
-      (insert header-string)
-      ;;(when (fboundp 'nxml-mode) (rng-auto-set-schema-and-validate))
-      (when (memq major-mode '(nxml-mode nxhtml-mode)) (rng-auto-set-schema-and-validate))
-      (put-text-property (point-min) (- (point) 1) 'read-only t)
-      (setq nxhtml-part-header-overlay (make-overlay (point-min) (point)))
-      (overlay-put nxhtml-part-header-overlay 'invisible nxhtml-part-invisible-hf)
-      ;;(overlay-put nxhtml-part-header-overlay 'intangible t)
-      (overlay-put nxhtml-part-header-overlay 'face (list (cons 'background-color nxhtml-part-hf-bgcolor)))
-      (overlay-put nxhtml-part-header-overlay 'pointer void-text-area-pointer)
-      (insert "\n"))
-    (unless nxhtml-part-base-overlay
-      (setq nxhtml-part-base-overlay nil)
-      (goto-char (point-min))
-      (when (search-forward-regexp "<base\\s-*href *= *\\(\".*?\"\\)[^>]*>" (overlay-end nxhtml-part-header-overlay) t)
-	(setq nxhtml-part-base-overlay (make-overlay (match-beginning 0) (match-end 0)))
-	(setq nxhtml-part-base-href-overlay (make-overlay (match-beginning 1) (match-end 1)))
-	(overlay-put nxhtml-part-base-overlay 'face (list (cons 'background-color nxhtml-part-base-bgcolor)))
-	(overlay-put nxhtml-part-base-overlay 'keymap nxhtml-part-base-keymap)
-	;;(overlay-put nxhtml-part-base-overlay 'intangible nil)
-	)
-      (setq nxhtml-part-css-overlay nil)
-      (goto-char (point-min))
-      (when (search-forward-regexp "<link[^>]*href *= *\\(\".*?\"\\)[^>]*rel=\"StyleSheet\"[^>]*>" (overlay-end nxhtml-part-header-overlay) t)
-	(setq nxhtml-part-css-overlay (make-overlay (match-beginning 0) (match-end 0)))
-	(setq nxhtml-part-css-href-overlay (make-overlay (match-beginning 1) (match-end 1)))
-	(overlay-put nxhtml-part-css-overlay 'face (list (cons 'background-color nxhtml-part-base-bgcolor)))
-	(overlay-put nxhtml-part-css-overlay 'keymap nxhtml-part-css-keymap)
-	;;(overlay-put nxhtml-part-css-overlay 'intangible nil)
-	)
-      )
-    (when (equal here (point-min-marker))
-      (setq here (point-marker)))
-    (unless nxhtml-part-footer-overlay
-      (goto-char (point-max))
-      (let ((old-end (point-max)))
-	(insert footer-string)
-	(let ((old-end1 (+ old-end 1)))
-	  (put-text-property old-end (point-max) 'read-only t)
-	  (setq nxhtml-part-footer-overlay (make-overlay old-end1 (point-max)))))
-      (overlay-put nxhtml-part-footer-overlay 'invisible nxhtml-part-invisible-hf)
-      ;;(overlay-put nxhtml-part-footer-overlay 'intangible t)
-      (overlay-put nxhtml-part-footer-overlay 'face (list (cons 'background-color nxhtml-part-hf-bgcolor)))
-      (overlay-put nxhtml-part-footer-overlay 'pointer void-text-area-pointer))
-    (set-buffer-modified-p old-modified)
-    (goto-char here)
-    (nxhtml-part-update-header-hrefs))
-  ;; Run the hook for the case when this is not run as a command, ie
-  ;; for example when opening a file with emacsclient.
-  ;;(switch-to-buffer (current-buffer))
-  ;;(message "before auto-set-schema")(sit-for 2)
-  (rng-auto-set-schema)
-  ;;(message "before post command hook in nxhtml-part-mode-enter")(sit-for 2)
-  (nxhtml-part--post-command)
-  ;;(message "after post command hook in nxhtml-part-mode-enter")(sit-for 2)
-  )
-
-(defun nxhtml-part-mode-exit()
-  (remove-hook 'post-command-hook 'nxhtml-part--post-command t)
-  (put 'write-contents-functions 'permanent-local nil)
-  (remove-hook 'write-contents-functions 'nxhtml-part-write-file-function t)
-  (let ((inhibit-read-only t)
-	(old-modified (buffer-modified-p)))
-    (when (and nxhtml-part-header-overlay (overlay-buffer nxhtml-part-header-overlay))
-      (delete-region (overlay-start nxhtml-part-header-overlay) (1+ (overlay-end nxhtml-part-header-overlay)))
-      (delete-overlay nxhtml-part-header-overlay))
-    (when (and nxhtml-part-footer-overlay (overlay-buffer nxhtml-part-footer-overlay))
-      (delete-region (- (overlay-start nxhtml-part-footer-overlay) 1)
-		     (overlay-end nxhtml-part-footer-overlay))
-      (delete-overlay nxhtml-part-footer-overlay))
-    (set-buffer-modified-p old-modified))
-  (setq nxhtml-part-header-overlay nil)
-  (setq nxhtml-part-footer-overlay nil)
-  (setq nxhtml-part-base-overlay nil))
-
-(defvar nxml-part-keep-me nil)
-(make-variable-buffer-local 'nxml-part-keep-me)
-
-(defun nxml-part-change-mode()
-  ;; Fix-me: In some case this might be desireable to do? Or should it ever be done??
-  (unless (or (boundp 'mumamo-mode)
-              (and (boundp 'xhtml-multi-mode)
-                   xhtml-multi-mode))
-    (nxhtml-part-mode-exit)))
-
-(define-derived-mode nxhtml-part-mode nxhtml-mode "nXhtmlPart"
-  "Major mode for editing a part of XHTML documents.
-OBSOLETE. Use just `nxhtml-mode' instead.
-
-Based on `nxhtml-mode."
-  (local-set-key [(control ?c) ?t] 'nxhtml-part-toggle-invisible-hf)
-  (nxml-part-mode-enter))
-
-(defvar nxhtml-part-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map nxhtml-mode-map)
-    (define-key map [(control ?c) ?t] 'nxhtml-part-toggle-invisible-hf)
-    map)
- "Keymap for `nxhtml-part-mode'.")
-
-(defvar nxhtml-part-base-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'nxhtml-part-set-base)
-    map))
-
-(defvar nxhtml-part-css-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'nxhtml-part-set-css)
-    map))
-
-(define-derived-mode nxml-part-mode nxml-mode "nXmlPart"
-  "Mode for editing part of an XML file.
-Based on `nxml-mode."
-  (progn
-    (add-hook 'change-major-mode-hook 'nxml-part-change-mode nil t)
-    (let ((upl-map (lookup-key nxhtml-part-mode-map [menu-bar nxhtml-mode nxhtml-upl-map])))
-      (define-key upl-map [test1] 
-        (list 'menu-item "TESTING" 'nxhtml-part-view)))
-    (nxml-part-mode-enter)
-    )
-  )
-
-
-;; Fix-me: What should be done when using Emacs server??
-;; (defun xmlpe-done()
-;;   "This does what C-x # normally does.
-;; \(It is supposed to call `gnuserv-edit' normally. I am not sure
-;; however how this is handled when using emacs-server instead.\)
-
-;; Before it exits `xmlpe-mode' removes the header and footer that
-;; was added."
-;;   (interactive)
-;;   (xmlpe-mode nil)
-;;   (funcall xmlpe-done-function))
-
-
-;;;;;;;;;;;;;;;;;
-;;; Saving
-(defun nxhtml-part-write-file-function()
-  "Writes the editable part of the buffer to the visited file.
-Also write to the temporary file for viewing so that it is easier
-to view the contents after saving.
-
-Added to hook `write-contents-functions'."
-  ;;(unless (eq major-mode 'nxhtml-part-mode) (error "nxhtml-part-write-file-function called but not in nxhtml-part-mode"))
-  ;; Save to temp file too to make it easier to view
-  (when (memq major-mode '(nxhtml-part-mode nxml-part-mode))
-    (nxhtml-part-view-save-temp-file))
-  ;; Save the editable region
-  ;;(when (eq major-mode 'nxml-mode) (setq buffer-file-coding-system nil) (nxml-prepare-to-save) )
-  (let ((coding-system-for-write buffer-file-coding-system))
-    (write-region (1+ (overlay-end nxhtml-part-header-overlay))
-                  (1- (overlay-start nxhtml-part-footer-overlay))
-                  (buffer-file-name)))
-  (set-buffer-modified-p nil)
-  (clear-visited-file-modtime)
-  t ;; Already written!
-  )
-
-(defun nxhtml-part-new()
-  "Create a temporary buffer in `nxhtml-part-mode'."
-  (interactive)
-  (switch-to-buffer (generate-new-buffer "*Nxthml Part Temporary Buffer*"))
-  (nxhtml-part-mode)
-  )
-
-(provide 'nxhtml-part)
-
-;;; nxhtml-part.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/xhtmlin.el b/elpa-to-submit/nxhtml/nxhtml/old/xhtmlin.el
deleted file mode 100644
index 8011071af1..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/xhtmlin.el
+++ /dev/null
@@ -1,256 +0,0 @@
-;;; xhtmlin.el --- Insert XHTML code fragment for some tags
-;; 
-;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
-;; Created: Thu Dec 29 22:45:47 2005
-(setq xhtmlin:version "0.31") ;; Version:
-;; Last-Updated: Mon Feb 27 22:28:29 2006 (3600 +0100)
-;; Keywords:
-;; Compatibility:
-;; 
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
-;;; Commentary:
-;; 
-;;  Easy insertion of some XHTML tags.
-;; 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
-;;; Change log:
-;; 
-;; 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
-;; This program 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.
-;; 
-;; This program 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 this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-;; 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
-;;; Code:
-
-(defcustom xhtmlin-files-must-exist t
-  "If non-nil then files pointed to must exist."
-  :type 'boolean
-  :group 'xhtmlin)
-
-(defcustom xhtmlin-check-web-links t
-  "If non-nil then web links are checked."
-  :type 'boolean
-  :group 'xhtmlin)
-
-(defun xhtmlin-get-url(url)
-  "Check URL and return it or a relative path to it.
-If URL is a local file path and `xhtmlin-files-must-exist' is
-non-nil then the file must exist.
-
-If URL is a web link and `xhtmlin-check-web-links' is non-nil
-then the user is asked if the file should be checked."
-  (if (file-name-absolute-p url)
-      (progn
-        (when xhtmlin-files-must-exist
-          (unless (file-exists-p url)
-            (error "Can't find file %s" url)))
-        (if (not (buffer-file-name))
-            url
-          (file-relative-name url
-                              (file-name-directory (buffer-file-name)))))
-    (if (not (string-match url-nonrelative-link url))
-        url
-      (if (and xhtmlin-check-web-links nil
-               (y-or-n-p "Check web url? "))
-          (if (url-http-file-exists-p url)
-              url
-            (error "Can't find %s" url))
-        url))))
- 
-(defvar xhtmlin-insertable nil
-  "Function to check if the tag can be inserted at `point'.")
-(defun xhtmlin-insertable (tag)
-  (if xhtmlin-insertable
-      (unless (funcall xhtmlin-insertable tag)
-        (error "Can't insert a %s tag here" tag))
-    t))
-
-(defun xhtmlin-insertable(tag)
-  (let ((len 0))
-    (when (fboundp 'nxhtml-check-insertable)
-      (setq len (nxhtml-check-insertable tag)))
-    len))
-
-(defun xhtmlin-insert-urlthing(tag prompt creator)
-  (let ((len (xhtmlin-insertable tag)))
-    (when len
-      (let ((url (expand-file-name
-                  (read-file-name prompt))))
-        (insert (substring (funcall creator url) len))))))
-
-(defun xhtmlin-javascript(url &optional absolute)
-;; <script type="text/javascript" src="EmacsW32.js"></script>
-  (let ((src (if absolute
-                 url
-               (xhtmlin-get-url url))))
-    (concat "<script"
-            " type=\"text/javascript\""
-            " src=\"" src "\""
-            " />")))
-
-(defun xhtmlin-insert-javascript()
-  "Insert an xhtml header javascript href tag.
-The link in the tag is checked with `xhtmlin-get-url'."
-  (interactive)
-  (xhtmlin-insert-urlthing "script" "JavaScript file: " 'xhtmlin-javascript))
-
-
-(defun xhtmlin-css(url &optional nocheck)
-;;    <link href="EmacsW32.css" rel="StyleSheet" />
-  (let ((href (if nocheck
-                  url
-                (xhtmlin-get-url url))))
-    (concat "<link"
-            " rel=\"StyleSheet\""
-            " href=\"" href "\""
-            " />")))
-
-(defun xhtmlin-insert-css()
-  "Insert an xhtml header css link tag.
-The link in the tag is checked with `xhtmlin-get-url'."
-  (interactive)
-  (xhtmlin-insert-urlthing "link" "CSS file: " 'xhtmlin-css))
-
-
-(defun xhtmlin-img(url alt &optional title nocheck)
-  (let* ((sizes (when (file-exists-p url) (image-size (create-image url) t)))
-         (usetit (if title title alt))
-         (src (if nocheck
-                  url
-                (xhtmlin-get-url url))))
-    (when (= 0 (length usetit)) (setq usetit nil))
-    (concat "<img src=\"" src "\""
-            (when sizes
-              (concat
-               " width=\""  (format "%d" (car sizes)) "\""
-               " height=\"" (format "%d" (cdr sizes)) "\""))
-            (if alt    (concat " alt=\"" alt "\"")     "")
-            (if usetit (concat " title=\"" usetit "\"") "")
-            " />")))
-
-(defun xhtmlin-insert-img()
-  "Insert an xhtml img tag.
-The link in the tag is checked with `xhtmlin-get-url'."
-  (interactive)
-  (let ((len (xhtmlin-insertable "img")))
-    (when len
-      (let ((url (expand-file-name
-                  (read-file-name "Image file: ")))
-            (alt   (read-string "Alt: "))
-            (title (read-string "Title: ")))
-        (insert (substring (xhtmlin-img url alt title) len))))))
-
-
-(defun xhtmlin-a(url title &optional nocheck)
-  (let ((href (if nocheck
-                  url
-                (xhtmlin-get-url url))))
-    (concat "<a href=\"" href "\">" title "</a>")))
-
-(defun xhtmlin-insert-a()
-  "Insert an a tag.
-The link in the tag is checked with `xhtmlin-get-url'."
-  (interactive)
-  (let ((len (xhtmlin-insertable "a")))
-    (when len
-      (let ((url (expand-file-name
-                  (read-file-name "Link to file: ")))
-            (title   (read-string "Title: ")))
-        (insert (substring (xhtmlin-a url title) len))))))
-
-(defun xhtmlin-insert-object-java()
-  (interactive)
-  (let ((len (xhtmlin-insertable "a")))
-    (when len
-      (let ((url (expand-file-name
-                  (read-file-name "Class file: ")))
-            (jar (when (y-or-n-p "Is there a jar file?")
-                   (expand-file-name
-                    (read-file-name "Jar file: "))))
-            (h (read-string "Height: "))
-            (w (read-string "Width: "))
-            )
-        (insert (substring (xhtmlin-object-java url jar h w) len))))))
-  
-(defun xhtmlin-object-java(class &optional jar height width nocheck init-params)
-  ;; See http://ww2.cs.fsu.edu/~steele/XHTML/appletObject.html
-  (let ((class-file (if nocheck
-                        class
-                      (xhtmlin-get-url class)))
-        (jar-file (when jar
-                    (if nocheck
-                        jar
-                      (xhtmlin-get-url jar))))
-        )
-  (concat
-   "<!--[if !IE]> Firefox and others will use outer object -->\n"
-   "<object classid=\"java:" class-file "\" \n"
-   "        type=\"application/x-java-applet\"\n"
-   (if jar-file
-       (concat "        archive=\"" jar-file "\" \n")
-     "")
-   (if height
-       "        height=\"300\" width=\"450\"\n"
-     "")
-   "        >\n"
-   (if init-params init-params "")
-   "  <!--<![endif]-->\n"
-   "  <!-- MSIE (Microsoft Internet Explorer) will use inner object --> \n"
-   "  <object classid=\"clsid:8AD9C840-044E-11D1-B3E9-00805F499D93\" \n"
-   "          codebase=\"http://java.sun.com/update/1.5.0/jinstall-1_5_0-windows-i586.cab\"\n"
-   (if height
-       "          height=\"300\" width=\"450\"\n"
-     "")
-   "          >\n"
-   "    <param name=\"code\" value=\"" (file-name-sans-extension class-file) "\" />\n"
-   (if jar-file
-       (concat "    <param name=\"archive\" value=\"" jar-file "\" />\n")
-     "")
-   (if init-params init-params "")
-   "    <strong>\n"
-   "      This browser does not have a Java Plug-in.\n"
-   "      <br />\n"
-   "      <a href=\"http://java.sun.com/products/plugin/downloads/index.html\">\n"
-   "        Get the latest Java Plug-in here.\n"
-   "      </a>\n"
-   "    </strong>\n"
-   "  </object> \n"
-   "  <!--[if !IE]> close outer object -->\n"
-   "</object>\n"
-   "<!--<![endif]-->\n")))
-
-(defconst xhtmlin-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [menu-bar xhtmlin] (cons "Insert Link" (make-sparse-keymap)))
-    (define-key map [menu-bar xhtmlin insert-java-obj] '("Insert Java Object" . xhtmlin-insert-object-java))
-    (define-key map [menu-bar xhtmlin insert-css] '("Insert CSS Link" . xhtmlin-insert-css))
-    (define-key map [menu-bar xhtmlin insert-javascript] '("Insert Javascript or Link" . xhtmlin-insert-javascript))
-    (define-key map [menu-bar xhtmlin insert-img] '("Insert Img Tag" . xhtmlin-insert-img))
-    (define-key map [menu-bar xhtmlin insert-a] '("Insert A Link Tag" . xhtmlin-insert-a))
-    map))
-
-
-(provide 'xhtmlin)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; xhtmlin.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.css b/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.css
deleted file mode 100644
index 47bb9f46cc..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.css
+++ /dev/null
@@ -1,21 +0,0 @@
-body, td {
-    font-size: 0.9em;
-    font-family: Arial, sans-serif;
-    background-color: #fff8dc;
-}
-body {
-    max-width: 40em;
-    margin: 2em;
-}
-blockquote {
-    margin-left: 2em;
-    font-style: italic;
-}
-p.says cite {
-    color: #b8860b;
-}
-p.says {
-    margin-left: 1em;
-    margin-top: 0;
-    margin-bottom: 0;
-}
diff --git a/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.el b/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.el
deleted file mode 100644
index 8a2d8e028c..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/old/xmlpe.el
+++ /dev/null
@@ -1,693 +0,0 @@
-;;; xmlpe.el --- Xml Part Edit - edit fragmens of XML using nxml-mode
-
-;; Copyright (C) 2005, 2006, 2007 by Lennart Borgman
-
-;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
-;; Created: 2005-06-17
-(defconst xmlpe:version "0.58") ;; Version:
-;; Last-Updated: Tue Feb 27 12:06:07 2007 (3600 +0100)
-;; Keywords: languages
-;; -Features that might be required by this library:
-;;
-;;   `browse-url', `cl'.
-;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; This file contains a minor mode `xmlpe-mode' that can be used to
-;; edit part of an XML file, but still use the DTD.  This is
-;; accomplished by adding a header and a footer so that the part to
-;; edit is in the correct XML context.  When nxml-mode is used as the
-;; major mode syntax can now be checked.
-;;
-;; You can however use any major mode together with `xmlpe-mode'.
-;; When saving the file the header and footer part is not saved.
-;;
-;; The header and the footer XML parts can be customized.  Default
-;; values are choosen so that the XML context is inside the <body>-tag
-;; in an XHTML document.
-;;
-;; To use xmlpe.el in your .emacs or elsewhere enter
-;;
-;;    (require 'xmlpe)
-;;
-;; Then open the file with the XML fragment, choose major mode and
-;; then enter M-x xmlpe-mode.
-;;
-;; Alternatively if you use a special file names (or extensions) you
-;; can use `auto-mode-alist' together with `xmlpe-mode-alist' to
-;; automatically set major mode and enter `xmlpe-mode'.
-;;
-;;    (add-to-list 'auto-mode-alist  '("\\.htmlf" . xmlpe-auto-mode))
-;;    (xmlpe-set-mode-alist-entry '("\\.htmlf" . nxhtml-mode))
-;;
-;; or even
-;;
-;;    (add-to-list 'auto-mode-alist  '("\\.htmlf" . xmlpe-auto-mode))
-;;    (xmlpe-set-mode-alist-entry '("\\.htmlf" nxhtml-mode nil
-;;                                  "xhtml-iso-8859-1"))
-;;
-;; The first form will open files with extension .htmlf in
-;; `nxhtml-mode' and set the minor mode `xmlpe-mode'. The second form
-;; also chooses what header-footer to use in `xmlpe-mode'.
-;;
-;; ***Note***: If you use this for XHTML (blogging for example) you
-;; may want to put the file xmlpe.css in the same directory as
-;; xmlpe.el.
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; History:
-;;
-;; 2005-12-25: Tried to use correct coding system for write.
-;; 2005-12-27: Better view functions.
-;;             Saving does not screw up undos now.
-;; 2006-01-23: Added `xmlpe-auto-mode'. Removed several functions.
-;;             Removed `xmlpe-extension-list'.
-;;             Added `xmlpe-mode-alist'.
-;;             New way to choose mode, more like `auto-mode-alist'.
-;; 2006-03-27: Corrected bugs in use of `xmlpe-mode-alist'.
-;;
-;; 2007-02-26: Removed 'intangible property. I believe this caused the
-;;             fontification to loop and it was not used any more.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is not part of Emacs
-
-;; This program 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.
-
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(require 'browse-url)
-(eval-when-compile (require 'cl))
-(eval-when-compile
-  (unless (featurep 'nxml-nxhtml-autostart)
-    (let ((efn (expand-file-name "../autostart.el")))
-      (load efn))
-    (require 'rng-valid)
-    (require 'nxml-mode)
-    ;;(require 'rng-nxml)
-    ))
-
-
-(defgroup xmlpe nil
-  "Customization group for xmlpe (Xml Part Editor)."
-  :group 'languages)
-
-(defcustom xmlpe-header-footer-alist
-  '(
-    ;;;;;; XHTML iso-8859-1
-    ("xhtml-iso-8859-1"
-    "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <base href=\"\" />
-    <link href=\"xmlpe.css\" rel=\"StyleSheet\" />
-    <title></title>
-  </head>
-  <body>
-"
-  "
-  </body>
-</html>\n")
-
-    ;;;;;; XHTML utf-8
-    ("xhtml-utf-8"
-    "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
-\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <base href=\"\" />
-    <link href=\"xmlpe.css\" rel=\"StyleSheet\" />
-    <title></title>
-  </head>
-  <body>
-"
-  "
-  </body>
-</html>\n")
-
-    )
-
-  "Available headers+footers to insert in buffer around XML code.
-Each entry in the list has the form
-
-   (key header footer)
-
-KEY is used by `xmlpe-header-footer-name' to find an entry in the
-list.  The value of HEADER and FOOTER in this entry is used by
-`xmlpe-mode' to temporary insert headers and footers in the
-buffer edited.
-
-Default header is a header for XHTML upto and including the
-<body> starting tag.
-
-Default is footer for XHTML, ie </body></html>."
-  :type '(repeat
-          (list
-           (string :tag "Key")
-           (string :tag "Header")
-           (string :tag "Footer")))
-  :group 'xmlpe)
-
-(defvar xmlpe-header-footer-hist nil)
-
-(defcustom xmlpe-header-footer-name "xhtml-iso-8859-1"
-  "Name of header+footer to use.
-This should be a key name in the association list
-`xmlpe-header-footer-alist'.
-
-Note that this is buffer local.  What you change here is the
-global value that is inherited when you start `xmlpe-mode'."
-  :type 'string
-  :set (lambda(symbol value)
-         (unless (assoc value xmlpe-header-footer-alist)
-           (lwarn '(xmlpe-header-footer-name) :error "Can not find %s in xmlpe-header-footer-alist" value))
-         (set-default symbol value))
-  :group 'xmlpe)
-
-(defun xmlpe-switch-header-footer-name(name)
-  (interactive (list
-                (let ((names))
-                  (unless xmlpe-mode
-                    (error "This can only be done in xmlpe-mode!"))
-                  (dolist (entry xmlpe-header-footer-alist)
-                    (add-to-list 'names (car entry)))
-                  (completing-read "Header-footer name: " names nil nil xmlpe-header-footer-name 'xmlpe-header-footer-hist ""))))
-  (if (string= xmlpe-header-footer-name name)
-      (message "Not changed (same as before)")
-    (xmlpe-mode 0)
-    (setq xmlpe-header-footer-name name)
-    (xmlpe-mode t)))
-
-
-(defcustom xmlpe-invisible-hf nil
-  "When non-nil header and footer are invisible.
-
-Note that this is buffer local. What you change here is the
-global value that is inherited when you start `xmlpe-mode'."
-  :type 'boolean
-  :group 'xmlpe)
-
-(defcustom xmlpe-hf-bgcolor "RGB:87/CE/FA"
-  "Background color for header and footer."
-  :type 'string
-  :group 'xmlpe)
-
-(defcustom xmlpe-base-bgcolor "RGB:A7/EE/FA"
-  "Background color for <base>-tag."
-  :type 'string
-  :group 'xmlpe)
-
-(defvar xmlpe-header-overlay nil)
-(defvar xmlpe-footer-overlay nil)
-(defvar xmlpe-base-overlay nil)
-(defvar xmlpe-base-href-overlay nil)
-(defvar xmlpe-css-overlay nil)
-(defvar xmlpe-css-href-overlay nil)
-
-(defun xmlpe-edit-min()
-  (1+ (overlay-end xmlpe-header-overlay)))
-
-(defun xmlpe-edit-max()
-  (- (overlay-start xmlpe-footer-overlay) 2))
-
-(defun xmlpe--post-command()
-  "Function for `post-command-hook'."
-  (condition-case nil
-      (let ((edit-min (xmlpe-edit-min))
-            (edit-max (xmlpe-edit-max)))
-        (when (< (point) edit-min)
-          (goto-char edit-min))
-        (when (> (point) edit-max)
-          (goto-char edit-max))
-        (when mark-active
-          (when (< (mark) edit-min)
-            (set-mark edit-min))
-          (when (> (mark) edit-max)
-            (set-mark edit-max))
-          )
-        (when (< (point) edit-min)
-          (insert "\n")
-          (goto-char edit-min)))
-    (error (message "%s" (error-message-string err)))))
-
-(defun xmlpe-toggle-invisible-hf()
-  "Toggle visibilty of the XML header and footer inserted by xmlpe-mode."
-  (interactive)
-  (setq xmlpe-invisible-hf (not xmlpe-invisible-hf))
-  (when (and xmlpe-header-overlay (overlay-buffer xmlpe-header-overlay))
-    (overlay-put xmlpe-header-overlay 'invisible xmlpe-invisible-hf))
-  (when (and xmlpe-footer-overlay (overlay-buffer xmlpe-footer-overlay))
-    (overlay-put xmlpe-footer-overlay 'invisible xmlpe-invisible-hf)))
-
-
-(defvar xmlpe-accept-modes
-  '(fundamental-mode text-mode nxml-mode nxhtml-mode html-mode sgml-mode)
-  "Modes from which `xmlpe-mode' can be entered.")
-
-
-;;;;;;;;;;;;;;;;
-;;; Viewing
-(defvar xmlpe-view-buffer-name "*XmlPE View Buffer*")
-;; Fix-me: Handle base href here!
-(defun xmlpe-view-save-temp-file()
-  "Save a temporary file for viewing in web browser."
-  (let ((curbuf (current-buffer))
-        (view-buffer (get-buffer-create xmlpe-view-buffer-name)))
-    (save-excursion
-      (set-buffer view-buffer)
-      (unless buffer-file-name
-        (set-visited-file-name "~/.temp-xmlpe-view.htm")
-        (rename-buffer xmlpe-view-buffer-name))
-      (erase-buffer)
-      (insert
-       (with-current-buffer curbuf
-           (buffer-substring-no-properties (point-min) (point-max))))
-      (when (fboundp 'emacsw32-eol-set)
-        (emacsw32-eol-set nil))
-      (save-buffer)
-      (current-buffer))))
-
-(defcustom xmlpe-view-region-hf-name "xhtml-iso-8859-1"
-  "Header-footer for `xmlpe-view-region'."
-  :type 'string
-  :group 'xmlpe)
-
-(defun xmlpe-view-region(start end)
-  "View the region in browser."
-  (interactive "r")
-  (unless (mark)
-    (error "The Region is not active"))
-  (let ((view-buffer (find-file-noselect "~/.temp-xmlpe-view-region.htm"))
-        (region (buffer-substring-no-properties start end)))
-    (with-current-buffer view-buffer
-      (erase-buffer)
-      (let* ((hf (assoc xmlpe-view-region-hf-name xmlpe-header-footer-alist))
-             (header (nth 1 hf))
-             (footer (nth 2 hf)))
-        (insert header)
-        (insert region)
-        (insert footer))
-      (save-buffer))
-    (browse-url (buffer-file-name view-buffer))
-    (kill-buffer view-buffer)))
-
-(defun xmlpe-view()
-  "View in web browser."
-  (interactive)
-  (let ((view-buffer (xmlpe-view-save-temp-file)))
-    (browse-url (buffer-file-name view-buffer))
-    (kill-buffer view-buffer)))
-
-;;;;;;;;;;;;;;;;;
-;;; Base hrefs
-(defcustom xmlpe-base-href ""
-  "URL to insert in <base href=\"\">-tag."
-  :type 'string
-  :group 'xmlpe)
-
-;;(setq xmlpe-base-hrefs '("some base" "some other base"))
-(defcustom xmlpe-base-hrefs nil
-  "List of hrefs to be used for <base>-tag when viewing.
-This list is used by `xmlpe-set-base' and is displayed as choices when reading the base URL."
-  :type '(repeat string)
-  :group 'xmlpe)
-
-(defvar xmlpe-set-base-hist nil)
-
-
-(defun xmlpe-set-base()
-  (interactive)
-  (let ((base (completing-read "Base href URL: " xmlpe-base-hrefs nil nil xmlpe-base-href 'xmlpe-set-base-hist "")))
-    (setq xmlpe-base-href base))
-  (xmlpe-update-header-hrefs))
-
-
-
-(defcustom xmlpe-css-href
-  (let* ((el-file (if load-file-name
-                     load-file-name
-                   (buffer-file-name)))
-         (el-dir (file-name-directory el-file)))
-    (concat el-dir "xmlpe.css"))
-  "URL to insert in <link href=\"\" rel=\"StyleSheet\">-tag."
-  :type 'string
-  :group 'xmlpe)
-
-(defcustom xmlpe-css-hrefs nil
-  "List of hrefs to be used for CSS <link>-tag when viewing.
-This list is used by `xmlpe-set-css' and is displayed as choices when reading the base URL."
-  :type '(repeat string)
-  :group 'xmlpe)
-
-(defvar xmlpe-set-css-hist nil)
-
-(defun xmlpe-set-css()
-  (interactive)
-  (setq xmlpe-css-href
-        (let ((has-nxhtml (fboundp 'nxhtml-read-url))
-              read-with-nxhtml)
-          (when has-nxhtml
-            (setq read-with-nxhtml
-                  (not (y-or-n-p "Choose one of your predefined CSS links? "))))
-          (if read-with-nxhtml
-              (nxhtml-read-url nil nil nil "CSS")
-            (completing-read "CSS URL: " xmlpe-css-hrefs nil nil xmlpe-css-href 'xmlpe-set-css-hist ""))))
-  (xmlpe-update-header-hrefs))
-
-;;(xmlpe-update-header-hrefs xmlpe-base-href))
-(defun xmlpe-update-header-hrefs()
-  (when xmlpe-base-overlay
-    (remove-hook 'post-command-hook 'xmlpe--post-command t)
-    ;;(overlay-put xmlpe-header-overlay 'intangible nil)
-    (let ((inhibit-read-only t)
-	  (old-modified (buffer-modified-p))
-	  )
-      (delete-region (+ (overlay-start xmlpe-base-href-overlay) 1) (- (overlay-end xmlpe-base-href-overlay) 1))
-      (delete-region (+ (overlay-start xmlpe-css-href-overlay) 1) (- (overlay-end xmlpe-css-href-overlay) 1))
-      (save-excursion
-	(goto-char (+ (overlay-start xmlpe-base-href-overlay) 1))
-	(insert (browse-url-file-url xmlpe-base-href))
-	(goto-char (+ (overlay-start xmlpe-css-href-overlay) 1))
-	(insert (browse-url-file-url xmlpe-css-href)))
-      (set-buffer-modified-p old-modified))
-    (add-hook 'post-command-hook 'xmlpe--post-command t t)
-    ;;(overlay-put xmlpe-header-overlay 'intangible t)
-    ))
-
-
-
-;;;;;;;;;;;;;;;;;;;;
-;;; File extensions
-
-(defvar xmlpe-mode-alist
-  ;;nil
-  '(("\\.htmlf" . nxhtml-mode))
-  "Alist of filename patterns vs corresponding major mode chooser.
-Each element looks like \(REGEXP . CHOOSER) or \(REGEXP CHOOSER
-MATCH-AGAIN HEADER-FOOTER).  CHOOSER may be a major mode function
-or a string.
-
-MATCH-AGAIN works the same way as the third element in
-`auto-mode-alist'.  \(Which is called NON-NIL.\) If HEADER-FOOTER
-is non-nil it should be a string to use as the name of the
-header-footer combination to use by `xmlpe-mode'.
-
-This alist is matched by `xmlpe-auto-mode' against
-`buffer-file-name' the same way as `find-file' matches against
-`auto-mode-alist'.  If a match is found then if CHOOSER is a
-function it is supposed to be the major mode function searched
-for.  If CHOOSER is a string it is supposed to be a file name and
-the major mode function is found by matching the string against
-`auto-mode-alist'.")
-
-(defun xmlpe-set-mode-alist-entry(entry)
-  "Add ENTRY to `xmlpe-mode-alist' and remove entries with same car."
-  (let* ((name (car entry))
-         (old  (assoc-string name xmlpe-mode-alist)))
-    (while old
-      (setq xmlpe-mode-alist (delete old xmlpe-mode-alist))
-      (setq old  (assoc-string name xmlpe-mode-alist))))
-  (setq xmlpe-mode-alist (cons entry xmlpe-mode-alist)))
-
-
-(defconst xmlpe-mode-keymap
-  (let ((map (make-sparse-keymap "XmlPE")))
-    (define-key map [menu-bar xmlpe] (cons "XmlPE" (make-sparse-keymap "second")))
-    (define-key map [menu-bar xmlpe custom]
-      '("Customize XmlPE" . (lambda()
-                              (interactive)
-                              (customize-group 'xmlpe))))
-    (define-key map [menu-bar xmlpe div1] '("-" . nil))
-    (define-key map [menu-bar xmlpe switch-hf] '("Switch header/footer" . xmlpe-switch-header-footer-name))
-    (define-key map [menu-bar xmlpe set-base] '("Set Base Href" . xmlpe-set-base))
-    (define-key map [menu-bar xmlpe set-css]  '("Set CSS Href" . xmlpe-set-css))
-    (define-key map [menu-bar xmlpe separator-1]  '(menu-item "--"))
-    (define-key map [menu-bar xmlpe toggle]   '("Toggle Invisible Header and Footer" . xmlpe-toggle-invisible-hf))
-    (define-key map [menu-bar xmlpe view]
-      (list 'menu-item "View with header+footer in Web Browser" 'xmlpe-view
-            :enable 'xmlpe-mode))
-    (define-key map [menu-bar xmlpe div2] '("-" . nil))
-
-    (define-key map [(control ?c) ?t] 'xmlpe-toggle-invisible-hf)
-    (define-key map [(control ?x) ?#] 'xmlpe-done)
-    map))
-
-(defvar xmlpe-base-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'xmlpe-set-base)
-    map))
-
-(defvar xmlpe-css-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'xmlpe-set-css)
-    map))
-
-(defvar xmlpe-started nil)
-
-(define-minor-mode xmlpe-mode
-  "xmlpe-mode is a minor mode for editing XML fragments.
-
-The purpose of xmlpe-mode (Xml Part Edit Mode) is to make it
-possible to edit parts of an XML document using the syntax
-checking provided by nxml-mode.
-
-To achive this the XML code in `xmlpe-header' and `xmlpe-footer'
-are temporary during xmlpe-mode inserted in the buffer around the
-XML fragment to edit.  They are made readonly and have a special
-background color \(`xmlpe-hf-bgcolor').  You can also hide them
-using `xmlpe-toggle-invisible-hf'.
-"
-  :initial-value nil
-  :lighter " XmlPE"
-  :keymap xmlpe-mode-keymap
-  (if xmlpe-mode
-      (progn
-	(if (not xmlpe-started)
-	    (progn
-	      (setq xmlpe-mode nil)
-	      (xmlpe-mode-start))
-	  (xmlpe-mode-enter))
-        (when (or (eq major-mode 'nxml-mode)
-                  (eq major-mode 'nxhtml-mode))
-          ;; Select coding system:
-          (nxml-prepare-to-save)))
-    (xmlpe-mode-exit)))
-
-(define-derived-mode xmlpe-auto-mode fundamental-mode "Xmlpe-auto-mode"
-  "Mode to use for file associations with Xmlpe.
-This mode is not meant to be used for editing. Instead it should
-be used in `auto-mode-alist' \(and maybe `magic-mode-alist'\) for
-file associations.
-
-When this mode is entered `xmlpe-mode-alist' is searched for a
-major mode to use.
-
-After setting the found major mode the minor mode `xmlpe-mode' is
-set."
-
-  (let (mode
-        header-footer)
-    (if buffer-file-name
-        (let ((name buffer-file-name)
-              (case-fold-search
-               (memq system-type '(vax-vms windows-nt cygwin))))
-          ;; Remove backup-suffixes from file name.
-          (setq name (file-name-sans-versions name))
-          (while name
-            ;; Find first matching alist entry.
-            (if (and (setq mode (assoc-default name xmlpe-mode-alist
-                                               'string-match))
-                     (consp mode)
-                     (cadr mode))
-                (progn
-                  (setq mode (car mode)
-                        name (substring name 0 (match-beginning 0))))
-              (setq name)))
-          (setq header-footer (caddr mode))
-          (setq mode (car mode))
-          (when (stringp name)
-            (setq name mode)
-            (setq mode)
-            (while name
-              ;; Find first matching alist entry.
-              (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 name)))))
-      (error "xmlpe-auto-mode: This buffer has no file name"))
-    (when mode (set-auto-mode-0 mode t))
-    (unless mode (error "No major mode found to use"))
-    (let ((xmlpe-header-footer-name (if header-footer
-                                        header-footer
-                                      xmlpe-header-footer-name)))
-      (xmlpe-mode t))
-    mode))
-
-(defvar xmlpe-done-function nil)
-(defun xmlpe-mode-start()
-  (unless (memq major-mode xmlpe-accept-modes)
-    (error "Can enter xmlpe-mode only from major modes in xmlpe-accept-modes (%s)." major-mode))
-  ;;(when (fboundp 'nxml-mode) (unless (eq major-mode 'nxml-mode) (nxml-mode)) )
-  ;;(make-variable-buffer-local 'xmlpe-this-major)
-  ;;(when xmlpe-this-major (unless (eq major-mode xmlpe-this-major) (funcall xmlpe-this-major)))
-  (make-local-variable 'xmlpe-header-footer-name)
-  (make-local-variable 'xmlpe-invisible-hf)
-  (make-local-variable 'xmlpe-started)
-  (make-local-variable 'xmlpe-header-overlay)
-  (make-local-variable 'xmlpe-footer-overlay)
-  (make-local-variable 'xmlpe-base-overlay)
-  (make-local-variable 'xmlpe-base-href-overlay)
-  (make-local-variable 'xmlpe-css-overlay)
-  (make-local-variable 'xmlpe-css-href-overlay)
-  ;; Fetch the keybinding for C-x # before entering xmlpe-mode:
-  (setq xmlpe-done-function (key-binding [(control ?x) ?#]))
-  (setq xmlpe-started t)
-  (xmlpe-mode t)
-  )
-
-(defun xmlpe-mode-enter()
-  (add-hook 'post-command-hook 'xmlpe--post-command t t)
-  (add-hook 'write-contents-functions 'xmlpe-write-file-function t t)
-  ;; Remove hook for coding system:
-  (remove-hook 'write-contents-functions 'nxml-prepare-to-save t)
-  (let* ((here (point-marker))
-	(old-modified (buffer-modified-p))
-        (header-footer (assoc xmlpe-header-footer-name xmlpe-header-footer-alist))
-        (header-string (nth 1 header-footer))
-        (footer-string (nth 2 header-footer))
-	)
-    (unless xmlpe-header-overlay
-      (goto-char (point-min))
-      (insert header-string)
-      ;;(when (fboundp 'nxml-mode) (rng-auto-set-schema-and-validate))
-      (when (memq major-mode '(nxml-mode nxhtml-mode)) (rng-auto-set-schema-and-validate))
-      (put-text-property (point-min) (- (point) 1) 'read-only t)
-      (setq xmlpe-header-overlay (make-overlay (point-min) (point)))
-      (when xmlpe-invisible-hf (overlay-put xmlpe-header-overlay 'invisible t))
-      ;;(overlay-put xmlpe-header-overlay 'intangible t)
-      (overlay-put xmlpe-header-overlay 'face (list (cons 'background-color xmlpe-hf-bgcolor)))
-      (overlay-put xmlpe-header-overlay 'pointer void-text-area-pointer))
-    (unless xmlpe-base-overlay
-      (setq xmlpe-base-overlay nil)
-      (goto-char (point-min))
-      (when (search-forward-regexp "<base\\s-*href *= *\\(\".*?\"\\)[^>]*>" (overlay-end xmlpe-header-overlay) t)
-	(setq xmlpe-base-overlay (make-overlay (match-beginning 0) (match-end 0)))
-	(setq xmlpe-base-href-overlay (make-overlay (match-beginning 1) (match-end 1)))
-	(overlay-put xmlpe-base-overlay 'face (list (cons 'background-color xmlpe-base-bgcolor)))
-	(overlay-put xmlpe-base-overlay 'keymap xmlpe-base-keymap)
-	;;(overlay-put xmlpe-base-overlay 'intangible nil)
-	)
-      (setq xmlpe-css-overlay nil)
-      (goto-char (point-min))
-      (when (search-forward-regexp "<link[^>]*href *= *\\(\".*?\"\\)[^>]*rel=\"StyleSheet\"[^>]*>" (overlay-end xmlpe-header-overlay) t)
-	(setq xmlpe-css-overlay (make-overlay (match-beginning 0) (match-end 0)))
-	(setq xmlpe-css-href-overlay (make-overlay (match-beginning 1) (match-end 1)))
-	(overlay-put xmlpe-css-overlay 'face (list (cons 'background-color xmlpe-base-bgcolor)))
-	(overlay-put xmlpe-css-overlay 'keymap xmlpe-css-keymap)
-	;;(overlay-put xmlpe-css-overlay 'intangible nil)
-	)
-      )
-    (when (equal here (point-min-marker))
-      (setq here (point-marker)))
-    (unless xmlpe-footer-overlay
-      (goto-char (point-max))
-      (let ((old-end (point-max)))
-	(insert footer-string)
-	(let ((old-end1 (+ old-end 1)))
-	  (put-text-property old-end (point-max) 'read-only t)
-	  (setq xmlpe-footer-overlay (make-overlay old-end1 (point-max)))))
-      (when xmlpe-invisible-hf (overlay-put xmlpe-footer-overlay 'invisible t))
-      ;;(overlay-put xmlpe-footer-overlay 'intangible t)
-      (overlay-put xmlpe-footer-overlay 'face (list (cons 'background-color xmlpe-hf-bgcolor)))
-      (overlay-put xmlpe-footer-overlay 'pointer void-text-area-pointer))
-    (set-buffer-modified-p old-modified)
-    (goto-char here)
-    (xmlpe-update-header-hrefs)))
-
-(defun xmlpe-mode-exit()
-  (remove-hook 'post-command-hook 'xmlpe--post-command t)
-  (remove-hook 'write-contents-functions 'xmlpe-write-file-function t)
-  (let ((inhibit-read-only t)
-	(old-modified (buffer-modified-p)))
-    (when (and xmlpe-header-overlay (overlay-buffer xmlpe-header-overlay))
-      (delete-region (overlay-start xmlpe-header-overlay) (overlay-end xmlpe-header-overlay))
-      (delete-overlay xmlpe-header-overlay))
-    (when (and xmlpe-footer-overlay (overlay-buffer xmlpe-footer-overlay))
-      (delete-region (- (overlay-start xmlpe-footer-overlay) 1)
-		     (overlay-end xmlpe-footer-overlay))
-      (delete-overlay xmlpe-footer-overlay))
-    (set-buffer-modified-p old-modified))
-  (setq xmlpe-header-overlay nil)
-  (setq xmlpe-footer-overlay nil)
-  (setq xmlpe-base-overlay nil))
-  ;(gnuserv-edit)
-
-;; Fix-me: What should be done when using Emacs server??
-(defun xmlpe-done()
-  "This does what C-x # normally does.
-\(It is supposed to call `gnuserv-edit' normally. I am not sure
-however how this is handled when using emacs-server instead.\)
-
-Before it exits `xmlpe-mode' removes the header and footer that
-was added."
-  (interactive)
-  (xmlpe-mode nil)
-  (funcall xmlpe-done-function))
-
-
-;;;;;;;;;;;;;;;;;
-;;; Saving
-(defun xmlpe-write-file-function()
-  "Writes the editable part of the buffer to the visited file.
-Also write to the temporary file for viewing so that it is easier
-to view the contents after saving.
-
-Added to hook `write-contents-functions'."
-  (unless xmlpe-mode
-    (error "xmlpe-write-file-function called but not in xmlpe-mode"))
-  ;; Save to temp file too to make it easier to view
-  (xmlpe-view-save-temp-file)
-  ;; Save the editable region
-  ;;(when (eq major-mode 'nxml-mode) (setq buffer-file-coding-system nil) (nxml-prepare-to-save) )
-  (let ((coding-system-for-write buffer-file-coding-system))
-    (write-region (overlay-end xmlpe-header-overlay)
-                  (1- (overlay-start xmlpe-footer-overlay))
-                  (buffer-file-name)))
-  (set-buffer-modified-p nil)
-  (clear-visited-file-modtime)
-  t ;; Already written!
-  )
-
-
-(provide 'xmlpe)
-
-;;; xmlpe.el ends here
diff --git a/elpa-to-submit/nxhtml/nxhtml/rngalt.el b/elpa-to-submit/nxhtml/nxhtml/rngalt.el
index 6c160d265b..16029500f9 100644
--- a/elpa-to-submit/nxhtml/nxhtml/rngalt.el
+++ b/elpa-to-submit/nxhtml/nxhtml/rngalt.el
@@ -46,21 +46,18 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'rng-valid))
+(eval-when-compile (require 'rng-nxml))
+(eval-when-compile (unless load-file-name (require 'nxhtml-mode)))
+
+(require 'rng-valid)
+;;(require 'ourcomments-util)
+
 (defvar rngalt-complete-first-try nil
   "First function to try for completion.
 If non-nil should be a function with no parameters.  Used by
 `rngalt-complete'.")
 
-(eval-when-compile
-  (unless (featurep 'nxhtml-autostart)
-    (let ((efn (expand-file-name "../autostart.el")))
-      (load efn))
-    (require 'rng-valid)
-    (require 'rng-nxml)
-    ))
-(require 'rng-valid)
-(require 'ourcomments-util)
-
 (defvar rngalt-complete-last-try nil
   "Last function to try for completion.
 If non-nil should be a function with no parameters.  Used by
@@ -237,12 +234,19 @@ Do you want to add a fictive XHTML validation header? ")
 
 (defun rngalt-validate ()
   (unless (= (buffer-size) 0)
-    (condition-case err
-        (while (rng-do-some-validation) nil)
-      (error
-       ;; FIX-ME: for debugging:
-       ;;(lwarn 'rngalt-validate :error "%s" (error-message-string err))
-       nil))
+    (let ((while-n1 0)
+          (maxn1 20))
+      (condition-case err
+          (while (and (> maxn1 (setq while-n1 (1+ while-n1)))
+                      (rng-do-some-validation))
+            nil)
+        (error
+         ;; FIX-ME: for debugging:
+         ;;(lwarn 'rngalt-validate :error "%s" (error-message-string err))
+         (message "rngalt-validate: %s" (error-message-string err))
+         nil))
+      (when (>= while-n1 maxn1)
+        (error "rngalt-validate: Could not validate")))
     (rng-validate-done)))
 
 (defvar rngalt-region-ovl nil)
@@ -429,7 +433,8 @@ available from table then this is called instead of
 `compleating-read' with the same parameters."
   (let* ((orig (buffer-substring-no-properties start (point)))
          (completion (try-completion orig table predicate))
-         (completing-fun (if altcompl altcompl 'completing-read)))
+         (completing-fun (if altcompl altcompl 'completing-read))
+         (completion-ignore-case t))
     (cond ((not (or completion completing-fun))
            (if (string= orig "")
                (message "No completions available")
@@ -625,10 +630,13 @@ See also `rngalt-display-validation-header'."
   "Face first line of validation header."
   :group 'nxhtml)
 
-(defun rng-set-initial-state ()
-  "Internal use.
-This is exactly the same as the original `rng-set-initial-state'
-except when `rngalt-validation-header' is non-nil."
+;; This is exactly the same as the original `rng-set-initial-state'
+;; except when `rngalt-validation-header' is non-nil."
+(defadvice rng-set-initial-state (around
+                                  rngalt-set-initial-state
+                                  activate
+                                  compile
+                                  )
   (nxml-ns-init)
   (rng-match-start-document)
   (setq rng-open-elements nil)
@@ -636,7 +644,7 @@ except when `rngalt-validation-header' is non-nil."
   (when rngalt-validation-header
       (let ((state (car rngalt-validation-header)))
         (rng-restore-state state)))
-  (goto-char (point-min)))
+  (setq ad-return-value (goto-char (point-min))))
 
 ;; (defun rng-new-validate-prepare ()
 ;;   "Prepare to do some validation, initializing point and the state.
@@ -673,6 +681,9 @@ except when `rngalt-validation-header' is non-nil."
 ;;                           (goto-char pos))
 ;;                          (t (rng-set-initial-state))))))))))
 
+
+;; For as-external.el
+;;;###autoload
 (defun rngalt-set-validation-header (start-of-doc)
   (rng-validate-mode -1)
   (if start-of-doc
@@ -728,13 +739,26 @@ except when `rngalt-validation-header' is non-nil."
       (when rng-validate-mode (rng-validate-mode -1))
       (erase-buffer)
       (insert start-of-doc)
+      ;; From rng-get-state
+      (setq rng-match-state nil)
+      (setq nxml-ns-state nil)
+      (setq rng-open-elements nil)
+      ;; From rng-match-init-buffer
+      (setq rng-compile-table nil)
+      (setq rng-ipattern-table nil)
+      (setq rng-last-ipattern-index nil)
+
       (nxml-mode)
       (rng-validate-mode 1)
       (rngalt-validate)
-      (let ((state (rng-get-state)))
-        (list (reverse (reverse state))
-              (rng-locate-schema-file)
-              start-of-doc)))))
+      (let* ((state (rng-get-state))
+             (cp-state (copy-tree state)))
+        ;;(if (equal state cp-state) (message "(equal state cp-state)=t") (message "(equal state cp-state)=nil"))
+        ;; Fix-me: is the copy-tree necessary here?
+        (list
+         cp-state
+         (rng-locate-schema-file)
+         start-of-doc)))))
 
 (defun rngalt-show-validation-header ()
   "Show XML validation header used in current buffer.
diff --git a/elpa-to-submit/nxhtml/nxhtml/test-c-m.el b/elpa-to-submit/nxhtml/nxhtml/test-c-m.el
deleted file mode 100644
index aca2b88162..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/test-c-m.el
+++ /dev/null
@@ -1,37 +0,0 @@
-
-(defvar temp-html
-  ;; Start-here
-  "
-<html>
-<head>
-</head>
-</html>
-") ;; Stop-here
-
-(defun temp-c-m ()
-  (let* ((temp-buffer (get-buffer-create "temp-c-m"))
-         (start (save-excursion
-                  (goto-char (point-min))
-                  (search-forward "Start-here")
-                  (forward-line 2)
-                  (point)))
-         (end (save-excursion
-                (goto-char start)
-                (search-forward "Stop-here")
-                (beginning-of-line)
-                (point)))
-         (command 
-          (concat "c:/dl/programs/Tidy.exe"
-                  ))
-         (coding-system-for-read 'undecided-dos)
-         (coding-system-for-write 'undecided-dos)
-         )
-    (with-current-buffer temp-buffer
-      (erase-buffer))
-    (shell-command-on-region start end command temp-buffer nil)
-    (with-current-buffer temp-buffer
-      (goto-char (point-max))
-      (insert (current-time-string) "\n\n"))
-    ))
-
-(temp-c-m)
diff --git a/elpa-to-submit/nxhtml/nxhtml/test-cust.el b/elpa-to-submit/nxhtml/nxhtml/test-cust.el
deleted file mode 100644
index e87a0fb639..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/test-cust.el
+++ /dev/null
@@ -1,75 +0,0 @@
-(define-widget 'my-assoc-widget 'lazy
-  "wdoc"
-  :offset 4
-  :tag "the tag"
-;;  :type '(vector string string)
-  :type '(list (cons symbol string)
-               (cons symbol string))
-;;   :type '(vector (cons symbol string)
-;;                  (cons symbol string))
-
-  ;; :convert-widget 'widget-value-convert-widget
-  :value-to-external 
-  (lambda (widget value)
-    (let (
-          (vec (make-vector 2 0))
-          )
-    (dolist (v value)
-      ;;(message "v=%s, car=%s, cdr=%s" v (car v)(cdr v))(sit-for 2)
-      (let ((k (car v))
-            )
-        (cond ((eq k 'zero)
-               (aset vec 0 (cdr v)))
-              ((eq k 'one)
-               (aset vec 1 (cdr v)))
-              (t
-               (error "Bad value")))
-        ))
-    (message "vec=%s" vec)(sit-for 2)
-    vec))
-;;   :value-to-internal 
-;;   (lambda (widget value)
-;;     (message "vti: value=%s" value)(sit-for 2)
-;;     (let ((iv (list
-;;                (cons 'zero (elt value 0))
-;;                (cons 'one  (elt value 1)))))
-;;     (message "iv=%s" iv)(sit-for 2)
-;;       iv))
-  )
-
-;; (eval-buffer)  
-;; (customize-option 'my-cust)  
-(defcustom my-cust
-  '((zero . "init0") (one . "init1"))
-  ;;(list (cons 'zero "init0") (cons 'one "init1"))
-  ;;["init0" "init1"]
-  "doc"
-  :type 'my-assoc-widget)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-widget 'binary-tree-of-string 'lazy
-  "A binary tree made of cons-cells and strings."
-  :offset 4
-  :tag "Node"
-  :type '(choice (string :tag "Leaf" :value "")
-                 (cons :tag "Interior"
-                       :value ("" . "")
-                       binary-tree-of-string
-                       binary-tree-of-string)))
-
-(defcustom foo-bar ""
-  "Sample variable holding a binary tree of strings."
-  :type 'binary-tree-of-string)
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defcustom my-cust4 ["" ""]
-  "doc"
-  :type '(vector string string)
-  )
-(defcustom my-cust5 '("aa" "bbb")
-  "doc"
-  :type '(list string string)
-  )
diff --git a/elpa-to-submit/nxhtml/nxhtml/tests.el b/elpa-to-submit/nxhtml/nxhtml/tests.el
deleted file mode 100644
index 9e1504b030..0000000000
--- a/elpa-to-submit/nxhtml/nxhtml/tests.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(when nil
-  (string=
-   (html-upl-local-to-remote
-    "d:/OurComments/htdocs/googlead47f674483956c7.html"
-    nil)
-   "/ftp:ourcommentso@ftp07.powweb.com:/htdocs/googlead47f674483956c7.html"
-   ))
diff --git a/elpa-to-submit/nxhtml/nxhtml/tidy-xhtml.el b/elpa-to-submit/nxhtml/nxhtml/tidy-xhtml.el
index c35bc866ae..05da33f4b8 100644
--- a/elpa-to-submit/nxhtml/nxhtml/tidy-xhtml.el
+++ b/elpa-to-submit/nxhtml/nxhtml/tidy-xhtml.el
@@ -192,9 +192,11 @@
 ;;;;; Forward references (stuff which must come first)
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'ediff))
+(eval-when-compile (require 'mumamo nil t))
 (eval-when-compile
   (add-to-list 'load-path default-directory))
-(require 'html-site)
+(eval-when-compile (require 'html-site))
 (require 'easymenu) ;; This makes menus so much easier!
 (require 'compile)  ;; To make the error buffer more sexy
 (require 'cus-edit) ;; Just for face custom-button
@@ -1935,17 +1937,22 @@ POSITION are not used in this case. "
 )
 
 (defvar tidy-menu-symbol nil)
+;;(tidy-build-menu (&optional map)
+;;;###autoload
 (defun tidy-build-menu (&optional map)
   "Set up the tidy menu in MAP.
 Used to set up a Tidy menu in your favourite mode."
   (interactive) ;; for debugging
-  (unless tidy-config-file-parsed
-    (tidy-parse-config-file)
-    (setq tidy-config-file-parsed t))
-  ;;(or map (setq map (current-local-map)))
-  (easy-menu-remove tidy-menu)
-  (easy-menu-define tidy-menu-symbol map "Menu for Tidy" tidy-menu)
-  (easy-menu-add tidy-menu map))
+  (unless tidy-menu-symbol
+    (unless tidy-config-file-parsed
+      (tidy-parse-config-file)
+      (setq tidy-config-file-parsed t))
+    ;;(or map (setq map (current-local-map)))
+    (easy-menu-remove tidy-menu)
+    (easy-menu-define tidy-menu-symbol map "Menu for Tidy" tidy-menu)
+    (setq tidy-menu-symbol (delete "Tidy" tidy-menu-symbol))
+    (easy-menu-add tidy-menu map))
+  t)
 
 ;;;;; Option description support
 
@@ -2272,6 +2279,7 @@ of the buffer still a hopefully suitable header is added before
 calling tidy."
 ;; Fix-me: copy back parts outside visible region
   (interactive)
+  (message "starting tidy-buffer")
   (let* ((is-narrowed (buffer-narrowed-p))
          (validation-header (when (boundp 'rngalt-validation-header)
                               (let ((header (nth 2 rngalt-validation-header)))
@@ -2753,15 +2761,6 @@ called."
           (when win
             (set-window-point win (point-max))
             ))
-;;         (run-with-idle-timer 0.1 nil
-;;                              (lambda (procbuf start end)
-;;                                (with-current-buffer procbuf
-;;                                  (font-lock-fontify-region start end)
-;;                                  ))
-;;                              (current-buffer)
-;;                              start
-;;                              (point-max)
-;;                              )
         ))))
 
 ;;;}}} +
diff --git a/elpa-to-submit/nxhtml/nxhtml/xhtml-help.el b/elpa-to-submit/nxhtml/nxhtml/xhtml-help.el
index fb91553b39..def8fe7ee1 100644
--- a/elpa-to-submit/nxhtml/nxhtml/xhtml-help.el
+++ b/elpa-to-submit/nxhtml/nxhtml/xhtml-help.el
@@ -73,15 +73,16 @@
         (when (looking-at "[a-z-]+")
           (match-string-no-properties 0))))))
 
-
+;;;###autoload
 (defun xhtml-help-show-css-ref ()
-  "Show css reference for css property name at point."
+  "Show CSS reference for CSS property name at point."
   (interactive)
   (let ((css-prop (xhtml-help-css-prop-at-point)))
     (setq css-prop (read-from-minibuffer "Get help for CSS property: " css-prop))
     (when css-prop
       (xhtml-help-browse-css css-prop))))
 
+;;;###autoload
 (defun xhtml-help-tag-at-point ()
   "Get xhtml tag name at or before point."
   (save-excursion
@@ -91,6 +92,7 @@
                (looking-at "</?\\([[:alnum:]]+\\)"))
       (match-string-no-properties 1))))
 
+;;;###autoload
 (defun xhtml-help-show-tag-ref ()
   "Show xhtml reference for tag name at or before point."
   (interactive)
@@ -110,7 +112,7 @@
           (const "http://www.w3.org/")
           (const "http://xhtml.com/")
           (const "http://www.w3schools.com/")
-          (const "http://learningforlife.fsu.edu/")
+          ;;(const "http://learningforlife.fsu.edu/")
           )
   :group 'xhtml-help)
 
@@ -134,12 +136,10 @@ This is used in `xhtml-help-browse-tag' and `xhtml-help-browse-css'."
           notvalid)
     (when (member default notvalid)
       (setq default (car choices)))
-    ;;(error "%s" choices)
     (completing-read (concat "Fetch " prompt " reference from: ")
                      choices
                      nil
                      t
-                     ;;xhtml-help-refurl
                      default
                      '(choices . 1))))
 
@@ -198,17 +198,17 @@ This is used in `xhtml-help-browse-tag' and `xhtml-help-browse-css'."
                    "text_")
                 (  t ""))
                css-prop ".asp"))
-           (  (equal refurl "http://learningforlife.fsu.edu/")
-              (let ((css-prop2 css-prop)
-                    (cc)
-                    (ii 0))
-                (while (< ii (length css-prop))
-                  (setq cc (substring css-prop2 ii (1+ ii)))
-                  (when (equal cc "-")
-                    (store-substring css-prop2 ii "_"))
-                  (setq ii (1+ ii)))
-                (concat
-                 refurl "webmaster/references/css/" css-prop2 ".cfm")))
+           ;; (  (equal refurl "http://learningforlife.fsu.edu/")
+           ;;    (let ((css-prop2 css-prop)
+           ;;          (cc)
+           ;;          (ii 0))
+           ;;      (while (< ii (length css-prop))
+           ;;        (setq cc (substring css-prop2 ii (1+ ii)))
+           ;;        (when (equal cc "-")
+           ;;          (store-substring css-prop2 ii "_"))
+           ;;        (setq ii (1+ ii)))
+           ;;      (concat
+           ;;       refurl "webmaster/references/css/" css-prop2 ".cfm")))
            (  (equal refurl "http://www.w3.org/")
               (let ((properties "")
                     (prop-def ""))
@@ -304,56 +304,56 @@ This is used in `xhtml-help-browse-tag' and `xhtml-help-browse-css'."
                 (  t
                    (concat "tag_" tag ".asp")
                    ))))
-           (  (equal refurl "http://learningforlife.fsu.edu/")
-               (concat
-                refurl "webmaster/references/xhtml/tags/"
-                (cond
-                 (   (member tag '("body" "head" "html" "title"))
-                     "structure/")
-                 (   (member tag '("abbr" "acronym" "address" "blockquote" "br" "cite"
-                                   "code" "dfn" "div" "em" "h1" "h2" "h3" "h4" "h5" "h6"
-                                   "kbd" "p" "pre" "q" "samp" "span" "strong" "var"))
-                     "text/")
-                 (   (member tag '("a"))
-                     "hypertext/")
-                 (   (member tag '("dl" "dd" "dt" "ol" "ul" "li"))
-                     "list/")
-                 (   (member tag '("object" "param"))
-                     "object/")
-                 (   (member tag '("b" "big" "hr" "i" "small" "sub" "sup" "tt"))
-                     "presentation/")
-                 (   (member tag '("del" "ins"))
-                     "edit/")
-                 (   (member tag '("bdo"))
-                     "bidirectional/")
-                 (   (member tag '("button" "fieldset" "form" "input" "label" "legend"
-                                   "select" "optgroup" "option" "textarea"))
-                     "forms/")
-                 (   (member tag '("caption" "col" "colgroup" "table" "tbody" "td"
-                                   "tfoot" "th" "thead" "tr"))
-                     "table/")
-                 (   (member tag '("img"))
-                     "image/")
-                 (   (member tag '("area" "map"))
-                     "client/")
-                 (   (member tag '("area" "map"))
-                     "client/")
-                 (   (member tag '("meta"))
-                     "meta/")
-                 (   (member tag '("noscript" "script"))
-                     "scripting/")
-                 (   (member tag '("style"))
-                     "stylesheet/")
-                 (   (member tag '("link"))
-                     "link/")
-                 (   (member tag '("base"))
-                     "base/")
-                 (   (member tag '("base"))
-                     "base/")
-                 (   (member tag '("ruby" "rbc" "rtc" "rb" "rt" "rp"))
-                     "ruby/")
-                 )
-                tag ".cfm"))
+           ;; (  (equal refurl "http://learningforlife.fsu.edu/")
+           ;;     (concat
+           ;;      refurl "webmaster/references/xhtml/tags/"
+           ;;      (cond
+           ;;       (   (member tag '("body" "head" "html" "title"))
+           ;;           "structure/")
+           ;;       (   (member tag '("abbr" "acronym" "address" "blockquote" "br" "cite"
+           ;;                         "code" "dfn" "div" "em" "h1" "h2" "h3" "h4" "h5" "h6"
+           ;;                         "kbd" "p" "pre" "q" "samp" "span" "strong" "var"))
+           ;;           "text/")
+           ;;       (   (member tag '("a"))
+           ;;           "hypertext/")
+           ;;       (   (member tag '("dl" "dd" "dt" "ol" "ul" "li"))
+           ;;           "list/")
+           ;;       (   (member tag '("object" "param"))
+           ;;           "object/")
+           ;;       (   (member tag '("b" "big" "hr" "i" "small" "sub" "sup" "tt"))
+           ;;           "presentation/")
+           ;;       (   (member tag '("del" "ins"))
+           ;;           "edit/")
+           ;;       (   (member tag '("bdo"))
+           ;;           "bidirectional/")
+           ;;       (   (member tag '("button" "fieldset" "form" "input" "label" "legend"
+           ;;                         "select" "optgroup" "option" "textarea"))
+           ;;           "forms/")
+           ;;       (   (member tag '("caption" "col" "colgroup" "table" "tbody" "td"
+           ;;                         "tfoot" "th" "thead" "tr"))
+           ;;           "table/")
+           ;;       (   (member tag '("img"))
+           ;;           "image/")
+           ;;       (   (member tag '("area" "map"))
+           ;;           "client/")
+           ;;       (   (member tag '("area" "map"))
+           ;;           "client/")
+           ;;       (   (member tag '("meta"))
+           ;;           "meta/")
+           ;;       (   (member tag '("noscript" "script"))
+           ;;           "scripting/")
+           ;;       (   (member tag '("style"))
+           ;;           "stylesheet/")
+           ;;       (   (member tag '("link"))
+           ;;           "link/")
+           ;;       (   (member tag '("base"))
+           ;;           "base/")
+           ;;       (   (member tag '("base"))
+           ;;           "base/")
+           ;;       (   (member tag '("ruby" "rbc" "rtc" "rb" "rt" "rp"))
+           ;;           "ruby/")
+           ;;       )
+           ;;      tag ".cfm"))
            (  t (error "Bad value for xhtml-help-refurl: %s" refurl))
            )))
     (browse-url url)))
diff --git a/elpa-to-submit/nxhtml/nxhtmlmaint.el b/elpa-to-submit/nxhtml/nxhtmlmaint.el
new file mode 100644
index 0000000000..1ca8c5a01a
--- /dev/null
+++ b/elpa-to-submit/nxhtml/nxhtmlmaint.el
@@ -0,0 +1,344 @@
+;;; nxhtmlmaint.el --- Some maintenance helpers
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2008-09-27T15:29:35+0200 Sat
+;; Version: 0.5
+;; Last-Updated: 2009-12-30 Tue
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   Cannot open load file: nxhtmlmaint.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; This module contains maintenance functions:
+;;
+;; `nxhtmlmaint-get-all-autoloads' (nxhtmlmaint-get-all-autoloads)
+;;
+;; `nxhtmlmaint-start-byte-compilation'
+;; `nxhtmlmaint-byte-uncompile-all'
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+;;(eval-when-compile (require 'ourcomments-util))
+
+(defvar nxhtmlmaint-dir
+  (file-name-directory (if load-file-name load-file-name buffer-file-name))
+  "Maintenance directory for nXhtml.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Autoload helpers
+
+(defun nxhtmlmaint-autoloads-file ()
+  "Return autoload file name for nXhtml."
+  (file-truename (expand-file-name "nxhtml-loaddefs.el" nxhtmlmaint-dir)))
+
+(defun nxhtmlmaint-util-dir ()
+  "Return nXhtml util directory."
+  (file-truename (file-name-as-directory
+                  (expand-file-name "util" nxhtmlmaint-dir))))
+
+(defvar nxhtmlmaint-autoload-default-directory (nxhtmlmaint-util-dir))
+
+(defvar generated-autoload-file)
+
+(defun nxhtmlmaint-initialize-autoloads-file ()
+  "Initialize nXhtml autoload file."
+  (with-current-buffer (find-file-noselect generated-autoload-file)
+    (when (= 0 (buffer-size))
+      (insert ";; Autoloads for nXthml
+;;
+;; This file should be updated by `nxhtmlmaint-get-file-autoloads',
+;; `nxhtmlmaint-get-dir-autoloads' or `nxhtmlmaint-get-all-autoloads'.")
+    (basic-save-buffer))))
+
+(defun nxmtmlmaint-advice-autoload (on)
+  "Activate advices if ON, otherwise turn them off."
+  (if on
+      (progn
+        (ad-activate 'autoload-file-load-name)
+        (ad-activate 'make-autoload))
+    (ad-deactivate 'autoload-file-load-name)
+    (ad-deactivate 'make-autoload)))
+
+(defun nxhtmlmaint-get-file-autoloads (file)
+  "Get autoloads for file FILE.
+Update nXhtml autoload file with them."
+  (interactive (list (buffer-file-name)))
+  (let* ((generated-autoload-file (nxhtmlmaint-autoloads-file))
+         (emacs-lisp-mode-hook nil)
+         (default-directory (nxhtmlmaint-util-dir)))
+    (nxhtmlmaint-initialize-autoloads-file)
+    ;; Get the autoloads using advice
+    (nxmtmlmaint-advice-autoload t)
+    (update-file-autoloads file nil)
+    (nxmtmlmaint-advice-autoload nil)
+    ;; Display
+    (display-buffer (find-file-noselect generated-autoload-file))))
+
+(defun nxhtmlmaint-get-dir-autoloads (dir)
+  "Get autoloads for directory DIR.
+Update nXhtml autoload file with them."
+  (interactive (list (or (when (buffer-file-name)
+                           (file-name-directory (buffer-file-name)))
+                         default-directory)))
+  (let* ((generated-autoload-file (nxhtmlmaint-autoloads-file))
+         (emacs-lisp-mode-hook nil)
+         (auto-buf (find-file-noselect generated-autoload-file)))
+    (nxhtmlmaint-initialize-autoloads-file)
+    ;; Get the autoloads using advice
+    (nxmtmlmaint-advice-autoload t)
+    ;; Fix-me: Loop instead, some files must be avoided.
+    (update-directory-autoloads dir)
+    (nxmtmlmaint-advice-autoload nil)
+    ;; Display
+    (display-buffer (find-file-noselect generated-autoload-file))))
+
+(defun nxhtmlmaint-get-tree-autoloads (root)
+  "Get autoloads for directory tree ROOT.
+Update nXhtml autoload file with them."
+  (interactive (list (or (when (buffer-file-name)
+                           (file-name-directory (buffer-file-name)))
+                         default-directory)))
+  (message "Getting autoloads in %s" root)
+  (nxhtmlmaint-get-dir-autoloads root)
+  (let* ((files (directory-files root))
+         (sub-dirs (mapcar (lambda (file)
+                             (when (and (not (member file '("." "..")))
+                                        (not (member file '("nxml-mode-20041004" "old")))
+                                        (not (member file '("in")))
+                                        (file-directory-p (expand-file-name file root)))
+                               file))
+                           files)))
+    (setq sub-dirs (delq nil sub-dirs))
+    ;;(message "sub-dirs=%s" sub-dirs)
+    (dolist (dir sub-dirs)
+      (let ((full-dir (expand-file-name dir root)))
+        (unless (or (string= full-dir nxhtmlmaint-dir)
+                    (string= dir "alts"))
+          (nxhtmlmaint-get-tree-autoloads full-dir))))))
+
+;;(nxhtmlmaint-get-all-autoloads)
+(defun nxhtmlmaint-get-all-autoloads ()
+  "Get all autoloads for nXhtml.
+Update nXhtml autoload file with them."
+  ;;(interactive)
+  (let ((auto-buf (find-file-noselect (nxhtmlmaint-autoloads-file))))
+    (with-current-buffer auto-buf
+      (erase-buffer)
+      (basic-save-buffer))
+    (nxhtmlmaint-get-tree-autoloads nxhtmlmaint-dir)
+    ;; `nxhtml-mode' and `nxhtml-validation-header-mode' should only be
+    ;; autoloaded if nxml-mode if available.
+    (with-current-buffer auto-buf
+      (message "Fixing nxml autoloads")
+      (let ((frmt (if (= emacs-major-version 22)
+                      "^(autoload (quote %s) "
+                      "^(autoload '%s ")))
+        (dolist (nxmode '(nxhtml-mode nxhtml-validation-header-mode))
+          (goto-char (point-min))
+          (when (re-search-forward (format frmt nxmode) nil t)
+            (forward-line 0)
+            (insert "(when (fboundp 'nxml-mode)\n")
+            (forward-sexp)
+            (insert ")"))))
+      ;; Fix defcustom autoloads
+      (goto-char (point-min))
+      (let ((cus-auto "(custom-autoload "))
+        (while (search-forward cus-auto nil t)
+          (backward-char (1- (length cus-auto)))
+          (insert "nxhtml-")))
+      ;; Save
+      (basic-save-buffer))))
+
+
+(defun nxhtmlmaint-autoload-file-load-name (file)
+  "Return relative file name for FILE to autoload file directory."
+  (let ((name (if nxhtmlmaint-autoload-default-directory
+                  (file-relative-name
+                   file nxhtmlmaint-autoload-default-directory)
+                (file-name-nondirectory file))))
+    (if (string-match "\\.elc?\\(\\.\\|\\'\\)" name)
+        (substring name 0 (match-beginning 0))
+      name)))
+
+(defadvice autoload-file-load-name (around
+                                    nxhtmlmaint-advice-autoload-file-load-name
+                                    ;;activate
+                                    compile)
+  "Advice to return relative file name."
+  (setq ad-return-value (nxhtmlmaint-autoload-file-load-name (ad-get-arg 0))))
+
+(defun nxhtmlmaint-make-autoload (form file)
+  "Make autoload for multi major modes."
+  ;;(message "form=%S" form)
+  (if (or (not (listp form))
+          (not (eq 'define-mumamo-multi-major-mode (car form))))
+      ad-return-value
+    (if ad-return-value
+        ad-return-value
+      ;; Fix-me: Maybe expand??
+      (let ((name (nth 1 form))
+            (doc  (nth 2 form)))
+        `(autoload ',name ,file ,doc t)
+        ))))
+
+(defadvice make-autoload (after
+                          nxhtmlmaint-advice-make-autoload
+                          ;;activate
+                          compile)
+  "Make autoload for multi major modes."
+  (setq ad-return-value
+        (nxhtmlmaint-make-autoload (ad-get-arg 0)
+                                   (ad-get-arg 1))))
+
+;; (defun nxhtmlmaint-generate-library-autoloads (library)
+;;   "Insert at point autoloads for Emacs library LIBRARY.
+;;   Works like `generate-file-autoloads', but for a library."
+;;   (interactive
+;;    (list (completing-read "Generate autoloads for library: "
+;;                           'locate-file-completion
+;;                           (cons load-path (get-load-suffixes)))))
+;;   (let ((file (locate-library library)))
+;;     ;; Fix-me: wasn't this defined???
+;;     (generate-file-autoloads file)))
+
+;;;###autoload
+(defun nxhtmlmaint-start-byte-compilation ()
+  "Start byte compilation of nXhtml in new Emacs instance.
+Byte compiling in general makes elisp code run 5-10 times faster
+which is quite noticeable when you use nXhtml.
+
+This will also update the file nxhtml-loaddefs.el.
+
+You must restart Emacs to use the byte compiled files.
+
+If for some reason the byte compiled files does not work you can
+remove then with `nxhtmlmaint-byte-uncompile-all'."
+  (interactive)
+  (let* ((this-file (expand-file-name "nxhtmlmaint.el" nxhtmlmaint-dir))
+         (auto-file (expand-file-name "autostart.el" nxhtmlmaint-dir))
+         (this-emacs (locate-file invocation-name
+                                  (list invocation-directory)
+                                  exec-suffixes))
+         (process-args `(,this-emacs nil 0 nil "-Q")))
+    (nxhtmlmaint-byte-uncompile-all)
+    (if noninteractive
+        (nxhtmlmaint-byte-compile-all)
+      ;;(when noninteractive (setq process-args (append process-args '("-batch"))))
+      (setq process-args (append process-args
+                                 (list "-l" this-file
+                                       "-l" auto-file
+                                       "-f" "nxhtmlmaint-byte-compile-all")))
+      (message "process-args=%S" process-args)
+      (message "Starting new Emacs instance for byte compiling ...")
+      (apply 'call-process process-args))))
+
+;;(nxhtmlmaint-byte-compile-all)
+(defun nxhtmlmaint-byte-compile-all ()
+  "Byte recompile all files in nXhtml that needs it."
+  (let* ((load-path load-path)
+         (nxhtml-dir (file-name-as-directory
+                      (expand-file-name "nxhtml"
+                                        nxhtmlmaint-dir)))
+         (util-dir (file-name-as-directory
+                    (expand-file-name "util"
+                                      nxhtmlmaint-dir)))
+         (related-dir (file-name-as-directory
+                       (expand-file-name "related"
+                                         nxhtmlmaint-dir)))
+         (tests-dir (file-name-as-directory
+                     (expand-file-name "tests"
+                                       nxhtmlmaint-dir)))
+         (emacsw32-dir (file-name-as-directory
+                        (expand-file-name "../lisp"
+                                          nxhtmlmaint-dir)))
+         )
+    (add-to-list 'load-path nxhtml-dir)
+    (add-to-list 'load-path util-dir)
+    (add-to-list 'load-path related-dir)
+    (add-to-list 'load-path tests-dir)
+    (when (file-directory-p emacsw32-dir)
+      (add-to-list 'load-path emacsw32-dir))
+    (require 'cl) ;; This is run in a new Emacs
+    (let ((dummy-debug-on-error t))
+      (nxhtmlmaint-byte-compile-dir nxhtmlmaint-dir nil nil))
+    (message "Byte compiling is ready, restart Emacs to use the compiled files")))
+
+;;;###autoload
+(defun nxhtmlmaint-byte-uncompile-all ()
+  "Delete byte compiled files in nXhtml.
+This will also update the file nxhtml-loaddefs.el.
+
+See `nxhtmlmaint-start-byte-compilation' for byte compiling."
+  (interactive)
+  (nxhtmlmaint-get-all-autoloads)
+  (let ((dummy-debug-on-error t))
+    (nxhtmlmaint-byte-compile-dir nxhtmlmaint-dir t t))
+  (message "Byte uncompiling is ready, restart Emacs to use the elisp files"))
+
+(defconst nxhtmlmaint-nonbyte-compile-dirs '("." ".." "alts" "nxml-mode-20041004" "old" "tests"))
+
+;; Fix-me: simplify this now that nxml is not included
+(defun nxhtmlmaint-byte-compile-dir (dir force del-elc)
+  "Byte compile or uncompile directory tree DIR.
+If FORCE is non-nil byte recompile the elisp file even if the
+compiled file is newer.
+
+If DEL-ELC is nil then byte compile files.  If DEL-ELC is non-nil
+then instead delete the compiled files."
+  ;;(directory-files (file-name-directory buffer-file-name) t "\.el\\'")
+  (dolist (el-src (directory-files dir t "\.el\\'"))
+    (let ((elc-dst (concat el-src "c")))
+      (if del-elc
+          (when (file-exists-p elc-dst)
+            (delete-file elc-dst)
+            (message "Deleted %s" elc-dst))
+        (setq debug-on-error t)
+        (when (or force (file-newer-than-file-p el-src elc-dst))
+          ;;(message "fn=%s" (file-name-nondirectory el-src))
+          (when t ;;(string= "nxhtml-menu.el" (file-name-nondirectory el-src))
+            (message "(byte-compile-file %s)" el-src)
+            (unless (byte-compile-file el-src)
+              (message "Couldn't compile %s" el-src))
+            )
+          ))))
+  (dolist (f (directory-files dir t))
+    (when (file-directory-p f)
+      ;; Fix-me: Avoid some dirs
+      (let ((name (file-name-nondirectory f)))
+        (unless (member name nxhtmlmaint-nonbyte-compile-dirs)
+          (nxhtmlmaint-byte-compile-dir f force del-elc))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; nxhtmlmaint.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/COPYING b/elpa-to-submit/nxhtml/nxml-mode-20041004/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/Makefile b/elpa-to-submit/nxhtml/nxml-mode-20041004/Makefile
deleted file mode 100644
index 3d0554c020..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-EXTRA=README NEWS VERSION TODO COPYING Makefile rng-auto.el \
-  nxml-mode.xml nxml-mode.rnc nxml-mode.texi nxml-mode.info dir \
-  test.valid.xml test.invalid.xml 
-
-SRC=nxml-rap.el nxml-outln.el nxml-mode.el nxml-parse.el nxml-enc.el \
-  nxml-uchnm.el nxml-glyph.el nxml-maint.el nxml-util.el nxml-ns.el \
-  rng-dt.el rng-valid.el rng-pttrn.el rng-xsd.el rng-cmpct.el \
-  rng-match.el rng-nxml.el rng-util.el rng-loc.el rng-uri.el \
-  rng-parse.el rng-maint.el xsd-regexp.el xmltok.el
-
-ELC=nxml-rap.elc nxml-outln.elc nxml-mode.elc nxml-parse.elc nxml-enc.elc \
-  nxml-uchnm.elc nxml-glyph.elc nxml-maint.elc nxml-util.elc nxml-ns.elc \
-  rng-dt.elc rng-valid.elc rng-pttrn.elc rng-xsd.elc rng-cmpct.elc \
-  rng-match.elc rng-nxml.elc rng-util.elc rng-loc.elc rng-uri.elc \
-  rng-parse.elc rng-maint.elc xsd-regexp.elc xmltok.elc
-
-FILESTOCLEAN=stamp-byte-compile $(ELC) VERSION TAGS \
-  nxml-mode.texi nxml-mode.info dir
-
-EMACS=d:/emacs/050613095156/emacs/bin/emacs
-EMACS=c:/program files/emacs/emacs-21.3/bin/emacs
-EMACS=emacs
-ETAGS=etags
-MAKEINFO=makeinfo
-INSTALL-INFO=install-info
-PACKAGE=nxml-mode
-
-stamp-byte-compile: $(SRC)
-	-rm -f $(ELC)
-	$(EMACS) -batch -no-site-file -q -l rng-auto.el -f rng-byte-compile-load
-	touch $(@)
-
-all: stamp-byte-compile nxml-mode.info
-
-dir: nxml-mode.info
-	rm -f $@
-	$(INSTALL-INFO) $< $@
-
-info: nxml-mode.info
-
-nxml-mode.info: nxml-mode.texi
-	$(MAKEINFO) $<
-
-nxml-mode.texi: nxml-mode.xml
-	$(EMACS) -batch -no-site-file -q -l rng-auto.el -f rng-format-manual
-
-VERSION: stamp-byte-compile rng-auto.el
-	$(EMACS) -batch -no-site-file -q -l rng-auto.el -f rng-write-version
-
-TAGS: $(SRC)
-	$(ETAGS) $(SRC)
-
-dist: stamp-byte-compile $(EXTRA)
-	@version=`cat VERSION`; \
-	set -e; \
-	echo Making $(PACKAGE)-$$version.tar.gz; \
-	rm -fr $(PACKAGE)-$$version; \
-	mkdir $(PACKAGE)-$$version; \
-	cd $(PACKAGE)-$$version; \
-	for f in $(EXTRA) $(SRC) $(ELC); do \
-	  ln -s ../$$f .; \
-	done; \
-	mkdir schema; \
-	cd schema; \
-	for f in ../../schema/*.rnc ../../schema/*.xml; do \
-	  ln -s $$f .; \
-	done; \
-	cd ..; \
-	mkdir char-name; \
-	mkdir char-name/unicode; \
-	cd char-name/unicode; \
-	for f in ../../../char-name/unicode/*-*.el; do \
-	  ln -s $$f .; \
-	done; \
-	cd ../../..; \
-	tar cfhz $(PACKAGE)-$$version.tar.gz $(PACKAGE)-$$version; \
-	rm -fr $(PACKAGE)-$$version
-
-clean:
-	-rm -f $(FILESTOCLEAN)
-
-.PHONY: all clean info
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/NEWS b/elpa-to-submit/nxhtml/nxml-mode-20041004/NEWS
deleted file mode 100644
index cebbab82fd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/NEWS
+++ /dev/null
@@ -1,199 +0,0 @@
-20041004
---------
-
-Support for outlining has been added. See the manual for more details.
-
-C-u C-c C-n goes to the first error.
-
-20040910
---------
-
-C-c RET splits the current element as in PSGML.
-
-20040908
---------
-
-Indentation has been rewritten.  Indentation of attribute names and
-values should work better.  The default value of
-`nxml-attribute-indent' has been changed to 4.
-
-Syntax highlighting with a dark background should now work.
-
-20040726
---------
-
-The attribute pathSuffix on the uri element in schema locating files
-has been replaced by a more general pattern attribute. The
-transformURI element now has required fromPattern and toPattern
-attributes.
-
-The schema related bindings have been changed to use C-c C-s as a prefix
-as follows:
-
-  C-c C-s => C-c C-s C-f (f for file)
-  C-c C-a => C-c C-s C-a
-  C-c C-t => C-c C-s C-t
-  C-c C-l => C-c C-s C-l
-  C-c C-w => C-c C-s C-w
-
-There's now an XML menu on the menu-bar.
-
-20031031
---------
-
-C-c C-d "dynamically" chooses a tag to put around the word before
-point, rather like M-/.
-
-The mechanism for locating the schema has changed completely.  The new
-mechanism is described in the manual.  Any existing customizations of
-`rng-auto-element-alist' or `rng-auto-file-name-alist' will no longer
-be effective.
-
-C-c C-a is now bound to rng-auto-set-schema.
-
-20031018
---------
-
-Unicode names can be used to insert characters with the new command
-C-c C-u.  Normally, this inserts a character reference.  With a prefix
-arg (i.e. C-u C-c C-u), it inserts the character directly.  You can
-customize `nxml-enabled-unicode-blocks' to control what Unicode blocks
-are used for completing names.
-
-Extra information is displayed for character references.  The Unicode
-name is displayed in a tooltip. A glyph for the referenced character
-is displayed in a distinguished face following the character
-reference; this can be disabled by customizing
-`nxml-char-ref-display-glyph-flag'.  The command
-`nxml-toggle-char-ref-extra-display' dynamically toggles the display
-of extra information for character references for a particular buffer.
-This can be used if the display of extra information is causing
-performance problems. nXML mode tries to figure out which glyphs can
-be displayed. Unfortunately Emacs doesn't provide the primitives
-necessary to do this properly, so nXML mode has to guess and will
-sometimes guess wrong.  The hook `nxml-glyph-set-hook' can be used to
-change nXML mode's guess.
-
-New command C-c C-w says what schema is being used.
-
-C-c C-s now turns on validation if it is not already on.
-
-20030928
---------
-
-M-q has been implemented so that it works reasonably with XML.  Other
-paragraph-related commands (M-{, M-}, M-h) have also been implemented.
-
-New command M-x rng-auto-set-schema to set the schema based on the
-buffer's current contents and file-name. This is called automatically
-when rng-validate-mode is first enabled.
-
-There's now a C-M-d to go with C-M-u.  C-M-d moves forward down into
-the content of an element.  C-M-n and C-M-p move to the next or
-previous element.
-
-By default, the sexp commands (C-M-f, C-M-b, C-M-k, C-M-SPC) operate
-on tags rather than elements.  To restore the old behaviour,
-customize nxml-sexp-element-flag.
-
-The file TUTORIAL has been replaced by nxml-mode.info; this is in info
-format and can be read using Emacs.  The source is maintained in a
-simple, ad-hoc XML format.
-
-20030915
---------
-
-XML encodings should now work properly.  When saving a buffer,
-nxml-mode arranges to use the encoding declared in the XML
-declaration.  If there is no encoding declared, then nxml-mode will
-use utf-8 or utf-16 according to the user options
-`nxml-prefer-utf-16-to-utf-8-flag' and
-`nxml-prefer-utf-16-little-to-big-endian-flag'. If the chosen encoding
-cannot encode all the characters in the buffer, nxml-mode will
-complain and give the user an opportunity to use an encoding that can.
-
-A new command C-c C-x inserts an XML declaration.
-
-The option `nxml-auto-insert-xml-declaration-flag' automatically
-inserts an XML declaration in new files.
-
-The `nxml-default-buffer-file-coding-system' option allows a different
-default buffer-file-coding-system for nXML mode buffers.  This affects
-what XML declaration is inserted.
-
-Encoding names in XML declarations are now validated by
-rng-validate-mode.
-
-RDF/XML schema was updated to version in 05 September 2003 WD.
-
-20030912
---------
-
-The tutorial has a new section on inserting end-tags.
-
-By default </ no longer automatically inserts the rest of the end-tag.
-You can do
-
-  M-x customize-variable RET nxml-slash-auto-complete-flag RET
-
-and then follow the instructions displayed in the buffer to get the
-old behaviour.
-
-Completion after </ will complete the rest of the end-tag. Completion
-after < will include the end-tag in the possibilities if allowed by
-the schema.
-
-You can use C-c C-i instead of > to close the start-tag of an
-inline-level element.  After inserting the >, it will insert the
-end-tag and leave point before the end-tag. The `i' is supposed to be
-mnemonic for `inline'. C-c C-b is similar, but for block elements: the
-start-tag, point and the end-tag will all be on separate lines.
-
-The binding for inserting an end-tag has changed from C-c / to C-c C-f
-to comply with Emacs guidelines about what keys major modes should
-bind.  The `f' is supposed to be mnemonic for `finish'.
-
-Completion always puts point after all the characters it inserts. It
-doesn't insert a `>' after completing a start-tag name.
-
-Completion no longer completes CDATA section and comment delimiters.
-
-The nxml-start-auto-coding command enables auto-detection of a file's
-encoding as specified in the XML Recommendation for files that use
-nxml-mode; rng-auto.el calls this.
-
-20030906
---------
-
-Validation messages applicable to point are displayed automatically.
-
-Completion can deal with prefixes that haven't yet been declared.
-
-rng-preferred-prefix-alist variable added.
-
-Namespace URIs can be completed.
-
-xmlns and xmlns:* attributes can be completed.
-
-CDATA section and comment delimiters can be completed.
-
-Each kind of completion has its own history.
-
-Completion function moved to nxml-mode; uses a hook to allow
-schema-sensitive completion.  Completion function bound to C-return.
-Also bound to M-TAB as before, unless
-nxml-bind-meta-tab-to-complete-flag is nil.  When there is a window
-system, nxml-bind-meta-tab-to-complete-flag is nil by default, This
-avoid problems with M-TAB, which is not passed through by several
-window systems/managers.
-
-TUTORIAL file added.
-
-NEWS file added.
-
-Bug fixes.
-
-20030901
---------
-
-Initial release.
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/README b/elpa-to-submit/nxhtml/nxml-mode-20041004/README
deleted file mode 100644
index 4f3fc96c0f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/README
+++ /dev/null
@@ -1,106 +0,0 @@
-This is a new major mode for GNU Emacs for editing XML documents. It
-supports editing well-formed XML documents and also provides
-schema-sensitive editing of XML documents using RELAX NG Compact
-Syntax.
-
-To use this, you need GNU Emacs version 21.x, preferably 21.3. GNU
-Emacs version 20 will not work properly, nor will XEmacs.
-
-To get started, do
-
-  M-x load-file <RET> rng-auto.el <RET>
-
-This defines the necessary autoloads.  Now, visit a file containing
-an XML document, and do
-
-  M-x nxml-mode
-
-Now do
-
-  C-h m
-
-for information on how to use nxml-mode.
-
-The beginnings of a manual are in nxml-mode.info.  You can read this
-using
-
-  C-u M-x info RET nxml-mode.info RET
-
-It's also installed as an entry at the end of the top-level info
-directory.  So you can read it with C-h i as usual.
-
-You can use test.valid.xml and test.invalid.xml as examples of valid
-and invalid XML documents.
-
-To get things automatically loaded each time you start Emacs, add
-
-  (load "~/nxml-mode-200YMMDD/rng-auto.el")
-
-to your .emacs, where ~/nxml-mode-200YMMDD is the directory containing
-the .elc files.  Note that rng-auto.el does not load all of the
-nxml-mode code; it merely sets things up so that all the features of
-nxml-mode will be autoloaded properly.  You should not try to autoload
-rng-auto.el itself.
-
-To use nxml-mode automatically for files with an extension of xml,
-xsl, rng or xhtml, add
-
-  (setq auto-mode-alist
-        (cons '("\\.\\(xml\\|xsl\\|rng\\|xhtml\\)\\'" . nxml-mode)
-	      auto-mode-alist))
-
-to your .emacs.
-
-If you edit XML using iso-8859-N encodings other than iso-8859-1 and
-you are running Emacs 21.3 or later, then I recommend enabling
-unify-8859-on-decoding-mode, by adding
-
-  (unify-8859-on-decoding-mode)
-
-to you .emacs.
-
-To get validation and schema-sensitive editing, you need a RELAX NG
-Compact Syntax (RNC) schema for you document. The schema directory
-includes some schemas for popular document types.
-
-For more on RELAX NG, see
-
-  http://relaxng.org
-
-For a tutorial on RELAX NG Compact Syntax, see
-
-  http://relaxng.org/compact-tutorial.html
-
-For automatically creating RNC schemas, I recommend my Trang program:
-
-  http://www.thaiopensource.com/relaxng/trang.html
-
-You can use this to
-
-- infer an RNC schema from an instance document;
-
-- convert a DTD to an RNC schema;
-
-- convert a RELAX NG XML syntax schema to an RNC schema.
-
-To convert a RELAX NG XML syntax (.rng) schema to a RNC schema, you
-can also use the XSLT stylesheet from
-
-  http://www.pantor.com/download.html
-
-To convert a W3C XML Schema to an RNC schema, you need first to
-convert it to RELAX NG XML syntax using Sun's RELAX NG converter tool
-rngconv (built on top of MSV). See
-
-  https://msv.dev.java.net/
-
-The file NEWS describes recent changes.
-
-Please use the list
-
-  http://groups.yahoo.com/group/emacs-nxml-mode/
-
-for bug reports, discussion. I will announce all new versions there.
-
-James Clark
-http://www.jclark.com/contact.html
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/TODO b/elpa-to-submit/nxhtml/nxml-mode-20041004/TODO
deleted file mode 100644
index 3e7d5012b6..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/TODO
+++ /dev/null
@@ -1,468 +0,0 @@
-* High priority
-
-** Command to insert an element template, including all required
-attributes and child elements.  When there's a choice of elements
-possible, we could insert a comment, and put an overlay on that
-comment that makes it behave like a button with a pop-up menu to
-select the appropriate choice.
-
-** Command to tag a region.  With a schema should complete using legal
-tags, but should work without a schema as well.
-
-** Provide a way to conveniently rename an element. With a schema should
-complete using legal tags, but should work without a schema as well.
-
-* Outlining
-
-** Implement C-c C-o C-q.
-
-** Install pre/post command hook for moving out of invisible section.
-
-** Put a modify hook on invisible sections that expands them.
-
-** Integrate dumb folding somehow.
-
-** An element should be able to be its own heading.
-
-** Optimize to avoid complete buffer scan on each command.
-
-** Make it work with HTML-style headings (i.e. level indicated by
-name of heading element rather than depth of section nesting).
-
-** Recognize root element as a section provided it has a title, even
-if it doesn't match section-element-name-regex.
-
-** Support for incremental search automatically making hidden text
-visible.
-
-** Allow title to be an attribute.
-
-** Command that says to recognize the tag at point as a section/heading.
-
-** Explore better ways to determine when an element is a section
-or a heading.
-
-** rng-next-error needs to either ignore invisible portion or reveal it
-(maybe use isearch oriented text properties).
-
-** Errors within hidden section should be highlighted by underlining the
-ellipsis.
-
-** Make indirect buffers work.
-
-** How should nxml-refresh outline recover from non well-formed tags?
-
-** Hide tags in title elements?
-
-** Use overlays instead of text properties for holding outline state?
-Necessary for indirect buffers to work?
-
-** Allow an outline to go in the speedbar.
-
-** Split up outlining manual section into subsections.
-
-** More detail in the manual about each outlining command.
-
-** More menu entries for hiding/showing?
-
-** Indication of many lines have been hidden?
-
-* Locating schemas
-
-** Should rng-validate-mode give the user an opportunity to specify a
-schema if there is currently none? Or should it at least give a hint
-to the user how to specify a non-vacuous schema?
-
-** Support for adding new schemas to schema-locating files. Add
-documentElement and namespace elements.
-
-** C-c C-w should be able to report current type id.
-
-** Implement doctypePublicId.
-
-** Implement typeIdBase.
-
-** Implement typeIdProcessingInstruction.
-
-** Support xml:base.
-
-** Implement group.
-
-** Find preferred prefix from schema-locating files.  Get rid of
-rng-preferred-prefix-alist.
-
-** Inserting document element with vacuous schema should complete using
-document elements declared in schema locating files, and set schema
-appropriately.
-
-** Add a ruleType attribute to the <include> element?
-
-** Allow processing instruction in prolog to contain the compact syntax
-schema directly.
-
-** Use RDDL to locate a schema based on the namespace URI.
-
-** Should not prompt to add redundant association to schema locating
-file.
-
-** Command to reload current schema.
-
-* Schema-sensitive features
-
-** Should filter dynamic markup possibilities using schema validity, by
-adding hook to nxml-mode.
-
-** Dynamic markup word should (at least optionally) be able to look in
-other buffers that are using nxml-mode.
-
-** Should clicking on Invalid move to next error if already on an error?
-
-** Take advantage of a:documentation. Needs change to schema format.
-
-** Provide feasible validation (as in Jing) toggle.
-
-** Save the validation state as a property on the error overlay to enable
-more detailed diagnosis.
-
-** Provide an Error Summary buffer showing all the validation errors.
-
-** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
-the region is not balanced).  Suggestions based on error messages.
-
-** Have configurable list of namespace URIs so that we can provide
-namespace URI completion on extension elements or with schema-less
-documents.
-
-** Allow validation to handle XInclude.
-
-** ID/IDREF support.
-
-* Completion
-
-** Make it work with icomplete.  Only use a function to complete when
-some of the possible names have undeclared namespaces.
-
-** How should C-return in mixed text work?
-
-** When there's a vacuous schema, C-return after < will insert the
-end-tag.  Is this a bug or a feature?
-
-** After completing start-tag, ensure we don't get unhelpful message
-from validation
-
-** Syntax table for completion.
-
-** Should complete start-tag name with a space if namespace attributes
-are required.
-
-** When completing start-tag name with no prefix and it doesn't match
-should try to infer namespace from local name.
-
-** Should completion pay attention to characters after point?  If so,
-how?
-
-** When completing start-tag name, add required atts if only one required
-attribute.
-
-** When completing attribute name, add attribute value if only one value
-is possible.
-
-** After attribute-value completion, insert space after close delimiter
-if more attributes are required.
-
-** Complete on enumerated data values in elements.
-
-** When in context that allows only elements, should get tag
-completion without having to type < first.
-
-** When immediately after start-tag name, and name is valid and not
-prefix of any other name, should C-return complete on attribute names?
-
-** When completing attributes, more consistent to ignore all attributes
-after point.
-
-** Inserting attribute value completions needs to be sensitive to what
-delimiter is used so that it quotes the correct character.
-
-** Complete on encoding-names in XML decl.
-
-** Complete namespace declarations by searching for all namespaces
-mentioned in the schema.
-
-* Well-formed XML support
-
-** Deal better with Mule-UCS
-
-** Deal with UTF-8 BOM when reading.
-
-** Complete entity names.
-
-** Provide some support for entity names for MathML.
-
-** Command to repeat the last tag.
-
-** Support for changing between character references and characters.
-Need to check that context is one in which character references are
-allowed.  xmltok prolog parsing will need to distinguish parameter
-literals from other kinds of literal.
-
-** Provide a comment command to bind to M-; that works better than the
-normal one.
-
-** Make indenting in a multi-line comment work.
-
-** Structure view.  Separate buffer displaying element tree. Be able to
-navigate from structure view to document and vice-versa.
-
-** Flash matching >.
-
-** Smart selection command that selects increasingly large syntactically
-coherent chunks of XML.  If point is in an attribute value, first
-select complete value; then if command is repeated, select value plus
-delimiters, then select attribute name as well, then complete
-start-tag, then complete element, then enclosing element, etc.
-
-** ispell integration.
-
-** Block-level items in mixed content should be indented, e.g:
-  <para>This is list:
-    <ul>
-      <li>item</li>
-
-** Provide option to indent like this:
-
-**   <para>This is a paragraph
-    occupying multiple lines.</para>
-
-** Option to add make a / that closes a start-tag electrically insert a
-space for the XHTML guys.
-
-** C-M-q should work.
-
-* Datatypes
-
-** Figure out workaround for CJK characters with regexps.
-
-** Does category C contain Cn?
-
-** Do ENTITY datatype properly.
-
-* XML Parsing Library
-
-** Parameter entity parsing option, nil (never), t (always),
-unless-standalone (unless standalone="yes" in XML declaration).
-
-** When a file is currently being edited, there should be an option to
-use its buffer instead of the on-disk copy.
-
-* Handling all XML features
-
-** Provide better support for editing external general parsed entities.
-Perhaps provide a way to force ignoring undefined entities; maybe turn
-this on automatically with <?xml encoding=""?> (with no version
-pseudo-att).
-
-** Handle internal general entity declarations containing elements.
-
-** Handle external general entity declarations.
-
-** Handle default attribute declarations in internal subset.
-
-** Handle parameter entities (including DTD).
-
-* RELAX NG
-
-** Do complete schema checking, at least optionally.
-
-** Detect include/external loops during schema parse.
-
-** Coding system detection for schemas.  Should use utf-8/utf-16 per the
-spec. But also need to allow encodings other than UTF-8/16 to support
-CJK charsets that Emacs cannot represent in Unicode.
-
-* Catching XML errors
-
-** Check public identifiers.
-
-** Check default attribute values.
-
-* Performance
-
-** Explore whether overlay-recenter can cure overlays performance
-problems.
-
-** Cache schemas. Need to have list of files and mtimes.
-
-** Make it possible to reduce rng-validate-chunk-size significantly,
-perhaps to 500 bytes, without bad performance impact: don't do
-redisplay on every chunk; pass continue functions on other uses of
-rng-do-some-validation.
-
-** Cache after first tag.
-
-** Introduce a new name class that is a choice between names (so that
-we can use member)
-
-** intern-choice should simplify after patterns with same 1st/2nd args
-
-** Large numbers of overlays slow things down dramatically.  Represent
-errors using text properties.  This implies we cannot incrementally
-keep track of the number of errors, in order to determine validity.
-Instead, when validation completes, scan for any characters with an
-error text property; this seems to be fast enough even with large
-buffers. Problem with error at end of buffer, where there's no
-character; need special variable for this.  Need to merge face from
-font-lock with the error face: use :inherit attribute with list of two
-faces.  How do we avoid making rng-valid depend on nxml-mode?
-
-* Error recovery
-
-** Don't stop at newline in looking for close of start-tag.
-
-** Use indentation to guide recovery from mismatched end-tags
-
-** Don't keep parsing when currently not well-formed but previously
-well-formed
-
-** Try to recover from a bad start-tag by popping an open element if
-there was a mismatched end-tag unaccounted for.
-
-** Try to recover from a bad start-tag open on the hypothesis that there
-was an error in the namespace URI.
-
-** Better recovery from ill-formed XML declarations.
-
-* Useability improvements
-
-** Should print a "Parsing..." message during long movements.
-
-** Provide better position for reference to undefined pattern error.
-
-** Put Well-formed in the mode-line when validating against any-content.
-
-** Trim marking of illegal data for leading and trailing whitespace.
-
-** Show Invalid status as soon as we are sure it's invalid, rather than
-waiting for everything to be completely up to date.
-
-** When narrowed, Valid or Invalid status should probably consider only
-validity of narrowed region.
-
-* Bug fixes
-
-** Need to give an error for a document like: <foo/><![CDATA[  ]]>
-
-** Make nxml-forward-balanced-item work better for the prolog.
-
-** Make filling and indenting comments work in the prolog.
-
-** Should delete RNC Input buffers.
-
-** Figure out what regex use for NCName and use it consistently,
-
-** Should have not-well-formed tokens in ref.
-
-** Require version in XML declaration? Probably not because prevents
-use for external parsed entities. At least forbid standalone
-without version.
-
-** Reject schema that compiles to rng-not-allowed-ipattern.
-
-** Move point backwards on schema parse error so that it's on the right token.
-
-* Internal
-
-** Use rng-quote-string consistently.
-
-** Use parsing library for XML to texinfo conversion.
-
-** Rename xmltok.el to nxml-token.el.  Use nxml-t- prefix instead of
-xmltok-. Change nxml-t-type to nxml-t-token-type, nxml-t-start to
-nxml-t-token-start.
-
-** Can we set fill-prefix to nil and rely on indenting?
-
-** xmltok should make available replacement text of entities containing
-elements
-
-** In rng-valid, instead of using modification-hooks and
-insert-behind-hooks on dependent overlays, use same technique as
-nxml-mode.
-
-** Port to XEmacs.  Issues include: Unicode (XEmacs seems to be based on
-Mule-UCS); overlays/text properties vs extents; absence of
-fontification-functions hook.
-
-* Fontification
-
-** Allow face to depend on element qname, attribute qname, attribute
-value.  Use list with pairs of (R . F), where R specifies regexps and
-F specifies faces.  How can this list be made to depend on the
-document type?
-
-* Other
-
-** Support RELAX NG XML syntax (use XML parsing library).
-
-** Support W3C XML Schema (use XML parsing library).
-
-** Command to infer schema from current document (like trang).
-
-* Schemas
-
-** XSLT schema should take advantage of RELAX NG to express cooccurrence
-constraints on attributes (e.g. xsl:template).
-
-* Documentation
-
-** Move material from README to manual.
-
-** Document encodings.
-
-* Notes
-
-** How can we allow an error to be displayed on a different token from
-where it is detected?  In particular, for a missing closing ">" we
-will need to display it at the beginning of the following token.  At
-the moment, when we parse the following token the error overlay will
-get cleared.
-
-** How should rng-goto-next-error deal with narrowing?
-
-** Perhaps should merge errors having same start position even if they
-have different ends.
-
-** How to handle surrogates? One possibility is to be compatible with
-utf8.e: represent as sequence of 4 chars.  But utf-16 is incompatible
-with this.
-
-** Should we distinguish well-formedness errors from invalidity errors?
-(I think not: we may want to recover from a bad start-tag by implying
-an end-tag.)
-
-** Seems to be a bug with Emacs, where a mouse movement that causes
-help-echo text to appear counts as pending input but does not cause
-idle timer to be restarted.
-
-** Use XML to represent this file.
-
-** I had a TODO which said simply "split-string". What did I mean?
-
-** Investigate performance on large files all on one line.
-
-* CVS emacs issues
-
-** Take advantage of UTF-8 CJK support.
-
-** Supply a next-error-function.
-
-** Investigate this NEWS item "Emacs now tries to set up buffer coding
-systems for HTML/XML files automatically."
-
-** Take advantage of the pointer text property.
-
-** Leverage char-displayable-p.
-
-Local variables:
-mode: outline
-end:
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/VERSION b/elpa-to-submit/nxhtml/nxml-mode-20041004/VERSION
deleted file mode 100644
index dcd4050a10..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-20041004
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00000-0007F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00000-0007F.el
deleted file mode 100644
index 122804fc47..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00000-0007F.el
+++ /dev/null
@@ -1,97 +0,0 @@
-(nxml-define-char-name-set 'basic-latin
-  '(("SPACE" #x0020)
-    ("EXCLAMATION MARK" #x0021)
-    ("QUOTATION MARK" #x0022)
-    ("NUMBER SIGN" #x0023)
-    ("DOLLAR SIGN" #x0024)
-    ("PERCENT SIGN" #x0025)
-    ("AMPERSAND" #x0026)
-    ("APOSTROPHE" #x0027)
-    ("LEFT PARENTHESIS" #x0028)
-    ("RIGHT PARENTHESIS" #x0029)
-    ("ASTERISK" #x002A)
-    ("PLUS SIGN" #x002B)
-    ("COMMA" #x002C)
-    ("HYPHEN-MINUS" #x002D)
-    ("FULL STOP" #x002E)
-    ("SOLIDUS" #x002F)
-    ("DIGIT ZERO" #x0030)
-    ("DIGIT ONE" #x0031)
-    ("DIGIT TWO" #x0032)
-    ("DIGIT THREE" #x0033)
-    ("DIGIT FOUR" #x0034)
-    ("DIGIT FIVE" #x0035)
-    ("DIGIT SIX" #x0036)
-    ("DIGIT SEVEN" #x0037)
-    ("DIGIT EIGHT" #x0038)
-    ("DIGIT NINE" #x0039)
-    ("COLON" #x003A)
-    ("SEMICOLON" #x003B)
-    ("LESS-THAN SIGN" #x003C)
-    ("EQUALS SIGN" #x003D)
-    ("GREATER-THAN SIGN" #x003E)
-    ("QUESTION MARK" #x003F)
-    ("COMMERCIAL AT" #x0040)
-    ("LATIN CAPITAL LETTER A" #x0041)
-    ("LATIN CAPITAL LETTER B" #x0042)
-    ("LATIN CAPITAL LETTER C" #x0043)
-    ("LATIN CAPITAL LETTER D" #x0044)
-    ("LATIN CAPITAL LETTER E" #x0045)
-    ("LATIN CAPITAL LETTER F" #x0046)
-    ("LATIN CAPITAL LETTER G" #x0047)
-    ("LATIN CAPITAL LETTER H" #x0048)
-    ("LATIN CAPITAL LETTER I" #x0049)
-    ("LATIN CAPITAL LETTER J" #x004A)
-    ("LATIN CAPITAL LETTER K" #x004B)
-    ("LATIN CAPITAL LETTER L" #x004C)
-    ("LATIN CAPITAL LETTER M" #x004D)
-    ("LATIN CAPITAL LETTER N" #x004E)
-    ("LATIN CAPITAL LETTER O" #x004F)
-    ("LATIN CAPITAL LETTER P" #x0050)
-    ("LATIN CAPITAL LETTER Q" #x0051)
-    ("LATIN CAPITAL LETTER R" #x0052)
-    ("LATIN CAPITAL LETTER S" #x0053)
-    ("LATIN CAPITAL LETTER T" #x0054)
-    ("LATIN CAPITAL LETTER U" #x0055)
-    ("LATIN CAPITAL LETTER V" #x0056)
-    ("LATIN CAPITAL LETTER W" #x0057)
-    ("LATIN CAPITAL LETTER X" #x0058)
-    ("LATIN CAPITAL LETTER Y" #x0059)
-    ("LATIN CAPITAL LETTER Z" #x005A)
-    ("LEFT SQUARE BRACKET" #x005B)
-    ("REVERSE SOLIDUS" #x005C)
-    ("RIGHT SQUARE BRACKET" #x005D)
-    ("CIRCUMFLEX ACCENT" #x005E)
-    ("LOW LINE" #x005F)
-    ("GRAVE ACCENT" #x0060)
-    ("LATIN SMALL LETTER A" #x0061)
-    ("LATIN SMALL LETTER B" #x0062)
-    ("LATIN SMALL LETTER C" #x0063)
-    ("LATIN SMALL LETTER D" #x0064)
-    ("LATIN SMALL LETTER E" #x0065)
-    ("LATIN SMALL LETTER F" #x0066)
-    ("LATIN SMALL LETTER G" #x0067)
-    ("LATIN SMALL LETTER H" #x0068)
-    ("LATIN SMALL LETTER I" #x0069)
-    ("LATIN SMALL LETTER J" #x006A)
-    ("LATIN SMALL LETTER K" #x006B)
-    ("LATIN SMALL LETTER L" #x006C)
-    ("LATIN SMALL LETTER M" #x006D)
-    ("LATIN SMALL LETTER N" #x006E)
-    ("LATIN SMALL LETTER O" #x006F)
-    ("LATIN SMALL LETTER P" #x0070)
-    ("LATIN SMALL LETTER Q" #x0071)
-    ("LATIN SMALL LETTER R" #x0072)
-    ("LATIN SMALL LETTER S" #x0073)
-    ("LATIN SMALL LETTER T" #x0074)
-    ("LATIN SMALL LETTER U" #x0075)
-    ("LATIN SMALL LETTER V" #x0076)
-    ("LATIN SMALL LETTER W" #x0077)
-    ("LATIN SMALL LETTER X" #x0078)
-    ("LATIN SMALL LETTER Y" #x0079)
-    ("LATIN SMALL LETTER Z" #x007A)
-    ("LEFT CURLY BRACKET" #x007B)
-    ("VERTICAL LINE" #x007C)
-    ("RIGHT CURLY BRACKET" #x007D)
-    ("TILDE" #x007E)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00080-000FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00080-000FF.el
deleted file mode 100644
index 1d7f463d56..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00080-000FF.el
+++ /dev/null
@@ -1,98 +0,0 @@
-(nxml-define-char-name-set 'latin-1-supplement
-  '(("NO-BREAK SPACE" #x00A0)
-    ("INVERTED EXCLAMATION MARK" #x00A1)
-    ("CENT SIGN" #x00A2)
-    ("POUND SIGN" #x00A3)
-    ("CURRENCY SIGN" #x00A4)
-    ("YEN SIGN" #x00A5)
-    ("BROKEN BAR" #x00A6)
-    ("SECTION SIGN" #x00A7)
-    ("DIAERESIS" #x00A8)
-    ("COPYRIGHT SIGN" #x00A9)
-    ("FEMININE ORDINAL INDICATOR" #x00AA)
-    ("LEFT-POINTING DOUBLE ANGLE QUOTATION MARK" #x00AB)
-    ("NOT SIGN" #x00AC)
-    ("SOFT HYPHEN" #x00AD)
-    ("REGISTERED SIGN" #x00AE)
-    ("MACRON" #x00AF)
-    ("DEGREE SIGN" #x00B0)
-    ("PLUS-MINUS SIGN" #x00B1)
-    ("SUPERSCRIPT TWO" #x00B2)
-    ("SUPERSCRIPT THREE" #x00B3)
-    ("ACUTE ACCENT" #x00B4)
-    ("MICRO SIGN" #x00B5)
-    ("PILCROW SIGN" #x00B6)
-    ("MIDDLE DOT" #x00B7)
-    ("CEDILLA" #x00B8)
-    ("SUPERSCRIPT ONE" #x00B9)
-    ("MASCULINE ORDINAL INDICATOR" #x00BA)
-    ("RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK" #x00BB)
-    ("VULGAR FRACTION ONE QUARTER" #x00BC)
-    ("VULGAR FRACTION ONE HALF" #x00BD)
-    ("VULGAR FRACTION THREE QUARTERS" #x00BE)
-    ("INVERTED QUESTION MARK" #x00BF)
-    ("LATIN CAPITAL LETTER A WITH GRAVE" #x00C0)
-    ("LATIN CAPITAL LETTER A WITH ACUTE" #x00C1)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX" #x00C2)
-    ("LATIN CAPITAL LETTER A WITH TILDE" #x00C3)
-    ("LATIN CAPITAL LETTER A WITH DIAERESIS" #x00C4)
-    ("LATIN CAPITAL LETTER A WITH RING ABOVE" #x00C5)
-    ("LATIN CAPITAL LETTER AE" #x00C6)
-    ("LATIN CAPITAL LETTER C WITH CEDILLA" #x00C7)
-    ("LATIN CAPITAL LETTER E WITH GRAVE" #x00C8)
-    ("LATIN CAPITAL LETTER E WITH ACUTE" #x00C9)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX" #x00CA)
-    ("LATIN CAPITAL LETTER E WITH DIAERESIS" #x00CB)
-    ("LATIN CAPITAL LETTER I WITH GRAVE" #x00CC)
-    ("LATIN CAPITAL LETTER I WITH ACUTE" #x00CD)
-    ("LATIN CAPITAL LETTER I WITH CIRCUMFLEX" #x00CE)
-    ("LATIN CAPITAL LETTER I WITH DIAERESIS" #x00CF)
-    ("LATIN CAPITAL LETTER ETH" #x00D0)
-    ("LATIN CAPITAL LETTER N WITH TILDE" #x00D1)
-    ("LATIN CAPITAL LETTER O WITH GRAVE" #x00D2)
-    ("LATIN CAPITAL LETTER O WITH ACUTE" #x00D3)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX" #x00D4)
-    ("LATIN CAPITAL LETTER O WITH TILDE" #x00D5)
-    ("LATIN CAPITAL LETTER O WITH DIAERESIS" #x00D6)
-    ("MULTIPLICATION SIGN" #x00D7)
-    ("LATIN CAPITAL LETTER O WITH STROKE" #x00D8)
-    ("LATIN CAPITAL LETTER U WITH GRAVE" #x00D9)
-    ("LATIN CAPITAL LETTER U WITH ACUTE" #x00DA)
-    ("LATIN CAPITAL LETTER U WITH CIRCUMFLEX" #x00DB)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS" #x00DC)
-    ("LATIN CAPITAL LETTER Y WITH ACUTE" #x00DD)
-    ("LATIN CAPITAL LETTER THORN" #x00DE)
-    ("LATIN SMALL LETTER SHARP S" #x00DF)
-    ("LATIN SMALL LETTER A WITH GRAVE" #x00E0)
-    ("LATIN SMALL LETTER A WITH ACUTE" #x00E1)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX" #x00E2)
-    ("LATIN SMALL LETTER A WITH TILDE" #x00E3)
-    ("LATIN SMALL LETTER A WITH DIAERESIS" #x00E4)
-    ("LATIN SMALL LETTER A WITH RING ABOVE" #x00E5)
-    ("LATIN SMALL LETTER AE" #x00E6)
-    ("LATIN SMALL LETTER C WITH CEDILLA" #x00E7)
-    ("LATIN SMALL LETTER E WITH GRAVE" #x00E8)
-    ("LATIN SMALL LETTER E WITH ACUTE" #x00E9)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX" #x00EA)
-    ("LATIN SMALL LETTER E WITH DIAERESIS" #x00EB)
-    ("LATIN SMALL LETTER I WITH GRAVE" #x00EC)
-    ("LATIN SMALL LETTER I WITH ACUTE" #x00ED)
-    ("LATIN SMALL LETTER I WITH CIRCUMFLEX" #x00EE)
-    ("LATIN SMALL LETTER I WITH DIAERESIS" #x00EF)
-    ("LATIN SMALL LETTER ETH" #x00F0)
-    ("LATIN SMALL LETTER N WITH TILDE" #x00F1)
-    ("LATIN SMALL LETTER O WITH GRAVE" #x00F2)
-    ("LATIN SMALL LETTER O WITH ACUTE" #x00F3)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX" #x00F4)
-    ("LATIN SMALL LETTER O WITH TILDE" #x00F5)
-    ("LATIN SMALL LETTER O WITH DIAERESIS" #x00F6)
-    ("DIVISION SIGN" #x00F7)
-    ("LATIN SMALL LETTER O WITH STROKE" #x00F8)
-    ("LATIN SMALL LETTER U WITH GRAVE" #x00F9)
-    ("LATIN SMALL LETTER U WITH ACUTE" #x00FA)
-    ("LATIN SMALL LETTER U WITH CIRCUMFLEX" #x00FB)
-    ("LATIN SMALL LETTER U WITH DIAERESIS" #x00FC)
-    ("LATIN SMALL LETTER Y WITH ACUTE" #x00FD)
-    ("LATIN SMALL LETTER THORN" #x00FE)
-    ("LATIN SMALL LETTER Y WITH DIAERESIS" #x00FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00100-0017F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00100-0017F.el
deleted file mode 100644
index 7a97964a16..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00100-0017F.el
+++ /dev/null
@@ -1,130 +0,0 @@
-(nxml-define-char-name-set 'latin-extended-a
-  '(("LATIN CAPITAL LETTER A WITH MACRON" #x0100)
-    ("LATIN SMALL LETTER A WITH MACRON" #x0101)
-    ("LATIN CAPITAL LETTER A WITH BREVE" #x0102)
-    ("LATIN SMALL LETTER A WITH BREVE" #x0103)
-    ("LATIN CAPITAL LETTER A WITH OGONEK" #x0104)
-    ("LATIN SMALL LETTER A WITH OGONEK" #x0105)
-    ("LATIN CAPITAL LETTER C WITH ACUTE" #x0106)
-    ("LATIN SMALL LETTER C WITH ACUTE" #x0107)
-    ("LATIN CAPITAL LETTER C WITH CIRCUMFLEX" #x0108)
-    ("LATIN SMALL LETTER C WITH CIRCUMFLEX" #x0109)
-    ("LATIN CAPITAL LETTER C WITH DOT ABOVE" #x010A)
-    ("LATIN SMALL LETTER C WITH DOT ABOVE" #x010B)
-    ("LATIN CAPITAL LETTER C WITH CARON" #x010C)
-    ("LATIN SMALL LETTER C WITH CARON" #x010D)
-    ("LATIN CAPITAL LETTER D WITH CARON" #x010E)
-    ("LATIN SMALL LETTER D WITH CARON" #x010F)
-    ("LATIN CAPITAL LETTER D WITH STROKE" #x0110)
-    ("LATIN SMALL LETTER D WITH STROKE" #x0111)
-    ("LATIN CAPITAL LETTER E WITH MACRON" #x0112)
-    ("LATIN SMALL LETTER E WITH MACRON" #x0113)
-    ("LATIN CAPITAL LETTER E WITH BREVE" #x0114)
-    ("LATIN SMALL LETTER E WITH BREVE" #x0115)
-    ("LATIN CAPITAL LETTER E WITH DOT ABOVE" #x0116)
-    ("LATIN SMALL LETTER E WITH DOT ABOVE" #x0117)
-    ("LATIN CAPITAL LETTER E WITH OGONEK" #x0118)
-    ("LATIN SMALL LETTER E WITH OGONEK" #x0119)
-    ("LATIN CAPITAL LETTER E WITH CARON" #x011A)
-    ("LATIN SMALL LETTER E WITH CARON" #x011B)
-    ("LATIN CAPITAL LETTER G WITH CIRCUMFLEX" #x011C)
-    ("LATIN SMALL LETTER G WITH CIRCUMFLEX" #x011D)
-    ("LATIN CAPITAL LETTER G WITH BREVE" #x011E)
-    ("LATIN SMALL LETTER G WITH BREVE" #x011F)
-    ("LATIN CAPITAL LETTER G WITH DOT ABOVE" #x0120)
-    ("LATIN SMALL LETTER G WITH DOT ABOVE" #x0121)
-    ("LATIN CAPITAL LETTER G WITH CEDILLA" #x0122)
-    ("LATIN SMALL LETTER G WITH CEDILLA" #x0123)
-    ("LATIN CAPITAL LETTER H WITH CIRCUMFLEX" #x0124)
-    ("LATIN SMALL LETTER H WITH CIRCUMFLEX" #x0125)
-    ("LATIN CAPITAL LETTER H WITH STROKE" #x0126)
-    ("LATIN SMALL LETTER H WITH STROKE" #x0127)
-    ("LATIN CAPITAL LETTER I WITH TILDE" #x0128)
-    ("LATIN SMALL LETTER I WITH TILDE" #x0129)
-    ("LATIN CAPITAL LETTER I WITH MACRON" #x012A)
-    ("LATIN SMALL LETTER I WITH MACRON" #x012B)
-    ("LATIN CAPITAL LETTER I WITH BREVE" #x012C)
-    ("LATIN SMALL LETTER I WITH BREVE" #x012D)
-    ("LATIN CAPITAL LETTER I WITH OGONEK" #x012E)
-    ("LATIN SMALL LETTER I WITH OGONEK" #x012F)
-    ("LATIN CAPITAL LETTER I WITH DOT ABOVE" #x0130)
-    ("LATIN SMALL LETTER DOTLESS I" #x0131)
-    ("LATIN CAPITAL LIGATURE IJ" #x0132)
-    ("LATIN SMALL LIGATURE IJ" #x0133)
-    ("LATIN CAPITAL LETTER J WITH CIRCUMFLEX" #x0134)
-    ("LATIN SMALL LETTER J WITH CIRCUMFLEX" #x0135)
-    ("LATIN CAPITAL LETTER K WITH CEDILLA" #x0136)
-    ("LATIN SMALL LETTER K WITH CEDILLA" #x0137)
-    ("LATIN SMALL LETTER KRA" #x0138)
-    ("LATIN CAPITAL LETTER L WITH ACUTE" #x0139)
-    ("LATIN SMALL LETTER L WITH ACUTE" #x013A)
-    ("LATIN CAPITAL LETTER L WITH CEDILLA" #x013B)
-    ("LATIN SMALL LETTER L WITH CEDILLA" #x013C)
-    ("LATIN CAPITAL LETTER L WITH CARON" #x013D)
-    ("LATIN SMALL LETTER L WITH CARON" #x013E)
-    ("LATIN CAPITAL LETTER L WITH MIDDLE DOT" #x013F)
-    ("LATIN SMALL LETTER L WITH MIDDLE DOT" #x0140)
-    ("LATIN CAPITAL LETTER L WITH STROKE" #x0141)
-    ("LATIN SMALL LETTER L WITH STROKE" #x0142)
-    ("LATIN CAPITAL LETTER N WITH ACUTE" #x0143)
-    ("LATIN SMALL LETTER N WITH ACUTE" #x0144)
-    ("LATIN CAPITAL LETTER N WITH CEDILLA" #x0145)
-    ("LATIN SMALL LETTER N WITH CEDILLA" #x0146)
-    ("LATIN CAPITAL LETTER N WITH CARON" #x0147)
-    ("LATIN SMALL LETTER N WITH CARON" #x0148)
-    ("LATIN SMALL LETTER N PRECEDED BY APOSTROPHE" #x0149)
-    ("LATIN CAPITAL LETTER ENG" #x014A)
-    ("LATIN SMALL LETTER ENG" #x014B)
-    ("LATIN CAPITAL LETTER O WITH MACRON" #x014C)
-    ("LATIN SMALL LETTER O WITH MACRON" #x014D)
-    ("LATIN CAPITAL LETTER O WITH BREVE" #x014E)
-    ("LATIN SMALL LETTER O WITH BREVE" #x014F)
-    ("LATIN CAPITAL LETTER O WITH DOUBLE ACUTE" #x0150)
-    ("LATIN SMALL LETTER O WITH DOUBLE ACUTE" #x0151)
-    ("LATIN CAPITAL LIGATURE OE" #x0152)
-    ("LATIN SMALL LIGATURE OE" #x0153)
-    ("LATIN CAPITAL LETTER R WITH ACUTE" #x0154)
-    ("LATIN SMALL LETTER R WITH ACUTE" #x0155)
-    ("LATIN CAPITAL LETTER R WITH CEDILLA" #x0156)
-    ("LATIN SMALL LETTER R WITH CEDILLA" #x0157)
-    ("LATIN CAPITAL LETTER R WITH CARON" #x0158)
-    ("LATIN SMALL LETTER R WITH CARON" #x0159)
-    ("LATIN CAPITAL LETTER S WITH ACUTE" #x015A)
-    ("LATIN SMALL LETTER S WITH ACUTE" #x015B)
-    ("LATIN CAPITAL LETTER S WITH CIRCUMFLEX" #x015C)
-    ("LATIN SMALL LETTER S WITH CIRCUMFLEX" #x015D)
-    ("LATIN CAPITAL LETTER S WITH CEDILLA" #x015E)
-    ("LATIN SMALL LETTER S WITH CEDILLA" #x015F)
-    ("LATIN CAPITAL LETTER S WITH CARON" #x0160)
-    ("LATIN SMALL LETTER S WITH CARON" #x0161)
-    ("LATIN CAPITAL LETTER T WITH CEDILLA" #x0162)
-    ("LATIN SMALL LETTER T WITH CEDILLA" #x0163)
-    ("LATIN CAPITAL LETTER T WITH CARON" #x0164)
-    ("LATIN SMALL LETTER T WITH CARON" #x0165)
-    ("LATIN CAPITAL LETTER T WITH STROKE" #x0166)
-    ("LATIN SMALL LETTER T WITH STROKE" #x0167)
-    ("LATIN CAPITAL LETTER U WITH TILDE" #x0168)
-    ("LATIN SMALL LETTER U WITH TILDE" #x0169)
-    ("LATIN CAPITAL LETTER U WITH MACRON" #x016A)
-    ("LATIN SMALL LETTER U WITH MACRON" #x016B)
-    ("LATIN CAPITAL LETTER U WITH BREVE" #x016C)
-    ("LATIN SMALL LETTER U WITH BREVE" #x016D)
-    ("LATIN CAPITAL LETTER U WITH RING ABOVE" #x016E)
-    ("LATIN SMALL LETTER U WITH RING ABOVE" #x016F)
-    ("LATIN CAPITAL LETTER U WITH DOUBLE ACUTE" #x0170)
-    ("LATIN SMALL LETTER U WITH DOUBLE ACUTE" #x0171)
-    ("LATIN CAPITAL LETTER U WITH OGONEK" #x0172)
-    ("LATIN SMALL LETTER U WITH OGONEK" #x0173)
-    ("LATIN CAPITAL LETTER W WITH CIRCUMFLEX" #x0174)
-    ("LATIN SMALL LETTER W WITH CIRCUMFLEX" #x0175)
-    ("LATIN CAPITAL LETTER Y WITH CIRCUMFLEX" #x0176)
-    ("LATIN SMALL LETTER Y WITH CIRCUMFLEX" #x0177)
-    ("LATIN CAPITAL LETTER Y WITH DIAERESIS" #x0178)
-    ("LATIN CAPITAL LETTER Z WITH ACUTE" #x0179)
-    ("LATIN SMALL LETTER Z WITH ACUTE" #x017A)
-    ("LATIN CAPITAL LETTER Z WITH DOT ABOVE" #x017B)
-    ("LATIN SMALL LETTER Z WITH DOT ABOVE" #x017C)
-    ("LATIN CAPITAL LETTER Z WITH CARON" #x017D)
-    ("LATIN SMALL LETTER Z WITH CARON" #x017E)
-    ("LATIN SMALL LETTER LONG S" #x017F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00180-0024F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00180-0024F.el
deleted file mode 100644
index 6a6a7ff3c1..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00180-0024F.el
+++ /dev/null
@@ -1,181 +0,0 @@
-(nxml-define-char-name-set 'latin-extended-b
-  '(("LATIN SMALL LETTER B WITH STROKE" #x0180)
-    ("LATIN CAPITAL LETTER B WITH HOOK" #x0181)
-    ("LATIN CAPITAL LETTER B WITH TOPBAR" #x0182)
-    ("LATIN SMALL LETTER B WITH TOPBAR" #x0183)
-    ("LATIN CAPITAL LETTER TONE SIX" #x0184)
-    ("LATIN SMALL LETTER TONE SIX" #x0185)
-    ("LATIN CAPITAL LETTER OPEN O" #x0186)
-    ("LATIN CAPITAL LETTER C WITH HOOK" #x0187)
-    ("LATIN SMALL LETTER C WITH HOOK" #x0188)
-    ("LATIN CAPITAL LETTER AFRICAN D" #x0189)
-    ("LATIN CAPITAL LETTER D WITH HOOK" #x018A)
-    ("LATIN CAPITAL LETTER D WITH TOPBAR" #x018B)
-    ("LATIN SMALL LETTER D WITH TOPBAR" #x018C)
-    ("LATIN SMALL LETTER TURNED DELTA" #x018D)
-    ("LATIN CAPITAL LETTER REVERSED E" #x018E)
-    ("LATIN CAPITAL LETTER SCHWA" #x018F)
-    ("LATIN CAPITAL LETTER OPEN E" #x0190)
-    ("LATIN CAPITAL LETTER F WITH HOOK" #x0191)
-    ("LATIN SMALL LETTER F WITH HOOK" #x0192)
-    ("LATIN CAPITAL LETTER G WITH HOOK" #x0193)
-    ("LATIN CAPITAL LETTER GAMMA" #x0194)
-    ("LATIN SMALL LETTER HV" #x0195)
-    ("LATIN CAPITAL LETTER IOTA" #x0196)
-    ("LATIN CAPITAL LETTER I WITH STROKE" #x0197)
-    ("LATIN CAPITAL LETTER K WITH HOOK" #x0198)
-    ("LATIN SMALL LETTER K WITH HOOK" #x0199)
-    ("LATIN SMALL LETTER L WITH BAR" #x019A)
-    ("LATIN SMALL LETTER LAMBDA WITH STROKE" #x019B)
-    ("LATIN CAPITAL LETTER TURNED M" #x019C)
-    ("LATIN CAPITAL LETTER N WITH LEFT HOOK" #x019D)
-    ("LATIN SMALL LETTER N WITH LONG RIGHT LEG" #x019E)
-    ("LATIN CAPITAL LETTER O WITH MIDDLE TILDE" #x019F)
-    ("LATIN CAPITAL LETTER O WITH HORN" #x01A0)
-    ("LATIN SMALL LETTER O WITH HORN" #x01A1)
-    ("LATIN CAPITAL LETTER OI" #x01A2)
-    ("LATIN SMALL LETTER OI" #x01A3)
-    ("LATIN CAPITAL LETTER P WITH HOOK" #x01A4)
-    ("LATIN SMALL LETTER P WITH HOOK" #x01A5)
-    ("LATIN LETTER YR" #x01A6)
-    ("LATIN CAPITAL LETTER TONE TWO" #x01A7)
-    ("LATIN SMALL LETTER TONE TWO" #x01A8)
-    ("LATIN CAPITAL LETTER ESH" #x01A9)
-    ("LATIN LETTER REVERSED ESH LOOP" #x01AA)
-    ("LATIN SMALL LETTER T WITH PALATAL HOOK" #x01AB)
-    ("LATIN CAPITAL LETTER T WITH HOOK" #x01AC)
-    ("LATIN SMALL LETTER T WITH HOOK" #x01AD)
-    ("LATIN CAPITAL LETTER T WITH RETROFLEX HOOK" #x01AE)
-    ("LATIN CAPITAL LETTER U WITH HORN" #x01AF)
-    ("LATIN SMALL LETTER U WITH HORN" #x01B0)
-    ("LATIN CAPITAL LETTER UPSILON" #x01B1)
-    ("LATIN CAPITAL LETTER V WITH HOOK" #x01B2)
-    ("LATIN CAPITAL LETTER Y WITH HOOK" #x01B3)
-    ("LATIN SMALL LETTER Y WITH HOOK" #x01B4)
-    ("LATIN CAPITAL LETTER Z WITH STROKE" #x01B5)
-    ("LATIN SMALL LETTER Z WITH STROKE" #x01B6)
-    ("LATIN CAPITAL LETTER EZH" #x01B7)
-    ("LATIN CAPITAL LETTER EZH REVERSED" #x01B8)
-    ("LATIN SMALL LETTER EZH REVERSED" #x01B9)
-    ("LATIN SMALL LETTER EZH WITH TAIL" #x01BA)
-    ("LATIN LETTER TWO WITH STROKE" #x01BB)
-    ("LATIN CAPITAL LETTER TONE FIVE" #x01BC)
-    ("LATIN SMALL LETTER TONE FIVE" #x01BD)
-    ("LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE" #x01BE)
-    ("LATIN LETTER WYNN" #x01BF)
-    ("LATIN LETTER DENTAL CLICK" #x01C0)
-    ("LATIN LETTER LATERAL CLICK" #x01C1)
-    ("LATIN LETTER ALVEOLAR CLICK" #x01C2)
-    ("LATIN LETTER RETROFLEX CLICK" #x01C3)
-    ("LATIN CAPITAL LETTER DZ WITH CARON" #x01C4)
-    ("LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON" #x01C5)
-    ("LATIN SMALL LETTER DZ WITH CARON" #x01C6)
-    ("LATIN CAPITAL LETTER LJ" #x01C7)
-    ("LATIN CAPITAL LETTER L WITH SMALL LETTER J" #x01C8)
-    ("LATIN SMALL LETTER LJ" #x01C9)
-    ("LATIN CAPITAL LETTER NJ" #x01CA)
-    ("LATIN CAPITAL LETTER N WITH SMALL LETTER J" #x01CB)
-    ("LATIN SMALL LETTER NJ" #x01CC)
-    ("LATIN CAPITAL LETTER A WITH CARON" #x01CD)
-    ("LATIN SMALL LETTER A WITH CARON" #x01CE)
-    ("LATIN CAPITAL LETTER I WITH CARON" #x01CF)
-    ("LATIN SMALL LETTER I WITH CARON" #x01D0)
-    ("LATIN CAPITAL LETTER O WITH CARON" #x01D1)
-    ("LATIN SMALL LETTER O WITH CARON" #x01D2)
-    ("LATIN CAPITAL LETTER U WITH CARON" #x01D3)
-    ("LATIN SMALL LETTER U WITH CARON" #x01D4)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON" #x01D5)
-    ("LATIN SMALL LETTER U WITH DIAERESIS AND MACRON" #x01D6)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE" #x01D7)
-    ("LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE" #x01D8)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON" #x01D9)
-    ("LATIN SMALL LETTER U WITH DIAERESIS AND CARON" #x01DA)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE" #x01DB)
-    ("LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE" #x01DC)
-    ("LATIN SMALL LETTER TURNED E" #x01DD)
-    ("LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON" #x01DE)
-    ("LATIN SMALL LETTER A WITH DIAERESIS AND MACRON" #x01DF)
-    ("LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON" #x01E0)
-    ("LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON" #x01E1)
-    ("LATIN CAPITAL LETTER AE WITH MACRON" #x01E2)
-    ("LATIN SMALL LETTER AE WITH MACRON" #x01E3)
-    ("LATIN CAPITAL LETTER G WITH STROKE" #x01E4)
-    ("LATIN SMALL LETTER G WITH STROKE" #x01E5)
-    ("LATIN CAPITAL LETTER G WITH CARON" #x01E6)
-    ("LATIN SMALL LETTER G WITH CARON" #x01E7)
-    ("LATIN CAPITAL LETTER K WITH CARON" #x01E8)
-    ("LATIN SMALL LETTER K WITH CARON" #x01E9)
-    ("LATIN CAPITAL LETTER O WITH OGONEK" #x01EA)
-    ("LATIN SMALL LETTER O WITH OGONEK" #x01EB)
-    ("LATIN CAPITAL LETTER O WITH OGONEK AND MACRON" #x01EC)
-    ("LATIN SMALL LETTER O WITH OGONEK AND MACRON" #x01ED)
-    ("LATIN CAPITAL LETTER EZH WITH CARON" #x01EE)
-    ("LATIN SMALL LETTER EZH WITH CARON" #x01EF)
-    ("LATIN SMALL LETTER J WITH CARON" #x01F0)
-    ("LATIN CAPITAL LETTER DZ" #x01F1)
-    ("LATIN CAPITAL LETTER D WITH SMALL LETTER Z" #x01F2)
-    ("LATIN SMALL LETTER DZ" #x01F3)
-    ("LATIN CAPITAL LETTER G WITH ACUTE" #x01F4)
-    ("LATIN SMALL LETTER G WITH ACUTE" #x01F5)
-    ("LATIN CAPITAL LETTER HWAIR" #x01F6)
-    ("LATIN CAPITAL LETTER WYNN" #x01F7)
-    ("LATIN CAPITAL LETTER N WITH GRAVE" #x01F8)
-    ("LATIN SMALL LETTER N WITH GRAVE" #x01F9)
-    ("LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE" #x01FA)
-    ("LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE" #x01FB)
-    ("LATIN CAPITAL LETTER AE WITH ACUTE" #x01FC)
-    ("LATIN SMALL LETTER AE WITH ACUTE" #x01FD)
-    ("LATIN CAPITAL LETTER O WITH STROKE AND ACUTE" #x01FE)
-    ("LATIN SMALL LETTER O WITH STROKE AND ACUTE" #x01FF)
-    ("LATIN CAPITAL LETTER A WITH DOUBLE GRAVE" #x0200)
-    ("LATIN SMALL LETTER A WITH DOUBLE GRAVE" #x0201)
-    ("LATIN CAPITAL LETTER A WITH INVERTED BREVE" #x0202)
-    ("LATIN SMALL LETTER A WITH INVERTED BREVE" #x0203)
-    ("LATIN CAPITAL LETTER E WITH DOUBLE GRAVE" #x0204)
-    ("LATIN SMALL LETTER E WITH DOUBLE GRAVE" #x0205)
-    ("LATIN CAPITAL LETTER E WITH INVERTED BREVE" #x0206)
-    ("LATIN SMALL LETTER E WITH INVERTED BREVE" #x0207)
-    ("LATIN CAPITAL LETTER I WITH DOUBLE GRAVE" #x0208)
-    ("LATIN SMALL LETTER I WITH DOUBLE GRAVE" #x0209)
-    ("LATIN CAPITAL LETTER I WITH INVERTED BREVE" #x020A)
-    ("LATIN SMALL LETTER I WITH INVERTED BREVE" #x020B)
-    ("LATIN CAPITAL LETTER O WITH DOUBLE GRAVE" #x020C)
-    ("LATIN SMALL LETTER O WITH DOUBLE GRAVE" #x020D)
-    ("LATIN CAPITAL LETTER O WITH INVERTED BREVE" #x020E)
-    ("LATIN SMALL LETTER O WITH INVERTED BREVE" #x020F)
-    ("LATIN CAPITAL LETTER R WITH DOUBLE GRAVE" #x0210)
-    ("LATIN SMALL LETTER R WITH DOUBLE GRAVE" #x0211)
-    ("LATIN CAPITAL LETTER R WITH INVERTED BREVE" #x0212)
-    ("LATIN SMALL LETTER R WITH INVERTED BREVE" #x0213)
-    ("LATIN CAPITAL LETTER U WITH DOUBLE GRAVE" #x0214)
-    ("LATIN SMALL LETTER U WITH DOUBLE GRAVE" #x0215)
-    ("LATIN CAPITAL LETTER U WITH INVERTED BREVE" #x0216)
-    ("LATIN SMALL LETTER U WITH INVERTED BREVE" #x0217)
-    ("LATIN CAPITAL LETTER S WITH COMMA BELOW" #x0218)
-    ("LATIN SMALL LETTER S WITH COMMA BELOW" #x0219)
-    ("LATIN CAPITAL LETTER T WITH COMMA BELOW" #x021A)
-    ("LATIN SMALL LETTER T WITH COMMA BELOW" #x021B)
-    ("LATIN CAPITAL LETTER YOGH" #x021C)
-    ("LATIN SMALL LETTER YOGH" #x021D)
-    ("LATIN CAPITAL LETTER H WITH CARON" #x021E)
-    ("LATIN SMALL LETTER H WITH CARON" #x021F)
-    ("LATIN CAPITAL LETTER N WITH LONG RIGHT LEG" #x0220)
-    ("LATIN CAPITAL LETTER OU" #x0222)
-    ("LATIN SMALL LETTER OU" #x0223)
-    ("LATIN CAPITAL LETTER Z WITH HOOK" #x0224)
-    ("LATIN SMALL LETTER Z WITH HOOK" #x0225)
-    ("LATIN CAPITAL LETTER A WITH DOT ABOVE" #x0226)
-    ("LATIN SMALL LETTER A WITH DOT ABOVE" #x0227)
-    ("LATIN CAPITAL LETTER E WITH CEDILLA" #x0228)
-    ("LATIN SMALL LETTER E WITH CEDILLA" #x0229)
-    ("LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON" #x022A)
-    ("LATIN SMALL LETTER O WITH DIAERESIS AND MACRON" #x022B)
-    ("LATIN CAPITAL LETTER O WITH TILDE AND MACRON" #x022C)
-    ("LATIN SMALL LETTER O WITH TILDE AND MACRON" #x022D)
-    ("LATIN CAPITAL LETTER O WITH DOT ABOVE" #x022E)
-    ("LATIN SMALL LETTER O WITH DOT ABOVE" #x022F)
-    ("LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON" #x0230)
-    ("LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON" #x0231)
-    ("LATIN CAPITAL LETTER Y WITH MACRON" #x0232)
-    ("LATIN SMALL LETTER Y WITH MACRON" #x0233)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00250-002AF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00250-002AF.el
deleted file mode 100644
index 84814214f5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00250-002AF.el
+++ /dev/null
@@ -1,96 +0,0 @@
-(nxml-define-char-name-set 'ipa-extensions
-  '(("LATIN SMALL LETTER TURNED A" #x0250)
-    ("LATIN SMALL LETTER ALPHA" #x0251)
-    ("LATIN SMALL LETTER TURNED ALPHA" #x0252)
-    ("LATIN SMALL LETTER B WITH HOOK" #x0253)
-    ("LATIN SMALL LETTER OPEN O" #x0254)
-    ("LATIN SMALL LETTER C WITH CURL" #x0255)
-    ("LATIN SMALL LETTER D WITH TAIL" #x0256)
-    ("LATIN SMALL LETTER D WITH HOOK" #x0257)
-    ("LATIN SMALL LETTER REVERSED E" #x0258)
-    ("LATIN SMALL LETTER SCHWA" #x0259)
-    ("LATIN SMALL LETTER SCHWA WITH HOOK" #x025A)
-    ("LATIN SMALL LETTER OPEN E" #x025B)
-    ("LATIN SMALL LETTER REVERSED OPEN E" #x025C)
-    ("LATIN SMALL LETTER REVERSED OPEN E WITH HOOK" #x025D)
-    ("LATIN SMALL LETTER CLOSED REVERSED OPEN E" #x025E)
-    ("LATIN SMALL LETTER DOTLESS J WITH STROKE" #x025F)
-    ("LATIN SMALL LETTER G WITH HOOK" #x0260)
-    ("LATIN SMALL LETTER SCRIPT G" #x0261)
-    ("LATIN LETTER SMALL CAPITAL G" #x0262)
-    ("LATIN SMALL LETTER GAMMA" #x0263)
-    ("LATIN SMALL LETTER RAMS HORN" #x0264)
-    ("LATIN SMALL LETTER TURNED H" #x0265)
-    ("LATIN SMALL LETTER H WITH HOOK" #x0266)
-    ("LATIN SMALL LETTER HENG WITH HOOK" #x0267)
-    ("LATIN SMALL LETTER I WITH STROKE" #x0268)
-    ("LATIN SMALL LETTER IOTA" #x0269)
-    ("LATIN LETTER SMALL CAPITAL I" #x026A)
-    ("LATIN SMALL LETTER L WITH MIDDLE TILDE" #x026B)
-    ("LATIN SMALL LETTER L WITH BELT" #x026C)
-    ("LATIN SMALL LETTER L WITH RETROFLEX HOOK" #x026D)
-    ("LATIN SMALL LETTER LEZH" #x026E)
-    ("LATIN SMALL LETTER TURNED M" #x026F)
-    ("LATIN SMALL LETTER TURNED M WITH LONG LEG" #x0270)
-    ("LATIN SMALL LETTER M WITH HOOK" #x0271)
-    ("LATIN SMALL LETTER N WITH LEFT HOOK" #x0272)
-    ("LATIN SMALL LETTER N WITH RETROFLEX HOOK" #x0273)
-    ("LATIN LETTER SMALL CAPITAL N" #x0274)
-    ("LATIN SMALL LETTER BARRED O" #x0275)
-    ("LATIN LETTER SMALL CAPITAL OE" #x0276)
-    ("LATIN SMALL LETTER CLOSED OMEGA" #x0277)
-    ("LATIN SMALL LETTER PHI" #x0278)
-    ("LATIN SMALL LETTER TURNED R" #x0279)
-    ("LATIN SMALL LETTER TURNED R WITH LONG LEG" #x027A)
-    ("LATIN SMALL LETTER TURNED R WITH HOOK" #x027B)
-    ("LATIN SMALL LETTER R WITH LONG LEG" #x027C)
-    ("LATIN SMALL LETTER R WITH TAIL" #x027D)
-    ("LATIN SMALL LETTER R WITH FISHHOOK" #x027E)
-    ("LATIN SMALL LETTER REVERSED R WITH FISHHOOK" #x027F)
-    ("LATIN LETTER SMALL CAPITAL R" #x0280)
-    ("LATIN LETTER SMALL CAPITAL INVERTED R" #x0281)
-    ("LATIN SMALL LETTER S WITH HOOK" #x0282)
-    ("LATIN SMALL LETTER ESH" #x0283)
-    ("LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK" #x0284)
-    ("LATIN SMALL LETTER SQUAT REVERSED ESH" #x0285)
-    ("LATIN SMALL LETTER ESH WITH CURL" #x0286)
-    ("LATIN SMALL LETTER TURNED T" #x0287)
-    ("LATIN SMALL LETTER T WITH RETROFLEX HOOK" #x0288)
-    ("LATIN SMALL LETTER U BAR" #x0289)
-    ("LATIN SMALL LETTER UPSILON" #x028A)
-    ("LATIN SMALL LETTER V WITH HOOK" #x028B)
-    ("LATIN SMALL LETTER TURNED V" #x028C)
-    ("LATIN SMALL LETTER TURNED W" #x028D)
-    ("LATIN SMALL LETTER TURNED Y" #x028E)
-    ("LATIN LETTER SMALL CAPITAL Y" #x028F)
-    ("LATIN SMALL LETTER Z WITH RETROFLEX HOOK" #x0290)
-    ("LATIN SMALL LETTER Z WITH CURL" #x0291)
-    ("LATIN SMALL LETTER EZH" #x0292)
-    ("LATIN SMALL LETTER EZH WITH CURL" #x0293)
-    ("LATIN LETTER GLOTTAL STOP" #x0294)
-    ("LATIN LETTER PHARYNGEAL VOICED FRICATIVE" #x0295)
-    ("LATIN LETTER INVERTED GLOTTAL STOP" #x0296)
-    ("LATIN LETTER STRETCHED C" #x0297)
-    ("LATIN LETTER BILABIAL CLICK" #x0298)
-    ("LATIN LETTER SMALL CAPITAL B" #x0299)
-    ("LATIN SMALL LETTER CLOSED OPEN E" #x029A)
-    ("LATIN LETTER SMALL CAPITAL G WITH HOOK" #x029B)
-    ("LATIN LETTER SMALL CAPITAL H" #x029C)
-    ("LATIN SMALL LETTER J WITH CROSSED-TAIL" #x029D)
-    ("LATIN SMALL LETTER TURNED K" #x029E)
-    ("LATIN LETTER SMALL CAPITAL L" #x029F)
-    ("LATIN SMALL LETTER Q WITH HOOK" #x02A0)
-    ("LATIN LETTER GLOTTAL STOP WITH STROKE" #x02A1)
-    ("LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE" #x02A2)
-    ("LATIN SMALL LETTER DZ DIGRAPH" #x02A3)
-    ("LATIN SMALL LETTER DEZH DIGRAPH" #x02A4)
-    ("LATIN SMALL LETTER DZ DIGRAPH WITH CURL" #x02A5)
-    ("LATIN SMALL LETTER TS DIGRAPH" #x02A6)
-    ("LATIN SMALL LETTER TESH DIGRAPH" #x02A7)
-    ("LATIN SMALL LETTER TC DIGRAPH WITH CURL" #x02A8)
-    ("LATIN SMALL LETTER FENG DIGRAPH" #x02A9)
-    ("LATIN SMALL LETTER LS DIGRAPH" #x02AA)
-    ("LATIN SMALL LETTER LZ DIGRAPH" #x02AB)
-    ("LATIN LETTER BILABIAL PERCUSSIVE" #x02AC)
-    ("LATIN LETTER BIDENTAL PERCUSSIVE" #x02AD)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/002B0-002FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/002B0-002FF.el
deleted file mode 100644
index 4f74699d76..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/002B0-002FF.el
+++ /dev/null
@@ -1,65 +0,0 @@
-(nxml-define-char-name-set 'spacing-modifier-letters
-  '(("MODIFIER LETTER SMALL H" #x02B0)
-    ("MODIFIER LETTER SMALL H WITH HOOK" #x02B1)
-    ("MODIFIER LETTER SMALL J" #x02B2)
-    ("MODIFIER LETTER SMALL R" #x02B3)
-    ("MODIFIER LETTER SMALL TURNED R" #x02B4)
-    ("MODIFIER LETTER SMALL TURNED R WITH HOOK" #x02B5)
-    ("MODIFIER LETTER SMALL CAPITAL INVERTED R" #x02B6)
-    ("MODIFIER LETTER SMALL W" #x02B7)
-    ("MODIFIER LETTER SMALL Y" #x02B8)
-    ("MODIFIER LETTER PRIME" #x02B9)
-    ("MODIFIER LETTER DOUBLE PRIME" #x02BA)
-    ("MODIFIER LETTER TURNED COMMA" #x02BB)
-    ("MODIFIER LETTER APOSTROPHE" #x02BC)
-    ("MODIFIER LETTER REVERSED COMMA" #x02BD)
-    ("MODIFIER LETTER RIGHT HALF RING" #x02BE)
-    ("MODIFIER LETTER LEFT HALF RING" #x02BF)
-    ("MODIFIER LETTER GLOTTAL STOP" #x02C0)
-    ("MODIFIER LETTER REVERSED GLOTTAL STOP" #x02C1)
-    ("MODIFIER LETTER LEFT ARROWHEAD" #x02C2)
-    ("MODIFIER LETTER RIGHT ARROWHEAD" #x02C3)
-    ("MODIFIER LETTER UP ARROWHEAD" #x02C4)
-    ("MODIFIER LETTER DOWN ARROWHEAD" #x02C5)
-    ("MODIFIER LETTER CIRCUMFLEX ACCENT" #x02C6)
-    ("CARON" #x02C7)
-    ("MODIFIER LETTER VERTICAL LINE" #x02C8)
-    ("MODIFIER LETTER MACRON" #x02C9)
-    ("MODIFIER LETTER ACUTE ACCENT" #x02CA)
-    ("MODIFIER LETTER GRAVE ACCENT" #x02CB)
-    ("MODIFIER LETTER LOW VERTICAL LINE" #x02CC)
-    ("MODIFIER LETTER LOW MACRON" #x02CD)
-    ("MODIFIER LETTER LOW GRAVE ACCENT" #x02CE)
-    ("MODIFIER LETTER LOW ACUTE ACCENT" #x02CF)
-    ("MODIFIER LETTER TRIANGULAR COLON" #x02D0)
-    ("MODIFIER LETTER HALF TRIANGULAR COLON" #x02D1)
-    ("MODIFIER LETTER CENTRED RIGHT HALF RING" #x02D2)
-    ("MODIFIER LETTER CENTRED LEFT HALF RING" #x02D3)
-    ("MODIFIER LETTER UP TACK" #x02D4)
-    ("MODIFIER LETTER DOWN TACK" #x02D5)
-    ("MODIFIER LETTER PLUS SIGN" #x02D6)
-    ("MODIFIER LETTER MINUS SIGN" #x02D7)
-    ("BREVE" #x02D8)
-    ("DOT ABOVE" #x02D9)
-    ("RING ABOVE" #x02DA)
-    ("OGONEK" #x02DB)
-    ("SMALL TILDE" #x02DC)
-    ("DOUBLE ACUTE ACCENT" #x02DD)
-    ("MODIFIER LETTER RHOTIC HOOK" #x02DE)
-    ("MODIFIER LETTER CROSS ACCENT" #x02DF)
-    ("MODIFIER LETTER SMALL GAMMA" #x02E0)
-    ("MODIFIER LETTER SMALL L" #x02E1)
-    ("MODIFIER LETTER SMALL S" #x02E2)
-    ("MODIFIER LETTER SMALL X" #x02E3)
-    ("MODIFIER LETTER SMALL REVERSED GLOTTAL STOP" #x02E4)
-    ("MODIFIER LETTER EXTRA-HIGH TONE BAR" #x02E5)
-    ("MODIFIER LETTER HIGH TONE BAR" #x02E6)
-    ("MODIFIER LETTER MID TONE BAR" #x02E7)
-    ("MODIFIER LETTER LOW TONE BAR" #x02E8)
-    ("MODIFIER LETTER EXTRA-LOW TONE BAR" #x02E9)
-    ("MODIFIER LETTER YIN DEPARTING TONE MARK" #x02EA)
-    ("MODIFIER LETTER YANG DEPARTING TONE MARK" #x02EB)
-    ("MODIFIER LETTER VOICING" #x02EC)
-    ("MODIFIER LETTER UNASPIRATED" #x02ED)
-    ("MODIFIER LETTER DOUBLE APOSTROPHE" #x02EE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00300-0036F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00300-0036F.el
deleted file mode 100644
index 33e9627d92..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00300-0036F.el
+++ /dev/null
@@ -1,98 +0,0 @@
-(nxml-define-char-name-set 'combining-diacritical-marks
-  '(("COMBINING GRAVE ACCENT" #x0300)
-    ("COMBINING ACUTE ACCENT" #x0301)
-    ("COMBINING CIRCUMFLEX ACCENT" #x0302)
-    ("COMBINING TILDE" #x0303)
-    ("COMBINING MACRON" #x0304)
-    ("COMBINING OVERLINE" #x0305)
-    ("COMBINING BREVE" #x0306)
-    ("COMBINING DOT ABOVE" #x0307)
-    ("COMBINING DIAERESIS" #x0308)
-    ("COMBINING HOOK ABOVE" #x0309)
-    ("COMBINING RING ABOVE" #x030A)
-    ("COMBINING DOUBLE ACUTE ACCENT" #x030B)
-    ("COMBINING CARON" #x030C)
-    ("COMBINING VERTICAL LINE ABOVE" #x030D)
-    ("COMBINING DOUBLE VERTICAL LINE ABOVE" #x030E)
-    ("COMBINING DOUBLE GRAVE ACCENT" #x030F)
-    ("COMBINING CANDRABINDU" #x0310)
-    ("COMBINING INVERTED BREVE" #x0311)
-    ("COMBINING TURNED COMMA ABOVE" #x0312)
-    ("COMBINING COMMA ABOVE" #x0313)
-    ("COMBINING REVERSED COMMA ABOVE" #x0314)
-    ("COMBINING COMMA ABOVE RIGHT" #x0315)
-    ("COMBINING GRAVE ACCENT BELOW" #x0316)
-    ("COMBINING ACUTE ACCENT BELOW" #x0317)
-    ("COMBINING LEFT TACK BELOW" #x0318)
-    ("COMBINING RIGHT TACK BELOW" #x0319)
-    ("COMBINING LEFT ANGLE ABOVE" #x031A)
-    ("COMBINING HORN" #x031B)
-    ("COMBINING LEFT HALF RING BELOW" #x031C)
-    ("COMBINING UP TACK BELOW" #x031D)
-    ("COMBINING DOWN TACK BELOW" #x031E)
-    ("COMBINING PLUS SIGN BELOW" #x031F)
-    ("COMBINING MINUS SIGN BELOW" #x0320)
-    ("COMBINING PALATALIZED HOOK BELOW" #x0321)
-    ("COMBINING RETROFLEX HOOK BELOW" #x0322)
-    ("COMBINING DOT BELOW" #x0323)
-    ("COMBINING DIAERESIS BELOW" #x0324)
-    ("COMBINING RING BELOW" #x0325)
-    ("COMBINING COMMA BELOW" #x0326)
-    ("COMBINING CEDILLA" #x0327)
-    ("COMBINING OGONEK" #x0328)
-    ("COMBINING VERTICAL LINE BELOW" #x0329)
-    ("COMBINING BRIDGE BELOW" #x032A)
-    ("COMBINING INVERTED DOUBLE ARCH BELOW" #x032B)
-    ("COMBINING CARON BELOW" #x032C)
-    ("COMBINING CIRCUMFLEX ACCENT BELOW" #x032D)
-    ("COMBINING BREVE BELOW" #x032E)
-    ("COMBINING INVERTED BREVE BELOW" #x032F)
-    ("COMBINING TILDE BELOW" #x0330)
-    ("COMBINING MACRON BELOW" #x0331)
-    ("COMBINING LOW LINE" #x0332)
-    ("COMBINING DOUBLE LOW LINE" #x0333)
-    ("COMBINING TILDE OVERLAY" #x0334)
-    ("COMBINING SHORT STROKE OVERLAY" #x0335)
-    ("COMBINING LONG STROKE OVERLAY" #x0336)
-    ("COMBINING SHORT SOLIDUS OVERLAY" #x0337)
-    ("COMBINING LONG SOLIDUS OVERLAY" #x0338)
-    ("COMBINING RIGHT HALF RING BELOW" #x0339)
-    ("COMBINING INVERTED BRIDGE BELOW" #x033A)
-    ("COMBINING SQUARE BELOW" #x033B)
-    ("COMBINING SEAGULL BELOW" #x033C)
-    ("COMBINING X ABOVE" #x033D)
-    ("COMBINING VERTICAL TILDE" #x033E)
-    ("COMBINING DOUBLE OVERLINE" #x033F)
-    ("COMBINING GRAVE TONE MARK" #x0340)
-    ("COMBINING ACUTE TONE MARK" #x0341)
-    ("COMBINING GREEK PERISPOMENI" #x0342)
-    ("COMBINING GREEK KORONIS" #x0343)
-    ("COMBINING GREEK DIALYTIKA TONOS" #x0344)
-    ("COMBINING GREEK YPOGEGRAMMENI" #x0345)
-    ("COMBINING BRIDGE ABOVE" #x0346)
-    ("COMBINING EQUALS SIGN BELOW" #x0347)
-    ("COMBINING DOUBLE VERTICAL LINE BELOW" #x0348)
-    ("COMBINING LEFT ANGLE BELOW" #x0349)
-    ("COMBINING NOT TILDE ABOVE" #x034A)
-    ("COMBINING HOMOTHETIC ABOVE" #x034B)
-    ("COMBINING ALMOST EQUAL TO ABOVE" #x034C)
-    ("COMBINING LEFT RIGHT ARROW BELOW" #x034D)
-    ("COMBINING UPWARDS ARROW BELOW" #x034E)
-    ("COMBINING GRAPHEME JOINER" #x034F)
-    ("COMBINING DOUBLE TILDE" #x0360)
-    ("COMBINING DOUBLE INVERTED BREVE" #x0361)
-    ("COMBINING DOUBLE RIGHTWARDS ARROW BELOW" #x0362)
-    ("COMBINING LATIN SMALL LETTER A" #x0363)
-    ("COMBINING LATIN SMALL LETTER E" #x0364)
-    ("COMBINING LATIN SMALL LETTER I" #x0365)
-    ("COMBINING LATIN SMALL LETTER O" #x0366)
-    ("COMBINING LATIN SMALL LETTER U" #x0367)
-    ("COMBINING LATIN SMALL LETTER C" #x0368)
-    ("COMBINING LATIN SMALL LETTER D" #x0369)
-    ("COMBINING LATIN SMALL LETTER H" #x036A)
-    ("COMBINING LATIN SMALL LETTER M" #x036B)
-    ("COMBINING LATIN SMALL LETTER R" #x036C)
-    ("COMBINING LATIN SMALL LETTER T" #x036D)
-    ("COMBINING LATIN SMALL LETTER V" #x036E)
-    ("COMBINING LATIN SMALL LETTER X" #x036F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00370-003FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00370-003FF.el
deleted file mode 100644
index 031b58d877..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00370-003FF.el
+++ /dev/null
@@ -1,117 +0,0 @@
-(nxml-define-char-name-set 'greek-and-coptic
-  '(("GREEK NUMERAL SIGN" #x0374)
-    ("GREEK LOWER NUMERAL SIGN" #x0375)
-    ("GREEK YPOGEGRAMMENI" #x037A)
-    ("GREEK QUESTION MARK" #x037E)
-    ("GREEK TONOS" #x0384)
-    ("GREEK DIALYTIKA TONOS" #x0385)
-    ("GREEK CAPITAL LETTER ALPHA WITH TONOS" #x0386)
-    ("GREEK ANO TELEIA" #x0387)
-    ("GREEK CAPITAL LETTER EPSILON WITH TONOS" #x0388)
-    ("GREEK CAPITAL LETTER ETA WITH TONOS" #x0389)
-    ("GREEK CAPITAL LETTER IOTA WITH TONOS" #x038A)
-    ("GREEK CAPITAL LETTER OMICRON WITH TONOS" #x038C)
-    ("GREEK CAPITAL LETTER UPSILON WITH TONOS" #x038E)
-    ("GREEK CAPITAL LETTER OMEGA WITH TONOS" #x038F)
-    ("GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS" #x0390)
-    ("GREEK CAPITAL LETTER ALPHA" #x0391)
-    ("GREEK CAPITAL LETTER BETA" #x0392)
-    ("GREEK CAPITAL LETTER GAMMA" #x0393)
-    ("GREEK CAPITAL LETTER DELTA" #x0394)
-    ("GREEK CAPITAL LETTER EPSILON" #x0395)
-    ("GREEK CAPITAL LETTER ZETA" #x0396)
-    ("GREEK CAPITAL LETTER ETA" #x0397)
-    ("GREEK CAPITAL LETTER THETA" #x0398)
-    ("GREEK CAPITAL LETTER IOTA" #x0399)
-    ("GREEK CAPITAL LETTER KAPPA" #x039A)
-    ("GREEK CAPITAL LETTER LAMDA" #x039B)
-    ("GREEK CAPITAL LETTER MU" #x039C)
-    ("GREEK CAPITAL LETTER NU" #x039D)
-    ("GREEK CAPITAL LETTER XI" #x039E)
-    ("GREEK CAPITAL LETTER OMICRON" #x039F)
-    ("GREEK CAPITAL LETTER PI" #x03A0)
-    ("GREEK CAPITAL LETTER RHO" #x03A1)
-    ("GREEK CAPITAL LETTER SIGMA" #x03A3)
-    ("GREEK CAPITAL LETTER TAU" #x03A4)
-    ("GREEK CAPITAL LETTER UPSILON" #x03A5)
-    ("GREEK CAPITAL LETTER PHI" #x03A6)
-    ("GREEK CAPITAL LETTER CHI" #x03A7)
-    ("GREEK CAPITAL LETTER PSI" #x03A8)
-    ("GREEK CAPITAL LETTER OMEGA" #x03A9)
-    ("GREEK CAPITAL LETTER IOTA WITH DIALYTIKA" #x03AA)
-    ("GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA" #x03AB)
-    ("GREEK SMALL LETTER ALPHA WITH TONOS" #x03AC)
-    ("GREEK SMALL LETTER EPSILON WITH TONOS" #x03AD)
-    ("GREEK SMALL LETTER ETA WITH TONOS" #x03AE)
-    ("GREEK SMALL LETTER IOTA WITH TONOS" #x03AF)
-    ("GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS" #x03B0)
-    ("GREEK SMALL LETTER ALPHA" #x03B1)
-    ("GREEK SMALL LETTER BETA" #x03B2)
-    ("GREEK SMALL LETTER GAMMA" #x03B3)
-    ("GREEK SMALL LETTER DELTA" #x03B4)
-    ("GREEK SMALL LETTER EPSILON" #x03B5)
-    ("GREEK SMALL LETTER ZETA" #x03B6)
-    ("GREEK SMALL LETTER ETA" #x03B7)
-    ("GREEK SMALL LETTER THETA" #x03B8)
-    ("GREEK SMALL LETTER IOTA" #x03B9)
-    ("GREEK SMALL LETTER KAPPA" #x03BA)
-    ("GREEK SMALL LETTER LAMDA" #x03BB)
-    ("GREEK SMALL LETTER MU" #x03BC)
-    ("GREEK SMALL LETTER NU" #x03BD)
-    ("GREEK SMALL LETTER XI" #x03BE)
-    ("GREEK SMALL LETTER OMICRON" #x03BF)
-    ("GREEK SMALL LETTER PI" #x03C0)
-    ("GREEK SMALL LETTER RHO" #x03C1)
-    ("GREEK SMALL LETTER FINAL SIGMA" #x03C2)
-    ("GREEK SMALL LETTER SIGMA" #x03C3)
-    ("GREEK SMALL LETTER TAU" #x03C4)
-    ("GREEK SMALL LETTER UPSILON" #x03C5)
-    ("GREEK SMALL LETTER PHI" #x03C6)
-    ("GREEK SMALL LETTER CHI" #x03C7)
-    ("GREEK SMALL LETTER PSI" #x03C8)
-    ("GREEK SMALL LETTER OMEGA" #x03C9)
-    ("GREEK SMALL LETTER IOTA WITH DIALYTIKA" #x03CA)
-    ("GREEK SMALL LETTER UPSILON WITH DIALYTIKA" #x03CB)
-    ("GREEK SMALL LETTER OMICRON WITH TONOS" #x03CC)
-    ("GREEK SMALL LETTER UPSILON WITH TONOS" #x03CD)
-    ("GREEK SMALL LETTER OMEGA WITH TONOS" #x03CE)
-    ("GREEK BETA SYMBOL" #x03D0)
-    ("GREEK THETA SYMBOL" #x03D1)
-    ("GREEK UPSILON WITH HOOK SYMBOL" #x03D2)
-    ("GREEK UPSILON WITH ACUTE AND HOOK SYMBOL" #x03D3)
-    ("GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL" #x03D4)
-    ("GREEK PHI SYMBOL" #x03D5)
-    ("GREEK PI SYMBOL" #x03D6)
-    ("GREEK KAI SYMBOL" #x03D7)
-    ("GREEK LETTER ARCHAIC KOPPA" #x03D8)
-    ("GREEK SMALL LETTER ARCHAIC KOPPA" #x03D9)
-    ("GREEK LETTER STIGMA" #x03DA)
-    ("GREEK SMALL LETTER STIGMA" #x03DB)
-    ("GREEK LETTER DIGAMMA" #x03DC)
-    ("GREEK SMALL LETTER DIGAMMA" #x03DD)
-    ("GREEK LETTER KOPPA" #x03DE)
-    ("GREEK SMALL LETTER KOPPA" #x03DF)
-    ("GREEK LETTER SAMPI" #x03E0)
-    ("GREEK SMALL LETTER SAMPI" #x03E1)
-    ("COPTIC CAPITAL LETTER SHEI" #x03E2)
-    ("COPTIC SMALL LETTER SHEI" #x03E3)
-    ("COPTIC CAPITAL LETTER FEI" #x03E4)
-    ("COPTIC SMALL LETTER FEI" #x03E5)
-    ("COPTIC CAPITAL LETTER KHEI" #x03E6)
-    ("COPTIC SMALL LETTER KHEI" #x03E7)
-    ("COPTIC CAPITAL LETTER HORI" #x03E8)
-    ("COPTIC SMALL LETTER HORI" #x03E9)
-    ("COPTIC CAPITAL LETTER GANGIA" #x03EA)
-    ("COPTIC SMALL LETTER GANGIA" #x03EB)
-    ("COPTIC CAPITAL LETTER SHIMA" #x03EC)
-    ("COPTIC SMALL LETTER SHIMA" #x03ED)
-    ("COPTIC CAPITAL LETTER DEI" #x03EE)
-    ("COPTIC SMALL LETTER DEI" #x03EF)
-    ("GREEK KAPPA SYMBOL" #x03F0)
-    ("GREEK RHO SYMBOL" #x03F1)
-    ("GREEK LUNATE SIGMA SYMBOL" #x03F2)
-    ("GREEK LETTER YOT" #x03F3)
-    ("GREEK CAPITAL THETA SYMBOL" #x03F4)
-    ("GREEK LUNATE EPSILON SYMBOL" #x03F5)
-    ("GREEK REVERSED LUNATE EPSILON SYMBOL" #x03F6)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00400-004FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00400-004FF.el
deleted file mode 100644
index 9de27e0dc5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00400-004FF.el
+++ /dev/null
@@ -1,248 +0,0 @@
-(nxml-define-char-name-set 'cyrillic
-  '(("CYRILLIC CAPITAL LETTER IE WITH GRAVE" #x0400)
-    ("CYRILLIC CAPITAL LETTER IO" #x0401)
-    ("CYRILLIC CAPITAL LETTER DJE" #x0402)
-    ("CYRILLIC CAPITAL LETTER GJE" #x0403)
-    ("CYRILLIC CAPITAL LETTER UKRAINIAN IE" #x0404)
-    ("CYRILLIC CAPITAL LETTER DZE" #x0405)
-    ("CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I" #x0406)
-    ("CYRILLIC CAPITAL LETTER YI" #x0407)
-    ("CYRILLIC CAPITAL LETTER JE" #x0408)
-    ("CYRILLIC CAPITAL LETTER LJE" #x0409)
-    ("CYRILLIC CAPITAL LETTER NJE" #x040A)
-    ("CYRILLIC CAPITAL LETTER TSHE" #x040B)
-    ("CYRILLIC CAPITAL LETTER KJE" #x040C)
-    ("CYRILLIC CAPITAL LETTER I WITH GRAVE" #x040D)
-    ("CYRILLIC CAPITAL LETTER SHORT U" #x040E)
-    ("CYRILLIC CAPITAL LETTER DZHE" #x040F)
-    ("CYRILLIC CAPITAL LETTER A" #x0410)
-    ("CYRILLIC CAPITAL LETTER BE" #x0411)
-    ("CYRILLIC CAPITAL LETTER VE" #x0412)
-    ("CYRILLIC CAPITAL LETTER GHE" #x0413)
-    ("CYRILLIC CAPITAL LETTER DE" #x0414)
-    ("CYRILLIC CAPITAL LETTER IE" #x0415)
-    ("CYRILLIC CAPITAL LETTER ZHE" #x0416)
-    ("CYRILLIC CAPITAL LETTER ZE" #x0417)
-    ("CYRILLIC CAPITAL LETTER I" #x0418)
-    ("CYRILLIC CAPITAL LETTER SHORT I" #x0419)
-    ("CYRILLIC CAPITAL LETTER KA" #x041A)
-    ("CYRILLIC CAPITAL LETTER EL" #x041B)
-    ("CYRILLIC CAPITAL LETTER EM" #x041C)
-    ("CYRILLIC CAPITAL LETTER EN" #x041D)
-    ("CYRILLIC CAPITAL LETTER O" #x041E)
-    ("CYRILLIC CAPITAL LETTER PE" #x041F)
-    ("CYRILLIC CAPITAL LETTER ER" #x0420)
-    ("CYRILLIC CAPITAL LETTER ES" #x0421)
-    ("CYRILLIC CAPITAL LETTER TE" #x0422)
-    ("CYRILLIC CAPITAL LETTER U" #x0423)
-    ("CYRILLIC CAPITAL LETTER EF" #x0424)
-    ("CYRILLIC CAPITAL LETTER HA" #x0425)
-    ("CYRILLIC CAPITAL LETTER TSE" #x0426)
-    ("CYRILLIC CAPITAL LETTER CHE" #x0427)
-    ("CYRILLIC CAPITAL LETTER SHA" #x0428)
-    ("CYRILLIC CAPITAL LETTER SHCHA" #x0429)
-    ("CYRILLIC CAPITAL LETTER HARD SIGN" #x042A)
-    ("CYRILLIC CAPITAL LETTER YERU" #x042B)
-    ("CYRILLIC CAPITAL LETTER SOFT SIGN" #x042C)
-    ("CYRILLIC CAPITAL LETTER E" #x042D)
-    ("CYRILLIC CAPITAL LETTER YU" #x042E)
-    ("CYRILLIC CAPITAL LETTER YA" #x042F)
-    ("CYRILLIC SMALL LETTER A" #x0430)
-    ("CYRILLIC SMALL LETTER BE" #x0431)
-    ("CYRILLIC SMALL LETTER VE" #x0432)
-    ("CYRILLIC SMALL LETTER GHE" #x0433)
-    ("CYRILLIC SMALL LETTER DE" #x0434)
-    ("CYRILLIC SMALL LETTER IE" #x0435)
-    ("CYRILLIC SMALL LETTER ZHE" #x0436)
-    ("CYRILLIC SMALL LETTER ZE" #x0437)
-    ("CYRILLIC SMALL LETTER I" #x0438)
-    ("CYRILLIC SMALL LETTER SHORT I" #x0439)
-    ("CYRILLIC SMALL LETTER KA" #x043A)
-    ("CYRILLIC SMALL LETTER EL" #x043B)
-    ("CYRILLIC SMALL LETTER EM" #x043C)
-    ("CYRILLIC SMALL LETTER EN" #x043D)
-    ("CYRILLIC SMALL LETTER O" #x043E)
-    ("CYRILLIC SMALL LETTER PE" #x043F)
-    ("CYRILLIC SMALL LETTER ER" #x0440)
-    ("CYRILLIC SMALL LETTER ES" #x0441)
-    ("CYRILLIC SMALL LETTER TE" #x0442)
-    ("CYRILLIC SMALL LETTER U" #x0443)
-    ("CYRILLIC SMALL LETTER EF" #x0444)
-    ("CYRILLIC SMALL LETTER HA" #x0445)
-    ("CYRILLIC SMALL LETTER TSE" #x0446)
-    ("CYRILLIC SMALL LETTER CHE" #x0447)
-    ("CYRILLIC SMALL LETTER SHA" #x0448)
-    ("CYRILLIC SMALL LETTER SHCHA" #x0449)
-    ("CYRILLIC SMALL LETTER HARD SIGN" #x044A)
-    ("CYRILLIC SMALL LETTER YERU" #x044B)
-    ("CYRILLIC SMALL LETTER SOFT SIGN" #x044C)
-    ("CYRILLIC SMALL LETTER E" #x044D)
-    ("CYRILLIC SMALL LETTER YU" #x044E)
-    ("CYRILLIC SMALL LETTER YA" #x044F)
-    ("CYRILLIC SMALL LETTER IE WITH GRAVE" #x0450)
-    ("CYRILLIC SMALL LETTER IO" #x0451)
-    ("CYRILLIC SMALL LETTER DJE" #x0452)
-    ("CYRILLIC SMALL LETTER GJE" #x0453)
-    ("CYRILLIC SMALL LETTER UKRAINIAN IE" #x0454)
-    ("CYRILLIC SMALL LETTER DZE" #x0455)
-    ("CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I" #x0456)
-    ("CYRILLIC SMALL LETTER YI" #x0457)
-    ("CYRILLIC SMALL LETTER JE" #x0458)
-    ("CYRILLIC SMALL LETTER LJE" #x0459)
-    ("CYRILLIC SMALL LETTER NJE" #x045A)
-    ("CYRILLIC SMALL LETTER TSHE" #x045B)
-    ("CYRILLIC SMALL LETTER KJE" #x045C)
-    ("CYRILLIC SMALL LETTER I WITH GRAVE" #x045D)
-    ("CYRILLIC SMALL LETTER SHORT U" #x045E)
-    ("CYRILLIC SMALL LETTER DZHE" #x045F)
-    ("CYRILLIC CAPITAL LETTER OMEGA" #x0460)
-    ("CYRILLIC SMALL LETTER OMEGA" #x0461)
-    ("CYRILLIC CAPITAL LETTER YAT" #x0462)
-    ("CYRILLIC SMALL LETTER YAT" #x0463)
-    ("CYRILLIC CAPITAL LETTER IOTIFIED E" #x0464)
-    ("CYRILLIC SMALL LETTER IOTIFIED E" #x0465)
-    ("CYRILLIC CAPITAL LETTER LITTLE YUS" #x0466)
-    ("CYRILLIC SMALL LETTER LITTLE YUS" #x0467)
-    ("CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS" #x0468)
-    ("CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS" #x0469)
-    ("CYRILLIC CAPITAL LETTER BIG YUS" #x046A)
-    ("CYRILLIC SMALL LETTER BIG YUS" #x046B)
-    ("CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS" #x046C)
-    ("CYRILLIC SMALL LETTER IOTIFIED BIG YUS" #x046D)
-    ("CYRILLIC CAPITAL LETTER KSI" #x046E)
-    ("CYRILLIC SMALL LETTER KSI" #x046F)
-    ("CYRILLIC CAPITAL LETTER PSI" #x0470)
-    ("CYRILLIC SMALL LETTER PSI" #x0471)
-    ("CYRILLIC CAPITAL LETTER FITA" #x0472)
-    ("CYRILLIC SMALL LETTER FITA" #x0473)
-    ("CYRILLIC CAPITAL LETTER IZHITSA" #x0474)
-    ("CYRILLIC SMALL LETTER IZHITSA" #x0475)
-    ("CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT" #x0476)
-    ("CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT" #x0477)
-    ("CYRILLIC CAPITAL LETTER UK" #x0478)
-    ("CYRILLIC SMALL LETTER UK" #x0479)
-    ("CYRILLIC CAPITAL LETTER ROUND OMEGA" #x047A)
-    ("CYRILLIC SMALL LETTER ROUND OMEGA" #x047B)
-    ("CYRILLIC CAPITAL LETTER OMEGA WITH TITLO" #x047C)
-    ("CYRILLIC SMALL LETTER OMEGA WITH TITLO" #x047D)
-    ("CYRILLIC CAPITAL LETTER OT" #x047E)
-    ("CYRILLIC SMALL LETTER OT" #x047F)
-    ("CYRILLIC CAPITAL LETTER KOPPA" #x0480)
-    ("CYRILLIC SMALL LETTER KOPPA" #x0481)
-    ("CYRILLIC THOUSANDS SIGN" #x0482)
-    ("COMBINING CYRILLIC TITLO" #x0483)
-    ("COMBINING CYRILLIC PALATALIZATION" #x0484)
-    ("COMBINING CYRILLIC DASIA PNEUMATA" #x0485)
-    ("COMBINING CYRILLIC PSILI PNEUMATA" #x0486)
-    ("COMBINING CYRILLIC HUNDRED THOUSANDS SIGN" #x0488)
-    ("COMBINING CYRILLIC MILLIONS SIGN" #x0489)
-    ("CYRILLIC CAPITAL LETTER SHORT I WITH TAIL" #x048A)
-    ("CYRILLIC SMALL LETTER SHORT I WITH TAIL" #x048B)
-    ("CYRILLIC CAPITAL LETTER SEMISOFT SIGN" #x048C)
-    ("CYRILLIC SMALL LETTER SEMISOFT SIGN" #x048D)
-    ("CYRILLIC CAPITAL LETTER ER WITH TICK" #x048E)
-    ("CYRILLIC SMALL LETTER ER WITH TICK" #x048F)
-    ("CYRILLIC CAPITAL LETTER GHE WITH UPTURN" #x0490)
-    ("CYRILLIC SMALL LETTER GHE WITH UPTURN" #x0491)
-    ("CYRILLIC CAPITAL LETTER GHE WITH STROKE" #x0492)
-    ("CYRILLIC SMALL LETTER GHE WITH STROKE" #x0493)
-    ("CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK" #x0494)
-    ("CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK" #x0495)
-    ("CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER" #x0496)
-    ("CYRILLIC SMALL LETTER ZHE WITH DESCENDER" #x0497)
-    ("CYRILLIC CAPITAL LETTER ZE WITH DESCENDER" #x0498)
-    ("CYRILLIC SMALL LETTER ZE WITH DESCENDER" #x0499)
-    ("CYRILLIC CAPITAL LETTER KA WITH DESCENDER" #x049A)
-    ("CYRILLIC SMALL LETTER KA WITH DESCENDER" #x049B)
-    ("CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE" #x049C)
-    ("CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE" #x049D)
-    ("CYRILLIC CAPITAL LETTER KA WITH STROKE" #x049E)
-    ("CYRILLIC SMALL LETTER KA WITH STROKE" #x049F)
-    ("CYRILLIC CAPITAL LETTER BASHKIR KA" #x04A0)
-    ("CYRILLIC SMALL LETTER BASHKIR KA" #x04A1)
-    ("CYRILLIC CAPITAL LETTER EN WITH DESCENDER" #x04A2)
-    ("CYRILLIC SMALL LETTER EN WITH DESCENDER" #x04A3)
-    ("CYRILLIC CAPITAL LIGATURE EN GHE" #x04A4)
-    ("CYRILLIC SMALL LIGATURE EN GHE" #x04A5)
-    ("CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK" #x04A6)
-    ("CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK" #x04A7)
-    ("CYRILLIC CAPITAL LETTER ABKHASIAN HA" #x04A8)
-    ("CYRILLIC SMALL LETTER ABKHASIAN HA" #x04A9)
-    ("CYRILLIC CAPITAL LETTER ES WITH DESCENDER" #x04AA)
-    ("CYRILLIC SMALL LETTER ES WITH DESCENDER" #x04AB)
-    ("CYRILLIC CAPITAL LETTER TE WITH DESCENDER" #x04AC)
-    ("CYRILLIC SMALL LETTER TE WITH DESCENDER" #x04AD)
-    ("CYRILLIC CAPITAL LETTER STRAIGHT U" #x04AE)
-    ("CYRILLIC SMALL LETTER STRAIGHT U" #x04AF)
-    ("CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE" #x04B0)
-    ("CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE" #x04B1)
-    ("CYRILLIC CAPITAL LETTER HA WITH DESCENDER" #x04B2)
-    ("CYRILLIC SMALL LETTER HA WITH DESCENDER" #x04B3)
-    ("CYRILLIC CAPITAL LIGATURE TE TSE" #x04B4)
-    ("CYRILLIC SMALL LIGATURE TE TSE" #x04B5)
-    ("CYRILLIC CAPITAL LETTER CHE WITH DESCENDER" #x04B6)
-    ("CYRILLIC SMALL LETTER CHE WITH DESCENDER" #x04B7)
-    ("CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE" #x04B8)
-    ("CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE" #x04B9)
-    ("CYRILLIC CAPITAL LETTER SHHA" #x04BA)
-    ("CYRILLIC SMALL LETTER SHHA" #x04BB)
-    ("CYRILLIC CAPITAL LETTER ABKHASIAN CHE" #x04BC)
-    ("CYRILLIC SMALL LETTER ABKHASIAN CHE" #x04BD)
-    ("CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER" #x04BE)
-    ("CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER" #x04BF)
-    ("CYRILLIC LETTER PALOCHKA" #x04C0)
-    ("CYRILLIC CAPITAL LETTER ZHE WITH BREVE" #x04C1)
-    ("CYRILLIC SMALL LETTER ZHE WITH BREVE" #x04C2)
-    ("CYRILLIC CAPITAL LETTER KA WITH HOOK" #x04C3)
-    ("CYRILLIC SMALL LETTER KA WITH HOOK" #x04C4)
-    ("CYRILLIC CAPITAL LETTER EL WITH TAIL" #x04C5)
-    ("CYRILLIC SMALL LETTER EL WITH TAIL" #x04C6)
-    ("CYRILLIC CAPITAL LETTER EN WITH HOOK" #x04C7)
-    ("CYRILLIC SMALL LETTER EN WITH HOOK" #x04C8)
-    ("CYRILLIC CAPITAL LETTER EN WITH TAIL" #x04C9)
-    ("CYRILLIC SMALL LETTER EN WITH TAIL" #x04CA)
-    ("CYRILLIC CAPITAL LETTER KHAKASSIAN CHE" #x04CB)
-    ("CYRILLIC SMALL LETTER KHAKASSIAN CHE" #x04CC)
-    ("CYRILLIC CAPITAL LETTER EM WITH TAIL" #x04CD)
-    ("CYRILLIC SMALL LETTER EM WITH TAIL" #x04CE)
-    ("CYRILLIC CAPITAL LETTER A WITH BREVE" #x04D0)
-    ("CYRILLIC SMALL LETTER A WITH BREVE" #x04D1)
-    ("CYRILLIC CAPITAL LETTER A WITH DIAERESIS" #x04D2)
-    ("CYRILLIC SMALL LETTER A WITH DIAERESIS" #x04D3)
-    ("CYRILLIC CAPITAL LIGATURE A IE" #x04D4)
-    ("CYRILLIC SMALL LIGATURE A IE" #x04D5)
-    ("CYRILLIC CAPITAL LETTER IE WITH BREVE" #x04D6)
-    ("CYRILLIC SMALL LETTER IE WITH BREVE" #x04D7)
-    ("CYRILLIC CAPITAL LETTER SCHWA" #x04D8)
-    ("CYRILLIC SMALL LETTER SCHWA" #x04D9)
-    ("CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS" #x04DA)
-    ("CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS" #x04DB)
-    ("CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS" #x04DC)
-    ("CYRILLIC SMALL LETTER ZHE WITH DIAERESIS" #x04DD)
-    ("CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS" #x04DE)
-    ("CYRILLIC SMALL LETTER ZE WITH DIAERESIS" #x04DF)
-    ("CYRILLIC CAPITAL LETTER ABKHASIAN DZE" #x04E0)
-    ("CYRILLIC SMALL LETTER ABKHASIAN DZE" #x04E1)
-    ("CYRILLIC CAPITAL LETTER I WITH MACRON" #x04E2)
-    ("CYRILLIC SMALL LETTER I WITH MACRON" #x04E3)
-    ("CYRILLIC CAPITAL LETTER I WITH DIAERESIS" #x04E4)
-    ("CYRILLIC SMALL LETTER I WITH DIAERESIS" #x04E5)
-    ("CYRILLIC CAPITAL LETTER O WITH DIAERESIS" #x04E6)
-    ("CYRILLIC SMALL LETTER O WITH DIAERESIS" #x04E7)
-    ("CYRILLIC CAPITAL LETTER BARRED O" #x04E8)
-    ("CYRILLIC SMALL LETTER BARRED O" #x04E9)
-    ("CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS" #x04EA)
-    ("CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS" #x04EB)
-    ("CYRILLIC CAPITAL LETTER E WITH DIAERESIS" #x04EC)
-    ("CYRILLIC SMALL LETTER E WITH DIAERESIS" #x04ED)
-    ("CYRILLIC CAPITAL LETTER U WITH MACRON" #x04EE)
-    ("CYRILLIC SMALL LETTER U WITH MACRON" #x04EF)
-    ("CYRILLIC CAPITAL LETTER U WITH DIAERESIS" #x04F0)
-    ("CYRILLIC SMALL LETTER U WITH DIAERESIS" #x04F1)
-    ("CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE" #x04F2)
-    ("CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE" #x04F3)
-    ("CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS" #x04F4)
-    ("CYRILLIC SMALL LETTER CHE WITH DIAERESIS" #x04F5)
-    ("CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS" #x04F8)
-    ("CYRILLIC SMALL LETTER YERU WITH DIAERESIS" #x04F9)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00500-0052F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00500-0052F.el
deleted file mode 100644
index a59541150e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00500-0052F.el
+++ /dev/null
@@ -1,18 +0,0 @@
-(nxml-define-char-name-set 'cyrillic-supplementary
-  '(("CYRILLIC CAPITAL LETTER KOMI DE" #x0500)
-    ("CYRILLIC SMALL LETTER KOMI DE" #x0501)
-    ("CYRILLIC CAPITAL LETTER KOMI DJE" #x0502)
-    ("CYRILLIC SMALL LETTER KOMI DJE" #x0503)
-    ("CYRILLIC CAPITAL LETTER KOMI ZJE" #x0504)
-    ("CYRILLIC SMALL LETTER KOMI ZJE" #x0505)
-    ("CYRILLIC CAPITAL LETTER KOMI DZJE" #x0506)
-    ("CYRILLIC SMALL LETTER KOMI DZJE" #x0507)
-    ("CYRILLIC CAPITAL LETTER KOMI LJE" #x0508)
-    ("CYRILLIC SMALL LETTER KOMI LJE" #x0509)
-    ("CYRILLIC CAPITAL LETTER KOMI NJE" #x050A)
-    ("CYRILLIC SMALL LETTER KOMI NJE" #x050B)
-    ("CYRILLIC CAPITAL LETTER KOMI SJE" #x050C)
-    ("CYRILLIC SMALL LETTER KOMI SJE" #x050D)
-    ("CYRILLIC CAPITAL LETTER KOMI TJE" #x050E)
-    ("CYRILLIC SMALL LETTER KOMI TJE" #x050F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00530-0058F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00530-0058F.el
deleted file mode 100644
index 0f5d0ed1e5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00530-0058F.el
+++ /dev/null
@@ -1,88 +0,0 @@
-(nxml-define-char-name-set 'armenian
-  '(("ARMENIAN CAPITAL LETTER AYB" #x0531)
-    ("ARMENIAN CAPITAL LETTER BEN" #x0532)
-    ("ARMENIAN CAPITAL LETTER GIM" #x0533)
-    ("ARMENIAN CAPITAL LETTER DA" #x0534)
-    ("ARMENIAN CAPITAL LETTER ECH" #x0535)
-    ("ARMENIAN CAPITAL LETTER ZA" #x0536)
-    ("ARMENIAN CAPITAL LETTER EH" #x0537)
-    ("ARMENIAN CAPITAL LETTER ET" #x0538)
-    ("ARMENIAN CAPITAL LETTER TO" #x0539)
-    ("ARMENIAN CAPITAL LETTER ZHE" #x053A)
-    ("ARMENIAN CAPITAL LETTER INI" #x053B)
-    ("ARMENIAN CAPITAL LETTER LIWN" #x053C)
-    ("ARMENIAN CAPITAL LETTER XEH" #x053D)
-    ("ARMENIAN CAPITAL LETTER CA" #x053E)
-    ("ARMENIAN CAPITAL LETTER KEN" #x053F)
-    ("ARMENIAN CAPITAL LETTER HO" #x0540)
-    ("ARMENIAN CAPITAL LETTER JA" #x0541)
-    ("ARMENIAN CAPITAL LETTER GHAD" #x0542)
-    ("ARMENIAN CAPITAL LETTER CHEH" #x0543)
-    ("ARMENIAN CAPITAL LETTER MEN" #x0544)
-    ("ARMENIAN CAPITAL LETTER YI" #x0545)
-    ("ARMENIAN CAPITAL LETTER NOW" #x0546)
-    ("ARMENIAN CAPITAL LETTER SHA" #x0547)
-    ("ARMENIAN CAPITAL LETTER VO" #x0548)
-    ("ARMENIAN CAPITAL LETTER CHA" #x0549)
-    ("ARMENIAN CAPITAL LETTER PEH" #x054A)
-    ("ARMENIAN CAPITAL LETTER JHEH" #x054B)
-    ("ARMENIAN CAPITAL LETTER RA" #x054C)
-    ("ARMENIAN CAPITAL LETTER SEH" #x054D)
-    ("ARMENIAN CAPITAL LETTER VEW" #x054E)
-    ("ARMENIAN CAPITAL LETTER TIWN" #x054F)
-    ("ARMENIAN CAPITAL LETTER REH" #x0550)
-    ("ARMENIAN CAPITAL LETTER CO" #x0551)
-    ("ARMENIAN CAPITAL LETTER YIWN" #x0552)
-    ("ARMENIAN CAPITAL LETTER PIWR" #x0553)
-    ("ARMENIAN CAPITAL LETTER KEH" #x0554)
-    ("ARMENIAN CAPITAL LETTER OH" #x0555)
-    ("ARMENIAN CAPITAL LETTER FEH" #x0556)
-    ("ARMENIAN MODIFIER LETTER LEFT HALF RING" #x0559)
-    ("ARMENIAN APOSTROPHE" #x055A)
-    ("ARMENIAN EMPHASIS MARK" #x055B)
-    ("ARMENIAN EXCLAMATION MARK" #x055C)
-    ("ARMENIAN COMMA" #x055D)
-    ("ARMENIAN QUESTION MARK" #x055E)
-    ("ARMENIAN ABBREVIATION MARK" #x055F)
-    ("ARMENIAN SMALL LETTER AYB" #x0561)
-    ("ARMENIAN SMALL LETTER BEN" #x0562)
-    ("ARMENIAN SMALL LETTER GIM" #x0563)
-    ("ARMENIAN SMALL LETTER DA" #x0564)
-    ("ARMENIAN SMALL LETTER ECH" #x0565)
-    ("ARMENIAN SMALL LETTER ZA" #x0566)
-    ("ARMENIAN SMALL LETTER EH" #x0567)
-    ("ARMENIAN SMALL LETTER ET" #x0568)
-    ("ARMENIAN SMALL LETTER TO" #x0569)
-    ("ARMENIAN SMALL LETTER ZHE" #x056A)
-    ("ARMENIAN SMALL LETTER INI" #x056B)
-    ("ARMENIAN SMALL LETTER LIWN" #x056C)
-    ("ARMENIAN SMALL LETTER XEH" #x056D)
-    ("ARMENIAN SMALL LETTER CA" #x056E)
-    ("ARMENIAN SMALL LETTER KEN" #x056F)
-    ("ARMENIAN SMALL LETTER HO" #x0570)
-    ("ARMENIAN SMALL LETTER JA" #x0571)
-    ("ARMENIAN SMALL LETTER GHAD" #x0572)
-    ("ARMENIAN SMALL LETTER CHEH" #x0573)
-    ("ARMENIAN SMALL LETTER MEN" #x0574)
-    ("ARMENIAN SMALL LETTER YI" #x0575)
-    ("ARMENIAN SMALL LETTER NOW" #x0576)
-    ("ARMENIAN SMALL LETTER SHA" #x0577)
-    ("ARMENIAN SMALL LETTER VO" #x0578)
-    ("ARMENIAN SMALL LETTER CHA" #x0579)
-    ("ARMENIAN SMALL LETTER PEH" #x057A)
-    ("ARMENIAN SMALL LETTER JHEH" #x057B)
-    ("ARMENIAN SMALL LETTER RA" #x057C)
-    ("ARMENIAN SMALL LETTER SEH" #x057D)
-    ("ARMENIAN SMALL LETTER VEW" #x057E)
-    ("ARMENIAN SMALL LETTER TIWN" #x057F)
-    ("ARMENIAN SMALL LETTER REH" #x0580)
-    ("ARMENIAN SMALL LETTER CO" #x0581)
-    ("ARMENIAN SMALL LETTER YIWN" #x0582)
-    ("ARMENIAN SMALL LETTER PIWR" #x0583)
-    ("ARMENIAN SMALL LETTER KEH" #x0584)
-    ("ARMENIAN SMALL LETTER OH" #x0585)
-    ("ARMENIAN SMALL LETTER FEH" #x0586)
-    ("ARMENIAN SMALL LIGATURE ECH YIWN" #x0587)
-    ("ARMENIAN FULL STOP" #x0589)
-    ("ARMENIAN HYPHEN" #x058A)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00590-005FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00590-005FF.el
deleted file mode 100644
index b33d5ea065..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00590-005FF.el
+++ /dev/null
@@ -1,84 +0,0 @@
-(nxml-define-char-name-set 'hebrew
-  '(("HEBREW ACCENT ETNAHTA" #x0591)
-    ("HEBREW ACCENT SEGOL" #x0592)
-    ("HEBREW ACCENT SHALSHELET" #x0593)
-    ("HEBREW ACCENT ZAQEF QATAN" #x0594)
-    ("HEBREW ACCENT ZAQEF GADOL" #x0595)
-    ("HEBREW ACCENT TIPEHA" #x0596)
-    ("HEBREW ACCENT REVIA" #x0597)
-    ("HEBREW ACCENT ZARQA" #x0598)
-    ("HEBREW ACCENT PASHTA" #x0599)
-    ("HEBREW ACCENT YETIV" #x059A)
-    ("HEBREW ACCENT TEVIR" #x059B)
-    ("HEBREW ACCENT GERESH" #x059C)
-    ("HEBREW ACCENT GERESH MUQDAM" #x059D)
-    ("HEBREW ACCENT GERSHAYIM" #x059E)
-    ("HEBREW ACCENT QARNEY PARA" #x059F)
-    ("HEBREW ACCENT TELISHA GEDOLA" #x05A0)
-    ("HEBREW ACCENT PAZER" #x05A1)
-    ("HEBREW ACCENT MUNAH" #x05A3)
-    ("HEBREW ACCENT MAHAPAKH" #x05A4)
-    ("HEBREW ACCENT MERKHA" #x05A5)
-    ("HEBREW ACCENT MERKHA KEFULA" #x05A6)
-    ("HEBREW ACCENT DARGA" #x05A7)
-    ("HEBREW ACCENT QADMA" #x05A8)
-    ("HEBREW ACCENT TELISHA QETANA" #x05A9)
-    ("HEBREW ACCENT YERAH BEN YOMO" #x05AA)
-    ("HEBREW ACCENT OLE" #x05AB)
-    ("HEBREW ACCENT ILUY" #x05AC)
-    ("HEBREW ACCENT DEHI" #x05AD)
-    ("HEBREW ACCENT ZINOR" #x05AE)
-    ("HEBREW MARK MASORA CIRCLE" #x05AF)
-    ("HEBREW POINT SHEVA" #x05B0)
-    ("HEBREW POINT HATAF SEGOL" #x05B1)
-    ("HEBREW POINT HATAF PATAH" #x05B2)
-    ("HEBREW POINT HATAF QAMATS" #x05B3)
-    ("HEBREW POINT HIRIQ" #x05B4)
-    ("HEBREW POINT TSERE" #x05B5)
-    ("HEBREW POINT SEGOL" #x05B6)
-    ("HEBREW POINT PATAH" #x05B7)
-    ("HEBREW POINT QAMATS" #x05B8)
-    ("HEBREW POINT HOLAM" #x05B9)
-    ("HEBREW POINT QUBUTS" #x05BB)
-    ("HEBREW POINT DAGESH OR MAPIQ" #x05BC)
-    ("HEBREW POINT METEG" #x05BD)
-    ("HEBREW PUNCTUATION MAQAF" #x05BE)
-    ("HEBREW POINT RAFE" #x05BF)
-    ("HEBREW PUNCTUATION PASEQ" #x05C0)
-    ("HEBREW POINT SHIN DOT" #x05C1)
-    ("HEBREW POINT SIN DOT" #x05C2)
-    ("HEBREW PUNCTUATION SOF PASUQ" #x05C3)
-    ("HEBREW MARK UPPER DOT" #x05C4)
-    ("HEBREW LETTER ALEF" #x05D0)
-    ("HEBREW LETTER BET" #x05D1)
-    ("HEBREW LETTER GIMEL" #x05D2)
-    ("HEBREW LETTER DALET" #x05D3)
-    ("HEBREW LETTER HE" #x05D4)
-    ("HEBREW LETTER VAV" #x05D5)
-    ("HEBREW LETTER ZAYIN" #x05D6)
-    ("HEBREW LETTER HET" #x05D7)
-    ("HEBREW LETTER TET" #x05D8)
-    ("HEBREW LETTER YOD" #x05D9)
-    ("HEBREW LETTER FINAL KAF" #x05DA)
-    ("HEBREW LETTER KAF" #x05DB)
-    ("HEBREW LETTER LAMED" #x05DC)
-    ("HEBREW LETTER FINAL MEM" #x05DD)
-    ("HEBREW LETTER MEM" #x05DE)
-    ("HEBREW LETTER FINAL NUN" #x05DF)
-    ("HEBREW LETTER NUN" #x05E0)
-    ("HEBREW LETTER SAMEKH" #x05E1)
-    ("HEBREW LETTER AYIN" #x05E2)
-    ("HEBREW LETTER FINAL PE" #x05E3)
-    ("HEBREW LETTER PE" #x05E4)
-    ("HEBREW LETTER FINAL TSADI" #x05E5)
-    ("HEBREW LETTER TSADI" #x05E6)
-    ("HEBREW LETTER QOF" #x05E7)
-    ("HEBREW LETTER RESH" #x05E8)
-    ("HEBREW LETTER SHIN" #x05E9)
-    ("HEBREW LETTER TAV" #x05EA)
-    ("HEBREW LIGATURE YIDDISH DOUBLE VAV" #x05F0)
-    ("HEBREW LIGATURE YIDDISH VAV YOD" #x05F1)
-    ("HEBREW LIGATURE YIDDISH DOUBLE YOD" #x05F2)
-    ("HEBREW PUNCTUATION GERESH" #x05F3)
-    ("HEBREW PUNCTUATION GERSHAYIM" #x05F4)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00600-006FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00600-006FF.el
deleted file mode 100644
index 9009737528..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00600-006FF.el
+++ /dev/null
@@ -1,210 +0,0 @@
-(nxml-define-char-name-set 'arabic
-  '(("ARABIC COMMA" #x060C)
-    ("ARABIC SEMICOLON" #x061B)
-    ("ARABIC QUESTION MARK" #x061F)
-    ("ARABIC LETTER HAMZA" #x0621)
-    ("ARABIC LETTER ALEF WITH MADDA ABOVE" #x0622)
-    ("ARABIC LETTER ALEF WITH HAMZA ABOVE" #x0623)
-    ("ARABIC LETTER WAW WITH HAMZA ABOVE" #x0624)
-    ("ARABIC LETTER ALEF WITH HAMZA BELOW" #x0625)
-    ("ARABIC LETTER YEH WITH HAMZA ABOVE" #x0626)
-    ("ARABIC LETTER ALEF" #x0627)
-    ("ARABIC LETTER BEH" #x0628)
-    ("ARABIC LETTER TEH MARBUTA" #x0629)
-    ("ARABIC LETTER TEH" #x062A)
-    ("ARABIC LETTER THEH" #x062B)
-    ("ARABIC LETTER JEEM" #x062C)
-    ("ARABIC LETTER HAH" #x062D)
-    ("ARABIC LETTER KHAH" #x062E)
-    ("ARABIC LETTER DAL" #x062F)
-    ("ARABIC LETTER THAL" #x0630)
-    ("ARABIC LETTER REH" #x0631)
-    ("ARABIC LETTER ZAIN" #x0632)
-    ("ARABIC LETTER SEEN" #x0633)
-    ("ARABIC LETTER SHEEN" #x0634)
-    ("ARABIC LETTER SAD" #x0635)
-    ("ARABIC LETTER DAD" #x0636)
-    ("ARABIC LETTER TAH" #x0637)
-    ("ARABIC LETTER ZAH" #x0638)
-    ("ARABIC LETTER AIN" #x0639)
-    ("ARABIC LETTER GHAIN" #x063A)
-    ("ARABIC TATWEEL" #x0640)
-    ("ARABIC LETTER FEH" #x0641)
-    ("ARABIC LETTER QAF" #x0642)
-    ("ARABIC LETTER KAF" #x0643)
-    ("ARABIC LETTER LAM" #x0644)
-    ("ARABIC LETTER MEEM" #x0645)
-    ("ARABIC LETTER NOON" #x0646)
-    ("ARABIC LETTER HEH" #x0647)
-    ("ARABIC LETTER WAW" #x0648)
-    ("ARABIC LETTER ALEF MAKSURA" #x0649)
-    ("ARABIC LETTER YEH" #x064A)
-    ("ARABIC FATHATAN" #x064B)
-    ("ARABIC DAMMATAN" #x064C)
-    ("ARABIC KASRATAN" #x064D)
-    ("ARABIC FATHA" #x064E)
-    ("ARABIC DAMMA" #x064F)
-    ("ARABIC KASRA" #x0650)
-    ("ARABIC SHADDA" #x0651)
-    ("ARABIC SUKUN" #x0652)
-    ("ARABIC MADDAH ABOVE" #x0653)
-    ("ARABIC HAMZA ABOVE" #x0654)
-    ("ARABIC HAMZA BELOW" #x0655)
-    ("ARABIC-INDIC DIGIT ZERO" #x0660)
-    ("ARABIC-INDIC DIGIT ONE" #x0661)
-    ("ARABIC-INDIC DIGIT TWO" #x0662)
-    ("ARABIC-INDIC DIGIT THREE" #x0663)
-    ("ARABIC-INDIC DIGIT FOUR" #x0664)
-    ("ARABIC-INDIC DIGIT FIVE" #x0665)
-    ("ARABIC-INDIC DIGIT SIX" #x0666)
-    ("ARABIC-INDIC DIGIT SEVEN" #x0667)
-    ("ARABIC-INDIC DIGIT EIGHT" #x0668)
-    ("ARABIC-INDIC DIGIT NINE" #x0669)
-    ("ARABIC PERCENT SIGN" #x066A)
-    ("ARABIC DECIMAL SEPARATOR" #x066B)
-    ("ARABIC THOUSANDS SEPARATOR" #x066C)
-    ("ARABIC FIVE POINTED STAR" #x066D)
-    ("ARABIC LETTER DOTLESS BEH" #x066E)
-    ("ARABIC LETTER DOTLESS QAF" #x066F)
-    ("ARABIC LETTER SUPERSCRIPT ALEF" #x0670)
-    ("ARABIC LETTER ALEF WASLA" #x0671)
-    ("ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE" #x0672)
-    ("ARABIC LETTER ALEF WITH WAVY HAMZA BELOW" #x0673)
-    ("ARABIC LETTER HIGH HAMZA" #x0674)
-    ("ARABIC LETTER HIGH HAMZA ALEF" #x0675)
-    ("ARABIC LETTER HIGH HAMZA WAW" #x0676)
-    ("ARABIC LETTER U WITH HAMZA ABOVE" #x0677)
-    ("ARABIC LETTER HIGH HAMZA YEH" #x0678)
-    ("ARABIC LETTER TTEH" #x0679)
-    ("ARABIC LETTER TTEHEH" #x067A)
-    ("ARABIC LETTER BEEH" #x067B)
-    ("ARABIC LETTER TEH WITH RING" #x067C)
-    ("ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS" #x067D)
-    ("ARABIC LETTER PEH" #x067E)
-    ("ARABIC LETTER TEHEH" #x067F)
-    ("ARABIC LETTER BEHEH" #x0680)
-    ("ARABIC LETTER HAH WITH HAMZA ABOVE" #x0681)
-    ("ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE" #x0682)
-    ("ARABIC LETTER NYEH" #x0683)
-    ("ARABIC LETTER DYEH" #x0684)
-    ("ARABIC LETTER HAH WITH THREE DOTS ABOVE" #x0685)
-    ("ARABIC LETTER TCHEH" #x0686)
-    ("ARABIC LETTER TCHEHEH" #x0687)
-    ("ARABIC LETTER DDAL" #x0688)
-    ("ARABIC LETTER DAL WITH RING" #x0689)
-    ("ARABIC LETTER DAL WITH DOT BELOW" #x068A)
-    ("ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH" #x068B)
-    ("ARABIC LETTER DAHAL" #x068C)
-    ("ARABIC LETTER DDAHAL" #x068D)
-    ("ARABIC LETTER DUL" #x068E)
-    ("ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS" #x068F)
-    ("ARABIC LETTER DAL WITH FOUR DOTS ABOVE" #x0690)
-    ("ARABIC LETTER RREH" #x0691)
-    ("ARABIC LETTER REH WITH SMALL V" #x0692)
-    ("ARABIC LETTER REH WITH RING" #x0693)
-    ("ARABIC LETTER REH WITH DOT BELOW" #x0694)
-    ("ARABIC LETTER REH WITH SMALL V BELOW" #x0695)
-    ("ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE" #x0696)
-    ("ARABIC LETTER REH WITH TWO DOTS ABOVE" #x0697)
-    ("ARABIC LETTER JEH" #x0698)
-    ("ARABIC LETTER REH WITH FOUR DOTS ABOVE" #x0699)
-    ("ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE" #x069A)
-    ("ARABIC LETTER SEEN WITH THREE DOTS BELOW" #x069B)
-    ("ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE" #x069C)
-    ("ARABIC LETTER SAD WITH TWO DOTS BELOW" #x069D)
-    ("ARABIC LETTER SAD WITH THREE DOTS ABOVE" #x069E)
-    ("ARABIC LETTER TAH WITH THREE DOTS ABOVE" #x069F)
-    ("ARABIC LETTER AIN WITH THREE DOTS ABOVE" #x06A0)
-    ("ARABIC LETTER DOTLESS FEH" #x06A1)
-    ("ARABIC LETTER FEH WITH DOT MOVED BELOW" #x06A2)
-    ("ARABIC LETTER FEH WITH DOT BELOW" #x06A3)
-    ("ARABIC LETTER VEH" #x06A4)
-    ("ARABIC LETTER FEH WITH THREE DOTS BELOW" #x06A5)
-    ("ARABIC LETTER PEHEH" #x06A6)
-    ("ARABIC LETTER QAF WITH DOT ABOVE" #x06A7)
-    ("ARABIC LETTER QAF WITH THREE DOTS ABOVE" #x06A8)
-    ("ARABIC LETTER KEHEH" #x06A9)
-    ("ARABIC LETTER SWASH KAF" #x06AA)
-    ("ARABIC LETTER KAF WITH RING" #x06AB)
-    ("ARABIC LETTER KAF WITH DOT ABOVE" #x06AC)
-    ("ARABIC LETTER NG" #x06AD)
-    ("ARABIC LETTER KAF WITH THREE DOTS BELOW" #x06AE)
-    ("ARABIC LETTER GAF" #x06AF)
-    ("ARABIC LETTER GAF WITH RING" #x06B0)
-    ("ARABIC LETTER NGOEH" #x06B1)
-    ("ARABIC LETTER GAF WITH TWO DOTS BELOW" #x06B2)
-    ("ARABIC LETTER GUEH" #x06B3)
-    ("ARABIC LETTER GAF WITH THREE DOTS ABOVE" #x06B4)
-    ("ARABIC LETTER LAM WITH SMALL V" #x06B5)
-    ("ARABIC LETTER LAM WITH DOT ABOVE" #x06B6)
-    ("ARABIC LETTER LAM WITH THREE DOTS ABOVE" #x06B7)
-    ("ARABIC LETTER LAM WITH THREE DOTS BELOW" #x06B8)
-    ("ARABIC LETTER NOON WITH DOT BELOW" #x06B9)
-    ("ARABIC LETTER NOON GHUNNA" #x06BA)
-    ("ARABIC LETTER RNOON" #x06BB)
-    ("ARABIC LETTER NOON WITH RING" #x06BC)
-    ("ARABIC LETTER NOON WITH THREE DOTS ABOVE" #x06BD)
-    ("ARABIC LETTER HEH DOACHASHMEE" #x06BE)
-    ("ARABIC LETTER TCHEH WITH DOT ABOVE" #x06BF)
-    ("ARABIC LETTER HEH WITH YEH ABOVE" #x06C0)
-    ("ARABIC LETTER HEH GOAL" #x06C1)
-    ("ARABIC LETTER HEH GOAL WITH HAMZA ABOVE" #x06C2)
-    ("ARABIC LETTER TEH MARBUTA GOAL" #x06C3)
-    ("ARABIC LETTER WAW WITH RING" #x06C4)
-    ("ARABIC LETTER KIRGHIZ OE" #x06C5)
-    ("ARABIC LETTER OE" #x06C6)
-    ("ARABIC LETTER U" #x06C7)
-    ("ARABIC LETTER YU" #x06C8)
-    ("ARABIC LETTER KIRGHIZ YU" #x06C9)
-    ("ARABIC LETTER WAW WITH TWO DOTS ABOVE" #x06CA)
-    ("ARABIC LETTER VE" #x06CB)
-    ("ARABIC LETTER FARSI YEH" #x06CC)
-    ("ARABIC LETTER YEH WITH TAIL" #x06CD)
-    ("ARABIC LETTER YEH WITH SMALL V" #x06CE)
-    ("ARABIC LETTER WAW WITH DOT ABOVE" #x06CF)
-    ("ARABIC LETTER E" #x06D0)
-    ("ARABIC LETTER YEH WITH THREE DOTS BELOW" #x06D1)
-    ("ARABIC LETTER YEH BARREE" #x06D2)
-    ("ARABIC LETTER YEH BARREE WITH HAMZA ABOVE" #x06D3)
-    ("ARABIC FULL STOP" #x06D4)
-    ("ARABIC LETTER AE" #x06D5)
-    ("ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA" #x06D6)
-    ("ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA" #x06D7)
-    ("ARABIC SMALL HIGH MEEM INITIAL FORM" #x06D8)
-    ("ARABIC SMALL HIGH LAM ALEF" #x06D9)
-    ("ARABIC SMALL HIGH JEEM" #x06DA)
-    ("ARABIC SMALL HIGH THREE DOTS" #x06DB)
-    ("ARABIC SMALL HIGH SEEN" #x06DC)
-    ("ARABIC END OF AYAH" #x06DD)
-    ("ARABIC START OF RUB EL HIZB" #x06DE)
-    ("ARABIC SMALL HIGH ROUNDED ZERO" #x06DF)
-    ("ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO" #x06E0)
-    ("ARABIC SMALL HIGH DOTLESS HEAD OF KHAH" #x06E1)
-    ("ARABIC SMALL HIGH MEEM ISOLATED FORM" #x06E2)
-    ("ARABIC SMALL LOW SEEN" #x06E3)
-    ("ARABIC SMALL HIGH MADDA" #x06E4)
-    ("ARABIC SMALL WAW" #x06E5)
-    ("ARABIC SMALL YEH" #x06E6)
-    ("ARABIC SMALL HIGH YEH" #x06E7)
-    ("ARABIC SMALL HIGH NOON" #x06E8)
-    ("ARABIC PLACE OF SAJDAH" #x06E9)
-    ("ARABIC EMPTY CENTRE LOW STOP" #x06EA)
-    ("ARABIC EMPTY CENTRE HIGH STOP" #x06EB)
-    ("ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE" #x06EC)
-    ("ARABIC SMALL LOW MEEM" #x06ED)
-    ("EXTENDED ARABIC-INDIC DIGIT ZERO" #x06F0)
-    ("EXTENDED ARABIC-INDIC DIGIT ONE" #x06F1)
-    ("EXTENDED ARABIC-INDIC DIGIT TWO" #x06F2)
-    ("EXTENDED ARABIC-INDIC DIGIT THREE" #x06F3)
-    ("EXTENDED ARABIC-INDIC DIGIT FOUR" #x06F4)
-    ("EXTENDED ARABIC-INDIC DIGIT FIVE" #x06F5)
-    ("EXTENDED ARABIC-INDIC DIGIT SIX" #x06F6)
-    ("EXTENDED ARABIC-INDIC DIGIT SEVEN" #x06F7)
-    ("EXTENDED ARABIC-INDIC DIGIT EIGHT" #x06F8)
-    ("EXTENDED ARABIC-INDIC DIGIT NINE" #x06F9)
-    ("ARABIC LETTER SHEEN WITH DOT BELOW" #x06FA)
-    ("ARABIC LETTER DAD WITH DOT BELOW" #x06FB)
-    ("ARABIC LETTER GHAIN WITH DOT BELOW" #x06FC)
-    ("ARABIC SIGN SINDHI AMPERSAND" #x06FD)
-    ("ARABIC SIGN SINDHI POSTPOSITION MEN" #x06FE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00700-0074F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00700-0074F.el
deleted file mode 100644
index 434861cf2b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00700-0074F.el
+++ /dev/null
@@ -1,73 +0,0 @@
-(nxml-define-char-name-set 'syriac
-  '(("SYRIAC END OF PARAGRAPH" #x0700)
-    ("SYRIAC SUPRALINEAR FULL STOP" #x0701)
-    ("SYRIAC SUBLINEAR FULL STOP" #x0702)
-    ("SYRIAC SUPRALINEAR COLON" #x0703)
-    ("SYRIAC SUBLINEAR COLON" #x0704)
-    ("SYRIAC HORIZONTAL COLON" #x0705)
-    ("SYRIAC COLON SKEWED LEFT" #x0706)
-    ("SYRIAC COLON SKEWED RIGHT" #x0707)
-    ("SYRIAC SUPRALINEAR COLON SKEWED LEFT" #x0708)
-    ("SYRIAC SUBLINEAR COLON SKEWED RIGHT" #x0709)
-    ("SYRIAC CONTRACTION" #x070A)
-    ("SYRIAC HARKLEAN OBELUS" #x070B)
-    ("SYRIAC HARKLEAN METOBELUS" #x070C)
-    ("SYRIAC HARKLEAN ASTERISCUS" #x070D)
-    ("SYRIAC ABBREVIATION MARK" #x070F)
-    ("SYRIAC LETTER ALAPH" #x0710)
-    ("SYRIAC LETTER SUPERSCRIPT ALAPH" #x0711)
-    ("SYRIAC LETTER BETH" #x0712)
-    ("SYRIAC LETTER GAMAL" #x0713)
-    ("SYRIAC LETTER GAMAL GARSHUNI" #x0714)
-    ("SYRIAC LETTER DALATH" #x0715)
-    ("SYRIAC LETTER DOTLESS DALATH RISH" #x0716)
-    ("SYRIAC LETTER HE" #x0717)
-    ("SYRIAC LETTER WAW" #x0718)
-    ("SYRIAC LETTER ZAIN" #x0719)
-    ("SYRIAC LETTER HETH" #x071A)
-    ("SYRIAC LETTER TETH" #x071B)
-    ("SYRIAC LETTER TETH GARSHUNI" #x071C)
-    ("SYRIAC LETTER YUDH" #x071D)
-    ("SYRIAC LETTER YUDH HE" #x071E)
-    ("SYRIAC LETTER KAPH" #x071F)
-    ("SYRIAC LETTER LAMADH" #x0720)
-    ("SYRIAC LETTER MIM" #x0721)
-    ("SYRIAC LETTER NUN" #x0722)
-    ("SYRIAC LETTER SEMKATH" #x0723)
-    ("SYRIAC LETTER FINAL SEMKATH" #x0724)
-    ("SYRIAC LETTER E" #x0725)
-    ("SYRIAC LETTER PE" #x0726)
-    ("SYRIAC LETTER REVERSED PE" #x0727)
-    ("SYRIAC LETTER SADHE" #x0728)
-    ("SYRIAC LETTER QAPH" #x0729)
-    ("SYRIAC LETTER RISH" #x072A)
-    ("SYRIAC LETTER SHIN" #x072B)
-    ("SYRIAC LETTER TAW" #x072C)
-    ("SYRIAC PTHAHA ABOVE" #x0730)
-    ("SYRIAC PTHAHA BELOW" #x0731)
-    ("SYRIAC PTHAHA DOTTED" #x0732)
-    ("SYRIAC ZQAPHA ABOVE" #x0733)
-    ("SYRIAC ZQAPHA BELOW" #x0734)
-    ("SYRIAC ZQAPHA DOTTED" #x0735)
-    ("SYRIAC RBASA ABOVE" #x0736)
-    ("SYRIAC RBASA BELOW" #x0737)
-    ("SYRIAC DOTTED ZLAMA HORIZONTAL" #x0738)
-    ("SYRIAC DOTTED ZLAMA ANGULAR" #x0739)
-    ("SYRIAC HBASA ABOVE" #x073A)
-    ("SYRIAC HBASA BELOW" #x073B)
-    ("SYRIAC HBASA-ESASA DOTTED" #x073C)
-    ("SYRIAC ESASA ABOVE" #x073D)
-    ("SYRIAC ESASA BELOW" #x073E)
-    ("SYRIAC RWAHA" #x073F)
-    ("SYRIAC FEMININE DOT" #x0740)
-    ("SYRIAC QUSHSHAYA" #x0741)
-    ("SYRIAC RUKKAKHA" #x0742)
-    ("SYRIAC TWO VERTICAL DOTS ABOVE" #x0743)
-    ("SYRIAC TWO VERTICAL DOTS BELOW" #x0744)
-    ("SYRIAC THREE DOTS ABOVE" #x0745)
-    ("SYRIAC THREE DOTS BELOW" #x0746)
-    ("SYRIAC OBLIQUE LINE ABOVE" #x0747)
-    ("SYRIAC OBLIQUE LINE BELOW" #x0748)
-    ("SYRIAC MUSIC" #x0749)
-    ("SYRIAC BARREKH" #x074A)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00780-007BF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00780-007BF.el
deleted file mode 100644
index bb572921dd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00780-007BF.el
+++ /dev/null
@@ -1,52 +0,0 @@
-(nxml-define-char-name-set 'thaana
-  '(("THAANA LETTER HAA" #x0780)
-    ("THAANA LETTER SHAVIYANI" #x0781)
-    ("THAANA LETTER NOONU" #x0782)
-    ("THAANA LETTER RAA" #x0783)
-    ("THAANA LETTER BAA" #x0784)
-    ("THAANA LETTER LHAVIYANI" #x0785)
-    ("THAANA LETTER KAAFU" #x0786)
-    ("THAANA LETTER ALIFU" #x0787)
-    ("THAANA LETTER VAAVU" #x0788)
-    ("THAANA LETTER MEEMU" #x0789)
-    ("THAANA LETTER FAAFU" #x078A)
-    ("THAANA LETTER DHAALU" #x078B)
-    ("THAANA LETTER THAA" #x078C)
-    ("THAANA LETTER LAAMU" #x078D)
-    ("THAANA LETTER GAAFU" #x078E)
-    ("THAANA LETTER GNAVIYANI" #x078F)
-    ("THAANA LETTER SEENU" #x0790)
-    ("THAANA LETTER DAVIYANI" #x0791)
-    ("THAANA LETTER ZAVIYANI" #x0792)
-    ("THAANA LETTER TAVIYANI" #x0793)
-    ("THAANA LETTER YAA" #x0794)
-    ("THAANA LETTER PAVIYANI" #x0795)
-    ("THAANA LETTER JAVIYANI" #x0796)
-    ("THAANA LETTER CHAVIYANI" #x0797)
-    ("THAANA LETTER TTAA" #x0798)
-    ("THAANA LETTER HHAA" #x0799)
-    ("THAANA LETTER KHAA" #x079A)
-    ("THAANA LETTER THAALU" #x079B)
-    ("THAANA LETTER ZAA" #x079C)
-    ("THAANA LETTER SHEENU" #x079D)
-    ("THAANA LETTER SAADHU" #x079E)
-    ("THAANA LETTER DAADHU" #x079F)
-    ("THAANA LETTER TO" #x07A0)
-    ("THAANA LETTER ZO" #x07A1)
-    ("THAANA LETTER AINU" #x07A2)
-    ("THAANA LETTER GHAINU" #x07A3)
-    ("THAANA LETTER QAAFU" #x07A4)
-    ("THAANA LETTER WAAVU" #x07A5)
-    ("THAANA ABAFILI" #x07A6)
-    ("THAANA AABAAFILI" #x07A7)
-    ("THAANA IBIFILI" #x07A8)
-    ("THAANA EEBEEFILI" #x07A9)
-    ("THAANA UBUFILI" #x07AA)
-    ("THAANA OOBOOFILI" #x07AB)
-    ("THAANA EBEFILI" #x07AC)
-    ("THAANA EYBEYFILI" #x07AD)
-    ("THAANA OBOFILI" #x07AE)
-    ("THAANA OABOAFILI" #x07AF)
-    ("THAANA SUKUN" #x07B0)
-    ("THAANA LETTER NAA" #x07B1)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00900-0097F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00900-0097F.el
deleted file mode 100644
index c93dd4654b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00900-0097F.el
+++ /dev/null
@@ -1,106 +0,0 @@
-(nxml-define-char-name-set 'devanagari
-  '(("DEVANAGARI SIGN CANDRABINDU" #x0901)
-    ("DEVANAGARI SIGN ANUSVARA" #x0902)
-    ("DEVANAGARI SIGN VISARGA" #x0903)
-    ("DEVANAGARI LETTER A" #x0905)
-    ("DEVANAGARI LETTER AA" #x0906)
-    ("DEVANAGARI LETTER I" #x0907)
-    ("DEVANAGARI LETTER II" #x0908)
-    ("DEVANAGARI LETTER U" #x0909)
-    ("DEVANAGARI LETTER UU" #x090A)
-    ("DEVANAGARI LETTER VOCALIC R" #x090B)
-    ("DEVANAGARI LETTER VOCALIC L" #x090C)
-    ("DEVANAGARI LETTER CANDRA E" #x090D)
-    ("DEVANAGARI LETTER SHORT E" #x090E)
-    ("DEVANAGARI LETTER E" #x090F)
-    ("DEVANAGARI LETTER AI" #x0910)
-    ("DEVANAGARI LETTER CANDRA O" #x0911)
-    ("DEVANAGARI LETTER SHORT O" #x0912)
-    ("DEVANAGARI LETTER O" #x0913)
-    ("DEVANAGARI LETTER AU" #x0914)
-    ("DEVANAGARI LETTER KA" #x0915)
-    ("DEVANAGARI LETTER KHA" #x0916)
-    ("DEVANAGARI LETTER GA" #x0917)
-    ("DEVANAGARI LETTER GHA" #x0918)
-    ("DEVANAGARI LETTER NGA" #x0919)
-    ("DEVANAGARI LETTER CA" #x091A)
-    ("DEVANAGARI LETTER CHA" #x091B)
-    ("DEVANAGARI LETTER JA" #x091C)
-    ("DEVANAGARI LETTER JHA" #x091D)
-    ("DEVANAGARI LETTER NYA" #x091E)
-    ("DEVANAGARI LETTER TTA" #x091F)
-    ("DEVANAGARI LETTER TTHA" #x0920)
-    ("DEVANAGARI LETTER DDA" #x0921)
-    ("DEVANAGARI LETTER DDHA" #x0922)
-    ("DEVANAGARI LETTER NNA" #x0923)
-    ("DEVANAGARI LETTER TA" #x0924)
-    ("DEVANAGARI LETTER THA" #x0925)
-    ("DEVANAGARI LETTER DA" #x0926)
-    ("DEVANAGARI LETTER DHA" #x0927)
-    ("DEVANAGARI LETTER NA" #x0928)
-    ("DEVANAGARI LETTER NNNA" #x0929)
-    ("DEVANAGARI LETTER PA" #x092A)
-    ("DEVANAGARI LETTER PHA" #x092B)
-    ("DEVANAGARI LETTER BA" #x092C)
-    ("DEVANAGARI LETTER BHA" #x092D)
-    ("DEVANAGARI LETTER MA" #x092E)
-    ("DEVANAGARI LETTER YA" #x092F)
-    ("DEVANAGARI LETTER RA" #x0930)
-    ("DEVANAGARI LETTER RRA" #x0931)
-    ("DEVANAGARI LETTER LA" #x0932)
-    ("DEVANAGARI LETTER LLA" #x0933)
-    ("DEVANAGARI LETTER LLLA" #x0934)
-    ("DEVANAGARI LETTER VA" #x0935)
-    ("DEVANAGARI LETTER SHA" #x0936)
-    ("DEVANAGARI LETTER SSA" #x0937)
-    ("DEVANAGARI LETTER SA" #x0938)
-    ("DEVANAGARI LETTER HA" #x0939)
-    ("DEVANAGARI SIGN NUKTA" #x093C)
-    ("DEVANAGARI SIGN AVAGRAHA" #x093D)
-    ("DEVANAGARI VOWEL SIGN AA" #x093E)
-    ("DEVANAGARI VOWEL SIGN I" #x093F)
-    ("DEVANAGARI VOWEL SIGN II" #x0940)
-    ("DEVANAGARI VOWEL SIGN U" #x0941)
-    ("DEVANAGARI VOWEL SIGN UU" #x0942)
-    ("DEVANAGARI VOWEL SIGN VOCALIC R" #x0943)
-    ("DEVANAGARI VOWEL SIGN VOCALIC RR" #x0944)
-    ("DEVANAGARI VOWEL SIGN CANDRA E" #x0945)
-    ("DEVANAGARI VOWEL SIGN SHORT E" #x0946)
-    ("DEVANAGARI VOWEL SIGN E" #x0947)
-    ("DEVANAGARI VOWEL SIGN AI" #x0948)
-    ("DEVANAGARI VOWEL SIGN CANDRA O" #x0949)
-    ("DEVANAGARI VOWEL SIGN SHORT O" #x094A)
-    ("DEVANAGARI VOWEL SIGN O" #x094B)
-    ("DEVANAGARI VOWEL SIGN AU" #x094C)
-    ("DEVANAGARI SIGN VIRAMA" #x094D)
-    ("DEVANAGARI OM" #x0950)
-    ("DEVANAGARI STRESS SIGN UDATTA" #x0951)
-    ("DEVANAGARI STRESS SIGN ANUDATTA" #x0952)
-    ("DEVANAGARI GRAVE ACCENT" #x0953)
-    ("DEVANAGARI ACUTE ACCENT" #x0954)
-    ("DEVANAGARI LETTER QA" #x0958)
-    ("DEVANAGARI LETTER KHHA" #x0959)
-    ("DEVANAGARI LETTER GHHA" #x095A)
-    ("DEVANAGARI LETTER ZA" #x095B)
-    ("DEVANAGARI LETTER DDDHA" #x095C)
-    ("DEVANAGARI LETTER RHA" #x095D)
-    ("DEVANAGARI LETTER FA" #x095E)
-    ("DEVANAGARI LETTER YYA" #x095F)
-    ("DEVANAGARI LETTER VOCALIC RR" #x0960)
-    ("DEVANAGARI LETTER VOCALIC LL" #x0961)
-    ("DEVANAGARI VOWEL SIGN VOCALIC L" #x0962)
-    ("DEVANAGARI VOWEL SIGN VOCALIC LL" #x0963)
-    ("DEVANAGARI DANDA" #x0964)
-    ("DEVANAGARI DOUBLE DANDA" #x0965)
-    ("DEVANAGARI DIGIT ZERO" #x0966)
-    ("DEVANAGARI DIGIT ONE" #x0967)
-    ("DEVANAGARI DIGIT TWO" #x0968)
-    ("DEVANAGARI DIGIT THREE" #x0969)
-    ("DEVANAGARI DIGIT FOUR" #x096A)
-    ("DEVANAGARI DIGIT FIVE" #x096B)
-    ("DEVANAGARI DIGIT SIX" #x096C)
-    ("DEVANAGARI DIGIT SEVEN" #x096D)
-    ("DEVANAGARI DIGIT EIGHT" #x096E)
-    ("DEVANAGARI DIGIT NINE" #x096F)
-    ("DEVANAGARI ABBREVIATION SIGN" #x0970)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00980-009FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00980-009FF.el
deleted file mode 100644
index cfae10e095..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00980-009FF.el
+++ /dev/null
@@ -1,91 +0,0 @@
-(nxml-define-char-name-set 'bengali
-  '(("BENGALI SIGN CANDRABINDU" #x0981)
-    ("BENGALI SIGN ANUSVARA" #x0982)
-    ("BENGALI SIGN VISARGA" #x0983)
-    ("BENGALI LETTER A" #x0985)
-    ("BENGALI LETTER AA" #x0986)
-    ("BENGALI LETTER I" #x0987)
-    ("BENGALI LETTER II" #x0988)
-    ("BENGALI LETTER U" #x0989)
-    ("BENGALI LETTER UU" #x098A)
-    ("BENGALI LETTER VOCALIC R" #x098B)
-    ("BENGALI LETTER VOCALIC L" #x098C)
-    ("BENGALI LETTER E" #x098F)
-    ("BENGALI LETTER AI" #x0990)
-    ("BENGALI LETTER O" #x0993)
-    ("BENGALI LETTER AU" #x0994)
-    ("BENGALI LETTER KA" #x0995)
-    ("BENGALI LETTER KHA" #x0996)
-    ("BENGALI LETTER GA" #x0997)
-    ("BENGALI LETTER GHA" #x0998)
-    ("BENGALI LETTER NGA" #x0999)
-    ("BENGALI LETTER CA" #x099A)
-    ("BENGALI LETTER CHA" #x099B)
-    ("BENGALI LETTER JA" #x099C)
-    ("BENGALI LETTER JHA" #x099D)
-    ("BENGALI LETTER NYA" #x099E)
-    ("BENGALI LETTER TTA" #x099F)
-    ("BENGALI LETTER TTHA" #x09A0)
-    ("BENGALI LETTER DDA" #x09A1)
-    ("BENGALI LETTER DDHA" #x09A2)
-    ("BENGALI LETTER NNA" #x09A3)
-    ("BENGALI LETTER TA" #x09A4)
-    ("BENGALI LETTER THA" #x09A5)
-    ("BENGALI LETTER DA" #x09A6)
-    ("BENGALI LETTER DHA" #x09A7)
-    ("BENGALI LETTER NA" #x09A8)
-    ("BENGALI LETTER PA" #x09AA)
-    ("BENGALI LETTER PHA" #x09AB)
-    ("BENGALI LETTER BA" #x09AC)
-    ("BENGALI LETTER BHA" #x09AD)
-    ("BENGALI LETTER MA" #x09AE)
-    ("BENGALI LETTER YA" #x09AF)
-    ("BENGALI LETTER RA" #x09B0)
-    ("BENGALI LETTER LA" #x09B2)
-    ("BENGALI LETTER SHA" #x09B6)
-    ("BENGALI LETTER SSA" #x09B7)
-    ("BENGALI LETTER SA" #x09B8)
-    ("BENGALI LETTER HA" #x09B9)
-    ("BENGALI SIGN NUKTA" #x09BC)
-    ("BENGALI VOWEL SIGN AA" #x09BE)
-    ("BENGALI VOWEL SIGN I" #x09BF)
-    ("BENGALI VOWEL SIGN II" #x09C0)
-    ("BENGALI VOWEL SIGN U" #x09C1)
-    ("BENGALI VOWEL SIGN UU" #x09C2)
-    ("BENGALI VOWEL SIGN VOCALIC R" #x09C3)
-    ("BENGALI VOWEL SIGN VOCALIC RR" #x09C4)
-    ("BENGALI VOWEL SIGN E" #x09C7)
-    ("BENGALI VOWEL SIGN AI" #x09C8)
-    ("BENGALI VOWEL SIGN O" #x09CB)
-    ("BENGALI VOWEL SIGN AU" #x09CC)
-    ("BENGALI SIGN VIRAMA" #x09CD)
-    ("BENGALI AU LENGTH MARK" #x09D7)
-    ("BENGALI LETTER RRA" #x09DC)
-    ("BENGALI LETTER RHA" #x09DD)
-    ("BENGALI LETTER YYA" #x09DF)
-    ("BENGALI LETTER VOCALIC RR" #x09E0)
-    ("BENGALI LETTER VOCALIC LL" #x09E1)
-    ("BENGALI VOWEL SIGN VOCALIC L" #x09E2)
-    ("BENGALI VOWEL SIGN VOCALIC LL" #x09E3)
-    ("BENGALI DIGIT ZERO" #x09E6)
-    ("BENGALI DIGIT ONE" #x09E7)
-    ("BENGALI DIGIT TWO" #x09E8)
-    ("BENGALI DIGIT THREE" #x09E9)
-    ("BENGALI DIGIT FOUR" #x09EA)
-    ("BENGALI DIGIT FIVE" #x09EB)
-    ("BENGALI DIGIT SIX" #x09EC)
-    ("BENGALI DIGIT SEVEN" #x09ED)
-    ("BENGALI DIGIT EIGHT" #x09EE)
-    ("BENGALI DIGIT NINE" #x09EF)
-    ("BENGALI LETTER RA WITH MIDDLE DIAGONAL" #x09F0)
-    ("BENGALI LETTER RA WITH LOWER DIAGONAL" #x09F1)
-    ("BENGALI RUPEE MARK" #x09F2)
-    ("BENGALI RUPEE SIGN" #x09F3)
-    ("BENGALI CURRENCY NUMERATOR ONE" #x09F4)
-    ("BENGALI CURRENCY NUMERATOR TWO" #x09F5)
-    ("BENGALI CURRENCY NUMERATOR THREE" #x09F6)
-    ("BENGALI CURRENCY NUMERATOR FOUR" #x09F7)
-    ("BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR" #x09F8)
-    ("BENGALI CURRENCY DENOMINATOR SIXTEEN" #x09F9)
-    ("BENGALI ISSHAR" #x09FA)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A00-00A7F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A00-00A7F.el
deleted file mode 100644
index 5adfaed0ef..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A00-00A7F.el
+++ /dev/null
@@ -1,77 +0,0 @@
-(nxml-define-char-name-set 'gurmukhi
-  '(("GURMUKHI SIGN BINDI" #x0A02)
-    ("GURMUKHI LETTER A" #x0A05)
-    ("GURMUKHI LETTER AA" #x0A06)
-    ("GURMUKHI LETTER I" #x0A07)
-    ("GURMUKHI LETTER II" #x0A08)
-    ("GURMUKHI LETTER U" #x0A09)
-    ("GURMUKHI LETTER UU" #x0A0A)
-    ("GURMUKHI LETTER EE" #x0A0F)
-    ("GURMUKHI LETTER AI" #x0A10)
-    ("GURMUKHI LETTER OO" #x0A13)
-    ("GURMUKHI LETTER AU" #x0A14)
-    ("GURMUKHI LETTER KA" #x0A15)
-    ("GURMUKHI LETTER KHA" #x0A16)
-    ("GURMUKHI LETTER GA" #x0A17)
-    ("GURMUKHI LETTER GHA" #x0A18)
-    ("GURMUKHI LETTER NGA" #x0A19)
-    ("GURMUKHI LETTER CA" #x0A1A)
-    ("GURMUKHI LETTER CHA" #x0A1B)
-    ("GURMUKHI LETTER JA" #x0A1C)
-    ("GURMUKHI LETTER JHA" #x0A1D)
-    ("GURMUKHI LETTER NYA" #x0A1E)
-    ("GURMUKHI LETTER TTA" #x0A1F)
-    ("GURMUKHI LETTER TTHA" #x0A20)
-    ("GURMUKHI LETTER DDA" #x0A21)
-    ("GURMUKHI LETTER DDHA" #x0A22)
-    ("GURMUKHI LETTER NNA" #x0A23)
-    ("GURMUKHI LETTER TA" #x0A24)
-    ("GURMUKHI LETTER THA" #x0A25)
-    ("GURMUKHI LETTER DA" #x0A26)
-    ("GURMUKHI LETTER DHA" #x0A27)
-    ("GURMUKHI LETTER NA" #x0A28)
-    ("GURMUKHI LETTER PA" #x0A2A)
-    ("GURMUKHI LETTER PHA" #x0A2B)
-    ("GURMUKHI LETTER BA" #x0A2C)
-    ("GURMUKHI LETTER BHA" #x0A2D)
-    ("GURMUKHI LETTER MA" #x0A2E)
-    ("GURMUKHI LETTER YA" #x0A2F)
-    ("GURMUKHI LETTER RA" #x0A30)
-    ("GURMUKHI LETTER LA" #x0A32)
-    ("GURMUKHI LETTER LLA" #x0A33)
-    ("GURMUKHI LETTER VA" #x0A35)
-    ("GURMUKHI LETTER SHA" #x0A36)
-    ("GURMUKHI LETTER SA" #x0A38)
-    ("GURMUKHI LETTER HA" #x0A39)
-    ("GURMUKHI SIGN NUKTA" #x0A3C)
-    ("GURMUKHI VOWEL SIGN AA" #x0A3E)
-    ("GURMUKHI VOWEL SIGN I" #x0A3F)
-    ("GURMUKHI VOWEL SIGN II" #x0A40)
-    ("GURMUKHI VOWEL SIGN U" #x0A41)
-    ("GURMUKHI VOWEL SIGN UU" #x0A42)
-    ("GURMUKHI VOWEL SIGN EE" #x0A47)
-    ("GURMUKHI VOWEL SIGN AI" #x0A48)
-    ("GURMUKHI VOWEL SIGN OO" #x0A4B)
-    ("GURMUKHI VOWEL SIGN AU" #x0A4C)
-    ("GURMUKHI SIGN VIRAMA" #x0A4D)
-    ("GURMUKHI LETTER KHHA" #x0A59)
-    ("GURMUKHI LETTER GHHA" #x0A5A)
-    ("GURMUKHI LETTER ZA" #x0A5B)
-    ("GURMUKHI LETTER RRA" #x0A5C)
-    ("GURMUKHI LETTER FA" #x0A5E)
-    ("GURMUKHI DIGIT ZERO" #x0A66)
-    ("GURMUKHI DIGIT ONE" #x0A67)
-    ("GURMUKHI DIGIT TWO" #x0A68)
-    ("GURMUKHI DIGIT THREE" #x0A69)
-    ("GURMUKHI DIGIT FOUR" #x0A6A)
-    ("GURMUKHI DIGIT FIVE" #x0A6B)
-    ("GURMUKHI DIGIT SIX" #x0A6C)
-    ("GURMUKHI DIGIT SEVEN" #x0A6D)
-    ("GURMUKHI DIGIT EIGHT" #x0A6E)
-    ("GURMUKHI DIGIT NINE" #x0A6F)
-    ("GURMUKHI TIPPI" #x0A70)
-    ("GURMUKHI ADDAK" #x0A71)
-    ("GURMUKHI IRI" #x0A72)
-    ("GURMUKHI URA" #x0A73)
-    ("GURMUKHI EK ONKAR" #x0A74)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A80-00AFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A80-00AFF.el
deleted file mode 100644
index 35be7fa7a5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00A80-00AFF.el
+++ /dev/null
@@ -1,80 +0,0 @@
-(nxml-define-char-name-set 'gujarati
-  '(("GUJARATI SIGN CANDRABINDU" #x0A81)
-    ("GUJARATI SIGN ANUSVARA" #x0A82)
-    ("GUJARATI SIGN VISARGA" #x0A83)
-    ("GUJARATI LETTER A" #x0A85)
-    ("GUJARATI LETTER AA" #x0A86)
-    ("GUJARATI LETTER I" #x0A87)
-    ("GUJARATI LETTER II" #x0A88)
-    ("GUJARATI LETTER U" #x0A89)
-    ("GUJARATI LETTER UU" #x0A8A)
-    ("GUJARATI LETTER VOCALIC R" #x0A8B)
-    ("GUJARATI VOWEL CANDRA E" #x0A8D)
-    ("GUJARATI LETTER E" #x0A8F)
-    ("GUJARATI LETTER AI" #x0A90)
-    ("GUJARATI VOWEL CANDRA O" #x0A91)
-    ("GUJARATI LETTER O" #x0A93)
-    ("GUJARATI LETTER AU" #x0A94)
-    ("GUJARATI LETTER KA" #x0A95)
-    ("GUJARATI LETTER KHA" #x0A96)
-    ("GUJARATI LETTER GA" #x0A97)
-    ("GUJARATI LETTER GHA" #x0A98)
-    ("GUJARATI LETTER NGA" #x0A99)
-    ("GUJARATI LETTER CA" #x0A9A)
-    ("GUJARATI LETTER CHA" #x0A9B)
-    ("GUJARATI LETTER JA" #x0A9C)
-    ("GUJARATI LETTER JHA" #x0A9D)
-    ("GUJARATI LETTER NYA" #x0A9E)
-    ("GUJARATI LETTER TTA" #x0A9F)
-    ("GUJARATI LETTER TTHA" #x0AA0)
-    ("GUJARATI LETTER DDA" #x0AA1)
-    ("GUJARATI LETTER DDHA" #x0AA2)
-    ("GUJARATI LETTER NNA" #x0AA3)
-    ("GUJARATI LETTER TA" #x0AA4)
-    ("GUJARATI LETTER THA" #x0AA5)
-    ("GUJARATI LETTER DA" #x0AA6)
-    ("GUJARATI LETTER DHA" #x0AA7)
-    ("GUJARATI LETTER NA" #x0AA8)
-    ("GUJARATI LETTER PA" #x0AAA)
-    ("GUJARATI LETTER PHA" #x0AAB)
-    ("GUJARATI LETTER BA" #x0AAC)
-    ("GUJARATI LETTER BHA" #x0AAD)
-    ("GUJARATI LETTER MA" #x0AAE)
-    ("GUJARATI LETTER YA" #x0AAF)
-    ("GUJARATI LETTER RA" #x0AB0)
-    ("GUJARATI LETTER LA" #x0AB2)
-    ("GUJARATI LETTER LLA" #x0AB3)
-    ("GUJARATI LETTER VA" #x0AB5)
-    ("GUJARATI LETTER SHA" #x0AB6)
-    ("GUJARATI LETTER SSA" #x0AB7)
-    ("GUJARATI LETTER SA" #x0AB8)
-    ("GUJARATI LETTER HA" #x0AB9)
-    ("GUJARATI SIGN NUKTA" #x0ABC)
-    ("GUJARATI SIGN AVAGRAHA" #x0ABD)
-    ("GUJARATI VOWEL SIGN AA" #x0ABE)
-    ("GUJARATI VOWEL SIGN I" #x0ABF)
-    ("GUJARATI VOWEL SIGN II" #x0AC0)
-    ("GUJARATI VOWEL SIGN U" #x0AC1)
-    ("GUJARATI VOWEL SIGN UU" #x0AC2)
-    ("GUJARATI VOWEL SIGN VOCALIC R" #x0AC3)
-    ("GUJARATI VOWEL SIGN VOCALIC RR" #x0AC4)
-    ("GUJARATI VOWEL SIGN CANDRA E" #x0AC5)
-    ("GUJARATI VOWEL SIGN E" #x0AC7)
-    ("GUJARATI VOWEL SIGN AI" #x0AC8)
-    ("GUJARATI VOWEL SIGN CANDRA O" #x0AC9)
-    ("GUJARATI VOWEL SIGN O" #x0ACB)
-    ("GUJARATI VOWEL SIGN AU" #x0ACC)
-    ("GUJARATI SIGN VIRAMA" #x0ACD)
-    ("GUJARATI OM" #x0AD0)
-    ("GUJARATI LETTER VOCALIC RR" #x0AE0)
-    ("GUJARATI DIGIT ZERO" #x0AE6)
-    ("GUJARATI DIGIT ONE" #x0AE7)
-    ("GUJARATI DIGIT TWO" #x0AE8)
-    ("GUJARATI DIGIT THREE" #x0AE9)
-    ("GUJARATI DIGIT FOUR" #x0AEA)
-    ("GUJARATI DIGIT FIVE" #x0AEB)
-    ("GUJARATI DIGIT SIX" #x0AEC)
-    ("GUJARATI DIGIT SEVEN" #x0AED)
-    ("GUJARATI DIGIT EIGHT" #x0AEE)
-    ("GUJARATI DIGIT NINE" #x0AEF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B00-00B7F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B00-00B7F.el
deleted file mode 100644
index e0d08648c9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B00-00B7F.el
+++ /dev/null
@@ -1,81 +0,0 @@
-(nxml-define-char-name-set 'oriya
-  '(("ORIYA SIGN CANDRABINDU" #x0B01)
-    ("ORIYA SIGN ANUSVARA" #x0B02)
-    ("ORIYA SIGN VISARGA" #x0B03)
-    ("ORIYA LETTER A" #x0B05)
-    ("ORIYA LETTER AA" #x0B06)
-    ("ORIYA LETTER I" #x0B07)
-    ("ORIYA LETTER II" #x0B08)
-    ("ORIYA LETTER U" #x0B09)
-    ("ORIYA LETTER UU" #x0B0A)
-    ("ORIYA LETTER VOCALIC R" #x0B0B)
-    ("ORIYA LETTER VOCALIC L" #x0B0C)
-    ("ORIYA LETTER E" #x0B0F)
-    ("ORIYA LETTER AI" #x0B10)
-    ("ORIYA LETTER O" #x0B13)
-    ("ORIYA LETTER AU" #x0B14)
-    ("ORIYA LETTER KA" #x0B15)
-    ("ORIYA LETTER KHA" #x0B16)
-    ("ORIYA LETTER GA" #x0B17)
-    ("ORIYA LETTER GHA" #x0B18)
-    ("ORIYA LETTER NGA" #x0B19)
-    ("ORIYA LETTER CA" #x0B1A)
-    ("ORIYA LETTER CHA" #x0B1B)
-    ("ORIYA LETTER JA" #x0B1C)
-    ("ORIYA LETTER JHA" #x0B1D)
-    ("ORIYA LETTER NYA" #x0B1E)
-    ("ORIYA LETTER TTA" #x0B1F)
-    ("ORIYA LETTER TTHA" #x0B20)
-    ("ORIYA LETTER DDA" #x0B21)
-    ("ORIYA LETTER DDHA" #x0B22)
-    ("ORIYA LETTER NNA" #x0B23)
-    ("ORIYA LETTER TA" #x0B24)
-    ("ORIYA LETTER THA" #x0B25)
-    ("ORIYA LETTER DA" #x0B26)
-    ("ORIYA LETTER DHA" #x0B27)
-    ("ORIYA LETTER NA" #x0B28)
-    ("ORIYA LETTER PA" #x0B2A)
-    ("ORIYA LETTER PHA" #x0B2B)
-    ("ORIYA LETTER BA" #x0B2C)
-    ("ORIYA LETTER BHA" #x0B2D)
-    ("ORIYA LETTER MA" #x0B2E)
-    ("ORIYA LETTER YA" #x0B2F)
-    ("ORIYA LETTER RA" #x0B30)
-    ("ORIYA LETTER LA" #x0B32)
-    ("ORIYA LETTER LLA" #x0B33)
-    ("ORIYA LETTER SHA" #x0B36)
-    ("ORIYA LETTER SSA" #x0B37)
-    ("ORIYA LETTER SA" #x0B38)
-    ("ORIYA LETTER HA" #x0B39)
-    ("ORIYA SIGN NUKTA" #x0B3C)
-    ("ORIYA SIGN AVAGRAHA" #x0B3D)
-    ("ORIYA VOWEL SIGN AA" #x0B3E)
-    ("ORIYA VOWEL SIGN I" #x0B3F)
-    ("ORIYA VOWEL SIGN II" #x0B40)
-    ("ORIYA VOWEL SIGN U" #x0B41)
-    ("ORIYA VOWEL SIGN UU" #x0B42)
-    ("ORIYA VOWEL SIGN VOCALIC R" #x0B43)
-    ("ORIYA VOWEL SIGN E" #x0B47)
-    ("ORIYA VOWEL SIGN AI" #x0B48)
-    ("ORIYA VOWEL SIGN O" #x0B4B)
-    ("ORIYA VOWEL SIGN AU" #x0B4C)
-    ("ORIYA SIGN VIRAMA" #x0B4D)
-    ("ORIYA AI LENGTH MARK" #x0B56)
-    ("ORIYA AU LENGTH MARK" #x0B57)
-    ("ORIYA LETTER RRA" #x0B5C)
-    ("ORIYA LETTER RHA" #x0B5D)
-    ("ORIYA LETTER YYA" #x0B5F)
-    ("ORIYA LETTER VOCALIC RR" #x0B60)
-    ("ORIYA LETTER VOCALIC LL" #x0B61)
-    ("ORIYA DIGIT ZERO" #x0B66)
-    ("ORIYA DIGIT ONE" #x0B67)
-    ("ORIYA DIGIT TWO" #x0B68)
-    ("ORIYA DIGIT THREE" #x0B69)
-    ("ORIYA DIGIT FOUR" #x0B6A)
-    ("ORIYA DIGIT FIVE" #x0B6B)
-    ("ORIYA DIGIT SIX" #x0B6C)
-    ("ORIYA DIGIT SEVEN" #x0B6D)
-    ("ORIYA DIGIT EIGHT" #x0B6E)
-    ("ORIYA DIGIT NINE" #x0B6F)
-    ("ORIYA ISSHAR" #x0B70)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B80-00BFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B80-00BFF.el
deleted file mode 100644
index 8e23e1341c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00B80-00BFF.el
+++ /dev/null
@@ -1,63 +0,0 @@
-(nxml-define-char-name-set 'tamil
-  '(("TAMIL SIGN ANUSVARA" #x0B82)
-    ("TAMIL SIGN VISARGA" #x0B83)
-    ("TAMIL LETTER A" #x0B85)
-    ("TAMIL LETTER AA" #x0B86)
-    ("TAMIL LETTER I" #x0B87)
-    ("TAMIL LETTER II" #x0B88)
-    ("TAMIL LETTER U" #x0B89)
-    ("TAMIL LETTER UU" #x0B8A)
-    ("TAMIL LETTER E" #x0B8E)
-    ("TAMIL LETTER EE" #x0B8F)
-    ("TAMIL LETTER AI" #x0B90)
-    ("TAMIL LETTER O" #x0B92)
-    ("TAMIL LETTER OO" #x0B93)
-    ("TAMIL LETTER AU" #x0B94)
-    ("TAMIL LETTER KA" #x0B95)
-    ("TAMIL LETTER NGA" #x0B99)
-    ("TAMIL LETTER CA" #x0B9A)
-    ("TAMIL LETTER JA" #x0B9C)
-    ("TAMIL LETTER NYA" #x0B9E)
-    ("TAMIL LETTER TTA" #x0B9F)
-    ("TAMIL LETTER NNA" #x0BA3)
-    ("TAMIL LETTER TA" #x0BA4)
-    ("TAMIL LETTER NA" #x0BA8)
-    ("TAMIL LETTER NNNA" #x0BA9)
-    ("TAMIL LETTER PA" #x0BAA)
-    ("TAMIL LETTER MA" #x0BAE)
-    ("TAMIL LETTER YA" #x0BAF)
-    ("TAMIL LETTER RA" #x0BB0)
-    ("TAMIL LETTER RRA" #x0BB1)
-    ("TAMIL LETTER LA" #x0BB2)
-    ("TAMIL LETTER LLA" #x0BB3)
-    ("TAMIL LETTER LLLA" #x0BB4)
-    ("TAMIL LETTER VA" #x0BB5)
-    ("TAMIL LETTER SSA" #x0BB7)
-    ("TAMIL LETTER SA" #x0BB8)
-    ("TAMIL LETTER HA" #x0BB9)
-    ("TAMIL VOWEL SIGN AA" #x0BBE)
-    ("TAMIL VOWEL SIGN I" #x0BBF)
-    ("TAMIL VOWEL SIGN II" #x0BC0)
-    ("TAMIL VOWEL SIGN U" #x0BC1)
-    ("TAMIL VOWEL SIGN UU" #x0BC2)
-    ("TAMIL VOWEL SIGN E" #x0BC6)
-    ("TAMIL VOWEL SIGN EE" #x0BC7)
-    ("TAMIL VOWEL SIGN AI" #x0BC8)
-    ("TAMIL VOWEL SIGN O" #x0BCA)
-    ("TAMIL VOWEL SIGN OO" #x0BCB)
-    ("TAMIL VOWEL SIGN AU" #x0BCC)
-    ("TAMIL SIGN VIRAMA" #x0BCD)
-    ("TAMIL AU LENGTH MARK" #x0BD7)
-    ("TAMIL DIGIT ONE" #x0BE7)
-    ("TAMIL DIGIT TWO" #x0BE8)
-    ("TAMIL DIGIT THREE" #x0BE9)
-    ("TAMIL DIGIT FOUR" #x0BEA)
-    ("TAMIL DIGIT FIVE" #x0BEB)
-    ("TAMIL DIGIT SIX" #x0BEC)
-    ("TAMIL DIGIT SEVEN" #x0BED)
-    ("TAMIL DIGIT EIGHT" #x0BEE)
-    ("TAMIL DIGIT NINE" #x0BEF)
-    ("TAMIL NUMBER TEN" #x0BF0)
-    ("TAMIL NUMBER ONE HUNDRED" #x0BF1)
-    ("TAMIL NUMBER ONE THOUSAND" #x0BF2)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C00-00C7F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C00-00C7F.el
deleted file mode 100644
index ef70b35ee1..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C00-00C7F.el
+++ /dev/null
@@ -1,82 +0,0 @@
-(nxml-define-char-name-set 'telugu
-  '(("TELUGU SIGN CANDRABINDU" #x0C01)
-    ("TELUGU SIGN ANUSVARA" #x0C02)
-    ("TELUGU SIGN VISARGA" #x0C03)
-    ("TELUGU LETTER A" #x0C05)
-    ("TELUGU LETTER AA" #x0C06)
-    ("TELUGU LETTER I" #x0C07)
-    ("TELUGU LETTER II" #x0C08)
-    ("TELUGU LETTER U" #x0C09)
-    ("TELUGU LETTER UU" #x0C0A)
-    ("TELUGU LETTER VOCALIC R" #x0C0B)
-    ("TELUGU LETTER VOCALIC L" #x0C0C)
-    ("TELUGU LETTER E" #x0C0E)
-    ("TELUGU LETTER EE" #x0C0F)
-    ("TELUGU LETTER AI" #x0C10)
-    ("TELUGU LETTER O" #x0C12)
-    ("TELUGU LETTER OO" #x0C13)
-    ("TELUGU LETTER AU" #x0C14)
-    ("TELUGU LETTER KA" #x0C15)
-    ("TELUGU LETTER KHA" #x0C16)
-    ("TELUGU LETTER GA" #x0C17)
-    ("TELUGU LETTER GHA" #x0C18)
-    ("TELUGU LETTER NGA" #x0C19)
-    ("TELUGU LETTER CA" #x0C1A)
-    ("TELUGU LETTER CHA" #x0C1B)
-    ("TELUGU LETTER JA" #x0C1C)
-    ("TELUGU LETTER JHA" #x0C1D)
-    ("TELUGU LETTER NYA" #x0C1E)
-    ("TELUGU LETTER TTA" #x0C1F)
-    ("TELUGU LETTER TTHA" #x0C20)
-    ("TELUGU LETTER DDA" #x0C21)
-    ("TELUGU LETTER DDHA" #x0C22)
-    ("TELUGU LETTER NNA" #x0C23)
-    ("TELUGU LETTER TA" #x0C24)
-    ("TELUGU LETTER THA" #x0C25)
-    ("TELUGU LETTER DA" #x0C26)
-    ("TELUGU LETTER DHA" #x0C27)
-    ("TELUGU LETTER NA" #x0C28)
-    ("TELUGU LETTER PA" #x0C2A)
-    ("TELUGU LETTER PHA" #x0C2B)
-    ("TELUGU LETTER BA" #x0C2C)
-    ("TELUGU LETTER BHA" #x0C2D)
-    ("TELUGU LETTER MA" #x0C2E)
-    ("TELUGU LETTER YA" #x0C2F)
-    ("TELUGU LETTER RA" #x0C30)
-    ("TELUGU LETTER RRA" #x0C31)
-    ("TELUGU LETTER LA" #x0C32)
-    ("TELUGU LETTER LLA" #x0C33)
-    ("TELUGU LETTER VA" #x0C35)
-    ("TELUGU LETTER SHA" #x0C36)
-    ("TELUGU LETTER SSA" #x0C37)
-    ("TELUGU LETTER SA" #x0C38)
-    ("TELUGU LETTER HA" #x0C39)
-    ("TELUGU VOWEL SIGN AA" #x0C3E)
-    ("TELUGU VOWEL SIGN I" #x0C3F)
-    ("TELUGU VOWEL SIGN II" #x0C40)
-    ("TELUGU VOWEL SIGN U" #x0C41)
-    ("TELUGU VOWEL SIGN UU" #x0C42)
-    ("TELUGU VOWEL SIGN VOCALIC R" #x0C43)
-    ("TELUGU VOWEL SIGN VOCALIC RR" #x0C44)
-    ("TELUGU VOWEL SIGN E" #x0C46)
-    ("TELUGU VOWEL SIGN EE" #x0C47)
-    ("TELUGU VOWEL SIGN AI" #x0C48)
-    ("TELUGU VOWEL SIGN O" #x0C4A)
-    ("TELUGU VOWEL SIGN OO" #x0C4B)
-    ("TELUGU VOWEL SIGN AU" #x0C4C)
-    ("TELUGU SIGN VIRAMA" #x0C4D)
-    ("TELUGU LENGTH MARK" #x0C55)
-    ("TELUGU AI LENGTH MARK" #x0C56)
-    ("TELUGU LETTER VOCALIC RR" #x0C60)
-    ("TELUGU LETTER VOCALIC LL" #x0C61)
-    ("TELUGU DIGIT ZERO" #x0C66)
-    ("TELUGU DIGIT ONE" #x0C67)
-    ("TELUGU DIGIT TWO" #x0C68)
-    ("TELUGU DIGIT THREE" #x0C69)
-    ("TELUGU DIGIT FOUR" #x0C6A)
-    ("TELUGU DIGIT FIVE" #x0C6B)
-    ("TELUGU DIGIT SIX" #x0C6C)
-    ("TELUGU DIGIT SEVEN" #x0C6D)
-    ("TELUGU DIGIT EIGHT" #x0C6E)
-    ("TELUGU DIGIT NINE" #x0C6F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C80-00CFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C80-00CFF.el
deleted file mode 100644
index b94e194456..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00C80-00CFF.el
+++ /dev/null
@@ -1,82 +0,0 @@
-(nxml-define-char-name-set 'kannada
-  '(("KANNADA SIGN ANUSVARA" #x0C82)
-    ("KANNADA SIGN VISARGA" #x0C83)
-    ("KANNADA LETTER A" #x0C85)
-    ("KANNADA LETTER AA" #x0C86)
-    ("KANNADA LETTER I" #x0C87)
-    ("KANNADA LETTER II" #x0C88)
-    ("KANNADA LETTER U" #x0C89)
-    ("KANNADA LETTER UU" #x0C8A)
-    ("KANNADA LETTER VOCALIC R" #x0C8B)
-    ("KANNADA LETTER VOCALIC L" #x0C8C)
-    ("KANNADA LETTER E" #x0C8E)
-    ("KANNADA LETTER EE" #x0C8F)
-    ("KANNADA LETTER AI" #x0C90)
-    ("KANNADA LETTER O" #x0C92)
-    ("KANNADA LETTER OO" #x0C93)
-    ("KANNADA LETTER AU" #x0C94)
-    ("KANNADA LETTER KA" #x0C95)
-    ("KANNADA LETTER KHA" #x0C96)
-    ("KANNADA LETTER GA" #x0C97)
-    ("KANNADA LETTER GHA" #x0C98)
-    ("KANNADA LETTER NGA" #x0C99)
-    ("KANNADA LETTER CA" #x0C9A)
-    ("KANNADA LETTER CHA" #x0C9B)
-    ("KANNADA LETTER JA" #x0C9C)
-    ("KANNADA LETTER JHA" #x0C9D)
-    ("KANNADA LETTER NYA" #x0C9E)
-    ("KANNADA LETTER TTA" #x0C9F)
-    ("KANNADA LETTER TTHA" #x0CA0)
-    ("KANNADA LETTER DDA" #x0CA1)
-    ("KANNADA LETTER DDHA" #x0CA2)
-    ("KANNADA LETTER NNA" #x0CA3)
-    ("KANNADA LETTER TA" #x0CA4)
-    ("KANNADA LETTER THA" #x0CA5)
-    ("KANNADA LETTER DA" #x0CA6)
-    ("KANNADA LETTER DHA" #x0CA7)
-    ("KANNADA LETTER NA" #x0CA8)
-    ("KANNADA LETTER PA" #x0CAA)
-    ("KANNADA LETTER PHA" #x0CAB)
-    ("KANNADA LETTER BA" #x0CAC)
-    ("KANNADA LETTER BHA" #x0CAD)
-    ("KANNADA LETTER MA" #x0CAE)
-    ("KANNADA LETTER YA" #x0CAF)
-    ("KANNADA LETTER RA" #x0CB0)
-    ("KANNADA LETTER RRA" #x0CB1)
-    ("KANNADA LETTER LA" #x0CB2)
-    ("KANNADA LETTER LLA" #x0CB3)
-    ("KANNADA LETTER VA" #x0CB5)
-    ("KANNADA LETTER SHA" #x0CB6)
-    ("KANNADA LETTER SSA" #x0CB7)
-    ("KANNADA LETTER SA" #x0CB8)
-    ("KANNADA LETTER HA" #x0CB9)
-    ("KANNADA VOWEL SIGN AA" #x0CBE)
-    ("KANNADA VOWEL SIGN I" #x0CBF)
-    ("KANNADA VOWEL SIGN II" #x0CC0)
-    ("KANNADA VOWEL SIGN U" #x0CC1)
-    ("KANNADA VOWEL SIGN UU" #x0CC2)
-    ("KANNADA VOWEL SIGN VOCALIC R" #x0CC3)
-    ("KANNADA VOWEL SIGN VOCALIC RR" #x0CC4)
-    ("KANNADA VOWEL SIGN E" #x0CC6)
-    ("KANNADA VOWEL SIGN EE" #x0CC7)
-    ("KANNADA VOWEL SIGN AI" #x0CC8)
-    ("KANNADA VOWEL SIGN O" #x0CCA)
-    ("KANNADA VOWEL SIGN OO" #x0CCB)
-    ("KANNADA VOWEL SIGN AU" #x0CCC)
-    ("KANNADA SIGN VIRAMA" #x0CCD)
-    ("KANNADA LENGTH MARK" #x0CD5)
-    ("KANNADA AI LENGTH MARK" #x0CD6)
-    ("KANNADA LETTER FA" #x0CDE)
-    ("KANNADA LETTER VOCALIC RR" #x0CE0)
-    ("KANNADA LETTER VOCALIC LL" #x0CE1)
-    ("KANNADA DIGIT ZERO" #x0CE6)
-    ("KANNADA DIGIT ONE" #x0CE7)
-    ("KANNADA DIGIT TWO" #x0CE8)
-    ("KANNADA DIGIT THREE" #x0CE9)
-    ("KANNADA DIGIT FOUR" #x0CEA)
-    ("KANNADA DIGIT FIVE" #x0CEB)
-    ("KANNADA DIGIT SIX" #x0CEC)
-    ("KANNADA DIGIT SEVEN" #x0CED)
-    ("KANNADA DIGIT EIGHT" #x0CEE)
-    ("KANNADA DIGIT NINE" #x0CEF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D00-00D7F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D00-00D7F.el
deleted file mode 100644
index e9ea7e2aea..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D00-00D7F.el
+++ /dev/null
@@ -1,80 +0,0 @@
-(nxml-define-char-name-set 'malayalam
-  '(("MALAYALAM SIGN ANUSVARA" #x0D02)
-    ("MALAYALAM SIGN VISARGA" #x0D03)
-    ("MALAYALAM LETTER A" #x0D05)
-    ("MALAYALAM LETTER AA" #x0D06)
-    ("MALAYALAM LETTER I" #x0D07)
-    ("MALAYALAM LETTER II" #x0D08)
-    ("MALAYALAM LETTER U" #x0D09)
-    ("MALAYALAM LETTER UU" #x0D0A)
-    ("MALAYALAM LETTER VOCALIC R" #x0D0B)
-    ("MALAYALAM LETTER VOCALIC L" #x0D0C)
-    ("MALAYALAM LETTER E" #x0D0E)
-    ("MALAYALAM LETTER EE" #x0D0F)
-    ("MALAYALAM LETTER AI" #x0D10)
-    ("MALAYALAM LETTER O" #x0D12)
-    ("MALAYALAM LETTER OO" #x0D13)
-    ("MALAYALAM LETTER AU" #x0D14)
-    ("MALAYALAM LETTER KA" #x0D15)
-    ("MALAYALAM LETTER KHA" #x0D16)
-    ("MALAYALAM LETTER GA" #x0D17)
-    ("MALAYALAM LETTER GHA" #x0D18)
-    ("MALAYALAM LETTER NGA" #x0D19)
-    ("MALAYALAM LETTER CA" #x0D1A)
-    ("MALAYALAM LETTER CHA" #x0D1B)
-    ("MALAYALAM LETTER JA" #x0D1C)
-    ("MALAYALAM LETTER JHA" #x0D1D)
-    ("MALAYALAM LETTER NYA" #x0D1E)
-    ("MALAYALAM LETTER TTA" #x0D1F)
-    ("MALAYALAM LETTER TTHA" #x0D20)
-    ("MALAYALAM LETTER DDA" #x0D21)
-    ("MALAYALAM LETTER DDHA" #x0D22)
-    ("MALAYALAM LETTER NNA" #x0D23)
-    ("MALAYALAM LETTER TA" #x0D24)
-    ("MALAYALAM LETTER THA" #x0D25)
-    ("MALAYALAM LETTER DA" #x0D26)
-    ("MALAYALAM LETTER DHA" #x0D27)
-    ("MALAYALAM LETTER NA" #x0D28)
-    ("MALAYALAM LETTER PA" #x0D2A)
-    ("MALAYALAM LETTER PHA" #x0D2B)
-    ("MALAYALAM LETTER BA" #x0D2C)
-    ("MALAYALAM LETTER BHA" #x0D2D)
-    ("MALAYALAM LETTER MA" #x0D2E)
-    ("MALAYALAM LETTER YA" #x0D2F)
-    ("MALAYALAM LETTER RA" #x0D30)
-    ("MALAYALAM LETTER RRA" #x0D31)
-    ("MALAYALAM LETTER LA" #x0D32)
-    ("MALAYALAM LETTER LLA" #x0D33)
-    ("MALAYALAM LETTER LLLA" #x0D34)
-    ("MALAYALAM LETTER VA" #x0D35)
-    ("MALAYALAM LETTER SHA" #x0D36)
-    ("MALAYALAM LETTER SSA" #x0D37)
-    ("MALAYALAM LETTER SA" #x0D38)
-    ("MALAYALAM LETTER HA" #x0D39)
-    ("MALAYALAM VOWEL SIGN AA" #x0D3E)
-    ("MALAYALAM VOWEL SIGN I" #x0D3F)
-    ("MALAYALAM VOWEL SIGN II" #x0D40)
-    ("MALAYALAM VOWEL SIGN U" #x0D41)
-    ("MALAYALAM VOWEL SIGN UU" #x0D42)
-    ("MALAYALAM VOWEL SIGN VOCALIC R" #x0D43)
-    ("MALAYALAM VOWEL SIGN E" #x0D46)
-    ("MALAYALAM VOWEL SIGN EE" #x0D47)
-    ("MALAYALAM VOWEL SIGN AI" #x0D48)
-    ("MALAYALAM VOWEL SIGN O" #x0D4A)
-    ("MALAYALAM VOWEL SIGN OO" #x0D4B)
-    ("MALAYALAM VOWEL SIGN AU" #x0D4C)
-    ("MALAYALAM SIGN VIRAMA" #x0D4D)
-    ("MALAYALAM AU LENGTH MARK" #x0D57)
-    ("MALAYALAM LETTER VOCALIC RR" #x0D60)
-    ("MALAYALAM LETTER VOCALIC LL" #x0D61)
-    ("MALAYALAM DIGIT ZERO" #x0D66)
-    ("MALAYALAM DIGIT ONE" #x0D67)
-    ("MALAYALAM DIGIT TWO" #x0D68)
-    ("MALAYALAM DIGIT THREE" #x0D69)
-    ("MALAYALAM DIGIT FOUR" #x0D6A)
-    ("MALAYALAM DIGIT FIVE" #x0D6B)
-    ("MALAYALAM DIGIT SIX" #x0D6C)
-    ("MALAYALAM DIGIT SEVEN" #x0D6D)
-    ("MALAYALAM DIGIT EIGHT" #x0D6E)
-    ("MALAYALAM DIGIT NINE" #x0D6F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D80-00DFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D80-00DFF.el
deleted file mode 100644
index d0278dd088..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00D80-00DFF.el
+++ /dev/null
@@ -1,82 +0,0 @@
-(nxml-define-char-name-set 'sinhala
-  '(("SINHALA SIGN ANUSVARAYA" #x0D82)
-    ("SINHALA SIGN VISARGAYA" #x0D83)
-    ("SINHALA LETTER AYANNA" #x0D85)
-    ("SINHALA LETTER AAYANNA" #x0D86)
-    ("SINHALA LETTER AEYANNA" #x0D87)
-    ("SINHALA LETTER AEEYANNA" #x0D88)
-    ("SINHALA LETTER IYANNA" #x0D89)
-    ("SINHALA LETTER IIYANNA" #x0D8A)
-    ("SINHALA LETTER UYANNA" #x0D8B)
-    ("SINHALA LETTER UUYANNA" #x0D8C)
-    ("SINHALA LETTER IRUYANNA" #x0D8D)
-    ("SINHALA LETTER IRUUYANNA" #x0D8E)
-    ("SINHALA LETTER ILUYANNA" #x0D8F)
-    ("SINHALA LETTER ILUUYANNA" #x0D90)
-    ("SINHALA LETTER EYANNA" #x0D91)
-    ("SINHALA LETTER EEYANNA" #x0D92)
-    ("SINHALA LETTER AIYANNA" #x0D93)
-    ("SINHALA LETTER OYANNA" #x0D94)
-    ("SINHALA LETTER OOYANNA" #x0D95)
-    ("SINHALA LETTER AUYANNA" #x0D96)
-    ("SINHALA LETTER ALPAPRAANA KAYANNA" #x0D9A)
-    ("SINHALA LETTER MAHAAPRAANA KAYANNA" #x0D9B)
-    ("SINHALA LETTER ALPAPRAANA GAYANNA" #x0D9C)
-    ("SINHALA LETTER MAHAAPRAANA GAYANNA" #x0D9D)
-    ("SINHALA LETTER KANTAJA NAASIKYAYA" #x0D9E)
-    ("SINHALA LETTER SANYAKA GAYANNA" #x0D9F)
-    ("SINHALA LETTER ALPAPRAANA CAYANNA" #x0DA0)
-    ("SINHALA LETTER MAHAAPRAANA CAYANNA" #x0DA1)
-    ("SINHALA LETTER ALPAPRAANA JAYANNA" #x0DA2)
-    ("SINHALA LETTER MAHAAPRAANA JAYANNA" #x0DA3)
-    ("SINHALA LETTER TAALUJA NAASIKYAYA" #x0DA4)
-    ("SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA" #x0DA5)
-    ("SINHALA LETTER SANYAKA JAYANNA" #x0DA6)
-    ("SINHALA LETTER ALPAPRAANA TTAYANNA" #x0DA7)
-    ("SINHALA LETTER MAHAAPRAANA TTAYANNA" #x0DA8)
-    ("SINHALA LETTER ALPAPRAANA DDAYANNA" #x0DA9)
-    ("SINHALA LETTER MAHAAPRAANA DDAYANNA" #x0DAA)
-    ("SINHALA LETTER MUURDHAJA NAYANNA" #x0DAB)
-    ("SINHALA LETTER SANYAKA DDAYANNA" #x0DAC)
-    ("SINHALA LETTER ALPAPRAANA TAYANNA" #x0DAD)
-    ("SINHALA LETTER MAHAAPRAANA TAYANNA" #x0DAE)
-    ("SINHALA LETTER ALPAPRAANA DAYANNA" #x0DAF)
-    ("SINHALA LETTER MAHAAPRAANA DAYANNA" #x0DB0)
-    ("SINHALA LETTER DANTAJA NAYANNA" #x0DB1)
-    ("SINHALA LETTER SANYAKA DAYANNA" #x0DB3)
-    ("SINHALA LETTER ALPAPRAANA PAYANNA" #x0DB4)
-    ("SINHALA LETTER MAHAAPRAANA PAYANNA" #x0DB5)
-    ("SINHALA LETTER ALPAPRAANA BAYANNA" #x0DB6)
-    ("SINHALA LETTER MAHAAPRAANA BAYANNA" #x0DB7)
-    ("SINHALA LETTER MAYANNA" #x0DB8)
-    ("SINHALA LETTER AMBA BAYANNA" #x0DB9)
-    ("SINHALA LETTER YAYANNA" #x0DBA)
-    ("SINHALA LETTER RAYANNA" #x0DBB)
-    ("SINHALA LETTER DANTAJA LAYANNA" #x0DBD)
-    ("SINHALA LETTER VAYANNA" #x0DC0)
-    ("SINHALA LETTER TAALUJA SAYANNA" #x0DC1)
-    ("SINHALA LETTER MUURDHAJA SAYANNA" #x0DC2)
-    ("SINHALA LETTER DANTAJA SAYANNA" #x0DC3)
-    ("SINHALA LETTER HAYANNA" #x0DC4)
-    ("SINHALA LETTER MUURDHAJA LAYANNA" #x0DC5)
-    ("SINHALA LETTER FAYANNA" #x0DC6)
-    ("SINHALA SIGN AL-LAKUNA" #x0DCA)
-    ("SINHALA VOWEL SIGN AELA-PILLA" #x0DCF)
-    ("SINHALA VOWEL SIGN KETTI AEDA-PILLA" #x0DD0)
-    ("SINHALA VOWEL SIGN DIGA AEDA-PILLA" #x0DD1)
-    ("SINHALA VOWEL SIGN KETTI IS-PILLA" #x0DD2)
-    ("SINHALA VOWEL SIGN DIGA IS-PILLA" #x0DD3)
-    ("SINHALA VOWEL SIGN KETTI PAA-PILLA" #x0DD4)
-    ("SINHALA VOWEL SIGN DIGA PAA-PILLA" #x0DD6)
-    ("SINHALA VOWEL SIGN GAETTA-PILLA" #x0DD8)
-    ("SINHALA VOWEL SIGN KOMBUVA" #x0DD9)
-    ("SINHALA VOWEL SIGN DIGA KOMBUVA" #x0DDA)
-    ("SINHALA VOWEL SIGN KOMBU DEKA" #x0DDB)
-    ("SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA" #x0DDC)
-    ("SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA" #x0DDD)
-    ("SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA" #x0DDE)
-    ("SINHALA VOWEL SIGN GAYANUKITTA" #x0DDF)
-    ("SINHALA VOWEL SIGN DIGA GAETTA-PILLA" #x0DF2)
-    ("SINHALA VOWEL SIGN DIGA GAYANUKITTA" #x0DF3)
-    ("SINHALA PUNCTUATION KUNDDALIYA" #x0DF4)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E00-00E7F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E00-00E7F.el
deleted file mode 100644
index ef5a9bb949..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E00-00E7F.el
+++ /dev/null
@@ -1,89 +0,0 @@
-(nxml-define-char-name-set 'thai
-  '(("THAI CHARACTER KO KAI" #x0E01)
-    ("THAI CHARACTER KHO KHAI" #x0E02)
-    ("THAI CHARACTER KHO KHUAT" #x0E03)
-    ("THAI CHARACTER KHO KHWAI" #x0E04)
-    ("THAI CHARACTER KHO KHON" #x0E05)
-    ("THAI CHARACTER KHO RAKHANG" #x0E06)
-    ("THAI CHARACTER NGO NGU" #x0E07)
-    ("THAI CHARACTER CHO CHAN" #x0E08)
-    ("THAI CHARACTER CHO CHING" #x0E09)
-    ("THAI CHARACTER CHO CHANG" #x0E0A)
-    ("THAI CHARACTER SO SO" #x0E0B)
-    ("THAI CHARACTER CHO CHOE" #x0E0C)
-    ("THAI CHARACTER YO YING" #x0E0D)
-    ("THAI CHARACTER DO CHADA" #x0E0E)
-    ("THAI CHARACTER TO PATAK" #x0E0F)
-    ("THAI CHARACTER THO THAN" #x0E10)
-    ("THAI CHARACTER THO NANGMONTHO" #x0E11)
-    ("THAI CHARACTER THO PHUTHAO" #x0E12)
-    ("THAI CHARACTER NO NEN" #x0E13)
-    ("THAI CHARACTER DO DEK" #x0E14)
-    ("THAI CHARACTER TO TAO" #x0E15)
-    ("THAI CHARACTER THO THUNG" #x0E16)
-    ("THAI CHARACTER THO THAHAN" #x0E17)
-    ("THAI CHARACTER THO THONG" #x0E18)
-    ("THAI CHARACTER NO NU" #x0E19)
-    ("THAI CHARACTER BO BAIMAI" #x0E1A)
-    ("THAI CHARACTER PO PLA" #x0E1B)
-    ("THAI CHARACTER PHO PHUNG" #x0E1C)
-    ("THAI CHARACTER FO FA" #x0E1D)
-    ("THAI CHARACTER PHO PHAN" #x0E1E)
-    ("THAI CHARACTER FO FAN" #x0E1F)
-    ("THAI CHARACTER PHO SAMPHAO" #x0E20)
-    ("THAI CHARACTER MO MA" #x0E21)
-    ("THAI CHARACTER YO YAK" #x0E22)
-    ("THAI CHARACTER RO RUA" #x0E23)
-    ("THAI CHARACTER RU" #x0E24)
-    ("THAI CHARACTER LO LING" #x0E25)
-    ("THAI CHARACTER LU" #x0E26)
-    ("THAI CHARACTER WO WAEN" #x0E27)
-    ("THAI CHARACTER SO SALA" #x0E28)
-    ("THAI CHARACTER SO RUSI" #x0E29)
-    ("THAI CHARACTER SO SUA" #x0E2A)
-    ("THAI CHARACTER HO HIP" #x0E2B)
-    ("THAI CHARACTER LO CHULA" #x0E2C)
-    ("THAI CHARACTER O ANG" #x0E2D)
-    ("THAI CHARACTER HO NOKHUK" #x0E2E)
-    ("THAI CHARACTER PAIYANNOI" #x0E2F)
-    ("THAI CHARACTER SARA A" #x0E30)
-    ("THAI CHARACTER MAI HAN-AKAT" #x0E31)
-    ("THAI CHARACTER SARA AA" #x0E32)
-    ("THAI CHARACTER SARA AM" #x0E33)
-    ("THAI CHARACTER SARA I" #x0E34)
-    ("THAI CHARACTER SARA II" #x0E35)
-    ("THAI CHARACTER SARA UE" #x0E36)
-    ("THAI CHARACTER SARA UEE" #x0E37)
-    ("THAI CHARACTER SARA U" #x0E38)
-    ("THAI CHARACTER SARA UU" #x0E39)
-    ("THAI CHARACTER PHINTHU" #x0E3A)
-    ("THAI CURRENCY SYMBOL BAHT" #x0E3F)
-    ("THAI CHARACTER SARA E" #x0E40)
-    ("THAI CHARACTER SARA AE" #x0E41)
-    ("THAI CHARACTER SARA O" #x0E42)
-    ("THAI CHARACTER SARA AI MAIMUAN" #x0E43)
-    ("THAI CHARACTER SARA AI MAIMALAI" #x0E44)
-    ("THAI CHARACTER LAKKHANGYAO" #x0E45)
-    ("THAI CHARACTER MAIYAMOK" #x0E46)
-    ("THAI CHARACTER MAITAIKHU" #x0E47)
-    ("THAI CHARACTER MAI EK" #x0E48)
-    ("THAI CHARACTER MAI THO" #x0E49)
-    ("THAI CHARACTER MAI TRI" #x0E4A)
-    ("THAI CHARACTER MAI CHATTAWA" #x0E4B)
-    ("THAI CHARACTER THANTHAKHAT" #x0E4C)
-    ("THAI CHARACTER NIKHAHIT" #x0E4D)
-    ("THAI CHARACTER YAMAKKAN" #x0E4E)
-    ("THAI CHARACTER FONGMAN" #x0E4F)
-    ("THAI DIGIT ZERO" #x0E50)
-    ("THAI DIGIT ONE" #x0E51)
-    ("THAI DIGIT TWO" #x0E52)
-    ("THAI DIGIT THREE" #x0E53)
-    ("THAI DIGIT FOUR" #x0E54)
-    ("THAI DIGIT FIVE" #x0E55)
-    ("THAI DIGIT SIX" #x0E56)
-    ("THAI DIGIT SEVEN" #x0E57)
-    ("THAI DIGIT EIGHT" #x0E58)
-    ("THAI DIGIT NINE" #x0E59)
-    ("THAI CHARACTER ANGKHANKHU" #x0E5A)
-    ("THAI CHARACTER KHOMUT" #x0E5B)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E80-00EFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E80-00EFF.el
deleted file mode 100644
index f9842bc8cb..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00E80-00EFF.el
+++ /dev/null
@@ -1,67 +0,0 @@
-(nxml-define-char-name-set 'lao
-  '(("LAO LETTER KO" #x0E81)
-    ("LAO LETTER KHO SUNG" #x0E82)
-    ("LAO LETTER KHO TAM" #x0E84)
-    ("LAO LETTER NGO" #x0E87)
-    ("LAO LETTER CO" #x0E88)
-    ("LAO LETTER SO TAM" #x0E8A)
-    ("LAO LETTER NYO" #x0E8D)
-    ("LAO LETTER DO" #x0E94)
-    ("LAO LETTER TO" #x0E95)
-    ("LAO LETTER THO SUNG" #x0E96)
-    ("LAO LETTER THO TAM" #x0E97)
-    ("LAO LETTER NO" #x0E99)
-    ("LAO LETTER BO" #x0E9A)
-    ("LAO LETTER PO" #x0E9B)
-    ("LAO LETTER PHO SUNG" #x0E9C)
-    ("LAO LETTER FO TAM" #x0E9D)
-    ("LAO LETTER PHO TAM" #x0E9E)
-    ("LAO LETTER FO SUNG" #x0E9F)
-    ("LAO LETTER MO" #x0EA1)
-    ("LAO LETTER YO" #x0EA2)
-    ("LAO LETTER LO LING" #x0EA3)
-    ("LAO LETTER LO LOOT" #x0EA5)
-    ("LAO LETTER WO" #x0EA7)
-    ("LAO LETTER SO SUNG" #x0EAA)
-    ("LAO LETTER HO SUNG" #x0EAB)
-    ("LAO LETTER O" #x0EAD)
-    ("LAO LETTER HO TAM" #x0EAE)
-    ("LAO ELLIPSIS" #x0EAF)
-    ("LAO VOWEL SIGN A" #x0EB0)
-    ("LAO VOWEL SIGN MAI KAN" #x0EB1)
-    ("LAO VOWEL SIGN AA" #x0EB2)
-    ("LAO VOWEL SIGN AM" #x0EB3)
-    ("LAO VOWEL SIGN I" #x0EB4)
-    ("LAO VOWEL SIGN II" #x0EB5)
-    ("LAO VOWEL SIGN Y" #x0EB6)
-    ("LAO VOWEL SIGN YY" #x0EB7)
-    ("LAO VOWEL SIGN U" #x0EB8)
-    ("LAO VOWEL SIGN UU" #x0EB9)
-    ("LAO VOWEL SIGN MAI KON" #x0EBB)
-    ("LAO SEMIVOWEL SIGN LO" #x0EBC)
-    ("LAO SEMIVOWEL SIGN NYO" #x0EBD)
-    ("LAO VOWEL SIGN E" #x0EC0)
-    ("LAO VOWEL SIGN EI" #x0EC1)
-    ("LAO VOWEL SIGN O" #x0EC2)
-    ("LAO VOWEL SIGN AY" #x0EC3)
-    ("LAO VOWEL SIGN AI" #x0EC4)
-    ("LAO KO LA" #x0EC6)
-    ("LAO TONE MAI EK" #x0EC8)
-    ("LAO TONE MAI THO" #x0EC9)
-    ("LAO TONE MAI TI" #x0ECA)
-    ("LAO TONE MAI CATAWA" #x0ECB)
-    ("LAO CANCELLATION MARK" #x0ECC)
-    ("LAO NIGGAHITA" #x0ECD)
-    ("LAO DIGIT ZERO" #x0ED0)
-    ("LAO DIGIT ONE" #x0ED1)
-    ("LAO DIGIT TWO" #x0ED2)
-    ("LAO DIGIT THREE" #x0ED3)
-    ("LAO DIGIT FOUR" #x0ED4)
-    ("LAO DIGIT FIVE" #x0ED5)
-    ("LAO DIGIT SIX" #x0ED6)
-    ("LAO DIGIT SEVEN" #x0ED7)
-    ("LAO DIGIT EIGHT" #x0ED8)
-    ("LAO DIGIT NINE" #x0ED9)
-    ("LAO HO NO" #x0EDC)
-    ("LAO HO MO" #x0EDD)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00F00-00FFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00F00-00FFF.el
deleted file mode 100644
index 7440269e0e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/00F00-00FFF.el
+++ /dev/null
@@ -1,195 +0,0 @@
-(nxml-define-char-name-set 'tibetan
-  '(("TIBETAN SYLLABLE OM" #x0F00)
-    ("TIBETAN MARK GTER YIG MGO TRUNCATED A" #x0F01)
-    ("TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA" #x0F02)
-    ("TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA" #x0F03)
-    ("TIBETAN MARK INITIAL YIG MGO MDUN MA" #x0F04)
-    ("TIBETAN MARK CLOSING YIG MGO SGAB MA" #x0F05)
-    ("TIBETAN MARK CARET YIG MGO PHUR SHAD MA" #x0F06)
-    ("TIBETAN MARK YIG MGO TSHEG SHAD MA" #x0F07)
-    ("TIBETAN MARK SBRUL SHAD" #x0F08)
-    ("TIBETAN MARK BSKUR YIG MGO" #x0F09)
-    ("TIBETAN MARK BKA- SHOG YIG MGO" #x0F0A)
-    ("TIBETAN MARK INTERSYLLABIC TSHEG" #x0F0B)
-    ("TIBETAN MARK DELIMITER TSHEG BSTAR" #x0F0C)
-    ("TIBETAN MARK SHAD" #x0F0D)
-    ("TIBETAN MARK NYIS SHAD" #x0F0E)
-    ("TIBETAN MARK TSHEG SHAD" #x0F0F)
-    ("TIBETAN MARK NYIS TSHEG SHAD" #x0F10)
-    ("TIBETAN MARK RIN CHEN SPUNGS SHAD" #x0F11)
-    ("TIBETAN MARK RGYA GRAM SHAD" #x0F12)
-    ("TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN" #x0F13)
-    ("TIBETAN MARK GTER TSHEG" #x0F14)
-    ("TIBETAN LOGOTYPE SIGN CHAD RTAGS" #x0F15)
-    ("TIBETAN LOGOTYPE SIGN LHAG RTAGS" #x0F16)
-    ("TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS" #x0F17)
-    ("TIBETAN ASTROLOGICAL SIGN -KHYUD PA" #x0F18)
-    ("TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS" #x0F19)
-    ("TIBETAN SIGN RDEL DKAR GCIG" #x0F1A)
-    ("TIBETAN SIGN RDEL DKAR GNYIS" #x0F1B)
-    ("TIBETAN SIGN RDEL DKAR GSUM" #x0F1C)
-    ("TIBETAN SIGN RDEL NAG GCIG" #x0F1D)
-    ("TIBETAN SIGN RDEL NAG GNYIS" #x0F1E)
-    ("TIBETAN SIGN RDEL DKAR RDEL NAG" #x0F1F)
-    ("TIBETAN DIGIT ZERO" #x0F20)
-    ("TIBETAN DIGIT ONE" #x0F21)
-    ("TIBETAN DIGIT TWO" #x0F22)
-    ("TIBETAN DIGIT THREE" #x0F23)
-    ("TIBETAN DIGIT FOUR" #x0F24)
-    ("TIBETAN DIGIT FIVE" #x0F25)
-    ("TIBETAN DIGIT SIX" #x0F26)
-    ("TIBETAN DIGIT SEVEN" #x0F27)
-    ("TIBETAN DIGIT EIGHT" #x0F28)
-    ("TIBETAN DIGIT NINE" #x0F29)
-    ("TIBETAN DIGIT HALF ONE" #x0F2A)
-    ("TIBETAN DIGIT HALF TWO" #x0F2B)
-    ("TIBETAN DIGIT HALF THREE" #x0F2C)
-    ("TIBETAN DIGIT HALF FOUR" #x0F2D)
-    ("TIBETAN DIGIT HALF FIVE" #x0F2E)
-    ("TIBETAN DIGIT HALF SIX" #x0F2F)
-    ("TIBETAN DIGIT HALF SEVEN" #x0F30)
-    ("TIBETAN DIGIT HALF EIGHT" #x0F31)
-    ("TIBETAN DIGIT HALF NINE" #x0F32)
-    ("TIBETAN DIGIT HALF ZERO" #x0F33)
-    ("TIBETAN MARK BSDUS RTAGS" #x0F34)
-    ("TIBETAN MARK NGAS BZUNG NYI ZLA" #x0F35)
-    ("TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN" #x0F36)
-    ("TIBETAN MARK NGAS BZUNG SGOR RTAGS" #x0F37)
-    ("TIBETAN MARK CHE MGO" #x0F38)
-    ("TIBETAN MARK TSA -PHRU" #x0F39)
-    ("TIBETAN MARK GUG RTAGS GYON" #x0F3A)
-    ("TIBETAN MARK GUG RTAGS GYAS" #x0F3B)
-    ("TIBETAN MARK ANG KHANG GYON" #x0F3C)
-    ("TIBETAN MARK ANG KHANG GYAS" #x0F3D)
-    ("TIBETAN SIGN YAR TSHES" #x0F3E)
-    ("TIBETAN SIGN MAR TSHES" #x0F3F)
-    ("TIBETAN LETTER KA" #x0F40)
-    ("TIBETAN LETTER KHA" #x0F41)
-    ("TIBETAN LETTER GA" #x0F42)
-    ("TIBETAN LETTER GHA" #x0F43)
-    ("TIBETAN LETTER NGA" #x0F44)
-    ("TIBETAN LETTER CA" #x0F45)
-    ("TIBETAN LETTER CHA" #x0F46)
-    ("TIBETAN LETTER JA" #x0F47)
-    ("TIBETAN LETTER NYA" #x0F49)
-    ("TIBETAN LETTER TTA" #x0F4A)
-    ("TIBETAN LETTER TTHA" #x0F4B)
-    ("TIBETAN LETTER DDA" #x0F4C)
-    ("TIBETAN LETTER DDHA" #x0F4D)
-    ("TIBETAN LETTER NNA" #x0F4E)
-    ("TIBETAN LETTER TA" #x0F4F)
-    ("TIBETAN LETTER THA" #x0F50)
-    ("TIBETAN LETTER DA" #x0F51)
-    ("TIBETAN LETTER DHA" #x0F52)
-    ("TIBETAN LETTER NA" #x0F53)
-    ("TIBETAN LETTER PA" #x0F54)
-    ("TIBETAN LETTER PHA" #x0F55)
-    ("TIBETAN LETTER BA" #x0F56)
-    ("TIBETAN LETTER BHA" #x0F57)
-    ("TIBETAN LETTER MA" #x0F58)
-    ("TIBETAN LETTER TSA" #x0F59)
-    ("TIBETAN LETTER TSHA" #x0F5A)
-    ("TIBETAN LETTER DZA" #x0F5B)
-    ("TIBETAN LETTER DZHA" #x0F5C)
-    ("TIBETAN LETTER WA" #x0F5D)
-    ("TIBETAN LETTER ZHA" #x0F5E)
-    ("TIBETAN LETTER ZA" #x0F5F)
-    ("TIBETAN LETTER -A" #x0F60)
-    ("TIBETAN LETTER YA" #x0F61)
-    ("TIBETAN LETTER RA" #x0F62)
-    ("TIBETAN LETTER LA" #x0F63)
-    ("TIBETAN LETTER SHA" #x0F64)
-    ("TIBETAN LETTER SSA" #x0F65)
-    ("TIBETAN LETTER SA" #x0F66)
-    ("TIBETAN LETTER HA" #x0F67)
-    ("TIBETAN LETTER A" #x0F68)
-    ("TIBETAN LETTER KSSA" #x0F69)
-    ("TIBETAN LETTER FIXED-FORM RA" #x0F6A)
-    ("TIBETAN VOWEL SIGN AA" #x0F71)
-    ("TIBETAN VOWEL SIGN I" #x0F72)
-    ("TIBETAN VOWEL SIGN II" #x0F73)
-    ("TIBETAN VOWEL SIGN U" #x0F74)
-    ("TIBETAN VOWEL SIGN UU" #x0F75)
-    ("TIBETAN VOWEL SIGN VOCALIC R" #x0F76)
-    ("TIBETAN VOWEL SIGN VOCALIC RR" #x0F77)
-    ("TIBETAN VOWEL SIGN VOCALIC L" #x0F78)
-    ("TIBETAN VOWEL SIGN VOCALIC LL" #x0F79)
-    ("TIBETAN VOWEL SIGN E" #x0F7A)
-    ("TIBETAN VOWEL SIGN EE" #x0F7B)
-    ("TIBETAN VOWEL SIGN O" #x0F7C)
-    ("TIBETAN VOWEL SIGN OO" #x0F7D)
-    ("TIBETAN SIGN RJES SU NGA RO" #x0F7E)
-    ("TIBETAN SIGN RNAM BCAD" #x0F7F)
-    ("TIBETAN VOWEL SIGN REVERSED I" #x0F80)
-    ("TIBETAN VOWEL SIGN REVERSED II" #x0F81)
-    ("TIBETAN SIGN NYI ZLA NAA DA" #x0F82)
-    ("TIBETAN SIGN SNA LDAN" #x0F83)
-    ("TIBETAN MARK HALANTA" #x0F84)
-    ("TIBETAN MARK PALUTA" #x0F85)
-    ("TIBETAN SIGN LCI RTAGS" #x0F86)
-    ("TIBETAN SIGN YANG RTAGS" #x0F87)
-    ("TIBETAN SIGN LCE TSA CAN" #x0F88)
-    ("TIBETAN SIGN MCHU CAN" #x0F89)
-    ("TIBETAN SIGN GRU CAN RGYINGS" #x0F8A)
-    ("TIBETAN SIGN GRU MED RGYINGS" #x0F8B)
-    ("TIBETAN SUBJOINED LETTER KA" #x0F90)
-    ("TIBETAN SUBJOINED LETTER KHA" #x0F91)
-    ("TIBETAN SUBJOINED LETTER GA" #x0F92)
-    ("TIBETAN SUBJOINED LETTER GHA" #x0F93)
-    ("TIBETAN SUBJOINED LETTER NGA" #x0F94)
-    ("TIBETAN SUBJOINED LETTER CA" #x0F95)
-    ("TIBETAN SUBJOINED LETTER CHA" #x0F96)
-    ("TIBETAN SUBJOINED LETTER JA" #x0F97)
-    ("TIBETAN SUBJOINED LETTER NYA" #x0F99)
-    ("TIBETAN SUBJOINED LETTER TTA" #x0F9A)
-    ("TIBETAN SUBJOINED LETTER TTHA" #x0F9B)
-    ("TIBETAN SUBJOINED LETTER DDA" #x0F9C)
-    ("TIBETAN SUBJOINED LETTER DDHA" #x0F9D)
-    ("TIBETAN SUBJOINED LETTER NNA" #x0F9E)
-    ("TIBETAN SUBJOINED LETTER TA" #x0F9F)
-    ("TIBETAN SUBJOINED LETTER THA" #x0FA0)
-    ("TIBETAN SUBJOINED LETTER DA" #x0FA1)
-    ("TIBETAN SUBJOINED LETTER DHA" #x0FA2)
-    ("TIBETAN SUBJOINED LETTER NA" #x0FA3)
-    ("TIBETAN SUBJOINED LETTER PA" #x0FA4)
-    ("TIBETAN SUBJOINED LETTER PHA" #x0FA5)
-    ("TIBETAN SUBJOINED LETTER BA" #x0FA6)
-    ("TIBETAN SUBJOINED LETTER BHA" #x0FA7)
-    ("TIBETAN SUBJOINED LETTER MA" #x0FA8)
-    ("TIBETAN SUBJOINED LETTER TSA" #x0FA9)
-    ("TIBETAN SUBJOINED LETTER TSHA" #x0FAA)
-    ("TIBETAN SUBJOINED LETTER DZA" #x0FAB)
-    ("TIBETAN SUBJOINED LETTER DZHA" #x0FAC)
-    ("TIBETAN SUBJOINED LETTER WA" #x0FAD)
-    ("TIBETAN SUBJOINED LETTER ZHA" #x0FAE)
-    ("TIBETAN SUBJOINED LETTER ZA" #x0FAF)
-    ("TIBETAN SUBJOINED LETTER -A" #x0FB0)
-    ("TIBETAN SUBJOINED LETTER YA" #x0FB1)
-    ("TIBETAN SUBJOINED LETTER RA" #x0FB2)
-    ("TIBETAN SUBJOINED LETTER LA" #x0FB3)
-    ("TIBETAN SUBJOINED LETTER SHA" #x0FB4)
-    ("TIBETAN SUBJOINED LETTER SSA" #x0FB5)
-    ("TIBETAN SUBJOINED LETTER SA" #x0FB6)
-    ("TIBETAN SUBJOINED LETTER HA" #x0FB7)
-    ("TIBETAN SUBJOINED LETTER A" #x0FB8)
-    ("TIBETAN SUBJOINED LETTER KSSA" #x0FB9)
-    ("TIBETAN SUBJOINED LETTER FIXED-FORM WA" #x0FBA)
-    ("TIBETAN SUBJOINED LETTER FIXED-FORM YA" #x0FBB)
-    ("TIBETAN SUBJOINED LETTER FIXED-FORM RA" #x0FBC)
-    ("TIBETAN KU RU KHA" #x0FBE)
-    ("TIBETAN KU RU KHA BZHI MIG CAN" #x0FBF)
-    ("TIBETAN CANTILLATION SIGN HEAVY BEAT" #x0FC0)
-    ("TIBETAN CANTILLATION SIGN LIGHT BEAT" #x0FC1)
-    ("TIBETAN CANTILLATION SIGN CANG TE-U" #x0FC2)
-    ("TIBETAN CANTILLATION SIGN SBUB -CHAL" #x0FC3)
-    ("TIBETAN SYMBOL DRIL BU" #x0FC4)
-    ("TIBETAN SYMBOL RDO RJE" #x0FC5)
-    ("TIBETAN SYMBOL PADMA GDAN" #x0FC6)
-    ("TIBETAN SYMBOL RDO RJE RGYA GRAM" #x0FC7)
-    ("TIBETAN SYMBOL PHUR PA" #x0FC8)
-    ("TIBETAN SYMBOL NOR BU" #x0FC9)
-    ("TIBETAN SYMBOL NOR BU NYIS -KHYIL" #x0FCA)
-    ("TIBETAN SYMBOL NOR BU GSUM -KHYIL" #x0FCB)
-    ("TIBETAN SYMBOL NOR BU BZHI -KHYIL" #x0FCC)
-    ("TIBETAN SIGN RDEL NAG GSUM" #x0FCF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01000-0109F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01000-0109F.el
deleted file mode 100644
index 4465de42dd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01000-0109F.el
+++ /dev/null
@@ -1,80 +0,0 @@
-(nxml-define-char-name-set 'myanmar
-  '(("MYANMAR LETTER KA" #x1000)
-    ("MYANMAR LETTER KHA" #x1001)
-    ("MYANMAR LETTER GA" #x1002)
-    ("MYANMAR LETTER GHA" #x1003)
-    ("MYANMAR LETTER NGA" #x1004)
-    ("MYANMAR LETTER CA" #x1005)
-    ("MYANMAR LETTER CHA" #x1006)
-    ("MYANMAR LETTER JA" #x1007)
-    ("MYANMAR LETTER JHA" #x1008)
-    ("MYANMAR LETTER NYA" #x1009)
-    ("MYANMAR LETTER NNYA" #x100A)
-    ("MYANMAR LETTER TTA" #x100B)
-    ("MYANMAR LETTER TTHA" #x100C)
-    ("MYANMAR LETTER DDA" #x100D)
-    ("MYANMAR LETTER DDHA" #x100E)
-    ("MYANMAR LETTER NNA" #x100F)
-    ("MYANMAR LETTER TA" #x1010)
-    ("MYANMAR LETTER THA" #x1011)
-    ("MYANMAR LETTER DA" #x1012)
-    ("MYANMAR LETTER DHA" #x1013)
-    ("MYANMAR LETTER NA" #x1014)
-    ("MYANMAR LETTER PA" #x1015)
-    ("MYANMAR LETTER PHA" #x1016)
-    ("MYANMAR LETTER BA" #x1017)
-    ("MYANMAR LETTER BHA" #x1018)
-    ("MYANMAR LETTER MA" #x1019)
-    ("MYANMAR LETTER YA" #x101A)
-    ("MYANMAR LETTER RA" #x101B)
-    ("MYANMAR LETTER LA" #x101C)
-    ("MYANMAR LETTER WA" #x101D)
-    ("MYANMAR LETTER SA" #x101E)
-    ("MYANMAR LETTER HA" #x101F)
-    ("MYANMAR LETTER LLA" #x1020)
-    ("MYANMAR LETTER A" #x1021)
-    ("MYANMAR LETTER I" #x1023)
-    ("MYANMAR LETTER II" #x1024)
-    ("MYANMAR LETTER U" #x1025)
-    ("MYANMAR LETTER UU" #x1026)
-    ("MYANMAR LETTER E" #x1027)
-    ("MYANMAR LETTER O" #x1029)
-    ("MYANMAR LETTER AU" #x102A)
-    ("MYANMAR VOWEL SIGN AA" #x102C)
-    ("MYANMAR VOWEL SIGN I" #x102D)
-    ("MYANMAR VOWEL SIGN II" #x102E)
-    ("MYANMAR VOWEL SIGN U" #x102F)
-    ("MYANMAR VOWEL SIGN UU" #x1030)
-    ("MYANMAR VOWEL SIGN E" #x1031)
-    ("MYANMAR VOWEL SIGN AI" #x1032)
-    ("MYANMAR SIGN ANUSVARA" #x1036)
-    ("MYANMAR SIGN DOT BELOW" #x1037)
-    ("MYANMAR SIGN VISARGA" #x1038)
-    ("MYANMAR SIGN VIRAMA" #x1039)
-    ("MYANMAR DIGIT ZERO" #x1040)
-    ("MYANMAR DIGIT ONE" #x1041)
-    ("MYANMAR DIGIT TWO" #x1042)
-    ("MYANMAR DIGIT THREE" #x1043)
-    ("MYANMAR DIGIT FOUR" #x1044)
-    ("MYANMAR DIGIT FIVE" #x1045)
-    ("MYANMAR DIGIT SIX" #x1046)
-    ("MYANMAR DIGIT SEVEN" #x1047)
-    ("MYANMAR DIGIT EIGHT" #x1048)
-    ("MYANMAR DIGIT NINE" #x1049)
-    ("MYANMAR SIGN LITTLE SECTION" #x104A)
-    ("MYANMAR SIGN SECTION" #x104B)
-    ("MYANMAR SYMBOL LOCATIVE" #x104C)
-    ("MYANMAR SYMBOL COMPLETED" #x104D)
-    ("MYANMAR SYMBOL AFOREMENTIONED" #x104E)
-    ("MYANMAR SYMBOL GENITIVE" #x104F)
-    ("MYANMAR LETTER SHA" #x1050)
-    ("MYANMAR LETTER SSA" #x1051)
-    ("MYANMAR LETTER VOCALIC R" #x1052)
-    ("MYANMAR LETTER VOCALIC RR" #x1053)
-    ("MYANMAR LETTER VOCALIC L" #x1054)
-    ("MYANMAR LETTER VOCALIC LL" #x1055)
-    ("MYANMAR VOWEL SIGN VOCALIC R" #x1056)
-    ("MYANMAR VOWEL SIGN VOCALIC RR" #x1057)
-    ("MYANMAR VOWEL SIGN VOCALIC L" #x1058)
-    ("MYANMAR VOWEL SIGN VOCALIC LL" #x1059)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/010A0-010FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/010A0-010FF.el
deleted file mode 100644
index 26abf69d52..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/010A0-010FF.el
+++ /dev/null
@@ -1,82 +0,0 @@
-(nxml-define-char-name-set 'georgian
-  '(("GEORGIAN CAPITAL LETTER AN" #x10A0)
-    ("GEORGIAN CAPITAL LETTER BAN" #x10A1)
-    ("GEORGIAN CAPITAL LETTER GAN" #x10A2)
-    ("GEORGIAN CAPITAL LETTER DON" #x10A3)
-    ("GEORGIAN CAPITAL LETTER EN" #x10A4)
-    ("GEORGIAN CAPITAL LETTER VIN" #x10A5)
-    ("GEORGIAN CAPITAL LETTER ZEN" #x10A6)
-    ("GEORGIAN CAPITAL LETTER TAN" #x10A7)
-    ("GEORGIAN CAPITAL LETTER IN" #x10A8)
-    ("GEORGIAN CAPITAL LETTER KAN" #x10A9)
-    ("GEORGIAN CAPITAL LETTER LAS" #x10AA)
-    ("GEORGIAN CAPITAL LETTER MAN" #x10AB)
-    ("GEORGIAN CAPITAL LETTER NAR" #x10AC)
-    ("GEORGIAN CAPITAL LETTER ON" #x10AD)
-    ("GEORGIAN CAPITAL LETTER PAR" #x10AE)
-    ("GEORGIAN CAPITAL LETTER ZHAR" #x10AF)
-    ("GEORGIAN CAPITAL LETTER RAE" #x10B0)
-    ("GEORGIAN CAPITAL LETTER SAN" #x10B1)
-    ("GEORGIAN CAPITAL LETTER TAR" #x10B2)
-    ("GEORGIAN CAPITAL LETTER UN" #x10B3)
-    ("GEORGIAN CAPITAL LETTER PHAR" #x10B4)
-    ("GEORGIAN CAPITAL LETTER KHAR" #x10B5)
-    ("GEORGIAN CAPITAL LETTER GHAN" #x10B6)
-    ("GEORGIAN CAPITAL LETTER QAR" #x10B7)
-    ("GEORGIAN CAPITAL LETTER SHIN" #x10B8)
-    ("GEORGIAN CAPITAL LETTER CHIN" #x10B9)
-    ("GEORGIAN CAPITAL LETTER CAN" #x10BA)
-    ("GEORGIAN CAPITAL LETTER JIL" #x10BB)
-    ("GEORGIAN CAPITAL LETTER CIL" #x10BC)
-    ("GEORGIAN CAPITAL LETTER CHAR" #x10BD)
-    ("GEORGIAN CAPITAL LETTER XAN" #x10BE)
-    ("GEORGIAN CAPITAL LETTER JHAN" #x10BF)
-    ("GEORGIAN CAPITAL LETTER HAE" #x10C0)
-    ("GEORGIAN CAPITAL LETTER HE" #x10C1)
-    ("GEORGIAN CAPITAL LETTER HIE" #x10C2)
-    ("GEORGIAN CAPITAL LETTER WE" #x10C3)
-    ("GEORGIAN CAPITAL LETTER HAR" #x10C4)
-    ("GEORGIAN CAPITAL LETTER HOE" #x10C5)
-    ("GEORGIAN LETTER AN" #x10D0)
-    ("GEORGIAN LETTER BAN" #x10D1)
-    ("GEORGIAN LETTER GAN" #x10D2)
-    ("GEORGIAN LETTER DON" #x10D3)
-    ("GEORGIAN LETTER EN" #x10D4)
-    ("GEORGIAN LETTER VIN" #x10D5)
-    ("GEORGIAN LETTER ZEN" #x10D6)
-    ("GEORGIAN LETTER TAN" #x10D7)
-    ("GEORGIAN LETTER IN" #x10D8)
-    ("GEORGIAN LETTER KAN" #x10D9)
-    ("GEORGIAN LETTER LAS" #x10DA)
-    ("GEORGIAN LETTER MAN" #x10DB)
-    ("GEORGIAN LETTER NAR" #x10DC)
-    ("GEORGIAN LETTER ON" #x10DD)
-    ("GEORGIAN LETTER PAR" #x10DE)
-    ("GEORGIAN LETTER ZHAR" #x10DF)
-    ("GEORGIAN LETTER RAE" #x10E0)
-    ("GEORGIAN LETTER SAN" #x10E1)
-    ("GEORGIAN LETTER TAR" #x10E2)
-    ("GEORGIAN LETTER UN" #x10E3)
-    ("GEORGIAN LETTER PHAR" #x10E4)
-    ("GEORGIAN LETTER KHAR" #x10E5)
-    ("GEORGIAN LETTER GHAN" #x10E6)
-    ("GEORGIAN LETTER QAR" #x10E7)
-    ("GEORGIAN LETTER SHIN" #x10E8)
-    ("GEORGIAN LETTER CHIN" #x10E9)
-    ("GEORGIAN LETTER CAN" #x10EA)
-    ("GEORGIAN LETTER JIL" #x10EB)
-    ("GEORGIAN LETTER CIL" #x10EC)
-    ("GEORGIAN LETTER CHAR" #x10ED)
-    ("GEORGIAN LETTER XAN" #x10EE)
-    ("GEORGIAN LETTER JHAN" #x10EF)
-    ("GEORGIAN LETTER HAE" #x10F0)
-    ("GEORGIAN LETTER HE" #x10F1)
-    ("GEORGIAN LETTER HIE" #x10F2)
-    ("GEORGIAN LETTER WE" #x10F3)
-    ("GEORGIAN LETTER HAR" #x10F4)
-    ("GEORGIAN LETTER HOE" #x10F5)
-    ("GEORGIAN LETTER FI" #x10F6)
-    ("GEORGIAN LETTER YN" #x10F7)
-    ("GEORGIAN LETTER ELIFI" #x10F8)
-    ("GEORGIAN PARAGRAPH SEPARATOR" #x10FB)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01100-011FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01100-011FF.el
deleted file mode 100644
index b89d01536f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01100-011FF.el
+++ /dev/null
@@ -1,242 +0,0 @@
-(nxml-define-char-name-set 'hangul-jamo
-  '(("HANGUL CHOSEONG KIYEOK" #x1100)
-    ("HANGUL CHOSEONG SSANGKIYEOK" #x1101)
-    ("HANGUL CHOSEONG NIEUN" #x1102)
-    ("HANGUL CHOSEONG TIKEUT" #x1103)
-    ("HANGUL CHOSEONG SSANGTIKEUT" #x1104)
-    ("HANGUL CHOSEONG RIEUL" #x1105)
-    ("HANGUL CHOSEONG MIEUM" #x1106)
-    ("HANGUL CHOSEONG PIEUP" #x1107)
-    ("HANGUL CHOSEONG SSANGPIEUP" #x1108)
-    ("HANGUL CHOSEONG SIOS" #x1109)
-    ("HANGUL CHOSEONG SSANGSIOS" #x110A)
-    ("HANGUL CHOSEONG IEUNG" #x110B)
-    ("HANGUL CHOSEONG CIEUC" #x110C)
-    ("HANGUL CHOSEONG SSANGCIEUC" #x110D)
-    ("HANGUL CHOSEONG CHIEUCH" #x110E)
-    ("HANGUL CHOSEONG KHIEUKH" #x110F)
-    ("HANGUL CHOSEONG THIEUTH" #x1110)
-    ("HANGUL CHOSEONG PHIEUPH" #x1111)
-    ("HANGUL CHOSEONG HIEUH" #x1112)
-    ("HANGUL CHOSEONG NIEUN-KIYEOK" #x1113)
-    ("HANGUL CHOSEONG SSANGNIEUN" #x1114)
-    ("HANGUL CHOSEONG NIEUN-TIKEUT" #x1115)
-    ("HANGUL CHOSEONG NIEUN-PIEUP" #x1116)
-    ("HANGUL CHOSEONG TIKEUT-KIYEOK" #x1117)
-    ("HANGUL CHOSEONG RIEUL-NIEUN" #x1118)
-    ("HANGUL CHOSEONG SSANGRIEUL" #x1119)
-    ("HANGUL CHOSEONG RIEUL-HIEUH" #x111A)
-    ("HANGUL CHOSEONG KAPYEOUNRIEUL" #x111B)
-    ("HANGUL CHOSEONG MIEUM-PIEUP" #x111C)
-    ("HANGUL CHOSEONG KAPYEOUNMIEUM" #x111D)
-    ("HANGUL CHOSEONG PIEUP-KIYEOK" #x111E)
-    ("HANGUL CHOSEONG PIEUP-NIEUN" #x111F)
-    ("HANGUL CHOSEONG PIEUP-TIKEUT" #x1120)
-    ("HANGUL CHOSEONG PIEUP-SIOS" #x1121)
-    ("HANGUL CHOSEONG PIEUP-SIOS-KIYEOK" #x1122)
-    ("HANGUL CHOSEONG PIEUP-SIOS-TIKEUT" #x1123)
-    ("HANGUL CHOSEONG PIEUP-SIOS-PIEUP" #x1124)
-    ("HANGUL CHOSEONG PIEUP-SSANGSIOS" #x1125)
-    ("HANGUL CHOSEONG PIEUP-SIOS-CIEUC" #x1126)
-    ("HANGUL CHOSEONG PIEUP-CIEUC" #x1127)
-    ("HANGUL CHOSEONG PIEUP-CHIEUCH" #x1128)
-    ("HANGUL CHOSEONG PIEUP-THIEUTH" #x1129)
-    ("HANGUL CHOSEONG PIEUP-PHIEUPH" #x112A)
-    ("HANGUL CHOSEONG KAPYEOUNPIEUP" #x112B)
-    ("HANGUL CHOSEONG KAPYEOUNSSANGPIEUP" #x112C)
-    ("HANGUL CHOSEONG SIOS-KIYEOK" #x112D)
-    ("HANGUL CHOSEONG SIOS-NIEUN" #x112E)
-    ("HANGUL CHOSEONG SIOS-TIKEUT" #x112F)
-    ("HANGUL CHOSEONG SIOS-RIEUL" #x1130)
-    ("HANGUL CHOSEONG SIOS-MIEUM" #x1131)
-    ("HANGUL CHOSEONG SIOS-PIEUP" #x1132)
-    ("HANGUL CHOSEONG SIOS-PIEUP-KIYEOK" #x1133)
-    ("HANGUL CHOSEONG SIOS-SSANGSIOS" #x1134)
-    ("HANGUL CHOSEONG SIOS-IEUNG" #x1135)
-    ("HANGUL CHOSEONG SIOS-CIEUC" #x1136)
-    ("HANGUL CHOSEONG SIOS-CHIEUCH" #x1137)
-    ("HANGUL CHOSEONG SIOS-KHIEUKH" #x1138)
-    ("HANGUL CHOSEONG SIOS-THIEUTH" #x1139)
-    ("HANGUL CHOSEONG SIOS-PHIEUPH" #x113A)
-    ("HANGUL CHOSEONG SIOS-HIEUH" #x113B)
-    ("HANGUL CHOSEONG CHITUEUMSIOS" #x113C)
-    ("HANGUL CHOSEONG CHITUEUMSSANGSIOS" #x113D)
-    ("HANGUL CHOSEONG CEONGCHIEUMSIOS" #x113E)
-    ("HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS" #x113F)
-    ("HANGUL CHOSEONG PANSIOS" #x1140)
-    ("HANGUL CHOSEONG IEUNG-KIYEOK" #x1141)
-    ("HANGUL CHOSEONG IEUNG-TIKEUT" #x1142)
-    ("HANGUL CHOSEONG IEUNG-MIEUM" #x1143)
-    ("HANGUL CHOSEONG IEUNG-PIEUP" #x1144)
-    ("HANGUL CHOSEONG IEUNG-SIOS" #x1145)
-    ("HANGUL CHOSEONG IEUNG-PANSIOS" #x1146)
-    ("HANGUL CHOSEONG SSANGIEUNG" #x1147)
-    ("HANGUL CHOSEONG IEUNG-CIEUC" #x1148)
-    ("HANGUL CHOSEONG IEUNG-CHIEUCH" #x1149)
-    ("HANGUL CHOSEONG IEUNG-THIEUTH" #x114A)
-    ("HANGUL CHOSEONG IEUNG-PHIEUPH" #x114B)
-    ("HANGUL CHOSEONG YESIEUNG" #x114C)
-    ("HANGUL CHOSEONG CIEUC-IEUNG" #x114D)
-    ("HANGUL CHOSEONG CHITUEUMCIEUC" #x114E)
-    ("HANGUL CHOSEONG CHITUEUMSSANGCIEUC" #x114F)
-    ("HANGUL CHOSEONG CEONGCHIEUMCIEUC" #x1150)
-    ("HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC" #x1151)
-    ("HANGUL CHOSEONG CHIEUCH-KHIEUKH" #x1152)
-    ("HANGUL CHOSEONG CHIEUCH-HIEUH" #x1153)
-    ("HANGUL CHOSEONG CHITUEUMCHIEUCH" #x1154)
-    ("HANGUL CHOSEONG CEONGCHIEUMCHIEUCH" #x1155)
-    ("HANGUL CHOSEONG PHIEUPH-PIEUP" #x1156)
-    ("HANGUL CHOSEONG KAPYEOUNPHIEUPH" #x1157)
-    ("HANGUL CHOSEONG SSANGHIEUH" #x1158)
-    ("HANGUL CHOSEONG YEORINHIEUH" #x1159)
-    ("HANGUL CHOSEONG FILLER" #x115F)
-    ("HANGUL JUNGSEONG FILLER" #x1160)
-    ("HANGUL JUNGSEONG A" #x1161)
-    ("HANGUL JUNGSEONG AE" #x1162)
-    ("HANGUL JUNGSEONG YA" #x1163)
-    ("HANGUL JUNGSEONG YAE" #x1164)
-    ("HANGUL JUNGSEONG EO" #x1165)
-    ("HANGUL JUNGSEONG E" #x1166)
-    ("HANGUL JUNGSEONG YEO" #x1167)
-    ("HANGUL JUNGSEONG YE" #x1168)
-    ("HANGUL JUNGSEONG O" #x1169)
-    ("HANGUL JUNGSEONG WA" #x116A)
-    ("HANGUL JUNGSEONG WAE" #x116B)
-    ("HANGUL JUNGSEONG OE" #x116C)
-    ("HANGUL JUNGSEONG YO" #x116D)
-    ("HANGUL JUNGSEONG U" #x116E)
-    ("HANGUL JUNGSEONG WEO" #x116F)
-    ("HANGUL JUNGSEONG WE" #x1170)
-    ("HANGUL JUNGSEONG WI" #x1171)
-    ("HANGUL JUNGSEONG YU" #x1172)
-    ("HANGUL JUNGSEONG EU" #x1173)
-    ("HANGUL JUNGSEONG YI" #x1174)
-    ("HANGUL JUNGSEONG I" #x1175)
-    ("HANGUL JUNGSEONG A-O" #x1176)
-    ("HANGUL JUNGSEONG A-U" #x1177)
-    ("HANGUL JUNGSEONG YA-O" #x1178)
-    ("HANGUL JUNGSEONG YA-YO" #x1179)
-    ("HANGUL JUNGSEONG EO-O" #x117A)
-    ("HANGUL JUNGSEONG EO-U" #x117B)
-    ("HANGUL JUNGSEONG EO-EU" #x117C)
-    ("HANGUL JUNGSEONG YEO-O" #x117D)
-    ("HANGUL JUNGSEONG YEO-U" #x117E)
-    ("HANGUL JUNGSEONG O-EO" #x117F)
-    ("HANGUL JUNGSEONG O-E" #x1180)
-    ("HANGUL JUNGSEONG O-YE" #x1181)
-    ("HANGUL JUNGSEONG O-O" #x1182)
-    ("HANGUL JUNGSEONG O-U" #x1183)
-    ("HANGUL JUNGSEONG YO-YA" #x1184)
-    ("HANGUL JUNGSEONG YO-YAE" #x1185)
-    ("HANGUL JUNGSEONG YO-YEO" #x1186)
-    ("HANGUL JUNGSEONG YO-O" #x1187)
-    ("HANGUL JUNGSEONG YO-I" #x1188)
-    ("HANGUL JUNGSEONG U-A" #x1189)
-    ("HANGUL JUNGSEONG U-AE" #x118A)
-    ("HANGUL JUNGSEONG U-EO-EU" #x118B)
-    ("HANGUL JUNGSEONG U-YE" #x118C)
-    ("HANGUL JUNGSEONG U-U" #x118D)
-    ("HANGUL JUNGSEONG YU-A" #x118E)
-    ("HANGUL JUNGSEONG YU-EO" #x118F)
-    ("HANGUL JUNGSEONG YU-E" #x1190)
-    ("HANGUL JUNGSEONG YU-YEO" #x1191)
-    ("HANGUL JUNGSEONG YU-YE" #x1192)
-    ("HANGUL JUNGSEONG YU-U" #x1193)
-    ("HANGUL JUNGSEONG YU-I" #x1194)
-    ("HANGUL JUNGSEONG EU-U" #x1195)
-    ("HANGUL JUNGSEONG EU-EU" #x1196)
-    ("HANGUL JUNGSEONG YI-U" #x1197)
-    ("HANGUL JUNGSEONG I-A" #x1198)
-    ("HANGUL JUNGSEONG I-YA" #x1199)
-    ("HANGUL JUNGSEONG I-O" #x119A)
-    ("HANGUL JUNGSEONG I-U" #x119B)
-    ("HANGUL JUNGSEONG I-EU" #x119C)
-    ("HANGUL JUNGSEONG I-ARAEA" #x119D)
-    ("HANGUL JUNGSEONG ARAEA" #x119E)
-    ("HANGUL JUNGSEONG ARAEA-EO" #x119F)
-    ("HANGUL JUNGSEONG ARAEA-U" #x11A0)
-    ("HANGUL JUNGSEONG ARAEA-I" #x11A1)
-    ("HANGUL JUNGSEONG SSANGARAEA" #x11A2)
-    ("HANGUL JONGSEONG KIYEOK" #x11A8)
-    ("HANGUL JONGSEONG SSANGKIYEOK" #x11A9)
-    ("HANGUL JONGSEONG KIYEOK-SIOS" #x11AA)
-    ("HANGUL JONGSEONG NIEUN" #x11AB)
-    ("HANGUL JONGSEONG NIEUN-CIEUC" #x11AC)
-    ("HANGUL JONGSEONG NIEUN-HIEUH" #x11AD)
-    ("HANGUL JONGSEONG TIKEUT" #x11AE)
-    ("HANGUL JONGSEONG RIEUL" #x11AF)
-    ("HANGUL JONGSEONG RIEUL-KIYEOK" #x11B0)
-    ("HANGUL JONGSEONG RIEUL-MIEUM" #x11B1)
-    ("HANGUL JONGSEONG RIEUL-PIEUP" #x11B2)
-    ("HANGUL JONGSEONG RIEUL-SIOS" #x11B3)
-    ("HANGUL JONGSEONG RIEUL-THIEUTH" #x11B4)
-    ("HANGUL JONGSEONG RIEUL-PHIEUPH" #x11B5)
-    ("HANGUL JONGSEONG RIEUL-HIEUH" #x11B6)
-    ("HANGUL JONGSEONG MIEUM" #x11B7)
-    ("HANGUL JONGSEONG PIEUP" #x11B8)
-    ("HANGUL JONGSEONG PIEUP-SIOS" #x11B9)
-    ("HANGUL JONGSEONG SIOS" #x11BA)
-    ("HANGUL JONGSEONG SSANGSIOS" #x11BB)
-    ("HANGUL JONGSEONG IEUNG" #x11BC)
-    ("HANGUL JONGSEONG CIEUC" #x11BD)
-    ("HANGUL JONGSEONG CHIEUCH" #x11BE)
-    ("HANGUL JONGSEONG KHIEUKH" #x11BF)
-    ("HANGUL JONGSEONG THIEUTH" #x11C0)
-    ("HANGUL JONGSEONG PHIEUPH" #x11C1)
-    ("HANGUL JONGSEONG HIEUH" #x11C2)
-    ("HANGUL JONGSEONG KIYEOK-RIEUL" #x11C3)
-    ("HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK" #x11C4)
-    ("HANGUL JONGSEONG NIEUN-KIYEOK" #x11C5)
-    ("HANGUL JONGSEONG NIEUN-TIKEUT" #x11C6)
-    ("HANGUL JONGSEONG NIEUN-SIOS" #x11C7)
-    ("HANGUL JONGSEONG NIEUN-PANSIOS" #x11C8)
-    ("HANGUL JONGSEONG NIEUN-THIEUTH" #x11C9)
-    ("HANGUL JONGSEONG TIKEUT-KIYEOK" #x11CA)
-    ("HANGUL JONGSEONG TIKEUT-RIEUL" #x11CB)
-    ("HANGUL JONGSEONG RIEUL-KIYEOK-SIOS" #x11CC)
-    ("HANGUL JONGSEONG RIEUL-NIEUN" #x11CD)
-    ("HANGUL JONGSEONG RIEUL-TIKEUT" #x11CE)
-    ("HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH" #x11CF)
-    ("HANGUL JONGSEONG SSANGRIEUL" #x11D0)
-    ("HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK" #x11D1)
-    ("HANGUL JONGSEONG RIEUL-MIEUM-SIOS" #x11D2)
-    ("HANGUL JONGSEONG RIEUL-PIEUP-SIOS" #x11D3)
-    ("HANGUL JONGSEONG RIEUL-PIEUP-HIEUH" #x11D4)
-    ("HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP" #x11D5)
-    ("HANGUL JONGSEONG RIEUL-SSANGSIOS" #x11D6)
-    ("HANGUL JONGSEONG RIEUL-PANSIOS" #x11D7)
-    ("HANGUL JONGSEONG RIEUL-KHIEUKH" #x11D8)
-    ("HANGUL JONGSEONG RIEUL-YEORINHIEUH" #x11D9)
-    ("HANGUL JONGSEONG MIEUM-KIYEOK" #x11DA)
-    ("HANGUL JONGSEONG MIEUM-RIEUL" #x11DB)
-    ("HANGUL JONGSEONG MIEUM-PIEUP" #x11DC)
-    ("HANGUL JONGSEONG MIEUM-SIOS" #x11DD)
-    ("HANGUL JONGSEONG MIEUM-SSANGSIOS" #x11DE)
-    ("HANGUL JONGSEONG MIEUM-PANSIOS" #x11DF)
-    ("HANGUL JONGSEONG MIEUM-CHIEUCH" #x11E0)
-    ("HANGUL JONGSEONG MIEUM-HIEUH" #x11E1)
-    ("HANGUL JONGSEONG KAPYEOUNMIEUM" #x11E2)
-    ("HANGUL JONGSEONG PIEUP-RIEUL" #x11E3)
-    ("HANGUL JONGSEONG PIEUP-PHIEUPH" #x11E4)
-    ("HANGUL JONGSEONG PIEUP-HIEUH" #x11E5)
-    ("HANGUL JONGSEONG KAPYEOUNPIEUP" #x11E6)
-    ("HANGUL JONGSEONG SIOS-KIYEOK" #x11E7)
-    ("HANGUL JONGSEONG SIOS-TIKEUT" #x11E8)
-    ("HANGUL JONGSEONG SIOS-RIEUL" #x11E9)
-    ("HANGUL JONGSEONG SIOS-PIEUP" #x11EA)
-    ("HANGUL JONGSEONG PANSIOS" #x11EB)
-    ("HANGUL JONGSEONG IEUNG-KIYEOK" #x11EC)
-    ("HANGUL JONGSEONG IEUNG-SSANGKIYEOK" #x11ED)
-    ("HANGUL JONGSEONG SSANGIEUNG" #x11EE)
-    ("HANGUL JONGSEONG IEUNG-KHIEUKH" #x11EF)
-    ("HANGUL JONGSEONG YESIEUNG" #x11F0)
-    ("HANGUL JONGSEONG YESIEUNG-SIOS" #x11F1)
-    ("HANGUL JONGSEONG YESIEUNG-PANSIOS" #x11F2)
-    ("HANGUL JONGSEONG PHIEUPH-PIEUP" #x11F3)
-    ("HANGUL JONGSEONG KAPYEOUNPHIEUPH" #x11F4)
-    ("HANGUL JONGSEONG HIEUH-NIEUN" #x11F5)
-    ("HANGUL JONGSEONG HIEUH-RIEUL" #x11F6)
-    ("HANGUL JONGSEONG HIEUH-MIEUM" #x11F7)
-    ("HANGUL JONGSEONG HIEUH-PIEUP" #x11F8)
-    ("HANGUL JONGSEONG YEORINHIEUH" #x11F9)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01200-0137F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01200-0137F.el
deleted file mode 100644
index 06f59a3d84..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01200-0137F.el
+++ /dev/null
@@ -1,347 +0,0 @@
-(nxml-define-char-name-set 'ethiopic
-  '(("ETHIOPIC SYLLABLE HA" #x1200)
-    ("ETHIOPIC SYLLABLE HU" #x1201)
-    ("ETHIOPIC SYLLABLE HI" #x1202)
-    ("ETHIOPIC SYLLABLE HAA" #x1203)
-    ("ETHIOPIC SYLLABLE HEE" #x1204)
-    ("ETHIOPIC SYLLABLE HE" #x1205)
-    ("ETHIOPIC SYLLABLE HO" #x1206)
-    ("ETHIOPIC SYLLABLE LA" #x1208)
-    ("ETHIOPIC SYLLABLE LU" #x1209)
-    ("ETHIOPIC SYLLABLE LI" #x120A)
-    ("ETHIOPIC SYLLABLE LAA" #x120B)
-    ("ETHIOPIC SYLLABLE LEE" #x120C)
-    ("ETHIOPIC SYLLABLE LE" #x120D)
-    ("ETHIOPIC SYLLABLE LO" #x120E)
-    ("ETHIOPIC SYLLABLE LWA" #x120F)
-    ("ETHIOPIC SYLLABLE HHA" #x1210)
-    ("ETHIOPIC SYLLABLE HHU" #x1211)
-    ("ETHIOPIC SYLLABLE HHI" #x1212)
-    ("ETHIOPIC SYLLABLE HHAA" #x1213)
-    ("ETHIOPIC SYLLABLE HHEE" #x1214)
-    ("ETHIOPIC SYLLABLE HHE" #x1215)
-    ("ETHIOPIC SYLLABLE HHO" #x1216)
-    ("ETHIOPIC SYLLABLE HHWA" #x1217)
-    ("ETHIOPIC SYLLABLE MA" #x1218)
-    ("ETHIOPIC SYLLABLE MU" #x1219)
-    ("ETHIOPIC SYLLABLE MI" #x121A)
-    ("ETHIOPIC SYLLABLE MAA" #x121B)
-    ("ETHIOPIC SYLLABLE MEE" #x121C)
-    ("ETHIOPIC SYLLABLE ME" #x121D)
-    ("ETHIOPIC SYLLABLE MO" #x121E)
-    ("ETHIOPIC SYLLABLE MWA" #x121F)
-    ("ETHIOPIC SYLLABLE SZA" #x1220)
-    ("ETHIOPIC SYLLABLE SZU" #x1221)
-    ("ETHIOPIC SYLLABLE SZI" #x1222)
-    ("ETHIOPIC SYLLABLE SZAA" #x1223)
-    ("ETHIOPIC SYLLABLE SZEE" #x1224)
-    ("ETHIOPIC SYLLABLE SZE" #x1225)
-    ("ETHIOPIC SYLLABLE SZO" #x1226)
-    ("ETHIOPIC SYLLABLE SZWA" #x1227)
-    ("ETHIOPIC SYLLABLE RA" #x1228)
-    ("ETHIOPIC SYLLABLE RU" #x1229)
-    ("ETHIOPIC SYLLABLE RI" #x122A)
-    ("ETHIOPIC SYLLABLE RAA" #x122B)
-    ("ETHIOPIC SYLLABLE REE" #x122C)
-    ("ETHIOPIC SYLLABLE RE" #x122D)
-    ("ETHIOPIC SYLLABLE RO" #x122E)
-    ("ETHIOPIC SYLLABLE RWA" #x122F)
-    ("ETHIOPIC SYLLABLE SA" #x1230)
-    ("ETHIOPIC SYLLABLE SU" #x1231)
-    ("ETHIOPIC SYLLABLE SI" #x1232)
-    ("ETHIOPIC SYLLABLE SAA" #x1233)
-    ("ETHIOPIC SYLLABLE SEE" #x1234)
-    ("ETHIOPIC SYLLABLE SE" #x1235)
-    ("ETHIOPIC SYLLABLE SO" #x1236)
-    ("ETHIOPIC SYLLABLE SWA" #x1237)
-    ("ETHIOPIC SYLLABLE SHA" #x1238)
-    ("ETHIOPIC SYLLABLE SHU" #x1239)
-    ("ETHIOPIC SYLLABLE SHI" #x123A)
-    ("ETHIOPIC SYLLABLE SHAA" #x123B)
-    ("ETHIOPIC SYLLABLE SHEE" #x123C)
-    ("ETHIOPIC SYLLABLE SHE" #x123D)
-    ("ETHIOPIC SYLLABLE SHO" #x123E)
-    ("ETHIOPIC SYLLABLE SHWA" #x123F)
-    ("ETHIOPIC SYLLABLE QA" #x1240)
-    ("ETHIOPIC SYLLABLE QU" #x1241)
-    ("ETHIOPIC SYLLABLE QI" #x1242)
-    ("ETHIOPIC SYLLABLE QAA" #x1243)
-    ("ETHIOPIC SYLLABLE QEE" #x1244)
-    ("ETHIOPIC SYLLABLE QE" #x1245)
-    ("ETHIOPIC SYLLABLE QO" #x1246)
-    ("ETHIOPIC SYLLABLE QWA" #x1248)
-    ("ETHIOPIC SYLLABLE QWI" #x124A)
-    ("ETHIOPIC SYLLABLE QWAA" #x124B)
-    ("ETHIOPIC SYLLABLE QWEE" #x124C)
-    ("ETHIOPIC SYLLABLE QWE" #x124D)
-    ("ETHIOPIC SYLLABLE QHA" #x1250)
-    ("ETHIOPIC SYLLABLE QHU" #x1251)
-    ("ETHIOPIC SYLLABLE QHI" #x1252)
-    ("ETHIOPIC SYLLABLE QHAA" #x1253)
-    ("ETHIOPIC SYLLABLE QHEE" #x1254)
-    ("ETHIOPIC SYLLABLE QHE" #x1255)
-    ("ETHIOPIC SYLLABLE QHO" #x1256)
-    ("ETHIOPIC SYLLABLE QHWA" #x1258)
-    ("ETHIOPIC SYLLABLE QHWI" #x125A)
-    ("ETHIOPIC SYLLABLE QHWAA" #x125B)
-    ("ETHIOPIC SYLLABLE QHWEE" #x125C)
-    ("ETHIOPIC SYLLABLE QHWE" #x125D)
-    ("ETHIOPIC SYLLABLE BA" #x1260)
-    ("ETHIOPIC SYLLABLE BU" #x1261)
-    ("ETHIOPIC SYLLABLE BI" #x1262)
-    ("ETHIOPIC SYLLABLE BAA" #x1263)
-    ("ETHIOPIC SYLLABLE BEE" #x1264)
-    ("ETHIOPIC SYLLABLE BE" #x1265)
-    ("ETHIOPIC SYLLABLE BO" #x1266)
-    ("ETHIOPIC SYLLABLE BWA" #x1267)
-    ("ETHIOPIC SYLLABLE VA" #x1268)
-    ("ETHIOPIC SYLLABLE VU" #x1269)
-    ("ETHIOPIC SYLLABLE VI" #x126A)
-    ("ETHIOPIC SYLLABLE VAA" #x126B)
-    ("ETHIOPIC SYLLABLE VEE" #x126C)
-    ("ETHIOPIC SYLLABLE VE" #x126D)
-    ("ETHIOPIC SYLLABLE VO" #x126E)
-    ("ETHIOPIC SYLLABLE VWA" #x126F)
-    ("ETHIOPIC SYLLABLE TA" #x1270)
-    ("ETHIOPIC SYLLABLE TU" #x1271)
-    ("ETHIOPIC SYLLABLE TI" #x1272)
-    ("ETHIOPIC SYLLABLE TAA" #x1273)
-    ("ETHIOPIC SYLLABLE TEE" #x1274)
-    ("ETHIOPIC SYLLABLE TE" #x1275)
-    ("ETHIOPIC SYLLABLE TO" #x1276)
-    ("ETHIOPIC SYLLABLE TWA" #x1277)
-    ("ETHIOPIC SYLLABLE CA" #x1278)
-    ("ETHIOPIC SYLLABLE CU" #x1279)
-    ("ETHIOPIC SYLLABLE CI" #x127A)
-    ("ETHIOPIC SYLLABLE CAA" #x127B)
-    ("ETHIOPIC SYLLABLE CEE" #x127C)
-    ("ETHIOPIC SYLLABLE CE" #x127D)
-    ("ETHIOPIC SYLLABLE CO" #x127E)
-    ("ETHIOPIC SYLLABLE CWA" #x127F)
-    ("ETHIOPIC SYLLABLE XA" #x1280)
-    ("ETHIOPIC SYLLABLE XU" #x1281)
-    ("ETHIOPIC SYLLABLE XI" #x1282)
-    ("ETHIOPIC SYLLABLE XAA" #x1283)
-    ("ETHIOPIC SYLLABLE XEE" #x1284)
-    ("ETHIOPIC SYLLABLE XE" #x1285)
-    ("ETHIOPIC SYLLABLE XO" #x1286)
-    ("ETHIOPIC SYLLABLE XWA" #x1288)
-    ("ETHIOPIC SYLLABLE XWI" #x128A)
-    ("ETHIOPIC SYLLABLE XWAA" #x128B)
-    ("ETHIOPIC SYLLABLE XWEE" #x128C)
-    ("ETHIOPIC SYLLABLE XWE" #x128D)
-    ("ETHIOPIC SYLLABLE NA" #x1290)
-    ("ETHIOPIC SYLLABLE NU" #x1291)
-    ("ETHIOPIC SYLLABLE NI" #x1292)
-    ("ETHIOPIC SYLLABLE NAA" #x1293)
-    ("ETHIOPIC SYLLABLE NEE" #x1294)
-    ("ETHIOPIC SYLLABLE NE" #x1295)
-    ("ETHIOPIC SYLLABLE NO" #x1296)
-    ("ETHIOPIC SYLLABLE NWA" #x1297)
-    ("ETHIOPIC SYLLABLE NYA" #x1298)
-    ("ETHIOPIC SYLLABLE NYU" #x1299)
-    ("ETHIOPIC SYLLABLE NYI" #x129A)
-    ("ETHIOPIC SYLLABLE NYAA" #x129B)
-    ("ETHIOPIC SYLLABLE NYEE" #x129C)
-    ("ETHIOPIC SYLLABLE NYE" #x129D)
-    ("ETHIOPIC SYLLABLE NYO" #x129E)
-    ("ETHIOPIC SYLLABLE NYWA" #x129F)
-    ("ETHIOPIC SYLLABLE GLOTTAL A" #x12A0)
-    ("ETHIOPIC SYLLABLE GLOTTAL U" #x12A1)
-    ("ETHIOPIC SYLLABLE GLOTTAL I" #x12A2)
-    ("ETHIOPIC SYLLABLE GLOTTAL AA" #x12A3)
-    ("ETHIOPIC SYLLABLE GLOTTAL EE" #x12A4)
-    ("ETHIOPIC SYLLABLE GLOTTAL E" #x12A5)
-    ("ETHIOPIC SYLLABLE GLOTTAL O" #x12A6)
-    ("ETHIOPIC SYLLABLE GLOTTAL WA" #x12A7)
-    ("ETHIOPIC SYLLABLE KA" #x12A8)
-    ("ETHIOPIC SYLLABLE KU" #x12A9)
-    ("ETHIOPIC SYLLABLE KI" #x12AA)
-    ("ETHIOPIC SYLLABLE KAA" #x12AB)
-    ("ETHIOPIC SYLLABLE KEE" #x12AC)
-    ("ETHIOPIC SYLLABLE KE" #x12AD)
-    ("ETHIOPIC SYLLABLE KO" #x12AE)
-    ("ETHIOPIC SYLLABLE KWA" #x12B0)
-    ("ETHIOPIC SYLLABLE KWI" #x12B2)
-    ("ETHIOPIC SYLLABLE KWAA" #x12B3)
-    ("ETHIOPIC SYLLABLE KWEE" #x12B4)
-    ("ETHIOPIC SYLLABLE KWE" #x12B5)
-    ("ETHIOPIC SYLLABLE KXA" #x12B8)
-    ("ETHIOPIC SYLLABLE KXU" #x12B9)
-    ("ETHIOPIC SYLLABLE KXI" #x12BA)
-    ("ETHIOPIC SYLLABLE KXAA" #x12BB)
-    ("ETHIOPIC SYLLABLE KXEE" #x12BC)
-    ("ETHIOPIC SYLLABLE KXE" #x12BD)
-    ("ETHIOPIC SYLLABLE KXO" #x12BE)
-    ("ETHIOPIC SYLLABLE KXWA" #x12C0)
-    ("ETHIOPIC SYLLABLE KXWI" #x12C2)
-    ("ETHIOPIC SYLLABLE KXWAA" #x12C3)
-    ("ETHIOPIC SYLLABLE KXWEE" #x12C4)
-    ("ETHIOPIC SYLLABLE KXWE" #x12C5)
-    ("ETHIOPIC SYLLABLE WA" #x12C8)
-    ("ETHIOPIC SYLLABLE WU" #x12C9)
-    ("ETHIOPIC SYLLABLE WI" #x12CA)
-    ("ETHIOPIC SYLLABLE WAA" #x12CB)
-    ("ETHIOPIC SYLLABLE WEE" #x12CC)
-    ("ETHIOPIC SYLLABLE WE" #x12CD)
-    ("ETHIOPIC SYLLABLE WO" #x12CE)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL A" #x12D0)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL U" #x12D1)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL I" #x12D2)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL AA" #x12D3)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL EE" #x12D4)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL E" #x12D5)
-    ("ETHIOPIC SYLLABLE PHARYNGEAL O" #x12D6)
-    ("ETHIOPIC SYLLABLE ZA" #x12D8)
-    ("ETHIOPIC SYLLABLE ZU" #x12D9)
-    ("ETHIOPIC SYLLABLE ZI" #x12DA)
-    ("ETHIOPIC SYLLABLE ZAA" #x12DB)
-    ("ETHIOPIC SYLLABLE ZEE" #x12DC)
-    ("ETHIOPIC SYLLABLE ZE" #x12DD)
-    ("ETHIOPIC SYLLABLE ZO" #x12DE)
-    ("ETHIOPIC SYLLABLE ZWA" #x12DF)
-    ("ETHIOPIC SYLLABLE ZHA" #x12E0)
-    ("ETHIOPIC SYLLABLE ZHU" #x12E1)
-    ("ETHIOPIC SYLLABLE ZHI" #x12E2)
-    ("ETHIOPIC SYLLABLE ZHAA" #x12E3)
-    ("ETHIOPIC SYLLABLE ZHEE" #x12E4)
-    ("ETHIOPIC SYLLABLE ZHE" #x12E5)
-    ("ETHIOPIC SYLLABLE ZHO" #x12E6)
-    ("ETHIOPIC SYLLABLE ZHWA" #x12E7)
-    ("ETHIOPIC SYLLABLE YA" #x12E8)
-    ("ETHIOPIC SYLLABLE YU" #x12E9)
-    ("ETHIOPIC SYLLABLE YI" #x12EA)
-    ("ETHIOPIC SYLLABLE YAA" #x12EB)
-    ("ETHIOPIC SYLLABLE YEE" #x12EC)
-    ("ETHIOPIC SYLLABLE YE" #x12ED)
-    ("ETHIOPIC SYLLABLE YO" #x12EE)
-    ("ETHIOPIC SYLLABLE DA" #x12F0)
-    ("ETHIOPIC SYLLABLE DU" #x12F1)
-    ("ETHIOPIC SYLLABLE DI" #x12F2)
-    ("ETHIOPIC SYLLABLE DAA" #x12F3)
-    ("ETHIOPIC SYLLABLE DEE" #x12F4)
-    ("ETHIOPIC SYLLABLE DE" #x12F5)
-    ("ETHIOPIC SYLLABLE DO" #x12F6)
-    ("ETHIOPIC SYLLABLE DWA" #x12F7)
-    ("ETHIOPIC SYLLABLE DDA" #x12F8)
-    ("ETHIOPIC SYLLABLE DDU" #x12F9)
-    ("ETHIOPIC SYLLABLE DDI" #x12FA)
-    ("ETHIOPIC SYLLABLE DDAA" #x12FB)
-    ("ETHIOPIC SYLLABLE DDEE" #x12FC)
-    ("ETHIOPIC SYLLABLE DDE" #x12FD)
-    ("ETHIOPIC SYLLABLE DDO" #x12FE)
-    ("ETHIOPIC SYLLABLE DDWA" #x12FF)
-    ("ETHIOPIC SYLLABLE JA" #x1300)
-    ("ETHIOPIC SYLLABLE JU" #x1301)
-    ("ETHIOPIC SYLLABLE JI" #x1302)
-    ("ETHIOPIC SYLLABLE JAA" #x1303)
-    ("ETHIOPIC SYLLABLE JEE" #x1304)
-    ("ETHIOPIC SYLLABLE JE" #x1305)
-    ("ETHIOPIC SYLLABLE JO" #x1306)
-    ("ETHIOPIC SYLLABLE JWA" #x1307)
-    ("ETHIOPIC SYLLABLE GA" #x1308)
-    ("ETHIOPIC SYLLABLE GU" #x1309)
-    ("ETHIOPIC SYLLABLE GI" #x130A)
-    ("ETHIOPIC SYLLABLE GAA" #x130B)
-    ("ETHIOPIC SYLLABLE GEE" #x130C)
-    ("ETHIOPIC SYLLABLE GE" #x130D)
-    ("ETHIOPIC SYLLABLE GO" #x130E)
-    ("ETHIOPIC SYLLABLE GWA" #x1310)
-    ("ETHIOPIC SYLLABLE GWI" #x1312)
-    ("ETHIOPIC SYLLABLE GWAA" #x1313)
-    ("ETHIOPIC SYLLABLE GWEE" #x1314)
-    ("ETHIOPIC SYLLABLE GWE" #x1315)
-    ("ETHIOPIC SYLLABLE GGA" #x1318)
-    ("ETHIOPIC SYLLABLE GGU" #x1319)
-    ("ETHIOPIC SYLLABLE GGI" #x131A)
-    ("ETHIOPIC SYLLABLE GGAA" #x131B)
-    ("ETHIOPIC SYLLABLE GGEE" #x131C)
-    ("ETHIOPIC SYLLABLE GGE" #x131D)
-    ("ETHIOPIC SYLLABLE GGO" #x131E)
-    ("ETHIOPIC SYLLABLE THA" #x1320)
-    ("ETHIOPIC SYLLABLE THU" #x1321)
-    ("ETHIOPIC SYLLABLE THI" #x1322)
-    ("ETHIOPIC SYLLABLE THAA" #x1323)
-    ("ETHIOPIC SYLLABLE THEE" #x1324)
-    ("ETHIOPIC SYLLABLE THE" #x1325)
-    ("ETHIOPIC SYLLABLE THO" #x1326)
-    ("ETHIOPIC SYLLABLE THWA" #x1327)
-    ("ETHIOPIC SYLLABLE CHA" #x1328)
-    ("ETHIOPIC SYLLABLE CHU" #x1329)
-    ("ETHIOPIC SYLLABLE CHI" #x132A)
-    ("ETHIOPIC SYLLABLE CHAA" #x132B)
-    ("ETHIOPIC SYLLABLE CHEE" #x132C)
-    ("ETHIOPIC SYLLABLE CHE" #x132D)
-    ("ETHIOPIC SYLLABLE CHO" #x132E)
-    ("ETHIOPIC SYLLABLE CHWA" #x132F)
-    ("ETHIOPIC SYLLABLE PHA" #x1330)
-    ("ETHIOPIC SYLLABLE PHU" #x1331)
-    ("ETHIOPIC SYLLABLE PHI" #x1332)
-    ("ETHIOPIC SYLLABLE PHAA" #x1333)
-    ("ETHIOPIC SYLLABLE PHEE" #x1334)
-    ("ETHIOPIC SYLLABLE PHE" #x1335)
-    ("ETHIOPIC SYLLABLE PHO" #x1336)
-    ("ETHIOPIC SYLLABLE PHWA" #x1337)
-    ("ETHIOPIC SYLLABLE TSA" #x1338)
-    ("ETHIOPIC SYLLABLE TSU" #x1339)
-    ("ETHIOPIC SYLLABLE TSI" #x133A)
-    ("ETHIOPIC SYLLABLE TSAA" #x133B)
-    ("ETHIOPIC SYLLABLE TSEE" #x133C)
-    ("ETHIOPIC SYLLABLE TSE" #x133D)
-    ("ETHIOPIC SYLLABLE TSO" #x133E)
-    ("ETHIOPIC SYLLABLE TSWA" #x133F)
-    ("ETHIOPIC SYLLABLE TZA" #x1340)
-    ("ETHIOPIC SYLLABLE TZU" #x1341)
-    ("ETHIOPIC SYLLABLE TZI" #x1342)
-    ("ETHIOPIC SYLLABLE TZAA" #x1343)
-    ("ETHIOPIC SYLLABLE TZEE" #x1344)
-    ("ETHIOPIC SYLLABLE TZE" #x1345)
-    ("ETHIOPIC SYLLABLE TZO" #x1346)
-    ("ETHIOPIC SYLLABLE FA" #x1348)
-    ("ETHIOPIC SYLLABLE FU" #x1349)
-    ("ETHIOPIC SYLLABLE FI" #x134A)
-    ("ETHIOPIC SYLLABLE FAA" #x134B)
-    ("ETHIOPIC SYLLABLE FEE" #x134C)
-    ("ETHIOPIC SYLLABLE FE" #x134D)
-    ("ETHIOPIC SYLLABLE FO" #x134E)
-    ("ETHIOPIC SYLLABLE FWA" #x134F)
-    ("ETHIOPIC SYLLABLE PA" #x1350)
-    ("ETHIOPIC SYLLABLE PU" #x1351)
-    ("ETHIOPIC SYLLABLE PI" #x1352)
-    ("ETHIOPIC SYLLABLE PAA" #x1353)
-    ("ETHIOPIC SYLLABLE PEE" #x1354)
-    ("ETHIOPIC SYLLABLE PE" #x1355)
-    ("ETHIOPIC SYLLABLE PO" #x1356)
-    ("ETHIOPIC SYLLABLE PWA" #x1357)
-    ("ETHIOPIC SYLLABLE RYA" #x1358)
-    ("ETHIOPIC SYLLABLE MYA" #x1359)
-    ("ETHIOPIC SYLLABLE FYA" #x135A)
-    ("ETHIOPIC WORDSPACE" #x1361)
-    ("ETHIOPIC FULL STOP" #x1362)
-    ("ETHIOPIC COMMA" #x1363)
-    ("ETHIOPIC SEMICOLON" #x1364)
-    ("ETHIOPIC COLON" #x1365)
-    ("ETHIOPIC PREFACE COLON" #x1366)
-    ("ETHIOPIC QUESTION MARK" #x1367)
-    ("ETHIOPIC PARAGRAPH SEPARATOR" #x1368)
-    ("ETHIOPIC DIGIT ONE" #x1369)
-    ("ETHIOPIC DIGIT TWO" #x136A)
-    ("ETHIOPIC DIGIT THREE" #x136B)
-    ("ETHIOPIC DIGIT FOUR" #x136C)
-    ("ETHIOPIC DIGIT FIVE" #x136D)
-    ("ETHIOPIC DIGIT SIX" #x136E)
-    ("ETHIOPIC DIGIT SEVEN" #x136F)
-    ("ETHIOPIC DIGIT EIGHT" #x1370)
-    ("ETHIOPIC DIGIT NINE" #x1371)
-    ("ETHIOPIC NUMBER TEN" #x1372)
-    ("ETHIOPIC NUMBER TWENTY" #x1373)
-    ("ETHIOPIC NUMBER THIRTY" #x1374)
-    ("ETHIOPIC NUMBER FORTY" #x1375)
-    ("ETHIOPIC NUMBER FIFTY" #x1376)
-    ("ETHIOPIC NUMBER SIXTY" #x1377)
-    ("ETHIOPIC NUMBER SEVENTY" #x1378)
-    ("ETHIOPIC NUMBER EIGHTY" #x1379)
-    ("ETHIOPIC NUMBER NINETY" #x137A)
-    ("ETHIOPIC NUMBER HUNDRED" #x137B)
-    ("ETHIOPIC NUMBER TEN THOUSAND" #x137C)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/013A0-013FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/013A0-013FF.el
deleted file mode 100644
index 74111fb8b0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/013A0-013FF.el
+++ /dev/null
@@ -1,87 +0,0 @@
-(nxml-define-char-name-set 'cherokee
-  '(("CHEROKEE LETTER A" #x13A0)
-    ("CHEROKEE LETTER E" #x13A1)
-    ("CHEROKEE LETTER I" #x13A2)
-    ("CHEROKEE LETTER O" #x13A3)
-    ("CHEROKEE LETTER U" #x13A4)
-    ("CHEROKEE LETTER V" #x13A5)
-    ("CHEROKEE LETTER GA" #x13A6)
-    ("CHEROKEE LETTER KA" #x13A7)
-    ("CHEROKEE LETTER GE" #x13A8)
-    ("CHEROKEE LETTER GI" #x13A9)
-    ("CHEROKEE LETTER GO" #x13AA)
-    ("CHEROKEE LETTER GU" #x13AB)
-    ("CHEROKEE LETTER GV" #x13AC)
-    ("CHEROKEE LETTER HA" #x13AD)
-    ("CHEROKEE LETTER HE" #x13AE)
-    ("CHEROKEE LETTER HI" #x13AF)
-    ("CHEROKEE LETTER HO" #x13B0)
-    ("CHEROKEE LETTER HU" #x13B1)
-    ("CHEROKEE LETTER HV" #x13B2)
-    ("CHEROKEE LETTER LA" #x13B3)
-    ("CHEROKEE LETTER LE" #x13B4)
-    ("CHEROKEE LETTER LI" #x13B5)
-    ("CHEROKEE LETTER LO" #x13B6)
-    ("CHEROKEE LETTER LU" #x13B7)
-    ("CHEROKEE LETTER LV" #x13B8)
-    ("CHEROKEE LETTER MA" #x13B9)
-    ("CHEROKEE LETTER ME" #x13BA)
-    ("CHEROKEE LETTER MI" #x13BB)
-    ("CHEROKEE LETTER MO" #x13BC)
-    ("CHEROKEE LETTER MU" #x13BD)
-    ("CHEROKEE LETTER NA" #x13BE)
-    ("CHEROKEE LETTER HNA" #x13BF)
-    ("CHEROKEE LETTER NAH" #x13C0)
-    ("CHEROKEE LETTER NE" #x13C1)
-    ("CHEROKEE LETTER NI" #x13C2)
-    ("CHEROKEE LETTER NO" #x13C3)
-    ("CHEROKEE LETTER NU" #x13C4)
-    ("CHEROKEE LETTER NV" #x13C5)
-    ("CHEROKEE LETTER QUA" #x13C6)
-    ("CHEROKEE LETTER QUE" #x13C7)
-    ("CHEROKEE LETTER QUI" #x13C8)
-    ("CHEROKEE LETTER QUO" #x13C9)
-    ("CHEROKEE LETTER QUU" #x13CA)
-    ("CHEROKEE LETTER QUV" #x13CB)
-    ("CHEROKEE LETTER SA" #x13CC)
-    ("CHEROKEE LETTER S" #x13CD)
-    ("CHEROKEE LETTER SE" #x13CE)
-    ("CHEROKEE LETTER SI" #x13CF)
-    ("CHEROKEE LETTER SO" #x13D0)
-    ("CHEROKEE LETTER SU" #x13D1)
-    ("CHEROKEE LETTER SV" #x13D2)
-    ("CHEROKEE LETTER DA" #x13D3)
-    ("CHEROKEE LETTER TA" #x13D4)
-    ("CHEROKEE LETTER DE" #x13D5)
-    ("CHEROKEE LETTER TE" #x13D6)
-    ("CHEROKEE LETTER DI" #x13D7)
-    ("CHEROKEE LETTER TI" #x13D8)
-    ("CHEROKEE LETTER DO" #x13D9)
-    ("CHEROKEE LETTER DU" #x13DA)
-    ("CHEROKEE LETTER DV" #x13DB)
-    ("CHEROKEE LETTER DLA" #x13DC)
-    ("CHEROKEE LETTER TLA" #x13DD)
-    ("CHEROKEE LETTER TLE" #x13DE)
-    ("CHEROKEE LETTER TLI" #x13DF)
-    ("CHEROKEE LETTER TLO" #x13E0)
-    ("CHEROKEE LETTER TLU" #x13E1)
-    ("CHEROKEE LETTER TLV" #x13E2)
-    ("CHEROKEE LETTER TSA" #x13E3)
-    ("CHEROKEE LETTER TSE" #x13E4)
-    ("CHEROKEE LETTER TSI" #x13E5)
-    ("CHEROKEE LETTER TSO" #x13E6)
-    ("CHEROKEE LETTER TSU" #x13E7)
-    ("CHEROKEE LETTER TSV" #x13E8)
-    ("CHEROKEE LETTER WA" #x13E9)
-    ("CHEROKEE LETTER WE" #x13EA)
-    ("CHEROKEE LETTER WI" #x13EB)
-    ("CHEROKEE LETTER WO" #x13EC)
-    ("CHEROKEE LETTER WU" #x13ED)
-    ("CHEROKEE LETTER WV" #x13EE)
-    ("CHEROKEE LETTER YA" #x13EF)
-    ("CHEROKEE LETTER YE" #x13F0)
-    ("CHEROKEE LETTER YI" #x13F1)
-    ("CHEROKEE LETTER YO" #x13F2)
-    ("CHEROKEE LETTER YU" #x13F3)
-    ("CHEROKEE LETTER YV" #x13F4)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01400-0167F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01400-0167F.el
deleted file mode 100644
index 644b2552d0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01400-0167F.el
+++ /dev/null
@@ -1,632 +0,0 @@
-(nxml-define-char-name-set 'unified-canadian-aboriginal-syllabics
-  '(("CANADIAN SYLLABICS E" #x1401)
-    ("CANADIAN SYLLABICS AAI" #x1402)
-    ("CANADIAN SYLLABICS I" #x1403)
-    ("CANADIAN SYLLABICS II" #x1404)
-    ("CANADIAN SYLLABICS O" #x1405)
-    ("CANADIAN SYLLABICS OO" #x1406)
-    ("CANADIAN SYLLABICS Y-CREE OO" #x1407)
-    ("CANADIAN SYLLABICS CARRIER EE" #x1408)
-    ("CANADIAN SYLLABICS CARRIER I" #x1409)
-    ("CANADIAN SYLLABICS A" #x140A)
-    ("CANADIAN SYLLABICS AA" #x140B)
-    ("CANADIAN SYLLABICS WE" #x140C)
-    ("CANADIAN SYLLABICS WEST-CREE WE" #x140D)
-    ("CANADIAN SYLLABICS WI" #x140E)
-    ("CANADIAN SYLLABICS WEST-CREE WI" #x140F)
-    ("CANADIAN SYLLABICS WII" #x1410)
-    ("CANADIAN SYLLABICS WEST-CREE WII" #x1411)
-    ("CANADIAN SYLLABICS WO" #x1412)
-    ("CANADIAN SYLLABICS WEST-CREE WO" #x1413)
-    ("CANADIAN SYLLABICS WOO" #x1414)
-    ("CANADIAN SYLLABICS WEST-CREE WOO" #x1415)
-    ("CANADIAN SYLLABICS NASKAPI WOO" #x1416)
-    ("CANADIAN SYLLABICS WA" #x1417)
-    ("CANADIAN SYLLABICS WEST-CREE WA" #x1418)
-    ("CANADIAN SYLLABICS WAA" #x1419)
-    ("CANADIAN SYLLABICS WEST-CREE WAA" #x141A)
-    ("CANADIAN SYLLABICS NASKAPI WAA" #x141B)
-    ("CANADIAN SYLLABICS AI" #x141C)
-    ("CANADIAN SYLLABICS Y-CREE W" #x141D)
-    ("CANADIAN SYLLABICS GLOTTAL STOP" #x141E)
-    ("CANADIAN SYLLABICS FINAL ACUTE" #x141F)
-    ("CANADIAN SYLLABICS FINAL GRAVE" #x1420)
-    ("CANADIAN SYLLABICS FINAL BOTTOM HALF RING" #x1421)
-    ("CANADIAN SYLLABICS FINAL TOP HALF RING" #x1422)
-    ("CANADIAN SYLLABICS FINAL RIGHT HALF RING" #x1423)
-    ("CANADIAN SYLLABICS FINAL RING" #x1424)
-    ("CANADIAN SYLLABICS FINAL DOUBLE ACUTE" #x1425)
-    ("CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES" #x1426)
-    ("CANADIAN SYLLABICS FINAL MIDDLE DOT" #x1427)
-    ("CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE" #x1428)
-    ("CANADIAN SYLLABICS FINAL PLUS" #x1429)
-    ("CANADIAN SYLLABICS FINAL DOWN TACK" #x142A)
-    ("CANADIAN SYLLABICS EN" #x142B)
-    ("CANADIAN SYLLABICS IN" #x142C)
-    ("CANADIAN SYLLABICS ON" #x142D)
-    ("CANADIAN SYLLABICS AN" #x142E)
-    ("CANADIAN SYLLABICS PE" #x142F)
-    ("CANADIAN SYLLABICS PAAI" #x1430)
-    ("CANADIAN SYLLABICS PI" #x1431)
-    ("CANADIAN SYLLABICS PII" #x1432)
-    ("CANADIAN SYLLABICS PO" #x1433)
-    ("CANADIAN SYLLABICS POO" #x1434)
-    ("CANADIAN SYLLABICS Y-CREE POO" #x1435)
-    ("CANADIAN SYLLABICS CARRIER HEE" #x1436)
-    ("CANADIAN SYLLABICS CARRIER HI" #x1437)
-    ("CANADIAN SYLLABICS PA" #x1438)
-    ("CANADIAN SYLLABICS PAA" #x1439)
-    ("CANADIAN SYLLABICS PWE" #x143A)
-    ("CANADIAN SYLLABICS WEST-CREE PWE" #x143B)
-    ("CANADIAN SYLLABICS PWI" #x143C)
-    ("CANADIAN SYLLABICS WEST-CREE PWI" #x143D)
-    ("CANADIAN SYLLABICS PWII" #x143E)
-    ("CANADIAN SYLLABICS WEST-CREE PWII" #x143F)
-    ("CANADIAN SYLLABICS PWO" #x1440)
-    ("CANADIAN SYLLABICS WEST-CREE PWO" #x1441)
-    ("CANADIAN SYLLABICS PWOO" #x1442)
-    ("CANADIAN SYLLABICS WEST-CREE PWOO" #x1443)
-    ("CANADIAN SYLLABICS PWA" #x1444)
-    ("CANADIAN SYLLABICS WEST-CREE PWA" #x1445)
-    ("CANADIAN SYLLABICS PWAA" #x1446)
-    ("CANADIAN SYLLABICS WEST-CREE PWAA" #x1447)
-    ("CANADIAN SYLLABICS Y-CREE PWAA" #x1448)
-    ("CANADIAN SYLLABICS P" #x1449)
-    ("CANADIAN SYLLABICS WEST-CREE P" #x144A)
-    ("CANADIAN SYLLABICS CARRIER H" #x144B)
-    ("CANADIAN SYLLABICS TE" #x144C)
-    ("CANADIAN SYLLABICS TAAI" #x144D)
-    ("CANADIAN SYLLABICS TI" #x144E)
-    ("CANADIAN SYLLABICS TII" #x144F)
-    ("CANADIAN SYLLABICS TO" #x1450)
-    ("CANADIAN SYLLABICS TOO" #x1451)
-    ("CANADIAN SYLLABICS Y-CREE TOO" #x1452)
-    ("CANADIAN SYLLABICS CARRIER DEE" #x1453)
-    ("CANADIAN SYLLABICS CARRIER DI" #x1454)
-    ("CANADIAN SYLLABICS TA" #x1455)
-    ("CANADIAN SYLLABICS TAA" #x1456)
-    ("CANADIAN SYLLABICS TWE" #x1457)
-    ("CANADIAN SYLLABICS WEST-CREE TWE" #x1458)
-    ("CANADIAN SYLLABICS TWI" #x1459)
-    ("CANADIAN SYLLABICS WEST-CREE TWI" #x145A)
-    ("CANADIAN SYLLABICS TWII" #x145B)
-    ("CANADIAN SYLLABICS WEST-CREE TWII" #x145C)
-    ("CANADIAN SYLLABICS TWO" #x145D)
-    ("CANADIAN SYLLABICS WEST-CREE TWO" #x145E)
-    ("CANADIAN SYLLABICS TWOO" #x145F)
-    ("CANADIAN SYLLABICS WEST-CREE TWOO" #x1460)
-    ("CANADIAN SYLLABICS TWA" #x1461)
-    ("CANADIAN SYLLABICS WEST-CREE TWA" #x1462)
-    ("CANADIAN SYLLABICS TWAA" #x1463)
-    ("CANADIAN SYLLABICS WEST-CREE TWAA" #x1464)
-    ("CANADIAN SYLLABICS NASKAPI TWAA" #x1465)
-    ("CANADIAN SYLLABICS T" #x1466)
-    ("CANADIAN SYLLABICS TTE" #x1467)
-    ("CANADIAN SYLLABICS TTI" #x1468)
-    ("CANADIAN SYLLABICS TTO" #x1469)
-    ("CANADIAN SYLLABICS TTA" #x146A)
-    ("CANADIAN SYLLABICS KE" #x146B)
-    ("CANADIAN SYLLABICS KAAI" #x146C)
-    ("CANADIAN SYLLABICS KI" #x146D)
-    ("CANADIAN SYLLABICS KII" #x146E)
-    ("CANADIAN SYLLABICS KO" #x146F)
-    ("CANADIAN SYLLABICS KOO" #x1470)
-    ("CANADIAN SYLLABICS Y-CREE KOO" #x1471)
-    ("CANADIAN SYLLABICS KA" #x1472)
-    ("CANADIAN SYLLABICS KAA" #x1473)
-    ("CANADIAN SYLLABICS KWE" #x1474)
-    ("CANADIAN SYLLABICS WEST-CREE KWE" #x1475)
-    ("CANADIAN SYLLABICS KWI" #x1476)
-    ("CANADIAN SYLLABICS WEST-CREE KWI" #x1477)
-    ("CANADIAN SYLLABICS KWII" #x1478)
-    ("CANADIAN SYLLABICS WEST-CREE KWII" #x1479)
-    ("CANADIAN SYLLABICS KWO" #x147A)
-    ("CANADIAN SYLLABICS WEST-CREE KWO" #x147B)
-    ("CANADIAN SYLLABICS KWOO" #x147C)
-    ("CANADIAN SYLLABICS WEST-CREE KWOO" #x147D)
-    ("CANADIAN SYLLABICS KWA" #x147E)
-    ("CANADIAN SYLLABICS WEST-CREE KWA" #x147F)
-    ("CANADIAN SYLLABICS KWAA" #x1480)
-    ("CANADIAN SYLLABICS WEST-CREE KWAA" #x1481)
-    ("CANADIAN SYLLABICS NASKAPI KWAA" #x1482)
-    ("CANADIAN SYLLABICS K" #x1483)
-    ("CANADIAN SYLLABICS KW" #x1484)
-    ("CANADIAN SYLLABICS SOUTH-SLAVEY KEH" #x1485)
-    ("CANADIAN SYLLABICS SOUTH-SLAVEY KIH" #x1486)
-    ("CANADIAN SYLLABICS SOUTH-SLAVEY KOH" #x1487)
-    ("CANADIAN SYLLABICS SOUTH-SLAVEY KAH" #x1488)
-    ("CANADIAN SYLLABICS CE" #x1489)
-    ("CANADIAN SYLLABICS CAAI" #x148A)
-    ("CANADIAN SYLLABICS CI" #x148B)
-    ("CANADIAN SYLLABICS CII" #x148C)
-    ("CANADIAN SYLLABICS CO" #x148D)
-    ("CANADIAN SYLLABICS COO" #x148E)
-    ("CANADIAN SYLLABICS Y-CREE COO" #x148F)
-    ("CANADIAN SYLLABICS CA" #x1490)
-    ("CANADIAN SYLLABICS CAA" #x1491)
-    ("CANADIAN SYLLABICS CWE" #x1492)
-    ("CANADIAN SYLLABICS WEST-CREE CWE" #x1493)
-    ("CANADIAN SYLLABICS CWI" #x1494)
-    ("CANADIAN SYLLABICS WEST-CREE CWI" #x1495)
-    ("CANADIAN SYLLABICS CWII" #x1496)
-    ("CANADIAN SYLLABICS WEST-CREE CWII" #x1497)
-    ("CANADIAN SYLLABICS CWO" #x1498)
-    ("CANADIAN SYLLABICS WEST-CREE CWO" #x1499)
-    ("CANADIAN SYLLABICS CWOO" #x149A)
-    ("CANADIAN SYLLABICS WEST-CREE CWOO" #x149B)
-    ("CANADIAN SYLLABICS CWA" #x149C)
-    ("CANADIAN SYLLABICS WEST-CREE CWA" #x149D)
-    ("CANADIAN SYLLABICS CWAA" #x149E)
-    ("CANADIAN SYLLABICS WEST-CREE CWAA" #x149F)
-    ("CANADIAN SYLLABICS NASKAPI CWAA" #x14A0)
-    ("CANADIAN SYLLABICS C" #x14A1)
-    ("CANADIAN SYLLABICS SAYISI TH" #x14A2)
-    ("CANADIAN SYLLABICS ME" #x14A3)
-    ("CANADIAN SYLLABICS MAAI" #x14A4)
-    ("CANADIAN SYLLABICS MI" #x14A5)
-    ("CANADIAN SYLLABICS MII" #x14A6)
-    ("CANADIAN SYLLABICS MO" #x14A7)
-    ("CANADIAN SYLLABICS MOO" #x14A8)
-    ("CANADIAN SYLLABICS Y-CREE MOO" #x14A9)
-    ("CANADIAN SYLLABICS MA" #x14AA)
-    ("CANADIAN SYLLABICS MAA" #x14AB)
-    ("CANADIAN SYLLABICS MWE" #x14AC)
-    ("CANADIAN SYLLABICS WEST-CREE MWE" #x14AD)
-    ("CANADIAN SYLLABICS MWI" #x14AE)
-    ("CANADIAN SYLLABICS WEST-CREE MWI" #x14AF)
-    ("CANADIAN SYLLABICS MWII" #x14B0)
-    ("CANADIAN SYLLABICS WEST-CREE MWII" #x14B1)
-    ("CANADIAN SYLLABICS MWO" #x14B2)
-    ("CANADIAN SYLLABICS WEST-CREE MWO" #x14B3)
-    ("CANADIAN SYLLABICS MWOO" #x14B4)
-    ("CANADIAN SYLLABICS WEST-CREE MWOO" #x14B5)
-    ("CANADIAN SYLLABICS MWA" #x14B6)
-    ("CANADIAN SYLLABICS WEST-CREE MWA" #x14B7)
-    ("CANADIAN SYLLABICS MWAA" #x14B8)
-    ("CANADIAN SYLLABICS WEST-CREE MWAA" #x14B9)
-    ("CANADIAN SYLLABICS NASKAPI MWAA" #x14BA)
-    ("CANADIAN SYLLABICS M" #x14BB)
-    ("CANADIAN SYLLABICS WEST-CREE M" #x14BC)
-    ("CANADIAN SYLLABICS MH" #x14BD)
-    ("CANADIAN SYLLABICS ATHAPASCAN M" #x14BE)
-    ("CANADIAN SYLLABICS SAYISI M" #x14BF)
-    ("CANADIAN SYLLABICS NE" #x14C0)
-    ("CANADIAN SYLLABICS NAAI" #x14C1)
-    ("CANADIAN SYLLABICS NI" #x14C2)
-    ("CANADIAN SYLLABICS NII" #x14C3)
-    ("CANADIAN SYLLABICS NO" #x14C4)
-    ("CANADIAN SYLLABICS NOO" #x14C5)
-    ("CANADIAN SYLLABICS Y-CREE NOO" #x14C6)
-    ("CANADIAN SYLLABICS NA" #x14C7)
-    ("CANADIAN SYLLABICS NAA" #x14C8)
-    ("CANADIAN SYLLABICS NWE" #x14C9)
-    ("CANADIAN SYLLABICS WEST-CREE NWE" #x14CA)
-    ("CANADIAN SYLLABICS NWA" #x14CB)
-    ("CANADIAN SYLLABICS WEST-CREE NWA" #x14CC)
-    ("CANADIAN SYLLABICS NWAA" #x14CD)
-    ("CANADIAN SYLLABICS WEST-CREE NWAA" #x14CE)
-    ("CANADIAN SYLLABICS NASKAPI NWAA" #x14CF)
-    ("CANADIAN SYLLABICS N" #x14D0)
-    ("CANADIAN SYLLABICS CARRIER NG" #x14D1)
-    ("CANADIAN SYLLABICS NH" #x14D2)
-    ("CANADIAN SYLLABICS LE" #x14D3)
-    ("CANADIAN SYLLABICS LAAI" #x14D4)
-    ("CANADIAN SYLLABICS LI" #x14D5)
-    ("CANADIAN SYLLABICS LII" #x14D6)
-    ("CANADIAN SYLLABICS LO" #x14D7)
-    ("CANADIAN SYLLABICS LOO" #x14D8)
-    ("CANADIAN SYLLABICS Y-CREE LOO" #x14D9)
-    ("CANADIAN SYLLABICS LA" #x14DA)
-    ("CANADIAN SYLLABICS LAA" #x14DB)
-    ("CANADIAN SYLLABICS LWE" #x14DC)
-    ("CANADIAN SYLLABICS WEST-CREE LWE" #x14DD)
-    ("CANADIAN SYLLABICS LWI" #x14DE)
-    ("CANADIAN SYLLABICS WEST-CREE LWI" #x14DF)
-    ("CANADIAN SYLLABICS LWII" #x14E0)
-    ("CANADIAN SYLLABICS WEST-CREE LWII" #x14E1)
-    ("CANADIAN SYLLABICS LWO" #x14E2)
-    ("CANADIAN SYLLABICS WEST-CREE LWO" #x14E3)
-    ("CANADIAN SYLLABICS LWOO" #x14E4)
-    ("CANADIAN SYLLABICS WEST-CREE LWOO" #x14E5)
-    ("CANADIAN SYLLABICS LWA" #x14E6)
-    ("CANADIAN SYLLABICS WEST-CREE LWA" #x14E7)
-    ("CANADIAN SYLLABICS LWAA" #x14E8)
-    ("CANADIAN SYLLABICS WEST-CREE LWAA" #x14E9)
-    ("CANADIAN SYLLABICS L" #x14EA)
-    ("CANADIAN SYLLABICS WEST-CREE L" #x14EB)
-    ("CANADIAN SYLLABICS MEDIAL L" #x14EC)
-    ("CANADIAN SYLLABICS SE" #x14ED)
-    ("CANADIAN SYLLABICS SAAI" #x14EE)
-    ("CANADIAN SYLLABICS SI" #x14EF)
-    ("CANADIAN SYLLABICS SII" #x14F0)
-    ("CANADIAN SYLLABICS SO" #x14F1)
-    ("CANADIAN SYLLABICS SOO" #x14F2)
-    ("CANADIAN SYLLABICS Y-CREE SOO" #x14F3)
-    ("CANADIAN SYLLABICS SA" #x14F4)
-    ("CANADIAN SYLLABICS SAA" #x14F5)
-    ("CANADIAN SYLLABICS SWE" #x14F6)
-    ("CANADIAN SYLLABICS WEST-CREE SWE" #x14F7)
-    ("CANADIAN SYLLABICS SWI" #x14F8)
-    ("CANADIAN SYLLABICS WEST-CREE SWI" #x14F9)
-    ("CANADIAN SYLLABICS SWII" #x14FA)
-    ("CANADIAN SYLLABICS WEST-CREE SWII" #x14FB)
-    ("CANADIAN SYLLABICS SWO" #x14FC)
-    ("CANADIAN SYLLABICS WEST-CREE SWO" #x14FD)
-    ("CANADIAN SYLLABICS SWOO" #x14FE)
-    ("CANADIAN SYLLABICS WEST-CREE SWOO" #x14FF)
-    ("CANADIAN SYLLABICS SWA" #x1500)
-    ("CANADIAN SYLLABICS WEST-CREE SWA" #x1501)
-    ("CANADIAN SYLLABICS SWAA" #x1502)
-    ("CANADIAN SYLLABICS WEST-CREE SWAA" #x1503)
-    ("CANADIAN SYLLABICS NASKAPI SWAA" #x1504)
-    ("CANADIAN SYLLABICS S" #x1505)
-    ("CANADIAN SYLLABICS ATHAPASCAN S" #x1506)
-    ("CANADIAN SYLLABICS SW" #x1507)
-    ("CANADIAN SYLLABICS BLACKFOOT S" #x1508)
-    ("CANADIAN SYLLABICS MOOSE-CREE SK" #x1509)
-    ("CANADIAN SYLLABICS NASKAPI SKW" #x150A)
-    ("CANADIAN SYLLABICS NASKAPI S-W" #x150B)
-    ("CANADIAN SYLLABICS NASKAPI SPWA" #x150C)
-    ("CANADIAN SYLLABICS NASKAPI STWA" #x150D)
-    ("CANADIAN SYLLABICS NASKAPI SKWA" #x150E)
-    ("CANADIAN SYLLABICS NASKAPI SCWA" #x150F)
-    ("CANADIAN SYLLABICS SHE" #x1510)
-    ("CANADIAN SYLLABICS SHI" #x1511)
-    ("CANADIAN SYLLABICS SHII" #x1512)
-    ("CANADIAN SYLLABICS SHO" #x1513)
-    ("CANADIAN SYLLABICS SHOO" #x1514)
-    ("CANADIAN SYLLABICS SHA" #x1515)
-    ("CANADIAN SYLLABICS SHAA" #x1516)
-    ("CANADIAN SYLLABICS SHWE" #x1517)
-    ("CANADIAN SYLLABICS WEST-CREE SHWE" #x1518)
-    ("CANADIAN SYLLABICS SHWI" #x1519)
-    ("CANADIAN SYLLABICS WEST-CREE SHWI" #x151A)
-    ("CANADIAN SYLLABICS SHWII" #x151B)
-    ("CANADIAN SYLLABICS WEST-CREE SHWII" #x151C)
-    ("CANADIAN SYLLABICS SHWO" #x151D)
-    ("CANADIAN SYLLABICS WEST-CREE SHWO" #x151E)
-    ("CANADIAN SYLLABICS SHWOO" #x151F)
-    ("CANADIAN SYLLABICS WEST-CREE SHWOO" #x1520)
-    ("CANADIAN SYLLABICS SHWA" #x1521)
-    ("CANADIAN SYLLABICS WEST-CREE SHWA" #x1522)
-    ("CANADIAN SYLLABICS SHWAA" #x1523)
-    ("CANADIAN SYLLABICS WEST-CREE SHWAA" #x1524)
-    ("CANADIAN SYLLABICS SH" #x1525)
-    ("CANADIAN SYLLABICS YE" #x1526)
-    ("CANADIAN SYLLABICS YAAI" #x1527)
-    ("CANADIAN SYLLABICS YI" #x1528)
-    ("CANADIAN SYLLABICS YII" #x1529)
-    ("CANADIAN SYLLABICS YO" #x152A)
-    ("CANADIAN SYLLABICS YOO" #x152B)
-    ("CANADIAN SYLLABICS Y-CREE YOO" #x152C)
-    ("CANADIAN SYLLABICS YA" #x152D)
-    ("CANADIAN SYLLABICS YAA" #x152E)
-    ("CANADIAN SYLLABICS YWE" #x152F)
-    ("CANADIAN SYLLABICS WEST-CREE YWE" #x1530)
-    ("CANADIAN SYLLABICS YWI" #x1531)
-    ("CANADIAN SYLLABICS WEST-CREE YWI" #x1532)
-    ("CANADIAN SYLLABICS YWII" #x1533)
-    ("CANADIAN SYLLABICS WEST-CREE YWII" #x1534)
-    ("CANADIAN SYLLABICS YWO" #x1535)
-    ("CANADIAN SYLLABICS WEST-CREE YWO" #x1536)
-    ("CANADIAN SYLLABICS YWOO" #x1537)
-    ("CANADIAN SYLLABICS WEST-CREE YWOO" #x1538)
-    ("CANADIAN SYLLABICS YWA" #x1539)
-    ("CANADIAN SYLLABICS WEST-CREE YWA" #x153A)
-    ("CANADIAN SYLLABICS YWAA" #x153B)
-    ("CANADIAN SYLLABICS WEST-CREE YWAA" #x153C)
-    ("CANADIAN SYLLABICS NASKAPI YWAA" #x153D)
-    ("CANADIAN SYLLABICS Y" #x153E)
-    ("CANADIAN SYLLABICS BIBLE-CREE Y" #x153F)
-    ("CANADIAN SYLLABICS WEST-CREE Y" #x1540)
-    ("CANADIAN SYLLABICS SAYISI YI" #x1541)
-    ("CANADIAN SYLLABICS RE" #x1542)
-    ("CANADIAN SYLLABICS R-CREE RE" #x1543)
-    ("CANADIAN SYLLABICS WEST-CREE LE" #x1544)
-    ("CANADIAN SYLLABICS RAAI" #x1545)
-    ("CANADIAN SYLLABICS RI" #x1546)
-    ("CANADIAN SYLLABICS RII" #x1547)
-    ("CANADIAN SYLLABICS RO" #x1548)
-    ("CANADIAN SYLLABICS ROO" #x1549)
-    ("CANADIAN SYLLABICS WEST-CREE LO" #x154A)
-    ("CANADIAN SYLLABICS RA" #x154B)
-    ("CANADIAN SYLLABICS RAA" #x154C)
-    ("CANADIAN SYLLABICS WEST-CREE LA" #x154D)
-    ("CANADIAN SYLLABICS RWAA" #x154E)
-    ("CANADIAN SYLLABICS WEST-CREE RWAA" #x154F)
-    ("CANADIAN SYLLABICS R" #x1550)
-    ("CANADIAN SYLLABICS WEST-CREE R" #x1551)
-    ("CANADIAN SYLLABICS MEDIAL R" #x1552)
-    ("CANADIAN SYLLABICS FE" #x1553)
-    ("CANADIAN SYLLABICS FAAI" #x1554)
-    ("CANADIAN SYLLABICS FI" #x1555)
-    ("CANADIAN SYLLABICS FII" #x1556)
-    ("CANADIAN SYLLABICS FO" #x1557)
-    ("CANADIAN SYLLABICS FOO" #x1558)
-    ("CANADIAN SYLLABICS FA" #x1559)
-    ("CANADIAN SYLLABICS FAA" #x155A)
-    ("CANADIAN SYLLABICS FWAA" #x155B)
-    ("CANADIAN SYLLABICS WEST-CREE FWAA" #x155C)
-    ("CANADIAN SYLLABICS F" #x155D)
-    ("CANADIAN SYLLABICS THE" #x155E)
-    ("CANADIAN SYLLABICS N-CREE THE" #x155F)
-    ("CANADIAN SYLLABICS THI" #x1560)
-    ("CANADIAN SYLLABICS N-CREE THI" #x1561)
-    ("CANADIAN SYLLABICS THII" #x1562)
-    ("CANADIAN SYLLABICS N-CREE THII" #x1563)
-    ("CANADIAN SYLLABICS THO" #x1564)
-    ("CANADIAN SYLLABICS THOO" #x1565)
-    ("CANADIAN SYLLABICS THA" #x1566)
-    ("CANADIAN SYLLABICS THAA" #x1567)
-    ("CANADIAN SYLLABICS THWAA" #x1568)
-    ("CANADIAN SYLLABICS WEST-CREE THWAA" #x1569)
-    ("CANADIAN SYLLABICS TH" #x156A)
-    ("CANADIAN SYLLABICS TTHE" #x156B)
-    ("CANADIAN SYLLABICS TTHI" #x156C)
-    ("CANADIAN SYLLABICS TTHO" #x156D)
-    ("CANADIAN SYLLABICS TTHA" #x156E)
-    ("CANADIAN SYLLABICS TTH" #x156F)
-    ("CANADIAN SYLLABICS TYE" #x1570)
-    ("CANADIAN SYLLABICS TYI" #x1571)
-    ("CANADIAN SYLLABICS TYO" #x1572)
-    ("CANADIAN SYLLABICS TYA" #x1573)
-    ("CANADIAN SYLLABICS NUNAVIK HE" #x1574)
-    ("CANADIAN SYLLABICS NUNAVIK HI" #x1575)
-    ("CANADIAN SYLLABICS NUNAVIK HII" #x1576)
-    ("CANADIAN SYLLABICS NUNAVIK HO" #x1577)
-    ("CANADIAN SYLLABICS NUNAVIK HOO" #x1578)
-    ("CANADIAN SYLLABICS NUNAVIK HA" #x1579)
-    ("CANADIAN SYLLABICS NUNAVIK HAA" #x157A)
-    ("CANADIAN SYLLABICS NUNAVIK H" #x157B)
-    ("CANADIAN SYLLABICS NUNAVUT H" #x157C)
-    ("CANADIAN SYLLABICS HK" #x157D)
-    ("CANADIAN SYLLABICS QAAI" #x157E)
-    ("CANADIAN SYLLABICS QI" #x157F)
-    ("CANADIAN SYLLABICS QII" #x1580)
-    ("CANADIAN SYLLABICS QO" #x1581)
-    ("CANADIAN SYLLABICS QOO" #x1582)
-    ("CANADIAN SYLLABICS QA" #x1583)
-    ("CANADIAN SYLLABICS QAA" #x1584)
-    ("CANADIAN SYLLABICS Q" #x1585)
-    ("CANADIAN SYLLABICS TLHE" #x1586)
-    ("CANADIAN SYLLABICS TLHI" #x1587)
-    ("CANADIAN SYLLABICS TLHO" #x1588)
-    ("CANADIAN SYLLABICS TLHA" #x1589)
-    ("CANADIAN SYLLABICS WEST-CREE RE" #x158A)
-    ("CANADIAN SYLLABICS WEST-CREE RI" #x158B)
-    ("CANADIAN SYLLABICS WEST-CREE RO" #x158C)
-    ("CANADIAN SYLLABICS WEST-CREE RA" #x158D)
-    ("CANADIAN SYLLABICS NGAAI" #x158E)
-    ("CANADIAN SYLLABICS NGI" #x158F)
-    ("CANADIAN SYLLABICS NGII" #x1590)
-    ("CANADIAN SYLLABICS NGO" #x1591)
-    ("CANADIAN SYLLABICS NGOO" #x1592)
-    ("CANADIAN SYLLABICS NGA" #x1593)
-    ("CANADIAN SYLLABICS NGAA" #x1594)
-    ("CANADIAN SYLLABICS NG" #x1595)
-    ("CANADIAN SYLLABICS NNG" #x1596)
-    ("CANADIAN SYLLABICS SAYISI SHE" #x1597)
-    ("CANADIAN SYLLABICS SAYISI SHI" #x1598)
-    ("CANADIAN SYLLABICS SAYISI SHO" #x1599)
-    ("CANADIAN SYLLABICS SAYISI SHA" #x159A)
-    ("CANADIAN SYLLABICS WOODS-CREE THE" #x159B)
-    ("CANADIAN SYLLABICS WOODS-CREE THI" #x159C)
-    ("CANADIAN SYLLABICS WOODS-CREE THO" #x159D)
-    ("CANADIAN SYLLABICS WOODS-CREE THA" #x159E)
-    ("CANADIAN SYLLABICS WOODS-CREE TH" #x159F)
-    ("CANADIAN SYLLABICS LHI" #x15A0)
-    ("CANADIAN SYLLABICS LHII" #x15A1)
-    ("CANADIAN SYLLABICS LHO" #x15A2)
-    ("CANADIAN SYLLABICS LHOO" #x15A3)
-    ("CANADIAN SYLLABICS LHA" #x15A4)
-    ("CANADIAN SYLLABICS LHAA" #x15A5)
-    ("CANADIAN SYLLABICS LH" #x15A6)
-    ("CANADIAN SYLLABICS TH-CREE THE" #x15A7)
-    ("CANADIAN SYLLABICS TH-CREE THI" #x15A8)
-    ("CANADIAN SYLLABICS TH-CREE THII" #x15A9)
-    ("CANADIAN SYLLABICS TH-CREE THO" #x15AA)
-    ("CANADIAN SYLLABICS TH-CREE THOO" #x15AB)
-    ("CANADIAN SYLLABICS TH-CREE THA" #x15AC)
-    ("CANADIAN SYLLABICS TH-CREE THAA" #x15AD)
-    ("CANADIAN SYLLABICS TH-CREE TH" #x15AE)
-    ("CANADIAN SYLLABICS AIVILIK B" #x15AF)
-    ("CANADIAN SYLLABICS BLACKFOOT E" #x15B0)
-    ("CANADIAN SYLLABICS BLACKFOOT I" #x15B1)
-    ("CANADIAN SYLLABICS BLACKFOOT O" #x15B2)
-    ("CANADIAN SYLLABICS BLACKFOOT A" #x15B3)
-    ("CANADIAN SYLLABICS BLACKFOOT WE" #x15B4)
-    ("CANADIAN SYLLABICS BLACKFOOT WI" #x15B5)
-    ("CANADIAN SYLLABICS BLACKFOOT WO" #x15B6)
-    ("CANADIAN SYLLABICS BLACKFOOT WA" #x15B7)
-    ("CANADIAN SYLLABICS BLACKFOOT NE" #x15B8)
-    ("CANADIAN SYLLABICS BLACKFOOT NI" #x15B9)
-    ("CANADIAN SYLLABICS BLACKFOOT NO" #x15BA)
-    ("CANADIAN SYLLABICS BLACKFOOT NA" #x15BB)
-    ("CANADIAN SYLLABICS BLACKFOOT KE" #x15BC)
-    ("CANADIAN SYLLABICS BLACKFOOT KI" #x15BD)
-    ("CANADIAN SYLLABICS BLACKFOOT KO" #x15BE)
-    ("CANADIAN SYLLABICS BLACKFOOT KA" #x15BF)
-    ("CANADIAN SYLLABICS SAYISI HE" #x15C0)
-    ("CANADIAN SYLLABICS SAYISI HI" #x15C1)
-    ("CANADIAN SYLLABICS SAYISI HO" #x15C2)
-    ("CANADIAN SYLLABICS SAYISI HA" #x15C3)
-    ("CANADIAN SYLLABICS CARRIER GHU" #x15C4)
-    ("CANADIAN SYLLABICS CARRIER GHO" #x15C5)
-    ("CANADIAN SYLLABICS CARRIER GHE" #x15C6)
-    ("CANADIAN SYLLABICS CARRIER GHEE" #x15C7)
-    ("CANADIAN SYLLABICS CARRIER GHI" #x15C8)
-    ("CANADIAN SYLLABICS CARRIER GHA" #x15C9)
-    ("CANADIAN SYLLABICS CARRIER RU" #x15CA)
-    ("CANADIAN SYLLABICS CARRIER RO" #x15CB)
-    ("CANADIAN SYLLABICS CARRIER RE" #x15CC)
-    ("CANADIAN SYLLABICS CARRIER REE" #x15CD)
-    ("CANADIAN SYLLABICS CARRIER RI" #x15CE)
-    ("CANADIAN SYLLABICS CARRIER RA" #x15CF)
-    ("CANADIAN SYLLABICS CARRIER WU" #x15D0)
-    ("CANADIAN SYLLABICS CARRIER WO" #x15D1)
-    ("CANADIAN SYLLABICS CARRIER WE" #x15D2)
-    ("CANADIAN SYLLABICS CARRIER WEE" #x15D3)
-    ("CANADIAN SYLLABICS CARRIER WI" #x15D4)
-    ("CANADIAN SYLLABICS CARRIER WA" #x15D5)
-    ("CANADIAN SYLLABICS CARRIER HWU" #x15D6)
-    ("CANADIAN SYLLABICS CARRIER HWO" #x15D7)
-    ("CANADIAN SYLLABICS CARRIER HWE" #x15D8)
-    ("CANADIAN SYLLABICS CARRIER HWEE" #x15D9)
-    ("CANADIAN SYLLABICS CARRIER HWI" #x15DA)
-    ("CANADIAN SYLLABICS CARRIER HWA" #x15DB)
-    ("CANADIAN SYLLABICS CARRIER THU" #x15DC)
-    ("CANADIAN SYLLABICS CARRIER THO" #x15DD)
-    ("CANADIAN SYLLABICS CARRIER THE" #x15DE)
-    ("CANADIAN SYLLABICS CARRIER THEE" #x15DF)
-    ("CANADIAN SYLLABICS CARRIER THI" #x15E0)
-    ("CANADIAN SYLLABICS CARRIER THA" #x15E1)
-    ("CANADIAN SYLLABICS CARRIER TTU" #x15E2)
-    ("CANADIAN SYLLABICS CARRIER TTO" #x15E3)
-    ("CANADIAN SYLLABICS CARRIER TTE" #x15E4)
-    ("CANADIAN SYLLABICS CARRIER TTEE" #x15E5)
-    ("CANADIAN SYLLABICS CARRIER TTI" #x15E6)
-    ("CANADIAN SYLLABICS CARRIER TTA" #x15E7)
-    ("CANADIAN SYLLABICS CARRIER PU" #x15E8)
-    ("CANADIAN SYLLABICS CARRIER PO" #x15E9)
-    ("CANADIAN SYLLABICS CARRIER PE" #x15EA)
-    ("CANADIAN SYLLABICS CARRIER PEE" #x15EB)
-    ("CANADIAN SYLLABICS CARRIER PI" #x15EC)
-    ("CANADIAN SYLLABICS CARRIER PA" #x15ED)
-    ("CANADIAN SYLLABICS CARRIER P" #x15EE)
-    ("CANADIAN SYLLABICS CARRIER GU" #x15EF)
-    ("CANADIAN SYLLABICS CARRIER GO" #x15F0)
-    ("CANADIAN SYLLABICS CARRIER GE" #x15F1)
-    ("CANADIAN SYLLABICS CARRIER GEE" #x15F2)
-    ("CANADIAN SYLLABICS CARRIER GI" #x15F3)
-    ("CANADIAN SYLLABICS CARRIER GA" #x15F4)
-    ("CANADIAN SYLLABICS CARRIER KHU" #x15F5)
-    ("CANADIAN SYLLABICS CARRIER KHO" #x15F6)
-    ("CANADIAN SYLLABICS CARRIER KHE" #x15F7)
-    ("CANADIAN SYLLABICS CARRIER KHEE" #x15F8)
-    ("CANADIAN SYLLABICS CARRIER KHI" #x15F9)
-    ("CANADIAN SYLLABICS CARRIER KHA" #x15FA)
-    ("CANADIAN SYLLABICS CARRIER KKU" #x15FB)
-    ("CANADIAN SYLLABICS CARRIER KKO" #x15FC)
-    ("CANADIAN SYLLABICS CARRIER KKE" #x15FD)
-    ("CANADIAN SYLLABICS CARRIER KKEE" #x15FE)
-    ("CANADIAN SYLLABICS CARRIER KKI" #x15FF)
-    ("CANADIAN SYLLABICS CARRIER KKA" #x1600)
-    ("CANADIAN SYLLABICS CARRIER KK" #x1601)
-    ("CANADIAN SYLLABICS CARRIER NU" #x1602)
-    ("CANADIAN SYLLABICS CARRIER NO" #x1603)
-    ("CANADIAN SYLLABICS CARRIER NE" #x1604)
-    ("CANADIAN SYLLABICS CARRIER NEE" #x1605)
-    ("CANADIAN SYLLABICS CARRIER NI" #x1606)
-    ("CANADIAN SYLLABICS CARRIER NA" #x1607)
-    ("CANADIAN SYLLABICS CARRIER MU" #x1608)
-    ("CANADIAN SYLLABICS CARRIER MO" #x1609)
-    ("CANADIAN SYLLABICS CARRIER ME" #x160A)
-    ("CANADIAN SYLLABICS CARRIER MEE" #x160B)
-    ("CANADIAN SYLLABICS CARRIER MI" #x160C)
-    ("CANADIAN SYLLABICS CARRIER MA" #x160D)
-    ("CANADIAN SYLLABICS CARRIER YU" #x160E)
-    ("CANADIAN SYLLABICS CARRIER YO" #x160F)
-    ("CANADIAN SYLLABICS CARRIER YE" #x1610)
-    ("CANADIAN SYLLABICS CARRIER YEE" #x1611)
-    ("CANADIAN SYLLABICS CARRIER YI" #x1612)
-    ("CANADIAN SYLLABICS CARRIER YA" #x1613)
-    ("CANADIAN SYLLABICS CARRIER JU" #x1614)
-    ("CANADIAN SYLLABICS SAYISI JU" #x1615)
-    ("CANADIAN SYLLABICS CARRIER JO" #x1616)
-    ("CANADIAN SYLLABICS CARRIER JE" #x1617)
-    ("CANADIAN SYLLABICS CARRIER JEE" #x1618)
-    ("CANADIAN SYLLABICS CARRIER JI" #x1619)
-    ("CANADIAN SYLLABICS SAYISI JI" #x161A)
-    ("CANADIAN SYLLABICS CARRIER JA" #x161B)
-    ("CANADIAN SYLLABICS CARRIER JJU" #x161C)
-    ("CANADIAN SYLLABICS CARRIER JJO" #x161D)
-    ("CANADIAN SYLLABICS CARRIER JJE" #x161E)
-    ("CANADIAN SYLLABICS CARRIER JJEE" #x161F)
-    ("CANADIAN SYLLABICS CARRIER JJI" #x1620)
-    ("CANADIAN SYLLABICS CARRIER JJA" #x1621)
-    ("CANADIAN SYLLABICS CARRIER LU" #x1622)
-    ("CANADIAN SYLLABICS CARRIER LO" #x1623)
-    ("CANADIAN SYLLABICS CARRIER LE" #x1624)
-    ("CANADIAN SYLLABICS CARRIER LEE" #x1625)
-    ("CANADIAN SYLLABICS CARRIER LI" #x1626)
-    ("CANADIAN SYLLABICS CARRIER LA" #x1627)
-    ("CANADIAN SYLLABICS CARRIER DLU" #x1628)
-    ("CANADIAN SYLLABICS CARRIER DLO" #x1629)
-    ("CANADIAN SYLLABICS CARRIER DLE" #x162A)
-    ("CANADIAN SYLLABICS CARRIER DLEE" #x162B)
-    ("CANADIAN SYLLABICS CARRIER DLI" #x162C)
-    ("CANADIAN SYLLABICS CARRIER DLA" #x162D)
-    ("CANADIAN SYLLABICS CARRIER LHU" #x162E)
-    ("CANADIAN SYLLABICS CARRIER LHO" #x162F)
-    ("CANADIAN SYLLABICS CARRIER LHE" #x1630)
-    ("CANADIAN SYLLABICS CARRIER LHEE" #x1631)
-    ("CANADIAN SYLLABICS CARRIER LHI" #x1632)
-    ("CANADIAN SYLLABICS CARRIER LHA" #x1633)
-    ("CANADIAN SYLLABICS CARRIER TLHU" #x1634)
-    ("CANADIAN SYLLABICS CARRIER TLHO" #x1635)
-    ("CANADIAN SYLLABICS CARRIER TLHE" #x1636)
-    ("CANADIAN SYLLABICS CARRIER TLHEE" #x1637)
-    ("CANADIAN SYLLABICS CARRIER TLHI" #x1638)
-    ("CANADIAN SYLLABICS CARRIER TLHA" #x1639)
-    ("CANADIAN SYLLABICS CARRIER TLU" #x163A)
-    ("CANADIAN SYLLABICS CARRIER TLO" #x163B)
-    ("CANADIAN SYLLABICS CARRIER TLE" #x163C)
-    ("CANADIAN SYLLABICS CARRIER TLEE" #x163D)
-    ("CANADIAN SYLLABICS CARRIER TLI" #x163E)
-    ("CANADIAN SYLLABICS CARRIER TLA" #x163F)
-    ("CANADIAN SYLLABICS CARRIER ZU" #x1640)
-    ("CANADIAN SYLLABICS CARRIER ZO" #x1641)
-    ("CANADIAN SYLLABICS CARRIER ZE" #x1642)
-    ("CANADIAN SYLLABICS CARRIER ZEE" #x1643)
-    ("CANADIAN SYLLABICS CARRIER ZI" #x1644)
-    ("CANADIAN SYLLABICS CARRIER ZA" #x1645)
-    ("CANADIAN SYLLABICS CARRIER Z" #x1646)
-    ("CANADIAN SYLLABICS CARRIER INITIAL Z" #x1647)
-    ("CANADIAN SYLLABICS CARRIER DZU" #x1648)
-    ("CANADIAN SYLLABICS CARRIER DZO" #x1649)
-    ("CANADIAN SYLLABICS CARRIER DZE" #x164A)
-    ("CANADIAN SYLLABICS CARRIER DZEE" #x164B)
-    ("CANADIAN SYLLABICS CARRIER DZI" #x164C)
-    ("CANADIAN SYLLABICS CARRIER DZA" #x164D)
-    ("CANADIAN SYLLABICS CARRIER SU" #x164E)
-    ("CANADIAN SYLLABICS CARRIER SO" #x164F)
-    ("CANADIAN SYLLABICS CARRIER SE" #x1650)
-    ("CANADIAN SYLLABICS CARRIER SEE" #x1651)
-    ("CANADIAN SYLLABICS CARRIER SI" #x1652)
-    ("CANADIAN SYLLABICS CARRIER SA" #x1653)
-    ("CANADIAN SYLLABICS CARRIER SHU" #x1654)
-    ("CANADIAN SYLLABICS CARRIER SHO" #x1655)
-    ("CANADIAN SYLLABICS CARRIER SHE" #x1656)
-    ("CANADIAN SYLLABICS CARRIER SHEE" #x1657)
-    ("CANADIAN SYLLABICS CARRIER SHI" #x1658)
-    ("CANADIAN SYLLABICS CARRIER SHA" #x1659)
-    ("CANADIAN SYLLABICS CARRIER SH" #x165A)
-    ("CANADIAN SYLLABICS CARRIER TSU" #x165B)
-    ("CANADIAN SYLLABICS CARRIER TSO" #x165C)
-    ("CANADIAN SYLLABICS CARRIER TSE" #x165D)
-    ("CANADIAN SYLLABICS CARRIER TSEE" #x165E)
-    ("CANADIAN SYLLABICS CARRIER TSI" #x165F)
-    ("CANADIAN SYLLABICS CARRIER TSA" #x1660)
-    ("CANADIAN SYLLABICS CARRIER CHU" #x1661)
-    ("CANADIAN SYLLABICS CARRIER CHO" #x1662)
-    ("CANADIAN SYLLABICS CARRIER CHE" #x1663)
-    ("CANADIAN SYLLABICS CARRIER CHEE" #x1664)
-    ("CANADIAN SYLLABICS CARRIER CHI" #x1665)
-    ("CANADIAN SYLLABICS CARRIER CHA" #x1666)
-    ("CANADIAN SYLLABICS CARRIER TTSU" #x1667)
-    ("CANADIAN SYLLABICS CARRIER TTSO" #x1668)
-    ("CANADIAN SYLLABICS CARRIER TTSE" #x1669)
-    ("CANADIAN SYLLABICS CARRIER TTSEE" #x166A)
-    ("CANADIAN SYLLABICS CARRIER TTSI" #x166B)
-    ("CANADIAN SYLLABICS CARRIER TTSA" #x166C)
-    ("CANADIAN SYLLABICS CHI SIGN" #x166D)
-    ("CANADIAN SYLLABICS FULL STOP" #x166E)
-    ("CANADIAN SYLLABICS QAI" #x166F)
-    ("CANADIAN SYLLABICS NGAI" #x1670)
-    ("CANADIAN SYLLABICS NNGI" #x1671)
-    ("CANADIAN SYLLABICS NNGII" #x1672)
-    ("CANADIAN SYLLABICS NNGO" #x1673)
-    ("CANADIAN SYLLABICS NNGOO" #x1674)
-    ("CANADIAN SYLLABICS NNGA" #x1675)
-    ("CANADIAN SYLLABICS NNGAA" #x1676)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01680-0169F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01680-0169F.el
deleted file mode 100644
index 827b70e6b0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01680-0169F.el
+++ /dev/null
@@ -1,31 +0,0 @@
-(nxml-define-char-name-set 'ogham
-  '(("OGHAM SPACE MARK" #x1680)
-    ("OGHAM LETTER BEITH" #x1681)
-    ("OGHAM LETTER LUIS" #x1682)
-    ("OGHAM LETTER FEARN" #x1683)
-    ("OGHAM LETTER SAIL" #x1684)
-    ("OGHAM LETTER NION" #x1685)
-    ("OGHAM LETTER UATH" #x1686)
-    ("OGHAM LETTER DAIR" #x1687)
-    ("OGHAM LETTER TINNE" #x1688)
-    ("OGHAM LETTER COLL" #x1689)
-    ("OGHAM LETTER CEIRT" #x168A)
-    ("OGHAM LETTER MUIN" #x168B)
-    ("OGHAM LETTER GORT" #x168C)
-    ("OGHAM LETTER NGEADAL" #x168D)
-    ("OGHAM LETTER STRAIF" #x168E)
-    ("OGHAM LETTER RUIS" #x168F)
-    ("OGHAM LETTER AILM" #x1690)
-    ("OGHAM LETTER ONN" #x1691)
-    ("OGHAM LETTER UR" #x1692)
-    ("OGHAM LETTER EADHADH" #x1693)
-    ("OGHAM LETTER IODHADH" #x1694)
-    ("OGHAM LETTER EABHADH" #x1695)
-    ("OGHAM LETTER OR" #x1696)
-    ("OGHAM LETTER UILLEANN" #x1697)
-    ("OGHAM LETTER IFIN" #x1698)
-    ("OGHAM LETTER EAMHANCHOLL" #x1699)
-    ("OGHAM LETTER PEITH" #x169A)
-    ("OGHAM FEATHER MARK" #x169B)
-    ("OGHAM REVERSED FEATHER MARK" #x169C)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/016A0-016FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/016A0-016FF.el
deleted file mode 100644
index ce67a4069e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/016A0-016FF.el
+++ /dev/null
@@ -1,83 +0,0 @@
-(nxml-define-char-name-set 'runic
-  '(("RUNIC LETTER FEHU FEOH FE F" #x16A0)
-    ("RUNIC LETTER V" #x16A1)
-    ("RUNIC LETTER URUZ UR U" #x16A2)
-    ("RUNIC LETTER YR" #x16A3)
-    ("RUNIC LETTER Y" #x16A4)
-    ("RUNIC LETTER W" #x16A5)
-    ("RUNIC LETTER THURISAZ THURS THORN" #x16A6)
-    ("RUNIC LETTER ETH" #x16A7)
-    ("RUNIC LETTER ANSUZ A" #x16A8)
-    ("RUNIC LETTER OS O" #x16A9)
-    ("RUNIC LETTER AC A" #x16AA)
-    ("RUNIC LETTER AESC" #x16AB)
-    ("RUNIC LETTER LONG-BRANCH-OSS O" #x16AC)
-    ("RUNIC LETTER SHORT-TWIG-OSS O" #x16AD)
-    ("RUNIC LETTER O" #x16AE)
-    ("RUNIC LETTER OE" #x16AF)
-    ("RUNIC LETTER ON" #x16B0)
-    ("RUNIC LETTER RAIDO RAD REID R" #x16B1)
-    ("RUNIC LETTER KAUNA" #x16B2)
-    ("RUNIC LETTER CEN" #x16B3)
-    ("RUNIC LETTER KAUN K" #x16B4)
-    ("RUNIC LETTER G" #x16B5)
-    ("RUNIC LETTER ENG" #x16B6)
-    ("RUNIC LETTER GEBO GYFU G" #x16B7)
-    ("RUNIC LETTER GAR" #x16B8)
-    ("RUNIC LETTER WUNJO WYNN W" #x16B9)
-    ("RUNIC LETTER HAGLAZ H" #x16BA)
-    ("RUNIC LETTER HAEGL H" #x16BB)
-    ("RUNIC LETTER LONG-BRANCH-HAGALL H" #x16BC)
-    ("RUNIC LETTER SHORT-TWIG-HAGALL H" #x16BD)
-    ("RUNIC LETTER NAUDIZ NYD NAUD N" #x16BE)
-    ("RUNIC LETTER SHORT-TWIG-NAUD N" #x16BF)
-    ("RUNIC LETTER DOTTED-N" #x16C0)
-    ("RUNIC LETTER ISAZ IS ISS I" #x16C1)
-    ("RUNIC LETTER E" #x16C2)
-    ("RUNIC LETTER JERAN J" #x16C3)
-    ("RUNIC LETTER GER" #x16C4)
-    ("RUNIC LETTER LONG-BRANCH-AR AE" #x16C5)
-    ("RUNIC LETTER SHORT-TWIG-AR A" #x16C6)
-    ("RUNIC LETTER IWAZ EOH" #x16C7)
-    ("RUNIC LETTER PERTHO PEORTH P" #x16C8)
-    ("RUNIC LETTER ALGIZ EOLHX" #x16C9)
-    ("RUNIC LETTER SOWILO S" #x16CA)
-    ("RUNIC LETTER SIGEL LONG-BRANCH-SOL S" #x16CB)
-    ("RUNIC LETTER SHORT-TWIG-SOL S" #x16CC)
-    ("RUNIC LETTER C" #x16CD)
-    ("RUNIC LETTER Z" #x16CE)
-    ("RUNIC LETTER TIWAZ TIR TYR T" #x16CF)
-    ("RUNIC LETTER SHORT-TWIG-TYR T" #x16D0)
-    ("RUNIC LETTER D" #x16D1)
-    ("RUNIC LETTER BERKANAN BEORC BJARKAN B" #x16D2)
-    ("RUNIC LETTER SHORT-TWIG-BJARKAN B" #x16D3)
-    ("RUNIC LETTER DOTTED-P" #x16D4)
-    ("RUNIC LETTER OPEN-P" #x16D5)
-    ("RUNIC LETTER EHWAZ EH E" #x16D6)
-    ("RUNIC LETTER MANNAZ MAN M" #x16D7)
-    ("RUNIC LETTER LONG-BRANCH-MADR M" #x16D8)
-    ("RUNIC LETTER SHORT-TWIG-MADR M" #x16D9)
-    ("RUNIC LETTER LAUKAZ LAGU LOGR L" #x16DA)
-    ("RUNIC LETTER DOTTED-L" #x16DB)
-    ("RUNIC LETTER INGWAZ" #x16DC)
-    ("RUNIC LETTER ING" #x16DD)
-    ("RUNIC LETTER DAGAZ DAEG D" #x16DE)
-    ("RUNIC LETTER OTHALAN ETHEL O" #x16DF)
-    ("RUNIC LETTER EAR" #x16E0)
-    ("RUNIC LETTER IOR" #x16E1)
-    ("RUNIC LETTER CWEORTH" #x16E2)
-    ("RUNIC LETTER CALC" #x16E3)
-    ("RUNIC LETTER CEALC" #x16E4)
-    ("RUNIC LETTER STAN" #x16E5)
-    ("RUNIC LETTER LONG-BRANCH-YR" #x16E6)
-    ("RUNIC LETTER SHORT-TWIG-YR" #x16E7)
-    ("RUNIC LETTER ICELANDIC-YR" #x16E8)
-    ("RUNIC LETTER Q" #x16E9)
-    ("RUNIC LETTER X" #x16EA)
-    ("RUNIC SINGLE PUNCTUATION" #x16EB)
-    ("RUNIC MULTIPLE PUNCTUATION" #x16EC)
-    ("RUNIC CROSS PUNCTUATION" #x16ED)
-    ("RUNIC ARLAUG SYMBOL" #x16EE)
-    ("RUNIC TVIMADUR SYMBOL" #x16EF)
-    ("RUNIC BELGTHOR SYMBOL" #x16F0)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01700-0171F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01700-0171F.el
deleted file mode 100644
index b30500639b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01700-0171F.el
+++ /dev/null
@@ -1,22 +0,0 @@
-(nxml-define-char-name-set 'tagalog
-  '(("TAGALOG LETTER A" #x1700)
-    ("TAGALOG LETTER I" #x1701)
-    ("TAGALOG LETTER U" #x1702)
-    ("TAGALOG LETTER KA" #x1703)
-    ("TAGALOG LETTER GA" #x1704)
-    ("TAGALOG LETTER NGA" #x1705)
-    ("TAGALOG LETTER TA" #x1706)
-    ("TAGALOG LETTER DA" #x1707)
-    ("TAGALOG LETTER NA" #x1708)
-    ("TAGALOG LETTER PA" #x1709)
-    ("TAGALOG LETTER BA" #x170A)
-    ("TAGALOG LETTER MA" #x170B)
-    ("TAGALOG LETTER YA" #x170C)
-    ("TAGALOG LETTER LA" #x170E)
-    ("TAGALOG LETTER WA" #x170F)
-    ("TAGALOG LETTER SA" #x1710)
-    ("TAGALOG LETTER HA" #x1711)
-    ("TAGALOG VOWEL SIGN I" #x1712)
-    ("TAGALOG VOWEL SIGN U" #x1713)
-    ("TAGALOG SIGN VIRAMA" #x1714)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01720-0173F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01720-0173F.el
deleted file mode 100644
index 09f61ea1b5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01720-0173F.el
+++ /dev/null
@@ -1,25 +0,0 @@
-(nxml-define-char-name-set 'hanunoo
-  '(("HANUNOO LETTER A" #x1720)
-    ("HANUNOO LETTER I" #x1721)
-    ("HANUNOO LETTER U" #x1722)
-    ("HANUNOO LETTER KA" #x1723)
-    ("HANUNOO LETTER GA" #x1724)
-    ("HANUNOO LETTER NGA" #x1725)
-    ("HANUNOO LETTER TA" #x1726)
-    ("HANUNOO LETTER DA" #x1727)
-    ("HANUNOO LETTER NA" #x1728)
-    ("HANUNOO LETTER PA" #x1729)
-    ("HANUNOO LETTER BA" #x172A)
-    ("HANUNOO LETTER MA" #x172B)
-    ("HANUNOO LETTER YA" #x172C)
-    ("HANUNOO LETTER RA" #x172D)
-    ("HANUNOO LETTER LA" #x172E)
-    ("HANUNOO LETTER WA" #x172F)
-    ("HANUNOO LETTER SA" #x1730)
-    ("HANUNOO LETTER HA" #x1731)
-    ("HANUNOO VOWEL SIGN I" #x1732)
-    ("HANUNOO VOWEL SIGN U" #x1733)
-    ("HANUNOO SIGN PAMUDPOD" #x1734)
-    ("PHILIPPINE SINGLE PUNCTUATION" #x1735)
-    ("PHILIPPINE DOUBLE PUNCTUATION" #x1736)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01740-0175F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01740-0175F.el
deleted file mode 100644
index b507c90c26..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01740-0175F.el
+++ /dev/null
@@ -1,22 +0,0 @@
-(nxml-define-char-name-set 'buhid
-  '(("BUHID LETTER A" #x1740)
-    ("BUHID LETTER I" #x1741)
-    ("BUHID LETTER U" #x1742)
-    ("BUHID LETTER KA" #x1743)
-    ("BUHID LETTER GA" #x1744)
-    ("BUHID LETTER NGA" #x1745)
-    ("BUHID LETTER TA" #x1746)
-    ("BUHID LETTER DA" #x1747)
-    ("BUHID LETTER NA" #x1748)
-    ("BUHID LETTER PA" #x1749)
-    ("BUHID LETTER BA" #x174A)
-    ("BUHID LETTER MA" #x174B)
-    ("BUHID LETTER YA" #x174C)
-    ("BUHID LETTER RA" #x174D)
-    ("BUHID LETTER LA" #x174E)
-    ("BUHID LETTER WA" #x174F)
-    ("BUHID LETTER SA" #x1750)
-    ("BUHID LETTER HA" #x1751)
-    ("BUHID VOWEL SIGN I" #x1752)
-    ("BUHID VOWEL SIGN U" #x1753)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01760-0177F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01760-0177F.el
deleted file mode 100644
index e824c2bd43..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01760-0177F.el
+++ /dev/null
@@ -1,20 +0,0 @@
-(nxml-define-char-name-set 'tagbanwa
-  '(("TAGBANWA LETTER A" #x1760)
-    ("TAGBANWA LETTER I" #x1761)
-    ("TAGBANWA LETTER U" #x1762)
-    ("TAGBANWA LETTER KA" #x1763)
-    ("TAGBANWA LETTER GA" #x1764)
-    ("TAGBANWA LETTER NGA" #x1765)
-    ("TAGBANWA LETTER TA" #x1766)
-    ("TAGBANWA LETTER DA" #x1767)
-    ("TAGBANWA LETTER NA" #x1768)
-    ("TAGBANWA LETTER PA" #x1769)
-    ("TAGBANWA LETTER BA" #x176A)
-    ("TAGBANWA LETTER MA" #x176B)
-    ("TAGBANWA LETTER YA" #x176C)
-    ("TAGBANWA LETTER LA" #x176E)
-    ("TAGBANWA LETTER WA" #x176F)
-    ("TAGBANWA LETTER SA" #x1770)
-    ("TAGBANWA VOWEL SIGN I" #x1772)
-    ("TAGBANWA VOWEL SIGN U" #x1773)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01780-017FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01780-017FF.el
deleted file mode 100644
index e9671c943c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01780-017FF.el
+++ /dev/null
@@ -1,105 +0,0 @@
-(nxml-define-char-name-set 'khmer
-  '(("KHMER LETTER KA" #x1780)
-    ("KHMER LETTER KHA" #x1781)
-    ("KHMER LETTER KO" #x1782)
-    ("KHMER LETTER KHO" #x1783)
-    ("KHMER LETTER NGO" #x1784)
-    ("KHMER LETTER CA" #x1785)
-    ("KHMER LETTER CHA" #x1786)
-    ("KHMER LETTER CO" #x1787)
-    ("KHMER LETTER CHO" #x1788)
-    ("KHMER LETTER NYO" #x1789)
-    ("KHMER LETTER DA" #x178A)
-    ("KHMER LETTER TTHA" #x178B)
-    ("KHMER LETTER DO" #x178C)
-    ("KHMER LETTER TTHO" #x178D)
-    ("KHMER LETTER NNO" #x178E)
-    ("KHMER LETTER TA" #x178F)
-    ("KHMER LETTER THA" #x1790)
-    ("KHMER LETTER TO" #x1791)
-    ("KHMER LETTER THO" #x1792)
-    ("KHMER LETTER NO" #x1793)
-    ("KHMER LETTER BA" #x1794)
-    ("KHMER LETTER PHA" #x1795)
-    ("KHMER LETTER PO" #x1796)
-    ("KHMER LETTER PHO" #x1797)
-    ("KHMER LETTER MO" #x1798)
-    ("KHMER LETTER YO" #x1799)
-    ("KHMER LETTER RO" #x179A)
-    ("KHMER LETTER LO" #x179B)
-    ("KHMER LETTER VO" #x179C)
-    ("KHMER LETTER SHA" #x179D)
-    ("KHMER LETTER SSO" #x179E)
-    ("KHMER LETTER SA" #x179F)
-    ("KHMER LETTER HA" #x17A0)
-    ("KHMER LETTER LA" #x17A1)
-    ("KHMER LETTER QA" #x17A2)
-    ("KHMER INDEPENDENT VOWEL QAQ" #x17A3)
-    ("KHMER INDEPENDENT VOWEL QAA" #x17A4)
-    ("KHMER INDEPENDENT VOWEL QI" #x17A5)
-    ("KHMER INDEPENDENT VOWEL QII" #x17A6)
-    ("KHMER INDEPENDENT VOWEL QU" #x17A7)
-    ("KHMER INDEPENDENT VOWEL QUK" #x17A8)
-    ("KHMER INDEPENDENT VOWEL QUU" #x17A9)
-    ("KHMER INDEPENDENT VOWEL QUUV" #x17AA)
-    ("KHMER INDEPENDENT VOWEL RY" #x17AB)
-    ("KHMER INDEPENDENT VOWEL RYY" #x17AC)
-    ("KHMER INDEPENDENT VOWEL LY" #x17AD)
-    ("KHMER INDEPENDENT VOWEL LYY" #x17AE)
-    ("KHMER INDEPENDENT VOWEL QE" #x17AF)
-    ("KHMER INDEPENDENT VOWEL QAI" #x17B0)
-    ("KHMER INDEPENDENT VOWEL QOO TYPE ONE" #x17B1)
-    ("KHMER INDEPENDENT VOWEL QOO TYPE TWO" #x17B2)
-    ("KHMER INDEPENDENT VOWEL QAU" #x17B3)
-    ("KHMER VOWEL INHERENT AQ" #x17B4)
-    ("KHMER VOWEL INHERENT AA" #x17B5)
-    ("KHMER VOWEL SIGN AA" #x17B6)
-    ("KHMER VOWEL SIGN I" #x17B7)
-    ("KHMER VOWEL SIGN II" #x17B8)
-    ("KHMER VOWEL SIGN Y" #x17B9)
-    ("KHMER VOWEL SIGN YY" #x17BA)
-    ("KHMER VOWEL SIGN U" #x17BB)
-    ("KHMER VOWEL SIGN UU" #x17BC)
-    ("KHMER VOWEL SIGN UA" #x17BD)
-    ("KHMER VOWEL SIGN OE" #x17BE)
-    ("KHMER VOWEL SIGN YA" #x17BF)
-    ("KHMER VOWEL SIGN IE" #x17C0)
-    ("KHMER VOWEL SIGN E" #x17C1)
-    ("KHMER VOWEL SIGN AE" #x17C2)
-    ("KHMER VOWEL SIGN AI" #x17C3)
-    ("KHMER VOWEL SIGN OO" #x17C4)
-    ("KHMER VOWEL SIGN AU" #x17C5)
-    ("KHMER SIGN NIKAHIT" #x17C6)
-    ("KHMER SIGN REAHMUK" #x17C7)
-    ("KHMER SIGN YUUKALEAPINTU" #x17C8)
-    ("KHMER SIGN MUUSIKATOAN" #x17C9)
-    ("KHMER SIGN TRIISAP" #x17CA)
-    ("KHMER SIGN BANTOC" #x17CB)
-    ("KHMER SIGN ROBAT" #x17CC)
-    ("KHMER SIGN TOANDAKHIAT" #x17CD)
-    ("KHMER SIGN KAKABAT" #x17CE)
-    ("KHMER SIGN AHSDA" #x17CF)
-    ("KHMER SIGN SAMYOK SANNYA" #x17D0)
-    ("KHMER SIGN VIRIAM" #x17D1)
-    ("KHMER SIGN COENG" #x17D2)
-    ("KHMER SIGN BATHAMASAT" #x17D3)
-    ("KHMER SIGN KHAN" #x17D4)
-    ("KHMER SIGN BARIYOOSAN" #x17D5)
-    ("KHMER SIGN CAMNUC PII KUUH" #x17D6)
-    ("KHMER SIGN LEK TOO" #x17D7)
-    ("KHMER SIGN BEYYAL" #x17D8)
-    ("KHMER SIGN PHNAEK MUAN" #x17D9)
-    ("KHMER SIGN KOOMUUT" #x17DA)
-    ("KHMER CURRENCY SYMBOL RIEL" #x17DB)
-    ("KHMER SIGN AVAKRAHASANYA" #x17DC)
-    ("KHMER DIGIT ZERO" #x17E0)
-    ("KHMER DIGIT ONE" #x17E1)
-    ("KHMER DIGIT TWO" #x17E2)
-    ("KHMER DIGIT THREE" #x17E3)
-    ("KHMER DIGIT FOUR" #x17E4)
-    ("KHMER DIGIT FIVE" #x17E5)
-    ("KHMER DIGIT SIX" #x17E6)
-    ("KHMER DIGIT SEVEN" #x17E7)
-    ("KHMER DIGIT EIGHT" #x17E8)
-    ("KHMER DIGIT NINE" #x17E9)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01800-018AF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01800-018AF.el
deleted file mode 100644
index fd3e2455a2..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01800-018AF.el
+++ /dev/null
@@ -1,157 +0,0 @@
-(nxml-define-char-name-set 'mongolian
-  '(("MONGOLIAN BIRGA" #x1800)
-    ("MONGOLIAN ELLIPSIS" #x1801)
-    ("MONGOLIAN COMMA" #x1802)
-    ("MONGOLIAN FULL STOP" #x1803)
-    ("MONGOLIAN COLON" #x1804)
-    ("MONGOLIAN FOUR DOTS" #x1805)
-    ("MONGOLIAN TODO SOFT HYPHEN" #x1806)
-    ("MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER" #x1807)
-    ("MONGOLIAN MANCHU COMMA" #x1808)
-    ("MONGOLIAN MANCHU FULL STOP" #x1809)
-    ("MONGOLIAN NIRUGU" #x180A)
-    ("MONGOLIAN FREE VARIATION SELECTOR ONE" #x180B)
-    ("MONGOLIAN FREE VARIATION SELECTOR TWO" #x180C)
-    ("MONGOLIAN FREE VARIATION SELECTOR THREE" #x180D)
-    ("MONGOLIAN VOWEL SEPARATOR" #x180E)
-    ("MONGOLIAN DIGIT ZERO" #x1810)
-    ("MONGOLIAN DIGIT ONE" #x1811)
-    ("MONGOLIAN DIGIT TWO" #x1812)
-    ("MONGOLIAN DIGIT THREE" #x1813)
-    ("MONGOLIAN DIGIT FOUR" #x1814)
-    ("MONGOLIAN DIGIT FIVE" #x1815)
-    ("MONGOLIAN DIGIT SIX" #x1816)
-    ("MONGOLIAN DIGIT SEVEN" #x1817)
-    ("MONGOLIAN DIGIT EIGHT" #x1818)
-    ("MONGOLIAN DIGIT NINE" #x1819)
-    ("MONGOLIAN LETTER A" #x1820)
-    ("MONGOLIAN LETTER E" #x1821)
-    ("MONGOLIAN LETTER I" #x1822)
-    ("MONGOLIAN LETTER O" #x1823)
-    ("MONGOLIAN LETTER U" #x1824)
-    ("MONGOLIAN LETTER OE" #x1825)
-    ("MONGOLIAN LETTER UE" #x1826)
-    ("MONGOLIAN LETTER EE" #x1827)
-    ("MONGOLIAN LETTER NA" #x1828)
-    ("MONGOLIAN LETTER ANG" #x1829)
-    ("MONGOLIAN LETTER BA" #x182A)
-    ("MONGOLIAN LETTER PA" #x182B)
-    ("MONGOLIAN LETTER QA" #x182C)
-    ("MONGOLIAN LETTER GA" #x182D)
-    ("MONGOLIAN LETTER MA" #x182E)
-    ("MONGOLIAN LETTER LA" #x182F)
-    ("MONGOLIAN LETTER SA" #x1830)
-    ("MONGOLIAN LETTER SHA" #x1831)
-    ("MONGOLIAN LETTER TA" #x1832)
-    ("MONGOLIAN LETTER DA" #x1833)
-    ("MONGOLIAN LETTER CHA" #x1834)
-    ("MONGOLIAN LETTER JA" #x1835)
-    ("MONGOLIAN LETTER YA" #x1836)
-    ("MONGOLIAN LETTER RA" #x1837)
-    ("MONGOLIAN LETTER WA" #x1838)
-    ("MONGOLIAN LETTER FA" #x1839)
-    ("MONGOLIAN LETTER KA" #x183A)
-    ("MONGOLIAN LETTER KHA" #x183B)
-    ("MONGOLIAN LETTER TSA" #x183C)
-    ("MONGOLIAN LETTER ZA" #x183D)
-    ("MONGOLIAN LETTER HAA" #x183E)
-    ("MONGOLIAN LETTER ZRA" #x183F)
-    ("MONGOLIAN LETTER LHA" #x1840)
-    ("MONGOLIAN LETTER ZHI" #x1841)
-    ("MONGOLIAN LETTER CHI" #x1842)
-    ("MONGOLIAN LETTER TODO LONG VOWEL SIGN" #x1843)
-    ("MONGOLIAN LETTER TODO E" #x1844)
-    ("MONGOLIAN LETTER TODO I" #x1845)
-    ("MONGOLIAN LETTER TODO O" #x1846)
-    ("MONGOLIAN LETTER TODO U" #x1847)
-    ("MONGOLIAN LETTER TODO OE" #x1848)
-    ("MONGOLIAN LETTER TODO UE" #x1849)
-    ("MONGOLIAN LETTER TODO ANG" #x184A)
-    ("MONGOLIAN LETTER TODO BA" #x184B)
-    ("MONGOLIAN LETTER TODO PA" #x184C)
-    ("MONGOLIAN LETTER TODO QA" #x184D)
-    ("MONGOLIAN LETTER TODO GA" #x184E)
-    ("MONGOLIAN LETTER TODO MA" #x184F)
-    ("MONGOLIAN LETTER TODO TA" #x1850)
-    ("MONGOLIAN LETTER TODO DA" #x1851)
-    ("MONGOLIAN LETTER TODO CHA" #x1852)
-    ("MONGOLIAN LETTER TODO JA" #x1853)
-    ("MONGOLIAN LETTER TODO TSA" #x1854)
-    ("MONGOLIAN LETTER TODO YA" #x1855)
-    ("MONGOLIAN LETTER TODO WA" #x1856)
-    ("MONGOLIAN LETTER TODO KA" #x1857)
-    ("MONGOLIAN LETTER TODO GAA" #x1858)
-    ("MONGOLIAN LETTER TODO HAA" #x1859)
-    ("MONGOLIAN LETTER TODO JIA" #x185A)
-    ("MONGOLIAN LETTER TODO NIA" #x185B)
-    ("MONGOLIAN LETTER TODO DZA" #x185C)
-    ("MONGOLIAN LETTER SIBE E" #x185D)
-    ("MONGOLIAN LETTER SIBE I" #x185E)
-    ("MONGOLIAN LETTER SIBE IY" #x185F)
-    ("MONGOLIAN LETTER SIBE UE" #x1860)
-    ("MONGOLIAN LETTER SIBE U" #x1861)
-    ("MONGOLIAN LETTER SIBE ANG" #x1862)
-    ("MONGOLIAN LETTER SIBE KA" #x1863)
-    ("MONGOLIAN LETTER SIBE GA" #x1864)
-    ("MONGOLIAN LETTER SIBE HA" #x1865)
-    ("MONGOLIAN LETTER SIBE PA" #x1866)
-    ("MONGOLIAN LETTER SIBE SHA" #x1867)
-    ("MONGOLIAN LETTER SIBE TA" #x1868)
-    ("MONGOLIAN LETTER SIBE DA" #x1869)
-    ("MONGOLIAN LETTER SIBE JA" #x186A)
-    ("MONGOLIAN LETTER SIBE FA" #x186B)
-    ("MONGOLIAN LETTER SIBE GAA" #x186C)
-    ("MONGOLIAN LETTER SIBE HAA" #x186D)
-    ("MONGOLIAN LETTER SIBE TSA" #x186E)
-    ("MONGOLIAN LETTER SIBE ZA" #x186F)
-    ("MONGOLIAN LETTER SIBE RAA" #x1870)
-    ("MONGOLIAN LETTER SIBE CHA" #x1871)
-    ("MONGOLIAN LETTER SIBE ZHA" #x1872)
-    ("MONGOLIAN LETTER MANCHU I" #x1873)
-    ("MONGOLIAN LETTER MANCHU KA" #x1874)
-    ("MONGOLIAN LETTER MANCHU RA" #x1875)
-    ("MONGOLIAN LETTER MANCHU FA" #x1876)
-    ("MONGOLIAN LETTER MANCHU ZHA" #x1877)
-    ("MONGOLIAN LETTER ALI GALI ANUSVARA ONE" #x1880)
-    ("MONGOLIAN LETTER ALI GALI VISARGA ONE" #x1881)
-    ("MONGOLIAN LETTER ALI GALI DAMARU" #x1882)
-    ("MONGOLIAN LETTER ALI GALI UBADAMA" #x1883)
-    ("MONGOLIAN LETTER ALI GALI INVERTED UBADAMA" #x1884)
-    ("MONGOLIAN LETTER ALI GALI BALUDA" #x1885)
-    ("MONGOLIAN LETTER ALI GALI THREE BALUDA" #x1886)
-    ("MONGOLIAN LETTER ALI GALI A" #x1887)
-    ("MONGOLIAN LETTER ALI GALI I" #x1888)
-    ("MONGOLIAN LETTER ALI GALI KA" #x1889)
-    ("MONGOLIAN LETTER ALI GALI NGA" #x188A)
-    ("MONGOLIAN LETTER ALI GALI CA" #x188B)
-    ("MONGOLIAN LETTER ALI GALI TTA" #x188C)
-    ("MONGOLIAN LETTER ALI GALI TTHA" #x188D)
-    ("MONGOLIAN LETTER ALI GALI DDA" #x188E)
-    ("MONGOLIAN LETTER ALI GALI NNA" #x188F)
-    ("MONGOLIAN LETTER ALI GALI TA" #x1890)
-    ("MONGOLIAN LETTER ALI GALI DA" #x1891)
-    ("MONGOLIAN LETTER ALI GALI PA" #x1892)
-    ("MONGOLIAN LETTER ALI GALI PHA" #x1893)
-    ("MONGOLIAN LETTER ALI GALI SSA" #x1894)
-    ("MONGOLIAN LETTER ALI GALI ZHA" #x1895)
-    ("MONGOLIAN LETTER ALI GALI ZA" #x1896)
-    ("MONGOLIAN LETTER ALI GALI AH" #x1897)
-    ("MONGOLIAN LETTER TODO ALI GALI TA" #x1898)
-    ("MONGOLIAN LETTER TODO ALI GALI ZHA" #x1899)
-    ("MONGOLIAN LETTER MANCHU ALI GALI GHA" #x189A)
-    ("MONGOLIAN LETTER MANCHU ALI GALI NGA" #x189B)
-    ("MONGOLIAN LETTER MANCHU ALI GALI CA" #x189C)
-    ("MONGOLIAN LETTER MANCHU ALI GALI JHA" #x189D)
-    ("MONGOLIAN LETTER MANCHU ALI GALI TTA" #x189E)
-    ("MONGOLIAN LETTER MANCHU ALI GALI DDHA" #x189F)
-    ("MONGOLIAN LETTER MANCHU ALI GALI TA" #x18A0)
-    ("MONGOLIAN LETTER MANCHU ALI GALI DHA" #x18A1)
-    ("MONGOLIAN LETTER MANCHU ALI GALI SSA" #x18A2)
-    ("MONGOLIAN LETTER MANCHU ALI GALI CYA" #x18A3)
-    ("MONGOLIAN LETTER MANCHU ALI GALI ZHA" #x18A4)
-    ("MONGOLIAN LETTER MANCHU ALI GALI ZA" #x18A5)
-    ("MONGOLIAN LETTER ALI GALI HALF U" #x18A6)
-    ("MONGOLIAN LETTER ALI GALI HALF YA" #x18A7)
-    ("MONGOLIAN LETTER MANCHU ALI GALI BHA" #x18A8)
-    ("MONGOLIAN LETTER ALI GALI DAGALGA" #x18A9)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01E00-01EFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01E00-01EFF.el
deleted file mode 100644
index 618b74cd3d..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01E00-01EFF.el
+++ /dev/null
@@ -1,248 +0,0 @@
-(nxml-define-char-name-set 'latin-extended-additional
-  '(("LATIN CAPITAL LETTER A WITH RING BELOW" #x1E00)
-    ("LATIN SMALL LETTER A WITH RING BELOW" #x1E01)
-    ("LATIN CAPITAL LETTER B WITH DOT ABOVE" #x1E02)
-    ("LATIN SMALL LETTER B WITH DOT ABOVE" #x1E03)
-    ("LATIN CAPITAL LETTER B WITH DOT BELOW" #x1E04)
-    ("LATIN SMALL LETTER B WITH DOT BELOW" #x1E05)
-    ("LATIN CAPITAL LETTER B WITH LINE BELOW" #x1E06)
-    ("LATIN SMALL LETTER B WITH LINE BELOW" #x1E07)
-    ("LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE" #x1E08)
-    ("LATIN SMALL LETTER C WITH CEDILLA AND ACUTE" #x1E09)
-    ("LATIN CAPITAL LETTER D WITH DOT ABOVE" #x1E0A)
-    ("LATIN SMALL LETTER D WITH DOT ABOVE" #x1E0B)
-    ("LATIN CAPITAL LETTER D WITH DOT BELOW" #x1E0C)
-    ("LATIN SMALL LETTER D WITH DOT BELOW" #x1E0D)
-    ("LATIN CAPITAL LETTER D WITH LINE BELOW" #x1E0E)
-    ("LATIN SMALL LETTER D WITH LINE BELOW" #x1E0F)
-    ("LATIN CAPITAL LETTER D WITH CEDILLA" #x1E10)
-    ("LATIN SMALL LETTER D WITH CEDILLA" #x1E11)
-    ("LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW" #x1E12)
-    ("LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW" #x1E13)
-    ("LATIN CAPITAL LETTER E WITH MACRON AND GRAVE" #x1E14)
-    ("LATIN SMALL LETTER E WITH MACRON AND GRAVE" #x1E15)
-    ("LATIN CAPITAL LETTER E WITH MACRON AND ACUTE" #x1E16)
-    ("LATIN SMALL LETTER E WITH MACRON AND ACUTE" #x1E17)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW" #x1E18)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW" #x1E19)
-    ("LATIN CAPITAL LETTER E WITH TILDE BELOW" #x1E1A)
-    ("LATIN SMALL LETTER E WITH TILDE BELOW" #x1E1B)
-    ("LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE" #x1E1C)
-    ("LATIN SMALL LETTER E WITH CEDILLA AND BREVE" #x1E1D)
-    ("LATIN CAPITAL LETTER F WITH DOT ABOVE" #x1E1E)
-    ("LATIN SMALL LETTER F WITH DOT ABOVE" #x1E1F)
-    ("LATIN CAPITAL LETTER G WITH MACRON" #x1E20)
-    ("LATIN SMALL LETTER G WITH MACRON" #x1E21)
-    ("LATIN CAPITAL LETTER H WITH DOT ABOVE" #x1E22)
-    ("LATIN SMALL LETTER H WITH DOT ABOVE" #x1E23)
-    ("LATIN CAPITAL LETTER H WITH DOT BELOW" #x1E24)
-    ("LATIN SMALL LETTER H WITH DOT BELOW" #x1E25)
-    ("LATIN CAPITAL LETTER H WITH DIAERESIS" #x1E26)
-    ("LATIN SMALL LETTER H WITH DIAERESIS" #x1E27)
-    ("LATIN CAPITAL LETTER H WITH CEDILLA" #x1E28)
-    ("LATIN SMALL LETTER H WITH CEDILLA" #x1E29)
-    ("LATIN CAPITAL LETTER H WITH BREVE BELOW" #x1E2A)
-    ("LATIN SMALL LETTER H WITH BREVE BELOW" #x1E2B)
-    ("LATIN CAPITAL LETTER I WITH TILDE BELOW" #x1E2C)
-    ("LATIN SMALL LETTER I WITH TILDE BELOW" #x1E2D)
-    ("LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE" #x1E2E)
-    ("LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE" #x1E2F)
-    ("LATIN CAPITAL LETTER K WITH ACUTE" #x1E30)
-    ("LATIN SMALL LETTER K WITH ACUTE" #x1E31)
-    ("LATIN CAPITAL LETTER K WITH DOT BELOW" #x1E32)
-    ("LATIN SMALL LETTER K WITH DOT BELOW" #x1E33)
-    ("LATIN CAPITAL LETTER K WITH LINE BELOW" #x1E34)
-    ("LATIN SMALL LETTER K WITH LINE BELOW" #x1E35)
-    ("LATIN CAPITAL LETTER L WITH DOT BELOW" #x1E36)
-    ("LATIN SMALL LETTER L WITH DOT BELOW" #x1E37)
-    ("LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON" #x1E38)
-    ("LATIN SMALL LETTER L WITH DOT BELOW AND MACRON" #x1E39)
-    ("LATIN CAPITAL LETTER L WITH LINE BELOW" #x1E3A)
-    ("LATIN SMALL LETTER L WITH LINE BELOW" #x1E3B)
-    ("LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW" #x1E3C)
-    ("LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW" #x1E3D)
-    ("LATIN CAPITAL LETTER M WITH ACUTE" #x1E3E)
-    ("LATIN SMALL LETTER M WITH ACUTE" #x1E3F)
-    ("LATIN CAPITAL LETTER M WITH DOT ABOVE" #x1E40)
-    ("LATIN SMALL LETTER M WITH DOT ABOVE" #x1E41)
-    ("LATIN CAPITAL LETTER M WITH DOT BELOW" #x1E42)
-    ("LATIN SMALL LETTER M WITH DOT BELOW" #x1E43)
-    ("LATIN CAPITAL LETTER N WITH DOT ABOVE" #x1E44)
-    ("LATIN SMALL LETTER N WITH DOT ABOVE" #x1E45)
-    ("LATIN CAPITAL LETTER N WITH DOT BELOW" #x1E46)
-    ("LATIN SMALL LETTER N WITH DOT BELOW" #x1E47)
-    ("LATIN CAPITAL LETTER N WITH LINE BELOW" #x1E48)
-    ("LATIN SMALL LETTER N WITH LINE BELOW" #x1E49)
-    ("LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW" #x1E4A)
-    ("LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW" #x1E4B)
-    ("LATIN CAPITAL LETTER O WITH TILDE AND ACUTE" #x1E4C)
-    ("LATIN SMALL LETTER O WITH TILDE AND ACUTE" #x1E4D)
-    ("LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS" #x1E4E)
-    ("LATIN SMALL LETTER O WITH TILDE AND DIAERESIS" #x1E4F)
-    ("LATIN CAPITAL LETTER O WITH MACRON AND GRAVE" #x1E50)
-    ("LATIN SMALL LETTER O WITH MACRON AND GRAVE" #x1E51)
-    ("LATIN CAPITAL LETTER O WITH MACRON AND ACUTE" #x1E52)
-    ("LATIN SMALL LETTER O WITH MACRON AND ACUTE" #x1E53)
-    ("LATIN CAPITAL LETTER P WITH ACUTE" #x1E54)
-    ("LATIN SMALL LETTER P WITH ACUTE" #x1E55)
-    ("LATIN CAPITAL LETTER P WITH DOT ABOVE" #x1E56)
-    ("LATIN SMALL LETTER P WITH DOT ABOVE" #x1E57)
-    ("LATIN CAPITAL LETTER R WITH DOT ABOVE" #x1E58)
-    ("LATIN SMALL LETTER R WITH DOT ABOVE" #x1E59)
-    ("LATIN CAPITAL LETTER R WITH DOT BELOW" #x1E5A)
-    ("LATIN SMALL LETTER R WITH DOT BELOW" #x1E5B)
-    ("LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON" #x1E5C)
-    ("LATIN SMALL LETTER R WITH DOT BELOW AND MACRON" #x1E5D)
-    ("LATIN CAPITAL LETTER R WITH LINE BELOW" #x1E5E)
-    ("LATIN SMALL LETTER R WITH LINE BELOW" #x1E5F)
-    ("LATIN CAPITAL LETTER S WITH DOT ABOVE" #x1E60)
-    ("LATIN SMALL LETTER S WITH DOT ABOVE" #x1E61)
-    ("LATIN CAPITAL LETTER S WITH DOT BELOW" #x1E62)
-    ("LATIN SMALL LETTER S WITH DOT BELOW" #x1E63)
-    ("LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE" #x1E64)
-    ("LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE" #x1E65)
-    ("LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE" #x1E66)
-    ("LATIN SMALL LETTER S WITH CARON AND DOT ABOVE" #x1E67)
-    ("LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE" #x1E68)
-    ("LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE" #x1E69)
-    ("LATIN CAPITAL LETTER T WITH DOT ABOVE" #x1E6A)
-    ("LATIN SMALL LETTER T WITH DOT ABOVE" #x1E6B)
-    ("LATIN CAPITAL LETTER T WITH DOT BELOW" #x1E6C)
-    ("LATIN SMALL LETTER T WITH DOT BELOW" #x1E6D)
-    ("LATIN CAPITAL LETTER T WITH LINE BELOW" #x1E6E)
-    ("LATIN SMALL LETTER T WITH LINE BELOW" #x1E6F)
-    ("LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW" #x1E70)
-    ("LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW" #x1E71)
-    ("LATIN CAPITAL LETTER U WITH DIAERESIS BELOW" #x1E72)
-    ("LATIN SMALL LETTER U WITH DIAERESIS BELOW" #x1E73)
-    ("LATIN CAPITAL LETTER U WITH TILDE BELOW" #x1E74)
-    ("LATIN SMALL LETTER U WITH TILDE BELOW" #x1E75)
-    ("LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW" #x1E76)
-    ("LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW" #x1E77)
-    ("LATIN CAPITAL LETTER U WITH TILDE AND ACUTE" #x1E78)
-    ("LATIN SMALL LETTER U WITH TILDE AND ACUTE" #x1E79)
-    ("LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS" #x1E7A)
-    ("LATIN SMALL LETTER U WITH MACRON AND DIAERESIS" #x1E7B)
-    ("LATIN CAPITAL LETTER V WITH TILDE" #x1E7C)
-    ("LATIN SMALL LETTER V WITH TILDE" #x1E7D)
-    ("LATIN CAPITAL LETTER V WITH DOT BELOW" #x1E7E)
-    ("LATIN SMALL LETTER V WITH DOT BELOW" #x1E7F)
-    ("LATIN CAPITAL LETTER W WITH GRAVE" #x1E80)
-    ("LATIN SMALL LETTER W WITH GRAVE" #x1E81)
-    ("LATIN CAPITAL LETTER W WITH ACUTE" #x1E82)
-    ("LATIN SMALL LETTER W WITH ACUTE" #x1E83)
-    ("LATIN CAPITAL LETTER W WITH DIAERESIS" #x1E84)
-    ("LATIN SMALL LETTER W WITH DIAERESIS" #x1E85)
-    ("LATIN CAPITAL LETTER W WITH DOT ABOVE" #x1E86)
-    ("LATIN SMALL LETTER W WITH DOT ABOVE" #x1E87)
-    ("LATIN CAPITAL LETTER W WITH DOT BELOW" #x1E88)
-    ("LATIN SMALL LETTER W WITH DOT BELOW" #x1E89)
-    ("LATIN CAPITAL LETTER X WITH DOT ABOVE" #x1E8A)
-    ("LATIN SMALL LETTER X WITH DOT ABOVE" #x1E8B)
-    ("LATIN CAPITAL LETTER X WITH DIAERESIS" #x1E8C)
-    ("LATIN SMALL LETTER X WITH DIAERESIS" #x1E8D)
-    ("LATIN CAPITAL LETTER Y WITH DOT ABOVE" #x1E8E)
-    ("LATIN SMALL LETTER Y WITH DOT ABOVE" #x1E8F)
-    ("LATIN CAPITAL LETTER Z WITH CIRCUMFLEX" #x1E90)
-    ("LATIN SMALL LETTER Z WITH CIRCUMFLEX" #x1E91)
-    ("LATIN CAPITAL LETTER Z WITH DOT BELOW" #x1E92)
-    ("LATIN SMALL LETTER Z WITH DOT BELOW" #x1E93)
-    ("LATIN CAPITAL LETTER Z WITH LINE BELOW" #x1E94)
-    ("LATIN SMALL LETTER Z WITH LINE BELOW" #x1E95)
-    ("LATIN SMALL LETTER H WITH LINE BELOW" #x1E96)
-    ("LATIN SMALL LETTER T WITH DIAERESIS" #x1E97)
-    ("LATIN SMALL LETTER W WITH RING ABOVE" #x1E98)
-    ("LATIN SMALL LETTER Y WITH RING ABOVE" #x1E99)
-    ("LATIN SMALL LETTER A WITH RIGHT HALF RING" #x1E9A)
-    ("LATIN SMALL LETTER LONG S WITH DOT ABOVE" #x1E9B)
-    ("LATIN CAPITAL LETTER A WITH DOT BELOW" #x1EA0)
-    ("LATIN SMALL LETTER A WITH DOT BELOW" #x1EA1)
-    ("LATIN CAPITAL LETTER A WITH HOOK ABOVE" #x1EA2)
-    ("LATIN SMALL LETTER A WITH HOOK ABOVE" #x1EA3)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE" #x1EA4)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE" #x1EA5)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE" #x1EA6)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE" #x1EA7)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE" #x1EA8)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE" #x1EA9)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE" #x1EAA)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE" #x1EAB)
-    ("LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW" #x1EAC)
-    ("LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW" #x1EAD)
-    ("LATIN CAPITAL LETTER A WITH BREVE AND ACUTE" #x1EAE)
-    ("LATIN SMALL LETTER A WITH BREVE AND ACUTE" #x1EAF)
-    ("LATIN CAPITAL LETTER A WITH BREVE AND GRAVE" #x1EB0)
-    ("LATIN SMALL LETTER A WITH BREVE AND GRAVE" #x1EB1)
-    ("LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE" #x1EB2)
-    ("LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE" #x1EB3)
-    ("LATIN CAPITAL LETTER A WITH BREVE AND TILDE" #x1EB4)
-    ("LATIN SMALL LETTER A WITH BREVE AND TILDE" #x1EB5)
-    ("LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW" #x1EB6)
-    ("LATIN SMALL LETTER A WITH BREVE AND DOT BELOW" #x1EB7)
-    ("LATIN CAPITAL LETTER E WITH DOT BELOW" #x1EB8)
-    ("LATIN SMALL LETTER E WITH DOT BELOW" #x1EB9)
-    ("LATIN CAPITAL LETTER E WITH HOOK ABOVE" #x1EBA)
-    ("LATIN SMALL LETTER E WITH HOOK ABOVE" #x1EBB)
-    ("LATIN CAPITAL LETTER E WITH TILDE" #x1EBC)
-    ("LATIN SMALL LETTER E WITH TILDE" #x1EBD)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE" #x1EBE)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE" #x1EBF)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE" #x1EC0)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE" #x1EC1)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE" #x1EC2)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE" #x1EC3)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE" #x1EC4)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE" #x1EC5)
-    ("LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW" #x1EC6)
-    ("LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW" #x1EC7)
-    ("LATIN CAPITAL LETTER I WITH HOOK ABOVE" #x1EC8)
-    ("LATIN SMALL LETTER I WITH HOOK ABOVE" #x1EC9)
-    ("LATIN CAPITAL LETTER I WITH DOT BELOW" #x1ECA)
-    ("LATIN SMALL LETTER I WITH DOT BELOW" #x1ECB)
-    ("LATIN CAPITAL LETTER O WITH DOT BELOW" #x1ECC)
-    ("LATIN SMALL LETTER O WITH DOT BELOW" #x1ECD)
-    ("LATIN CAPITAL LETTER O WITH HOOK ABOVE" #x1ECE)
-    ("LATIN SMALL LETTER O WITH HOOK ABOVE" #x1ECF)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE" #x1ED0)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE" #x1ED1)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE" #x1ED2)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE" #x1ED3)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE" #x1ED4)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE" #x1ED5)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE" #x1ED6)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE" #x1ED7)
-    ("LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW" #x1ED8)
-    ("LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW" #x1ED9)
-    ("LATIN CAPITAL LETTER O WITH HORN AND ACUTE" #x1EDA)
-    ("LATIN SMALL LETTER O WITH HORN AND ACUTE" #x1EDB)
-    ("LATIN CAPITAL LETTER O WITH HORN AND GRAVE" #x1EDC)
-    ("LATIN SMALL LETTER O WITH HORN AND GRAVE" #x1EDD)
-    ("LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE" #x1EDE)
-    ("LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE" #x1EDF)
-    ("LATIN CAPITAL LETTER O WITH HORN AND TILDE" #x1EE0)
-    ("LATIN SMALL LETTER O WITH HORN AND TILDE" #x1EE1)
-    ("LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW" #x1EE2)
-    ("LATIN SMALL LETTER O WITH HORN AND DOT BELOW" #x1EE3)
-    ("LATIN CAPITAL LETTER U WITH DOT BELOW" #x1EE4)
-    ("LATIN SMALL LETTER U WITH DOT BELOW" #x1EE5)
-    ("LATIN CAPITAL LETTER U WITH HOOK ABOVE" #x1EE6)
-    ("LATIN SMALL LETTER U WITH HOOK ABOVE" #x1EE7)
-    ("LATIN CAPITAL LETTER U WITH HORN AND ACUTE" #x1EE8)
-    ("LATIN SMALL LETTER U WITH HORN AND ACUTE" #x1EE9)
-    ("LATIN CAPITAL LETTER U WITH HORN AND GRAVE" #x1EEA)
-    ("LATIN SMALL LETTER U WITH HORN AND GRAVE" #x1EEB)
-    ("LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE" #x1EEC)
-    ("LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE" #x1EED)
-    ("LATIN CAPITAL LETTER U WITH HORN AND TILDE" #x1EEE)
-    ("LATIN SMALL LETTER U WITH HORN AND TILDE" #x1EEF)
-    ("LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW" #x1EF0)
-    ("LATIN SMALL LETTER U WITH HORN AND DOT BELOW" #x1EF1)
-    ("LATIN CAPITAL LETTER Y WITH GRAVE" #x1EF2)
-    ("LATIN SMALL LETTER Y WITH GRAVE" #x1EF3)
-    ("LATIN CAPITAL LETTER Y WITH DOT BELOW" #x1EF4)
-    ("LATIN SMALL LETTER Y WITH DOT BELOW" #x1EF5)
-    ("LATIN CAPITAL LETTER Y WITH HOOK ABOVE" #x1EF6)
-    ("LATIN SMALL LETTER Y WITH HOOK ABOVE" #x1EF7)
-    ("LATIN CAPITAL LETTER Y WITH TILDE" #x1EF8)
-    ("LATIN SMALL LETTER Y WITH TILDE" #x1EF9)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01F00-01FFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01F00-01FFF.el
deleted file mode 100644
index 56ce30a017..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/01F00-01FFF.el
+++ /dev/null
@@ -1,235 +0,0 @@
-(nxml-define-char-name-set 'greek-extended
-  '(("GREEK SMALL LETTER ALPHA WITH PSILI" #x1F00)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA" #x1F01)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA" #x1F02)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA" #x1F03)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA" #x1F04)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA" #x1F05)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI" #x1F06)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI" #x1F07)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI" #x1F08)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA" #x1F09)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA" #x1F0A)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA" #x1F0B)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA" #x1F0C)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA" #x1F0D)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI" #x1F0E)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI" #x1F0F)
-    ("GREEK SMALL LETTER EPSILON WITH PSILI" #x1F10)
-    ("GREEK SMALL LETTER EPSILON WITH DASIA" #x1F11)
-    ("GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA" #x1F12)
-    ("GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA" #x1F13)
-    ("GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA" #x1F14)
-    ("GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA" #x1F15)
-    ("GREEK CAPITAL LETTER EPSILON WITH PSILI" #x1F18)
-    ("GREEK CAPITAL LETTER EPSILON WITH DASIA" #x1F19)
-    ("GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA" #x1F1A)
-    ("GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA" #x1F1B)
-    ("GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA" #x1F1C)
-    ("GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA" #x1F1D)
-    ("GREEK SMALL LETTER ETA WITH PSILI" #x1F20)
-    ("GREEK SMALL LETTER ETA WITH DASIA" #x1F21)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND VARIA" #x1F22)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND VARIA" #x1F23)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND OXIA" #x1F24)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND OXIA" #x1F25)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI" #x1F26)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI" #x1F27)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI" #x1F28)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA" #x1F29)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA" #x1F2A)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA" #x1F2B)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA" #x1F2C)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA" #x1F2D)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI" #x1F2E)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI" #x1F2F)
-    ("GREEK SMALL LETTER IOTA WITH PSILI" #x1F30)
-    ("GREEK SMALL LETTER IOTA WITH DASIA" #x1F31)
-    ("GREEK SMALL LETTER IOTA WITH PSILI AND VARIA" #x1F32)
-    ("GREEK SMALL LETTER IOTA WITH DASIA AND VARIA" #x1F33)
-    ("GREEK SMALL LETTER IOTA WITH PSILI AND OXIA" #x1F34)
-    ("GREEK SMALL LETTER IOTA WITH DASIA AND OXIA" #x1F35)
-    ("GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI" #x1F36)
-    ("GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI" #x1F37)
-    ("GREEK CAPITAL LETTER IOTA WITH PSILI" #x1F38)
-    ("GREEK CAPITAL LETTER IOTA WITH DASIA" #x1F39)
-    ("GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA" #x1F3A)
-    ("GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA" #x1F3B)
-    ("GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA" #x1F3C)
-    ("GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA" #x1F3D)
-    ("GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI" #x1F3E)
-    ("GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI" #x1F3F)
-    ("GREEK SMALL LETTER OMICRON WITH PSILI" #x1F40)
-    ("GREEK SMALL LETTER OMICRON WITH DASIA" #x1F41)
-    ("GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA" #x1F42)
-    ("GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA" #x1F43)
-    ("GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA" #x1F44)
-    ("GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA" #x1F45)
-    ("GREEK CAPITAL LETTER OMICRON WITH PSILI" #x1F48)
-    ("GREEK CAPITAL LETTER OMICRON WITH DASIA" #x1F49)
-    ("GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA" #x1F4A)
-    ("GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA" #x1F4B)
-    ("GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA" #x1F4C)
-    ("GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA" #x1F4D)
-    ("GREEK SMALL LETTER UPSILON WITH PSILI" #x1F50)
-    ("GREEK SMALL LETTER UPSILON WITH DASIA" #x1F51)
-    ("GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA" #x1F52)
-    ("GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA" #x1F53)
-    ("GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA" #x1F54)
-    ("GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA" #x1F55)
-    ("GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI" #x1F56)
-    ("GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI" #x1F57)
-    ("GREEK CAPITAL LETTER UPSILON WITH DASIA" #x1F59)
-    ("GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA" #x1F5B)
-    ("GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA" #x1F5D)
-    ("GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI" #x1F5F)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI" #x1F60)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA" #x1F61)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA" #x1F62)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA" #x1F63)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA" #x1F64)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA" #x1F65)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI" #x1F66)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI" #x1F67)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI" #x1F68)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA" #x1F69)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA" #x1F6A)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA" #x1F6B)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA" #x1F6C)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA" #x1F6D)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI" #x1F6E)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI" #x1F6F)
-    ("GREEK SMALL LETTER ALPHA WITH VARIA" #x1F70)
-    ("GREEK SMALL LETTER ALPHA WITH OXIA" #x1F71)
-    ("GREEK SMALL LETTER EPSILON WITH VARIA" #x1F72)
-    ("GREEK SMALL LETTER EPSILON WITH OXIA" #x1F73)
-    ("GREEK SMALL LETTER ETA WITH VARIA" #x1F74)
-    ("GREEK SMALL LETTER ETA WITH OXIA" #x1F75)
-    ("GREEK SMALL LETTER IOTA WITH VARIA" #x1F76)
-    ("GREEK SMALL LETTER IOTA WITH OXIA" #x1F77)
-    ("GREEK SMALL LETTER OMICRON WITH VARIA" #x1F78)
-    ("GREEK SMALL LETTER OMICRON WITH OXIA" #x1F79)
-    ("GREEK SMALL LETTER UPSILON WITH VARIA" #x1F7A)
-    ("GREEK SMALL LETTER UPSILON WITH OXIA" #x1F7B)
-    ("GREEK SMALL LETTER OMEGA WITH VARIA" #x1F7C)
-    ("GREEK SMALL LETTER OMEGA WITH OXIA" #x1F7D)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI" #x1F80)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI" #x1F81)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI" #x1F82)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI" #x1F83)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI" #x1F84)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI" #x1F85)
-    ("GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI" #x1F86)
-    ("GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI" #x1F87)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI" #x1F88)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI" #x1F89)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI" #x1F8A)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI" #x1F8B)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI" #x1F8C)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI" #x1F8D)
-    ("GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI" #x1F8E)
-    ("GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI" #x1F8F)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI" #x1F90)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI" #x1F91)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI" #x1F92)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI" #x1F93)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI" #x1F94)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI" #x1F95)
-    ("GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI" #x1F96)
-    ("GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI" #x1F97)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI" #x1F98)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI" #x1F99)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI" #x1F9A)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI" #x1F9B)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI" #x1F9C)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI" #x1F9D)
-    ("GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI" #x1F9E)
-    ("GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI" #x1F9F)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI" #x1FA0)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI" #x1FA1)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI" #x1FA2)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI" #x1FA3)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI" #x1FA4)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI" #x1FA5)
-    ("GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI" #x1FA6)
-    ("GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI" #x1FA7)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI" #x1FA8)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI" #x1FA9)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI" #x1FAA)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI" #x1FAB)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI" #x1FAC)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI" #x1FAD)
-    ("GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI" #x1FAE)
-    ("GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI" #x1FAF)
-    ("GREEK SMALL LETTER ALPHA WITH VRACHY" #x1FB0)
-    ("GREEK SMALL LETTER ALPHA WITH MACRON" #x1FB1)
-    ("GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI" #x1FB2)
-    ("GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI" #x1FB3)
-    ("GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI" #x1FB4)
-    ("GREEK SMALL LETTER ALPHA WITH PERISPOMENI" #x1FB6)
-    ("GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI" #x1FB7)
-    ("GREEK CAPITAL LETTER ALPHA WITH VRACHY" #x1FB8)
-    ("GREEK CAPITAL LETTER ALPHA WITH MACRON" #x1FB9)
-    ("GREEK CAPITAL LETTER ALPHA WITH VARIA" #x1FBA)
-    ("GREEK CAPITAL LETTER ALPHA WITH OXIA" #x1FBB)
-    ("GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI" #x1FBC)
-    ("GREEK KORONIS" #x1FBD)
-    ("GREEK PROSGEGRAMMENI" #x1FBE)
-    ("GREEK PSILI" #x1FBF)
-    ("GREEK PERISPOMENI" #x1FC0)
-    ("GREEK DIALYTIKA AND PERISPOMENI" #x1FC1)
-    ("GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI" #x1FC2)
-    ("GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI" #x1FC3)
-    ("GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI" #x1FC4)
-    ("GREEK SMALL LETTER ETA WITH PERISPOMENI" #x1FC6)
-    ("GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI" #x1FC7)
-    ("GREEK CAPITAL LETTER EPSILON WITH VARIA" #x1FC8)
-    ("GREEK CAPITAL LETTER EPSILON WITH OXIA" #x1FC9)
-    ("GREEK CAPITAL LETTER ETA WITH VARIA" #x1FCA)
-    ("GREEK CAPITAL LETTER ETA WITH OXIA" #x1FCB)
-    ("GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI" #x1FCC)
-    ("GREEK PSILI AND VARIA" #x1FCD)
-    ("GREEK PSILI AND OXIA" #x1FCE)
-    ("GREEK PSILI AND PERISPOMENI" #x1FCF)
-    ("GREEK SMALL LETTER IOTA WITH VRACHY" #x1FD0)
-    ("GREEK SMALL LETTER IOTA WITH MACRON" #x1FD1)
-    ("GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA" #x1FD2)
-    ("GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA" #x1FD3)
-    ("GREEK SMALL LETTER IOTA WITH PERISPOMENI" #x1FD6)
-    ("GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI" #x1FD7)
-    ("GREEK CAPITAL LETTER IOTA WITH VRACHY" #x1FD8)
-    ("GREEK CAPITAL LETTER IOTA WITH MACRON" #x1FD9)
-    ("GREEK CAPITAL LETTER IOTA WITH VARIA" #x1FDA)
-    ("GREEK CAPITAL LETTER IOTA WITH OXIA" #x1FDB)
-    ("GREEK DASIA AND VARIA" #x1FDD)
-    ("GREEK DASIA AND OXIA" #x1FDE)
-    ("GREEK DASIA AND PERISPOMENI" #x1FDF)
-    ("GREEK SMALL LETTER UPSILON WITH VRACHY" #x1FE0)
-    ("GREEK SMALL LETTER UPSILON WITH MACRON" #x1FE1)
-    ("GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA" #x1FE2)
-    ("GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA" #x1FE3)
-    ("GREEK SMALL LETTER RHO WITH PSILI" #x1FE4)
-    ("GREEK SMALL LETTER RHO WITH DASIA" #x1FE5)
-    ("GREEK SMALL LETTER UPSILON WITH PERISPOMENI" #x1FE6)
-    ("GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI" #x1FE7)
-    ("GREEK CAPITAL LETTER UPSILON WITH VRACHY" #x1FE8)
-    ("GREEK CAPITAL LETTER UPSILON WITH MACRON" #x1FE9)
-    ("GREEK CAPITAL LETTER UPSILON WITH VARIA" #x1FEA)
-    ("GREEK CAPITAL LETTER UPSILON WITH OXIA" #x1FEB)
-    ("GREEK CAPITAL LETTER RHO WITH DASIA" #x1FEC)
-    ("GREEK DIALYTIKA AND VARIA" #x1FED)
-    ("GREEK DIALYTIKA AND OXIA" #x1FEE)
-    ("GREEK VARIA" #x1FEF)
-    ("GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI" #x1FF2)
-    ("GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI" #x1FF3)
-    ("GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI" #x1FF4)
-    ("GREEK SMALL LETTER OMEGA WITH PERISPOMENI" #x1FF6)
-    ("GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI" #x1FF7)
-    ("GREEK CAPITAL LETTER OMICRON WITH VARIA" #x1FF8)
-    ("GREEK CAPITAL LETTER OMICRON WITH OXIA" #x1FF9)
-    ("GREEK CAPITAL LETTER OMEGA WITH VARIA" #x1FFA)
-    ("GREEK CAPITAL LETTER OMEGA WITH OXIA" #x1FFB)
-    ("GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI" #x1FFC)
-    ("GREEK OXIA" #x1FFD)
-    ("GREEK DASIA" #x1FFE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02000-0206F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02000-0206F.el
deleted file mode 100644
index 54f6207cd4..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02000-0206F.el
+++ /dev/null
@@ -1,97 +0,0 @@
-(nxml-define-char-name-set 'general-punctuation
-  '(("EN QUAD" #x2000)
-    ("EM QUAD" #x2001)
-    ("EN SPACE" #x2002)
-    ("EM SPACE" #x2003)
-    ("THREE-PER-EM SPACE" #x2004)
-    ("FOUR-PER-EM SPACE" #x2005)
-    ("SIX-PER-EM SPACE" #x2006)
-    ("FIGURE SPACE" #x2007)
-    ("PUNCTUATION SPACE" #x2008)
-    ("THIN SPACE" #x2009)
-    ("HAIR SPACE" #x200A)
-    ("ZERO WIDTH SPACE" #x200B)
-    ("ZERO WIDTH NON-JOINER" #x200C)
-    ("ZERO WIDTH JOINER" #x200D)
-    ("LEFT-TO-RIGHT MARK" #x200E)
-    ("RIGHT-TO-LEFT MARK" #x200F)
-    ("HYPHEN" #x2010)
-    ("NON-BREAKING HYPHEN" #x2011)
-    ("FIGURE DASH" #x2012)
-    ("EN DASH" #x2013)
-    ("EM DASH" #x2014)
-    ("HORIZONTAL BAR" #x2015)
-    ("DOUBLE VERTICAL LINE" #x2016)
-    ("DOUBLE LOW LINE" #x2017)
-    ("LEFT SINGLE QUOTATION MARK" #x2018)
-    ("RIGHT SINGLE QUOTATION MARK" #x2019)
-    ("SINGLE LOW-9 QUOTATION MARK" #x201A)
-    ("SINGLE HIGH-REVERSED-9 QUOTATION MARK" #x201B)
-    ("LEFT DOUBLE QUOTATION MARK" #x201C)
-    ("RIGHT DOUBLE QUOTATION MARK" #x201D)
-    ("DOUBLE LOW-9 QUOTATION MARK" #x201E)
-    ("DOUBLE HIGH-REVERSED-9 QUOTATION MARK" #x201F)
-    ("DAGGER" #x2020)
-    ("DOUBLE DAGGER" #x2021)
-    ("BULLET" #x2022)
-    ("TRIANGULAR BULLET" #x2023)
-    ("ONE DOT LEADER" #x2024)
-    ("TWO DOT LEADER" #x2025)
-    ("HORIZONTAL ELLIPSIS" #x2026)
-    ("HYPHENATION POINT" #x2027)
-    ("LINE SEPARATOR" #x2028)
-    ("PARAGRAPH SEPARATOR" #x2029)
-    ("LEFT-TO-RIGHT EMBEDDING" #x202A)
-    ("RIGHT-TO-LEFT EMBEDDING" #x202B)
-    ("POP DIRECTIONAL FORMATTING" #x202C)
-    ("LEFT-TO-RIGHT OVERRIDE" #x202D)
-    ("RIGHT-TO-LEFT OVERRIDE" #x202E)
-    ("NARROW NO-BREAK SPACE" #x202F)
-    ("PER MILLE SIGN" #x2030)
-    ("PER TEN THOUSAND SIGN" #x2031)
-    ("PRIME" #x2032)
-    ("DOUBLE PRIME" #x2033)
-    ("TRIPLE PRIME" #x2034)
-    ("REVERSED PRIME" #x2035)
-    ("REVERSED DOUBLE PRIME" #x2036)
-    ("REVERSED TRIPLE PRIME" #x2037)
-    ("CARET" #x2038)
-    ("SINGLE LEFT-POINTING ANGLE QUOTATION MARK" #x2039)
-    ("SINGLE RIGHT-POINTING ANGLE QUOTATION MARK" #x203A)
-    ("REFERENCE MARK" #x203B)
-    ("DOUBLE EXCLAMATION MARK" #x203C)
-    ("INTERROBANG" #x203D)
-    ("OVERLINE" #x203E)
-    ("UNDERTIE" #x203F)
-    ("CHARACTER TIE" #x2040)
-    ("CARET INSERTION POINT" #x2041)
-    ("ASTERISM" #x2042)
-    ("HYPHEN BULLET" #x2043)
-    ("FRACTION SLASH" #x2044)
-    ("LEFT SQUARE BRACKET WITH QUILL" #x2045)
-    ("RIGHT SQUARE BRACKET WITH QUILL" #x2046)
-    ("DOUBLE QUESTION MARK" #x2047)
-    ("QUESTION EXCLAMATION MARK" #x2048)
-    ("EXCLAMATION QUESTION MARK" #x2049)
-    ("TIRONIAN SIGN ET" #x204A)
-    ("REVERSED PILCROW SIGN" #x204B)
-    ("BLACK LEFTWARDS BULLET" #x204C)
-    ("BLACK RIGHTWARDS BULLET" #x204D)
-    ("LOW ASTERISK" #x204E)
-    ("REVERSED SEMICOLON" #x204F)
-    ("CLOSE UP" #x2050)
-    ("TWO ASTERISKS ALIGNED VERTICALLY" #x2051)
-    ("COMMERCIAL MINUS SIGN" #x2052)
-    ("QUADRUPLE PRIME" #x2057)
-    ("MEDIUM MATHEMATICAL SPACE" #x205F)
-    ("WORD JOINER" #x2060)
-    ("FUNCTION APPLICATION" #x2061)
-    ("INVISIBLE TIMES" #x2062)
-    ("INVISIBLE SEPARATOR" #x2063)
-    ("INHIBIT SYMMETRIC SWAPPING" #x206A)
-    ("ACTIVATE SYMMETRIC SWAPPING" #x206B)
-    ("INHIBIT ARABIC FORM SHAPING" #x206C)
-    ("ACTIVATE ARABIC FORM SHAPING" #x206D)
-    ("NATIONAL DIGIT SHAPES" #x206E)
-    ("NOMINAL DIGIT SHAPES" #x206F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02070-0209F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02070-0209F.el
deleted file mode 100644
index 5d37880fd6..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02070-0209F.el
+++ /dev/null
@@ -1,31 +0,0 @@
-(nxml-define-char-name-set 'superscripts-and-subscripts
-  '(("SUPERSCRIPT ZERO" #x2070)
-    ("SUPERSCRIPT LATIN SMALL LETTER I" #x2071)
-    ("SUPERSCRIPT FOUR" #x2074)
-    ("SUPERSCRIPT FIVE" #x2075)
-    ("SUPERSCRIPT SIX" #x2076)
-    ("SUPERSCRIPT SEVEN" #x2077)
-    ("SUPERSCRIPT EIGHT" #x2078)
-    ("SUPERSCRIPT NINE" #x2079)
-    ("SUPERSCRIPT PLUS SIGN" #x207A)
-    ("SUPERSCRIPT MINUS" #x207B)
-    ("SUPERSCRIPT EQUALS SIGN" #x207C)
-    ("SUPERSCRIPT LEFT PARENTHESIS" #x207D)
-    ("SUPERSCRIPT RIGHT PARENTHESIS" #x207E)
-    ("SUPERSCRIPT LATIN SMALL LETTER N" #x207F)
-    ("SUBSCRIPT ZERO" #x2080)
-    ("SUBSCRIPT ONE" #x2081)
-    ("SUBSCRIPT TWO" #x2082)
-    ("SUBSCRIPT THREE" #x2083)
-    ("SUBSCRIPT FOUR" #x2084)
-    ("SUBSCRIPT FIVE" #x2085)
-    ("SUBSCRIPT SIX" #x2086)
-    ("SUBSCRIPT SEVEN" #x2087)
-    ("SUBSCRIPT EIGHT" #x2088)
-    ("SUBSCRIPT NINE" #x2089)
-    ("SUBSCRIPT PLUS SIGN" #x208A)
-    ("SUBSCRIPT MINUS" #x208B)
-    ("SUBSCRIPT EQUALS SIGN" #x208C)
-    ("SUBSCRIPT LEFT PARENTHESIS" #x208D)
-    ("SUBSCRIPT RIGHT PARENTHESIS" #x208E)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020A0-020CF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020A0-020CF.el
deleted file mode 100644
index 1cab37edcb..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020A0-020CF.el
+++ /dev/null
@@ -1,20 +0,0 @@
-(nxml-define-char-name-set 'currency-symbols
-  '(("EURO-CURRENCY SIGN" #x20A0)
-    ("COLON SIGN" #x20A1)
-    ("CRUZEIRO SIGN" #x20A2)
-    ("FRENCH FRANC SIGN" #x20A3)
-    ("LIRA SIGN" #x20A4)
-    ("MILL SIGN" #x20A5)
-    ("NAIRA SIGN" #x20A6)
-    ("PESETA SIGN" #x20A7)
-    ("RUPEE SIGN" #x20A8)
-    ("WON SIGN" #x20A9)
-    ("NEW SHEQEL SIGN" #x20AA)
-    ("DONG SIGN" #x20AB)
-    ("EURO SIGN" #x20AC)
-    ("KIP SIGN" #x20AD)
-    ("TUGRIK SIGN" #x20AE)
-    ("DRACHMA SIGN" #x20AF)
-    ("GERMAN PENNY SIGN" #x20B0)
-    ("PESO SIGN" #x20B1)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020D0-020FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020D0-020FF.el
deleted file mode 100644
index e610d399d4..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/020D0-020FF.el
+++ /dev/null
@@ -1,29 +0,0 @@
-(nxml-define-char-name-set 'combining-diacritical-marks-for-symbols
-  '(("COMBINING LEFT HARPOON ABOVE" #x20D0)
-    ("COMBINING RIGHT HARPOON ABOVE" #x20D1)
-    ("COMBINING LONG VERTICAL LINE OVERLAY" #x20D2)
-    ("COMBINING SHORT VERTICAL LINE OVERLAY" #x20D3)
-    ("COMBINING ANTICLOCKWISE ARROW ABOVE" #x20D4)
-    ("COMBINING CLOCKWISE ARROW ABOVE" #x20D5)
-    ("COMBINING LEFT ARROW ABOVE" #x20D6)
-    ("COMBINING RIGHT ARROW ABOVE" #x20D7)
-    ("COMBINING RING OVERLAY" #x20D8)
-    ("COMBINING CLOCKWISE RING OVERLAY" #x20D9)
-    ("COMBINING ANTICLOCKWISE RING OVERLAY" #x20DA)
-    ("COMBINING THREE DOTS ABOVE" #x20DB)
-    ("COMBINING FOUR DOTS ABOVE" #x20DC)
-    ("COMBINING ENCLOSING CIRCLE" #x20DD)
-    ("COMBINING ENCLOSING SQUARE" #x20DE)
-    ("COMBINING ENCLOSING DIAMOND" #x20DF)
-    ("COMBINING ENCLOSING CIRCLE BACKSLASH" #x20E0)
-    ("COMBINING LEFT RIGHT ARROW ABOVE" #x20E1)
-    ("COMBINING ENCLOSING SCREEN" #x20E2)
-    ("COMBINING ENCLOSING KEYCAP" #x20E3)
-    ("COMBINING ENCLOSING UPWARD POINTING TRIANGLE" #x20E4)
-    ("COMBINING REVERSE SOLIDUS OVERLAY" #x20E5)
-    ("COMBINING DOUBLE VERTICAL STROKE OVERLAY" #x20E6)
-    ("COMBINING ANNUITY SYMBOL" #x20E7)
-    ("COMBINING TRIPLE UNDERDOT" #x20E8)
-    ("COMBINING WIDE BRIDGE ABOVE" #x20E9)
-    ("COMBINING LEFTWARDS ARROW OVERLAY" #x20EA)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02100-0214F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02100-0214F.el
deleted file mode 100644
index bdf929f654..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02100-0214F.el
+++ /dev/null
@@ -1,76 +0,0 @@
-(nxml-define-char-name-set 'letterlike-symbols
-  '(("ACCOUNT OF" #x2100)
-    ("ADDRESSED TO THE SUBJECT" #x2101)
-    ("DOUBLE-STRUCK CAPITAL C" #x2102)
-    ("DEGREE CELSIUS" #x2103)
-    ("CENTRE LINE SYMBOL" #x2104)
-    ("CARE OF" #x2105)
-    ("CADA UNA" #x2106)
-    ("EULER CONSTANT" #x2107)
-    ("SCRUPLE" #x2108)
-    ("DEGREE FAHRENHEIT" #x2109)
-    ("SCRIPT SMALL G" #x210A)
-    ("SCRIPT CAPITAL H" #x210B)
-    ("BLACK-LETTER CAPITAL H" #x210C)
-    ("DOUBLE-STRUCK CAPITAL H" #x210D)
-    ("PLANCK CONSTANT" #x210E)
-    ("PLANCK CONSTANT OVER TWO PI" #x210F)
-    ("SCRIPT CAPITAL I" #x2110)
-    ("BLACK-LETTER CAPITAL I" #x2111)
-    ("SCRIPT CAPITAL L" #x2112)
-    ("SCRIPT SMALL L" #x2113)
-    ("L B BAR SYMBOL" #x2114)
-    ("DOUBLE-STRUCK CAPITAL N" #x2115)
-    ("NUMERO SIGN" #x2116)
-    ("SOUND RECORDING COPYRIGHT" #x2117)
-    ("SCRIPT CAPITAL P" #x2118)
-    ("DOUBLE-STRUCK CAPITAL P" #x2119)
-    ("DOUBLE-STRUCK CAPITAL Q" #x211A)
-    ("SCRIPT CAPITAL R" #x211B)
-    ("BLACK-LETTER CAPITAL R" #x211C)
-    ("DOUBLE-STRUCK CAPITAL R" #x211D)
-    ("PRESCRIPTION TAKE" #x211E)
-    ("RESPONSE" #x211F)
-    ("SERVICE MARK" #x2120)
-    ("TELEPHONE SIGN" #x2121)
-    ("TRADE MARK SIGN" #x2122)
-    ("VERSICLE" #x2123)
-    ("DOUBLE-STRUCK CAPITAL Z" #x2124)
-    ("OUNCE SIGN" #x2125)
-    ("OHM SIGN" #x2126)
-    ("INVERTED OHM SIGN" #x2127)
-    ("BLACK-LETTER CAPITAL Z" #x2128)
-    ("TURNED GREEK SMALL LETTER IOTA" #x2129)
-    ("KELVIN SIGN" #x212A)
-    ("ANGSTROM SIGN" #x212B)
-    ("SCRIPT CAPITAL B" #x212C)
-    ("BLACK-LETTER CAPITAL C" #x212D)
-    ("ESTIMATED SYMBOL" #x212E)
-    ("SCRIPT SMALL E" #x212F)
-    ("SCRIPT CAPITAL E" #x2130)
-    ("SCRIPT CAPITAL F" #x2131)
-    ("TURNED CAPITAL F" #x2132)
-    ("SCRIPT CAPITAL M" #x2133)
-    ("SCRIPT SMALL O" #x2134)
-    ("ALEF SYMBOL" #x2135)
-    ("BET SYMBOL" #x2136)
-    ("GIMEL SYMBOL" #x2137)
-    ("DALET SYMBOL" #x2138)
-    ("INFORMATION SOURCE" #x2139)
-    ("ROTATED CAPITAL Q" #x213A)
-    ("DOUBLE-STRUCK SMALL GAMMA" #x213D)
-    ("DOUBLE-STRUCK CAPITAL GAMMA" #x213E)
-    ("DOUBLE-STRUCK CAPITAL PI" #x213F)
-    ("DOUBLE-STRUCK N-ARY SUMMATION" #x2140)
-    ("TURNED SANS-SERIF CAPITAL G" #x2141)
-    ("TURNED SANS-SERIF CAPITAL L" #x2142)
-    ("REVERSED SANS-SERIF CAPITAL L" #x2143)
-    ("TURNED SANS-SERIF CAPITAL Y" #x2144)
-    ("DOUBLE-STRUCK ITALIC CAPITAL D" #x2145)
-    ("DOUBLE-STRUCK ITALIC SMALL D" #x2146)
-    ("DOUBLE-STRUCK ITALIC SMALL E" #x2147)
-    ("DOUBLE-STRUCK ITALIC SMALL I" #x2148)
-    ("DOUBLE-STRUCK ITALIC SMALL J" #x2149)
-    ("PROPERTY LINE" #x214A)
-    ("TURNED AMPERSAND" #x214B)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02150-0218F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02150-0218F.el
deleted file mode 100644
index 4300c49780..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02150-0218F.el
+++ /dev/null
@@ -1,51 +0,0 @@
-(nxml-define-char-name-set 'number-forms
-  '(("VULGAR FRACTION ONE THIRD" #x2153)
-    ("VULGAR FRACTION TWO THIRDS" #x2154)
-    ("VULGAR FRACTION ONE FIFTH" #x2155)
-    ("VULGAR FRACTION TWO FIFTHS" #x2156)
-    ("VULGAR FRACTION THREE FIFTHS" #x2157)
-    ("VULGAR FRACTION FOUR FIFTHS" #x2158)
-    ("VULGAR FRACTION ONE SIXTH" #x2159)
-    ("VULGAR FRACTION FIVE SIXTHS" #x215A)
-    ("VULGAR FRACTION ONE EIGHTH" #x215B)
-    ("VULGAR FRACTION THREE EIGHTHS" #x215C)
-    ("VULGAR FRACTION FIVE EIGHTHS" #x215D)
-    ("VULGAR FRACTION SEVEN EIGHTHS" #x215E)
-    ("FRACTION NUMERATOR ONE" #x215F)
-    ("ROMAN NUMERAL ONE" #x2160)
-    ("ROMAN NUMERAL TWO" #x2161)
-    ("ROMAN NUMERAL THREE" #x2162)
-    ("ROMAN NUMERAL FOUR" #x2163)
-    ("ROMAN NUMERAL FIVE" #x2164)
-    ("ROMAN NUMERAL SIX" #x2165)
-    ("ROMAN NUMERAL SEVEN" #x2166)
-    ("ROMAN NUMERAL EIGHT" #x2167)
-    ("ROMAN NUMERAL NINE" #x2168)
-    ("ROMAN NUMERAL TEN" #x2169)
-    ("ROMAN NUMERAL ELEVEN" #x216A)
-    ("ROMAN NUMERAL TWELVE" #x216B)
-    ("ROMAN NUMERAL FIFTY" #x216C)
-    ("ROMAN NUMERAL ONE HUNDRED" #x216D)
-    ("ROMAN NUMERAL FIVE HUNDRED" #x216E)
-    ("ROMAN NUMERAL ONE THOUSAND" #x216F)
-    ("SMALL ROMAN NUMERAL ONE" #x2170)
-    ("SMALL ROMAN NUMERAL TWO" #x2171)
-    ("SMALL ROMAN NUMERAL THREE" #x2172)
-    ("SMALL ROMAN NUMERAL FOUR" #x2173)
-    ("SMALL ROMAN NUMERAL FIVE" #x2174)
-    ("SMALL ROMAN NUMERAL SIX" #x2175)
-    ("SMALL ROMAN NUMERAL SEVEN" #x2176)
-    ("SMALL ROMAN NUMERAL EIGHT" #x2177)
-    ("SMALL ROMAN NUMERAL NINE" #x2178)
-    ("SMALL ROMAN NUMERAL TEN" #x2179)
-    ("SMALL ROMAN NUMERAL ELEVEN" #x217A)
-    ("SMALL ROMAN NUMERAL TWELVE" #x217B)
-    ("SMALL ROMAN NUMERAL FIFTY" #x217C)
-    ("SMALL ROMAN NUMERAL ONE HUNDRED" #x217D)
-    ("SMALL ROMAN NUMERAL FIVE HUNDRED" #x217E)
-    ("SMALL ROMAN NUMERAL ONE THOUSAND" #x217F)
-    ("ROMAN NUMERAL ONE THOUSAND C D" #x2180)
-    ("ROMAN NUMERAL FIVE THOUSAND" #x2181)
-    ("ROMAN NUMERAL TEN THOUSAND" #x2182)
-    ("ROMAN NUMERAL REVERSED ONE HUNDRED" #x2183)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02190-021FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02190-021FF.el
deleted file mode 100644
index 88989ed7b6..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02190-021FF.el
+++ /dev/null
@@ -1,114 +0,0 @@
-(nxml-define-char-name-set 'arrows
-  '(("LEFTWARDS ARROW" #x2190)
-    ("UPWARDS ARROW" #x2191)
-    ("RIGHTWARDS ARROW" #x2192)
-    ("DOWNWARDS ARROW" #x2193)
-    ("LEFT RIGHT ARROW" #x2194)
-    ("UP DOWN ARROW" #x2195)
-    ("NORTH WEST ARROW" #x2196)
-    ("NORTH EAST ARROW" #x2197)
-    ("SOUTH EAST ARROW" #x2198)
-    ("SOUTH WEST ARROW" #x2199)
-    ("LEFTWARDS ARROW WITH STROKE" #x219A)
-    ("RIGHTWARDS ARROW WITH STROKE" #x219B)
-    ("LEFTWARDS WAVE ARROW" #x219C)
-    ("RIGHTWARDS WAVE ARROW" #x219D)
-    ("LEFTWARDS TWO HEADED ARROW" #x219E)
-    ("UPWARDS TWO HEADED ARROW" #x219F)
-    ("RIGHTWARDS TWO HEADED ARROW" #x21A0)
-    ("DOWNWARDS TWO HEADED ARROW" #x21A1)
-    ("LEFTWARDS ARROW WITH TAIL" #x21A2)
-    ("RIGHTWARDS ARROW WITH TAIL" #x21A3)
-    ("LEFTWARDS ARROW FROM BAR" #x21A4)
-    ("UPWARDS ARROW FROM BAR" #x21A5)
-    ("RIGHTWARDS ARROW FROM BAR" #x21A6)
-    ("DOWNWARDS ARROW FROM BAR" #x21A7)
-    ("UP DOWN ARROW WITH BASE" #x21A8)
-    ("LEFTWARDS ARROW WITH HOOK" #x21A9)
-    ("RIGHTWARDS ARROW WITH HOOK" #x21AA)
-    ("LEFTWARDS ARROW WITH LOOP" #x21AB)
-    ("RIGHTWARDS ARROW WITH LOOP" #x21AC)
-    ("LEFT RIGHT WAVE ARROW" #x21AD)
-    ("LEFT RIGHT ARROW WITH STROKE" #x21AE)
-    ("DOWNWARDS ZIGZAG ARROW" #x21AF)
-    ("UPWARDS ARROW WITH TIP LEFTWARDS" #x21B0)
-    ("UPWARDS ARROW WITH TIP RIGHTWARDS" #x21B1)
-    ("DOWNWARDS ARROW WITH TIP LEFTWARDS" #x21B2)
-    ("DOWNWARDS ARROW WITH TIP RIGHTWARDS" #x21B3)
-    ("RIGHTWARDS ARROW WITH CORNER DOWNWARDS" #x21B4)
-    ("DOWNWARDS ARROW WITH CORNER LEFTWARDS" #x21B5)
-    ("ANTICLOCKWISE TOP SEMICIRCLE ARROW" #x21B6)
-    ("CLOCKWISE TOP SEMICIRCLE ARROW" #x21B7)
-    ("NORTH WEST ARROW TO LONG BAR" #x21B8)
-    ("LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR" #x21B9)
-    ("ANTICLOCKWISE OPEN CIRCLE ARROW" #x21BA)
-    ("CLOCKWISE OPEN CIRCLE ARROW" #x21BB)
-    ("LEFTWARDS HARPOON WITH BARB UPWARDS" #x21BC)
-    ("LEFTWARDS HARPOON WITH BARB DOWNWARDS" #x21BD)
-    ("UPWARDS HARPOON WITH BARB RIGHTWARDS" #x21BE)
-    ("UPWARDS HARPOON WITH BARB LEFTWARDS" #x21BF)
-    ("RIGHTWARDS HARPOON WITH BARB UPWARDS" #x21C0)
-    ("RIGHTWARDS HARPOON WITH BARB DOWNWARDS" #x21C1)
-    ("DOWNWARDS HARPOON WITH BARB RIGHTWARDS" #x21C2)
-    ("DOWNWARDS HARPOON WITH BARB LEFTWARDS" #x21C3)
-    ("RIGHTWARDS ARROW OVER LEFTWARDS ARROW" #x21C4)
-    ("UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW" #x21C5)
-    ("LEFTWARDS ARROW OVER RIGHTWARDS ARROW" #x21C6)
-    ("LEFTWARDS PAIRED ARROWS" #x21C7)
-    ("UPWARDS PAIRED ARROWS" #x21C8)
-    ("RIGHTWARDS PAIRED ARROWS" #x21C9)
-    ("DOWNWARDS PAIRED ARROWS" #x21CA)
-    ("LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON" #x21CB)
-    ("RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON" #x21CC)
-    ("LEFTWARDS DOUBLE ARROW WITH STROKE" #x21CD)
-    ("LEFT RIGHT DOUBLE ARROW WITH STROKE" #x21CE)
-    ("RIGHTWARDS DOUBLE ARROW WITH STROKE" #x21CF)
-    ("LEFTWARDS DOUBLE ARROW" #x21D0)
-    ("UPWARDS DOUBLE ARROW" #x21D1)
-    ("RIGHTWARDS DOUBLE ARROW" #x21D2)
-    ("DOWNWARDS DOUBLE ARROW" #x21D3)
-    ("LEFT RIGHT DOUBLE ARROW" #x21D4)
-    ("UP DOWN DOUBLE ARROW" #x21D5)
-    ("NORTH WEST DOUBLE ARROW" #x21D6)
-    ("NORTH EAST DOUBLE ARROW" #x21D7)
-    ("SOUTH EAST DOUBLE ARROW" #x21D8)
-    ("SOUTH WEST DOUBLE ARROW" #x21D9)
-    ("LEFTWARDS TRIPLE ARROW" #x21DA)
-    ("RIGHTWARDS TRIPLE ARROW" #x21DB)
-    ("LEFTWARDS SQUIGGLE ARROW" #x21DC)
-    ("RIGHTWARDS SQUIGGLE ARROW" #x21DD)
-    ("UPWARDS ARROW WITH DOUBLE STROKE" #x21DE)
-    ("DOWNWARDS ARROW WITH DOUBLE STROKE" #x21DF)
-    ("LEFTWARDS DASHED ARROW" #x21E0)
-    ("UPWARDS DASHED ARROW" #x21E1)
-    ("RIGHTWARDS DASHED ARROW" #x21E2)
-    ("DOWNWARDS DASHED ARROW" #x21E3)
-    ("LEFTWARDS ARROW TO BAR" #x21E4)
-    ("RIGHTWARDS ARROW TO BAR" #x21E5)
-    ("LEFTWARDS WHITE ARROW" #x21E6)
-    ("UPWARDS WHITE ARROW" #x21E7)
-    ("RIGHTWARDS WHITE ARROW" #x21E8)
-    ("DOWNWARDS WHITE ARROW" #x21E9)
-    ("UPWARDS WHITE ARROW FROM BAR" #x21EA)
-    ("UPWARDS WHITE ARROW ON PEDESTAL" #x21EB)
-    ("UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR" #x21EC)
-    ("UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR" #x21ED)
-    ("UPWARDS WHITE DOUBLE ARROW" #x21EE)
-    ("UPWARDS WHITE DOUBLE ARROW ON PEDESTAL" #x21EF)
-    ("RIGHTWARDS WHITE ARROW FROM WALL" #x21F0)
-    ("NORTH WEST ARROW TO CORNER" #x21F1)
-    ("SOUTH EAST ARROW TO CORNER" #x21F2)
-    ("UP DOWN WHITE ARROW" #x21F3)
-    ("RIGHT ARROW WITH SMALL CIRCLE" #x21F4)
-    ("DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW" #x21F5)
-    ("THREE RIGHTWARDS ARROWS" #x21F6)
-    ("LEFTWARDS ARROW WITH VERTICAL STROKE" #x21F7)
-    ("RIGHTWARDS ARROW WITH VERTICAL STROKE" #x21F8)
-    ("LEFT RIGHT ARROW WITH VERTICAL STROKE" #x21F9)
-    ("LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE" #x21FA)
-    ("RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE" #x21FB)
-    ("LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE" #x21FC)
-    ("LEFTWARDS OPEN-HEADED ARROW" #x21FD)
-    ("RIGHTWARDS OPEN-HEADED ARROW" #x21FE)
-    ("LEFT RIGHT OPEN-HEADED ARROW" #x21FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02200-022FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02200-022FF.el
deleted file mode 100644
index a28f77853d..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02200-022FF.el
+++ /dev/null
@@ -1,258 +0,0 @@
-(nxml-define-char-name-set 'mathematical-operators
-  '(("FOR ALL" #x2200)
-    ("COMPLEMENT" #x2201)
-    ("PARTIAL DIFFERENTIAL" #x2202)
-    ("THERE EXISTS" #x2203)
-    ("THERE DOES NOT EXIST" #x2204)
-    ("EMPTY SET" #x2205)
-    ("INCREMENT" #x2206)
-    ("NABLA" #x2207)
-    ("ELEMENT OF" #x2208)
-    ("NOT AN ELEMENT OF" #x2209)
-    ("SMALL ELEMENT OF" #x220A)
-    ("CONTAINS AS MEMBER" #x220B)
-    ("DOES NOT CONTAIN AS MEMBER" #x220C)
-    ("SMALL CONTAINS AS MEMBER" #x220D)
-    ("END OF PROOF" #x220E)
-    ("N-ARY PRODUCT" #x220F)
-    ("N-ARY COPRODUCT" #x2210)
-    ("N-ARY SUMMATION" #x2211)
-    ("MINUS SIGN" #x2212)
-    ("MINUS-OR-PLUS SIGN" #x2213)
-    ("DOT PLUS" #x2214)
-    ("DIVISION SLASH" #x2215)
-    ("SET MINUS" #x2216)
-    ("ASTERISK OPERATOR" #x2217)
-    ("RING OPERATOR" #x2218)
-    ("BULLET OPERATOR" #x2219)
-    ("SQUARE ROOT" #x221A)
-    ("CUBE ROOT" #x221B)
-    ("FOURTH ROOT" #x221C)
-    ("PROPORTIONAL TO" #x221D)
-    ("INFINITY" #x221E)
-    ("RIGHT ANGLE" #x221F)
-    ("ANGLE" #x2220)
-    ("MEASURED ANGLE" #x2221)
-    ("SPHERICAL ANGLE" #x2222)
-    ("DIVIDES" #x2223)
-    ("DOES NOT DIVIDE" #x2224)
-    ("PARALLEL TO" #x2225)
-    ("NOT PARALLEL TO" #x2226)
-    ("LOGICAL AND" #x2227)
-    ("LOGICAL OR" #x2228)
-    ("INTERSECTION" #x2229)
-    ("UNION" #x222A)
-    ("INTEGRAL" #x222B)
-    ("DOUBLE INTEGRAL" #x222C)
-    ("TRIPLE INTEGRAL" #x222D)
-    ("CONTOUR INTEGRAL" #x222E)
-    ("SURFACE INTEGRAL" #x222F)
-    ("VOLUME INTEGRAL" #x2230)
-    ("CLOCKWISE INTEGRAL" #x2231)
-    ("CLOCKWISE CONTOUR INTEGRAL" #x2232)
-    ("ANTICLOCKWISE CONTOUR INTEGRAL" #x2233)
-    ("THEREFORE" #x2234)
-    ("BECAUSE" #x2235)
-    ("RATIO" #x2236)
-    ("PROPORTION" #x2237)
-    ("DOT MINUS" #x2238)
-    ("EXCESS" #x2239)
-    ("GEOMETRIC PROPORTION" #x223A)
-    ("HOMOTHETIC" #x223B)
-    ("TILDE OPERATOR" #x223C)
-    ("REVERSED TILDE" #x223D)
-    ("INVERTED LAZY S" #x223E)
-    ("SINE WAVE" #x223F)
-    ("WREATH PRODUCT" #x2240)
-    ("NOT TILDE" #x2241)
-    ("MINUS TILDE" #x2242)
-    ("ASYMPTOTICALLY EQUAL TO" #x2243)
-    ("NOT ASYMPTOTICALLY EQUAL TO" #x2244)
-    ("APPROXIMATELY EQUAL TO" #x2245)
-    ("APPROXIMATELY BUT NOT ACTUALLY EQUAL TO" #x2246)
-    ("NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO" #x2247)
-    ("ALMOST EQUAL TO" #x2248)
-    ("NOT ALMOST EQUAL TO" #x2249)
-    ("ALMOST EQUAL OR EQUAL TO" #x224A)
-    ("TRIPLE TILDE" #x224B)
-    ("ALL EQUAL TO" #x224C)
-    ("EQUIVALENT TO" #x224D)
-    ("GEOMETRICALLY EQUIVALENT TO" #x224E)
-    ("DIFFERENCE BETWEEN" #x224F)
-    ("APPROACHES THE LIMIT" #x2250)
-    ("GEOMETRICALLY EQUAL TO" #x2251)
-    ("APPROXIMATELY EQUAL TO OR THE IMAGE OF" #x2252)
-    ("IMAGE OF OR APPROXIMATELY EQUAL TO" #x2253)
-    ("COLON EQUALS" #x2254)
-    ("EQUALS COLON" #x2255)
-    ("RING IN EQUAL TO" #x2256)
-    ("RING EQUAL TO" #x2257)
-    ("CORRESPONDS TO" #x2258)
-    ("ESTIMATES" #x2259)
-    ("EQUIANGULAR TO" #x225A)
-    ("STAR EQUALS" #x225B)
-    ("DELTA EQUAL TO" #x225C)
-    ("EQUAL TO BY DEFINITION" #x225D)
-    ("MEASURED BY" #x225E)
-    ("QUESTIONED EQUAL TO" #x225F)
-    ("NOT EQUAL TO" #x2260)
-    ("IDENTICAL TO" #x2261)
-    ("NOT IDENTICAL TO" #x2262)
-    ("STRICTLY EQUIVALENT TO" #x2263)
-    ("LESS-THAN OR EQUAL TO" #x2264)
-    ("GREATER-THAN OR EQUAL TO" #x2265)
-    ("LESS-THAN OVER EQUAL TO" #x2266)
-    ("GREATER-THAN OVER EQUAL TO" #x2267)
-    ("LESS-THAN BUT NOT EQUAL TO" #x2268)
-    ("GREATER-THAN BUT NOT EQUAL TO" #x2269)
-    ("MUCH LESS-THAN" #x226A)
-    ("MUCH GREATER-THAN" #x226B)
-    ("BETWEEN" #x226C)
-    ("NOT EQUIVALENT TO" #x226D)
-    ("NOT LESS-THAN" #x226E)
-    ("NOT GREATER-THAN" #x226F)
-    ("NEITHER LESS-THAN NOR EQUAL TO" #x2270)
-    ("NEITHER GREATER-THAN NOR EQUAL TO" #x2271)
-    ("LESS-THAN OR EQUIVALENT TO" #x2272)
-    ("GREATER-THAN OR EQUIVALENT TO" #x2273)
-    ("NEITHER LESS-THAN NOR EQUIVALENT TO" #x2274)
-    ("NEITHER GREATER-THAN NOR EQUIVALENT TO" #x2275)
-    ("LESS-THAN OR GREATER-THAN" #x2276)
-    ("GREATER-THAN OR LESS-THAN" #x2277)
-    ("NEITHER LESS-THAN NOR GREATER-THAN" #x2278)
-    ("NEITHER GREATER-THAN NOR LESS-THAN" #x2279)
-    ("PRECEDES" #x227A)
-    ("SUCCEEDS" #x227B)
-    ("PRECEDES OR EQUAL TO" #x227C)
-    ("SUCCEEDS OR EQUAL TO" #x227D)
-    ("PRECEDES OR EQUIVALENT TO" #x227E)
-    ("SUCCEEDS OR EQUIVALENT TO" #x227F)
-    ("DOES NOT PRECEDE" #x2280)
-    ("DOES NOT SUCCEED" #x2281)
-    ("SUBSET OF" #x2282)
-    ("SUPERSET OF" #x2283)
-    ("NOT A SUBSET OF" #x2284)
-    ("NOT A SUPERSET OF" #x2285)
-    ("SUBSET OF OR EQUAL TO" #x2286)
-    ("SUPERSET OF OR EQUAL TO" #x2287)
-    ("NEITHER A SUBSET OF NOR EQUAL TO" #x2288)
-    ("NEITHER A SUPERSET OF NOR EQUAL TO" #x2289)
-    ("SUBSET OF WITH NOT EQUAL TO" #x228A)
-    ("SUPERSET OF WITH NOT EQUAL TO" #x228B)
-    ("MULTISET" #x228C)
-    ("MULTISET MULTIPLICATION" #x228D)
-    ("MULTISET UNION" #x228E)
-    ("SQUARE IMAGE OF" #x228F)
-    ("SQUARE ORIGINAL OF" #x2290)
-    ("SQUARE IMAGE OF OR EQUAL TO" #x2291)
-    ("SQUARE ORIGINAL OF OR EQUAL TO" #x2292)
-    ("SQUARE CAP" #x2293)
-    ("SQUARE CUP" #x2294)
-    ("CIRCLED PLUS" #x2295)
-    ("CIRCLED MINUS" #x2296)
-    ("CIRCLED TIMES" #x2297)
-    ("CIRCLED DIVISION SLASH" #x2298)
-    ("CIRCLED DOT OPERATOR" #x2299)
-    ("CIRCLED RING OPERATOR" #x229A)
-    ("CIRCLED ASTERISK OPERATOR" #x229B)
-    ("CIRCLED EQUALS" #x229C)
-    ("CIRCLED DASH" #x229D)
-    ("SQUARED PLUS" #x229E)
-    ("SQUARED MINUS" #x229F)
-    ("SQUARED TIMES" #x22A0)
-    ("SQUARED DOT OPERATOR" #x22A1)
-    ("RIGHT TACK" #x22A2)
-    ("LEFT TACK" #x22A3)
-    ("DOWN TACK" #x22A4)
-    ("UP TACK" #x22A5)
-    ("ASSERTION" #x22A6)
-    ("MODELS" #x22A7)
-    ("TRUE" #x22A8)
-    ("FORCES" #x22A9)
-    ("TRIPLE VERTICAL BAR RIGHT TURNSTILE" #x22AA)
-    ("DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE" #x22AB)
-    ("DOES NOT PROVE" #x22AC)
-    ("NOT TRUE" #x22AD)
-    ("DOES NOT FORCE" #x22AE)
-    ("NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE" #x22AF)
-    ("PRECEDES UNDER RELATION" #x22B0)
-    ("SUCCEEDS UNDER RELATION" #x22B1)
-    ("NORMAL SUBGROUP OF" #x22B2)
-    ("CONTAINS AS NORMAL SUBGROUP" #x22B3)
-    ("NORMAL SUBGROUP OF OR EQUAL TO" #x22B4)
-    ("CONTAINS AS NORMAL SUBGROUP OR EQUAL TO" #x22B5)
-    ("ORIGINAL OF" #x22B6)
-    ("IMAGE OF" #x22B7)
-    ("MULTIMAP" #x22B8)
-    ("HERMITIAN CONJUGATE MATRIX" #x22B9)
-    ("INTERCALATE" #x22BA)
-    ("XOR" #x22BB)
-    ("NAND" #x22BC)
-    ("NOR" #x22BD)
-    ("RIGHT ANGLE WITH ARC" #x22BE)
-    ("RIGHT TRIANGLE" #x22BF)
-    ("N-ARY LOGICAL AND" #x22C0)
-    ("N-ARY LOGICAL OR" #x22C1)
-    ("N-ARY INTERSECTION" #x22C2)
-    ("N-ARY UNION" #x22C3)
-    ("DIAMOND OPERATOR" #x22C4)
-    ("DOT OPERATOR" #x22C5)
-    ("STAR OPERATOR" #x22C6)
-    ("DIVISION TIMES" #x22C7)
-    ("BOWTIE" #x22C8)
-    ("LEFT NORMAL FACTOR SEMIDIRECT PRODUCT" #x22C9)
-    ("RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT" #x22CA)
-    ("LEFT SEMIDIRECT PRODUCT" #x22CB)
-    ("RIGHT SEMIDIRECT PRODUCT" #x22CC)
-    ("REVERSED TILDE EQUALS" #x22CD)
-    ("CURLY LOGICAL OR" #x22CE)
-    ("CURLY LOGICAL AND" #x22CF)
-    ("DOUBLE SUBSET" #x22D0)
-    ("DOUBLE SUPERSET" #x22D1)
-    ("DOUBLE INTERSECTION" #x22D2)
-    ("DOUBLE UNION" #x22D3)
-    ("PITCHFORK" #x22D4)
-    ("EQUAL AND PARALLEL TO" #x22D5)
-    ("LESS-THAN WITH DOT" #x22D6)
-    ("GREATER-THAN WITH DOT" #x22D7)
-    ("VERY MUCH LESS-THAN" #x22D8)
-    ("VERY MUCH GREATER-THAN" #x22D9)
-    ("LESS-THAN EQUAL TO OR GREATER-THAN" #x22DA)
-    ("GREATER-THAN EQUAL TO OR LESS-THAN" #x22DB)
-    ("EQUAL TO OR LESS-THAN" #x22DC)
-    ("EQUAL TO OR GREATER-THAN" #x22DD)
-    ("EQUAL TO OR PRECEDES" #x22DE)
-    ("EQUAL TO OR SUCCEEDS" #x22DF)
-    ("DOES NOT PRECEDE OR EQUAL" #x22E0)
-    ("DOES NOT SUCCEED OR EQUAL" #x22E1)
-    ("NOT SQUARE IMAGE OF OR EQUAL TO" #x22E2)
-    ("NOT SQUARE ORIGINAL OF OR EQUAL TO" #x22E3)
-    ("SQUARE IMAGE OF OR NOT EQUAL TO" #x22E4)
-    ("SQUARE ORIGINAL OF OR NOT EQUAL TO" #x22E5)
-    ("LESS-THAN BUT NOT EQUIVALENT TO" #x22E6)
-    ("GREATER-THAN BUT NOT EQUIVALENT TO" #x22E7)
-    ("PRECEDES BUT NOT EQUIVALENT TO" #x22E8)
-    ("SUCCEEDS BUT NOT EQUIVALENT TO" #x22E9)
-    ("NOT NORMAL SUBGROUP OF" #x22EA)
-    ("DOES NOT CONTAIN AS NORMAL SUBGROUP" #x22EB)
-    ("NOT NORMAL SUBGROUP OF OR EQUAL TO" #x22EC)
-    ("DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL" #x22ED)
-    ("VERTICAL ELLIPSIS" #x22EE)
-    ("MIDLINE HORIZONTAL ELLIPSIS" #x22EF)
-    ("UP RIGHT DIAGONAL ELLIPSIS" #x22F0)
-    ("DOWN RIGHT DIAGONAL ELLIPSIS" #x22F1)
-    ("ELEMENT OF WITH LONG HORIZONTAL STROKE" #x22F2)
-    ("ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE" #x22F3)
-    ("SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE" #x22F4)
-    ("ELEMENT OF WITH DOT ABOVE" #x22F5)
-    ("ELEMENT OF WITH OVERBAR" #x22F6)
-    ("SMALL ELEMENT OF WITH OVERBAR" #x22F7)
-    ("ELEMENT OF WITH UNDERBAR" #x22F8)
-    ("ELEMENT OF WITH TWO HORIZONTAL STROKES" #x22F9)
-    ("CONTAINS WITH LONG HORIZONTAL STROKE" #x22FA)
-    ("CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE" #x22FB)
-    ("SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE" #x22FC)
-    ("CONTAINS WITH OVERBAR" #x22FD)
-    ("SMALL CONTAINS WITH OVERBAR" #x22FE)
-    ("Z NOTATION BAG MEMBERSHIP" #x22FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02300-023FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02300-023FF.el
deleted file mode 100644
index a255894831..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02300-023FF.el
+++ /dev/null
@@ -1,209 +0,0 @@
-(nxml-define-char-name-set 'miscellaneous-technical
-  '(("DIAMETER SIGN" #x2300)
-    ("ELECTRIC ARROW" #x2301)
-    ("HOUSE" #x2302)
-    ("UP ARROWHEAD" #x2303)
-    ("DOWN ARROWHEAD" #x2304)
-    ("PROJECTIVE" #x2305)
-    ("PERSPECTIVE" #x2306)
-    ("WAVY LINE" #x2307)
-    ("LEFT CEILING" #x2308)
-    ("RIGHT CEILING" #x2309)
-    ("LEFT FLOOR" #x230A)
-    ("RIGHT FLOOR" #x230B)
-    ("BOTTOM RIGHT CROP" #x230C)
-    ("BOTTOM LEFT CROP" #x230D)
-    ("TOP RIGHT CROP" #x230E)
-    ("TOP LEFT CROP" #x230F)
-    ("REVERSED NOT SIGN" #x2310)
-    ("SQUARE LOZENGE" #x2311)
-    ("ARC" #x2312)
-    ("SEGMENT" #x2313)
-    ("SECTOR" #x2314)
-    ("TELEPHONE RECORDER" #x2315)
-    ("POSITION INDICATOR" #x2316)
-    ("VIEWDATA SQUARE" #x2317)
-    ("PLACE OF INTEREST SIGN" #x2318)
-    ("TURNED NOT SIGN" #x2319)
-    ("WATCH" #x231A)
-    ("HOURGLASS" #x231B)
-    ("TOP LEFT CORNER" #x231C)
-    ("TOP RIGHT CORNER" #x231D)
-    ("BOTTOM LEFT CORNER" #x231E)
-    ("BOTTOM RIGHT CORNER" #x231F)
-    ("TOP HALF INTEGRAL" #x2320)
-    ("BOTTOM HALF INTEGRAL" #x2321)
-    ("FROWN" #x2322)
-    ("SMILE" #x2323)
-    ("UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS" #x2324)
-    ("OPTION KEY" #x2325)
-    ("ERASE TO THE RIGHT" #x2326)
-    ("X IN A RECTANGLE BOX" #x2327)
-    ("KEYBOARD" #x2328)
-    ("LEFT-POINTING ANGLE BRACKET" #x2329)
-    ("RIGHT-POINTING ANGLE BRACKET" #x232A)
-    ("ERASE TO THE LEFT" #x232B)
-    ("BENZENE RING" #x232C)
-    ("CYLINDRICITY" #x232D)
-    ("ALL AROUND-PROFILE" #x232E)
-    ("SYMMETRY" #x232F)
-    ("TOTAL RUNOUT" #x2330)
-    ("DIMENSION ORIGIN" #x2331)
-    ("CONICAL TAPER" #x2332)
-    ("SLOPE" #x2333)
-    ("COUNTERBORE" #x2334)
-    ("COUNTERSINK" #x2335)
-    ("APL FUNCTIONAL SYMBOL I-BEAM" #x2336)
-    ("APL FUNCTIONAL SYMBOL SQUISH QUAD" #x2337)
-    ("APL FUNCTIONAL SYMBOL QUAD EQUAL" #x2338)
-    ("APL FUNCTIONAL SYMBOL QUAD DIVIDE" #x2339)
-    ("APL FUNCTIONAL SYMBOL QUAD DIAMOND" #x233A)
-    ("APL FUNCTIONAL SYMBOL QUAD JOT" #x233B)
-    ("APL FUNCTIONAL SYMBOL QUAD CIRCLE" #x233C)
-    ("APL FUNCTIONAL SYMBOL CIRCLE STILE" #x233D)
-    ("APL FUNCTIONAL SYMBOL CIRCLE JOT" #x233E)
-    ("APL FUNCTIONAL SYMBOL SLASH BAR" #x233F)
-    ("APL FUNCTIONAL SYMBOL BACKSLASH BAR" #x2340)
-    ("APL FUNCTIONAL SYMBOL QUAD SLASH" #x2341)
-    ("APL FUNCTIONAL SYMBOL QUAD BACKSLASH" #x2342)
-    ("APL FUNCTIONAL SYMBOL QUAD LESS-THAN" #x2343)
-    ("APL FUNCTIONAL SYMBOL QUAD GREATER-THAN" #x2344)
-    ("APL FUNCTIONAL SYMBOL LEFTWARDS VANE" #x2345)
-    ("APL FUNCTIONAL SYMBOL RIGHTWARDS VANE" #x2346)
-    ("APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW" #x2347)
-    ("APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW" #x2348)
-    ("APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH" #x2349)
-    ("APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR" #x234A)
-    ("APL FUNCTIONAL SYMBOL DELTA STILE" #x234B)
-    ("APL FUNCTIONAL SYMBOL QUAD DOWN CARET" #x234C)
-    ("APL FUNCTIONAL SYMBOL QUAD DELTA" #x234D)
-    ("APL FUNCTIONAL SYMBOL DOWN TACK JOT" #x234E)
-    ("APL FUNCTIONAL SYMBOL UPWARDS VANE" #x234F)
-    ("APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW" #x2350)
-    ("APL FUNCTIONAL SYMBOL UP TACK OVERBAR" #x2351)
-    ("APL FUNCTIONAL SYMBOL DEL STILE" #x2352)
-    ("APL FUNCTIONAL SYMBOL QUAD UP CARET" #x2353)
-    ("APL FUNCTIONAL SYMBOL QUAD DEL" #x2354)
-    ("APL FUNCTIONAL SYMBOL UP TACK JOT" #x2355)
-    ("APL FUNCTIONAL SYMBOL DOWNWARDS VANE" #x2356)
-    ("APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW" #x2357)
-    ("APL FUNCTIONAL SYMBOL QUOTE UNDERBAR" #x2358)
-    ("APL FUNCTIONAL SYMBOL DELTA UNDERBAR" #x2359)
-    ("APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR" #x235A)
-    ("APL FUNCTIONAL SYMBOL JOT UNDERBAR" #x235B)
-    ("APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR" #x235C)
-    ("APL FUNCTIONAL SYMBOL UP SHOE JOT" #x235D)
-    ("APL FUNCTIONAL SYMBOL QUOTE QUAD" #x235E)
-    ("APL FUNCTIONAL SYMBOL CIRCLE STAR" #x235F)
-    ("APL FUNCTIONAL SYMBOL QUAD COLON" #x2360)
-    ("APL FUNCTIONAL SYMBOL UP TACK DIAERESIS" #x2361)
-    ("APL FUNCTIONAL SYMBOL DEL DIAERESIS" #x2362)
-    ("APL FUNCTIONAL SYMBOL STAR DIAERESIS" #x2363)
-    ("APL FUNCTIONAL SYMBOL JOT DIAERESIS" #x2364)
-    ("APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS" #x2365)
-    ("APL FUNCTIONAL SYMBOL DOWN SHOE STILE" #x2366)
-    ("APL FUNCTIONAL SYMBOL LEFT SHOE STILE" #x2367)
-    ("APL FUNCTIONAL SYMBOL TILDE DIAERESIS" #x2368)
-    ("APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS" #x2369)
-    ("APL FUNCTIONAL SYMBOL COMMA BAR" #x236A)
-    ("APL FUNCTIONAL SYMBOL DEL TILDE" #x236B)
-    ("APL FUNCTIONAL SYMBOL ZILDE" #x236C)
-    ("APL FUNCTIONAL SYMBOL STILE TILDE" #x236D)
-    ("APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR" #x236E)
-    ("APL FUNCTIONAL SYMBOL QUAD NOT EQUAL" #x236F)
-    ("APL FUNCTIONAL SYMBOL QUAD QUESTION" #x2370)
-    ("APL FUNCTIONAL SYMBOL DOWN CARET TILDE" #x2371)
-    ("APL FUNCTIONAL SYMBOL UP CARET TILDE" #x2372)
-    ("APL FUNCTIONAL SYMBOL IOTA" #x2373)
-    ("APL FUNCTIONAL SYMBOL RHO" #x2374)
-    ("APL FUNCTIONAL SYMBOL OMEGA" #x2375)
-    ("APL FUNCTIONAL SYMBOL ALPHA UNDERBAR" #x2376)
-    ("APL FUNCTIONAL SYMBOL EPSILON UNDERBAR" #x2377)
-    ("APL FUNCTIONAL SYMBOL IOTA UNDERBAR" #x2378)
-    ("APL FUNCTIONAL SYMBOL OMEGA UNDERBAR" #x2379)
-    ("APL FUNCTIONAL SYMBOL ALPHA" #x237A)
-    ("NOT CHECK MARK" #x237B)
-    ("RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW" #x237C)
-    ("SHOULDERED OPEN BOX" #x237D)
-    ("BELL SYMBOL" #x237E)
-    ("VERTICAL LINE WITH MIDDLE DOT" #x237F)
-    ("INSERTION SYMBOL" #x2380)
-    ("CONTINUOUS UNDERLINE SYMBOL" #x2381)
-    ("DISCONTINUOUS UNDERLINE SYMBOL" #x2382)
-    ("EMPHASIS SYMBOL" #x2383)
-    ("COMPOSITION SYMBOL" #x2384)
-    ("WHITE SQUARE WITH CENTRE VERTICAL LINE" #x2385)
-    ("ENTER SYMBOL" #x2386)
-    ("ALTERNATIVE KEY SYMBOL" #x2387)
-    ("HELM SYMBOL" #x2388)
-    ("CIRCLED HORIZONTAL BAR WITH NOTCH" #x2389)
-    ("CIRCLED TRIANGLE DOWN" #x238A)
-    ("BROKEN CIRCLE WITH NORTHWEST ARROW" #x238B)
-    ("UNDO SYMBOL" #x238C)
-    ("MONOSTABLE SYMBOL" #x238D)
-    ("HYSTERESIS SYMBOL" #x238E)
-    ("OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL" #x238F)
-    ("OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL" #x2390)
-    ("PASSIVE-PULL-DOWN-OUTPUT SYMBOL" #x2391)
-    ("PASSIVE-PULL-UP-OUTPUT SYMBOL" #x2392)
-    ("DIRECT CURRENT SYMBOL FORM TWO" #x2393)
-    ("SOFTWARE-FUNCTION SYMBOL" #x2394)
-    ("APL FUNCTIONAL SYMBOL QUAD" #x2395)
-    ("DECIMAL SEPARATOR KEY SYMBOL" #x2396)
-    ("PREVIOUS PAGE" #x2397)
-    ("NEXT PAGE" #x2398)
-    ("PRINT SCREEN SYMBOL" #x2399)
-    ("CLEAR SCREEN SYMBOL" #x239A)
-    ("LEFT PARENTHESIS UPPER HOOK" #x239B)
-    ("LEFT PARENTHESIS EXTENSION" #x239C)
-    ("LEFT PARENTHESIS LOWER HOOK" #x239D)
-    ("RIGHT PARENTHESIS UPPER HOOK" #x239E)
-    ("RIGHT PARENTHESIS EXTENSION" #x239F)
-    ("RIGHT PARENTHESIS LOWER HOOK" #x23A0)
-    ("LEFT SQUARE BRACKET UPPER CORNER" #x23A1)
-    ("LEFT SQUARE BRACKET EXTENSION" #x23A2)
-    ("LEFT SQUARE BRACKET LOWER CORNER" #x23A3)
-    ("RIGHT SQUARE BRACKET UPPER CORNER" #x23A4)
-    ("RIGHT SQUARE BRACKET EXTENSION" #x23A5)
-    ("RIGHT SQUARE BRACKET LOWER CORNER" #x23A6)
-    ("LEFT CURLY BRACKET UPPER HOOK" #x23A7)
-    ("LEFT CURLY BRACKET MIDDLE PIECE" #x23A8)
-    ("LEFT CURLY BRACKET LOWER HOOK" #x23A9)
-    ("CURLY BRACKET EXTENSION" #x23AA)
-    ("RIGHT CURLY BRACKET UPPER HOOK" #x23AB)
-    ("RIGHT CURLY BRACKET MIDDLE PIECE" #x23AC)
-    ("RIGHT CURLY BRACKET LOWER HOOK" #x23AD)
-    ("INTEGRAL EXTENSION" #x23AE)
-    ("HORIZONTAL LINE EXTENSION" #x23AF)
-    ("UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION" #x23B0)
-    ("UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION" #x23B1)
-    ("SUMMATION TOP" #x23B2)
-    ("SUMMATION BOTTOM" #x23B3)
-    ("TOP SQUARE BRACKET" #x23B4)
-    ("BOTTOM SQUARE BRACKET" #x23B5)
-    ("BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET" #x23B6)
-    ("RADICAL SYMBOL BOTTOM" #x23B7)
-    ("LEFT VERTICAL BOX LINE" #x23B8)
-    ("RIGHT VERTICAL BOX LINE" #x23B9)
-    ("HORIZONTAL SCAN LINE-1" #x23BA)
-    ("HORIZONTAL SCAN LINE-3" #x23BB)
-    ("HORIZONTAL SCAN LINE-7" #x23BC)
-    ("HORIZONTAL SCAN LINE-9" #x23BD)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT" #x23BE)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT" #x23BF)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE" #x23C0)
-    ("DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE" #x23C1)
-    ("DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE" #x23C2)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE" #x23C3)
-    ("DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE" #x23C4)
-    ("DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE" #x23C5)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE" #x23C6)
-    ("DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE" #x23C7)
-    ("DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE" #x23C8)
-    ("DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL" #x23C9)
-    ("DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL" #x23CA)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT" #x23CB)
-    ("DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT" #x23CC)
-    ("SQUARE FOOT" #x23CD)
-    ("RETURN SYMBOL" #x23CE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02400-0243F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02400-0243F.el
deleted file mode 100644
index b4cc42640f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02400-0243F.el
+++ /dev/null
@@ -1,41 +0,0 @@
-(nxml-define-char-name-set 'control-pictures
-  '(("SYMBOL FOR NULL" #x2400)
-    ("SYMBOL FOR START OF HEADING" #x2401)
-    ("SYMBOL FOR START OF TEXT" #x2402)
-    ("SYMBOL FOR END OF TEXT" #x2403)
-    ("SYMBOL FOR END OF TRANSMISSION" #x2404)
-    ("SYMBOL FOR ENQUIRY" #x2405)
-    ("SYMBOL FOR ACKNOWLEDGE" #x2406)
-    ("SYMBOL FOR BELL" #x2407)
-    ("SYMBOL FOR BACKSPACE" #x2408)
-    ("SYMBOL FOR HORIZONTAL TABULATION" #x2409)
-    ("SYMBOL FOR LINE FEED" #x240A)
-    ("SYMBOL FOR VERTICAL TABULATION" #x240B)
-    ("SYMBOL FOR FORM FEED" #x240C)
-    ("SYMBOL FOR CARRIAGE RETURN" #x240D)
-    ("SYMBOL FOR SHIFT OUT" #x240E)
-    ("SYMBOL FOR SHIFT IN" #x240F)
-    ("SYMBOL FOR DATA LINK ESCAPE" #x2410)
-    ("SYMBOL FOR DEVICE CONTROL ONE" #x2411)
-    ("SYMBOL FOR DEVICE CONTROL TWO" #x2412)
-    ("SYMBOL FOR DEVICE CONTROL THREE" #x2413)
-    ("SYMBOL FOR DEVICE CONTROL FOUR" #x2414)
-    ("SYMBOL FOR NEGATIVE ACKNOWLEDGE" #x2415)
-    ("SYMBOL FOR SYNCHRONOUS IDLE" #x2416)
-    ("SYMBOL FOR END OF TRANSMISSION BLOCK" #x2417)
-    ("SYMBOL FOR CANCEL" #x2418)
-    ("SYMBOL FOR END OF MEDIUM" #x2419)
-    ("SYMBOL FOR SUBSTITUTE" #x241A)
-    ("SYMBOL FOR ESCAPE" #x241B)
-    ("SYMBOL FOR FILE SEPARATOR" #x241C)
-    ("SYMBOL FOR GROUP SEPARATOR" #x241D)
-    ("SYMBOL FOR RECORD SEPARATOR" #x241E)
-    ("SYMBOL FOR UNIT SEPARATOR" #x241F)
-    ("SYMBOL FOR SPACE" #x2420)
-    ("SYMBOL FOR DELETE" #x2421)
-    ("BLANK SYMBOL" #x2422)
-    ("OPEN BOX" #x2423)
-    ("SYMBOL FOR NEWLINE" #x2424)
-    ("SYMBOL FOR DELETE FORM TWO" #x2425)
-    ("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02440-0245F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02440-0245F.el
deleted file mode 100644
index 332720d71f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02440-0245F.el
+++ /dev/null
@@ -1,13 +0,0 @@
-(nxml-define-char-name-set 'optical-character-recognition
-  '(("OCR HOOK" #x2440)
-    ("OCR CHAIR" #x2441)
-    ("OCR FORK" #x2442)
-    ("OCR INVERTED FORK" #x2443)
-    ("OCR BELT BUCKLE" #x2444)
-    ("OCR BOW TIE" #x2445)
-    ("OCR BRANCH BANK IDENTIFICATION" #x2446)
-    ("OCR AMOUNT OF CHECK" #x2447)
-    ("OCR DASH" #x2448)
-    ("OCR CUSTOMER ACCOUNT NUMBER" #x2449)
-    ("OCR DOUBLE BACKSLASH" #x244A)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02460-024FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02460-024FF.el
deleted file mode 100644
index 41152bff4a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02460-024FF.el
+++ /dev/null
@@ -1,161 +0,0 @@
-(nxml-define-char-name-set 'enclosed-alphanumerics
-  '(("CIRCLED DIGIT ONE" #x2460)
-    ("CIRCLED DIGIT TWO" #x2461)
-    ("CIRCLED DIGIT THREE" #x2462)
-    ("CIRCLED DIGIT FOUR" #x2463)
-    ("CIRCLED DIGIT FIVE" #x2464)
-    ("CIRCLED DIGIT SIX" #x2465)
-    ("CIRCLED DIGIT SEVEN" #x2466)
-    ("CIRCLED DIGIT EIGHT" #x2467)
-    ("CIRCLED DIGIT NINE" #x2468)
-    ("CIRCLED NUMBER TEN" #x2469)
-    ("CIRCLED NUMBER ELEVEN" #x246A)
-    ("CIRCLED NUMBER TWELVE" #x246B)
-    ("CIRCLED NUMBER THIRTEEN" #x246C)
-    ("CIRCLED NUMBER FOURTEEN" #x246D)
-    ("CIRCLED NUMBER FIFTEEN" #x246E)
-    ("CIRCLED NUMBER SIXTEEN" #x246F)
-    ("CIRCLED NUMBER SEVENTEEN" #x2470)
-    ("CIRCLED NUMBER EIGHTEEN" #x2471)
-    ("CIRCLED NUMBER NINETEEN" #x2472)
-    ("CIRCLED NUMBER TWENTY" #x2473)
-    ("PARENTHESIZED DIGIT ONE" #x2474)
-    ("PARENTHESIZED DIGIT TWO" #x2475)
-    ("PARENTHESIZED DIGIT THREE" #x2476)
-    ("PARENTHESIZED DIGIT FOUR" #x2477)
-    ("PARENTHESIZED DIGIT FIVE" #x2478)
-    ("PARENTHESIZED DIGIT SIX" #x2479)
-    ("PARENTHESIZED DIGIT SEVEN" #x247A)
-    ("PARENTHESIZED DIGIT EIGHT" #x247B)
-    ("PARENTHESIZED DIGIT NINE" #x247C)
-    ("PARENTHESIZED NUMBER TEN" #x247D)
-    ("PARENTHESIZED NUMBER ELEVEN" #x247E)
-    ("PARENTHESIZED NUMBER TWELVE" #x247F)
-    ("PARENTHESIZED NUMBER THIRTEEN" #x2480)
-    ("PARENTHESIZED NUMBER FOURTEEN" #x2481)
-    ("PARENTHESIZED NUMBER FIFTEEN" #x2482)
-    ("PARENTHESIZED NUMBER SIXTEEN" #x2483)
-    ("PARENTHESIZED NUMBER SEVENTEEN" #x2484)
-    ("PARENTHESIZED NUMBER EIGHTEEN" #x2485)
-    ("PARENTHESIZED NUMBER NINETEEN" #x2486)
-    ("PARENTHESIZED NUMBER TWENTY" #x2487)
-    ("DIGIT ONE FULL STOP" #x2488)
-    ("DIGIT TWO FULL STOP" #x2489)
-    ("DIGIT THREE FULL STOP" #x248A)
-    ("DIGIT FOUR FULL STOP" #x248B)
-    ("DIGIT FIVE FULL STOP" #x248C)
-    ("DIGIT SIX FULL STOP" #x248D)
-    ("DIGIT SEVEN FULL STOP" #x248E)
-    ("DIGIT EIGHT FULL STOP" #x248F)
-    ("DIGIT NINE FULL STOP" #x2490)
-    ("NUMBER TEN FULL STOP" #x2491)
-    ("NUMBER ELEVEN FULL STOP" #x2492)
-    ("NUMBER TWELVE FULL STOP" #x2493)
-    ("NUMBER THIRTEEN FULL STOP" #x2494)
-    ("NUMBER FOURTEEN FULL STOP" #x2495)
-    ("NUMBER FIFTEEN FULL STOP" #x2496)
-    ("NUMBER SIXTEEN FULL STOP" #x2497)
-    ("NUMBER SEVENTEEN FULL STOP" #x2498)
-    ("NUMBER EIGHTEEN FULL STOP" #x2499)
-    ("NUMBER NINETEEN FULL STOP" #x249A)
-    ("NUMBER TWENTY FULL STOP" #x249B)
-    ("PARENTHESIZED LATIN SMALL LETTER A" #x249C)
-    ("PARENTHESIZED LATIN SMALL LETTER B" #x249D)
-    ("PARENTHESIZED LATIN SMALL LETTER C" #x249E)
-    ("PARENTHESIZED LATIN SMALL LETTER D" #x249F)
-    ("PARENTHESIZED LATIN SMALL LETTER E" #x24A0)
-    ("PARENTHESIZED LATIN SMALL LETTER F" #x24A1)
-    ("PARENTHESIZED LATIN SMALL LETTER G" #x24A2)
-    ("PARENTHESIZED LATIN SMALL LETTER H" #x24A3)
-    ("PARENTHESIZED LATIN SMALL LETTER I" #x24A4)
-    ("PARENTHESIZED LATIN SMALL LETTER J" #x24A5)
-    ("PARENTHESIZED LATIN SMALL LETTER K" #x24A6)
-    ("PARENTHESIZED LATIN SMALL LETTER L" #x24A7)
-    ("PARENTHESIZED LATIN SMALL LETTER M" #x24A8)
-    ("PARENTHESIZED LATIN SMALL LETTER N" #x24A9)
-    ("PARENTHESIZED LATIN SMALL LETTER O" #x24AA)
-    ("PARENTHESIZED LATIN SMALL LETTER P" #x24AB)
-    ("PARENTHESIZED LATIN SMALL LETTER Q" #x24AC)
-    ("PARENTHESIZED LATIN SMALL LETTER R" #x24AD)
-    ("PARENTHESIZED LATIN SMALL LETTER S" #x24AE)
-    ("PARENTHESIZED LATIN SMALL LETTER T" #x24AF)
-    ("PARENTHESIZED LATIN SMALL LETTER U" #x24B0)
-    ("PARENTHESIZED LATIN SMALL LETTER V" #x24B1)
-    ("PARENTHESIZED LATIN SMALL LETTER W" #x24B2)
-    ("PARENTHESIZED LATIN SMALL LETTER X" #x24B3)
-    ("PARENTHESIZED LATIN SMALL LETTER Y" #x24B4)
-    ("PARENTHESIZED LATIN SMALL LETTER Z" #x24B5)
-    ("CIRCLED LATIN CAPITAL LETTER A" #x24B6)
-    ("CIRCLED LATIN CAPITAL LETTER B" #x24B7)
-    ("CIRCLED LATIN CAPITAL LETTER C" #x24B8)
-    ("CIRCLED LATIN CAPITAL LETTER D" #x24B9)
-    ("CIRCLED LATIN CAPITAL LETTER E" #x24BA)
-    ("CIRCLED LATIN CAPITAL LETTER F" #x24BB)
-    ("CIRCLED LATIN CAPITAL LETTER G" #x24BC)
-    ("CIRCLED LATIN CAPITAL LETTER H" #x24BD)
-    ("CIRCLED LATIN CAPITAL LETTER I" #x24BE)
-    ("CIRCLED LATIN CAPITAL LETTER J" #x24BF)
-    ("CIRCLED LATIN CAPITAL LETTER K" #x24C0)
-    ("CIRCLED LATIN CAPITAL LETTER L" #x24C1)
-    ("CIRCLED LATIN CAPITAL LETTER M" #x24C2)
-    ("CIRCLED LATIN CAPITAL LETTER N" #x24C3)
-    ("CIRCLED LATIN CAPITAL LETTER O" #x24C4)
-    ("CIRCLED LATIN CAPITAL LETTER P" #x24C5)
-    ("CIRCLED LATIN CAPITAL LETTER Q" #x24C6)
-    ("CIRCLED LATIN CAPITAL LETTER R" #x24C7)
-    ("CIRCLED LATIN CAPITAL LETTER S" #x24C8)
-    ("CIRCLED LATIN CAPITAL LETTER T" #x24C9)
-    ("CIRCLED LATIN CAPITAL LETTER U" #x24CA)
-    ("CIRCLED LATIN CAPITAL LETTER V" #x24CB)
-    ("CIRCLED LATIN CAPITAL LETTER W" #x24CC)
-    ("CIRCLED LATIN CAPITAL LETTER X" #x24CD)
-    ("CIRCLED LATIN CAPITAL LETTER Y" #x24CE)
-    ("CIRCLED LATIN CAPITAL LETTER Z" #x24CF)
-    ("CIRCLED LATIN SMALL LETTER A" #x24D0)
-    ("CIRCLED LATIN SMALL LETTER B" #x24D1)
-    ("CIRCLED LATIN SMALL LETTER C" #x24D2)
-    ("CIRCLED LATIN SMALL LETTER D" #x24D3)
-    ("CIRCLED LATIN SMALL LETTER E" #x24D4)
-    ("CIRCLED LATIN SMALL LETTER F" #x24D5)
-    ("CIRCLED LATIN SMALL LETTER G" #x24D6)
-    ("CIRCLED LATIN SMALL LETTER H" #x24D7)
-    ("CIRCLED LATIN SMALL LETTER I" #x24D8)
-    ("CIRCLED LATIN SMALL LETTER J" #x24D9)
-    ("CIRCLED LATIN SMALL LETTER K" #x24DA)
-    ("CIRCLED LATIN SMALL LETTER L" #x24DB)
-    ("CIRCLED LATIN SMALL LETTER M" #x24DC)
-    ("CIRCLED LATIN SMALL LETTER N" #x24DD)
-    ("CIRCLED LATIN SMALL LETTER O" #x24DE)
-    ("CIRCLED LATIN SMALL LETTER P" #x24DF)
-    ("CIRCLED LATIN SMALL LETTER Q" #x24E0)
-    ("CIRCLED LATIN SMALL LETTER R" #x24E1)
-    ("CIRCLED LATIN SMALL LETTER S" #x24E2)
-    ("CIRCLED LATIN SMALL LETTER T" #x24E3)
-    ("CIRCLED LATIN SMALL LETTER U" #x24E4)
-    ("CIRCLED LATIN SMALL LETTER V" #x24E5)
-    ("CIRCLED LATIN SMALL LETTER W" #x24E6)
-    ("CIRCLED LATIN SMALL LETTER X" #x24E7)
-    ("CIRCLED LATIN SMALL LETTER Y" #x24E8)
-    ("CIRCLED LATIN SMALL LETTER Z" #x24E9)
-    ("CIRCLED DIGIT ZERO" #x24EA)
-    ("NEGATIVE CIRCLED NUMBER ELEVEN" #x24EB)
-    ("NEGATIVE CIRCLED NUMBER TWELVE" #x24EC)
-    ("NEGATIVE CIRCLED NUMBER THIRTEEN" #x24ED)
-    ("NEGATIVE CIRCLED NUMBER FOURTEEN" #x24EE)
-    ("NEGATIVE CIRCLED NUMBER FIFTEEN" #x24EF)
-    ("NEGATIVE CIRCLED NUMBER SIXTEEN" #x24F0)
-    ("NEGATIVE CIRCLED NUMBER SEVENTEEN" #x24F1)
-    ("NEGATIVE CIRCLED NUMBER EIGHTEEN" #x24F2)
-    ("NEGATIVE CIRCLED NUMBER NINETEEN" #x24F3)
-    ("NEGATIVE CIRCLED NUMBER TWENTY" #x24F4)
-    ("DOUBLE CIRCLED DIGIT ONE" #x24F5)
-    ("DOUBLE CIRCLED DIGIT TWO" #x24F6)
-    ("DOUBLE CIRCLED DIGIT THREE" #x24F7)
-    ("DOUBLE CIRCLED DIGIT FOUR" #x24F8)
-    ("DOUBLE CIRCLED DIGIT FIVE" #x24F9)
-    ("DOUBLE CIRCLED DIGIT SIX" #x24FA)
-    ("DOUBLE CIRCLED DIGIT SEVEN" #x24FB)
-    ("DOUBLE CIRCLED DIGIT EIGHT" #x24FC)
-    ("DOUBLE CIRCLED DIGIT NINE" #x24FD)
-    ("DOUBLE CIRCLED NUMBER TEN" #x24FE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02500-0257F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02500-0257F.el
deleted file mode 100644
index bf17039df2..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02500-0257F.el
+++ /dev/null
@@ -1,130 +0,0 @@
-(nxml-define-char-name-set 'box-drawing
-  '(("BOX DRAWINGS LIGHT HORIZONTAL" #x2500)
-    ("BOX DRAWINGS HEAVY HORIZONTAL" #x2501)
-    ("BOX DRAWINGS LIGHT VERTICAL" #x2502)
-    ("BOX DRAWINGS HEAVY VERTICAL" #x2503)
-    ("BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL" #x2504)
-    ("BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL" #x2505)
-    ("BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL" #x2506)
-    ("BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL" #x2507)
-    ("BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL" #x2508)
-    ("BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL" #x2509)
-    ("BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL" #x250A)
-    ("BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL" #x250B)
-    ("BOX DRAWINGS LIGHT DOWN AND RIGHT" #x250C)
-    ("BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY" #x250D)
-    ("BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT" #x250E)
-    ("BOX DRAWINGS HEAVY DOWN AND RIGHT" #x250F)
-    ("BOX DRAWINGS LIGHT DOWN AND LEFT" #x2510)
-    ("BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY" #x2511)
-    ("BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT" #x2512)
-    ("BOX DRAWINGS HEAVY DOWN AND LEFT" #x2513)
-    ("BOX DRAWINGS LIGHT UP AND RIGHT" #x2514)
-    ("BOX DRAWINGS UP LIGHT AND RIGHT HEAVY" #x2515)
-    ("BOX DRAWINGS UP HEAVY AND RIGHT LIGHT" #x2516)
-    ("BOX DRAWINGS HEAVY UP AND RIGHT" #x2517)
-    ("BOX DRAWINGS LIGHT UP AND LEFT" #x2518)
-    ("BOX DRAWINGS UP LIGHT AND LEFT HEAVY" #x2519)
-    ("BOX DRAWINGS UP HEAVY AND LEFT LIGHT" #x251A)
-    ("BOX DRAWINGS HEAVY UP AND LEFT" #x251B)
-    ("BOX DRAWINGS LIGHT VERTICAL AND RIGHT" #x251C)
-    ("BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY" #x251D)
-    ("BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT" #x251E)
-    ("BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT" #x251F)
-    ("BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT" #x2520)
-    ("BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY" #x2521)
-    ("BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY" #x2522)
-    ("BOX DRAWINGS HEAVY VERTICAL AND RIGHT" #x2523)
-    ("BOX DRAWINGS LIGHT VERTICAL AND LEFT" #x2524)
-    ("BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY" #x2525)
-    ("BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT" #x2526)
-    ("BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT" #x2527)
-    ("BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT" #x2528)
-    ("BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY" #x2529)
-    ("BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY" #x252A)
-    ("BOX DRAWINGS HEAVY VERTICAL AND LEFT" #x252B)
-    ("BOX DRAWINGS LIGHT DOWN AND HORIZONTAL" #x252C)
-    ("BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT" #x252D)
-    ("BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT" #x252E)
-    ("BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY" #x252F)
-    ("BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT" #x2530)
-    ("BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY" #x2531)
-    ("BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY" #x2532)
-    ("BOX DRAWINGS HEAVY DOWN AND HORIZONTAL" #x2533)
-    ("BOX DRAWINGS LIGHT UP AND HORIZONTAL" #x2534)
-    ("BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT" #x2535)
-    ("BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT" #x2536)
-    ("BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY" #x2537)
-    ("BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT" #x2538)
-    ("BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY" #x2539)
-    ("BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY" #x253A)
-    ("BOX DRAWINGS HEAVY UP AND HORIZONTAL" #x253B)
-    ("BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL" #x253C)
-    ("BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT" #x253D)
-    ("BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT" #x253E)
-    ("BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY" #x253F)
-    ("BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT" #x2540)
-    ("BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT" #x2541)
-    ("BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT" #x2542)
-    ("BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT" #x2543)
-    ("BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT" #x2544)
-    ("BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT" #x2545)
-    ("BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT" #x2546)
-    ("BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY" #x2547)
-    ("BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY" #x2548)
-    ("BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY" #x2549)
-    ("BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY" #x254A)
-    ("BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL" #x254B)
-    ("BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL" #x254C)
-    ("BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL" #x254D)
-    ("BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL" #x254E)
-    ("BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL" #x254F)
-    ("BOX DRAWINGS DOUBLE HORIZONTAL" #x2550)
-    ("BOX DRAWINGS DOUBLE VERTICAL" #x2551)
-    ("BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE" #x2552)
-    ("BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE" #x2553)
-    ("BOX DRAWINGS DOUBLE DOWN AND RIGHT" #x2554)
-    ("BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE" #x2555)
-    ("BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE" #x2556)
-    ("BOX DRAWINGS DOUBLE DOWN AND LEFT" #x2557)
-    ("BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE" #x2558)
-    ("BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE" #x2559)
-    ("BOX DRAWINGS DOUBLE UP AND RIGHT" #x255A)
-    ("BOX DRAWINGS UP SINGLE AND LEFT DOUBLE" #x255B)
-    ("BOX DRAWINGS UP DOUBLE AND LEFT SINGLE" #x255C)
-    ("BOX DRAWINGS DOUBLE UP AND LEFT" #x255D)
-    ("BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE" #x255E)
-    ("BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE" #x255F)
-    ("BOX DRAWINGS DOUBLE VERTICAL AND RIGHT" #x2560)
-    ("BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE" #x2561)
-    ("BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE" #x2562)
-    ("BOX DRAWINGS DOUBLE VERTICAL AND LEFT" #x2563)
-    ("BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE" #x2564)
-    ("BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE" #x2565)
-    ("BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL" #x2566)
-    ("BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE" #x2567)
-    ("BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE" #x2568)
-    ("BOX DRAWINGS DOUBLE UP AND HORIZONTAL" #x2569)
-    ("BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE" #x256A)
-    ("BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE" #x256B)
-    ("BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL" #x256C)
-    ("BOX DRAWINGS LIGHT ARC DOWN AND RIGHT" #x256D)
-    ("BOX DRAWINGS LIGHT ARC DOWN AND LEFT" #x256E)
-    ("BOX DRAWINGS LIGHT ARC UP AND LEFT" #x256F)
-    ("BOX DRAWINGS LIGHT ARC UP AND RIGHT" #x2570)
-    ("BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT" #x2571)
-    ("BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT" #x2572)
-    ("BOX DRAWINGS LIGHT DIAGONAL CROSS" #x2573)
-    ("BOX DRAWINGS LIGHT LEFT" #x2574)
-    ("BOX DRAWINGS LIGHT UP" #x2575)
-    ("BOX DRAWINGS LIGHT RIGHT" #x2576)
-    ("BOX DRAWINGS LIGHT DOWN" #x2577)
-    ("BOX DRAWINGS HEAVY LEFT" #x2578)
-    ("BOX DRAWINGS HEAVY UP" #x2579)
-    ("BOX DRAWINGS HEAVY RIGHT" #x257A)
-    ("BOX DRAWINGS HEAVY DOWN" #x257B)
-    ("BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT" #x257C)
-    ("BOX DRAWINGS LIGHT UP AND HEAVY DOWN" #x257D)
-    ("BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT" #x257E)
-    ("BOX DRAWINGS HEAVY UP AND LIGHT DOWN" #x257F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02580-0259F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02580-0259F.el
deleted file mode 100644
index 89413a2e44..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02580-0259F.el
+++ /dev/null
@@ -1,34 +0,0 @@
-(nxml-define-char-name-set 'block-elements
-  '(("UPPER HALF BLOCK" #x2580)
-    ("LOWER ONE EIGHTH BLOCK" #x2581)
-    ("LOWER ONE QUARTER BLOCK" #x2582)
-    ("LOWER THREE EIGHTHS BLOCK" #x2583)
-    ("LOWER HALF BLOCK" #x2584)
-    ("LOWER FIVE EIGHTHS BLOCK" #x2585)
-    ("LOWER THREE QUARTERS BLOCK" #x2586)
-    ("LOWER SEVEN EIGHTHS BLOCK" #x2587)
-    ("FULL BLOCK" #x2588)
-    ("LEFT SEVEN EIGHTHS BLOCK" #x2589)
-    ("LEFT THREE QUARTERS BLOCK" #x258A)
-    ("LEFT FIVE EIGHTHS BLOCK" #x258B)
-    ("LEFT HALF BLOCK" #x258C)
-    ("LEFT THREE EIGHTHS BLOCK" #x258D)
-    ("LEFT ONE QUARTER BLOCK" #x258E)
-    ("LEFT ONE EIGHTH BLOCK" #x258F)
-    ("RIGHT HALF BLOCK" #x2590)
-    ("LIGHT SHADE" #x2591)
-    ("MEDIUM SHADE" #x2592)
-    ("DARK SHADE" #x2593)
-    ("UPPER ONE EIGHTH BLOCK" #x2594)
-    ("RIGHT ONE EIGHTH BLOCK" #x2595)
-    ("QUADRANT LOWER LEFT" #x2596)
-    ("QUADRANT LOWER RIGHT" #x2597)
-    ("QUADRANT UPPER LEFT" #x2598)
-    ("QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT" #x2599)
-    ("QUADRANT UPPER LEFT AND LOWER RIGHT" #x259A)
-    ("QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT" #x259B)
-    ("QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT" #x259C)
-    ("QUADRANT UPPER RIGHT" #x259D)
-    ("QUADRANT UPPER RIGHT AND LOWER LEFT" #x259E)
-    ("QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT" #x259F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/025A0-025FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/025A0-025FF.el
deleted file mode 100644
index 2313c781d6..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/025A0-025FF.el
+++ /dev/null
@@ -1,98 +0,0 @@
-(nxml-define-char-name-set 'geometric-shapes
-  '(("BLACK SQUARE" #x25A0)
-    ("WHITE SQUARE" #x25A1)
-    ("WHITE SQUARE WITH ROUNDED CORNERS" #x25A2)
-    ("WHITE SQUARE CONTAINING BLACK SMALL SQUARE" #x25A3)
-    ("SQUARE WITH HORIZONTAL FILL" #x25A4)
-    ("SQUARE WITH VERTICAL FILL" #x25A5)
-    ("SQUARE WITH ORTHOGONAL CROSSHATCH FILL" #x25A6)
-    ("SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL" #x25A7)
-    ("SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL" #x25A8)
-    ("SQUARE WITH DIAGONAL CROSSHATCH FILL" #x25A9)
-    ("BLACK SMALL SQUARE" #x25AA)
-    ("WHITE SMALL SQUARE" #x25AB)
-    ("BLACK RECTANGLE" #x25AC)
-    ("WHITE RECTANGLE" #x25AD)
-    ("BLACK VERTICAL RECTANGLE" #x25AE)
-    ("WHITE VERTICAL RECTANGLE" #x25AF)
-    ("BLACK PARALLELOGRAM" #x25B0)
-    ("WHITE PARALLELOGRAM" #x25B1)
-    ("BLACK UP-POINTING TRIANGLE" #x25B2)
-    ("WHITE UP-POINTING TRIANGLE" #x25B3)
-    ("BLACK UP-POINTING SMALL TRIANGLE" #x25B4)
-    ("WHITE UP-POINTING SMALL TRIANGLE" #x25B5)
-    ("BLACK RIGHT-POINTING TRIANGLE" #x25B6)
-    ("WHITE RIGHT-POINTING TRIANGLE" #x25B7)
-    ("BLACK RIGHT-POINTING SMALL TRIANGLE" #x25B8)
-    ("WHITE RIGHT-POINTING SMALL TRIANGLE" #x25B9)
-    ("BLACK RIGHT-POINTING POINTER" #x25BA)
-    ("WHITE RIGHT-POINTING POINTER" #x25BB)
-    ("BLACK DOWN-POINTING TRIANGLE" #x25BC)
-    ("WHITE DOWN-POINTING TRIANGLE" #x25BD)
-    ("BLACK DOWN-POINTING SMALL TRIANGLE" #x25BE)
-    ("WHITE DOWN-POINTING SMALL TRIANGLE" #x25BF)
-    ("BLACK LEFT-POINTING TRIANGLE" #x25C0)
-    ("WHITE LEFT-POINTING TRIANGLE" #x25C1)
-    ("BLACK LEFT-POINTING SMALL TRIANGLE" #x25C2)
-    ("WHITE LEFT-POINTING SMALL TRIANGLE" #x25C3)
-    ("BLACK LEFT-POINTING POINTER" #x25C4)
-    ("WHITE LEFT-POINTING POINTER" #x25C5)
-    ("BLACK DIAMOND" #x25C6)
-    ("WHITE DIAMOND" #x25C7)
-    ("WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND" #x25C8)
-    ("FISHEYE" #x25C9)
-    ("LOZENGE" #x25CA)
-    ("WHITE CIRCLE" #x25CB)
-    ("DOTTED CIRCLE" #x25CC)
-    ("CIRCLE WITH VERTICAL FILL" #x25CD)
-    ("BULLSEYE" #x25CE)
-    ("BLACK CIRCLE" #x25CF)
-    ("CIRCLE WITH LEFT HALF BLACK" #x25D0)
-    ("CIRCLE WITH RIGHT HALF BLACK" #x25D1)
-    ("CIRCLE WITH LOWER HALF BLACK" #x25D2)
-    ("CIRCLE WITH UPPER HALF BLACK" #x25D3)
-    ("CIRCLE WITH UPPER RIGHT QUADRANT BLACK" #x25D4)
-    ("CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK" #x25D5)
-    ("LEFT HALF BLACK CIRCLE" #x25D6)
-    ("RIGHT HALF BLACK CIRCLE" #x25D7)
-    ("INVERSE BULLET" #x25D8)
-    ("INVERSE WHITE CIRCLE" #x25D9)
-    ("UPPER HALF INVERSE WHITE CIRCLE" #x25DA)
-    ("LOWER HALF INVERSE WHITE CIRCLE" #x25DB)
-    ("UPPER LEFT QUADRANT CIRCULAR ARC" #x25DC)
-    ("UPPER RIGHT QUADRANT CIRCULAR ARC" #x25DD)
-    ("LOWER RIGHT QUADRANT CIRCULAR ARC" #x25DE)
-    ("LOWER LEFT QUADRANT CIRCULAR ARC" #x25DF)
-    ("UPPER HALF CIRCLE" #x25E0)
-    ("LOWER HALF CIRCLE" #x25E1)
-    ("BLACK LOWER RIGHT TRIANGLE" #x25E2)
-    ("BLACK LOWER LEFT TRIANGLE" #x25E3)
-    ("BLACK UPPER LEFT TRIANGLE" #x25E4)
-    ("BLACK UPPER RIGHT TRIANGLE" #x25E5)
-    ("WHITE BULLET" #x25E6)
-    ("SQUARE WITH LEFT HALF BLACK" #x25E7)
-    ("SQUARE WITH RIGHT HALF BLACK" #x25E8)
-    ("SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK" #x25E9)
-    ("SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK" #x25EA)
-    ("WHITE SQUARE WITH VERTICAL BISECTING LINE" #x25EB)
-    ("WHITE UP-POINTING TRIANGLE WITH DOT" #x25EC)
-    ("UP-POINTING TRIANGLE WITH LEFT HALF BLACK" #x25ED)
-    ("UP-POINTING TRIANGLE WITH RIGHT HALF BLACK" #x25EE)
-    ("LARGE CIRCLE" #x25EF)
-    ("WHITE SQUARE WITH UPPER LEFT QUADRANT" #x25F0)
-    ("WHITE SQUARE WITH LOWER LEFT QUADRANT" #x25F1)
-    ("WHITE SQUARE WITH LOWER RIGHT QUADRANT" #x25F2)
-    ("WHITE SQUARE WITH UPPER RIGHT QUADRANT" #x25F3)
-    ("WHITE CIRCLE WITH UPPER LEFT QUADRANT" #x25F4)
-    ("WHITE CIRCLE WITH LOWER LEFT QUADRANT" #x25F5)
-    ("WHITE CIRCLE WITH LOWER RIGHT QUADRANT" #x25F6)
-    ("WHITE CIRCLE WITH UPPER RIGHT QUADRANT" #x25F7)
-    ("UPPER LEFT TRIANGLE" #x25F8)
-    ("UPPER RIGHT TRIANGLE" #x25F9)
-    ("LOWER LEFT TRIANGLE" #x25FA)
-    ("WHITE MEDIUM SQUARE" #x25FB)
-    ("BLACK MEDIUM SQUARE" #x25FC)
-    ("WHITE MEDIUM SMALL SQUARE" #x25FD)
-    ("BLACK MEDIUM SMALL SQUARE" #x25FE)
-    ("LOWER RIGHT TRIANGLE" #x25FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02600-026FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02600-026FF.el
deleted file mode 100644
index eaae9bec08..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02600-026FF.el
+++ /dev/null
@@ -1,135 +0,0 @@
-(nxml-define-char-name-set 'miscellaneous-symbols
-  '(("BLACK SUN WITH RAYS" #x2600)
-    ("CLOUD" #x2601)
-    ("UMBRELLA" #x2602)
-    ("SNOWMAN" #x2603)
-    ("COMET" #x2604)
-    ("BLACK STAR" #x2605)
-    ("WHITE STAR" #x2606)
-    ("LIGHTNING" #x2607)
-    ("THUNDERSTORM" #x2608)
-    ("SUN" #x2609)
-    ("ASCENDING NODE" #x260A)
-    ("DESCENDING NODE" #x260B)
-    ("CONJUNCTION" #x260C)
-    ("OPPOSITION" #x260D)
-    ("BLACK TELEPHONE" #x260E)
-    ("WHITE TELEPHONE" #x260F)
-    ("BALLOT BOX" #x2610)
-    ("BALLOT BOX WITH CHECK" #x2611)
-    ("BALLOT BOX WITH X" #x2612)
-    ("SALTIRE" #x2613)
-    ("WHITE SHOGI PIECE" #x2616)
-    ("BLACK SHOGI PIECE" #x2617)
-    ("REVERSED ROTATED FLORAL HEART BULLET" #x2619)
-    ("BLACK LEFT POINTING INDEX" #x261A)
-    ("BLACK RIGHT POINTING INDEX" #x261B)
-    ("WHITE LEFT POINTING INDEX" #x261C)
-    ("WHITE UP POINTING INDEX" #x261D)
-    ("WHITE RIGHT POINTING INDEX" #x261E)
-    ("WHITE DOWN POINTING INDEX" #x261F)
-    ("SKULL AND CROSSBONES" #x2620)
-    ("CAUTION SIGN" #x2621)
-    ("RADIOACTIVE SIGN" #x2622)
-    ("BIOHAZARD SIGN" #x2623)
-    ("CADUCEUS" #x2624)
-    ("ANKH" #x2625)
-    ("ORTHODOX CROSS" #x2626)
-    ("CHI RHO" #x2627)
-    ("CROSS OF LORRAINE" #x2628)
-    ("CROSS OF JERUSALEM" #x2629)
-    ("STAR AND CRESCENT" #x262A)
-    ("FARSI SYMBOL" #x262B)
-    ("ADI SHAKTI" #x262C)
-    ("HAMMER AND SICKLE" #x262D)
-    ("PEACE SYMBOL" #x262E)
-    ("YIN YANG" #x262F)
-    ("TRIGRAM FOR HEAVEN" #x2630)
-    ("TRIGRAM FOR LAKE" #x2631)
-    ("TRIGRAM FOR FIRE" #x2632)
-    ("TRIGRAM FOR THUNDER" #x2633)
-    ("TRIGRAM FOR WIND" #x2634)
-    ("TRIGRAM FOR WATER" #x2635)
-    ("TRIGRAM FOR MOUNTAIN" #x2636)
-    ("TRIGRAM FOR EARTH" #x2637)
-    ("WHEEL OF DHARMA" #x2638)
-    ("WHITE FROWNING FACE" #x2639)
-    ("WHITE SMILING FACE" #x263A)
-    ("BLACK SMILING FACE" #x263B)
-    ("WHITE SUN WITH RAYS" #x263C)
-    ("FIRST QUARTER MOON" #x263D)
-    ("LAST QUARTER MOON" #x263E)
-    ("MERCURY" #x263F)
-    ("FEMALE SIGN" #x2640)
-    ("EARTH" #x2641)
-    ("MALE SIGN" #x2642)
-    ("JUPITER" #x2643)
-    ("SATURN" #x2644)
-    ("URANUS" #x2645)
-    ("NEPTUNE" #x2646)
-    ("PLUTO" #x2647)
-    ("ARIES" #x2648)
-    ("TAURUS" #x2649)
-    ("GEMINI" #x264A)
-    ("CANCER" #x264B)
-    ("LEO" #x264C)
-    ("VIRGO" #x264D)
-    ("LIBRA" #x264E)
-    ("SCORPIUS" #x264F)
-    ("SAGITTARIUS" #x2650)
-    ("CAPRICORN" #x2651)
-    ("AQUARIUS" #x2652)
-    ("PISCES" #x2653)
-    ("WHITE CHESS KING" #x2654)
-    ("WHITE CHESS QUEEN" #x2655)
-    ("WHITE CHESS ROOK" #x2656)
-    ("WHITE CHESS BISHOP" #x2657)
-    ("WHITE CHESS KNIGHT" #x2658)
-    ("WHITE CHESS PAWN" #x2659)
-    ("BLACK CHESS KING" #x265A)
-    ("BLACK CHESS QUEEN" #x265B)
-    ("BLACK CHESS ROOK" #x265C)
-    ("BLACK CHESS BISHOP" #x265D)
-    ("BLACK CHESS KNIGHT" #x265E)
-    ("BLACK CHESS PAWN" #x265F)
-    ("BLACK SPADE SUIT" #x2660)
-    ("WHITE HEART SUIT" #x2661)
-    ("WHITE DIAMOND SUIT" #x2662)
-    ("BLACK CLUB SUIT" #x2663)
-    ("WHITE SPADE SUIT" #x2664)
-    ("BLACK HEART SUIT" #x2665)
-    ("BLACK DIAMOND SUIT" #x2666)
-    ("WHITE CLUB SUIT" #x2667)
-    ("HOT SPRINGS" #x2668)
-    ("QUARTER NOTE" #x2669)
-    ("EIGHTH NOTE" #x266A)
-    ("BEAMED EIGHTH NOTES" #x266B)
-    ("BEAMED SIXTEENTH NOTES" #x266C)
-    ("MUSIC FLAT SIGN" #x266D)
-    ("MUSIC NATURAL SIGN" #x266E)
-    ("MUSIC SHARP SIGN" #x266F)
-    ("WEST SYRIAC CROSS" #x2670)
-    ("EAST SYRIAC CROSS" #x2671)
-    ("UNIVERSAL RECYCLING SYMBOL" #x2672)
-    ("RECYCLING SYMBOL FOR TYPE-1 PLASTICS" #x2673)
-    ("RECYCLING SYMBOL FOR TYPE-2 PLASTICS" #x2674)
-    ("RECYCLING SYMBOL FOR TYPE-3 PLASTICS" #x2675)
-    ("RECYCLING SYMBOL FOR TYPE-4 PLASTICS" #x2676)
-    ("RECYCLING SYMBOL FOR TYPE-5 PLASTICS" #x2677)
-    ("RECYCLING SYMBOL FOR TYPE-6 PLASTICS" #x2678)
-    ("RECYCLING SYMBOL FOR TYPE-7 PLASTICS" #x2679)
-    ("RECYCLING SYMBOL FOR GENERIC MATERIALS" #x267A)
-    ("BLACK UNIVERSAL RECYCLING SYMBOL" #x267B)
-    ("RECYCLED PAPER SYMBOL" #x267C)
-    ("PARTIALLY-RECYCLED PAPER SYMBOL" #x267D)
-    ("DIE FACE-1" #x2680)
-    ("DIE FACE-2" #x2681)
-    ("DIE FACE-3" #x2682)
-    ("DIE FACE-4" #x2683)
-    ("DIE FACE-5" #x2684)
-    ("DIE FACE-6" #x2685)
-    ("WHITE CIRCLE WITH DOT RIGHT" #x2686)
-    ("WHITE CIRCLE WITH TWO DOTS" #x2687)
-    ("BLACK CIRCLE WITH WHITE DOT RIGHT" #x2688)
-    ("BLACK CIRCLE WITH TWO WHITE DOTS" #x2689)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02700-027BF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02700-027BF.el
deleted file mode 100644
index e4361a3240..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02700-027BF.el
+++ /dev/null
@@ -1,176 +0,0 @@
-(nxml-define-char-name-set 'dingbats
-  '(("UPPER BLADE SCISSORS" #x2701)
-    ("BLACK SCISSORS" #x2702)
-    ("LOWER BLADE SCISSORS" #x2703)
-    ("WHITE SCISSORS" #x2704)
-    ("TELEPHONE LOCATION SIGN" #x2706)
-    ("TAPE DRIVE" #x2707)
-    ("AIRPLANE" #x2708)
-    ("ENVELOPE" #x2709)
-    ("VICTORY HAND" #x270C)
-    ("WRITING HAND" #x270D)
-    ("LOWER RIGHT PENCIL" #x270E)
-    ("PENCIL" #x270F)
-    ("UPPER RIGHT PENCIL" #x2710)
-    ("WHITE NIB" #x2711)
-    ("BLACK NIB" #x2712)
-    ("CHECK MARK" #x2713)
-    ("HEAVY CHECK MARK" #x2714)
-    ("MULTIPLICATION X" #x2715)
-    ("HEAVY MULTIPLICATION X" #x2716)
-    ("BALLOT X" #x2717)
-    ("HEAVY BALLOT X" #x2718)
-    ("OUTLINED GREEK CROSS" #x2719)
-    ("HEAVY GREEK CROSS" #x271A)
-    ("OPEN CENTRE CROSS" #x271B)
-    ("HEAVY OPEN CENTRE CROSS" #x271C)
-    ("LATIN CROSS" #x271D)
-    ("SHADOWED WHITE LATIN CROSS" #x271E)
-    ("OUTLINED LATIN CROSS" #x271F)
-    ("MALTESE CROSS" #x2720)
-    ("STAR OF DAVID" #x2721)
-    ("FOUR TEARDROP-SPOKED ASTERISK" #x2722)
-    ("FOUR BALLOON-SPOKED ASTERISK" #x2723)
-    ("HEAVY FOUR BALLOON-SPOKED ASTERISK" #x2724)
-    ("FOUR CLUB-SPOKED ASTERISK" #x2725)
-    ("BLACK FOUR POINTED STAR" #x2726)
-    ("WHITE FOUR POINTED STAR" #x2727)
-    ("STRESS OUTLINED WHITE STAR" #x2729)
-    ("CIRCLED WHITE STAR" #x272A)
-    ("OPEN CENTRE BLACK STAR" #x272B)
-    ("BLACK CENTRE WHITE STAR" #x272C)
-    ("OUTLINED BLACK STAR" #x272D)
-    ("HEAVY OUTLINED BLACK STAR" #x272E)
-    ("PINWHEEL STAR" #x272F)
-    ("SHADOWED WHITE STAR" #x2730)
-    ("HEAVY ASTERISK" #x2731)
-    ("OPEN CENTRE ASTERISK" #x2732)
-    ("EIGHT SPOKED ASTERISK" #x2733)
-    ("EIGHT POINTED BLACK STAR" #x2734)
-    ("EIGHT POINTED PINWHEEL STAR" #x2735)
-    ("SIX POINTED BLACK STAR" #x2736)
-    ("EIGHT POINTED RECTILINEAR BLACK STAR" #x2737)
-    ("HEAVY EIGHT POINTED RECTILINEAR BLACK STAR" #x2738)
-    ("TWELVE POINTED BLACK STAR" #x2739)
-    ("SIXTEEN POINTED ASTERISK" #x273A)
-    ("TEARDROP-SPOKED ASTERISK" #x273B)
-    ("OPEN CENTRE TEARDROP-SPOKED ASTERISK" #x273C)
-    ("HEAVY TEARDROP-SPOKED ASTERISK" #x273D)
-    ("SIX PETALLED BLACK AND WHITE FLORETTE" #x273E)
-    ("BLACK FLORETTE" #x273F)
-    ("WHITE FLORETTE" #x2740)
-    ("EIGHT PETALLED OUTLINED BLACK FLORETTE" #x2741)
-    ("CIRCLED OPEN CENTRE EIGHT POINTED STAR" #x2742)
-    ("HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK" #x2743)
-    ("SNOWFLAKE" #x2744)
-    ("TIGHT TRIFOLIATE SNOWFLAKE" #x2745)
-    ("HEAVY CHEVRON SNOWFLAKE" #x2746)
-    ("SPARKLE" #x2747)
-    ("HEAVY SPARKLE" #x2748)
-    ("BALLOON-SPOKED ASTERISK" #x2749)
-    ("EIGHT TEARDROP-SPOKED PROPELLER ASTERISK" #x274A)
-    ("HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK" #x274B)
-    ("SHADOWED WHITE CIRCLE" #x274D)
-    ("LOWER RIGHT DROP-SHADOWED WHITE SQUARE" #x274F)
-    ("UPPER RIGHT DROP-SHADOWED WHITE SQUARE" #x2750)
-    ("LOWER RIGHT SHADOWED WHITE SQUARE" #x2751)
-    ("UPPER RIGHT SHADOWED WHITE SQUARE" #x2752)
-    ("BLACK DIAMOND MINUS WHITE X" #x2756)
-    ("LIGHT VERTICAL BAR" #x2758)
-    ("MEDIUM VERTICAL BAR" #x2759)
-    ("HEAVY VERTICAL BAR" #x275A)
-    ("HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT" #x275B)
-    ("HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT" #x275C)
-    ("HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT" #x275D)
-    ("HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT" #x275E)
-    ("CURVED STEM PARAGRAPH SIGN ORNAMENT" #x2761)
-    ("HEAVY EXCLAMATION MARK ORNAMENT" #x2762)
-    ("HEAVY HEART EXCLAMATION MARK ORNAMENT" #x2763)
-    ("HEAVY BLACK HEART" #x2764)
-    ("ROTATED HEAVY BLACK HEART BULLET" #x2765)
-    ("FLORAL HEART" #x2766)
-    ("ROTATED FLORAL HEART BULLET" #x2767)
-    ("MEDIUM LEFT PARENTHESIS ORNAMENT" #x2768)
-    ("MEDIUM RIGHT PARENTHESIS ORNAMENT" #x2769)
-    ("MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT" #x276A)
-    ("MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT" #x276B)
-    ("MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT" #x276C)
-    ("MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT" #x276D)
-    ("HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT" #x276E)
-    ("HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT" #x276F)
-    ("HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT" #x2770)
-    ("HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT" #x2771)
-    ("LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT" #x2772)
-    ("LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT" #x2773)
-    ("MEDIUM LEFT CURLY BRACKET ORNAMENT" #x2774)
-    ("MEDIUM RIGHT CURLY BRACKET ORNAMENT" #x2775)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT ONE" #x2776)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT TWO" #x2777)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT THREE" #x2778)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT FOUR" #x2779)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT FIVE" #x277A)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT SIX" #x277B)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT SEVEN" #x277C)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT EIGHT" #x277D)
-    ("DINGBAT NEGATIVE CIRCLED DIGIT NINE" #x277E)
-    ("DINGBAT NEGATIVE CIRCLED NUMBER TEN" #x277F)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT ONE" #x2780)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT TWO" #x2781)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT THREE" #x2782)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT FOUR" #x2783)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT FIVE" #x2784)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT SIX" #x2785)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN" #x2786)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT" #x2787)
-    ("DINGBAT CIRCLED SANS-SERIF DIGIT NINE" #x2788)
-    ("DINGBAT CIRCLED SANS-SERIF NUMBER TEN" #x2789)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE" #x278A)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO" #x278B)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE" #x278C)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR" #x278D)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE" #x278E)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX" #x278F)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN" #x2790)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT" #x2791)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE" #x2792)
-    ("DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN" #x2793)
-    ("HEAVY WIDE-HEADED RIGHTWARDS ARROW" #x2794)
-    ("HEAVY SOUTH EAST ARROW" #x2798)
-    ("HEAVY RIGHTWARDS ARROW" #x2799)
-    ("HEAVY NORTH EAST ARROW" #x279A)
-    ("DRAFTING POINT RIGHTWARDS ARROW" #x279B)
-    ("HEAVY ROUND-TIPPED RIGHTWARDS ARROW" #x279C)
-    ("TRIANGLE-HEADED RIGHTWARDS ARROW" #x279D)
-    ("HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW" #x279E)
-    ("DASHED TRIANGLE-HEADED RIGHTWARDS ARROW" #x279F)
-    ("HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW" #x27A0)
-    ("BLACK RIGHTWARDS ARROW" #x27A1)
-    ("THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD" #x27A2)
-    ("THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD" #x27A3)
-    ("BLACK RIGHTWARDS ARROWHEAD" #x27A4)
-    ("HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW" #x27A5)
-    ("HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW" #x27A6)
-    ("SQUAT BLACK RIGHTWARDS ARROW" #x27A7)
-    ("HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW" #x27A8)
-    ("RIGHT-SHADED WHITE RIGHTWARDS ARROW" #x27A9)
-    ("LEFT-SHADED WHITE RIGHTWARDS ARROW" #x27AA)
-    ("BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW" #x27AB)
-    ("FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW" #x27AC)
-    ("HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW" #x27AD)
-    ("HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW" #x27AE)
-    ("NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW" #x27AF)
-    ("NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW" #x27B1)
-    ("CIRCLED HEAVY WHITE RIGHTWARDS ARROW" #x27B2)
-    ("WHITE-FEATHERED RIGHTWARDS ARROW" #x27B3)
-    ("BLACK-FEATHERED SOUTH EAST ARROW" #x27B4)
-    ("BLACK-FEATHERED RIGHTWARDS ARROW" #x27B5)
-    ("BLACK-FEATHERED NORTH EAST ARROW" #x27B6)
-    ("HEAVY BLACK-FEATHERED SOUTH EAST ARROW" #x27B7)
-    ("HEAVY BLACK-FEATHERED RIGHTWARDS ARROW" #x27B8)
-    ("HEAVY BLACK-FEATHERED NORTH EAST ARROW" #x27B9)
-    ("TEARDROP-BARBED RIGHTWARDS ARROW" #x27BA)
-    ("HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW" #x27BB)
-    ("WEDGE-TAILED RIGHTWARDS ARROW" #x27BC)
-    ("HEAVY WEDGE-TAILED RIGHTWARDS ARROW" #x27BD)
-    ("OPEN-OUTLINED RIGHTWARDS ARROW" #x27BE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027C0-027EF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027C0-027EF.el
deleted file mode 100644
index c68207cff7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027C0-027EF.el
+++ /dev/null
@@ -1,30 +0,0 @@
-(nxml-define-char-name-set 'miscellaneous-mathematical-symbols-a
-  '(("WHITE DIAMOND WITH CENTRED DOT" #x27D0)
-    ("AND WITH DOT" #x27D1)
-    ("ELEMENT OF OPENING UPWARDS" #x27D2)
-    ("LOWER RIGHT CORNER WITH DOT" #x27D3)
-    ("UPPER LEFT CORNER WITH DOT" #x27D4)
-    ("LEFT OUTER JOIN" #x27D5)
-    ("RIGHT OUTER JOIN" #x27D6)
-    ("FULL OUTER JOIN" #x27D7)
-    ("LARGE UP TACK" #x27D8)
-    ("LARGE DOWN TACK" #x27D9)
-    ("LEFT AND RIGHT DOUBLE TURNSTILE" #x27DA)
-    ("LEFT AND RIGHT TACK" #x27DB)
-    ("LEFT MULTIMAP" #x27DC)
-    ("LONG RIGHT TACK" #x27DD)
-    ("LONG LEFT TACK" #x27DE)
-    ("UP TACK WITH CIRCLE ABOVE" #x27DF)
-    ("LOZENGE DIVIDED BY HORIZONTAL RULE" #x27E0)
-    ("WHITE CONCAVE-SIDED DIAMOND" #x27E1)
-    ("WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK" #x27E2)
-    ("WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK" #x27E3)
-    ("WHITE SQUARE WITH LEFTWARDS TICK" #x27E4)
-    ("WHITE SQUARE WITH RIGHTWARDS TICK" #x27E5)
-    ("MATHEMATICAL LEFT WHITE SQUARE BRACKET" #x27E6)
-    ("MATHEMATICAL RIGHT WHITE SQUARE BRACKET" #x27E7)
-    ("MATHEMATICAL LEFT ANGLE BRACKET" #x27E8)
-    ("MATHEMATICAL RIGHT ANGLE BRACKET" #x27E9)
-    ("MATHEMATICAL LEFT DOUBLE ANGLE BRACKET" #x27EA)
-    ("MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET" #x27EB)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027F0-027FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027F0-027FF.el
deleted file mode 100644
index 3403ce4614..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/027F0-027FF.el
+++ /dev/null
@@ -1,18 +0,0 @@
-(nxml-define-char-name-set 'supplemental-arrows-a
-  '(("UPWARDS QUADRUPLE ARROW" #x27F0)
-    ("DOWNWARDS QUADRUPLE ARROW" #x27F1)
-    ("ANTICLOCKWISE GAPPED CIRCLE ARROW" #x27F2)
-    ("CLOCKWISE GAPPED CIRCLE ARROW" #x27F3)
-    ("RIGHT ARROW WITH CIRCLED PLUS" #x27F4)
-    ("LONG LEFTWARDS ARROW" #x27F5)
-    ("LONG RIGHTWARDS ARROW" #x27F6)
-    ("LONG LEFT RIGHT ARROW" #x27F7)
-    ("LONG LEFTWARDS DOUBLE ARROW" #x27F8)
-    ("LONG RIGHTWARDS DOUBLE ARROW" #x27F9)
-    ("LONG LEFT RIGHT DOUBLE ARROW" #x27FA)
-    ("LONG LEFTWARDS ARROW FROM BAR" #x27FB)
-    ("LONG RIGHTWARDS ARROW FROM BAR" #x27FC)
-    ("LONG LEFTWARDS DOUBLE ARROW FROM BAR" #x27FD)
-    ("LONG RIGHTWARDS DOUBLE ARROW FROM BAR" #x27FE)
-    ("LONG RIGHTWARDS SQUIGGLE ARROW" #x27FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02800-028FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02800-028FF.el
deleted file mode 100644
index 91876d840b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02800-028FF.el
+++ /dev/null
@@ -1,258 +0,0 @@
-(nxml-define-char-name-set 'braille-patterns
-  '(("BRAILLE PATTERN BLANK" #x2800)
-    ("BRAILLE PATTERN DOTS-1" #x2801)
-    ("BRAILLE PATTERN DOTS-2" #x2802)
-    ("BRAILLE PATTERN DOTS-12" #x2803)
-    ("BRAILLE PATTERN DOTS-3" #x2804)
-    ("BRAILLE PATTERN DOTS-13" #x2805)
-    ("BRAILLE PATTERN DOTS-23" #x2806)
-    ("BRAILLE PATTERN DOTS-123" #x2807)
-    ("BRAILLE PATTERN DOTS-4" #x2808)
-    ("BRAILLE PATTERN DOTS-14" #x2809)
-    ("BRAILLE PATTERN DOTS-24" #x280A)
-    ("BRAILLE PATTERN DOTS-124" #x280B)
-    ("BRAILLE PATTERN DOTS-34" #x280C)
-    ("BRAILLE PATTERN DOTS-134" #x280D)
-    ("BRAILLE PATTERN DOTS-234" #x280E)
-    ("BRAILLE PATTERN DOTS-1234" #x280F)
-    ("BRAILLE PATTERN DOTS-5" #x2810)
-    ("BRAILLE PATTERN DOTS-15" #x2811)
-    ("BRAILLE PATTERN DOTS-25" #x2812)
-    ("BRAILLE PATTERN DOTS-125" #x2813)
-    ("BRAILLE PATTERN DOTS-35" #x2814)
-    ("BRAILLE PATTERN DOTS-135" #x2815)
-    ("BRAILLE PATTERN DOTS-235" #x2816)
-    ("BRAILLE PATTERN DOTS-1235" #x2817)
-    ("BRAILLE PATTERN DOTS-45" #x2818)
-    ("BRAILLE PATTERN DOTS-145" #x2819)
-    ("BRAILLE PATTERN DOTS-245" #x281A)
-    ("BRAILLE PATTERN DOTS-1245" #x281B)
-    ("BRAILLE PATTERN DOTS-345" #x281C)
-    ("BRAILLE PATTERN DOTS-1345" #x281D)
-    ("BRAILLE PATTERN DOTS-2345" #x281E)
-    ("BRAILLE PATTERN DOTS-12345" #x281F)
-    ("BRAILLE PATTERN DOTS-6" #x2820)
-    ("BRAILLE PATTERN DOTS-16" #x2821)
-    ("BRAILLE PATTERN DOTS-26" #x2822)
-    ("BRAILLE PATTERN DOTS-126" #x2823)
-    ("BRAILLE PATTERN DOTS-36" #x2824)
-    ("BRAILLE PATTERN DOTS-136" #x2825)
-    ("BRAILLE PATTERN DOTS-236" #x2826)
-    ("BRAILLE PATTERN DOTS-1236" #x2827)
-    ("BRAILLE PATTERN DOTS-46" #x2828)
-    ("BRAILLE PATTERN DOTS-146" #x2829)
-    ("BRAILLE PATTERN DOTS-246" #x282A)
-    ("BRAILLE PATTERN DOTS-1246" #x282B)
-    ("BRAILLE PATTERN DOTS-346" #x282C)
-    ("BRAILLE PATTERN DOTS-1346" #x282D)
-    ("BRAILLE PATTERN DOTS-2346" #x282E)
-    ("BRAILLE PATTERN DOTS-12346" #x282F)
-    ("BRAILLE PATTERN DOTS-56" #x2830)
-    ("BRAILLE PATTERN DOTS-156" #x2831)
-    ("BRAILLE PATTERN DOTS-256" #x2832)
-    ("BRAILLE PATTERN DOTS-1256" #x2833)
-    ("BRAILLE PATTERN DOTS-356" #x2834)
-    ("BRAILLE PATTERN DOTS-1356" #x2835)
-    ("BRAILLE PATTERN DOTS-2356" #x2836)
-    ("BRAILLE PATTERN DOTS-12356" #x2837)
-    ("BRAILLE PATTERN DOTS-456" #x2838)
-    ("BRAILLE PATTERN DOTS-1456" #x2839)
-    ("BRAILLE PATTERN DOTS-2456" #x283A)
-    ("BRAILLE PATTERN DOTS-12456" #x283B)
-    ("BRAILLE PATTERN DOTS-3456" #x283C)
-    ("BRAILLE PATTERN DOTS-13456" #x283D)
-    ("BRAILLE PATTERN DOTS-23456" #x283E)
-    ("BRAILLE PATTERN DOTS-123456" #x283F)
-    ("BRAILLE PATTERN DOTS-7" #x2840)
-    ("BRAILLE PATTERN DOTS-17" #x2841)
-    ("BRAILLE PATTERN DOTS-27" #x2842)
-    ("BRAILLE PATTERN DOTS-127" #x2843)
-    ("BRAILLE PATTERN DOTS-37" #x2844)
-    ("BRAILLE PATTERN DOTS-137" #x2845)
-    ("BRAILLE PATTERN DOTS-237" #x2846)
-    ("BRAILLE PATTERN DOTS-1237" #x2847)
-    ("BRAILLE PATTERN DOTS-47" #x2848)
-    ("BRAILLE PATTERN DOTS-147" #x2849)
-    ("BRAILLE PATTERN DOTS-247" #x284A)
-    ("BRAILLE PATTERN DOTS-1247" #x284B)
-    ("BRAILLE PATTERN DOTS-347" #x284C)
-    ("BRAILLE PATTERN DOTS-1347" #x284D)
-    ("BRAILLE PATTERN DOTS-2347" #x284E)
-    ("BRAILLE PATTERN DOTS-12347" #x284F)
-    ("BRAILLE PATTERN DOTS-57" #x2850)
-    ("BRAILLE PATTERN DOTS-157" #x2851)
-    ("BRAILLE PATTERN DOTS-257" #x2852)
-    ("BRAILLE PATTERN DOTS-1257" #x2853)
-    ("BRAILLE PATTERN DOTS-357" #x2854)
-    ("BRAILLE PATTERN DOTS-1357" #x2855)
-    ("BRAILLE PATTERN DOTS-2357" #x2856)
-    ("BRAILLE PATTERN DOTS-12357" #x2857)
-    ("BRAILLE PATTERN DOTS-457" #x2858)
-    ("BRAILLE PATTERN DOTS-1457" #x2859)
-    ("BRAILLE PATTERN DOTS-2457" #x285A)
-    ("BRAILLE PATTERN DOTS-12457" #x285B)
-    ("BRAILLE PATTERN DOTS-3457" #x285C)
-    ("BRAILLE PATTERN DOTS-13457" #x285D)
-    ("BRAILLE PATTERN DOTS-23457" #x285E)
-    ("BRAILLE PATTERN DOTS-123457" #x285F)
-    ("BRAILLE PATTERN DOTS-67" #x2860)
-    ("BRAILLE PATTERN DOTS-167" #x2861)
-    ("BRAILLE PATTERN DOTS-267" #x2862)
-    ("BRAILLE PATTERN DOTS-1267" #x2863)
-    ("BRAILLE PATTERN DOTS-367" #x2864)
-    ("BRAILLE PATTERN DOTS-1367" #x2865)
-    ("BRAILLE PATTERN DOTS-2367" #x2866)
-    ("BRAILLE PATTERN DOTS-12367" #x2867)
-    ("BRAILLE PATTERN DOTS-467" #x2868)
-    ("BRAILLE PATTERN DOTS-1467" #x2869)
-    ("BRAILLE PATTERN DOTS-2467" #x286A)
-    ("BRAILLE PATTERN DOTS-12467" #x286B)
-    ("BRAILLE PATTERN DOTS-3467" #x286C)
-    ("BRAILLE PATTERN DOTS-13467" #x286D)
-    ("BRAILLE PATTERN DOTS-23467" #x286E)
-    ("BRAILLE PATTERN DOTS-123467" #x286F)
-    ("BRAILLE PATTERN DOTS-567" #x2870)
-    ("BRAILLE PATTERN DOTS-1567" #x2871)
-    ("BRAILLE PATTERN DOTS-2567" #x2872)
-    ("BRAILLE PATTERN DOTS-12567" #x2873)
-    ("BRAILLE PATTERN DOTS-3567" #x2874)
-    ("BRAILLE PATTERN DOTS-13567" #x2875)
-    ("BRAILLE PATTERN DOTS-23567" #x2876)
-    ("BRAILLE PATTERN DOTS-123567" #x2877)
-    ("BRAILLE PATTERN DOTS-4567" #x2878)
-    ("BRAILLE PATTERN DOTS-14567" #x2879)
-    ("BRAILLE PATTERN DOTS-24567" #x287A)
-    ("BRAILLE PATTERN DOTS-124567" #x287B)
-    ("BRAILLE PATTERN DOTS-34567" #x287C)
-    ("BRAILLE PATTERN DOTS-134567" #x287D)
-    ("BRAILLE PATTERN DOTS-234567" #x287E)
-    ("BRAILLE PATTERN DOTS-1234567" #x287F)
-    ("BRAILLE PATTERN DOTS-8" #x2880)
-    ("BRAILLE PATTERN DOTS-18" #x2881)
-    ("BRAILLE PATTERN DOTS-28" #x2882)
-    ("BRAILLE PATTERN DOTS-128" #x2883)
-    ("BRAILLE PATTERN DOTS-38" #x2884)
-    ("BRAILLE PATTERN DOTS-138" #x2885)
-    ("BRAILLE PATTERN DOTS-238" #x2886)
-    ("BRAILLE PATTERN DOTS-1238" #x2887)
-    ("BRAILLE PATTERN DOTS-48" #x2888)
-    ("BRAILLE PATTERN DOTS-148" #x2889)
-    ("BRAILLE PATTERN DOTS-248" #x288A)
-    ("BRAILLE PATTERN DOTS-1248" #x288B)
-    ("BRAILLE PATTERN DOTS-348" #x288C)
-    ("BRAILLE PATTERN DOTS-1348" #x288D)
-    ("BRAILLE PATTERN DOTS-2348" #x288E)
-    ("BRAILLE PATTERN DOTS-12348" #x288F)
-    ("BRAILLE PATTERN DOTS-58" #x2890)
-    ("BRAILLE PATTERN DOTS-158" #x2891)
-    ("BRAILLE PATTERN DOTS-258" #x2892)
-    ("BRAILLE PATTERN DOTS-1258" #x2893)
-    ("BRAILLE PATTERN DOTS-358" #x2894)
-    ("BRAILLE PATTERN DOTS-1358" #x2895)
-    ("BRAILLE PATTERN DOTS-2358" #x2896)
-    ("BRAILLE PATTERN DOTS-12358" #x2897)
-    ("BRAILLE PATTERN DOTS-458" #x2898)
-    ("BRAILLE PATTERN DOTS-1458" #x2899)
-    ("BRAILLE PATTERN DOTS-2458" #x289A)
-    ("BRAILLE PATTERN DOTS-12458" #x289B)
-    ("BRAILLE PATTERN DOTS-3458" #x289C)
-    ("BRAILLE PATTERN DOTS-13458" #x289D)
-    ("BRAILLE PATTERN DOTS-23458" #x289E)
-    ("BRAILLE PATTERN DOTS-123458" #x289F)
-    ("BRAILLE PATTERN DOTS-68" #x28A0)
-    ("BRAILLE PATTERN DOTS-168" #x28A1)
-    ("BRAILLE PATTERN DOTS-268" #x28A2)
-    ("BRAILLE PATTERN DOTS-1268" #x28A3)
-    ("BRAILLE PATTERN DOTS-368" #x28A4)
-    ("BRAILLE PATTERN DOTS-1368" #x28A5)
-    ("BRAILLE PATTERN DOTS-2368" #x28A6)
-    ("BRAILLE PATTERN DOTS-12368" #x28A7)
-    ("BRAILLE PATTERN DOTS-468" #x28A8)
-    ("BRAILLE PATTERN DOTS-1468" #x28A9)
-    ("BRAILLE PATTERN DOTS-2468" #x28AA)
-    ("BRAILLE PATTERN DOTS-12468" #x28AB)
-    ("BRAILLE PATTERN DOTS-3468" #x28AC)
-    ("BRAILLE PATTERN DOTS-13468" #x28AD)
-    ("BRAILLE PATTERN DOTS-23468" #x28AE)
-    ("BRAILLE PATTERN DOTS-123468" #x28AF)
-    ("BRAILLE PATTERN DOTS-568" #x28B0)
-    ("BRAILLE PATTERN DOTS-1568" #x28B1)
-    ("BRAILLE PATTERN DOTS-2568" #x28B2)
-    ("BRAILLE PATTERN DOTS-12568" #x28B3)
-    ("BRAILLE PATTERN DOTS-3568" #x28B4)
-    ("BRAILLE PATTERN DOTS-13568" #x28B5)
-    ("BRAILLE PATTERN DOTS-23568" #x28B6)
-    ("BRAILLE PATTERN DOTS-123568" #x28B7)
-    ("BRAILLE PATTERN DOTS-4568" #x28B8)
-    ("BRAILLE PATTERN DOTS-14568" #x28B9)
-    ("BRAILLE PATTERN DOTS-24568" #x28BA)
-    ("BRAILLE PATTERN DOTS-124568" #x28BB)
-    ("BRAILLE PATTERN DOTS-34568" #x28BC)
-    ("BRAILLE PATTERN DOTS-134568" #x28BD)
-    ("BRAILLE PATTERN DOTS-234568" #x28BE)
-    ("BRAILLE PATTERN DOTS-1234568" #x28BF)
-    ("BRAILLE PATTERN DOTS-78" #x28C0)
-    ("BRAILLE PATTERN DOTS-178" #x28C1)
-    ("BRAILLE PATTERN DOTS-278" #x28C2)
-    ("BRAILLE PATTERN DOTS-1278" #x28C3)
-    ("BRAILLE PATTERN DOTS-378" #x28C4)
-    ("BRAILLE PATTERN DOTS-1378" #x28C5)
-    ("BRAILLE PATTERN DOTS-2378" #x28C6)
-    ("BRAILLE PATTERN DOTS-12378" #x28C7)
-    ("BRAILLE PATTERN DOTS-478" #x28C8)
-    ("BRAILLE PATTERN DOTS-1478" #x28C9)
-    ("BRAILLE PATTERN DOTS-2478" #x28CA)
-    ("BRAILLE PATTERN DOTS-12478" #x28CB)
-    ("BRAILLE PATTERN DOTS-3478" #x28CC)
-    ("BRAILLE PATTERN DOTS-13478" #x28CD)
-    ("BRAILLE PATTERN DOTS-23478" #x28CE)
-    ("BRAILLE PATTERN DOTS-123478" #x28CF)
-    ("BRAILLE PATTERN DOTS-578" #x28D0)
-    ("BRAILLE PATTERN DOTS-1578" #x28D1)
-    ("BRAILLE PATTERN DOTS-2578" #x28D2)
-    ("BRAILLE PATTERN DOTS-12578" #x28D3)
-    ("BRAILLE PATTERN DOTS-3578" #x28D4)
-    ("BRAILLE PATTERN DOTS-13578" #x28D5)
-    ("BRAILLE PATTERN DOTS-23578" #x28D6)
-    ("BRAILLE PATTERN DOTS-123578" #x28D7)
-    ("BRAILLE PATTERN DOTS-4578" #x28D8)
-    ("BRAILLE PATTERN DOTS-14578" #x28D9)
-    ("BRAILLE PATTERN DOTS-24578" #x28DA)
-    ("BRAILLE PATTERN DOTS-124578" #x28DB)
-    ("BRAILLE PATTERN DOTS-34578" #x28DC)
-    ("BRAILLE PATTERN DOTS-134578" #x28DD)
-    ("BRAILLE PATTERN DOTS-234578" #x28DE)
-    ("BRAILLE PATTERN DOTS-1234578" #x28DF)
-    ("BRAILLE PATTERN DOTS-678" #x28E0)
-    ("BRAILLE PATTERN DOTS-1678" #x28E1)
-    ("BRAILLE PATTERN DOTS-2678" #x28E2)
-    ("BRAILLE PATTERN DOTS-12678" #x28E3)
-    ("BRAILLE PATTERN DOTS-3678" #x28E4)
-    ("BRAILLE PATTERN DOTS-13678" #x28E5)
-    ("BRAILLE PATTERN DOTS-23678" #x28E6)
-    ("BRAILLE PATTERN DOTS-123678" #x28E7)
-    ("BRAILLE PATTERN DOTS-4678" #x28E8)
-    ("BRAILLE PATTERN DOTS-14678" #x28E9)
-    ("BRAILLE PATTERN DOTS-24678" #x28EA)
-    ("BRAILLE PATTERN DOTS-124678" #x28EB)
-    ("BRAILLE PATTERN DOTS-34678" #x28EC)
-    ("BRAILLE PATTERN DOTS-134678" #x28ED)
-    ("BRAILLE PATTERN DOTS-234678" #x28EE)
-    ("BRAILLE PATTERN DOTS-1234678" #x28EF)
-    ("BRAILLE PATTERN DOTS-5678" #x28F0)
-    ("BRAILLE PATTERN DOTS-15678" #x28F1)
-    ("BRAILLE PATTERN DOTS-25678" #x28F2)
-    ("BRAILLE PATTERN DOTS-125678" #x28F3)
-    ("BRAILLE PATTERN DOTS-35678" #x28F4)
-    ("BRAILLE PATTERN DOTS-135678" #x28F5)
-    ("BRAILLE PATTERN DOTS-235678" #x28F6)
-    ("BRAILLE PATTERN DOTS-1235678" #x28F7)
-    ("BRAILLE PATTERN DOTS-45678" #x28F8)
-    ("BRAILLE PATTERN DOTS-145678" #x28F9)
-    ("BRAILLE PATTERN DOTS-245678" #x28FA)
-    ("BRAILLE PATTERN DOTS-1245678" #x28FB)
-    ("BRAILLE PATTERN DOTS-345678" #x28FC)
-    ("BRAILLE PATTERN DOTS-1345678" #x28FD)
-    ("BRAILLE PATTERN DOTS-2345678" #x28FE)
-    ("BRAILLE PATTERN DOTS-12345678" #x28FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02900-0297F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02900-0297F.el
deleted file mode 100644
index a70eb7fe83..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02900-0297F.el
+++ /dev/null
@@ -1,130 +0,0 @@
-(nxml-define-char-name-set 'supplemental-arrows-b
-  '(("RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE" #x2900)
-    ("RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE" #x2901)
-    ("LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE" #x2902)
-    ("RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE" #x2903)
-    ("LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE" #x2904)
-    ("RIGHTWARDS TWO-HEADED ARROW FROM BAR" #x2905)
-    ("LEFTWARDS DOUBLE ARROW FROM BAR" #x2906)
-    ("RIGHTWARDS DOUBLE ARROW FROM BAR" #x2907)
-    ("DOWNWARDS ARROW WITH HORIZONTAL STROKE" #x2908)
-    ("UPWARDS ARROW WITH HORIZONTAL STROKE" #x2909)
-    ("UPWARDS TRIPLE ARROW" #x290A)
-    ("DOWNWARDS TRIPLE ARROW" #x290B)
-    ("LEFTWARDS DOUBLE DASH ARROW" #x290C)
-    ("RIGHTWARDS DOUBLE DASH ARROW" #x290D)
-    ("LEFTWARDS TRIPLE DASH ARROW" #x290E)
-    ("RIGHTWARDS TRIPLE DASH ARROW" #x290F)
-    ("RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW" #x2910)
-    ("RIGHTWARDS ARROW WITH DOTTED STEM" #x2911)
-    ("UPWARDS ARROW TO BAR" #x2912)
-    ("DOWNWARDS ARROW TO BAR" #x2913)
-    ("RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE" #x2914)
-    ("RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE" #x2915)
-    ("RIGHTWARDS TWO-HEADED ARROW WITH TAIL" #x2916)
-    ("RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE" #x2917)
-    ("RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE" #x2918)
-    ("LEFTWARDS ARROW-TAIL" #x2919)
-    ("RIGHTWARDS ARROW-TAIL" #x291A)
-    ("LEFTWARDS DOUBLE ARROW-TAIL" #x291B)
-    ("RIGHTWARDS DOUBLE ARROW-TAIL" #x291C)
-    ("LEFTWARDS ARROW TO BLACK DIAMOND" #x291D)
-    ("RIGHTWARDS ARROW TO BLACK DIAMOND" #x291E)
-    ("LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND" #x291F)
-    ("RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND" #x2920)
-    ("NORTH WEST AND SOUTH EAST ARROW" #x2921)
-    ("NORTH EAST AND SOUTH WEST ARROW" #x2922)
-    ("NORTH WEST ARROW WITH HOOK" #x2923)
-    ("NORTH EAST ARROW WITH HOOK" #x2924)
-    ("SOUTH EAST ARROW WITH HOOK" #x2925)
-    ("SOUTH WEST ARROW WITH HOOK" #x2926)
-    ("NORTH WEST ARROW AND NORTH EAST ARROW" #x2927)
-    ("NORTH EAST ARROW AND SOUTH EAST ARROW" #x2928)
-    ("SOUTH EAST ARROW AND SOUTH WEST ARROW" #x2929)
-    ("SOUTH WEST ARROW AND NORTH WEST ARROW" #x292A)
-    ("RISING DIAGONAL CROSSING FALLING DIAGONAL" #x292B)
-    ("FALLING DIAGONAL CROSSING RISING DIAGONAL" #x292C)
-    ("SOUTH EAST ARROW CROSSING NORTH EAST ARROW" #x292D)
-    ("NORTH EAST ARROW CROSSING SOUTH EAST ARROW" #x292E)
-    ("FALLING DIAGONAL CROSSING NORTH EAST ARROW" #x292F)
-    ("RISING DIAGONAL CROSSING SOUTH EAST ARROW" #x2930)
-    ("NORTH EAST ARROW CROSSING NORTH WEST ARROW" #x2931)
-    ("NORTH WEST ARROW CROSSING NORTH EAST ARROW" #x2932)
-    ("WAVE ARROW POINTING DIRECTLY RIGHT" #x2933)
-    ("ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS" #x2934)
-    ("ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS" #x2935)
-    ("ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS" #x2936)
-    ("ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS" #x2937)
-    ("RIGHT-SIDE ARC CLOCKWISE ARROW" #x2938)
-    ("LEFT-SIDE ARC ANTICLOCKWISE ARROW" #x2939)
-    ("TOP ARC ANTICLOCKWISE ARROW" #x293A)
-    ("BOTTOM ARC ANTICLOCKWISE ARROW" #x293B)
-    ("TOP ARC CLOCKWISE ARROW WITH MINUS" #x293C)
-    ("TOP ARC ANTICLOCKWISE ARROW WITH PLUS" #x293D)
-    ("LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW" #x293E)
-    ("LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW" #x293F)
-    ("ANTICLOCKWISE CLOSED CIRCLE ARROW" #x2940)
-    ("CLOCKWISE CLOSED CIRCLE ARROW" #x2941)
-    ("RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW" #x2942)
-    ("LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW" #x2943)
-    ("SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW" #x2944)
-    ("RIGHTWARDS ARROW WITH PLUS BELOW" #x2945)
-    ("LEFTWARDS ARROW WITH PLUS BELOW" #x2946)
-    ("RIGHTWARDS ARROW THROUGH X" #x2947)
-    ("LEFT RIGHT ARROW THROUGH SMALL CIRCLE" #x2948)
-    ("UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE" #x2949)
-    ("LEFT BARB UP RIGHT BARB DOWN HARPOON" #x294A)
-    ("LEFT BARB DOWN RIGHT BARB UP HARPOON" #x294B)
-    ("UP BARB RIGHT DOWN BARB LEFT HARPOON" #x294C)
-    ("UP BARB LEFT DOWN BARB RIGHT HARPOON" #x294D)
-    ("LEFT BARB UP RIGHT BARB UP HARPOON" #x294E)
-    ("UP BARB RIGHT DOWN BARB RIGHT HARPOON" #x294F)
-    ("LEFT BARB DOWN RIGHT BARB DOWN HARPOON" #x2950)
-    ("UP BARB LEFT DOWN BARB LEFT HARPOON" #x2951)
-    ("LEFTWARDS HARPOON WITH BARB UP TO BAR" #x2952)
-    ("RIGHTWARDS HARPOON WITH BARB UP TO BAR" #x2953)
-    ("UPWARDS HARPOON WITH BARB RIGHT TO BAR" #x2954)
-    ("DOWNWARDS HARPOON WITH BARB RIGHT TO BAR" #x2955)
-    ("LEFTWARDS HARPOON WITH BARB DOWN TO BAR" #x2956)
-    ("RIGHTWARDS HARPOON WITH BARB DOWN TO BAR" #x2957)
-    ("UPWARDS HARPOON WITH BARB LEFT TO BAR" #x2958)
-    ("DOWNWARDS HARPOON WITH BARB LEFT TO BAR" #x2959)
-    ("LEFTWARDS HARPOON WITH BARB UP FROM BAR" #x295A)
-    ("RIGHTWARDS HARPOON WITH BARB UP FROM BAR" #x295B)
-    ("UPWARDS HARPOON WITH BARB RIGHT FROM BAR" #x295C)
-    ("DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR" #x295D)
-    ("LEFTWARDS HARPOON WITH BARB DOWN FROM BAR" #x295E)
-    ("RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR" #x295F)
-    ("UPWARDS HARPOON WITH BARB LEFT FROM BAR" #x2960)
-    ("DOWNWARDS HARPOON WITH BARB LEFT FROM BAR" #x2961)
-    ("LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN" #x2962)
-    ("UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT" #x2963)
-    ("RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN" #x2964)
-    ("DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT" #x2965)
-    ("LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP" #x2966)
-    ("LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN" #x2967)
-    ("RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP" #x2968)
-    ("RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN" #x2969)
-    ("LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH" #x296A)
-    ("LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH" #x296B)
-    ("RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH" #x296C)
-    ("RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH" #x296D)
-    ("UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT" #x296E)
-    ("DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT" #x296F)
-    ("RIGHT DOUBLE ARROW WITH ROUNDED HEAD" #x2970)
-    ("EQUALS SIGN ABOVE RIGHTWARDS ARROW" #x2971)
-    ("TILDE OPERATOR ABOVE RIGHTWARDS ARROW" #x2972)
-    ("LEFTWARDS ARROW ABOVE TILDE OPERATOR" #x2973)
-    ("RIGHTWARDS ARROW ABOVE TILDE OPERATOR" #x2974)
-    ("RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO" #x2975)
-    ("LESS-THAN ABOVE LEFTWARDS ARROW" #x2976)
-    ("LEFTWARDS ARROW THROUGH LESS-THAN" #x2977)
-    ("GREATER-THAN ABOVE RIGHTWARDS ARROW" #x2978)
-    ("SUBSET ABOVE RIGHTWARDS ARROW" #x2979)
-    ("LEFTWARDS ARROW THROUGH SUBSET" #x297A)
-    ("SUPERSET ABOVE LEFTWARDS ARROW" #x297B)
-    ("LEFT FISH TAIL" #x297C)
-    ("RIGHT FISH TAIL" #x297D)
-    ("UP FISH TAIL" #x297E)
-    ("DOWN FISH TAIL" #x297F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02980-029FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02980-029FF.el
deleted file mode 100644
index f1e368783a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02980-029FF.el
+++ /dev/null
@@ -1,130 +0,0 @@
-(nxml-define-char-name-set 'miscellaneous-mathematical-symbols-b
-  '(("TRIPLE VERTICAL BAR DELIMITER" #x2980)
-    ("Z NOTATION SPOT" #x2981)
-    ("Z NOTATION TYPE COLON" #x2982)
-    ("LEFT WHITE CURLY BRACKET" #x2983)
-    ("RIGHT WHITE CURLY BRACKET" #x2984)
-    ("LEFT WHITE PARENTHESIS" #x2985)
-    ("RIGHT WHITE PARENTHESIS" #x2986)
-    ("Z NOTATION LEFT IMAGE BRACKET" #x2987)
-    ("Z NOTATION RIGHT IMAGE BRACKET" #x2988)
-    ("Z NOTATION LEFT BINDING BRACKET" #x2989)
-    ("Z NOTATION RIGHT BINDING BRACKET" #x298A)
-    ("LEFT SQUARE BRACKET WITH UNDERBAR" #x298B)
-    ("RIGHT SQUARE BRACKET WITH UNDERBAR" #x298C)
-    ("LEFT SQUARE BRACKET WITH TICK IN TOP CORNER" #x298D)
-    ("RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER" #x298E)
-    ("LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER" #x298F)
-    ("RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER" #x2990)
-    ("LEFT ANGLE BRACKET WITH DOT" #x2991)
-    ("RIGHT ANGLE BRACKET WITH DOT" #x2992)
-    ("LEFT ARC LESS-THAN BRACKET" #x2993)
-    ("RIGHT ARC GREATER-THAN BRACKET" #x2994)
-    ("DOUBLE LEFT ARC GREATER-THAN BRACKET" #x2995)
-    ("DOUBLE RIGHT ARC LESS-THAN BRACKET" #x2996)
-    ("LEFT BLACK TORTOISE SHELL BRACKET" #x2997)
-    ("RIGHT BLACK TORTOISE SHELL BRACKET" #x2998)
-    ("DOTTED FENCE" #x2999)
-    ("VERTICAL ZIGZAG LINE" #x299A)
-    ("MEASURED ANGLE OPENING LEFT" #x299B)
-    ("RIGHT ANGLE VARIANT WITH SQUARE" #x299C)
-    ("MEASURED RIGHT ANGLE WITH DOT" #x299D)
-    ("ANGLE WITH S INSIDE" #x299E)
-    ("ACUTE ANGLE" #x299F)
-    ("SPHERICAL ANGLE OPENING LEFT" #x29A0)
-    ("SPHERICAL ANGLE OPENING UP" #x29A1)
-    ("TURNED ANGLE" #x29A2)
-    ("REVERSED ANGLE" #x29A3)
-    ("ANGLE WITH UNDERBAR" #x29A4)
-    ("REVERSED ANGLE WITH UNDERBAR" #x29A5)
-    ("OBLIQUE ANGLE OPENING UP" #x29A6)
-    ("OBLIQUE ANGLE OPENING DOWN" #x29A7)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT" #x29A8)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT" #x29A9)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT" #x29AA)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT" #x29AB)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP" #x29AC)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP" #x29AD)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN" #x29AE)
-    ("MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN" #x29AF)
-    ("REVERSED EMPTY SET" #x29B0)
-    ("EMPTY SET WITH OVERBAR" #x29B1)
-    ("EMPTY SET WITH SMALL CIRCLE ABOVE" #x29B2)
-    ("EMPTY SET WITH RIGHT ARROW ABOVE" #x29B3)
-    ("EMPTY SET WITH LEFT ARROW ABOVE" #x29B4)
-    ("CIRCLE WITH HORIZONTAL BAR" #x29B5)
-    ("CIRCLED VERTICAL BAR" #x29B6)
-    ("CIRCLED PARALLEL" #x29B7)
-    ("CIRCLED REVERSE SOLIDUS" #x29B8)
-    ("CIRCLED PERPENDICULAR" #x29B9)
-    ("CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR" #x29BA)
-    ("CIRCLE WITH SUPERIMPOSED X" #x29BB)
-    ("CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN" #x29BC)
-    ("UP ARROW THROUGH CIRCLE" #x29BD)
-    ("CIRCLED WHITE BULLET" #x29BE)
-    ("CIRCLED BULLET" #x29BF)
-    ("CIRCLED LESS-THAN" #x29C0)
-    ("CIRCLED GREATER-THAN" #x29C1)
-    ("CIRCLE WITH SMALL CIRCLE TO THE RIGHT" #x29C2)
-    ("CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT" #x29C3)
-    ("SQUARED RISING DIAGONAL SLASH" #x29C4)
-    ("SQUARED FALLING DIAGONAL SLASH" #x29C5)
-    ("SQUARED ASTERISK" #x29C6)
-    ("SQUARED SMALL CIRCLE" #x29C7)
-    ("SQUARED SQUARE" #x29C8)
-    ("TWO JOINED SQUARES" #x29C9)
-    ("TRIANGLE WITH DOT ABOVE" #x29CA)
-    ("TRIANGLE WITH UNDERBAR" #x29CB)
-    ("S IN TRIANGLE" #x29CC)
-    ("TRIANGLE WITH SERIFS AT BOTTOM" #x29CD)
-    ("RIGHT TRIANGLE ABOVE LEFT TRIANGLE" #x29CE)
-    ("LEFT TRIANGLE BESIDE VERTICAL BAR" #x29CF)
-    ("VERTICAL BAR BESIDE RIGHT TRIANGLE" #x29D0)
-    ("BOWTIE WITH LEFT HALF BLACK" #x29D1)
-    ("BOWTIE WITH RIGHT HALF BLACK" #x29D2)
-    ("BLACK BOWTIE" #x29D3)
-    ("TIMES WITH LEFT HALF BLACK" #x29D4)
-    ("TIMES WITH RIGHT HALF BLACK" #x29D5)
-    ("WHITE HOURGLASS" #x29D6)
-    ("BLACK HOURGLASS" #x29D7)
-    ("LEFT WIGGLY FENCE" #x29D8)
-    ("RIGHT WIGGLY FENCE" #x29D9)
-    ("LEFT DOUBLE WIGGLY FENCE" #x29DA)
-    ("RIGHT DOUBLE WIGGLY FENCE" #x29DB)
-    ("INCOMPLETE INFINITY" #x29DC)
-    ("TIE OVER INFINITY" #x29DD)
-    ("INFINITY NEGATED WITH VERTICAL BAR" #x29DE)
-    ("DOUBLE-ENDED MULTIMAP" #x29DF)
-    ("SQUARE WITH CONTOURED OUTLINE" #x29E0)
-    ("INCREASES AS" #x29E1)
-    ("SHUFFLE PRODUCT" #x29E2)
-    ("EQUALS SIGN AND SLANTED PARALLEL" #x29E3)
-    ("EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE" #x29E4)
-    ("IDENTICAL TO AND SLANTED PARALLEL" #x29E5)
-    ("GLEICH STARK" #x29E6)
-    ("THERMODYNAMIC" #x29E7)
-    ("DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK" #x29E8)
-    ("DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK" #x29E9)
-    ("BLACK DIAMOND WITH DOWN ARROW" #x29EA)
-    ("BLACK LOZENGE" #x29EB)
-    ("WHITE CIRCLE WITH DOWN ARROW" #x29EC)
-    ("BLACK CIRCLE WITH DOWN ARROW" #x29ED)
-    ("ERROR-BARRED WHITE SQUARE" #x29EE)
-    ("ERROR-BARRED BLACK SQUARE" #x29EF)
-    ("ERROR-BARRED WHITE DIAMOND" #x29F0)
-    ("ERROR-BARRED BLACK DIAMOND" #x29F1)
-    ("ERROR-BARRED WHITE CIRCLE" #x29F2)
-    ("ERROR-BARRED BLACK CIRCLE" #x29F3)
-    ("RULE-DELAYED" #x29F4)
-    ("REVERSE SOLIDUS OPERATOR" #x29F5)
-    ("SOLIDUS WITH OVERBAR" #x29F6)
-    ("REVERSE SOLIDUS WITH HORIZONTAL STROKE" #x29F7)
-    ("BIG SOLIDUS" #x29F8)
-    ("BIG REVERSE SOLIDUS" #x29F9)
-    ("DOUBLE PLUS" #x29FA)
-    ("TRIPLE PLUS" #x29FB)
-    ("LEFT-POINTING CURVED ANGLE BRACKET" #x29FC)
-    ("RIGHT-POINTING CURVED ANGLE BRACKET" #x29FD)
-    ("TINY" #x29FE)
-    ("MINY" #x29FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02A00-02AFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02A00-02AFF.el
deleted file mode 100644
index e6f9ca432b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02A00-02AFF.el
+++ /dev/null
@@ -1,258 +0,0 @@
-(nxml-define-char-name-set 'supplemental-mathematical-operators
-  '(("N-ARY CIRCLED DOT OPERATOR" #x2A00)
-    ("N-ARY CIRCLED PLUS OPERATOR" #x2A01)
-    ("N-ARY CIRCLED TIMES OPERATOR" #x2A02)
-    ("N-ARY UNION OPERATOR WITH DOT" #x2A03)
-    ("N-ARY UNION OPERATOR WITH PLUS" #x2A04)
-    ("N-ARY SQUARE INTERSECTION OPERATOR" #x2A05)
-    ("N-ARY SQUARE UNION OPERATOR" #x2A06)
-    ("TWO LOGICAL AND OPERATOR" #x2A07)
-    ("TWO LOGICAL OR OPERATOR" #x2A08)
-    ("N-ARY TIMES OPERATOR" #x2A09)
-    ("MODULO TWO SUM" #x2A0A)
-    ("SUMMATION WITH INTEGRAL" #x2A0B)
-    ("QUADRUPLE INTEGRAL OPERATOR" #x2A0C)
-    ("FINITE PART INTEGRAL" #x2A0D)
-    ("INTEGRAL WITH DOUBLE STROKE" #x2A0E)
-    ("INTEGRAL AVERAGE WITH SLASH" #x2A0F)
-    ("CIRCULATION FUNCTION" #x2A10)
-    ("ANTICLOCKWISE INTEGRATION" #x2A11)
-    ("LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE" #x2A12)
-    ("LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE" #x2A13)
-    ("LINE INTEGRATION NOT INCLUDING THE POLE" #x2A14)
-    ("INTEGRAL AROUND A POINT OPERATOR" #x2A15)
-    ("QUATERNION INTEGRAL OPERATOR" #x2A16)
-    ("INTEGRAL WITH LEFTWARDS ARROW WITH HOOK" #x2A17)
-    ("INTEGRAL WITH TIMES SIGN" #x2A18)
-    ("INTEGRAL WITH INTERSECTION" #x2A19)
-    ("INTEGRAL WITH UNION" #x2A1A)
-    ("INTEGRAL WITH OVERBAR" #x2A1B)
-    ("INTEGRAL WITH UNDERBAR" #x2A1C)
-    ("JOIN" #x2A1D)
-    ("LARGE LEFT TRIANGLE OPERATOR" #x2A1E)
-    ("Z NOTATION SCHEMA COMPOSITION" #x2A1F)
-    ("Z NOTATION SCHEMA PIPING" #x2A20)
-    ("Z NOTATION SCHEMA PROJECTION" #x2A21)
-    ("PLUS SIGN WITH SMALL CIRCLE ABOVE" #x2A22)
-    ("PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE" #x2A23)
-    ("PLUS SIGN WITH TILDE ABOVE" #x2A24)
-    ("PLUS SIGN WITH DOT BELOW" #x2A25)
-    ("PLUS SIGN WITH TILDE BELOW" #x2A26)
-    ("PLUS SIGN WITH SUBSCRIPT TWO" #x2A27)
-    ("PLUS SIGN WITH BLACK TRIANGLE" #x2A28)
-    ("MINUS SIGN WITH COMMA ABOVE" #x2A29)
-    ("MINUS SIGN WITH DOT BELOW" #x2A2A)
-    ("MINUS SIGN WITH FALLING DOTS" #x2A2B)
-    ("MINUS SIGN WITH RISING DOTS" #x2A2C)
-    ("PLUS SIGN IN LEFT HALF CIRCLE" #x2A2D)
-    ("PLUS SIGN IN RIGHT HALF CIRCLE" #x2A2E)
-    ("VECTOR OR CROSS PRODUCT" #x2A2F)
-    ("MULTIPLICATION SIGN WITH DOT ABOVE" #x2A30)
-    ("MULTIPLICATION SIGN WITH UNDERBAR" #x2A31)
-    ("SEMIDIRECT PRODUCT WITH BOTTOM CLOSED" #x2A32)
-    ("SMASH PRODUCT" #x2A33)
-    ("MULTIPLICATION SIGN IN LEFT HALF CIRCLE" #x2A34)
-    ("MULTIPLICATION SIGN IN RIGHT HALF CIRCLE" #x2A35)
-    ("CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT" #x2A36)
-    ("MULTIPLICATION SIGN IN DOUBLE CIRCLE" #x2A37)
-    ("CIRCLED DIVISION SIGN" #x2A38)
-    ("PLUS SIGN IN TRIANGLE" #x2A39)
-    ("MINUS SIGN IN TRIANGLE" #x2A3A)
-    ("MULTIPLICATION SIGN IN TRIANGLE" #x2A3B)
-    ("INTERIOR PRODUCT" #x2A3C)
-    ("RIGHTHAND INTERIOR PRODUCT" #x2A3D)
-    ("Z NOTATION RELATIONAL COMPOSITION" #x2A3E)
-    ("AMALGAMATION OR COPRODUCT" #x2A3F)
-    ("INTERSECTION WITH DOT" #x2A40)
-    ("UNION WITH MINUS SIGN" #x2A41)
-    ("UNION WITH OVERBAR" #x2A42)
-    ("INTERSECTION WITH OVERBAR" #x2A43)
-    ("INTERSECTION WITH LOGICAL AND" #x2A44)
-    ("UNION WITH LOGICAL OR" #x2A45)
-    ("UNION ABOVE INTERSECTION" #x2A46)
-    ("INTERSECTION ABOVE UNION" #x2A47)
-    ("UNION ABOVE BAR ABOVE INTERSECTION" #x2A48)
-    ("INTERSECTION ABOVE BAR ABOVE UNION" #x2A49)
-    ("UNION BESIDE AND JOINED WITH UNION" #x2A4A)
-    ("INTERSECTION BESIDE AND JOINED WITH INTERSECTION" #x2A4B)
-    ("CLOSED UNION WITH SERIFS" #x2A4C)
-    ("CLOSED INTERSECTION WITH SERIFS" #x2A4D)
-    ("DOUBLE SQUARE INTERSECTION" #x2A4E)
-    ("DOUBLE SQUARE UNION" #x2A4F)
-    ("CLOSED UNION WITH SERIFS AND SMASH PRODUCT" #x2A50)
-    ("LOGICAL AND WITH DOT ABOVE" #x2A51)
-    ("LOGICAL OR WITH DOT ABOVE" #x2A52)
-    ("DOUBLE LOGICAL AND" #x2A53)
-    ("DOUBLE LOGICAL OR" #x2A54)
-    ("TWO INTERSECTING LOGICAL AND" #x2A55)
-    ("TWO INTERSECTING LOGICAL OR" #x2A56)
-    ("SLOPING LARGE OR" #x2A57)
-    ("SLOPING LARGE AND" #x2A58)
-    ("LOGICAL OR OVERLAPPING LOGICAL AND" #x2A59)
-    ("LOGICAL AND WITH MIDDLE STEM" #x2A5A)
-    ("LOGICAL OR WITH MIDDLE STEM" #x2A5B)
-    ("LOGICAL AND WITH HORIZONTAL DASH" #x2A5C)
-    ("LOGICAL OR WITH HORIZONTAL DASH" #x2A5D)
-    ("LOGICAL AND WITH DOUBLE OVERBAR" #x2A5E)
-    ("LOGICAL AND WITH UNDERBAR" #x2A5F)
-    ("LOGICAL AND WITH DOUBLE UNDERBAR" #x2A60)
-    ("SMALL VEE WITH UNDERBAR" #x2A61)
-    ("LOGICAL OR WITH DOUBLE OVERBAR" #x2A62)
-    ("LOGICAL OR WITH DOUBLE UNDERBAR" #x2A63)
-    ("Z NOTATION DOMAIN ANTIRESTRICTION" #x2A64)
-    ("Z NOTATION RANGE ANTIRESTRICTION" #x2A65)
-    ("EQUALS SIGN WITH DOT BELOW" #x2A66)
-    ("IDENTICAL WITH DOT ABOVE" #x2A67)
-    ("TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE" #x2A68)
-    ("TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE" #x2A69)
-    ("TILDE OPERATOR WITH DOT ABOVE" #x2A6A)
-    ("TILDE OPERATOR WITH RISING DOTS" #x2A6B)
-    ("SIMILAR MINUS SIMILAR" #x2A6C)
-    ("CONGRUENT WITH DOT ABOVE" #x2A6D)
-    ("EQUALS WITH ASTERISK" #x2A6E)
-    ("ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT" #x2A6F)
-    ("APPROXIMATELY EQUAL OR EQUAL TO" #x2A70)
-    ("EQUALS SIGN ABOVE PLUS SIGN" #x2A71)
-    ("PLUS SIGN ABOVE EQUALS SIGN" #x2A72)
-    ("EQUALS SIGN ABOVE TILDE OPERATOR" #x2A73)
-    ("DOUBLE COLON EQUAL" #x2A74)
-    ("TWO CONSECUTIVE EQUALS SIGNS" #x2A75)
-    ("THREE CONSECUTIVE EQUALS SIGNS" #x2A76)
-    ("EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW" #x2A77)
-    ("EQUIVALENT WITH FOUR DOTS ABOVE" #x2A78)
-    ("LESS-THAN WITH CIRCLE INSIDE" #x2A79)
-    ("GREATER-THAN WITH CIRCLE INSIDE" #x2A7A)
-    ("LESS-THAN WITH QUESTION MARK ABOVE" #x2A7B)
-    ("GREATER-THAN WITH QUESTION MARK ABOVE" #x2A7C)
-    ("LESS-THAN OR SLANTED EQUAL TO" #x2A7D)
-    ("GREATER-THAN OR SLANTED EQUAL TO" #x2A7E)
-    ("LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE" #x2A7F)
-    ("GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE" #x2A80)
-    ("LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE" #x2A81)
-    ("GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE" #x2A82)
-    ("LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT" #x2A83)
-    ("GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT" #x2A84)
-    ("LESS-THAN OR APPROXIMATE" #x2A85)
-    ("GREATER-THAN OR APPROXIMATE" #x2A86)
-    ("LESS-THAN AND SINGLE-LINE NOT EQUAL TO" #x2A87)
-    ("GREATER-THAN AND SINGLE-LINE NOT EQUAL TO" #x2A88)
-    ("LESS-THAN AND NOT APPROXIMATE" #x2A89)
-    ("GREATER-THAN AND NOT APPROXIMATE" #x2A8A)
-    ("LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN" #x2A8B)
-    ("GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN" #x2A8C)
-    ("LESS-THAN ABOVE SIMILAR OR EQUAL" #x2A8D)
-    ("GREATER-THAN ABOVE SIMILAR OR EQUAL" #x2A8E)
-    ("LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN" #x2A8F)
-    ("GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN" #x2A90)
-    ("LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL" #x2A91)
-    ("GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL" #x2A92)
-    ("LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL" #x2A93)
-    ("GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL" #x2A94)
-    ("SLANTED EQUAL TO OR LESS-THAN" #x2A95)
-    ("SLANTED EQUAL TO OR GREATER-THAN" #x2A96)
-    ("SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE" #x2A97)
-    ("SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE" #x2A98)
-    ("DOUBLE-LINE EQUAL TO OR LESS-THAN" #x2A99)
-    ("DOUBLE-LINE EQUAL TO OR GREATER-THAN" #x2A9A)
-    ("DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN" #x2A9B)
-    ("DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN" #x2A9C)
-    ("SIMILAR OR LESS-THAN" #x2A9D)
-    ("SIMILAR OR GREATER-THAN" #x2A9E)
-    ("SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN" #x2A9F)
-    ("SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN" #x2AA0)
-    ("DOUBLE NESTED LESS-THAN" #x2AA1)
-    ("DOUBLE NESTED GREATER-THAN" #x2AA2)
-    ("DOUBLE NESTED LESS-THAN WITH UNDERBAR" #x2AA3)
-    ("GREATER-THAN OVERLAPPING LESS-THAN" #x2AA4)
-    ("GREATER-THAN BESIDE LESS-THAN" #x2AA5)
-    ("LESS-THAN CLOSED BY CURVE" #x2AA6)
-    ("GREATER-THAN CLOSED BY CURVE" #x2AA7)
-    ("LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL" #x2AA8)
-    ("GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL" #x2AA9)
-    ("SMALLER THAN" #x2AAA)
-    ("LARGER THAN" #x2AAB)
-    ("SMALLER THAN OR EQUAL TO" #x2AAC)
-    ("LARGER THAN OR EQUAL TO" #x2AAD)
-    ("EQUALS SIGN WITH BUMPY ABOVE" #x2AAE)
-    ("PRECEDES ABOVE SINGLE-LINE EQUALS SIGN" #x2AAF)
-    ("SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN" #x2AB0)
-    ("PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO" #x2AB1)
-    ("SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO" #x2AB2)
-    ("PRECEDES ABOVE EQUALS SIGN" #x2AB3)
-    ("SUCCEEDS ABOVE EQUALS SIGN" #x2AB4)
-    ("PRECEDES ABOVE NOT EQUAL TO" #x2AB5)
-    ("SUCCEEDS ABOVE NOT EQUAL TO" #x2AB6)
-    ("PRECEDES ABOVE ALMOST EQUAL TO" #x2AB7)
-    ("SUCCEEDS ABOVE ALMOST EQUAL TO" #x2AB8)
-    ("PRECEDES ABOVE NOT ALMOST EQUAL TO" #x2AB9)
-    ("SUCCEEDS ABOVE NOT ALMOST EQUAL TO" #x2ABA)
-    ("DOUBLE PRECEDES" #x2ABB)
-    ("DOUBLE SUCCEEDS" #x2ABC)
-    ("SUBSET WITH DOT" #x2ABD)
-    ("SUPERSET WITH DOT" #x2ABE)
-    ("SUBSET WITH PLUS SIGN BELOW" #x2ABF)
-    ("SUPERSET WITH PLUS SIGN BELOW" #x2AC0)
-    ("SUBSET WITH MULTIPLICATION SIGN BELOW" #x2AC1)
-    ("SUPERSET WITH MULTIPLICATION SIGN BELOW" #x2AC2)
-    ("SUBSET OF OR EQUAL TO WITH DOT ABOVE" #x2AC3)
-    ("SUPERSET OF OR EQUAL TO WITH DOT ABOVE" #x2AC4)
-    ("SUBSET OF ABOVE EQUALS SIGN" #x2AC5)
-    ("SUPERSET OF ABOVE EQUALS SIGN" #x2AC6)
-    ("SUBSET OF ABOVE TILDE OPERATOR" #x2AC7)
-    ("SUPERSET OF ABOVE TILDE OPERATOR" #x2AC8)
-    ("SUBSET OF ABOVE ALMOST EQUAL TO" #x2AC9)
-    ("SUPERSET OF ABOVE ALMOST EQUAL TO" #x2ACA)
-    ("SUBSET OF ABOVE NOT EQUAL TO" #x2ACB)
-    ("SUPERSET OF ABOVE NOT EQUAL TO" #x2ACC)
-    ("SQUARE LEFT OPEN BOX OPERATOR" #x2ACD)
-    ("SQUARE RIGHT OPEN BOX OPERATOR" #x2ACE)
-    ("CLOSED SUBSET" #x2ACF)
-    ("CLOSED SUPERSET" #x2AD0)
-    ("CLOSED SUBSET OR EQUAL TO" #x2AD1)
-    ("CLOSED SUPERSET OR EQUAL TO" #x2AD2)
-    ("SUBSET ABOVE SUPERSET" #x2AD3)
-    ("SUPERSET ABOVE SUBSET" #x2AD4)
-    ("SUBSET ABOVE SUBSET" #x2AD5)
-    ("SUPERSET ABOVE SUPERSET" #x2AD6)
-    ("SUPERSET BESIDE SUBSET" #x2AD7)
-    ("SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET" #x2AD8)
-    ("ELEMENT OF OPENING DOWNWARDS" #x2AD9)
-    ("PITCHFORK WITH TEE TOP" #x2ADA)
-    ("TRANSVERSAL INTERSECTION" #x2ADB)
-    ("FORKING" #x2ADC)
-    ("NONFORKING" #x2ADD)
-    ("SHORT LEFT TACK" #x2ADE)
-    ("SHORT DOWN TACK" #x2ADF)
-    ("SHORT UP TACK" #x2AE0)
-    ("PERPENDICULAR WITH S" #x2AE1)
-    ("VERTICAL BAR TRIPLE RIGHT TURNSTILE" #x2AE2)
-    ("DOUBLE VERTICAL BAR LEFT TURNSTILE" #x2AE3)
-    ("VERTICAL BAR DOUBLE LEFT TURNSTILE" #x2AE4)
-    ("DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE" #x2AE5)
-    ("LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL" #x2AE6)
-    ("SHORT DOWN TACK WITH OVERBAR" #x2AE7)
-    ("SHORT UP TACK WITH UNDERBAR" #x2AE8)
-    ("SHORT UP TACK ABOVE SHORT DOWN TACK" #x2AE9)
-    ("DOUBLE DOWN TACK" #x2AEA)
-    ("DOUBLE UP TACK" #x2AEB)
-    ("DOUBLE STROKE NOT SIGN" #x2AEC)
-    ("REVERSED DOUBLE STROKE NOT SIGN" #x2AED)
-    ("DOES NOT DIVIDE WITH REVERSED NEGATION SLASH" #x2AEE)
-    ("VERTICAL LINE WITH CIRCLE ABOVE" #x2AEF)
-    ("VERTICAL LINE WITH CIRCLE BELOW" #x2AF0)
-    ("DOWN TACK WITH CIRCLE BELOW" #x2AF1)
-    ("PARALLEL WITH HORIZONTAL STROKE" #x2AF2)
-    ("PARALLEL WITH TILDE OPERATOR" #x2AF3)
-    ("TRIPLE VERTICAL BAR BINARY RELATION" #x2AF4)
-    ("TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE" #x2AF5)
-    ("TRIPLE COLON OPERATOR" #x2AF6)
-    ("TRIPLE NESTED LESS-THAN" #x2AF7)
-    ("TRIPLE NESTED GREATER-THAN" #x2AF8)
-    ("DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO" #x2AF9)
-    ("DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO" #x2AFA)
-    ("TRIPLE SOLIDUS BINARY RELATION" #x2AFB)
-    ("LARGE TRIPLE VERTICAL BAR OPERATOR" #x2AFC)
-    ("DOUBLE SOLIDUS OPERATOR" #x2AFD)
-    ("WHITE VERTICAL BAR" #x2AFE)
-    ("N-ARY WHITE VERTICAL BAR" #x2AFF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02E80-02EFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02E80-02EFF.el
deleted file mode 100644
index 3cb901803b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02E80-02EFF.el
+++ /dev/null
@@ -1,117 +0,0 @@
-(nxml-define-char-name-set 'cjk-radicals-supplement
-  '(("CJK RADICAL REPEAT" #x2E80)
-    ("CJK RADICAL CLIFF" #x2E81)
-    ("CJK RADICAL SECOND ONE" #x2E82)
-    ("CJK RADICAL SECOND TWO" #x2E83)
-    ("CJK RADICAL SECOND THREE" #x2E84)
-    ("CJK RADICAL PERSON" #x2E85)
-    ("CJK RADICAL BOX" #x2E86)
-    ("CJK RADICAL TABLE" #x2E87)
-    ("CJK RADICAL KNIFE ONE" #x2E88)
-    ("CJK RADICAL KNIFE TWO" #x2E89)
-    ("CJK RADICAL DIVINATION" #x2E8A)
-    ("CJK RADICAL SEAL" #x2E8B)
-    ("CJK RADICAL SMALL ONE" #x2E8C)
-    ("CJK RADICAL SMALL TWO" #x2E8D)
-    ("CJK RADICAL LAME ONE" #x2E8E)
-    ("CJK RADICAL LAME TWO" #x2E8F)
-    ("CJK RADICAL LAME THREE" #x2E90)
-    ("CJK RADICAL LAME FOUR" #x2E91)
-    ("CJK RADICAL SNAKE" #x2E92)
-    ("CJK RADICAL THREAD" #x2E93)
-    ("CJK RADICAL SNOUT ONE" #x2E94)
-    ("CJK RADICAL SNOUT TWO" #x2E95)
-    ("CJK RADICAL HEART ONE" #x2E96)
-    ("CJK RADICAL HEART TWO" #x2E97)
-    ("CJK RADICAL HAND" #x2E98)
-    ("CJK RADICAL RAP" #x2E99)
-    ("CJK RADICAL CHOKE" #x2E9B)
-    ("CJK RADICAL SUN" #x2E9C)
-    ("CJK RADICAL MOON" #x2E9D)
-    ("CJK RADICAL DEATH" #x2E9E)
-    ("CJK RADICAL MOTHER" #x2E9F)
-    ("CJK RADICAL CIVILIAN" #x2EA0)
-    ("CJK RADICAL WATER ONE" #x2EA1)
-    ("CJK RADICAL WATER TWO" #x2EA2)
-    ("CJK RADICAL FIRE" #x2EA3)
-    ("CJK RADICAL PAW ONE" #x2EA4)
-    ("CJK RADICAL PAW TWO" #x2EA5)
-    ("CJK RADICAL SIMPLIFIED HALF TREE TRUNK" #x2EA6)
-    ("CJK RADICAL COW" #x2EA7)
-    ("CJK RADICAL DOG" #x2EA8)
-    ("CJK RADICAL JADE" #x2EA9)
-    ("CJK RADICAL BOLT OF CLOTH" #x2EAA)
-    ("CJK RADICAL EYE" #x2EAB)
-    ("CJK RADICAL SPIRIT ONE" #x2EAC)
-    ("CJK RADICAL SPIRIT TWO" #x2EAD)
-    ("CJK RADICAL BAMBOO" #x2EAE)
-    ("CJK RADICAL SILK" #x2EAF)
-    ("CJK RADICAL C-SIMPLIFIED SILK" #x2EB0)
-    ("CJK RADICAL NET ONE" #x2EB1)
-    ("CJK RADICAL NET TWO" #x2EB2)
-    ("CJK RADICAL NET THREE" #x2EB3)
-    ("CJK RADICAL NET FOUR" #x2EB4)
-    ("CJK RADICAL MESH" #x2EB5)
-    ("CJK RADICAL SHEEP" #x2EB6)
-    ("CJK RADICAL RAM" #x2EB7)
-    ("CJK RADICAL EWE" #x2EB8)
-    ("CJK RADICAL OLD" #x2EB9)
-    ("CJK RADICAL BRUSH ONE" #x2EBA)
-    ("CJK RADICAL BRUSH TWO" #x2EBB)
-    ("CJK RADICAL MEAT" #x2EBC)
-    ("CJK RADICAL MORTAR" #x2EBD)
-    ("CJK RADICAL GRASS ONE" #x2EBE)
-    ("CJK RADICAL GRASS TWO" #x2EBF)
-    ("CJK RADICAL GRASS THREE" #x2EC0)
-    ("CJK RADICAL TIGER" #x2EC1)
-    ("CJK RADICAL CLOTHES" #x2EC2)
-    ("CJK RADICAL WEST ONE" #x2EC3)
-    ("CJK RADICAL WEST TWO" #x2EC4)
-    ("CJK RADICAL C-SIMPLIFIED SEE" #x2EC5)
-    ("CJK RADICAL SIMPLIFIED HORN" #x2EC6)
-    ("CJK RADICAL HORN" #x2EC7)
-    ("CJK RADICAL C-SIMPLIFIED SPEECH" #x2EC8)
-    ("CJK RADICAL C-SIMPLIFIED SHELL" #x2EC9)
-    ("CJK RADICAL FOOT" #x2ECA)
-    ("CJK RADICAL C-SIMPLIFIED CART" #x2ECB)
-    ("CJK RADICAL SIMPLIFIED WALK" #x2ECC)
-    ("CJK RADICAL WALK ONE" #x2ECD)
-    ("CJK RADICAL WALK TWO" #x2ECE)
-    ("CJK RADICAL CITY" #x2ECF)
-    ("CJK RADICAL C-SIMPLIFIED GOLD" #x2ED0)
-    ("CJK RADICAL LONG ONE" #x2ED1)
-    ("CJK RADICAL LONG TWO" #x2ED2)
-    ("CJK RADICAL C-SIMPLIFIED LONG" #x2ED3)
-    ("CJK RADICAL C-SIMPLIFIED GATE" #x2ED4)
-    ("CJK RADICAL MOUND ONE" #x2ED5)
-    ("CJK RADICAL MOUND TWO" #x2ED6)
-    ("CJK RADICAL RAIN" #x2ED7)
-    ("CJK RADICAL BLUE" #x2ED8)
-    ("CJK RADICAL C-SIMPLIFIED TANNED LEATHER" #x2ED9)
-    ("CJK RADICAL C-SIMPLIFIED LEAF" #x2EDA)
-    ("CJK RADICAL C-SIMPLIFIED WIND" #x2EDB)
-    ("CJK RADICAL C-SIMPLIFIED FLY" #x2EDC)
-    ("CJK RADICAL EAT ONE" #x2EDD)
-    ("CJK RADICAL EAT TWO" #x2EDE)
-    ("CJK RADICAL EAT THREE" #x2EDF)
-    ("CJK RADICAL C-SIMPLIFIED EAT" #x2EE0)
-    ("CJK RADICAL HEAD" #x2EE1)
-    ("CJK RADICAL C-SIMPLIFIED HORSE" #x2EE2)
-    ("CJK RADICAL BONE" #x2EE3)
-    ("CJK RADICAL GHOST" #x2EE4)
-    ("CJK RADICAL C-SIMPLIFIED FISH" #x2EE5)
-    ("CJK RADICAL C-SIMPLIFIED BIRD" #x2EE6)
-    ("CJK RADICAL C-SIMPLIFIED SALT" #x2EE7)
-    ("CJK RADICAL SIMPLIFIED WHEAT" #x2EE8)
-    ("CJK RADICAL SIMPLIFIED YELLOW" #x2EE9)
-    ("CJK RADICAL C-SIMPLIFIED FROG" #x2EEA)
-    ("CJK RADICAL J-SIMPLIFIED EVEN" #x2EEB)
-    ("CJK RADICAL C-SIMPLIFIED EVEN" #x2EEC)
-    ("CJK RADICAL J-SIMPLIFIED TOOTH" #x2EED)
-    ("CJK RADICAL C-SIMPLIFIED TOOTH" #x2EEE)
-    ("CJK RADICAL J-SIMPLIFIED DRAGON" #x2EEF)
-    ("CJK RADICAL C-SIMPLIFIED DRAGON" #x2EF0)
-    ("CJK RADICAL TURTLE" #x2EF1)
-    ("CJK RADICAL J-SIMPLIFIED TURTLE" #x2EF2)
-    ("CJK RADICAL C-SIMPLIFIED TURTLE" #x2EF3)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02F00-02FDF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02F00-02FDF.el
deleted file mode 100644
index 89c202709f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02F00-02FDF.el
+++ /dev/null
@@ -1,216 +0,0 @@
-(nxml-define-char-name-set 'kangxi-radicals
-  '(("KANGXI RADICAL ONE" #x2F00)
-    ("KANGXI RADICAL LINE" #x2F01)
-    ("KANGXI RADICAL DOT" #x2F02)
-    ("KANGXI RADICAL SLASH" #x2F03)
-    ("KANGXI RADICAL SECOND" #x2F04)
-    ("KANGXI RADICAL HOOK" #x2F05)
-    ("KANGXI RADICAL TWO" #x2F06)
-    ("KANGXI RADICAL LID" #x2F07)
-    ("KANGXI RADICAL MAN" #x2F08)
-    ("KANGXI RADICAL LEGS" #x2F09)
-    ("KANGXI RADICAL ENTER" #x2F0A)
-    ("KANGXI RADICAL EIGHT" #x2F0B)
-    ("KANGXI RADICAL DOWN BOX" #x2F0C)
-    ("KANGXI RADICAL COVER" #x2F0D)
-    ("KANGXI RADICAL ICE" #x2F0E)
-    ("KANGXI RADICAL TABLE" #x2F0F)
-    ("KANGXI RADICAL OPEN BOX" #x2F10)
-    ("KANGXI RADICAL KNIFE" #x2F11)
-    ("KANGXI RADICAL POWER" #x2F12)
-    ("KANGXI RADICAL WRAP" #x2F13)
-    ("KANGXI RADICAL SPOON" #x2F14)
-    ("KANGXI RADICAL RIGHT OPEN BOX" #x2F15)
-    ("KANGXI RADICAL HIDING ENCLOSURE" #x2F16)
-    ("KANGXI RADICAL TEN" #x2F17)
-    ("KANGXI RADICAL DIVINATION" #x2F18)
-    ("KANGXI RADICAL SEAL" #x2F19)
-    ("KANGXI RADICAL CLIFF" #x2F1A)
-    ("KANGXI RADICAL PRIVATE" #x2F1B)
-    ("KANGXI RADICAL AGAIN" #x2F1C)
-    ("KANGXI RADICAL MOUTH" #x2F1D)
-    ("KANGXI RADICAL ENCLOSURE" #x2F1E)
-    ("KANGXI RADICAL EARTH" #x2F1F)
-    ("KANGXI RADICAL SCHOLAR" #x2F20)
-    ("KANGXI RADICAL GO" #x2F21)
-    ("KANGXI RADICAL GO SLOWLY" #x2F22)
-    ("KANGXI RADICAL EVENING" #x2F23)
-    ("KANGXI RADICAL BIG" #x2F24)
-    ("KANGXI RADICAL WOMAN" #x2F25)
-    ("KANGXI RADICAL CHILD" #x2F26)
-    ("KANGXI RADICAL ROOF" #x2F27)
-    ("KANGXI RADICAL INCH" #x2F28)
-    ("KANGXI RADICAL SMALL" #x2F29)
-    ("KANGXI RADICAL LAME" #x2F2A)
-    ("KANGXI RADICAL CORPSE" #x2F2B)
-    ("KANGXI RADICAL SPROUT" #x2F2C)
-    ("KANGXI RADICAL MOUNTAIN" #x2F2D)
-    ("KANGXI RADICAL RIVER" #x2F2E)
-    ("KANGXI RADICAL WORK" #x2F2F)
-    ("KANGXI RADICAL ONESELF" #x2F30)
-    ("KANGXI RADICAL TURBAN" #x2F31)
-    ("KANGXI RADICAL DRY" #x2F32)
-    ("KANGXI RADICAL SHORT THREAD" #x2F33)
-    ("KANGXI RADICAL DOTTED CLIFF" #x2F34)
-    ("KANGXI RADICAL LONG STRIDE" #x2F35)
-    ("KANGXI RADICAL TWO HANDS" #x2F36)
-    ("KANGXI RADICAL SHOOT" #x2F37)
-    ("KANGXI RADICAL BOW" #x2F38)
-    ("KANGXI RADICAL SNOUT" #x2F39)
-    ("KANGXI RADICAL BRISTLE" #x2F3A)
-    ("KANGXI RADICAL STEP" #x2F3B)
-    ("KANGXI RADICAL HEART" #x2F3C)
-    ("KANGXI RADICAL HALBERD" #x2F3D)
-    ("KANGXI RADICAL DOOR" #x2F3E)
-    ("KANGXI RADICAL HAND" #x2F3F)
-    ("KANGXI RADICAL BRANCH" #x2F40)
-    ("KANGXI RADICAL RAP" #x2F41)
-    ("KANGXI RADICAL SCRIPT" #x2F42)
-    ("KANGXI RADICAL DIPPER" #x2F43)
-    ("KANGXI RADICAL AXE" #x2F44)
-    ("KANGXI RADICAL SQUARE" #x2F45)
-    ("KANGXI RADICAL NOT" #x2F46)
-    ("KANGXI RADICAL SUN" #x2F47)
-    ("KANGXI RADICAL SAY" #x2F48)
-    ("KANGXI RADICAL MOON" #x2F49)
-    ("KANGXI RADICAL TREE" #x2F4A)
-    ("KANGXI RADICAL LACK" #x2F4B)
-    ("KANGXI RADICAL STOP" #x2F4C)
-    ("KANGXI RADICAL DEATH" #x2F4D)
-    ("KANGXI RADICAL WEAPON" #x2F4E)
-    ("KANGXI RADICAL DO NOT" #x2F4F)
-    ("KANGXI RADICAL COMPARE" #x2F50)
-    ("KANGXI RADICAL FUR" #x2F51)
-    ("KANGXI RADICAL CLAN" #x2F52)
-    ("KANGXI RADICAL STEAM" #x2F53)
-    ("KANGXI RADICAL WATER" #x2F54)
-    ("KANGXI RADICAL FIRE" #x2F55)
-    ("KANGXI RADICAL CLAW" #x2F56)
-    ("KANGXI RADICAL FATHER" #x2F57)
-    ("KANGXI RADICAL DOUBLE X" #x2F58)
-    ("KANGXI RADICAL HALF TREE TRUNK" #x2F59)
-    ("KANGXI RADICAL SLICE" #x2F5A)
-    ("KANGXI RADICAL FANG" #x2F5B)
-    ("KANGXI RADICAL COW" #x2F5C)
-    ("KANGXI RADICAL DOG" #x2F5D)
-    ("KANGXI RADICAL PROFOUND" #x2F5E)
-    ("KANGXI RADICAL JADE" #x2F5F)
-    ("KANGXI RADICAL MELON" #x2F60)
-    ("KANGXI RADICAL TILE" #x2F61)
-    ("KANGXI RADICAL SWEET" #x2F62)
-    ("KANGXI RADICAL LIFE" #x2F63)
-    ("KANGXI RADICAL USE" #x2F64)
-    ("KANGXI RADICAL FIELD" #x2F65)
-    ("KANGXI RADICAL BOLT OF CLOTH" #x2F66)
-    ("KANGXI RADICAL SICKNESS" #x2F67)
-    ("KANGXI RADICAL DOTTED TENT" #x2F68)
-    ("KANGXI RADICAL WHITE" #x2F69)
-    ("KANGXI RADICAL SKIN" #x2F6A)
-    ("KANGXI RADICAL DISH" #x2F6B)
-    ("KANGXI RADICAL EYE" #x2F6C)
-    ("KANGXI RADICAL SPEAR" #x2F6D)
-    ("KANGXI RADICAL ARROW" #x2F6E)
-    ("KANGXI RADICAL STONE" #x2F6F)
-    ("KANGXI RADICAL SPIRIT" #x2F70)
-    ("KANGXI RADICAL TRACK" #x2F71)
-    ("KANGXI RADICAL GRAIN" #x2F72)
-    ("KANGXI RADICAL CAVE" #x2F73)
-    ("KANGXI RADICAL STAND" #x2F74)
-    ("KANGXI RADICAL BAMBOO" #x2F75)
-    ("KANGXI RADICAL RICE" #x2F76)
-    ("KANGXI RADICAL SILK" #x2F77)
-    ("KANGXI RADICAL JAR" #x2F78)
-    ("KANGXI RADICAL NET" #x2F79)
-    ("KANGXI RADICAL SHEEP" #x2F7A)
-    ("KANGXI RADICAL FEATHER" #x2F7B)
-    ("KANGXI RADICAL OLD" #x2F7C)
-    ("KANGXI RADICAL AND" #x2F7D)
-    ("KANGXI RADICAL PLOW" #x2F7E)
-    ("KANGXI RADICAL EAR" #x2F7F)
-    ("KANGXI RADICAL BRUSH" #x2F80)
-    ("KANGXI RADICAL MEAT" #x2F81)
-    ("KANGXI RADICAL MINISTER" #x2F82)
-    ("KANGXI RADICAL SELF" #x2F83)
-    ("KANGXI RADICAL ARRIVE" #x2F84)
-    ("KANGXI RADICAL MORTAR" #x2F85)
-    ("KANGXI RADICAL TONGUE" #x2F86)
-    ("KANGXI RADICAL OPPOSE" #x2F87)
-    ("KANGXI RADICAL BOAT" #x2F88)
-    ("KANGXI RADICAL STOPPING" #x2F89)
-    ("KANGXI RADICAL COLOR" #x2F8A)
-    ("KANGXI RADICAL GRASS" #x2F8B)
-    ("KANGXI RADICAL TIGER" #x2F8C)
-    ("KANGXI RADICAL INSECT" #x2F8D)
-    ("KANGXI RADICAL BLOOD" #x2F8E)
-    ("KANGXI RADICAL WALK ENCLOSURE" #x2F8F)
-    ("KANGXI RADICAL CLOTHES" #x2F90)
-    ("KANGXI RADICAL WEST" #x2F91)
-    ("KANGXI RADICAL SEE" #x2F92)
-    ("KANGXI RADICAL HORN" #x2F93)
-    ("KANGXI RADICAL SPEECH" #x2F94)
-    ("KANGXI RADICAL VALLEY" #x2F95)
-    ("KANGXI RADICAL BEAN" #x2F96)
-    ("KANGXI RADICAL PIG" #x2F97)
-    ("KANGXI RADICAL BADGER" #x2F98)
-    ("KANGXI RADICAL SHELL" #x2F99)
-    ("KANGXI RADICAL RED" #x2F9A)
-    ("KANGXI RADICAL RUN" #x2F9B)
-    ("KANGXI RADICAL FOOT" #x2F9C)
-    ("KANGXI RADICAL BODY" #x2F9D)
-    ("KANGXI RADICAL CART" #x2F9E)
-    ("KANGXI RADICAL BITTER" #x2F9F)
-    ("KANGXI RADICAL MORNING" #x2FA0)
-    ("KANGXI RADICAL WALK" #x2FA1)
-    ("KANGXI RADICAL CITY" #x2FA2)
-    ("KANGXI RADICAL WINE" #x2FA3)
-    ("KANGXI RADICAL DISTINGUISH" #x2FA4)
-    ("KANGXI RADICAL VILLAGE" #x2FA5)
-    ("KANGXI RADICAL GOLD" #x2FA6)
-    ("KANGXI RADICAL LONG" #x2FA7)
-    ("KANGXI RADICAL GATE" #x2FA8)
-    ("KANGXI RADICAL MOUND" #x2FA9)
-    ("KANGXI RADICAL SLAVE" #x2FAA)
-    ("KANGXI RADICAL SHORT TAILED BIRD" #x2FAB)
-    ("KANGXI RADICAL RAIN" #x2FAC)
-    ("KANGXI RADICAL BLUE" #x2FAD)
-    ("KANGXI RADICAL WRONG" #x2FAE)
-    ("KANGXI RADICAL FACE" #x2FAF)
-    ("KANGXI RADICAL LEATHER" #x2FB0)
-    ("KANGXI RADICAL TANNED LEATHER" #x2FB1)
-    ("KANGXI RADICAL LEEK" #x2FB2)
-    ("KANGXI RADICAL SOUND" #x2FB3)
-    ("KANGXI RADICAL LEAF" #x2FB4)
-    ("KANGXI RADICAL WIND" #x2FB5)
-    ("KANGXI RADICAL FLY" #x2FB6)
-    ("KANGXI RADICAL EAT" #x2FB7)
-    ("KANGXI RADICAL HEAD" #x2FB8)
-    ("KANGXI RADICAL FRAGRANT" #x2FB9)
-    ("KANGXI RADICAL HORSE" #x2FBA)
-    ("KANGXI RADICAL BONE" #x2FBB)
-    ("KANGXI RADICAL TALL" #x2FBC)
-    ("KANGXI RADICAL HAIR" #x2FBD)
-    ("KANGXI RADICAL FIGHT" #x2FBE)
-    ("KANGXI RADICAL SACRIFICIAL WINE" #x2FBF)
-    ("KANGXI RADICAL CAULDRON" #x2FC0)
-    ("KANGXI RADICAL GHOST" #x2FC1)
-    ("KANGXI RADICAL FISH" #x2FC2)
-    ("KANGXI RADICAL BIRD" #x2FC3)
-    ("KANGXI RADICAL SALT" #x2FC4)
-    ("KANGXI RADICAL DEER" #x2FC5)
-    ("KANGXI RADICAL WHEAT" #x2FC6)
-    ("KANGXI RADICAL HEMP" #x2FC7)
-    ("KANGXI RADICAL YELLOW" #x2FC8)
-    ("KANGXI RADICAL MILLET" #x2FC9)
-    ("KANGXI RADICAL BLACK" #x2FCA)
-    ("KANGXI RADICAL EMBROIDERY" #x2FCB)
-    ("KANGXI RADICAL FROG" #x2FCC)
-    ("KANGXI RADICAL TRIPOD" #x2FCD)
-    ("KANGXI RADICAL DRUM" #x2FCE)
-    ("KANGXI RADICAL RAT" #x2FCF)
-    ("KANGXI RADICAL NOSE" #x2FD0)
-    ("KANGXI RADICAL EVEN" #x2FD1)
-    ("KANGXI RADICAL TOOTH" #x2FD2)
-    ("KANGXI RADICAL DRAGON" #x2FD3)
-    ("KANGXI RADICAL TURTLE" #x2FD4)
-    ("KANGXI RADICAL FLUTE" #x2FD5)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02FF0-02FFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02FF0-02FFF.el
deleted file mode 100644
index 9232af9cab..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/02FF0-02FFF.el
+++ /dev/null
@@ -1,14 +0,0 @@
-(nxml-define-char-name-set 'ideographic-description-characters
-  '(("IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT" #x2FF0)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW" #x2FF1)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT" #x2FF2)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW" #x2FF3)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND" #x2FF4)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE" #x2FF5)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW" #x2FF6)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT" #x2FF7)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT" #x2FF8)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT" #x2FF9)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT" #x2FFA)
-    ("IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID" #x2FFB)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03000-0303F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03000-0303F.el
deleted file mode 100644
index 0b481adb4c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03000-0303F.el
+++ /dev/null
@@ -1,66 +0,0 @@
-(nxml-define-char-name-set 'cjk-symbols-and-punctuation
-  '(("IDEOGRAPHIC SPACE" #x3000)
-    ("IDEOGRAPHIC COMMA" #x3001)
-    ("IDEOGRAPHIC FULL STOP" #x3002)
-    ("DITTO MARK" #x3003)
-    ("JAPANESE INDUSTRIAL STANDARD SYMBOL" #x3004)
-    ("IDEOGRAPHIC ITERATION MARK" #x3005)
-    ("IDEOGRAPHIC CLOSING MARK" #x3006)
-    ("IDEOGRAPHIC NUMBER ZERO" #x3007)
-    ("LEFT ANGLE BRACKET" #x3008)
-    ("RIGHT ANGLE BRACKET" #x3009)
-    ("LEFT DOUBLE ANGLE BRACKET" #x300A)
-    ("RIGHT DOUBLE ANGLE BRACKET" #x300B)
-    ("LEFT CORNER BRACKET" #x300C)
-    ("RIGHT CORNER BRACKET" #x300D)
-    ("LEFT WHITE CORNER BRACKET" #x300E)
-    ("RIGHT WHITE CORNER BRACKET" #x300F)
-    ("LEFT BLACK LENTICULAR BRACKET" #x3010)
-    ("RIGHT BLACK LENTICULAR BRACKET" #x3011)
-    ("POSTAL MARK" #x3012)
-    ("GETA MARK" #x3013)
-    ("LEFT TORTOISE SHELL BRACKET" #x3014)
-    ("RIGHT TORTOISE SHELL BRACKET" #x3015)
-    ("LEFT WHITE LENTICULAR BRACKET" #x3016)
-    ("RIGHT WHITE LENTICULAR BRACKET" #x3017)
-    ("LEFT WHITE TORTOISE SHELL BRACKET" #x3018)
-    ("RIGHT WHITE TORTOISE SHELL BRACKET" #x3019)
-    ("LEFT WHITE SQUARE BRACKET" #x301A)
-    ("RIGHT WHITE SQUARE BRACKET" #x301B)
-    ("WAVE DASH" #x301C)
-    ("REVERSED DOUBLE PRIME QUOTATION MARK" #x301D)
-    ("DOUBLE PRIME QUOTATION MARK" #x301E)
-    ("LOW DOUBLE PRIME QUOTATION MARK" #x301F)
-    ("POSTAL MARK FACE" #x3020)
-    ("HANGZHOU NUMERAL ONE" #x3021)
-    ("HANGZHOU NUMERAL TWO" #x3022)
-    ("HANGZHOU NUMERAL THREE" #x3023)
-    ("HANGZHOU NUMERAL FOUR" #x3024)
-    ("HANGZHOU NUMERAL FIVE" #x3025)
-    ("HANGZHOU NUMERAL SIX" #x3026)
-    ("HANGZHOU NUMERAL SEVEN" #x3027)
-    ("HANGZHOU NUMERAL EIGHT" #x3028)
-    ("HANGZHOU NUMERAL NINE" #x3029)
-    ("IDEOGRAPHIC LEVEL TONE MARK" #x302A)
-    ("IDEOGRAPHIC RISING TONE MARK" #x302B)
-    ("IDEOGRAPHIC DEPARTING TONE MARK" #x302C)
-    ("IDEOGRAPHIC ENTERING TONE MARK" #x302D)
-    ("HANGUL SINGLE DOT TONE MARK" #x302E)
-    ("HANGUL DOUBLE DOT TONE MARK" #x302F)
-    ("WAVY DASH" #x3030)
-    ("VERTICAL KANA REPEAT MARK" #x3031)
-    ("VERTICAL KANA REPEAT WITH VOICED SOUND MARK" #x3032)
-    ("VERTICAL KANA REPEAT MARK UPPER HALF" #x3033)
-    ("VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF" #x3034)
-    ("VERTICAL KANA REPEAT MARK LOWER HALF" #x3035)
-    ("CIRCLED POSTAL MARK" #x3036)
-    ("IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL" #x3037)
-    ("HANGZHOU NUMERAL TEN" #x3038)
-    ("HANGZHOU NUMERAL TWENTY" #x3039)
-    ("HANGZHOU NUMERAL THIRTY" #x303A)
-    ("VERTICAL IDEOGRAPHIC ITERATION MARK" #x303B)
-    ("MASU MARK" #x303C)
-    ("PART ALTERNATION MARK" #x303D)
-    ("IDEOGRAPHIC VARIATION INDICATOR" #x303E)
-    ("IDEOGRAPHIC HALF FILL SPACE" #x303F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03040-0309F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03040-0309F.el
deleted file mode 100644
index c19e541e0a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03040-0309F.el
+++ /dev/null
@@ -1,95 +0,0 @@
-(nxml-define-char-name-set 'hiragana
-  '(("HIRAGANA LETTER SMALL A" #x3041)
-    ("HIRAGANA LETTER A" #x3042)
-    ("HIRAGANA LETTER SMALL I" #x3043)
-    ("HIRAGANA LETTER I" #x3044)
-    ("HIRAGANA LETTER SMALL U" #x3045)
-    ("HIRAGANA LETTER U" #x3046)
-    ("HIRAGANA LETTER SMALL E" #x3047)
-    ("HIRAGANA LETTER E" #x3048)
-    ("HIRAGANA LETTER SMALL O" #x3049)
-    ("HIRAGANA LETTER O" #x304A)
-    ("HIRAGANA LETTER KA" #x304B)
-    ("HIRAGANA LETTER GA" #x304C)
-    ("HIRAGANA LETTER KI" #x304D)
-    ("HIRAGANA LETTER GI" #x304E)
-    ("HIRAGANA LETTER KU" #x304F)
-    ("HIRAGANA LETTER GU" #x3050)
-    ("HIRAGANA LETTER KE" #x3051)
-    ("HIRAGANA LETTER GE" #x3052)
-    ("HIRAGANA LETTER KO" #x3053)
-    ("HIRAGANA LETTER GO" #x3054)
-    ("HIRAGANA LETTER SA" #x3055)
-    ("HIRAGANA LETTER ZA" #x3056)
-    ("HIRAGANA LETTER SI" #x3057)
-    ("HIRAGANA LETTER ZI" #x3058)
-    ("HIRAGANA LETTER SU" #x3059)
-    ("HIRAGANA LETTER ZU" #x305A)
-    ("HIRAGANA LETTER SE" #x305B)
-    ("HIRAGANA LETTER ZE" #x305C)
-    ("HIRAGANA LETTER SO" #x305D)
-    ("HIRAGANA LETTER ZO" #x305E)
-    ("HIRAGANA LETTER TA" #x305F)
-    ("HIRAGANA LETTER DA" #x3060)
-    ("HIRAGANA LETTER TI" #x3061)
-    ("HIRAGANA LETTER DI" #x3062)
-    ("HIRAGANA LETTER SMALL TU" #x3063)
-    ("HIRAGANA LETTER TU" #x3064)
-    ("HIRAGANA LETTER DU" #x3065)
-    ("HIRAGANA LETTER TE" #x3066)
-    ("HIRAGANA LETTER DE" #x3067)
-    ("HIRAGANA LETTER TO" #x3068)
-    ("HIRAGANA LETTER DO" #x3069)
-    ("HIRAGANA LETTER NA" #x306A)
-    ("HIRAGANA LETTER NI" #x306B)
-    ("HIRAGANA LETTER NU" #x306C)
-    ("HIRAGANA LETTER NE" #x306D)
-    ("HIRAGANA LETTER NO" #x306E)
-    ("HIRAGANA LETTER HA" #x306F)
-    ("HIRAGANA LETTER BA" #x3070)
-    ("HIRAGANA LETTER PA" #x3071)
-    ("HIRAGANA LETTER HI" #x3072)
-    ("HIRAGANA LETTER BI" #x3073)
-    ("HIRAGANA LETTER PI" #x3074)
-    ("HIRAGANA LETTER HU" #x3075)
-    ("HIRAGANA LETTER BU" #x3076)
-    ("HIRAGANA LETTER PU" #x3077)
-    ("HIRAGANA LETTER HE" #x3078)
-    ("HIRAGANA LETTER BE" #x3079)
-    ("HIRAGANA LETTER PE" #x307A)
-    ("HIRAGANA LETTER HO" #x307B)
-    ("HIRAGANA LETTER BO" #x307C)
-    ("HIRAGANA LETTER PO" #x307D)
-    ("HIRAGANA LETTER MA" #x307E)
-    ("HIRAGANA LETTER MI" #x307F)
-    ("HIRAGANA LETTER MU" #x3080)
-    ("HIRAGANA LETTER ME" #x3081)
-    ("HIRAGANA LETTER MO" #x3082)
-    ("HIRAGANA LETTER SMALL YA" #x3083)
-    ("HIRAGANA LETTER YA" #x3084)
-    ("HIRAGANA LETTER SMALL YU" #x3085)
-    ("HIRAGANA LETTER YU" #x3086)
-    ("HIRAGANA LETTER SMALL YO" #x3087)
-    ("HIRAGANA LETTER YO" #x3088)
-    ("HIRAGANA LETTER RA" #x3089)
-    ("HIRAGANA LETTER RI" #x308A)
-    ("HIRAGANA LETTER RU" #x308B)
-    ("HIRAGANA LETTER RE" #x308C)
-    ("HIRAGANA LETTER RO" #x308D)
-    ("HIRAGANA LETTER SMALL WA" #x308E)
-    ("HIRAGANA LETTER WA" #x308F)
-    ("HIRAGANA LETTER WI" #x3090)
-    ("HIRAGANA LETTER WE" #x3091)
-    ("HIRAGANA LETTER WO" #x3092)
-    ("HIRAGANA LETTER N" #x3093)
-    ("HIRAGANA LETTER VU" #x3094)
-    ("HIRAGANA LETTER SMALL KA" #x3095)
-    ("HIRAGANA LETTER SMALL KE" #x3096)
-    ("COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK" #x3099)
-    ("COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK" #x309A)
-    ("KATAKANA-HIRAGANA VOICED SOUND MARK" #x309B)
-    ("KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK" #x309C)
-    ("HIRAGANA ITERATION MARK" #x309D)
-    ("HIRAGANA VOICED ITERATION MARK" #x309E)
-    ("HIRAGANA DIGRAPH YORI" #x309F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/030A0-030FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/030A0-030FF.el
deleted file mode 100644
index 52168c73ad..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/030A0-030FF.el
+++ /dev/null
@@ -1,98 +0,0 @@
-(nxml-define-char-name-set 'katakana
-  '(("KATAKANA-HIRAGANA DOUBLE HYPHEN" #x30A0)
-    ("KATAKANA LETTER SMALL A" #x30A1)
-    ("KATAKANA LETTER A" #x30A2)
-    ("KATAKANA LETTER SMALL I" #x30A3)
-    ("KATAKANA LETTER I" #x30A4)
-    ("KATAKANA LETTER SMALL U" #x30A5)
-    ("KATAKANA LETTER U" #x30A6)
-    ("KATAKANA LETTER SMALL E" #x30A7)
-    ("KATAKANA LETTER E" #x30A8)
-    ("KATAKANA LETTER SMALL O" #x30A9)
-    ("KATAKANA LETTER O" #x30AA)
-    ("KATAKANA LETTER KA" #x30AB)
-    ("KATAKANA LETTER GA" #x30AC)
-    ("KATAKANA LETTER KI" #x30AD)
-    ("KATAKANA LETTER GI" #x30AE)
-    ("KATAKANA LETTER KU" #x30AF)
-    ("KATAKANA LETTER GU" #x30B0)
-    ("KATAKANA LETTER KE" #x30B1)
-    ("KATAKANA LETTER GE" #x30B2)
-    ("KATAKANA LETTER KO" #x30B3)
-    ("KATAKANA LETTER GO" #x30B4)
-    ("KATAKANA LETTER SA" #x30B5)
-    ("KATAKANA LETTER ZA" #x30B6)
-    ("KATAKANA LETTER SI" #x30B7)
-    ("KATAKANA LETTER ZI" #x30B8)
-    ("KATAKANA LETTER SU" #x30B9)
-    ("KATAKANA LETTER ZU" #x30BA)
-    ("KATAKANA LETTER SE" #x30BB)
-    ("KATAKANA LETTER ZE" #x30BC)
-    ("KATAKANA LETTER SO" #x30BD)
-    ("KATAKANA LETTER ZO" #x30BE)
-    ("KATAKANA LETTER TA" #x30BF)
-    ("KATAKANA LETTER DA" #x30C0)
-    ("KATAKANA LETTER TI" #x30C1)
-    ("KATAKANA LETTER DI" #x30C2)
-    ("KATAKANA LETTER SMALL TU" #x30C3)
-    ("KATAKANA LETTER TU" #x30C4)
-    ("KATAKANA LETTER DU" #x30C5)
-    ("KATAKANA LETTER TE" #x30C6)
-    ("KATAKANA LETTER DE" #x30C7)
-    ("KATAKANA LETTER TO" #x30C8)
-    ("KATAKANA LETTER DO" #x30C9)
-    ("KATAKANA LETTER NA" #x30CA)
-    ("KATAKANA LETTER NI" #x30CB)
-    ("KATAKANA LETTER NU" #x30CC)
-    ("KATAKANA LETTER NE" #x30CD)
-    ("KATAKANA LETTER NO" #x30CE)
-    ("KATAKANA LETTER HA" #x30CF)
-    ("KATAKANA LETTER BA" #x30D0)
-    ("KATAKANA LETTER PA" #x30D1)
-    ("KATAKANA LETTER HI" #x30D2)
-    ("KATAKANA LETTER BI" #x30D3)
-    ("KATAKANA LETTER PI" #x30D4)
-    ("KATAKANA LETTER HU" #x30D5)
-    ("KATAKANA LETTER BU" #x30D6)
-    ("KATAKANA LETTER PU" #x30D7)
-    ("KATAKANA LETTER HE" #x30D8)
-    ("KATAKANA LETTER BE" #x30D9)
-    ("KATAKANA LETTER PE" #x30DA)
-    ("KATAKANA LETTER HO" #x30DB)
-    ("KATAKANA LETTER BO" #x30DC)
-    ("KATAKANA LETTER PO" #x30DD)
-    ("KATAKANA LETTER MA" #x30DE)
-    ("KATAKANA LETTER MI" #x30DF)
-    ("KATAKANA LETTER MU" #x30E0)
-    ("KATAKANA LETTER ME" #x30E1)
-    ("KATAKANA LETTER MO" #x30E2)
-    ("KATAKANA LETTER SMALL YA" #x30E3)
-    ("KATAKANA LETTER YA" #x30E4)
-    ("KATAKANA LETTER SMALL YU" #x30E5)
-    ("KATAKANA LETTER YU" #x30E6)
-    ("KATAKANA LETTER SMALL YO" #x30E7)
-    ("KATAKANA LETTER YO" #x30E8)
-    ("KATAKANA LETTER RA" #x30E9)
-    ("KATAKANA LETTER RI" #x30EA)
-    ("KATAKANA LETTER RU" #x30EB)
-    ("KATAKANA LETTER RE" #x30EC)
-    ("KATAKANA LETTER RO" #x30ED)
-    ("KATAKANA LETTER SMALL WA" #x30EE)
-    ("KATAKANA LETTER WA" #x30EF)
-    ("KATAKANA LETTER WI" #x30F0)
-    ("KATAKANA LETTER WE" #x30F1)
-    ("KATAKANA LETTER WO" #x30F2)
-    ("KATAKANA LETTER N" #x30F3)
-    ("KATAKANA LETTER VU" #x30F4)
-    ("KATAKANA LETTER SMALL KA" #x30F5)
-    ("KATAKANA LETTER SMALL KE" #x30F6)
-    ("KATAKANA LETTER VA" #x30F7)
-    ("KATAKANA LETTER VI" #x30F8)
-    ("KATAKANA LETTER VE" #x30F9)
-    ("KATAKANA LETTER VO" #x30FA)
-    ("KATAKANA MIDDLE DOT" #x30FB)
-    ("KATAKANA-HIRAGANA PROLONGED SOUND MARK" #x30FC)
-    ("KATAKANA ITERATION MARK" #x30FD)
-    ("KATAKANA VOICED ITERATION MARK" #x30FE)
-    ("KATAKANA DIGRAPH KOTO" #x30FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03100-0312F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03100-0312F.el
deleted file mode 100644
index ea0cc9ee5e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03100-0312F.el
+++ /dev/null
@@ -1,42 +0,0 @@
-(nxml-define-char-name-set 'bopomofo
-  '(("BOPOMOFO LETTER B" #x3105)
-    ("BOPOMOFO LETTER P" #x3106)
-    ("BOPOMOFO LETTER M" #x3107)
-    ("BOPOMOFO LETTER F" #x3108)
-    ("BOPOMOFO LETTER D" #x3109)
-    ("BOPOMOFO LETTER T" #x310A)
-    ("BOPOMOFO LETTER N" #x310B)
-    ("BOPOMOFO LETTER L" #x310C)
-    ("BOPOMOFO LETTER G" #x310D)
-    ("BOPOMOFO LETTER K" #x310E)
-    ("BOPOMOFO LETTER H" #x310F)
-    ("BOPOMOFO LETTER J" #x3110)
-    ("BOPOMOFO LETTER Q" #x3111)
-    ("BOPOMOFO LETTER X" #x3112)
-    ("BOPOMOFO LETTER ZH" #x3113)
-    ("BOPOMOFO LETTER CH" #x3114)
-    ("BOPOMOFO LETTER SH" #x3115)
-    ("BOPOMOFO LETTER R" #x3116)
-    ("BOPOMOFO LETTER Z" #x3117)
-    ("BOPOMOFO LETTER C" #x3118)
-    ("BOPOMOFO LETTER S" #x3119)
-    ("BOPOMOFO LETTER A" #x311A)
-    ("BOPOMOFO LETTER O" #x311B)
-    ("BOPOMOFO LETTER E" #x311C)
-    ("BOPOMOFO LETTER EH" #x311D)
-    ("BOPOMOFO LETTER AI" #x311E)
-    ("BOPOMOFO LETTER EI" #x311F)
-    ("BOPOMOFO LETTER AU" #x3120)
-    ("BOPOMOFO LETTER OU" #x3121)
-    ("BOPOMOFO LETTER AN" #x3122)
-    ("BOPOMOFO LETTER EN" #x3123)
-    ("BOPOMOFO LETTER ANG" #x3124)
-    ("BOPOMOFO LETTER ENG" #x3125)
-    ("BOPOMOFO LETTER ER" #x3126)
-    ("BOPOMOFO LETTER I" #x3127)
-    ("BOPOMOFO LETTER U" #x3128)
-    ("BOPOMOFO LETTER IU" #x3129)
-    ("BOPOMOFO LETTER V" #x312A)
-    ("BOPOMOFO LETTER NG" #x312B)
-    ("BOPOMOFO LETTER GN" #x312C)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03130-0318F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03130-0318F.el
deleted file mode 100644
index 5e7746f4a5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03130-0318F.el
+++ /dev/null
@@ -1,96 +0,0 @@
-(nxml-define-char-name-set 'hangul-compatibility-jamo
-  '(("HANGUL LETTER KIYEOK" #x3131)
-    ("HANGUL LETTER SSANGKIYEOK" #x3132)
-    ("HANGUL LETTER KIYEOK-SIOS" #x3133)
-    ("HANGUL LETTER NIEUN" #x3134)
-    ("HANGUL LETTER NIEUN-CIEUC" #x3135)
-    ("HANGUL LETTER NIEUN-HIEUH" #x3136)
-    ("HANGUL LETTER TIKEUT" #x3137)
-    ("HANGUL LETTER SSANGTIKEUT" #x3138)
-    ("HANGUL LETTER RIEUL" #x3139)
-    ("HANGUL LETTER RIEUL-KIYEOK" #x313A)
-    ("HANGUL LETTER RIEUL-MIEUM" #x313B)
-    ("HANGUL LETTER RIEUL-PIEUP" #x313C)
-    ("HANGUL LETTER RIEUL-SIOS" #x313D)
-    ("HANGUL LETTER RIEUL-THIEUTH" #x313E)
-    ("HANGUL LETTER RIEUL-PHIEUPH" #x313F)
-    ("HANGUL LETTER RIEUL-HIEUH" #x3140)
-    ("HANGUL LETTER MIEUM" #x3141)
-    ("HANGUL LETTER PIEUP" #x3142)
-    ("HANGUL LETTER SSANGPIEUP" #x3143)
-    ("HANGUL LETTER PIEUP-SIOS" #x3144)
-    ("HANGUL LETTER SIOS" #x3145)
-    ("HANGUL LETTER SSANGSIOS" #x3146)
-    ("HANGUL LETTER IEUNG" #x3147)
-    ("HANGUL LETTER CIEUC" #x3148)
-    ("HANGUL LETTER SSANGCIEUC" #x3149)
-    ("HANGUL LETTER CHIEUCH" #x314A)
-    ("HANGUL LETTER KHIEUKH" #x314B)
-    ("HANGUL LETTER THIEUTH" #x314C)
-    ("HANGUL LETTER PHIEUPH" #x314D)
-    ("HANGUL LETTER HIEUH" #x314E)
-    ("HANGUL LETTER A" #x314F)
-    ("HANGUL LETTER AE" #x3150)
-    ("HANGUL LETTER YA" #x3151)
-    ("HANGUL LETTER YAE" #x3152)
-    ("HANGUL LETTER EO" #x3153)
-    ("HANGUL LETTER E" #x3154)
-    ("HANGUL LETTER YEO" #x3155)
-    ("HANGUL LETTER YE" #x3156)
-    ("HANGUL LETTER O" #x3157)
-    ("HANGUL LETTER WA" #x3158)
-    ("HANGUL LETTER WAE" #x3159)
-    ("HANGUL LETTER OE" #x315A)
-    ("HANGUL LETTER YO" #x315B)
-    ("HANGUL LETTER U" #x315C)
-    ("HANGUL LETTER WEO" #x315D)
-    ("HANGUL LETTER WE" #x315E)
-    ("HANGUL LETTER WI" #x315F)
-    ("HANGUL LETTER YU" #x3160)
-    ("HANGUL LETTER EU" #x3161)
-    ("HANGUL LETTER YI" #x3162)
-    ("HANGUL LETTER I" #x3163)
-    ("HANGUL FILLER" #x3164)
-    ("HANGUL LETTER SSANGNIEUN" #x3165)
-    ("HANGUL LETTER NIEUN-TIKEUT" #x3166)
-    ("HANGUL LETTER NIEUN-SIOS" #x3167)
-    ("HANGUL LETTER NIEUN-PANSIOS" #x3168)
-    ("HANGUL LETTER RIEUL-KIYEOK-SIOS" #x3169)
-    ("HANGUL LETTER RIEUL-TIKEUT" #x316A)
-    ("HANGUL LETTER RIEUL-PIEUP-SIOS" #x316B)
-    ("HANGUL LETTER RIEUL-PANSIOS" #x316C)
-    ("HANGUL LETTER RIEUL-YEORINHIEUH" #x316D)
-    ("HANGUL LETTER MIEUM-PIEUP" #x316E)
-    ("HANGUL LETTER MIEUM-SIOS" #x316F)
-    ("HANGUL LETTER MIEUM-PANSIOS" #x3170)
-    ("HANGUL LETTER KAPYEOUNMIEUM" #x3171)
-    ("HANGUL LETTER PIEUP-KIYEOK" #x3172)
-    ("HANGUL LETTER PIEUP-TIKEUT" #x3173)
-    ("HANGUL LETTER PIEUP-SIOS-KIYEOK" #x3174)
-    ("HANGUL LETTER PIEUP-SIOS-TIKEUT" #x3175)
-    ("HANGUL LETTER PIEUP-CIEUC" #x3176)
-    ("HANGUL LETTER PIEUP-THIEUTH" #x3177)
-    ("HANGUL LETTER KAPYEOUNPIEUP" #x3178)
-    ("HANGUL LETTER KAPYEOUNSSANGPIEUP" #x3179)
-    ("HANGUL LETTER SIOS-KIYEOK" #x317A)
-    ("HANGUL LETTER SIOS-NIEUN" #x317B)
-    ("HANGUL LETTER SIOS-TIKEUT" #x317C)
-    ("HANGUL LETTER SIOS-PIEUP" #x317D)
-    ("HANGUL LETTER SIOS-CIEUC" #x317E)
-    ("HANGUL LETTER PANSIOS" #x317F)
-    ("HANGUL LETTER SSANGIEUNG" #x3180)
-    ("HANGUL LETTER YESIEUNG" #x3181)
-    ("HANGUL LETTER YESIEUNG-SIOS" #x3182)
-    ("HANGUL LETTER YESIEUNG-PANSIOS" #x3183)
-    ("HANGUL LETTER KAPYEOUNPHIEUPH" #x3184)
-    ("HANGUL LETTER SSANGHIEUH" #x3185)
-    ("HANGUL LETTER YEORINHIEUH" #x3186)
-    ("HANGUL LETTER YO-YA" #x3187)
-    ("HANGUL LETTER YO-YAE" #x3188)
-    ("HANGUL LETTER YO-I" #x3189)
-    ("HANGUL LETTER YU-YEO" #x318A)
-    ("HANGUL LETTER YU-YE" #x318B)
-    ("HANGUL LETTER YU-I" #x318C)
-    ("HANGUL LETTER ARAEA" #x318D)
-    ("HANGUL LETTER ARAEAE" #x318E)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03190-0319F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03190-0319F.el
deleted file mode 100644
index b8520da93a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03190-0319F.el
+++ /dev/null
@@ -1,18 +0,0 @@
-(nxml-define-char-name-set 'kanbun
-  '(("IDEOGRAPHIC ANNOTATION LINKING MARK" #x3190)
-    ("IDEOGRAPHIC ANNOTATION REVERSE MARK" #x3191)
-    ("IDEOGRAPHIC ANNOTATION ONE MARK" #x3192)
-    ("IDEOGRAPHIC ANNOTATION TWO MARK" #x3193)
-    ("IDEOGRAPHIC ANNOTATION THREE MARK" #x3194)
-    ("IDEOGRAPHIC ANNOTATION FOUR MARK" #x3195)
-    ("IDEOGRAPHIC ANNOTATION TOP MARK" #x3196)
-    ("IDEOGRAPHIC ANNOTATION MIDDLE MARK" #x3197)
-    ("IDEOGRAPHIC ANNOTATION BOTTOM MARK" #x3198)
-    ("IDEOGRAPHIC ANNOTATION FIRST MARK" #x3199)
-    ("IDEOGRAPHIC ANNOTATION SECOND MARK" #x319A)
-    ("IDEOGRAPHIC ANNOTATION THIRD MARK" #x319B)
-    ("IDEOGRAPHIC ANNOTATION FOURTH MARK" #x319C)
-    ("IDEOGRAPHIC ANNOTATION HEAVEN MARK" #x319D)
-    ("IDEOGRAPHIC ANNOTATION EARTH MARK" #x319E)
-    ("IDEOGRAPHIC ANNOTATION MAN MARK" #x319F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031A0-031BF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031A0-031BF.el
deleted file mode 100644
index 18392547c8..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031A0-031BF.el
+++ /dev/null
@@ -1,26 +0,0 @@
-(nxml-define-char-name-set 'bopomofo-extended
-  '(("BOPOMOFO LETTER BU" #x31A0)
-    ("BOPOMOFO LETTER ZI" #x31A1)
-    ("BOPOMOFO LETTER JI" #x31A2)
-    ("BOPOMOFO LETTER GU" #x31A3)
-    ("BOPOMOFO LETTER EE" #x31A4)
-    ("BOPOMOFO LETTER ENN" #x31A5)
-    ("BOPOMOFO LETTER OO" #x31A6)
-    ("BOPOMOFO LETTER ONN" #x31A7)
-    ("BOPOMOFO LETTER IR" #x31A8)
-    ("BOPOMOFO LETTER ANN" #x31A9)
-    ("BOPOMOFO LETTER INN" #x31AA)
-    ("BOPOMOFO LETTER UNN" #x31AB)
-    ("BOPOMOFO LETTER IM" #x31AC)
-    ("BOPOMOFO LETTER NGG" #x31AD)
-    ("BOPOMOFO LETTER AINN" #x31AE)
-    ("BOPOMOFO LETTER AUNN" #x31AF)
-    ("BOPOMOFO LETTER AM" #x31B0)
-    ("BOPOMOFO LETTER OM" #x31B1)
-    ("BOPOMOFO LETTER ONG" #x31B2)
-    ("BOPOMOFO LETTER INNN" #x31B3)
-    ("BOPOMOFO FINAL LETTER P" #x31B4)
-    ("BOPOMOFO FINAL LETTER T" #x31B5)
-    ("BOPOMOFO FINAL LETTER K" #x31B6)
-    ("BOPOMOFO FINAL LETTER H" #x31B7)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031F0-031FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031F0-031FF.el
deleted file mode 100644
index e637bf3c6d..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/031F0-031FF.el
+++ /dev/null
@@ -1,18 +0,0 @@
-(nxml-define-char-name-set 'katakana-phonetic-extensions
-  '(("KATAKANA LETTER SMALL KU" #x31F0)
-    ("KATAKANA LETTER SMALL SI" #x31F1)
-    ("KATAKANA LETTER SMALL SU" #x31F2)
-    ("KATAKANA LETTER SMALL TO" #x31F3)
-    ("KATAKANA LETTER SMALL NU" #x31F4)
-    ("KATAKANA LETTER SMALL HA" #x31F5)
-    ("KATAKANA LETTER SMALL HI" #x31F6)
-    ("KATAKANA LETTER SMALL HU" #x31F7)
-    ("KATAKANA LETTER SMALL HE" #x31F8)
-    ("KATAKANA LETTER SMALL HO" #x31F9)
-    ("KATAKANA LETTER SMALL MU" #x31FA)
-    ("KATAKANA LETTER SMALL RA" #x31FB)
-    ("KATAKANA LETTER SMALL RI" #x31FC)
-    ("KATAKANA LETTER SMALL RU" #x31FD)
-    ("KATAKANA LETTER SMALL RE" #x31FE)
-    ("KATAKANA LETTER SMALL RO" #x31FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03200-032FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03200-032FF.el
deleted file mode 100644
index 625ff5bdfd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03200-032FF.el
+++ /dev/null
@@ -1,234 +0,0 @@
-(nxml-define-char-name-set 'enclosed-cjk-letters-and-months
-  '(("PARENTHESIZED HANGUL KIYEOK" #x3200)
-    ("PARENTHESIZED HANGUL NIEUN" #x3201)
-    ("PARENTHESIZED HANGUL TIKEUT" #x3202)
-    ("PARENTHESIZED HANGUL RIEUL" #x3203)
-    ("PARENTHESIZED HANGUL MIEUM" #x3204)
-    ("PARENTHESIZED HANGUL PIEUP" #x3205)
-    ("PARENTHESIZED HANGUL SIOS" #x3206)
-    ("PARENTHESIZED HANGUL IEUNG" #x3207)
-    ("PARENTHESIZED HANGUL CIEUC" #x3208)
-    ("PARENTHESIZED HANGUL CHIEUCH" #x3209)
-    ("PARENTHESIZED HANGUL KHIEUKH" #x320A)
-    ("PARENTHESIZED HANGUL THIEUTH" #x320B)
-    ("PARENTHESIZED HANGUL PHIEUPH" #x320C)
-    ("PARENTHESIZED HANGUL HIEUH" #x320D)
-    ("PARENTHESIZED HANGUL KIYEOK A" #x320E)
-    ("PARENTHESIZED HANGUL NIEUN A" #x320F)
-    ("PARENTHESIZED HANGUL TIKEUT A" #x3210)
-    ("PARENTHESIZED HANGUL RIEUL A" #x3211)
-    ("PARENTHESIZED HANGUL MIEUM A" #x3212)
-    ("PARENTHESIZED HANGUL PIEUP A" #x3213)
-    ("PARENTHESIZED HANGUL SIOS A" #x3214)
-    ("PARENTHESIZED HANGUL IEUNG A" #x3215)
-    ("PARENTHESIZED HANGUL CIEUC A" #x3216)
-    ("PARENTHESIZED HANGUL CHIEUCH A" #x3217)
-    ("PARENTHESIZED HANGUL KHIEUKH A" #x3218)
-    ("PARENTHESIZED HANGUL THIEUTH A" #x3219)
-    ("PARENTHESIZED HANGUL PHIEUPH A" #x321A)
-    ("PARENTHESIZED HANGUL HIEUH A" #x321B)
-    ("PARENTHESIZED HANGUL CIEUC U" #x321C)
-    ("PARENTHESIZED IDEOGRAPH ONE" #x3220)
-    ("PARENTHESIZED IDEOGRAPH TWO" #x3221)
-    ("PARENTHESIZED IDEOGRAPH THREE" #x3222)
-    ("PARENTHESIZED IDEOGRAPH FOUR" #x3223)
-    ("PARENTHESIZED IDEOGRAPH FIVE" #x3224)
-    ("PARENTHESIZED IDEOGRAPH SIX" #x3225)
-    ("PARENTHESIZED IDEOGRAPH SEVEN" #x3226)
-    ("PARENTHESIZED IDEOGRAPH EIGHT" #x3227)
-    ("PARENTHESIZED IDEOGRAPH NINE" #x3228)
-    ("PARENTHESIZED IDEOGRAPH TEN" #x3229)
-    ("PARENTHESIZED IDEOGRAPH MOON" #x322A)
-    ("PARENTHESIZED IDEOGRAPH FIRE" #x322B)
-    ("PARENTHESIZED IDEOGRAPH WATER" #x322C)
-    ("PARENTHESIZED IDEOGRAPH WOOD" #x322D)
-    ("PARENTHESIZED IDEOGRAPH METAL" #x322E)
-    ("PARENTHESIZED IDEOGRAPH EARTH" #x322F)
-    ("PARENTHESIZED IDEOGRAPH SUN" #x3230)
-    ("PARENTHESIZED IDEOGRAPH STOCK" #x3231)
-    ("PARENTHESIZED IDEOGRAPH HAVE" #x3232)
-    ("PARENTHESIZED IDEOGRAPH SOCIETY" #x3233)
-    ("PARENTHESIZED IDEOGRAPH NAME" #x3234)
-    ("PARENTHESIZED IDEOGRAPH SPECIAL" #x3235)
-    ("PARENTHESIZED IDEOGRAPH FINANCIAL" #x3236)
-    ("PARENTHESIZED IDEOGRAPH CONGRATULATION" #x3237)
-    ("PARENTHESIZED IDEOGRAPH LABOR" #x3238)
-    ("PARENTHESIZED IDEOGRAPH REPRESENT" #x3239)
-    ("PARENTHESIZED IDEOGRAPH CALL" #x323A)
-    ("PARENTHESIZED IDEOGRAPH STUDY" #x323B)
-    ("PARENTHESIZED IDEOGRAPH SUPERVISE" #x323C)
-    ("PARENTHESIZED IDEOGRAPH ENTERPRISE" #x323D)
-    ("PARENTHESIZED IDEOGRAPH RESOURCE" #x323E)
-    ("PARENTHESIZED IDEOGRAPH ALLIANCE" #x323F)
-    ("PARENTHESIZED IDEOGRAPH FESTIVAL" #x3240)
-    ("PARENTHESIZED IDEOGRAPH REST" #x3241)
-    ("PARENTHESIZED IDEOGRAPH SELF" #x3242)
-    ("PARENTHESIZED IDEOGRAPH REACH" #x3243)
-    ("CIRCLED NUMBER TWENTY ONE" #x3251)
-    ("CIRCLED NUMBER TWENTY TWO" #x3252)
-    ("CIRCLED NUMBER TWENTY THREE" #x3253)
-    ("CIRCLED NUMBER TWENTY FOUR" #x3254)
-    ("CIRCLED NUMBER TWENTY FIVE" #x3255)
-    ("CIRCLED NUMBER TWENTY SIX" #x3256)
-    ("CIRCLED NUMBER TWENTY SEVEN" #x3257)
-    ("CIRCLED NUMBER TWENTY EIGHT" #x3258)
-    ("CIRCLED NUMBER TWENTY NINE" #x3259)
-    ("CIRCLED NUMBER THIRTY" #x325A)
-    ("CIRCLED NUMBER THIRTY ONE" #x325B)
-    ("CIRCLED NUMBER THIRTY TWO" #x325C)
-    ("CIRCLED NUMBER THIRTY THREE" #x325D)
-    ("CIRCLED NUMBER THIRTY FOUR" #x325E)
-    ("CIRCLED NUMBER THIRTY FIVE" #x325F)
-    ("CIRCLED HANGUL KIYEOK" #x3260)
-    ("CIRCLED HANGUL NIEUN" #x3261)
-    ("CIRCLED HANGUL TIKEUT" #x3262)
-    ("CIRCLED HANGUL RIEUL" #x3263)
-    ("CIRCLED HANGUL MIEUM" #x3264)
-    ("CIRCLED HANGUL PIEUP" #x3265)
-    ("CIRCLED HANGUL SIOS" #x3266)
-    ("CIRCLED HANGUL IEUNG" #x3267)
-    ("CIRCLED HANGUL CIEUC" #x3268)
-    ("CIRCLED HANGUL CHIEUCH" #x3269)
-    ("CIRCLED HANGUL KHIEUKH" #x326A)
-    ("CIRCLED HANGUL THIEUTH" #x326B)
-    ("CIRCLED HANGUL PHIEUPH" #x326C)
-    ("CIRCLED HANGUL HIEUH" #x326D)
-    ("CIRCLED HANGUL KIYEOK A" #x326E)
-    ("CIRCLED HANGUL NIEUN A" #x326F)
-    ("CIRCLED HANGUL TIKEUT A" #x3270)
-    ("CIRCLED HANGUL RIEUL A" #x3271)
-    ("CIRCLED HANGUL MIEUM A" #x3272)
-    ("CIRCLED HANGUL PIEUP A" #x3273)
-    ("CIRCLED HANGUL SIOS A" #x3274)
-    ("CIRCLED HANGUL IEUNG A" #x3275)
-    ("CIRCLED HANGUL CIEUC A" #x3276)
-    ("CIRCLED HANGUL CHIEUCH A" #x3277)
-    ("CIRCLED HANGUL KHIEUKH A" #x3278)
-    ("CIRCLED HANGUL THIEUTH A" #x3279)
-    ("CIRCLED HANGUL PHIEUPH A" #x327A)
-    ("CIRCLED HANGUL HIEUH A" #x327B)
-    ("KOREAN STANDARD SYMBOL" #x327F)
-    ("CIRCLED IDEOGRAPH ONE" #x3280)
-    ("CIRCLED IDEOGRAPH TWO" #x3281)
-    ("CIRCLED IDEOGRAPH THREE" #x3282)
-    ("CIRCLED IDEOGRAPH FOUR" #x3283)
-    ("CIRCLED IDEOGRAPH FIVE" #x3284)
-    ("CIRCLED IDEOGRAPH SIX" #x3285)
-    ("CIRCLED IDEOGRAPH SEVEN" #x3286)
-    ("CIRCLED IDEOGRAPH EIGHT" #x3287)
-    ("CIRCLED IDEOGRAPH NINE" #x3288)
-    ("CIRCLED IDEOGRAPH TEN" #x3289)
-    ("CIRCLED IDEOGRAPH MOON" #x328A)
-    ("CIRCLED IDEOGRAPH FIRE" #x328B)
-    ("CIRCLED IDEOGRAPH WATER" #x328C)
-    ("CIRCLED IDEOGRAPH WOOD" #x328D)
-    ("CIRCLED IDEOGRAPH METAL" #x328E)
-    ("CIRCLED IDEOGRAPH EARTH" #x328F)
-    ("CIRCLED IDEOGRAPH SUN" #x3290)
-    ("CIRCLED IDEOGRAPH STOCK" #x3291)
-    ("CIRCLED IDEOGRAPH HAVE" #x3292)
-    ("CIRCLED IDEOGRAPH SOCIETY" #x3293)
-    ("CIRCLED IDEOGRAPH NAME" #x3294)
-    ("CIRCLED IDEOGRAPH SPECIAL" #x3295)
-    ("CIRCLED IDEOGRAPH FINANCIAL" #x3296)
-    ("CIRCLED IDEOGRAPH CONGRATULATION" #x3297)
-    ("CIRCLED IDEOGRAPH LABOR" #x3298)
-    ("CIRCLED IDEOGRAPH SECRET" #x3299)
-    ("CIRCLED IDEOGRAPH MALE" #x329A)
-    ("CIRCLED IDEOGRAPH FEMALE" #x329B)
-    ("CIRCLED IDEOGRAPH SUITABLE" #x329C)
-    ("CIRCLED IDEOGRAPH EXCELLENT" #x329D)
-    ("CIRCLED IDEOGRAPH PRINT" #x329E)
-    ("CIRCLED IDEOGRAPH ATTENTION" #x329F)
-    ("CIRCLED IDEOGRAPH ITEM" #x32A0)
-    ("CIRCLED IDEOGRAPH REST" #x32A1)
-    ("CIRCLED IDEOGRAPH COPY" #x32A2)
-    ("CIRCLED IDEOGRAPH CORRECT" #x32A3)
-    ("CIRCLED IDEOGRAPH HIGH" #x32A4)
-    ("CIRCLED IDEOGRAPH CENTRE" #x32A5)
-    ("CIRCLED IDEOGRAPH LOW" #x32A6)
-    ("CIRCLED IDEOGRAPH LEFT" #x32A7)
-    ("CIRCLED IDEOGRAPH RIGHT" #x32A8)
-    ("CIRCLED IDEOGRAPH MEDICINE" #x32A9)
-    ("CIRCLED IDEOGRAPH RELIGION" #x32AA)
-    ("CIRCLED IDEOGRAPH STUDY" #x32AB)
-    ("CIRCLED IDEOGRAPH SUPERVISE" #x32AC)
-    ("CIRCLED IDEOGRAPH ENTERPRISE" #x32AD)
-    ("CIRCLED IDEOGRAPH RESOURCE" #x32AE)
-    ("CIRCLED IDEOGRAPH ALLIANCE" #x32AF)
-    ("CIRCLED IDEOGRAPH NIGHT" #x32B0)
-    ("CIRCLED NUMBER THIRTY SIX" #x32B1)
-    ("CIRCLED NUMBER THIRTY SEVEN" #x32B2)
-    ("CIRCLED NUMBER THIRTY EIGHT" #x32B3)
-    ("CIRCLED NUMBER THIRTY NINE" #x32B4)
-    ("CIRCLED NUMBER FORTY" #x32B5)
-    ("CIRCLED NUMBER FORTY ONE" #x32B6)
-    ("CIRCLED NUMBER FORTY TWO" #x32B7)
-    ("CIRCLED NUMBER FORTY THREE" #x32B8)
-    ("CIRCLED NUMBER FORTY FOUR" #x32B9)
-    ("CIRCLED NUMBER FORTY FIVE" #x32BA)
-    ("CIRCLED NUMBER FORTY SIX" #x32BB)
-    ("CIRCLED NUMBER FORTY SEVEN" #x32BC)
-    ("CIRCLED NUMBER FORTY EIGHT" #x32BD)
-    ("CIRCLED NUMBER FORTY NINE" #x32BE)
-    ("CIRCLED NUMBER FIFTY" #x32BF)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY" #x32C0)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY" #x32C1)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH" #x32C2)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL" #x32C3)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY" #x32C4)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE" #x32C5)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY" #x32C6)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST" #x32C7)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER" #x32C8)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER" #x32C9)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER" #x32CA)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER" #x32CB)
-    ("CIRCLED KATAKANA A" #x32D0)
-    ("CIRCLED KATAKANA I" #x32D1)
-    ("CIRCLED KATAKANA U" #x32D2)
-    ("CIRCLED KATAKANA E" #x32D3)
-    ("CIRCLED KATAKANA O" #x32D4)
-    ("CIRCLED KATAKANA KA" #x32D5)
-    ("CIRCLED KATAKANA KI" #x32D6)
-    ("CIRCLED KATAKANA KU" #x32D7)
-    ("CIRCLED KATAKANA KE" #x32D8)
-    ("CIRCLED KATAKANA KO" #x32D9)
-    ("CIRCLED KATAKANA SA" #x32DA)
-    ("CIRCLED KATAKANA SI" #x32DB)
-    ("CIRCLED KATAKANA SU" #x32DC)
-    ("CIRCLED KATAKANA SE" #x32DD)
-    ("CIRCLED KATAKANA SO" #x32DE)
-    ("CIRCLED KATAKANA TA" #x32DF)
-    ("CIRCLED KATAKANA TI" #x32E0)
-    ("CIRCLED KATAKANA TU" #x32E1)
-    ("CIRCLED KATAKANA TE" #x32E2)
-    ("CIRCLED KATAKANA TO" #x32E3)
-    ("CIRCLED KATAKANA NA" #x32E4)
-    ("CIRCLED KATAKANA NI" #x32E5)
-    ("CIRCLED KATAKANA NU" #x32E6)
-    ("CIRCLED KATAKANA NE" #x32E7)
-    ("CIRCLED KATAKANA NO" #x32E8)
-    ("CIRCLED KATAKANA HA" #x32E9)
-    ("CIRCLED KATAKANA HI" #x32EA)
-    ("CIRCLED KATAKANA HU" #x32EB)
-    ("CIRCLED KATAKANA HE" #x32EC)
-    ("CIRCLED KATAKANA HO" #x32ED)
-    ("CIRCLED KATAKANA MA" #x32EE)
-    ("CIRCLED KATAKANA MI" #x32EF)
-    ("CIRCLED KATAKANA MU" #x32F0)
-    ("CIRCLED KATAKANA ME" #x32F1)
-    ("CIRCLED KATAKANA MO" #x32F2)
-    ("CIRCLED KATAKANA YA" #x32F3)
-    ("CIRCLED KATAKANA YU" #x32F4)
-    ("CIRCLED KATAKANA YO" #x32F5)
-    ("CIRCLED KATAKANA RA" #x32F6)
-    ("CIRCLED KATAKANA RI" #x32F7)
-    ("CIRCLED KATAKANA RU" #x32F8)
-    ("CIRCLED KATAKANA RE" #x32F9)
-    ("CIRCLED KATAKANA RO" #x32FA)
-    ("CIRCLED KATAKANA WA" #x32FB)
-    ("CIRCLED KATAKANA WI" #x32FC)
-    ("CIRCLED KATAKANA WE" #x32FD)
-    ("CIRCLED KATAKANA WO" #x32FE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03300-033FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03300-033FF.el
deleted file mode 100644
index 25a070fd6c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03300-033FF.el
+++ /dev/null
@@ -1,251 +0,0 @@
-(nxml-define-char-name-set 'cjk-compatibility
-  '(("SQUARE APAATO" #x3300)
-    ("SQUARE ARUHUA" #x3301)
-    ("SQUARE ANPEA" #x3302)
-    ("SQUARE AARU" #x3303)
-    ("SQUARE ININGU" #x3304)
-    ("SQUARE INTI" #x3305)
-    ("SQUARE UON" #x3306)
-    ("SQUARE ESUKUUDO" #x3307)
-    ("SQUARE EEKAA" #x3308)
-    ("SQUARE ONSU" #x3309)
-    ("SQUARE OOMU" #x330A)
-    ("SQUARE KAIRI" #x330B)
-    ("SQUARE KARATTO" #x330C)
-    ("SQUARE KARORII" #x330D)
-    ("SQUARE GARON" #x330E)
-    ("SQUARE GANMA" #x330F)
-    ("SQUARE GIGA" #x3310)
-    ("SQUARE GINII" #x3311)
-    ("SQUARE KYURII" #x3312)
-    ("SQUARE GIRUDAA" #x3313)
-    ("SQUARE KIRO" #x3314)
-    ("SQUARE KIROGURAMU" #x3315)
-    ("SQUARE KIROMEETORU" #x3316)
-    ("SQUARE KIROWATTO" #x3317)
-    ("SQUARE GURAMU" #x3318)
-    ("SQUARE GURAMUTON" #x3319)
-    ("SQUARE KURUZEIRO" #x331A)
-    ("SQUARE KUROONE" #x331B)
-    ("SQUARE KEESU" #x331C)
-    ("SQUARE KORUNA" #x331D)
-    ("SQUARE KOOPO" #x331E)
-    ("SQUARE SAIKURU" #x331F)
-    ("SQUARE SANTIIMU" #x3320)
-    ("SQUARE SIRINGU" #x3321)
-    ("SQUARE SENTI" #x3322)
-    ("SQUARE SENTO" #x3323)
-    ("SQUARE DAASU" #x3324)
-    ("SQUARE DESI" #x3325)
-    ("SQUARE DORU" #x3326)
-    ("SQUARE TON" #x3327)
-    ("SQUARE NANO" #x3328)
-    ("SQUARE NOTTO" #x3329)
-    ("SQUARE HAITU" #x332A)
-    ("SQUARE PAASENTO" #x332B)
-    ("SQUARE PAATU" #x332C)
-    ("SQUARE BAARERU" #x332D)
-    ("SQUARE PIASUTORU" #x332E)
-    ("SQUARE PIKURU" #x332F)
-    ("SQUARE PIKO" #x3330)
-    ("SQUARE BIRU" #x3331)
-    ("SQUARE HUARADDO" #x3332)
-    ("SQUARE HUIITO" #x3333)
-    ("SQUARE BUSSYERU" #x3334)
-    ("SQUARE HURAN" #x3335)
-    ("SQUARE HEKUTAARU" #x3336)
-    ("SQUARE PESO" #x3337)
-    ("SQUARE PENIHI" #x3338)
-    ("SQUARE HERUTU" #x3339)
-    ("SQUARE PENSU" #x333A)
-    ("SQUARE PEEZI" #x333B)
-    ("SQUARE BEETA" #x333C)
-    ("SQUARE POINTO" #x333D)
-    ("SQUARE BORUTO" #x333E)
-    ("SQUARE HON" #x333F)
-    ("SQUARE PONDO" #x3340)
-    ("SQUARE HOORU" #x3341)
-    ("SQUARE HOON" #x3342)
-    ("SQUARE MAIKURO" #x3343)
-    ("SQUARE MAIRU" #x3344)
-    ("SQUARE MAHHA" #x3345)
-    ("SQUARE MARUKU" #x3346)
-    ("SQUARE MANSYON" #x3347)
-    ("SQUARE MIKURON" #x3348)
-    ("SQUARE MIRI" #x3349)
-    ("SQUARE MIRIBAARU" #x334A)
-    ("SQUARE MEGA" #x334B)
-    ("SQUARE MEGATON" #x334C)
-    ("SQUARE MEETORU" #x334D)
-    ("SQUARE YAADO" #x334E)
-    ("SQUARE YAARU" #x334F)
-    ("SQUARE YUAN" #x3350)
-    ("SQUARE RITTORU" #x3351)
-    ("SQUARE RIRA" #x3352)
-    ("SQUARE RUPII" #x3353)
-    ("SQUARE RUUBURU" #x3354)
-    ("SQUARE REMU" #x3355)
-    ("SQUARE RENTOGEN" #x3356)
-    ("SQUARE WATTO" #x3357)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO" #x3358)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE" #x3359)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO" #x335A)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE" #x335B)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR" #x335C)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE" #x335D)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX" #x335E)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN" #x335F)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT" #x3360)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE" #x3361)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN" #x3362)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN" #x3363)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE" #x3364)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN" #x3365)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN" #x3366)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN" #x3367)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN" #x3368)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN" #x3369)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN" #x336A)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN" #x336B)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY" #x336C)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE" #x336D)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO" #x336E)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE" #x336F)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR" #x3370)
-    ("SQUARE HPA" #x3371)
-    ("SQUARE DA" #x3372)
-    ("SQUARE AU" #x3373)
-    ("SQUARE BAR" #x3374)
-    ("SQUARE OV" #x3375)
-    ("SQUARE PC" #x3376)
-    ("SQUARE ERA NAME HEISEI" #x337B)
-    ("SQUARE ERA NAME SYOUWA" #x337C)
-    ("SQUARE ERA NAME TAISYOU" #x337D)
-    ("SQUARE ERA NAME MEIZI" #x337E)
-    ("SQUARE CORPORATION" #x337F)
-    ("SQUARE PA AMPS" #x3380)
-    ("SQUARE NA" #x3381)
-    ("SQUARE MU A" #x3382)
-    ("SQUARE MA" #x3383)
-    ("SQUARE KA" #x3384)
-    ("SQUARE KB" #x3385)
-    ("SQUARE MB" #x3386)
-    ("SQUARE GB" #x3387)
-    ("SQUARE CAL" #x3388)
-    ("SQUARE KCAL" #x3389)
-    ("SQUARE PF" #x338A)
-    ("SQUARE NF" #x338B)
-    ("SQUARE MU F" #x338C)
-    ("SQUARE MU G" #x338D)
-    ("SQUARE MG" #x338E)
-    ("SQUARE KG" #x338F)
-    ("SQUARE HZ" #x3390)
-    ("SQUARE KHZ" #x3391)
-    ("SQUARE MHZ" #x3392)
-    ("SQUARE GHZ" #x3393)
-    ("SQUARE THZ" #x3394)
-    ("SQUARE MU L" #x3395)
-    ("SQUARE ML" #x3396)
-    ("SQUARE DL" #x3397)
-    ("SQUARE KL" #x3398)
-    ("SQUARE FM" #x3399)
-    ("SQUARE NM" #x339A)
-    ("SQUARE MU M" #x339B)
-    ("SQUARE MM" #x339C)
-    ("SQUARE CM" #x339D)
-    ("SQUARE KM" #x339E)
-    ("SQUARE MM SQUARED" #x339F)
-    ("SQUARE CM SQUARED" #x33A0)
-    ("SQUARE M SQUARED" #x33A1)
-    ("SQUARE KM SQUARED" #x33A2)
-    ("SQUARE MM CUBED" #x33A3)
-    ("SQUARE CM CUBED" #x33A4)
-    ("SQUARE M CUBED" #x33A5)
-    ("SQUARE KM CUBED" #x33A6)
-    ("SQUARE M OVER S" #x33A7)
-    ("SQUARE M OVER S SQUARED" #x33A8)
-    ("SQUARE PA" #x33A9)
-    ("SQUARE KPA" #x33AA)
-    ("SQUARE MPA" #x33AB)
-    ("SQUARE GPA" #x33AC)
-    ("SQUARE RAD" #x33AD)
-    ("SQUARE RAD OVER S" #x33AE)
-    ("SQUARE RAD OVER S SQUARED" #x33AF)
-    ("SQUARE PS" #x33B0)
-    ("SQUARE NS" #x33B1)
-    ("SQUARE MU S" #x33B2)
-    ("SQUARE MS" #x33B3)
-    ("SQUARE PV" #x33B4)
-    ("SQUARE NV" #x33B5)
-    ("SQUARE MU V" #x33B6)
-    ("SQUARE MV" #x33B7)
-    ("SQUARE KV" #x33B8)
-    ("SQUARE MV MEGA" #x33B9)
-    ("SQUARE PW" #x33BA)
-    ("SQUARE NW" #x33BB)
-    ("SQUARE MU W" #x33BC)
-    ("SQUARE MW" #x33BD)
-    ("SQUARE KW" #x33BE)
-    ("SQUARE MW MEGA" #x33BF)
-    ("SQUARE K OHM" #x33C0)
-    ("SQUARE M OHM" #x33C1)
-    ("SQUARE AM" #x33C2)
-    ("SQUARE BQ" #x33C3)
-    ("SQUARE CC" #x33C4)
-    ("SQUARE CD" #x33C5)
-    ("SQUARE C OVER KG" #x33C6)
-    ("SQUARE CO" #x33C7)
-    ("SQUARE DB" #x33C8)
-    ("SQUARE GY" #x33C9)
-    ("SQUARE HA" #x33CA)
-    ("SQUARE HP" #x33CB)
-    ("SQUARE IN" #x33CC)
-    ("SQUARE KK" #x33CD)
-    ("SQUARE KM CAPITAL" #x33CE)
-    ("SQUARE KT" #x33CF)
-    ("SQUARE LM" #x33D0)
-    ("SQUARE LN" #x33D1)
-    ("SQUARE LOG" #x33D2)
-    ("SQUARE LX" #x33D3)
-    ("SQUARE MB SMALL" #x33D4)
-    ("SQUARE MIL" #x33D5)
-    ("SQUARE MOL" #x33D6)
-    ("SQUARE PH" #x33D7)
-    ("SQUARE PM" #x33D8)
-    ("SQUARE PPM" #x33D9)
-    ("SQUARE PR" #x33DA)
-    ("SQUARE SR" #x33DB)
-    ("SQUARE SV" #x33DC)
-    ("SQUARE WB" #x33DD)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE" #x33E0)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO" #x33E1)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE" #x33E2)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR" #x33E3)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE" #x33E4)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX" #x33E5)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN" #x33E6)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT" #x33E7)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE" #x33E8)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN" #x33E9)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN" #x33EA)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE" #x33EB)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN" #x33EC)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN" #x33ED)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN" #x33EE)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN" #x33EF)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN" #x33F0)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN" #x33F1)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN" #x33F2)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY" #x33F3)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE" #x33F4)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO" #x33F5)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE" #x33F6)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR" #x33F7)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE" #x33F8)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX" #x33F9)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN" #x33FA)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT" #x33FB)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE" #x33FC)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY" #x33FD)
-    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE" #x33FE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03400-04DBF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03400-04DBF.el
deleted file mode 100644
index 14d5c4bff5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/03400-04DBF.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(nxml-define-char-name-set 'cjk-unified-ideographs-extension-a
-  '())
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A000-0A48F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A000-0A48F.el
deleted file mode 100644
index 8d0727f6c1..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A000-0A48F.el
+++ /dev/null
@@ -1,1167 +0,0 @@
-(nxml-define-char-name-set 'yi-syllables
-  '(("YI SYLLABLE IT" #xA000)
-    ("YI SYLLABLE IX" #xA001)
-    ("YI SYLLABLE I" #xA002)
-    ("YI SYLLABLE IP" #xA003)
-    ("YI SYLLABLE IET" #xA004)
-    ("YI SYLLABLE IEX" #xA005)
-    ("YI SYLLABLE IE" #xA006)
-    ("YI SYLLABLE IEP" #xA007)
-    ("YI SYLLABLE AT" #xA008)
-    ("YI SYLLABLE AX" #xA009)
-    ("YI SYLLABLE A" #xA00A)
-    ("YI SYLLABLE AP" #xA00B)
-    ("YI SYLLABLE UOX" #xA00C)
-    ("YI SYLLABLE UO" #xA00D)
-    ("YI SYLLABLE UOP" #xA00E)
-    ("YI SYLLABLE OT" #xA00F)
-    ("YI SYLLABLE OX" #xA010)
-    ("YI SYLLABLE O" #xA011)
-    ("YI SYLLABLE OP" #xA012)
-    ("YI SYLLABLE EX" #xA013)
-    ("YI SYLLABLE E" #xA014)
-    ("YI SYLLABLE WU" #xA015)
-    ("YI SYLLABLE BIT" #xA016)
-    ("YI SYLLABLE BIX" #xA017)
-    ("YI SYLLABLE BI" #xA018)
-    ("YI SYLLABLE BIP" #xA019)
-    ("YI SYLLABLE BIET" #xA01A)
-    ("YI SYLLABLE BIEX" #xA01B)
-    ("YI SYLLABLE BIE" #xA01C)
-    ("YI SYLLABLE BIEP" #xA01D)
-    ("YI SYLLABLE BAT" #xA01E)
-    ("YI SYLLABLE BAX" #xA01F)
-    ("YI SYLLABLE BA" #xA020)
-    ("YI SYLLABLE BAP" #xA021)
-    ("YI SYLLABLE BUOX" #xA022)
-    ("YI SYLLABLE BUO" #xA023)
-    ("YI SYLLABLE BUOP" #xA024)
-    ("YI SYLLABLE BOT" #xA025)
-    ("YI SYLLABLE BOX" #xA026)
-    ("YI SYLLABLE BO" #xA027)
-    ("YI SYLLABLE BOP" #xA028)
-    ("YI SYLLABLE BEX" #xA029)
-    ("YI SYLLABLE BE" #xA02A)
-    ("YI SYLLABLE BEP" #xA02B)
-    ("YI SYLLABLE BUT" #xA02C)
-    ("YI SYLLABLE BUX" #xA02D)
-    ("YI SYLLABLE BU" #xA02E)
-    ("YI SYLLABLE BUP" #xA02F)
-    ("YI SYLLABLE BURX" #xA030)
-    ("YI SYLLABLE BUR" #xA031)
-    ("YI SYLLABLE BYT" #xA032)
-    ("YI SYLLABLE BYX" #xA033)
-    ("YI SYLLABLE BY" #xA034)
-    ("YI SYLLABLE BYP" #xA035)
-    ("YI SYLLABLE BYRX" #xA036)
-    ("YI SYLLABLE BYR" #xA037)
-    ("YI SYLLABLE PIT" #xA038)
-    ("YI SYLLABLE PIX" #xA039)
-    ("YI SYLLABLE PI" #xA03A)
-    ("YI SYLLABLE PIP" #xA03B)
-    ("YI SYLLABLE PIEX" #xA03C)
-    ("YI SYLLABLE PIE" #xA03D)
-    ("YI SYLLABLE PIEP" #xA03E)
-    ("YI SYLLABLE PAT" #xA03F)
-    ("YI SYLLABLE PAX" #xA040)
-    ("YI SYLLABLE PA" #xA041)
-    ("YI SYLLABLE PAP" #xA042)
-    ("YI SYLLABLE PUOX" #xA043)
-    ("YI SYLLABLE PUO" #xA044)
-    ("YI SYLLABLE PUOP" #xA045)
-    ("YI SYLLABLE POT" #xA046)
-    ("YI SYLLABLE POX" #xA047)
-    ("YI SYLLABLE PO" #xA048)
-    ("YI SYLLABLE POP" #xA049)
-    ("YI SYLLABLE PUT" #xA04A)
-    ("YI SYLLABLE PUX" #xA04B)
-    ("YI SYLLABLE PU" #xA04C)
-    ("YI SYLLABLE PUP" #xA04D)
-    ("YI SYLLABLE PURX" #xA04E)
-    ("YI SYLLABLE PUR" #xA04F)
-    ("YI SYLLABLE PYT" #xA050)
-    ("YI SYLLABLE PYX" #xA051)
-    ("YI SYLLABLE PY" #xA052)
-    ("YI SYLLABLE PYP" #xA053)
-    ("YI SYLLABLE PYRX" #xA054)
-    ("YI SYLLABLE PYR" #xA055)
-    ("YI SYLLABLE BBIT" #xA056)
-    ("YI SYLLABLE BBIX" #xA057)
-    ("YI SYLLABLE BBI" #xA058)
-    ("YI SYLLABLE BBIP" #xA059)
-    ("YI SYLLABLE BBIET" #xA05A)
-    ("YI SYLLABLE BBIEX" #xA05B)
-    ("YI SYLLABLE BBIE" #xA05C)
-    ("YI SYLLABLE BBIEP" #xA05D)
-    ("YI SYLLABLE BBAT" #xA05E)
-    ("YI SYLLABLE BBAX" #xA05F)
-    ("YI SYLLABLE BBA" #xA060)
-    ("YI SYLLABLE BBAP" #xA061)
-    ("YI SYLLABLE BBUOX" #xA062)
-    ("YI SYLLABLE BBUO" #xA063)
-    ("YI SYLLABLE BBUOP" #xA064)
-    ("YI SYLLABLE BBOT" #xA065)
-    ("YI SYLLABLE BBOX" #xA066)
-    ("YI SYLLABLE BBO" #xA067)
-    ("YI SYLLABLE BBOP" #xA068)
-    ("YI SYLLABLE BBEX" #xA069)
-    ("YI SYLLABLE BBE" #xA06A)
-    ("YI SYLLABLE BBEP" #xA06B)
-    ("YI SYLLABLE BBUT" #xA06C)
-    ("YI SYLLABLE BBUX" #xA06D)
-    ("YI SYLLABLE BBU" #xA06E)
-    ("YI SYLLABLE BBUP" #xA06F)
-    ("YI SYLLABLE BBURX" #xA070)
-    ("YI SYLLABLE BBUR" #xA071)
-    ("YI SYLLABLE BBYT" #xA072)
-    ("YI SYLLABLE BBYX" #xA073)
-    ("YI SYLLABLE BBY" #xA074)
-    ("YI SYLLABLE BBYP" #xA075)
-    ("YI SYLLABLE NBIT" #xA076)
-    ("YI SYLLABLE NBIX" #xA077)
-    ("YI SYLLABLE NBI" #xA078)
-    ("YI SYLLABLE NBIP" #xA079)
-    ("YI SYLLABLE NBIEX" #xA07A)
-    ("YI SYLLABLE NBIE" #xA07B)
-    ("YI SYLLABLE NBIEP" #xA07C)
-    ("YI SYLLABLE NBAT" #xA07D)
-    ("YI SYLLABLE NBAX" #xA07E)
-    ("YI SYLLABLE NBA" #xA07F)
-    ("YI SYLLABLE NBAP" #xA080)
-    ("YI SYLLABLE NBOT" #xA081)
-    ("YI SYLLABLE NBOX" #xA082)
-    ("YI SYLLABLE NBO" #xA083)
-    ("YI SYLLABLE NBOP" #xA084)
-    ("YI SYLLABLE NBUT" #xA085)
-    ("YI SYLLABLE NBUX" #xA086)
-    ("YI SYLLABLE NBU" #xA087)
-    ("YI SYLLABLE NBUP" #xA088)
-    ("YI SYLLABLE NBURX" #xA089)
-    ("YI SYLLABLE NBUR" #xA08A)
-    ("YI SYLLABLE NBYT" #xA08B)
-    ("YI SYLLABLE NBYX" #xA08C)
-    ("YI SYLLABLE NBY" #xA08D)
-    ("YI SYLLABLE NBYP" #xA08E)
-    ("YI SYLLABLE NBYRX" #xA08F)
-    ("YI SYLLABLE NBYR" #xA090)
-    ("YI SYLLABLE HMIT" #xA091)
-    ("YI SYLLABLE HMIX" #xA092)
-    ("YI SYLLABLE HMI" #xA093)
-    ("YI SYLLABLE HMIP" #xA094)
-    ("YI SYLLABLE HMIEX" #xA095)
-    ("YI SYLLABLE HMIE" #xA096)
-    ("YI SYLLABLE HMIEP" #xA097)
-    ("YI SYLLABLE HMAT" #xA098)
-    ("YI SYLLABLE HMAX" #xA099)
-    ("YI SYLLABLE HMA" #xA09A)
-    ("YI SYLLABLE HMAP" #xA09B)
-    ("YI SYLLABLE HMUOX" #xA09C)
-    ("YI SYLLABLE HMUO" #xA09D)
-    ("YI SYLLABLE HMUOP" #xA09E)
-    ("YI SYLLABLE HMOT" #xA09F)
-    ("YI SYLLABLE HMOX" #xA0A0)
-    ("YI SYLLABLE HMO" #xA0A1)
-    ("YI SYLLABLE HMOP" #xA0A2)
-    ("YI SYLLABLE HMUT" #xA0A3)
-    ("YI SYLLABLE HMUX" #xA0A4)
-    ("YI SYLLABLE HMU" #xA0A5)
-    ("YI SYLLABLE HMUP" #xA0A6)
-    ("YI SYLLABLE HMURX" #xA0A7)
-    ("YI SYLLABLE HMUR" #xA0A8)
-    ("YI SYLLABLE HMYX" #xA0A9)
-    ("YI SYLLABLE HMY" #xA0AA)
-    ("YI SYLLABLE HMYP" #xA0AB)
-    ("YI SYLLABLE HMYRX" #xA0AC)
-    ("YI SYLLABLE HMYR" #xA0AD)
-    ("YI SYLLABLE MIT" #xA0AE)
-    ("YI SYLLABLE MIX" #xA0AF)
-    ("YI SYLLABLE MI" #xA0B0)
-    ("YI SYLLABLE MIP" #xA0B1)
-    ("YI SYLLABLE MIEX" #xA0B2)
-    ("YI SYLLABLE MIE" #xA0B3)
-    ("YI SYLLABLE MIEP" #xA0B4)
-    ("YI SYLLABLE MAT" #xA0B5)
-    ("YI SYLLABLE MAX" #xA0B6)
-    ("YI SYLLABLE MA" #xA0B7)
-    ("YI SYLLABLE MAP" #xA0B8)
-    ("YI SYLLABLE MUOT" #xA0B9)
-    ("YI SYLLABLE MUOX" #xA0BA)
-    ("YI SYLLABLE MUO" #xA0BB)
-    ("YI SYLLABLE MUOP" #xA0BC)
-    ("YI SYLLABLE MOT" #xA0BD)
-    ("YI SYLLABLE MOX" #xA0BE)
-    ("YI SYLLABLE MO" #xA0BF)
-    ("YI SYLLABLE MOP" #xA0C0)
-    ("YI SYLLABLE MEX" #xA0C1)
-    ("YI SYLLABLE ME" #xA0C2)
-    ("YI SYLLABLE MUT" #xA0C3)
-    ("YI SYLLABLE MUX" #xA0C4)
-    ("YI SYLLABLE MU" #xA0C5)
-    ("YI SYLLABLE MUP" #xA0C6)
-    ("YI SYLLABLE MURX" #xA0C7)
-    ("YI SYLLABLE MUR" #xA0C8)
-    ("YI SYLLABLE MYT" #xA0C9)
-    ("YI SYLLABLE MYX" #xA0CA)
-    ("YI SYLLABLE MY" #xA0CB)
-    ("YI SYLLABLE MYP" #xA0CC)
-    ("YI SYLLABLE FIT" #xA0CD)
-    ("YI SYLLABLE FIX" #xA0CE)
-    ("YI SYLLABLE FI" #xA0CF)
-    ("YI SYLLABLE FIP" #xA0D0)
-    ("YI SYLLABLE FAT" #xA0D1)
-    ("YI SYLLABLE FAX" #xA0D2)
-    ("YI SYLLABLE FA" #xA0D3)
-    ("YI SYLLABLE FAP" #xA0D4)
-    ("YI SYLLABLE FOX" #xA0D5)
-    ("YI SYLLABLE FO" #xA0D6)
-    ("YI SYLLABLE FOP" #xA0D7)
-    ("YI SYLLABLE FUT" #xA0D8)
-    ("YI SYLLABLE FUX" #xA0D9)
-    ("YI SYLLABLE FU" #xA0DA)
-    ("YI SYLLABLE FUP" #xA0DB)
-    ("YI SYLLABLE FURX" #xA0DC)
-    ("YI SYLLABLE FUR" #xA0DD)
-    ("YI SYLLABLE FYT" #xA0DE)
-    ("YI SYLLABLE FYX" #xA0DF)
-    ("YI SYLLABLE FY" #xA0E0)
-    ("YI SYLLABLE FYP" #xA0E1)
-    ("YI SYLLABLE VIT" #xA0E2)
-    ("YI SYLLABLE VIX" #xA0E3)
-    ("YI SYLLABLE VI" #xA0E4)
-    ("YI SYLLABLE VIP" #xA0E5)
-    ("YI SYLLABLE VIET" #xA0E6)
-    ("YI SYLLABLE VIEX" #xA0E7)
-    ("YI SYLLABLE VIE" #xA0E8)
-    ("YI SYLLABLE VIEP" #xA0E9)
-    ("YI SYLLABLE VAT" #xA0EA)
-    ("YI SYLLABLE VAX" #xA0EB)
-    ("YI SYLLABLE VA" #xA0EC)
-    ("YI SYLLABLE VAP" #xA0ED)
-    ("YI SYLLABLE VOT" #xA0EE)
-    ("YI SYLLABLE VOX" #xA0EF)
-    ("YI SYLLABLE VO" #xA0F0)
-    ("YI SYLLABLE VOP" #xA0F1)
-    ("YI SYLLABLE VEX" #xA0F2)
-    ("YI SYLLABLE VEP" #xA0F3)
-    ("YI SYLLABLE VUT" #xA0F4)
-    ("YI SYLLABLE VUX" #xA0F5)
-    ("YI SYLLABLE VU" #xA0F6)
-    ("YI SYLLABLE VUP" #xA0F7)
-    ("YI SYLLABLE VURX" #xA0F8)
-    ("YI SYLLABLE VUR" #xA0F9)
-    ("YI SYLLABLE VYT" #xA0FA)
-    ("YI SYLLABLE VYX" #xA0FB)
-    ("YI SYLLABLE VY" #xA0FC)
-    ("YI SYLLABLE VYP" #xA0FD)
-    ("YI SYLLABLE VYRX" #xA0FE)
-    ("YI SYLLABLE VYR" #xA0FF)
-    ("YI SYLLABLE DIT" #xA100)
-    ("YI SYLLABLE DIX" #xA101)
-    ("YI SYLLABLE DI" #xA102)
-    ("YI SYLLABLE DIP" #xA103)
-    ("YI SYLLABLE DIEX" #xA104)
-    ("YI SYLLABLE DIE" #xA105)
-    ("YI SYLLABLE DIEP" #xA106)
-    ("YI SYLLABLE DAT" #xA107)
-    ("YI SYLLABLE DAX" #xA108)
-    ("YI SYLLABLE DA" #xA109)
-    ("YI SYLLABLE DAP" #xA10A)
-    ("YI SYLLABLE DUOX" #xA10B)
-    ("YI SYLLABLE DUO" #xA10C)
-    ("YI SYLLABLE DOT" #xA10D)
-    ("YI SYLLABLE DOX" #xA10E)
-    ("YI SYLLABLE DO" #xA10F)
-    ("YI SYLLABLE DOP" #xA110)
-    ("YI SYLLABLE DEX" #xA111)
-    ("YI SYLLABLE DE" #xA112)
-    ("YI SYLLABLE DEP" #xA113)
-    ("YI SYLLABLE DUT" #xA114)
-    ("YI SYLLABLE DUX" #xA115)
-    ("YI SYLLABLE DU" #xA116)
-    ("YI SYLLABLE DUP" #xA117)
-    ("YI SYLLABLE DURX" #xA118)
-    ("YI SYLLABLE DUR" #xA119)
-    ("YI SYLLABLE TIT" #xA11A)
-    ("YI SYLLABLE TIX" #xA11B)
-    ("YI SYLLABLE TI" #xA11C)
-    ("YI SYLLABLE TIP" #xA11D)
-    ("YI SYLLABLE TIEX" #xA11E)
-    ("YI SYLLABLE TIE" #xA11F)
-    ("YI SYLLABLE TIEP" #xA120)
-    ("YI SYLLABLE TAT" #xA121)
-    ("YI SYLLABLE TAX" #xA122)
-    ("YI SYLLABLE TA" #xA123)
-    ("YI SYLLABLE TAP" #xA124)
-    ("YI SYLLABLE TUOT" #xA125)
-    ("YI SYLLABLE TUOX" #xA126)
-    ("YI SYLLABLE TUO" #xA127)
-    ("YI SYLLABLE TUOP" #xA128)
-    ("YI SYLLABLE TOT" #xA129)
-    ("YI SYLLABLE TOX" #xA12A)
-    ("YI SYLLABLE TO" #xA12B)
-    ("YI SYLLABLE TOP" #xA12C)
-    ("YI SYLLABLE TEX" #xA12D)
-    ("YI SYLLABLE TE" #xA12E)
-    ("YI SYLLABLE TEP" #xA12F)
-    ("YI SYLLABLE TUT" #xA130)
-    ("YI SYLLABLE TUX" #xA131)
-    ("YI SYLLABLE TU" #xA132)
-    ("YI SYLLABLE TUP" #xA133)
-    ("YI SYLLABLE TURX" #xA134)
-    ("YI SYLLABLE TUR" #xA135)
-    ("YI SYLLABLE DDIT" #xA136)
-    ("YI SYLLABLE DDIX" #xA137)
-    ("YI SYLLABLE DDI" #xA138)
-    ("YI SYLLABLE DDIP" #xA139)
-    ("YI SYLLABLE DDIEX" #xA13A)
-    ("YI SYLLABLE DDIE" #xA13B)
-    ("YI SYLLABLE DDIEP" #xA13C)
-    ("YI SYLLABLE DDAT" #xA13D)
-    ("YI SYLLABLE DDAX" #xA13E)
-    ("YI SYLLABLE DDA" #xA13F)
-    ("YI SYLLABLE DDAP" #xA140)
-    ("YI SYLLABLE DDUOX" #xA141)
-    ("YI SYLLABLE DDUO" #xA142)
-    ("YI SYLLABLE DDUOP" #xA143)
-    ("YI SYLLABLE DDOT" #xA144)
-    ("YI SYLLABLE DDOX" #xA145)
-    ("YI SYLLABLE DDO" #xA146)
-    ("YI SYLLABLE DDOP" #xA147)
-    ("YI SYLLABLE DDEX" #xA148)
-    ("YI SYLLABLE DDE" #xA149)
-    ("YI SYLLABLE DDEP" #xA14A)
-    ("YI SYLLABLE DDUT" #xA14B)
-    ("YI SYLLABLE DDUX" #xA14C)
-    ("YI SYLLABLE DDU" #xA14D)
-    ("YI SYLLABLE DDUP" #xA14E)
-    ("YI SYLLABLE DDURX" #xA14F)
-    ("YI SYLLABLE DDUR" #xA150)
-    ("YI SYLLABLE NDIT" #xA151)
-    ("YI SYLLABLE NDIX" #xA152)
-    ("YI SYLLABLE NDI" #xA153)
-    ("YI SYLLABLE NDIP" #xA154)
-    ("YI SYLLABLE NDIEX" #xA155)
-    ("YI SYLLABLE NDIE" #xA156)
-    ("YI SYLLABLE NDAT" #xA157)
-    ("YI SYLLABLE NDAX" #xA158)
-    ("YI SYLLABLE NDA" #xA159)
-    ("YI SYLLABLE NDAP" #xA15A)
-    ("YI SYLLABLE NDOT" #xA15B)
-    ("YI SYLLABLE NDOX" #xA15C)
-    ("YI SYLLABLE NDO" #xA15D)
-    ("YI SYLLABLE NDOP" #xA15E)
-    ("YI SYLLABLE NDEX" #xA15F)
-    ("YI SYLLABLE NDE" #xA160)
-    ("YI SYLLABLE NDEP" #xA161)
-    ("YI SYLLABLE NDUT" #xA162)
-    ("YI SYLLABLE NDUX" #xA163)
-    ("YI SYLLABLE NDU" #xA164)
-    ("YI SYLLABLE NDUP" #xA165)
-    ("YI SYLLABLE NDURX" #xA166)
-    ("YI SYLLABLE NDUR" #xA167)
-    ("YI SYLLABLE HNIT" #xA168)
-    ("YI SYLLABLE HNIX" #xA169)
-    ("YI SYLLABLE HNI" #xA16A)
-    ("YI SYLLABLE HNIP" #xA16B)
-    ("YI SYLLABLE HNIET" #xA16C)
-    ("YI SYLLABLE HNIEX" #xA16D)
-    ("YI SYLLABLE HNIE" #xA16E)
-    ("YI SYLLABLE HNIEP" #xA16F)
-    ("YI SYLLABLE HNAT" #xA170)
-    ("YI SYLLABLE HNAX" #xA171)
-    ("YI SYLLABLE HNA" #xA172)
-    ("YI SYLLABLE HNAP" #xA173)
-    ("YI SYLLABLE HNUOX" #xA174)
-    ("YI SYLLABLE HNUO" #xA175)
-    ("YI SYLLABLE HNOT" #xA176)
-    ("YI SYLLABLE HNOX" #xA177)
-    ("YI SYLLABLE HNOP" #xA178)
-    ("YI SYLLABLE HNEX" #xA179)
-    ("YI SYLLABLE HNE" #xA17A)
-    ("YI SYLLABLE HNEP" #xA17B)
-    ("YI SYLLABLE HNUT" #xA17C)
-    ("YI SYLLABLE NIT" #xA17D)
-    ("YI SYLLABLE NIX" #xA17E)
-    ("YI SYLLABLE NI" #xA17F)
-    ("YI SYLLABLE NIP" #xA180)
-    ("YI SYLLABLE NIEX" #xA181)
-    ("YI SYLLABLE NIE" #xA182)
-    ("YI SYLLABLE NIEP" #xA183)
-    ("YI SYLLABLE NAX" #xA184)
-    ("YI SYLLABLE NA" #xA185)
-    ("YI SYLLABLE NAP" #xA186)
-    ("YI SYLLABLE NUOX" #xA187)
-    ("YI SYLLABLE NUO" #xA188)
-    ("YI SYLLABLE NUOP" #xA189)
-    ("YI SYLLABLE NOT" #xA18A)
-    ("YI SYLLABLE NOX" #xA18B)
-    ("YI SYLLABLE NO" #xA18C)
-    ("YI SYLLABLE NOP" #xA18D)
-    ("YI SYLLABLE NEX" #xA18E)
-    ("YI SYLLABLE NE" #xA18F)
-    ("YI SYLLABLE NEP" #xA190)
-    ("YI SYLLABLE NUT" #xA191)
-    ("YI SYLLABLE NUX" #xA192)
-    ("YI SYLLABLE NU" #xA193)
-    ("YI SYLLABLE NUP" #xA194)
-    ("YI SYLLABLE NURX" #xA195)
-    ("YI SYLLABLE NUR" #xA196)
-    ("YI SYLLABLE HLIT" #xA197)
-    ("YI SYLLABLE HLIX" #xA198)
-    ("YI SYLLABLE HLI" #xA199)
-    ("YI SYLLABLE HLIP" #xA19A)
-    ("YI SYLLABLE HLIEX" #xA19B)
-    ("YI SYLLABLE HLIE" #xA19C)
-    ("YI SYLLABLE HLIEP" #xA19D)
-    ("YI SYLLABLE HLAT" #xA19E)
-    ("YI SYLLABLE HLAX" #xA19F)
-    ("YI SYLLABLE HLA" #xA1A0)
-    ("YI SYLLABLE HLAP" #xA1A1)
-    ("YI SYLLABLE HLUOX" #xA1A2)
-    ("YI SYLLABLE HLUO" #xA1A3)
-    ("YI SYLLABLE HLUOP" #xA1A4)
-    ("YI SYLLABLE HLOX" #xA1A5)
-    ("YI SYLLABLE HLO" #xA1A6)
-    ("YI SYLLABLE HLOP" #xA1A7)
-    ("YI SYLLABLE HLEX" #xA1A8)
-    ("YI SYLLABLE HLE" #xA1A9)
-    ("YI SYLLABLE HLEP" #xA1AA)
-    ("YI SYLLABLE HLUT" #xA1AB)
-    ("YI SYLLABLE HLUX" #xA1AC)
-    ("YI SYLLABLE HLU" #xA1AD)
-    ("YI SYLLABLE HLUP" #xA1AE)
-    ("YI SYLLABLE HLURX" #xA1AF)
-    ("YI SYLLABLE HLUR" #xA1B0)
-    ("YI SYLLABLE HLYT" #xA1B1)
-    ("YI SYLLABLE HLYX" #xA1B2)
-    ("YI SYLLABLE HLY" #xA1B3)
-    ("YI SYLLABLE HLYP" #xA1B4)
-    ("YI SYLLABLE HLYRX" #xA1B5)
-    ("YI SYLLABLE HLYR" #xA1B6)
-    ("YI SYLLABLE LIT" #xA1B7)
-    ("YI SYLLABLE LIX" #xA1B8)
-    ("YI SYLLABLE LI" #xA1B9)
-    ("YI SYLLABLE LIP" #xA1BA)
-    ("YI SYLLABLE LIET" #xA1BB)
-    ("YI SYLLABLE LIEX" #xA1BC)
-    ("YI SYLLABLE LIE" #xA1BD)
-    ("YI SYLLABLE LIEP" #xA1BE)
-    ("YI SYLLABLE LAT" #xA1BF)
-    ("YI SYLLABLE LAX" #xA1C0)
-    ("YI SYLLABLE LA" #xA1C1)
-    ("YI SYLLABLE LAP" #xA1C2)
-    ("YI SYLLABLE LUOT" #xA1C3)
-    ("YI SYLLABLE LUOX" #xA1C4)
-    ("YI SYLLABLE LUO" #xA1C5)
-    ("YI SYLLABLE LUOP" #xA1C6)
-    ("YI SYLLABLE LOT" #xA1C7)
-    ("YI SYLLABLE LOX" #xA1C8)
-    ("YI SYLLABLE LO" #xA1C9)
-    ("YI SYLLABLE LOP" #xA1CA)
-    ("YI SYLLABLE LEX" #xA1CB)
-    ("YI SYLLABLE LE" #xA1CC)
-    ("YI SYLLABLE LEP" #xA1CD)
-    ("YI SYLLABLE LUT" #xA1CE)
-    ("YI SYLLABLE LUX" #xA1CF)
-    ("YI SYLLABLE LU" #xA1D0)
-    ("YI SYLLABLE LUP" #xA1D1)
-    ("YI SYLLABLE LURX" #xA1D2)
-    ("YI SYLLABLE LUR" #xA1D3)
-    ("YI SYLLABLE LYT" #xA1D4)
-    ("YI SYLLABLE LYX" #xA1D5)
-    ("YI SYLLABLE LY" #xA1D6)
-    ("YI SYLLABLE LYP" #xA1D7)
-    ("YI SYLLABLE LYRX" #xA1D8)
-    ("YI SYLLABLE LYR" #xA1D9)
-    ("YI SYLLABLE GIT" #xA1DA)
-    ("YI SYLLABLE GIX" #xA1DB)
-    ("YI SYLLABLE GI" #xA1DC)
-    ("YI SYLLABLE GIP" #xA1DD)
-    ("YI SYLLABLE GIET" #xA1DE)
-    ("YI SYLLABLE GIEX" #xA1DF)
-    ("YI SYLLABLE GIE" #xA1E0)
-    ("YI SYLLABLE GIEP" #xA1E1)
-    ("YI SYLLABLE GAT" #xA1E2)
-    ("YI SYLLABLE GAX" #xA1E3)
-    ("YI SYLLABLE GA" #xA1E4)
-    ("YI SYLLABLE GAP" #xA1E5)
-    ("YI SYLLABLE GUOT" #xA1E6)
-    ("YI SYLLABLE GUOX" #xA1E7)
-    ("YI SYLLABLE GUO" #xA1E8)
-    ("YI SYLLABLE GUOP" #xA1E9)
-    ("YI SYLLABLE GOT" #xA1EA)
-    ("YI SYLLABLE GOX" #xA1EB)
-    ("YI SYLLABLE GO" #xA1EC)
-    ("YI SYLLABLE GOP" #xA1ED)
-    ("YI SYLLABLE GET" #xA1EE)
-    ("YI SYLLABLE GEX" #xA1EF)
-    ("YI SYLLABLE GE" #xA1F0)
-    ("YI SYLLABLE GEP" #xA1F1)
-    ("YI SYLLABLE GUT" #xA1F2)
-    ("YI SYLLABLE GUX" #xA1F3)
-    ("YI SYLLABLE GU" #xA1F4)
-    ("YI SYLLABLE GUP" #xA1F5)
-    ("YI SYLLABLE GURX" #xA1F6)
-    ("YI SYLLABLE GUR" #xA1F7)
-    ("YI SYLLABLE KIT" #xA1F8)
-    ("YI SYLLABLE KIX" #xA1F9)
-    ("YI SYLLABLE KI" #xA1FA)
-    ("YI SYLLABLE KIP" #xA1FB)
-    ("YI SYLLABLE KIEX" #xA1FC)
-    ("YI SYLLABLE KIE" #xA1FD)
-    ("YI SYLLABLE KIEP" #xA1FE)
-    ("YI SYLLABLE KAT" #xA1FF)
-    ("YI SYLLABLE KAX" #xA200)
-    ("YI SYLLABLE KA" #xA201)
-    ("YI SYLLABLE KAP" #xA202)
-    ("YI SYLLABLE KUOX" #xA203)
-    ("YI SYLLABLE KUO" #xA204)
-    ("YI SYLLABLE KUOP" #xA205)
-    ("YI SYLLABLE KOT" #xA206)
-    ("YI SYLLABLE KOX" #xA207)
-    ("YI SYLLABLE KO" #xA208)
-    ("YI SYLLABLE KOP" #xA209)
-    ("YI SYLLABLE KET" #xA20A)
-    ("YI SYLLABLE KEX" #xA20B)
-    ("YI SYLLABLE KE" #xA20C)
-    ("YI SYLLABLE KEP" #xA20D)
-    ("YI SYLLABLE KUT" #xA20E)
-    ("YI SYLLABLE KUX" #xA20F)
-    ("YI SYLLABLE KU" #xA210)
-    ("YI SYLLABLE KUP" #xA211)
-    ("YI SYLLABLE KURX" #xA212)
-    ("YI SYLLABLE KUR" #xA213)
-    ("YI SYLLABLE GGIT" #xA214)
-    ("YI SYLLABLE GGIX" #xA215)
-    ("YI SYLLABLE GGI" #xA216)
-    ("YI SYLLABLE GGIEX" #xA217)
-    ("YI SYLLABLE GGIE" #xA218)
-    ("YI SYLLABLE GGIEP" #xA219)
-    ("YI SYLLABLE GGAT" #xA21A)
-    ("YI SYLLABLE GGAX" #xA21B)
-    ("YI SYLLABLE GGA" #xA21C)
-    ("YI SYLLABLE GGAP" #xA21D)
-    ("YI SYLLABLE GGUOT" #xA21E)
-    ("YI SYLLABLE GGUOX" #xA21F)
-    ("YI SYLLABLE GGUO" #xA220)
-    ("YI SYLLABLE GGUOP" #xA221)
-    ("YI SYLLABLE GGOT" #xA222)
-    ("YI SYLLABLE GGOX" #xA223)
-    ("YI SYLLABLE GGO" #xA224)
-    ("YI SYLLABLE GGOP" #xA225)
-    ("YI SYLLABLE GGET" #xA226)
-    ("YI SYLLABLE GGEX" #xA227)
-    ("YI SYLLABLE GGE" #xA228)
-    ("YI SYLLABLE GGEP" #xA229)
-    ("YI SYLLABLE GGUT" #xA22A)
-    ("YI SYLLABLE GGUX" #xA22B)
-    ("YI SYLLABLE GGU" #xA22C)
-    ("YI SYLLABLE GGUP" #xA22D)
-    ("YI SYLLABLE GGURX" #xA22E)
-    ("YI SYLLABLE GGUR" #xA22F)
-    ("YI SYLLABLE MGIEX" #xA230)
-    ("YI SYLLABLE MGIE" #xA231)
-    ("YI SYLLABLE MGAT" #xA232)
-    ("YI SYLLABLE MGAX" #xA233)
-    ("YI SYLLABLE MGA" #xA234)
-    ("YI SYLLABLE MGAP" #xA235)
-    ("YI SYLLABLE MGUOX" #xA236)
-    ("YI SYLLABLE MGUO" #xA237)
-    ("YI SYLLABLE MGUOP" #xA238)
-    ("YI SYLLABLE MGOT" #xA239)
-    ("YI SYLLABLE MGOX" #xA23A)
-    ("YI SYLLABLE MGO" #xA23B)
-    ("YI SYLLABLE MGOP" #xA23C)
-    ("YI SYLLABLE MGEX" #xA23D)
-    ("YI SYLLABLE MGE" #xA23E)
-    ("YI SYLLABLE MGEP" #xA23F)
-    ("YI SYLLABLE MGUT" #xA240)
-    ("YI SYLLABLE MGUX" #xA241)
-    ("YI SYLLABLE MGU" #xA242)
-    ("YI SYLLABLE MGUP" #xA243)
-    ("YI SYLLABLE MGURX" #xA244)
-    ("YI SYLLABLE MGUR" #xA245)
-    ("YI SYLLABLE HXIT" #xA246)
-    ("YI SYLLABLE HXIX" #xA247)
-    ("YI SYLLABLE HXI" #xA248)
-    ("YI SYLLABLE HXIP" #xA249)
-    ("YI SYLLABLE HXIET" #xA24A)
-    ("YI SYLLABLE HXIEX" #xA24B)
-    ("YI SYLLABLE HXIE" #xA24C)
-    ("YI SYLLABLE HXIEP" #xA24D)
-    ("YI SYLLABLE HXAT" #xA24E)
-    ("YI SYLLABLE HXAX" #xA24F)
-    ("YI SYLLABLE HXA" #xA250)
-    ("YI SYLLABLE HXAP" #xA251)
-    ("YI SYLLABLE HXUOT" #xA252)
-    ("YI SYLLABLE HXUOX" #xA253)
-    ("YI SYLLABLE HXUO" #xA254)
-    ("YI SYLLABLE HXUOP" #xA255)
-    ("YI SYLLABLE HXOT" #xA256)
-    ("YI SYLLABLE HXOX" #xA257)
-    ("YI SYLLABLE HXO" #xA258)
-    ("YI SYLLABLE HXOP" #xA259)
-    ("YI SYLLABLE HXEX" #xA25A)
-    ("YI SYLLABLE HXE" #xA25B)
-    ("YI SYLLABLE HXEP" #xA25C)
-    ("YI SYLLABLE NGIEX" #xA25D)
-    ("YI SYLLABLE NGIE" #xA25E)
-    ("YI SYLLABLE NGIEP" #xA25F)
-    ("YI SYLLABLE NGAT" #xA260)
-    ("YI SYLLABLE NGAX" #xA261)
-    ("YI SYLLABLE NGA" #xA262)
-    ("YI SYLLABLE NGAP" #xA263)
-    ("YI SYLLABLE NGUOT" #xA264)
-    ("YI SYLLABLE NGUOX" #xA265)
-    ("YI SYLLABLE NGUO" #xA266)
-    ("YI SYLLABLE NGOT" #xA267)
-    ("YI SYLLABLE NGOX" #xA268)
-    ("YI SYLLABLE NGO" #xA269)
-    ("YI SYLLABLE NGOP" #xA26A)
-    ("YI SYLLABLE NGEX" #xA26B)
-    ("YI SYLLABLE NGE" #xA26C)
-    ("YI SYLLABLE NGEP" #xA26D)
-    ("YI SYLLABLE HIT" #xA26E)
-    ("YI SYLLABLE HIEX" #xA26F)
-    ("YI SYLLABLE HIE" #xA270)
-    ("YI SYLLABLE HAT" #xA271)
-    ("YI SYLLABLE HAX" #xA272)
-    ("YI SYLLABLE HA" #xA273)
-    ("YI SYLLABLE HAP" #xA274)
-    ("YI SYLLABLE HUOT" #xA275)
-    ("YI SYLLABLE HUOX" #xA276)
-    ("YI SYLLABLE HUO" #xA277)
-    ("YI SYLLABLE HUOP" #xA278)
-    ("YI SYLLABLE HOT" #xA279)
-    ("YI SYLLABLE HOX" #xA27A)
-    ("YI SYLLABLE HO" #xA27B)
-    ("YI SYLLABLE HOP" #xA27C)
-    ("YI SYLLABLE HEX" #xA27D)
-    ("YI SYLLABLE HE" #xA27E)
-    ("YI SYLLABLE HEP" #xA27F)
-    ("YI SYLLABLE WAT" #xA280)
-    ("YI SYLLABLE WAX" #xA281)
-    ("YI SYLLABLE WA" #xA282)
-    ("YI SYLLABLE WAP" #xA283)
-    ("YI SYLLABLE WUOX" #xA284)
-    ("YI SYLLABLE WUO" #xA285)
-    ("YI SYLLABLE WUOP" #xA286)
-    ("YI SYLLABLE WOX" #xA287)
-    ("YI SYLLABLE WO" #xA288)
-    ("YI SYLLABLE WOP" #xA289)
-    ("YI SYLLABLE WEX" #xA28A)
-    ("YI SYLLABLE WE" #xA28B)
-    ("YI SYLLABLE WEP" #xA28C)
-    ("YI SYLLABLE ZIT" #xA28D)
-    ("YI SYLLABLE ZIX" #xA28E)
-    ("YI SYLLABLE ZI" #xA28F)
-    ("YI SYLLABLE ZIP" #xA290)
-    ("YI SYLLABLE ZIEX" #xA291)
-    ("YI SYLLABLE ZIE" #xA292)
-    ("YI SYLLABLE ZIEP" #xA293)
-    ("YI SYLLABLE ZAT" #xA294)
-    ("YI SYLLABLE ZAX" #xA295)
-    ("YI SYLLABLE ZA" #xA296)
-    ("YI SYLLABLE ZAP" #xA297)
-    ("YI SYLLABLE ZUOX" #xA298)
-    ("YI SYLLABLE ZUO" #xA299)
-    ("YI SYLLABLE ZUOP" #xA29A)
-    ("YI SYLLABLE ZOT" #xA29B)
-    ("YI SYLLABLE ZOX" #xA29C)
-    ("YI SYLLABLE ZO" #xA29D)
-    ("YI SYLLABLE ZOP" #xA29E)
-    ("YI SYLLABLE ZEX" #xA29F)
-    ("YI SYLLABLE ZE" #xA2A0)
-    ("YI SYLLABLE ZEP" #xA2A1)
-    ("YI SYLLABLE ZUT" #xA2A2)
-    ("YI SYLLABLE ZUX" #xA2A3)
-    ("YI SYLLABLE ZU" #xA2A4)
-    ("YI SYLLABLE ZUP" #xA2A5)
-    ("YI SYLLABLE ZURX" #xA2A6)
-    ("YI SYLLABLE ZUR" #xA2A7)
-    ("YI SYLLABLE ZYT" #xA2A8)
-    ("YI SYLLABLE ZYX" #xA2A9)
-    ("YI SYLLABLE ZY" #xA2AA)
-    ("YI SYLLABLE ZYP" #xA2AB)
-    ("YI SYLLABLE ZYRX" #xA2AC)
-    ("YI SYLLABLE ZYR" #xA2AD)
-    ("YI SYLLABLE CIT" #xA2AE)
-    ("YI SYLLABLE CIX" #xA2AF)
-    ("YI SYLLABLE CI" #xA2B0)
-    ("YI SYLLABLE CIP" #xA2B1)
-    ("YI SYLLABLE CIET" #xA2B2)
-    ("YI SYLLABLE CIEX" #xA2B3)
-    ("YI SYLLABLE CIE" #xA2B4)
-    ("YI SYLLABLE CIEP" #xA2B5)
-    ("YI SYLLABLE CAT" #xA2B6)
-    ("YI SYLLABLE CAX" #xA2B7)
-    ("YI SYLLABLE CA" #xA2B8)
-    ("YI SYLLABLE CAP" #xA2B9)
-    ("YI SYLLABLE CUOX" #xA2BA)
-    ("YI SYLLABLE CUO" #xA2BB)
-    ("YI SYLLABLE CUOP" #xA2BC)
-    ("YI SYLLABLE COT" #xA2BD)
-    ("YI SYLLABLE COX" #xA2BE)
-    ("YI SYLLABLE CO" #xA2BF)
-    ("YI SYLLABLE COP" #xA2C0)
-    ("YI SYLLABLE CEX" #xA2C1)
-    ("YI SYLLABLE CE" #xA2C2)
-    ("YI SYLLABLE CEP" #xA2C3)
-    ("YI SYLLABLE CUT" #xA2C4)
-    ("YI SYLLABLE CUX" #xA2C5)
-    ("YI SYLLABLE CU" #xA2C6)
-    ("YI SYLLABLE CUP" #xA2C7)
-    ("YI SYLLABLE CURX" #xA2C8)
-    ("YI SYLLABLE CUR" #xA2C9)
-    ("YI SYLLABLE CYT" #xA2CA)
-    ("YI SYLLABLE CYX" #xA2CB)
-    ("YI SYLLABLE CY" #xA2CC)
-    ("YI SYLLABLE CYP" #xA2CD)
-    ("YI SYLLABLE CYRX" #xA2CE)
-    ("YI SYLLABLE CYR" #xA2CF)
-    ("YI SYLLABLE ZZIT" #xA2D0)
-    ("YI SYLLABLE ZZIX" #xA2D1)
-    ("YI SYLLABLE ZZI" #xA2D2)
-    ("YI SYLLABLE ZZIP" #xA2D3)
-    ("YI SYLLABLE ZZIET" #xA2D4)
-    ("YI SYLLABLE ZZIEX" #xA2D5)
-    ("YI SYLLABLE ZZIE" #xA2D6)
-    ("YI SYLLABLE ZZIEP" #xA2D7)
-    ("YI SYLLABLE ZZAT" #xA2D8)
-    ("YI SYLLABLE ZZAX" #xA2D9)
-    ("YI SYLLABLE ZZA" #xA2DA)
-    ("YI SYLLABLE ZZAP" #xA2DB)
-    ("YI SYLLABLE ZZOX" #xA2DC)
-    ("YI SYLLABLE ZZO" #xA2DD)
-    ("YI SYLLABLE ZZOP" #xA2DE)
-    ("YI SYLLABLE ZZEX" #xA2DF)
-    ("YI SYLLABLE ZZE" #xA2E0)
-    ("YI SYLLABLE ZZEP" #xA2E1)
-    ("YI SYLLABLE ZZUX" #xA2E2)
-    ("YI SYLLABLE ZZU" #xA2E3)
-    ("YI SYLLABLE ZZUP" #xA2E4)
-    ("YI SYLLABLE ZZURX" #xA2E5)
-    ("YI SYLLABLE ZZUR" #xA2E6)
-    ("YI SYLLABLE ZZYT" #xA2E7)
-    ("YI SYLLABLE ZZYX" #xA2E8)
-    ("YI SYLLABLE ZZY" #xA2E9)
-    ("YI SYLLABLE ZZYP" #xA2EA)
-    ("YI SYLLABLE ZZYRX" #xA2EB)
-    ("YI SYLLABLE ZZYR" #xA2EC)
-    ("YI SYLLABLE NZIT" #xA2ED)
-    ("YI SYLLABLE NZIX" #xA2EE)
-    ("YI SYLLABLE NZI" #xA2EF)
-    ("YI SYLLABLE NZIP" #xA2F0)
-    ("YI SYLLABLE NZIEX" #xA2F1)
-    ("YI SYLLABLE NZIE" #xA2F2)
-    ("YI SYLLABLE NZIEP" #xA2F3)
-    ("YI SYLLABLE NZAT" #xA2F4)
-    ("YI SYLLABLE NZAX" #xA2F5)
-    ("YI SYLLABLE NZA" #xA2F6)
-    ("YI SYLLABLE NZAP" #xA2F7)
-    ("YI SYLLABLE NZUOX" #xA2F8)
-    ("YI SYLLABLE NZUO" #xA2F9)
-    ("YI SYLLABLE NZOX" #xA2FA)
-    ("YI SYLLABLE NZOP" #xA2FB)
-    ("YI SYLLABLE NZEX" #xA2FC)
-    ("YI SYLLABLE NZE" #xA2FD)
-    ("YI SYLLABLE NZUX" #xA2FE)
-    ("YI SYLLABLE NZU" #xA2FF)
-    ("YI SYLLABLE NZUP" #xA300)
-    ("YI SYLLABLE NZURX" #xA301)
-    ("YI SYLLABLE NZUR" #xA302)
-    ("YI SYLLABLE NZYT" #xA303)
-    ("YI SYLLABLE NZYX" #xA304)
-    ("YI SYLLABLE NZY" #xA305)
-    ("YI SYLLABLE NZYP" #xA306)
-    ("YI SYLLABLE NZYRX" #xA307)
-    ("YI SYLLABLE NZYR" #xA308)
-    ("YI SYLLABLE SIT" #xA309)
-    ("YI SYLLABLE SIX" #xA30A)
-    ("YI SYLLABLE SI" #xA30B)
-    ("YI SYLLABLE SIP" #xA30C)
-    ("YI SYLLABLE SIEX" #xA30D)
-    ("YI SYLLABLE SIE" #xA30E)
-    ("YI SYLLABLE SIEP" #xA30F)
-    ("YI SYLLABLE SAT" #xA310)
-    ("YI SYLLABLE SAX" #xA311)
-    ("YI SYLLABLE SA" #xA312)
-    ("YI SYLLABLE SAP" #xA313)
-    ("YI SYLLABLE SUOX" #xA314)
-    ("YI SYLLABLE SUO" #xA315)
-    ("YI SYLLABLE SUOP" #xA316)
-    ("YI SYLLABLE SOT" #xA317)
-    ("YI SYLLABLE SOX" #xA318)
-    ("YI SYLLABLE SO" #xA319)
-    ("YI SYLLABLE SOP" #xA31A)
-    ("YI SYLLABLE SEX" #xA31B)
-    ("YI SYLLABLE SE" #xA31C)
-    ("YI SYLLABLE SEP" #xA31D)
-    ("YI SYLLABLE SUT" #xA31E)
-    ("YI SYLLABLE SUX" #xA31F)
-    ("YI SYLLABLE SU" #xA320)
-    ("YI SYLLABLE SUP" #xA321)
-    ("YI SYLLABLE SURX" #xA322)
-    ("YI SYLLABLE SUR" #xA323)
-    ("YI SYLLABLE SYT" #xA324)
-    ("YI SYLLABLE SYX" #xA325)
-    ("YI SYLLABLE SY" #xA326)
-    ("YI SYLLABLE SYP" #xA327)
-    ("YI SYLLABLE SYRX" #xA328)
-    ("YI SYLLABLE SYR" #xA329)
-    ("YI SYLLABLE SSIT" #xA32A)
-    ("YI SYLLABLE SSIX" #xA32B)
-    ("YI SYLLABLE SSI" #xA32C)
-    ("YI SYLLABLE SSIP" #xA32D)
-    ("YI SYLLABLE SSIEX" #xA32E)
-    ("YI SYLLABLE SSIE" #xA32F)
-    ("YI SYLLABLE SSIEP" #xA330)
-    ("YI SYLLABLE SSAT" #xA331)
-    ("YI SYLLABLE SSAX" #xA332)
-    ("YI SYLLABLE SSA" #xA333)
-    ("YI SYLLABLE SSAP" #xA334)
-    ("YI SYLLABLE SSOT" #xA335)
-    ("YI SYLLABLE SSOX" #xA336)
-    ("YI SYLLABLE SSO" #xA337)
-    ("YI SYLLABLE SSOP" #xA338)
-    ("YI SYLLABLE SSEX" #xA339)
-    ("YI SYLLABLE SSE" #xA33A)
-    ("YI SYLLABLE SSEP" #xA33B)
-    ("YI SYLLABLE SSUT" #xA33C)
-    ("YI SYLLABLE SSUX" #xA33D)
-    ("YI SYLLABLE SSU" #xA33E)
-    ("YI SYLLABLE SSUP" #xA33F)
-    ("YI SYLLABLE SSYT" #xA340)
-    ("YI SYLLABLE SSYX" #xA341)
-    ("YI SYLLABLE SSY" #xA342)
-    ("YI SYLLABLE SSYP" #xA343)
-    ("YI SYLLABLE SSYRX" #xA344)
-    ("YI SYLLABLE SSYR" #xA345)
-    ("YI SYLLABLE ZHAT" #xA346)
-    ("YI SYLLABLE ZHAX" #xA347)
-    ("YI SYLLABLE ZHA" #xA348)
-    ("YI SYLLABLE ZHAP" #xA349)
-    ("YI SYLLABLE ZHUOX" #xA34A)
-    ("YI SYLLABLE ZHUO" #xA34B)
-    ("YI SYLLABLE ZHUOP" #xA34C)
-    ("YI SYLLABLE ZHOT" #xA34D)
-    ("YI SYLLABLE ZHOX" #xA34E)
-    ("YI SYLLABLE ZHO" #xA34F)
-    ("YI SYLLABLE ZHOP" #xA350)
-    ("YI SYLLABLE ZHET" #xA351)
-    ("YI SYLLABLE ZHEX" #xA352)
-    ("YI SYLLABLE ZHE" #xA353)
-    ("YI SYLLABLE ZHEP" #xA354)
-    ("YI SYLLABLE ZHUT" #xA355)
-    ("YI SYLLABLE ZHUX" #xA356)
-    ("YI SYLLABLE ZHU" #xA357)
-    ("YI SYLLABLE ZHUP" #xA358)
-    ("YI SYLLABLE ZHURX" #xA359)
-    ("YI SYLLABLE ZHUR" #xA35A)
-    ("YI SYLLABLE ZHYT" #xA35B)
-    ("YI SYLLABLE ZHYX" #xA35C)
-    ("YI SYLLABLE ZHY" #xA35D)
-    ("YI SYLLABLE ZHYP" #xA35E)
-    ("YI SYLLABLE ZHYRX" #xA35F)
-    ("YI SYLLABLE ZHYR" #xA360)
-    ("YI SYLLABLE CHAT" #xA361)
-    ("YI SYLLABLE CHAX" #xA362)
-    ("YI SYLLABLE CHA" #xA363)
-    ("YI SYLLABLE CHAP" #xA364)
-    ("YI SYLLABLE CHUOT" #xA365)
-    ("YI SYLLABLE CHUOX" #xA366)
-    ("YI SYLLABLE CHUO" #xA367)
-    ("YI SYLLABLE CHUOP" #xA368)
-    ("YI SYLLABLE CHOT" #xA369)
-    ("YI SYLLABLE CHOX" #xA36A)
-    ("YI SYLLABLE CHO" #xA36B)
-    ("YI SYLLABLE CHOP" #xA36C)
-    ("YI SYLLABLE CHET" #xA36D)
-    ("YI SYLLABLE CHEX" #xA36E)
-    ("YI SYLLABLE CHE" #xA36F)
-    ("YI SYLLABLE CHEP" #xA370)
-    ("YI SYLLABLE CHUX" #xA371)
-    ("YI SYLLABLE CHU" #xA372)
-    ("YI SYLLABLE CHUP" #xA373)
-    ("YI SYLLABLE CHURX" #xA374)
-    ("YI SYLLABLE CHUR" #xA375)
-    ("YI SYLLABLE CHYT" #xA376)
-    ("YI SYLLABLE CHYX" #xA377)
-    ("YI SYLLABLE CHY" #xA378)
-    ("YI SYLLABLE CHYP" #xA379)
-    ("YI SYLLABLE CHYRX" #xA37A)
-    ("YI SYLLABLE CHYR" #xA37B)
-    ("YI SYLLABLE RRAX" #xA37C)
-    ("YI SYLLABLE RRA" #xA37D)
-    ("YI SYLLABLE RRUOX" #xA37E)
-    ("YI SYLLABLE RRUO" #xA37F)
-    ("YI SYLLABLE RROT" #xA380)
-    ("YI SYLLABLE RROX" #xA381)
-    ("YI SYLLABLE RRO" #xA382)
-    ("YI SYLLABLE RROP" #xA383)
-    ("YI SYLLABLE RRET" #xA384)
-    ("YI SYLLABLE RREX" #xA385)
-    ("YI SYLLABLE RRE" #xA386)
-    ("YI SYLLABLE RREP" #xA387)
-    ("YI SYLLABLE RRUT" #xA388)
-    ("YI SYLLABLE RRUX" #xA389)
-    ("YI SYLLABLE RRU" #xA38A)
-    ("YI SYLLABLE RRUP" #xA38B)
-    ("YI SYLLABLE RRURX" #xA38C)
-    ("YI SYLLABLE RRUR" #xA38D)
-    ("YI SYLLABLE RRYT" #xA38E)
-    ("YI SYLLABLE RRYX" #xA38F)
-    ("YI SYLLABLE RRY" #xA390)
-    ("YI SYLLABLE RRYP" #xA391)
-    ("YI SYLLABLE RRYRX" #xA392)
-    ("YI SYLLABLE RRYR" #xA393)
-    ("YI SYLLABLE NRAT" #xA394)
-    ("YI SYLLABLE NRAX" #xA395)
-    ("YI SYLLABLE NRA" #xA396)
-    ("YI SYLLABLE NRAP" #xA397)
-    ("YI SYLLABLE NROX" #xA398)
-    ("YI SYLLABLE NRO" #xA399)
-    ("YI SYLLABLE NROP" #xA39A)
-    ("YI SYLLABLE NRET" #xA39B)
-    ("YI SYLLABLE NREX" #xA39C)
-    ("YI SYLLABLE NRE" #xA39D)
-    ("YI SYLLABLE NREP" #xA39E)
-    ("YI SYLLABLE NRUT" #xA39F)
-    ("YI SYLLABLE NRUX" #xA3A0)
-    ("YI SYLLABLE NRU" #xA3A1)
-    ("YI SYLLABLE NRUP" #xA3A2)
-    ("YI SYLLABLE NRURX" #xA3A3)
-    ("YI SYLLABLE NRUR" #xA3A4)
-    ("YI SYLLABLE NRYT" #xA3A5)
-    ("YI SYLLABLE NRYX" #xA3A6)
-    ("YI SYLLABLE NRY" #xA3A7)
-    ("YI SYLLABLE NRYP" #xA3A8)
-    ("YI SYLLABLE NRYRX" #xA3A9)
-    ("YI SYLLABLE NRYR" #xA3AA)
-    ("YI SYLLABLE SHAT" #xA3AB)
-    ("YI SYLLABLE SHAX" #xA3AC)
-    ("YI SYLLABLE SHA" #xA3AD)
-    ("YI SYLLABLE SHAP" #xA3AE)
-    ("YI SYLLABLE SHUOX" #xA3AF)
-    ("YI SYLLABLE SHUO" #xA3B0)
-    ("YI SYLLABLE SHUOP" #xA3B1)
-    ("YI SYLLABLE SHOT" #xA3B2)
-    ("YI SYLLABLE SHOX" #xA3B3)
-    ("YI SYLLABLE SHO" #xA3B4)
-    ("YI SYLLABLE SHOP" #xA3B5)
-    ("YI SYLLABLE SHET" #xA3B6)
-    ("YI SYLLABLE SHEX" #xA3B7)
-    ("YI SYLLABLE SHE" #xA3B8)
-    ("YI SYLLABLE SHEP" #xA3B9)
-    ("YI SYLLABLE SHUT" #xA3BA)
-    ("YI SYLLABLE SHUX" #xA3BB)
-    ("YI SYLLABLE SHU" #xA3BC)
-    ("YI SYLLABLE SHUP" #xA3BD)
-    ("YI SYLLABLE SHURX" #xA3BE)
-    ("YI SYLLABLE SHUR" #xA3BF)
-    ("YI SYLLABLE SHYT" #xA3C0)
-    ("YI SYLLABLE SHYX" #xA3C1)
-    ("YI SYLLABLE SHY" #xA3C2)
-    ("YI SYLLABLE SHYP" #xA3C3)
-    ("YI SYLLABLE SHYRX" #xA3C4)
-    ("YI SYLLABLE SHYR" #xA3C5)
-    ("YI SYLLABLE RAT" #xA3C6)
-    ("YI SYLLABLE RAX" #xA3C7)
-    ("YI SYLLABLE RA" #xA3C8)
-    ("YI SYLLABLE RAP" #xA3C9)
-    ("YI SYLLABLE RUOX" #xA3CA)
-    ("YI SYLLABLE RUO" #xA3CB)
-    ("YI SYLLABLE RUOP" #xA3CC)
-    ("YI SYLLABLE ROT" #xA3CD)
-    ("YI SYLLABLE ROX" #xA3CE)
-    ("YI SYLLABLE RO" #xA3CF)
-    ("YI SYLLABLE ROP" #xA3D0)
-    ("YI SYLLABLE REX" #xA3D1)
-    ("YI SYLLABLE RE" #xA3D2)
-    ("YI SYLLABLE REP" #xA3D3)
-    ("YI SYLLABLE RUT" #xA3D4)
-    ("YI SYLLABLE RUX" #xA3D5)
-    ("YI SYLLABLE RU" #xA3D6)
-    ("YI SYLLABLE RUP" #xA3D7)
-    ("YI SYLLABLE RURX" #xA3D8)
-    ("YI SYLLABLE RUR" #xA3D9)
-    ("YI SYLLABLE RYT" #xA3DA)
-    ("YI SYLLABLE RYX" #xA3DB)
-    ("YI SYLLABLE RY" #xA3DC)
-    ("YI SYLLABLE RYP" #xA3DD)
-    ("YI SYLLABLE RYRX" #xA3DE)
-    ("YI SYLLABLE RYR" #xA3DF)
-    ("YI SYLLABLE JIT" #xA3E0)
-    ("YI SYLLABLE JIX" #xA3E1)
-    ("YI SYLLABLE JI" #xA3E2)
-    ("YI SYLLABLE JIP" #xA3E3)
-    ("YI SYLLABLE JIET" #xA3E4)
-    ("YI SYLLABLE JIEX" #xA3E5)
-    ("YI SYLLABLE JIE" #xA3E6)
-    ("YI SYLLABLE JIEP" #xA3E7)
-    ("YI SYLLABLE JUOT" #xA3E8)
-    ("YI SYLLABLE JUOX" #xA3E9)
-    ("YI SYLLABLE JUO" #xA3EA)
-    ("YI SYLLABLE JUOP" #xA3EB)
-    ("YI SYLLABLE JOT" #xA3EC)
-    ("YI SYLLABLE JOX" #xA3ED)
-    ("YI SYLLABLE JO" #xA3EE)
-    ("YI SYLLABLE JOP" #xA3EF)
-    ("YI SYLLABLE JUT" #xA3F0)
-    ("YI SYLLABLE JUX" #xA3F1)
-    ("YI SYLLABLE JU" #xA3F2)
-    ("YI SYLLABLE JUP" #xA3F3)
-    ("YI SYLLABLE JURX" #xA3F4)
-    ("YI SYLLABLE JUR" #xA3F5)
-    ("YI SYLLABLE JYT" #xA3F6)
-    ("YI SYLLABLE JYX" #xA3F7)
-    ("YI SYLLABLE JY" #xA3F8)
-    ("YI SYLLABLE JYP" #xA3F9)
-    ("YI SYLLABLE JYRX" #xA3FA)
-    ("YI SYLLABLE JYR" #xA3FB)
-    ("YI SYLLABLE QIT" #xA3FC)
-    ("YI SYLLABLE QIX" #xA3FD)
-    ("YI SYLLABLE QI" #xA3FE)
-    ("YI SYLLABLE QIP" #xA3FF)
-    ("YI SYLLABLE QIET" #xA400)
-    ("YI SYLLABLE QIEX" #xA401)
-    ("YI SYLLABLE QIE" #xA402)
-    ("YI SYLLABLE QIEP" #xA403)
-    ("YI SYLLABLE QUOT" #xA404)
-    ("YI SYLLABLE QUOX" #xA405)
-    ("YI SYLLABLE QUO" #xA406)
-    ("YI SYLLABLE QUOP" #xA407)
-    ("YI SYLLABLE QOT" #xA408)
-    ("YI SYLLABLE QOX" #xA409)
-    ("YI SYLLABLE QO" #xA40A)
-    ("YI SYLLABLE QOP" #xA40B)
-    ("YI SYLLABLE QUT" #xA40C)
-    ("YI SYLLABLE QUX" #xA40D)
-    ("YI SYLLABLE QU" #xA40E)
-    ("YI SYLLABLE QUP" #xA40F)
-    ("YI SYLLABLE QURX" #xA410)
-    ("YI SYLLABLE QUR" #xA411)
-    ("YI SYLLABLE QYT" #xA412)
-    ("YI SYLLABLE QYX" #xA413)
-    ("YI SYLLABLE QY" #xA414)
-    ("YI SYLLABLE QYP" #xA415)
-    ("YI SYLLABLE QYRX" #xA416)
-    ("YI SYLLABLE QYR" #xA417)
-    ("YI SYLLABLE JJIT" #xA418)
-    ("YI SYLLABLE JJIX" #xA419)
-    ("YI SYLLABLE JJI" #xA41A)
-    ("YI SYLLABLE JJIP" #xA41B)
-    ("YI SYLLABLE JJIET" #xA41C)
-    ("YI SYLLABLE JJIEX" #xA41D)
-    ("YI SYLLABLE JJIE" #xA41E)
-    ("YI SYLLABLE JJIEP" #xA41F)
-    ("YI SYLLABLE JJUOX" #xA420)
-    ("YI SYLLABLE JJUO" #xA421)
-    ("YI SYLLABLE JJUOP" #xA422)
-    ("YI SYLLABLE JJOT" #xA423)
-    ("YI SYLLABLE JJOX" #xA424)
-    ("YI SYLLABLE JJO" #xA425)
-    ("YI SYLLABLE JJOP" #xA426)
-    ("YI SYLLABLE JJUT" #xA427)
-    ("YI SYLLABLE JJUX" #xA428)
-    ("YI SYLLABLE JJU" #xA429)
-    ("YI SYLLABLE JJUP" #xA42A)
-    ("YI SYLLABLE JJURX" #xA42B)
-    ("YI SYLLABLE JJUR" #xA42C)
-    ("YI SYLLABLE JJYT" #xA42D)
-    ("YI SYLLABLE JJYX" #xA42E)
-    ("YI SYLLABLE JJY" #xA42F)
-    ("YI SYLLABLE JJYP" #xA430)
-    ("YI SYLLABLE NJIT" #xA431)
-    ("YI SYLLABLE NJIX" #xA432)
-    ("YI SYLLABLE NJI" #xA433)
-    ("YI SYLLABLE NJIP" #xA434)
-    ("YI SYLLABLE NJIET" #xA435)
-    ("YI SYLLABLE NJIEX" #xA436)
-    ("YI SYLLABLE NJIE" #xA437)
-    ("YI SYLLABLE NJIEP" #xA438)
-    ("YI SYLLABLE NJUOX" #xA439)
-    ("YI SYLLABLE NJUO" #xA43A)
-    ("YI SYLLABLE NJOT" #xA43B)
-    ("YI SYLLABLE NJOX" #xA43C)
-    ("YI SYLLABLE NJO" #xA43D)
-    ("YI SYLLABLE NJOP" #xA43E)
-    ("YI SYLLABLE NJUX" #xA43F)
-    ("YI SYLLABLE NJU" #xA440)
-    ("YI SYLLABLE NJUP" #xA441)
-    ("YI SYLLABLE NJURX" #xA442)
-    ("YI SYLLABLE NJUR" #xA443)
-    ("YI SYLLABLE NJYT" #xA444)
-    ("YI SYLLABLE NJYX" #xA445)
-    ("YI SYLLABLE NJY" #xA446)
-    ("YI SYLLABLE NJYP" #xA447)
-    ("YI SYLLABLE NJYRX" #xA448)
-    ("YI SYLLABLE NJYR" #xA449)
-    ("YI SYLLABLE NYIT" #xA44A)
-    ("YI SYLLABLE NYIX" #xA44B)
-    ("YI SYLLABLE NYI" #xA44C)
-    ("YI SYLLABLE NYIP" #xA44D)
-    ("YI SYLLABLE NYIET" #xA44E)
-    ("YI SYLLABLE NYIEX" #xA44F)
-    ("YI SYLLABLE NYIE" #xA450)
-    ("YI SYLLABLE NYIEP" #xA451)
-    ("YI SYLLABLE NYUOX" #xA452)
-    ("YI SYLLABLE NYUO" #xA453)
-    ("YI SYLLABLE NYUOP" #xA454)
-    ("YI SYLLABLE NYOT" #xA455)
-    ("YI SYLLABLE NYOX" #xA456)
-    ("YI SYLLABLE NYO" #xA457)
-    ("YI SYLLABLE NYOP" #xA458)
-    ("YI SYLLABLE NYUT" #xA459)
-    ("YI SYLLABLE NYUX" #xA45A)
-    ("YI SYLLABLE NYU" #xA45B)
-    ("YI SYLLABLE NYUP" #xA45C)
-    ("YI SYLLABLE XIT" #xA45D)
-    ("YI SYLLABLE XIX" #xA45E)
-    ("YI SYLLABLE XI" #xA45F)
-    ("YI SYLLABLE XIP" #xA460)
-    ("YI SYLLABLE XIET" #xA461)
-    ("YI SYLLABLE XIEX" #xA462)
-    ("YI SYLLABLE XIE" #xA463)
-    ("YI SYLLABLE XIEP" #xA464)
-    ("YI SYLLABLE XUOX" #xA465)
-    ("YI SYLLABLE XUO" #xA466)
-    ("YI SYLLABLE XOT" #xA467)
-    ("YI SYLLABLE XOX" #xA468)
-    ("YI SYLLABLE XO" #xA469)
-    ("YI SYLLABLE XOP" #xA46A)
-    ("YI SYLLABLE XYT" #xA46B)
-    ("YI SYLLABLE XYX" #xA46C)
-    ("YI SYLLABLE XY" #xA46D)
-    ("YI SYLLABLE XYP" #xA46E)
-    ("YI SYLLABLE XYRX" #xA46F)
-    ("YI SYLLABLE XYR" #xA470)
-    ("YI SYLLABLE YIT" #xA471)
-    ("YI SYLLABLE YIX" #xA472)
-    ("YI SYLLABLE YI" #xA473)
-    ("YI SYLLABLE YIP" #xA474)
-    ("YI SYLLABLE YIET" #xA475)
-    ("YI SYLLABLE YIEX" #xA476)
-    ("YI SYLLABLE YIE" #xA477)
-    ("YI SYLLABLE YIEP" #xA478)
-    ("YI SYLLABLE YUOT" #xA479)
-    ("YI SYLLABLE YUOX" #xA47A)
-    ("YI SYLLABLE YUO" #xA47B)
-    ("YI SYLLABLE YUOP" #xA47C)
-    ("YI SYLLABLE YOT" #xA47D)
-    ("YI SYLLABLE YOX" #xA47E)
-    ("YI SYLLABLE YO" #xA47F)
-    ("YI SYLLABLE YOP" #xA480)
-    ("YI SYLLABLE YUT" #xA481)
-    ("YI SYLLABLE YUX" #xA482)
-    ("YI SYLLABLE YU" #xA483)
-    ("YI SYLLABLE YUP" #xA484)
-    ("YI SYLLABLE YURX" #xA485)
-    ("YI SYLLABLE YUR" #xA486)
-    ("YI SYLLABLE YYT" #xA487)
-    ("YI SYLLABLE YYX" #xA488)
-    ("YI SYLLABLE YY" #xA489)
-    ("YI SYLLABLE YYP" #xA48A)
-    ("YI SYLLABLE YYRX" #xA48B)
-    ("YI SYLLABLE YYR" #xA48C)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A490-0A4CF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A490-0A4CF.el
deleted file mode 100644
index 16c8656b48..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0A490-0A4CF.el
+++ /dev/null
@@ -1,57 +0,0 @@
-(nxml-define-char-name-set 'yi-radicals
-  '(("YI RADICAL QOT" #xA490)
-    ("YI RADICAL LI" #xA491)
-    ("YI RADICAL KIT" #xA492)
-    ("YI RADICAL NYIP" #xA493)
-    ("YI RADICAL CYP" #xA494)
-    ("YI RADICAL SSI" #xA495)
-    ("YI RADICAL GGOP" #xA496)
-    ("YI RADICAL GEP" #xA497)
-    ("YI RADICAL MI" #xA498)
-    ("YI RADICAL HXIT" #xA499)
-    ("YI RADICAL LYR" #xA49A)
-    ("YI RADICAL BBUT" #xA49B)
-    ("YI RADICAL MOP" #xA49C)
-    ("YI RADICAL YO" #xA49D)
-    ("YI RADICAL PUT" #xA49E)
-    ("YI RADICAL HXUO" #xA49F)
-    ("YI RADICAL TAT" #xA4A0)
-    ("YI RADICAL GA" #xA4A1)
-    ("YI RADICAL ZUP" #xA4A2)
-    ("YI RADICAL CYT" #xA4A3)
-    ("YI RADICAL DDUR" #xA4A4)
-    ("YI RADICAL BUR" #xA4A5)
-    ("YI RADICAL GGUO" #xA4A6)
-    ("YI RADICAL NYOP" #xA4A7)
-    ("YI RADICAL TU" #xA4A8)
-    ("YI RADICAL OP" #xA4A9)
-    ("YI RADICAL JJUT" #xA4AA)
-    ("YI RADICAL ZOT" #xA4AB)
-    ("YI RADICAL PYT" #xA4AC)
-    ("YI RADICAL HMO" #xA4AD)
-    ("YI RADICAL YIT" #xA4AE)
-    ("YI RADICAL VUR" #xA4AF)
-    ("YI RADICAL SHY" #xA4B0)
-    ("YI RADICAL VEP" #xA4B1)
-    ("YI RADICAL ZA" #xA4B2)
-    ("YI RADICAL JO" #xA4B3)
-    ("YI RADICAL NZUP" #xA4B4)
-    ("YI RADICAL JJY" #xA4B5)
-    ("YI RADICAL GOT" #xA4B6)
-    ("YI RADICAL JJIE" #xA4B7)
-    ("YI RADICAL WO" #xA4B8)
-    ("YI RADICAL DU" #xA4B9)
-    ("YI RADICAL SHUR" #xA4BA)
-    ("YI RADICAL LIE" #xA4BB)
-    ("YI RADICAL CY" #xA4BC)
-    ("YI RADICAL CUOP" #xA4BD)
-    ("YI RADICAL CIP" #xA4BE)
-    ("YI RADICAL HXOP" #xA4BF)
-    ("YI RADICAL SHAT" #xA4C0)
-    ("YI RADICAL ZUR" #xA4C1)
-    ("YI RADICAL SHOP" #xA4C2)
-    ("YI RADICAL CHE" #xA4C3)
-    ("YI RADICAL ZZIET" #xA4C4)
-    ("YI RADICAL NBIE" #xA4C5)
-    ("YI RADICAL KE" #xA4C6)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB00-0FB4F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB00-0FB4F.el
deleted file mode 100644
index 36818c1e13..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB00-0FB4F.el
+++ /dev/null
@@ -1,60 +0,0 @@
-(nxml-define-char-name-set 'alphabetic-presentation-forms
-  '(("LATIN SMALL LIGATURE FF" #xFB00)
-    ("LATIN SMALL LIGATURE FI" #xFB01)
-    ("LATIN SMALL LIGATURE FL" #xFB02)
-    ("LATIN SMALL LIGATURE FFI" #xFB03)
-    ("LATIN SMALL LIGATURE FFL" #xFB04)
-    ("LATIN SMALL LIGATURE LONG S T" #xFB05)
-    ("LATIN SMALL LIGATURE ST" #xFB06)
-    ("ARMENIAN SMALL LIGATURE MEN NOW" #xFB13)
-    ("ARMENIAN SMALL LIGATURE MEN ECH" #xFB14)
-    ("ARMENIAN SMALL LIGATURE MEN INI" #xFB15)
-    ("ARMENIAN SMALL LIGATURE VEW NOW" #xFB16)
-    ("ARMENIAN SMALL LIGATURE MEN XEH" #xFB17)
-    ("HEBREW LETTER YOD WITH HIRIQ" #xFB1D)
-    ("HEBREW POINT JUDEO-SPANISH VARIKA" #xFB1E)
-    ("HEBREW LIGATURE YIDDISH YOD YOD PATAH" #xFB1F)
-    ("HEBREW LETTER ALTERNATIVE AYIN" #xFB20)
-    ("HEBREW LETTER WIDE ALEF" #xFB21)
-    ("HEBREW LETTER WIDE DALET" #xFB22)
-    ("HEBREW LETTER WIDE HE" #xFB23)
-    ("HEBREW LETTER WIDE KAF" #xFB24)
-    ("HEBREW LETTER WIDE LAMED" #xFB25)
-    ("HEBREW LETTER WIDE FINAL MEM" #xFB26)
-    ("HEBREW LETTER WIDE RESH" #xFB27)
-    ("HEBREW LETTER WIDE TAV" #xFB28)
-    ("HEBREW LETTER ALTERNATIVE PLUS SIGN" #xFB29)
-    ("HEBREW LETTER SHIN WITH SHIN DOT" #xFB2A)
-    ("HEBREW LETTER SHIN WITH SIN DOT" #xFB2B)
-    ("HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT" #xFB2C)
-    ("HEBREW LETTER SHIN WITH DAGESH AND SIN DOT" #xFB2D)
-    ("HEBREW LETTER ALEF WITH PATAH" #xFB2E)
-    ("HEBREW LETTER ALEF WITH QAMATS" #xFB2F)
-    ("HEBREW LETTER ALEF WITH MAPIQ" #xFB30)
-    ("HEBREW LETTER BET WITH DAGESH" #xFB31)
-    ("HEBREW LETTER GIMEL WITH DAGESH" #xFB32)
-    ("HEBREW LETTER DALET WITH DAGESH" #xFB33)
-    ("HEBREW LETTER HE WITH MAPIQ" #xFB34)
-    ("HEBREW LETTER VAV WITH DAGESH" #xFB35)
-    ("HEBREW LETTER ZAYIN WITH DAGESH" #xFB36)
-    ("HEBREW LETTER TET WITH DAGESH" #xFB38)
-    ("HEBREW LETTER YOD WITH DAGESH" #xFB39)
-    ("HEBREW LETTER FINAL KAF WITH DAGESH" #xFB3A)
-    ("HEBREW LETTER KAF WITH DAGESH" #xFB3B)
-    ("HEBREW LETTER LAMED WITH DAGESH" #xFB3C)
-    ("HEBREW LETTER MEM WITH DAGESH" #xFB3E)
-    ("HEBREW LETTER NUN WITH DAGESH" #xFB40)
-    ("HEBREW LETTER SAMEKH WITH DAGESH" #xFB41)
-    ("HEBREW LETTER FINAL PE WITH DAGESH" #xFB43)
-    ("HEBREW LETTER PE WITH DAGESH" #xFB44)
-    ("HEBREW LETTER TSADI WITH DAGESH" #xFB46)
-    ("HEBREW LETTER QOF WITH DAGESH" #xFB47)
-    ("HEBREW LETTER RESH WITH DAGESH" #xFB48)
-    ("HEBREW LETTER SHIN WITH DAGESH" #xFB49)
-    ("HEBREW LETTER TAV WITH DAGESH" #xFB4A)
-    ("HEBREW LETTER VAV WITH HOLAM" #xFB4B)
-    ("HEBREW LETTER BET WITH RAFE" #xFB4C)
-    ("HEBREW LETTER KAF WITH RAFE" #xFB4D)
-    ("HEBREW LETTER PE WITH RAFE" #xFB4E)
-    ("HEBREW LIGATURE ALEF LAMED" #xFB4F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB50-0FDFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB50-0FDFF.el
deleted file mode 100644
index a39ae4700b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FB50-0FDFF.el
+++ /dev/null
@@ -1,596 +0,0 @@
-(nxml-define-char-name-set 'arabic-presentation-forms-a
-  '(("ARABIC LETTER ALEF WASLA ISOLATED FORM" #xFB50)
-    ("ARABIC LETTER ALEF WASLA FINAL FORM" #xFB51)
-    ("ARABIC LETTER BEEH ISOLATED FORM" #xFB52)
-    ("ARABIC LETTER BEEH FINAL FORM" #xFB53)
-    ("ARABIC LETTER BEEH INITIAL FORM" #xFB54)
-    ("ARABIC LETTER BEEH MEDIAL FORM" #xFB55)
-    ("ARABIC LETTER PEH ISOLATED FORM" #xFB56)
-    ("ARABIC LETTER PEH FINAL FORM" #xFB57)
-    ("ARABIC LETTER PEH INITIAL FORM" #xFB58)
-    ("ARABIC LETTER PEH MEDIAL FORM" #xFB59)
-    ("ARABIC LETTER BEHEH ISOLATED FORM" #xFB5A)
-    ("ARABIC LETTER BEHEH FINAL FORM" #xFB5B)
-    ("ARABIC LETTER BEHEH INITIAL FORM" #xFB5C)
-    ("ARABIC LETTER BEHEH MEDIAL FORM" #xFB5D)
-    ("ARABIC LETTER TTEHEH ISOLATED FORM" #xFB5E)
-    ("ARABIC LETTER TTEHEH FINAL FORM" #xFB5F)
-    ("ARABIC LETTER TTEHEH INITIAL FORM" #xFB60)
-    ("ARABIC LETTER TTEHEH MEDIAL FORM" #xFB61)
-    ("ARABIC LETTER TEHEH ISOLATED FORM" #xFB62)
-    ("ARABIC LETTER TEHEH FINAL FORM" #xFB63)
-    ("ARABIC LETTER TEHEH INITIAL FORM" #xFB64)
-    ("ARABIC LETTER TEHEH MEDIAL FORM" #xFB65)
-    ("ARABIC LETTER TTEH ISOLATED FORM" #xFB66)
-    ("ARABIC LETTER TTEH FINAL FORM" #xFB67)
-    ("ARABIC LETTER TTEH INITIAL FORM" #xFB68)
-    ("ARABIC LETTER TTEH MEDIAL FORM" #xFB69)
-    ("ARABIC LETTER VEH ISOLATED FORM" #xFB6A)
-    ("ARABIC LETTER VEH FINAL FORM" #xFB6B)
-    ("ARABIC LETTER VEH INITIAL FORM" #xFB6C)
-    ("ARABIC LETTER VEH MEDIAL FORM" #xFB6D)
-    ("ARABIC LETTER PEHEH ISOLATED FORM" #xFB6E)
-    ("ARABIC LETTER PEHEH FINAL FORM" #xFB6F)
-    ("ARABIC LETTER PEHEH INITIAL FORM" #xFB70)
-    ("ARABIC LETTER PEHEH MEDIAL FORM" #xFB71)
-    ("ARABIC LETTER DYEH ISOLATED FORM" #xFB72)
-    ("ARABIC LETTER DYEH FINAL FORM" #xFB73)
-    ("ARABIC LETTER DYEH INITIAL FORM" #xFB74)
-    ("ARABIC LETTER DYEH MEDIAL FORM" #xFB75)
-    ("ARABIC LETTER NYEH ISOLATED FORM" #xFB76)
-    ("ARABIC LETTER NYEH FINAL FORM" #xFB77)
-    ("ARABIC LETTER NYEH INITIAL FORM" #xFB78)
-    ("ARABIC LETTER NYEH MEDIAL FORM" #xFB79)
-    ("ARABIC LETTER TCHEH ISOLATED FORM" #xFB7A)
-    ("ARABIC LETTER TCHEH FINAL FORM" #xFB7B)
-    ("ARABIC LETTER TCHEH INITIAL FORM" #xFB7C)
-    ("ARABIC LETTER TCHEH MEDIAL FORM" #xFB7D)
-    ("ARABIC LETTER TCHEHEH ISOLATED FORM" #xFB7E)
-    ("ARABIC LETTER TCHEHEH FINAL FORM" #xFB7F)
-    ("ARABIC LETTER TCHEHEH INITIAL FORM" #xFB80)
-    ("ARABIC LETTER TCHEHEH MEDIAL FORM" #xFB81)
-    ("ARABIC LETTER DDAHAL ISOLATED FORM" #xFB82)
-    ("ARABIC LETTER DDAHAL FINAL FORM" #xFB83)
-    ("ARABIC LETTER DAHAL ISOLATED FORM" #xFB84)
-    ("ARABIC LETTER DAHAL FINAL FORM" #xFB85)
-    ("ARABIC LETTER DUL ISOLATED FORM" #xFB86)
-    ("ARABIC LETTER DUL FINAL FORM" #xFB87)
-    ("ARABIC LETTER DDAL ISOLATED FORM" #xFB88)
-    ("ARABIC LETTER DDAL FINAL FORM" #xFB89)
-    ("ARABIC LETTER JEH ISOLATED FORM" #xFB8A)
-    ("ARABIC LETTER JEH FINAL FORM" #xFB8B)
-    ("ARABIC LETTER RREH ISOLATED FORM" #xFB8C)
-    ("ARABIC LETTER RREH FINAL FORM" #xFB8D)
-    ("ARABIC LETTER KEHEH ISOLATED FORM" #xFB8E)
-    ("ARABIC LETTER KEHEH FINAL FORM" #xFB8F)
-    ("ARABIC LETTER KEHEH INITIAL FORM" #xFB90)
-    ("ARABIC LETTER KEHEH MEDIAL FORM" #xFB91)
-    ("ARABIC LETTER GAF ISOLATED FORM" #xFB92)
-    ("ARABIC LETTER GAF FINAL FORM" #xFB93)
-    ("ARABIC LETTER GAF INITIAL FORM" #xFB94)
-    ("ARABIC LETTER GAF MEDIAL FORM" #xFB95)
-    ("ARABIC LETTER GUEH ISOLATED FORM" #xFB96)
-    ("ARABIC LETTER GUEH FINAL FORM" #xFB97)
-    ("ARABIC LETTER GUEH INITIAL FORM" #xFB98)
-    ("ARABIC LETTER GUEH MEDIAL FORM" #xFB99)
-    ("ARABIC LETTER NGOEH ISOLATED FORM" #xFB9A)
-    ("ARABIC LETTER NGOEH FINAL FORM" #xFB9B)
-    ("ARABIC LETTER NGOEH INITIAL FORM" #xFB9C)
-    ("ARABIC LETTER NGOEH MEDIAL FORM" #xFB9D)
-    ("ARABIC LETTER NOON GHUNNA ISOLATED FORM" #xFB9E)
-    ("ARABIC LETTER NOON GHUNNA FINAL FORM" #xFB9F)
-    ("ARABIC LETTER RNOON ISOLATED FORM" #xFBA0)
-    ("ARABIC LETTER RNOON FINAL FORM" #xFBA1)
-    ("ARABIC LETTER RNOON INITIAL FORM" #xFBA2)
-    ("ARABIC LETTER RNOON MEDIAL FORM" #xFBA3)
-    ("ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM" #xFBA4)
-    ("ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM" #xFBA5)
-    ("ARABIC LETTER HEH GOAL ISOLATED FORM" #xFBA6)
-    ("ARABIC LETTER HEH GOAL FINAL FORM" #xFBA7)
-    ("ARABIC LETTER HEH GOAL INITIAL FORM" #xFBA8)
-    ("ARABIC LETTER HEH GOAL MEDIAL FORM" #xFBA9)
-    ("ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM" #xFBAA)
-    ("ARABIC LETTER HEH DOACHASHMEE FINAL FORM" #xFBAB)
-    ("ARABIC LETTER HEH DOACHASHMEE INITIAL FORM" #xFBAC)
-    ("ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM" #xFBAD)
-    ("ARABIC LETTER YEH BARREE ISOLATED FORM" #xFBAE)
-    ("ARABIC LETTER YEH BARREE FINAL FORM" #xFBAF)
-    ("ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM" #xFBB0)
-    ("ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM" #xFBB1)
-    ("ARABIC LETTER NG ISOLATED FORM" #xFBD3)
-    ("ARABIC LETTER NG FINAL FORM" #xFBD4)
-    ("ARABIC LETTER NG INITIAL FORM" #xFBD5)
-    ("ARABIC LETTER NG MEDIAL FORM" #xFBD6)
-    ("ARABIC LETTER U ISOLATED FORM" #xFBD7)
-    ("ARABIC LETTER U FINAL FORM" #xFBD8)
-    ("ARABIC LETTER OE ISOLATED FORM" #xFBD9)
-    ("ARABIC LETTER OE FINAL FORM" #xFBDA)
-    ("ARABIC LETTER YU ISOLATED FORM" #xFBDB)
-    ("ARABIC LETTER YU FINAL FORM" #xFBDC)
-    ("ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM" #xFBDD)
-    ("ARABIC LETTER VE ISOLATED FORM" #xFBDE)
-    ("ARABIC LETTER VE FINAL FORM" #xFBDF)
-    ("ARABIC LETTER KIRGHIZ OE ISOLATED FORM" #xFBE0)
-    ("ARABIC LETTER KIRGHIZ OE FINAL FORM" #xFBE1)
-    ("ARABIC LETTER KIRGHIZ YU ISOLATED FORM" #xFBE2)
-    ("ARABIC LETTER KIRGHIZ YU FINAL FORM" #xFBE3)
-    ("ARABIC LETTER E ISOLATED FORM" #xFBE4)
-    ("ARABIC LETTER E FINAL FORM" #xFBE5)
-    ("ARABIC LETTER E INITIAL FORM" #xFBE6)
-    ("ARABIC LETTER E MEDIAL FORM" #xFBE7)
-    ("ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM" #xFBE8)
-    ("ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM" #xFBE9)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM" #xFBEA)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM" #xFBEB)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM" #xFBEC)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM" #xFBED)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM" #xFBEE)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM" #xFBEF)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM" #xFBF0)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM" #xFBF1)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM" #xFBF2)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM" #xFBF3)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM" #xFBF4)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM" #xFBF5)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM" #xFBF6)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM" #xFBF7)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM" #xFBF8)
-    ("ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM" #xFBF9)
-    ("ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM" #xFBFA)
-    ("ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM" #xFBFB)
-    ("ARABIC LETTER FARSI YEH ISOLATED FORM" #xFBFC)
-    ("ARABIC LETTER FARSI YEH FINAL FORM" #xFBFD)
-    ("ARABIC LETTER FARSI YEH INITIAL FORM" #xFBFE)
-    ("ARABIC LETTER FARSI YEH MEDIAL FORM" #xFBFF)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM" #xFC00)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM" #xFC01)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM" #xFC02)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM" #xFC03)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM" #xFC04)
-    ("ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM" #xFC05)
-    ("ARABIC LIGATURE BEH WITH HAH ISOLATED FORM" #xFC06)
-    ("ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM" #xFC07)
-    ("ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM" #xFC08)
-    ("ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM" #xFC09)
-    ("ARABIC LIGATURE BEH WITH YEH ISOLATED FORM" #xFC0A)
-    ("ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM" #xFC0B)
-    ("ARABIC LIGATURE TEH WITH HAH ISOLATED FORM" #xFC0C)
-    ("ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM" #xFC0D)
-    ("ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM" #xFC0E)
-    ("ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM" #xFC0F)
-    ("ARABIC LIGATURE TEH WITH YEH ISOLATED FORM" #xFC10)
-    ("ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM" #xFC11)
-    ("ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM" #xFC12)
-    ("ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM" #xFC13)
-    ("ARABIC LIGATURE THEH WITH YEH ISOLATED FORM" #xFC14)
-    ("ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM" #xFC15)
-    ("ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM" #xFC16)
-    ("ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM" #xFC17)
-    ("ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM" #xFC18)
-    ("ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM" #xFC19)
-    ("ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM" #xFC1A)
-    ("ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM" #xFC1B)
-    ("ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM" #xFC1C)
-    ("ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM" #xFC1D)
-    ("ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM" #xFC1E)
-    ("ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM" #xFC1F)
-    ("ARABIC LIGATURE SAD WITH HAH ISOLATED FORM" #xFC20)
-    ("ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM" #xFC21)
-    ("ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM" #xFC22)
-    ("ARABIC LIGATURE DAD WITH HAH ISOLATED FORM" #xFC23)
-    ("ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM" #xFC24)
-    ("ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM" #xFC25)
-    ("ARABIC LIGATURE TAH WITH HAH ISOLATED FORM" #xFC26)
-    ("ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM" #xFC27)
-    ("ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM" #xFC28)
-    ("ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM" #xFC29)
-    ("ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM" #xFC2A)
-    ("ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM" #xFC2B)
-    ("ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM" #xFC2C)
-    ("ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM" #xFC2D)
-    ("ARABIC LIGATURE FEH WITH HAH ISOLATED FORM" #xFC2E)
-    ("ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM" #xFC2F)
-    ("ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM" #xFC30)
-    ("ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM" #xFC31)
-    ("ARABIC LIGATURE FEH WITH YEH ISOLATED FORM" #xFC32)
-    ("ARABIC LIGATURE QAF WITH HAH ISOLATED FORM" #xFC33)
-    ("ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM" #xFC34)
-    ("ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM" #xFC35)
-    ("ARABIC LIGATURE QAF WITH YEH ISOLATED FORM" #xFC36)
-    ("ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM" #xFC37)
-    ("ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM" #xFC38)
-    ("ARABIC LIGATURE KAF WITH HAH ISOLATED FORM" #xFC39)
-    ("ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM" #xFC3A)
-    ("ARABIC LIGATURE KAF WITH LAM ISOLATED FORM" #xFC3B)
-    ("ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM" #xFC3C)
-    ("ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM" #xFC3D)
-    ("ARABIC LIGATURE KAF WITH YEH ISOLATED FORM" #xFC3E)
-    ("ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM" #xFC3F)
-    ("ARABIC LIGATURE LAM WITH HAH ISOLATED FORM" #xFC40)
-    ("ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM" #xFC41)
-    ("ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM" #xFC42)
-    ("ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM" #xFC43)
-    ("ARABIC LIGATURE LAM WITH YEH ISOLATED FORM" #xFC44)
-    ("ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM" #xFC45)
-    ("ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM" #xFC46)
-    ("ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM" #xFC47)
-    ("ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM" #xFC48)
-    ("ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM" #xFC49)
-    ("ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM" #xFC4A)
-    ("ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM" #xFC4B)
-    ("ARABIC LIGATURE NOON WITH HAH ISOLATED FORM" #xFC4C)
-    ("ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM" #xFC4D)
-    ("ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM" #xFC4E)
-    ("ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM" #xFC4F)
-    ("ARABIC LIGATURE NOON WITH YEH ISOLATED FORM" #xFC50)
-    ("ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM" #xFC51)
-    ("ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM" #xFC52)
-    ("ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM" #xFC53)
-    ("ARABIC LIGATURE HEH WITH YEH ISOLATED FORM" #xFC54)
-    ("ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM" #xFC55)
-    ("ARABIC LIGATURE YEH WITH HAH ISOLATED FORM" #xFC56)
-    ("ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM" #xFC57)
-    ("ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM" #xFC58)
-    ("ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM" #xFC59)
-    ("ARABIC LIGATURE YEH WITH YEH ISOLATED FORM" #xFC5A)
-    ("ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM" #xFC5B)
-    ("ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM" #xFC5C)
-    ("ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM" #xFC5D)
-    ("ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM" #xFC5E)
-    ("ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM" #xFC5F)
-    ("ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM" #xFC60)
-    ("ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM" #xFC61)
-    ("ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM" #xFC62)
-    ("ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM" #xFC63)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM" #xFC64)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM" #xFC65)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM" #xFC66)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM" #xFC67)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM" #xFC68)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM" #xFC69)
-    ("ARABIC LIGATURE BEH WITH REH FINAL FORM" #xFC6A)
-    ("ARABIC LIGATURE BEH WITH ZAIN FINAL FORM" #xFC6B)
-    ("ARABIC LIGATURE BEH WITH MEEM FINAL FORM" #xFC6C)
-    ("ARABIC LIGATURE BEH WITH NOON FINAL FORM" #xFC6D)
-    ("ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM" #xFC6E)
-    ("ARABIC LIGATURE BEH WITH YEH FINAL FORM" #xFC6F)
-    ("ARABIC LIGATURE TEH WITH REH FINAL FORM" #xFC70)
-    ("ARABIC LIGATURE TEH WITH ZAIN FINAL FORM" #xFC71)
-    ("ARABIC LIGATURE TEH WITH MEEM FINAL FORM" #xFC72)
-    ("ARABIC LIGATURE TEH WITH NOON FINAL FORM" #xFC73)
-    ("ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM" #xFC74)
-    ("ARABIC LIGATURE TEH WITH YEH FINAL FORM" #xFC75)
-    ("ARABIC LIGATURE THEH WITH REH FINAL FORM" #xFC76)
-    ("ARABIC LIGATURE THEH WITH ZAIN FINAL FORM" #xFC77)
-    ("ARABIC LIGATURE THEH WITH MEEM FINAL FORM" #xFC78)
-    ("ARABIC LIGATURE THEH WITH NOON FINAL FORM" #xFC79)
-    ("ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM" #xFC7A)
-    ("ARABIC LIGATURE THEH WITH YEH FINAL FORM" #xFC7B)
-    ("ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM" #xFC7C)
-    ("ARABIC LIGATURE FEH WITH YEH FINAL FORM" #xFC7D)
-    ("ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM" #xFC7E)
-    ("ARABIC LIGATURE QAF WITH YEH FINAL FORM" #xFC7F)
-    ("ARABIC LIGATURE KAF WITH ALEF FINAL FORM" #xFC80)
-    ("ARABIC LIGATURE KAF WITH LAM FINAL FORM" #xFC81)
-    ("ARABIC LIGATURE KAF WITH MEEM FINAL FORM" #xFC82)
-    ("ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM" #xFC83)
-    ("ARABIC LIGATURE KAF WITH YEH FINAL FORM" #xFC84)
-    ("ARABIC LIGATURE LAM WITH MEEM FINAL FORM" #xFC85)
-    ("ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM" #xFC86)
-    ("ARABIC LIGATURE LAM WITH YEH FINAL FORM" #xFC87)
-    ("ARABIC LIGATURE MEEM WITH ALEF FINAL FORM" #xFC88)
-    ("ARABIC LIGATURE MEEM WITH MEEM FINAL FORM" #xFC89)
-    ("ARABIC LIGATURE NOON WITH REH FINAL FORM" #xFC8A)
-    ("ARABIC LIGATURE NOON WITH ZAIN FINAL FORM" #xFC8B)
-    ("ARABIC LIGATURE NOON WITH MEEM FINAL FORM" #xFC8C)
-    ("ARABIC LIGATURE NOON WITH NOON FINAL FORM" #xFC8D)
-    ("ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM" #xFC8E)
-    ("ARABIC LIGATURE NOON WITH YEH FINAL FORM" #xFC8F)
-    ("ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM" #xFC90)
-    ("ARABIC LIGATURE YEH WITH REH FINAL FORM" #xFC91)
-    ("ARABIC LIGATURE YEH WITH ZAIN FINAL FORM" #xFC92)
-    ("ARABIC LIGATURE YEH WITH MEEM FINAL FORM" #xFC93)
-    ("ARABIC LIGATURE YEH WITH NOON FINAL FORM" #xFC94)
-    ("ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM" #xFC95)
-    ("ARABIC LIGATURE YEH WITH YEH FINAL FORM" #xFC96)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM" #xFC97)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM" #xFC98)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM" #xFC99)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM" #xFC9A)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM" #xFC9B)
-    ("ARABIC LIGATURE BEH WITH JEEM INITIAL FORM" #xFC9C)
-    ("ARABIC LIGATURE BEH WITH HAH INITIAL FORM" #xFC9D)
-    ("ARABIC LIGATURE BEH WITH KHAH INITIAL FORM" #xFC9E)
-    ("ARABIC LIGATURE BEH WITH MEEM INITIAL FORM" #xFC9F)
-    ("ARABIC LIGATURE BEH WITH HEH INITIAL FORM" #xFCA0)
-    ("ARABIC LIGATURE TEH WITH JEEM INITIAL FORM" #xFCA1)
-    ("ARABIC LIGATURE TEH WITH HAH INITIAL FORM" #xFCA2)
-    ("ARABIC LIGATURE TEH WITH KHAH INITIAL FORM" #xFCA3)
-    ("ARABIC LIGATURE TEH WITH MEEM INITIAL FORM" #xFCA4)
-    ("ARABIC LIGATURE TEH WITH HEH INITIAL FORM" #xFCA5)
-    ("ARABIC LIGATURE THEH WITH MEEM INITIAL FORM" #xFCA6)
-    ("ARABIC LIGATURE JEEM WITH HAH INITIAL FORM" #xFCA7)
-    ("ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM" #xFCA8)
-    ("ARABIC LIGATURE HAH WITH JEEM INITIAL FORM" #xFCA9)
-    ("ARABIC LIGATURE HAH WITH MEEM INITIAL FORM" #xFCAA)
-    ("ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM" #xFCAB)
-    ("ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM" #xFCAC)
-    ("ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM" #xFCAD)
-    ("ARABIC LIGATURE SEEN WITH HAH INITIAL FORM" #xFCAE)
-    ("ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM" #xFCAF)
-    ("ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM" #xFCB0)
-    ("ARABIC LIGATURE SAD WITH HAH INITIAL FORM" #xFCB1)
-    ("ARABIC LIGATURE SAD WITH KHAH INITIAL FORM" #xFCB2)
-    ("ARABIC LIGATURE SAD WITH MEEM INITIAL FORM" #xFCB3)
-    ("ARABIC LIGATURE DAD WITH JEEM INITIAL FORM" #xFCB4)
-    ("ARABIC LIGATURE DAD WITH HAH INITIAL FORM" #xFCB5)
-    ("ARABIC LIGATURE DAD WITH KHAH INITIAL FORM" #xFCB6)
-    ("ARABIC LIGATURE DAD WITH MEEM INITIAL FORM" #xFCB7)
-    ("ARABIC LIGATURE TAH WITH HAH INITIAL FORM" #xFCB8)
-    ("ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM" #xFCB9)
-    ("ARABIC LIGATURE AIN WITH JEEM INITIAL FORM" #xFCBA)
-    ("ARABIC LIGATURE AIN WITH MEEM INITIAL FORM" #xFCBB)
-    ("ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM" #xFCBC)
-    ("ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM" #xFCBD)
-    ("ARABIC LIGATURE FEH WITH JEEM INITIAL FORM" #xFCBE)
-    ("ARABIC LIGATURE FEH WITH HAH INITIAL FORM" #xFCBF)
-    ("ARABIC LIGATURE FEH WITH KHAH INITIAL FORM" #xFCC0)
-    ("ARABIC LIGATURE FEH WITH MEEM INITIAL FORM" #xFCC1)
-    ("ARABIC LIGATURE QAF WITH HAH INITIAL FORM" #xFCC2)
-    ("ARABIC LIGATURE QAF WITH MEEM INITIAL FORM" #xFCC3)
-    ("ARABIC LIGATURE KAF WITH JEEM INITIAL FORM" #xFCC4)
-    ("ARABIC LIGATURE KAF WITH HAH INITIAL FORM" #xFCC5)
-    ("ARABIC LIGATURE KAF WITH KHAH INITIAL FORM" #xFCC6)
-    ("ARABIC LIGATURE KAF WITH LAM INITIAL FORM" #xFCC7)
-    ("ARABIC LIGATURE KAF WITH MEEM INITIAL FORM" #xFCC8)
-    ("ARABIC LIGATURE LAM WITH JEEM INITIAL FORM" #xFCC9)
-    ("ARABIC LIGATURE LAM WITH HAH INITIAL FORM" #xFCCA)
-    ("ARABIC LIGATURE LAM WITH KHAH INITIAL FORM" #xFCCB)
-    ("ARABIC LIGATURE LAM WITH MEEM INITIAL FORM" #xFCCC)
-    ("ARABIC LIGATURE LAM WITH HEH INITIAL FORM" #xFCCD)
-    ("ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM" #xFCCE)
-    ("ARABIC LIGATURE MEEM WITH HAH INITIAL FORM" #xFCCF)
-    ("ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM" #xFCD0)
-    ("ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM" #xFCD1)
-    ("ARABIC LIGATURE NOON WITH JEEM INITIAL FORM" #xFCD2)
-    ("ARABIC LIGATURE NOON WITH HAH INITIAL FORM" #xFCD3)
-    ("ARABIC LIGATURE NOON WITH KHAH INITIAL FORM" #xFCD4)
-    ("ARABIC LIGATURE NOON WITH MEEM INITIAL FORM" #xFCD5)
-    ("ARABIC LIGATURE NOON WITH HEH INITIAL FORM" #xFCD6)
-    ("ARABIC LIGATURE HEH WITH JEEM INITIAL FORM" #xFCD7)
-    ("ARABIC LIGATURE HEH WITH MEEM INITIAL FORM" #xFCD8)
-    ("ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM" #xFCD9)
-    ("ARABIC LIGATURE YEH WITH JEEM INITIAL FORM" #xFCDA)
-    ("ARABIC LIGATURE YEH WITH HAH INITIAL FORM" #xFCDB)
-    ("ARABIC LIGATURE YEH WITH KHAH INITIAL FORM" #xFCDC)
-    ("ARABIC LIGATURE YEH WITH MEEM INITIAL FORM" #xFCDD)
-    ("ARABIC LIGATURE YEH WITH HEH INITIAL FORM" #xFCDE)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM" #xFCDF)
-    ("ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM" #xFCE0)
-    ("ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM" #xFCE1)
-    ("ARABIC LIGATURE BEH WITH HEH MEDIAL FORM" #xFCE2)
-    ("ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM" #xFCE3)
-    ("ARABIC LIGATURE TEH WITH HEH MEDIAL FORM" #xFCE4)
-    ("ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM" #xFCE5)
-    ("ARABIC LIGATURE THEH WITH HEH MEDIAL FORM" #xFCE6)
-    ("ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM" #xFCE7)
-    ("ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM" #xFCE8)
-    ("ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM" #xFCE9)
-    ("ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM" #xFCEA)
-    ("ARABIC LIGATURE KAF WITH LAM MEDIAL FORM" #xFCEB)
-    ("ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM" #xFCEC)
-    ("ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM" #xFCED)
-    ("ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM" #xFCEE)
-    ("ARABIC LIGATURE NOON WITH HEH MEDIAL FORM" #xFCEF)
-    ("ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM" #xFCF0)
-    ("ARABIC LIGATURE YEH WITH HEH MEDIAL FORM" #xFCF1)
-    ("ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM" #xFCF2)
-    ("ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM" #xFCF3)
-    ("ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM" #xFCF4)
-    ("ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM" #xFCF5)
-    ("ARABIC LIGATURE TAH WITH YEH ISOLATED FORM" #xFCF6)
-    ("ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM" #xFCF7)
-    ("ARABIC LIGATURE AIN WITH YEH ISOLATED FORM" #xFCF8)
-    ("ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM" #xFCF9)
-    ("ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM" #xFCFA)
-    ("ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM" #xFCFB)
-    ("ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM" #xFCFC)
-    ("ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM" #xFCFD)
-    ("ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM" #xFCFE)
-    ("ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM" #xFCFF)
-    ("ARABIC LIGATURE HAH WITH YEH ISOLATED FORM" #xFD00)
-    ("ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM" #xFD01)
-    ("ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM" #xFD02)
-    ("ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM" #xFD03)
-    ("ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM" #xFD04)
-    ("ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM" #xFD05)
-    ("ARABIC LIGATURE SAD WITH YEH ISOLATED FORM" #xFD06)
-    ("ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM" #xFD07)
-    ("ARABIC LIGATURE DAD WITH YEH ISOLATED FORM" #xFD08)
-    ("ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM" #xFD09)
-    ("ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM" #xFD0A)
-    ("ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM" #xFD0B)
-    ("ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM" #xFD0C)
-    ("ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM" #xFD0D)
-    ("ARABIC LIGATURE SEEN WITH REH ISOLATED FORM" #xFD0E)
-    ("ARABIC LIGATURE SAD WITH REH ISOLATED FORM" #xFD0F)
-    ("ARABIC LIGATURE DAD WITH REH ISOLATED FORM" #xFD10)
-    ("ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM" #xFD11)
-    ("ARABIC LIGATURE TAH WITH YEH FINAL FORM" #xFD12)
-    ("ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM" #xFD13)
-    ("ARABIC LIGATURE AIN WITH YEH FINAL FORM" #xFD14)
-    ("ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM" #xFD15)
-    ("ARABIC LIGATURE GHAIN WITH YEH FINAL FORM" #xFD16)
-    ("ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM" #xFD17)
-    ("ARABIC LIGATURE SEEN WITH YEH FINAL FORM" #xFD18)
-    ("ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM" #xFD19)
-    ("ARABIC LIGATURE SHEEN WITH YEH FINAL FORM" #xFD1A)
-    ("ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM" #xFD1B)
-    ("ARABIC LIGATURE HAH WITH YEH FINAL FORM" #xFD1C)
-    ("ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM" #xFD1D)
-    ("ARABIC LIGATURE JEEM WITH YEH FINAL FORM" #xFD1E)
-    ("ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM" #xFD1F)
-    ("ARABIC LIGATURE KHAH WITH YEH FINAL FORM" #xFD20)
-    ("ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM" #xFD21)
-    ("ARABIC LIGATURE SAD WITH YEH FINAL FORM" #xFD22)
-    ("ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM" #xFD23)
-    ("ARABIC LIGATURE DAD WITH YEH FINAL FORM" #xFD24)
-    ("ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM" #xFD25)
-    ("ARABIC LIGATURE SHEEN WITH HAH FINAL FORM" #xFD26)
-    ("ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM" #xFD27)
-    ("ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM" #xFD28)
-    ("ARABIC LIGATURE SHEEN WITH REH FINAL FORM" #xFD29)
-    ("ARABIC LIGATURE SEEN WITH REH FINAL FORM" #xFD2A)
-    ("ARABIC LIGATURE SAD WITH REH FINAL FORM" #xFD2B)
-    ("ARABIC LIGATURE DAD WITH REH FINAL FORM" #xFD2C)
-    ("ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM" #xFD2D)
-    ("ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM" #xFD2E)
-    ("ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM" #xFD2F)
-    ("ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM" #xFD30)
-    ("ARABIC LIGATURE SEEN WITH HEH INITIAL FORM" #xFD31)
-    ("ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM" #xFD32)
-    ("ARABIC LIGATURE TAH WITH MEEM INITIAL FORM" #xFD33)
-    ("ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM" #xFD34)
-    ("ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM" #xFD35)
-    ("ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM" #xFD36)
-    ("ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM" #xFD37)
-    ("ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM" #xFD38)
-    ("ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM" #xFD39)
-    ("ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM" #xFD3A)
-    ("ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM" #xFD3B)
-    ("ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM" #xFD3C)
-    ("ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM" #xFD3D)
-    ("ORNATE LEFT PARENTHESIS" #xFD3E)
-    ("ORNATE RIGHT PARENTHESIS" #xFD3F)
-    ("ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM" #xFD50)
-    ("ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM" #xFD51)
-    ("ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM" #xFD52)
-    ("ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM" #xFD53)
-    ("ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM" #xFD54)
-    ("ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM" #xFD55)
-    ("ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM" #xFD56)
-    ("ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM" #xFD57)
-    ("ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM" #xFD58)
-    ("ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM" #xFD59)
-    ("ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM" #xFD5A)
-    ("ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFD5B)
-    ("ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM" #xFD5C)
-    ("ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM" #xFD5D)
-    ("ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM" #xFD5E)
-    ("ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM" #xFD5F)
-    ("ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM" #xFD60)
-    ("ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM" #xFD61)
-    ("ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM" #xFD62)
-    ("ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM" #xFD63)
-    ("ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM" #xFD64)
-    ("ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM" #xFD65)
-    ("ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM" #xFD66)
-    ("ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM" #xFD67)
-    ("ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM" #xFD68)
-    ("ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM" #xFD69)
-    ("ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM" #xFD6A)
-    ("ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM" #xFD6B)
-    ("ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM" #xFD6C)
-    ("ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM" #xFD6D)
-    ("ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM" #xFD6E)
-    ("ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM" #xFD6F)
-    ("ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM" #xFD70)
-    ("ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM" #xFD71)
-    ("ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM" #xFD72)
-    ("ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM" #xFD73)
-    ("ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM" #xFD74)
-    ("ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM" #xFD75)
-    ("ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM" #xFD76)
-    ("ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM" #xFD77)
-    ("ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFD78)
-    ("ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM" #xFD79)
-    ("ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM" #xFD7A)
-    ("ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFD7B)
-    ("ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM" #xFD7C)
-    ("ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM" #xFD7D)
-    ("ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM" #xFD7E)
-    ("ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM" #xFD7F)
-    ("ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM" #xFD80)
-    ("ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM" #xFD81)
-    ("ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM" #xFD82)
-    ("ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM" #xFD83)
-    ("ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM" #xFD84)
-    ("ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM" #xFD85)
-    ("ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM" #xFD86)
-    ("ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM" #xFD87)
-    ("ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM" #xFD88)
-    ("ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM" #xFD89)
-    ("ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM" #xFD8A)
-    ("ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM" #xFD8B)
-    ("ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM" #xFD8C)
-    ("ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM" #xFD8D)
-    ("ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM" #xFD8E)
-    ("ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM" #xFD8F)
-    ("ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM" #xFD92)
-    ("ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM" #xFD93)
-    ("ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM" #xFD94)
-    ("ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM" #xFD95)
-    ("ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM" #xFD96)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM" #xFD97)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM" #xFD98)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM" #xFD99)
-    ("ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM" #xFD9A)
-    ("ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFD9B)
-    ("ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM" #xFD9C)
-    ("ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM" #xFD9D)
-    ("ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM" #xFD9E)
-    ("ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM" #xFD9F)
-    ("ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM" #xFDA0)
-    ("ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM" #xFDA1)
-    ("ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM" #xFDA2)
-    ("ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM" #xFDA3)
-    ("ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFDA4)
-    ("ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM" #xFDA5)
-    ("ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM" #xFDA6)
-    ("ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM" #xFDA7)
-    ("ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM" #xFDA8)
-    ("ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM" #xFDA9)
-    ("ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM" #xFDAA)
-    ("ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM" #xFDAB)
-    ("ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM" #xFDAC)
-    ("ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM" #xFDAD)
-    ("ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM" #xFDAE)
-    ("ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM" #xFDAF)
-    ("ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM" #xFDB0)
-    ("ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM" #xFDB1)
-    ("ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM" #xFDB2)
-    ("ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM" #xFDB3)
-    ("ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM" #xFDB4)
-    ("ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM" #xFDB5)
-    ("ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM" #xFDB6)
-    ("ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM" #xFDB7)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM" #xFDB8)
-    ("ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM" #xFDB9)
-    ("ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM" #xFDBA)
-    ("ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM" #xFDBB)
-    ("ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM" #xFDBC)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM" #xFDBD)
-    ("ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM" #xFDBE)
-    ("ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM" #xFDBF)
-    ("ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM" #xFDC0)
-    ("ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM" #xFDC1)
-    ("ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM" #xFDC2)
-    ("ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM" #xFDC3)
-    ("ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM" #xFDC4)
-    ("ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM" #xFDC5)
-    ("ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM" #xFDC6)
-    ("ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM" #xFDC7)
-    ("ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM" #xFDF0)
-    ("ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM" #xFDF1)
-    ("ARABIC LIGATURE ALLAH ISOLATED FORM" #xFDF2)
-    ("ARABIC LIGATURE AKBAR ISOLATED FORM" #xFDF3)
-    ("ARABIC LIGATURE MOHAMMAD ISOLATED FORM" #xFDF4)
-    ("ARABIC LIGATURE SALAM ISOLATED FORM" #xFDF5)
-    ("ARABIC LIGATURE RASOUL ISOLATED FORM" #xFDF6)
-    ("ARABIC LIGATURE ALAYHE ISOLATED FORM" #xFDF7)
-    ("ARABIC LIGATURE WASALLAM ISOLATED FORM" #xFDF8)
-    ("ARABIC LIGATURE SALLA ISOLATED FORM" #xFDF9)
-    ("ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM" #xFDFA)
-    ("ARABIC LIGATURE JALLAJALALOUHOU" #xFDFB)
-    ("RIAL SIGN" #xFDFC)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE00-0FE0F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE00-0FE0F.el
deleted file mode 100644
index f1eb897599..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE00-0FE0F.el
+++ /dev/null
@@ -1,18 +0,0 @@
-(nxml-define-char-name-set 'variation-selectors
-  '(("VARIATION SELECTOR-1" #xFE00)
-    ("VARIATION SELECTOR-2" #xFE01)
-    ("VARIATION SELECTOR-3" #xFE02)
-    ("VARIATION SELECTOR-4" #xFE03)
-    ("VARIATION SELECTOR-5" #xFE04)
-    ("VARIATION SELECTOR-6" #xFE05)
-    ("VARIATION SELECTOR-7" #xFE06)
-    ("VARIATION SELECTOR-8" #xFE07)
-    ("VARIATION SELECTOR-9" #xFE08)
-    ("VARIATION SELECTOR-10" #xFE09)
-    ("VARIATION SELECTOR-11" #xFE0A)
-    ("VARIATION SELECTOR-12" #xFE0B)
-    ("VARIATION SELECTOR-13" #xFE0C)
-    ("VARIATION SELECTOR-14" #xFE0D)
-    ("VARIATION SELECTOR-15" #xFE0E)
-    ("VARIATION SELECTOR-16" #xFE0F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE20-0FE2F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE20-0FE2F.el
deleted file mode 100644
index 2cc5ef2bb0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE20-0FE2F.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(nxml-define-char-name-set 'combining-half-marks
-  '(("COMBINING LIGATURE LEFT HALF" #xFE20)
-    ("COMBINING LIGATURE RIGHT HALF" #xFE21)
-    ("COMBINING DOUBLE TILDE LEFT HALF" #xFE22)
-    ("COMBINING DOUBLE TILDE RIGHT HALF" #xFE23)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE30-0FE4F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE30-0FE4F.el
deleted file mode 100644
index 83893e4b93..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE30-0FE4F.el
+++ /dev/null
@@ -1,32 +0,0 @@
-(nxml-define-char-name-set 'cjk-compatibility-forms
-  '(("PRESENTATION FORM FOR VERTICAL TWO DOT LEADER" #xFE30)
-    ("PRESENTATION FORM FOR VERTICAL EM DASH" #xFE31)
-    ("PRESENTATION FORM FOR VERTICAL EN DASH" #xFE32)
-    ("PRESENTATION FORM FOR VERTICAL LOW LINE" #xFE33)
-    ("PRESENTATION FORM FOR VERTICAL WAVY LOW LINE" #xFE34)
-    ("PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS" #xFE35)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS" #xFE36)
-    ("PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET" #xFE37)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET" #xFE38)
-    ("PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET" #xFE39)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET" #xFE3A)
-    ("PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET" #xFE3B)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET" #xFE3C)
-    ("PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET" #xFE3D)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET" #xFE3E)
-    ("PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET" #xFE3F)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET" #xFE40)
-    ("PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET" #xFE41)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET" #xFE42)
-    ("PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET" #xFE43)
-    ("PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET" #xFE44)
-    ("SESAME DOT" #xFE45)
-    ("WHITE SESAME DOT" #xFE46)
-    ("DASHED OVERLINE" #xFE49)
-    ("CENTRELINE OVERLINE" #xFE4A)
-    ("WAVY OVERLINE" #xFE4B)
-    ("DOUBLE WAVY OVERLINE" #xFE4C)
-    ("DASHED LOW LINE" #xFE4D)
-    ("CENTRELINE LOW LINE" #xFE4E)
-    ("WAVY LOW LINE" #xFE4F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE50-0FE6F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE50-0FE6F.el
deleted file mode 100644
index d94cc453f4..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE50-0FE6F.el
+++ /dev/null
@@ -1,28 +0,0 @@
-(nxml-define-char-name-set 'small-form-variants
-  '(("SMALL COMMA" #xFE50)
-    ("SMALL IDEOGRAPHIC COMMA" #xFE51)
-    ("SMALL FULL STOP" #xFE52)
-    ("SMALL SEMICOLON" #xFE54)
-    ("SMALL COLON" #xFE55)
-    ("SMALL QUESTION MARK" #xFE56)
-    ("SMALL EXCLAMATION MARK" #xFE57)
-    ("SMALL EM DASH" #xFE58)
-    ("SMALL LEFT PARENTHESIS" #xFE59)
-    ("SMALL RIGHT PARENTHESIS" #xFE5A)
-    ("SMALL LEFT CURLY BRACKET" #xFE5B)
-    ("SMALL RIGHT CURLY BRACKET" #xFE5C)
-    ("SMALL LEFT TORTOISE SHELL BRACKET" #xFE5D)
-    ("SMALL RIGHT TORTOISE SHELL BRACKET" #xFE5E)
-    ("SMALL NUMBER SIGN" #xFE5F)
-    ("SMALL AMPERSAND" #xFE60)
-    ("SMALL ASTERISK" #xFE61)
-    ("SMALL PLUS SIGN" #xFE62)
-    ("SMALL HYPHEN-MINUS" #xFE63)
-    ("SMALL LESS-THAN SIGN" #xFE64)
-    ("SMALL GREATER-THAN SIGN" #xFE65)
-    ("SMALL EQUALS SIGN" #xFE66)
-    ("SMALL REVERSE SOLIDUS" #xFE68)
-    ("SMALL DOLLAR SIGN" #xFE69)
-    ("SMALL PERCENT SIGN" #xFE6A)
-    ("SMALL COMMERCIAL AT" #xFE6B)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE70-0FEFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE70-0FEFF.el
deleted file mode 100644
index d0e54b64ec..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FE70-0FEFF.el
+++ /dev/null
@@ -1,143 +0,0 @@
-(nxml-define-char-name-set 'arabic-presentation-forms-b
-  '(("ARABIC FATHATAN ISOLATED FORM" #xFE70)
-    ("ARABIC TATWEEL WITH FATHATAN ABOVE" #xFE71)
-    ("ARABIC DAMMATAN ISOLATED FORM" #xFE72)
-    ("ARABIC TAIL FRAGMENT" #xFE73)
-    ("ARABIC KASRATAN ISOLATED FORM" #xFE74)
-    ("ARABIC FATHA ISOLATED FORM" #xFE76)
-    ("ARABIC FATHA MEDIAL FORM" #xFE77)
-    ("ARABIC DAMMA ISOLATED FORM" #xFE78)
-    ("ARABIC DAMMA MEDIAL FORM" #xFE79)
-    ("ARABIC KASRA ISOLATED FORM" #xFE7A)
-    ("ARABIC KASRA MEDIAL FORM" #xFE7B)
-    ("ARABIC SHADDA ISOLATED FORM" #xFE7C)
-    ("ARABIC SHADDA MEDIAL FORM" #xFE7D)
-    ("ARABIC SUKUN ISOLATED FORM" #xFE7E)
-    ("ARABIC SUKUN MEDIAL FORM" #xFE7F)
-    ("ARABIC LETTER HAMZA ISOLATED FORM" #xFE80)
-    ("ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM" #xFE81)
-    ("ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM" #xFE82)
-    ("ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM" #xFE83)
-    ("ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM" #xFE84)
-    ("ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM" #xFE85)
-    ("ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM" #xFE86)
-    ("ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM" #xFE87)
-    ("ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM" #xFE88)
-    ("ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM" #xFE89)
-    ("ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM" #xFE8A)
-    ("ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM" #xFE8B)
-    ("ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM" #xFE8C)
-    ("ARABIC LETTER ALEF ISOLATED FORM" #xFE8D)
-    ("ARABIC LETTER ALEF FINAL FORM" #xFE8E)
-    ("ARABIC LETTER BEH ISOLATED FORM" #xFE8F)
-    ("ARABIC LETTER BEH FINAL FORM" #xFE90)
-    ("ARABIC LETTER BEH INITIAL FORM" #xFE91)
-    ("ARABIC LETTER BEH MEDIAL FORM" #xFE92)
-    ("ARABIC LETTER TEH MARBUTA ISOLATED FORM" #xFE93)
-    ("ARABIC LETTER TEH MARBUTA FINAL FORM" #xFE94)
-    ("ARABIC LETTER TEH ISOLATED FORM" #xFE95)
-    ("ARABIC LETTER TEH FINAL FORM" #xFE96)
-    ("ARABIC LETTER TEH INITIAL FORM" #xFE97)
-    ("ARABIC LETTER TEH MEDIAL FORM" #xFE98)
-    ("ARABIC LETTER THEH ISOLATED FORM" #xFE99)
-    ("ARABIC LETTER THEH FINAL FORM" #xFE9A)
-    ("ARABIC LETTER THEH INITIAL FORM" #xFE9B)
-    ("ARABIC LETTER THEH MEDIAL FORM" #xFE9C)
-    ("ARABIC LETTER JEEM ISOLATED FORM" #xFE9D)
-    ("ARABIC LETTER JEEM FINAL FORM" #xFE9E)
-    ("ARABIC LETTER JEEM INITIAL FORM" #xFE9F)
-    ("ARABIC LETTER JEEM MEDIAL FORM" #xFEA0)
-    ("ARABIC LETTER HAH ISOLATED FORM" #xFEA1)
-    ("ARABIC LETTER HAH FINAL FORM" #xFEA2)
-    ("ARABIC LETTER HAH INITIAL FORM" #xFEA3)
-    ("ARABIC LETTER HAH MEDIAL FORM" #xFEA4)
-    ("ARABIC LETTER KHAH ISOLATED FORM" #xFEA5)
-    ("ARABIC LETTER KHAH FINAL FORM" #xFEA6)
-    ("ARABIC LETTER KHAH INITIAL FORM" #xFEA7)
-    ("ARABIC LETTER KHAH MEDIAL FORM" #xFEA8)
-    ("ARABIC LETTER DAL ISOLATED FORM" #xFEA9)
-    ("ARABIC LETTER DAL FINAL FORM" #xFEAA)
-    ("ARABIC LETTER THAL ISOLATED FORM" #xFEAB)
-    ("ARABIC LETTER THAL FINAL FORM" #xFEAC)
-    ("ARABIC LETTER REH ISOLATED FORM" #xFEAD)
-    ("ARABIC LETTER REH FINAL FORM" #xFEAE)
-    ("ARABIC LETTER ZAIN ISOLATED FORM" #xFEAF)
-    ("ARABIC LETTER ZAIN FINAL FORM" #xFEB0)
-    ("ARABIC LETTER SEEN ISOLATED FORM" #xFEB1)
-    ("ARABIC LETTER SEEN FINAL FORM" #xFEB2)
-    ("ARABIC LETTER SEEN INITIAL FORM" #xFEB3)
-    ("ARABIC LETTER SEEN MEDIAL FORM" #xFEB4)
-    ("ARABIC LETTER SHEEN ISOLATED FORM" #xFEB5)
-    ("ARABIC LETTER SHEEN FINAL FORM" #xFEB6)
-    ("ARABIC LETTER SHEEN INITIAL FORM" #xFEB7)
-    ("ARABIC LETTER SHEEN MEDIAL FORM" #xFEB8)
-    ("ARABIC LETTER SAD ISOLATED FORM" #xFEB9)
-    ("ARABIC LETTER SAD FINAL FORM" #xFEBA)
-    ("ARABIC LETTER SAD INITIAL FORM" #xFEBB)
-    ("ARABIC LETTER SAD MEDIAL FORM" #xFEBC)
-    ("ARABIC LETTER DAD ISOLATED FORM" #xFEBD)
-    ("ARABIC LETTER DAD FINAL FORM" #xFEBE)
-    ("ARABIC LETTER DAD INITIAL FORM" #xFEBF)
-    ("ARABIC LETTER DAD MEDIAL FORM" #xFEC0)
-    ("ARABIC LETTER TAH ISOLATED FORM" #xFEC1)
-    ("ARABIC LETTER TAH FINAL FORM" #xFEC2)
-    ("ARABIC LETTER TAH INITIAL FORM" #xFEC3)
-    ("ARABIC LETTER TAH MEDIAL FORM" #xFEC4)
-    ("ARABIC LETTER ZAH ISOLATED FORM" #xFEC5)
-    ("ARABIC LETTER ZAH FINAL FORM" #xFEC6)
-    ("ARABIC LETTER ZAH INITIAL FORM" #xFEC7)
-    ("ARABIC LETTER ZAH MEDIAL FORM" #xFEC8)
-    ("ARABIC LETTER AIN ISOLATED FORM" #xFEC9)
-    ("ARABIC LETTER AIN FINAL FORM" #xFECA)
-    ("ARABIC LETTER AIN INITIAL FORM" #xFECB)
-    ("ARABIC LETTER AIN MEDIAL FORM" #xFECC)
-    ("ARABIC LETTER GHAIN ISOLATED FORM" #xFECD)
-    ("ARABIC LETTER GHAIN FINAL FORM" #xFECE)
-    ("ARABIC LETTER GHAIN INITIAL FORM" #xFECF)
-    ("ARABIC LETTER GHAIN MEDIAL FORM" #xFED0)
-    ("ARABIC LETTER FEH ISOLATED FORM" #xFED1)
-    ("ARABIC LETTER FEH FINAL FORM" #xFED2)
-    ("ARABIC LETTER FEH INITIAL FORM" #xFED3)
-    ("ARABIC LETTER FEH MEDIAL FORM" #xFED4)
-    ("ARABIC LETTER QAF ISOLATED FORM" #xFED5)
-    ("ARABIC LETTER QAF FINAL FORM" #xFED6)
-    ("ARABIC LETTER QAF INITIAL FORM" #xFED7)
-    ("ARABIC LETTER QAF MEDIAL FORM" #xFED8)
-    ("ARABIC LETTER KAF ISOLATED FORM" #xFED9)
-    ("ARABIC LETTER KAF FINAL FORM" #xFEDA)
-    ("ARABIC LETTER KAF INITIAL FORM" #xFEDB)
-    ("ARABIC LETTER KAF MEDIAL FORM" #xFEDC)
-    ("ARABIC LETTER LAM ISOLATED FORM" #xFEDD)
-    ("ARABIC LETTER LAM FINAL FORM" #xFEDE)
-    ("ARABIC LETTER LAM INITIAL FORM" #xFEDF)
-    ("ARABIC LETTER LAM MEDIAL FORM" #xFEE0)
-    ("ARABIC LETTER MEEM ISOLATED FORM" #xFEE1)
-    ("ARABIC LETTER MEEM FINAL FORM" #xFEE2)
-    ("ARABIC LETTER MEEM INITIAL FORM" #xFEE3)
-    ("ARABIC LETTER MEEM MEDIAL FORM" #xFEE4)
-    ("ARABIC LETTER NOON ISOLATED FORM" #xFEE5)
-    ("ARABIC LETTER NOON FINAL FORM" #xFEE6)
-    ("ARABIC LETTER NOON INITIAL FORM" #xFEE7)
-    ("ARABIC LETTER NOON MEDIAL FORM" #xFEE8)
-    ("ARABIC LETTER HEH ISOLATED FORM" #xFEE9)
-    ("ARABIC LETTER HEH FINAL FORM" #xFEEA)
-    ("ARABIC LETTER HEH INITIAL FORM" #xFEEB)
-    ("ARABIC LETTER HEH MEDIAL FORM" #xFEEC)
-    ("ARABIC LETTER WAW ISOLATED FORM" #xFEED)
-    ("ARABIC LETTER WAW FINAL FORM" #xFEEE)
-    ("ARABIC LETTER ALEF MAKSURA ISOLATED FORM" #xFEEF)
-    ("ARABIC LETTER ALEF MAKSURA FINAL FORM" #xFEF0)
-    ("ARABIC LETTER YEH ISOLATED FORM" #xFEF1)
-    ("ARABIC LETTER YEH FINAL FORM" #xFEF2)
-    ("ARABIC LETTER YEH INITIAL FORM" #xFEF3)
-    ("ARABIC LETTER YEH MEDIAL FORM" #xFEF4)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM" #xFEF5)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM" #xFEF6)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM" #xFEF7)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM" #xFEF8)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM" #xFEF9)
-    ("ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM" #xFEFA)
-    ("ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM" #xFEFB)
-    ("ARABIC LIGATURE LAM WITH ALEF FINAL FORM" #xFEFC)
-    ("ZERO WIDTH NO-BREAK SPACE" #xFEFF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FF00-0FFEF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FF00-0FFEF.el
deleted file mode 100644
index 004f043c19..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FF00-0FFEF.el
+++ /dev/null
@@ -1,227 +0,0 @@
-(nxml-define-char-name-set 'halfwidth-and-fullwidth-forms
-  '(("FULLWIDTH EXCLAMATION MARK" #xFF01)
-    ("FULLWIDTH QUOTATION MARK" #xFF02)
-    ("FULLWIDTH NUMBER SIGN" #xFF03)
-    ("FULLWIDTH DOLLAR SIGN" #xFF04)
-    ("FULLWIDTH PERCENT SIGN" #xFF05)
-    ("FULLWIDTH AMPERSAND" #xFF06)
-    ("FULLWIDTH APOSTROPHE" #xFF07)
-    ("FULLWIDTH LEFT PARENTHESIS" #xFF08)
-    ("FULLWIDTH RIGHT PARENTHESIS" #xFF09)
-    ("FULLWIDTH ASTERISK" #xFF0A)
-    ("FULLWIDTH PLUS SIGN" #xFF0B)
-    ("FULLWIDTH COMMA" #xFF0C)
-    ("FULLWIDTH HYPHEN-MINUS" #xFF0D)
-    ("FULLWIDTH FULL STOP" #xFF0E)
-    ("FULLWIDTH SOLIDUS" #xFF0F)
-    ("FULLWIDTH DIGIT ZERO" #xFF10)
-    ("FULLWIDTH DIGIT ONE" #xFF11)
-    ("FULLWIDTH DIGIT TWO" #xFF12)
-    ("FULLWIDTH DIGIT THREE" #xFF13)
-    ("FULLWIDTH DIGIT FOUR" #xFF14)
-    ("FULLWIDTH DIGIT FIVE" #xFF15)
-    ("FULLWIDTH DIGIT SIX" #xFF16)
-    ("FULLWIDTH DIGIT SEVEN" #xFF17)
-    ("FULLWIDTH DIGIT EIGHT" #xFF18)
-    ("FULLWIDTH DIGIT NINE" #xFF19)
-    ("FULLWIDTH COLON" #xFF1A)
-    ("FULLWIDTH SEMICOLON" #xFF1B)
-    ("FULLWIDTH LESS-THAN SIGN" #xFF1C)
-    ("FULLWIDTH EQUALS SIGN" #xFF1D)
-    ("FULLWIDTH GREATER-THAN SIGN" #xFF1E)
-    ("FULLWIDTH QUESTION MARK" #xFF1F)
-    ("FULLWIDTH COMMERCIAL AT" #xFF20)
-    ("FULLWIDTH LATIN CAPITAL LETTER A" #xFF21)
-    ("FULLWIDTH LATIN CAPITAL LETTER B" #xFF22)
-    ("FULLWIDTH LATIN CAPITAL LETTER C" #xFF23)
-    ("FULLWIDTH LATIN CAPITAL LETTER D" #xFF24)
-    ("FULLWIDTH LATIN CAPITAL LETTER E" #xFF25)
-    ("FULLWIDTH LATIN CAPITAL LETTER F" #xFF26)
-    ("FULLWIDTH LATIN CAPITAL LETTER G" #xFF27)
-    ("FULLWIDTH LATIN CAPITAL LETTER H" #xFF28)
-    ("FULLWIDTH LATIN CAPITAL LETTER I" #xFF29)
-    ("FULLWIDTH LATIN CAPITAL LETTER J" #xFF2A)
-    ("FULLWIDTH LATIN CAPITAL LETTER K" #xFF2B)
-    ("FULLWIDTH LATIN CAPITAL LETTER L" #xFF2C)
-    ("FULLWIDTH LATIN CAPITAL LETTER M" #xFF2D)
-    ("FULLWIDTH LATIN CAPITAL LETTER N" #xFF2E)
-    ("FULLWIDTH LATIN CAPITAL LETTER O" #xFF2F)
-    ("FULLWIDTH LATIN CAPITAL LETTER P" #xFF30)
-    ("FULLWIDTH LATIN CAPITAL LETTER Q" #xFF31)
-    ("FULLWIDTH LATIN CAPITAL LETTER R" #xFF32)
-    ("FULLWIDTH LATIN CAPITAL LETTER S" #xFF33)
-    ("FULLWIDTH LATIN CAPITAL LETTER T" #xFF34)
-    ("FULLWIDTH LATIN CAPITAL LETTER U" #xFF35)
-    ("FULLWIDTH LATIN CAPITAL LETTER V" #xFF36)
-    ("FULLWIDTH LATIN CAPITAL LETTER W" #xFF37)
-    ("FULLWIDTH LATIN CAPITAL LETTER X" #xFF38)
-    ("FULLWIDTH LATIN CAPITAL LETTER Y" #xFF39)
-    ("FULLWIDTH LATIN CAPITAL LETTER Z" #xFF3A)
-    ("FULLWIDTH LEFT SQUARE BRACKET" #xFF3B)
-    ("FULLWIDTH REVERSE SOLIDUS" #xFF3C)
-    ("FULLWIDTH RIGHT SQUARE BRACKET" #xFF3D)
-    ("FULLWIDTH CIRCUMFLEX ACCENT" #xFF3E)
-    ("FULLWIDTH LOW LINE" #xFF3F)
-    ("FULLWIDTH GRAVE ACCENT" #xFF40)
-    ("FULLWIDTH LATIN SMALL LETTER A" #xFF41)
-    ("FULLWIDTH LATIN SMALL LETTER B" #xFF42)
-    ("FULLWIDTH LATIN SMALL LETTER C" #xFF43)
-    ("FULLWIDTH LATIN SMALL LETTER D" #xFF44)
-    ("FULLWIDTH LATIN SMALL LETTER E" #xFF45)
-    ("FULLWIDTH LATIN SMALL LETTER F" #xFF46)
-    ("FULLWIDTH LATIN SMALL LETTER G" #xFF47)
-    ("FULLWIDTH LATIN SMALL LETTER H" #xFF48)
-    ("FULLWIDTH LATIN SMALL LETTER I" #xFF49)
-    ("FULLWIDTH LATIN SMALL LETTER J" #xFF4A)
-    ("FULLWIDTH LATIN SMALL LETTER K" #xFF4B)
-    ("FULLWIDTH LATIN SMALL LETTER L" #xFF4C)
-    ("FULLWIDTH LATIN SMALL LETTER M" #xFF4D)
-    ("FULLWIDTH LATIN SMALL LETTER N" #xFF4E)
-    ("FULLWIDTH LATIN SMALL LETTER O" #xFF4F)
-    ("FULLWIDTH LATIN SMALL LETTER P" #xFF50)
-    ("FULLWIDTH LATIN SMALL LETTER Q" #xFF51)
-    ("FULLWIDTH LATIN SMALL LETTER R" #xFF52)
-    ("FULLWIDTH LATIN SMALL LETTER S" #xFF53)
-    ("FULLWIDTH LATIN SMALL LETTER T" #xFF54)
-    ("FULLWIDTH LATIN SMALL LETTER U" #xFF55)
-    ("FULLWIDTH LATIN SMALL LETTER V" #xFF56)
-    ("FULLWIDTH LATIN SMALL LETTER W" #xFF57)
-    ("FULLWIDTH LATIN SMALL LETTER X" #xFF58)
-    ("FULLWIDTH LATIN SMALL LETTER Y" #xFF59)
-    ("FULLWIDTH LATIN SMALL LETTER Z" #xFF5A)
-    ("FULLWIDTH LEFT CURLY BRACKET" #xFF5B)
-    ("FULLWIDTH VERTICAL LINE" #xFF5C)
-    ("FULLWIDTH RIGHT CURLY BRACKET" #xFF5D)
-    ("FULLWIDTH TILDE" #xFF5E)
-    ("FULLWIDTH LEFT WHITE PARENTHESIS" #xFF5F)
-    ("FULLWIDTH RIGHT WHITE PARENTHESIS" #xFF60)
-    ("HALFWIDTH IDEOGRAPHIC FULL STOP" #xFF61)
-    ("HALFWIDTH LEFT CORNER BRACKET" #xFF62)
-    ("HALFWIDTH RIGHT CORNER BRACKET" #xFF63)
-    ("HALFWIDTH IDEOGRAPHIC COMMA" #xFF64)
-    ("HALFWIDTH KATAKANA MIDDLE DOT" #xFF65)
-    ("HALFWIDTH KATAKANA LETTER WO" #xFF66)
-    ("HALFWIDTH KATAKANA LETTER SMALL A" #xFF67)
-    ("HALFWIDTH KATAKANA LETTER SMALL I" #xFF68)
-    ("HALFWIDTH KATAKANA LETTER SMALL U" #xFF69)
-    ("HALFWIDTH KATAKANA LETTER SMALL E" #xFF6A)
-    ("HALFWIDTH KATAKANA LETTER SMALL O" #xFF6B)
-    ("HALFWIDTH KATAKANA LETTER SMALL YA" #xFF6C)
-    ("HALFWIDTH KATAKANA LETTER SMALL YU" #xFF6D)
-    ("HALFWIDTH KATAKANA LETTER SMALL YO" #xFF6E)
-    ("HALFWIDTH KATAKANA LETTER SMALL TU" #xFF6F)
-    ("HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK" #xFF70)
-    ("HALFWIDTH KATAKANA LETTER A" #xFF71)
-    ("HALFWIDTH KATAKANA LETTER I" #xFF72)
-    ("HALFWIDTH KATAKANA LETTER U" #xFF73)
-    ("HALFWIDTH KATAKANA LETTER E" #xFF74)
-    ("HALFWIDTH KATAKANA LETTER O" #xFF75)
-    ("HALFWIDTH KATAKANA LETTER KA" #xFF76)
-    ("HALFWIDTH KATAKANA LETTER KI" #xFF77)
-    ("HALFWIDTH KATAKANA LETTER KU" #xFF78)
-    ("HALFWIDTH KATAKANA LETTER KE" #xFF79)
-    ("HALFWIDTH KATAKANA LETTER KO" #xFF7A)
-    ("HALFWIDTH KATAKANA LETTER SA" #xFF7B)
-    ("HALFWIDTH KATAKANA LETTER SI" #xFF7C)
-    ("HALFWIDTH KATAKANA LETTER SU" #xFF7D)
-    ("HALFWIDTH KATAKANA LETTER SE" #xFF7E)
-    ("HALFWIDTH KATAKANA LETTER SO" #xFF7F)
-    ("HALFWIDTH KATAKANA LETTER TA" #xFF80)
-    ("HALFWIDTH KATAKANA LETTER TI" #xFF81)
-    ("HALFWIDTH KATAKANA LETTER TU" #xFF82)
-    ("HALFWIDTH KATAKANA LETTER TE" #xFF83)
-    ("HALFWIDTH KATAKANA LETTER TO" #xFF84)
-    ("HALFWIDTH KATAKANA LETTER NA" #xFF85)
-    ("HALFWIDTH KATAKANA LETTER NI" #xFF86)
-    ("HALFWIDTH KATAKANA LETTER NU" #xFF87)
-    ("HALFWIDTH KATAKANA LETTER NE" #xFF88)
-    ("HALFWIDTH KATAKANA LETTER NO" #xFF89)
-    ("HALFWIDTH KATAKANA LETTER HA" #xFF8A)
-    ("HALFWIDTH KATAKANA LETTER HI" #xFF8B)
-    ("HALFWIDTH KATAKANA LETTER HU" #xFF8C)
-    ("HALFWIDTH KATAKANA LETTER HE" #xFF8D)
-    ("HALFWIDTH KATAKANA LETTER HO" #xFF8E)
-    ("HALFWIDTH KATAKANA LETTER MA" #xFF8F)
-    ("HALFWIDTH KATAKANA LETTER MI" #xFF90)
-    ("HALFWIDTH KATAKANA LETTER MU" #xFF91)
-    ("HALFWIDTH KATAKANA LETTER ME" #xFF92)
-    ("HALFWIDTH KATAKANA LETTER MO" #xFF93)
-    ("HALFWIDTH KATAKANA LETTER YA" #xFF94)
-    ("HALFWIDTH KATAKANA LETTER YU" #xFF95)
-    ("HALFWIDTH KATAKANA LETTER YO" #xFF96)
-    ("HALFWIDTH KATAKANA LETTER RA" #xFF97)
-    ("HALFWIDTH KATAKANA LETTER RI" #xFF98)
-    ("HALFWIDTH KATAKANA LETTER RU" #xFF99)
-    ("HALFWIDTH KATAKANA LETTER RE" #xFF9A)
-    ("HALFWIDTH KATAKANA LETTER RO" #xFF9B)
-    ("HALFWIDTH KATAKANA LETTER WA" #xFF9C)
-    ("HALFWIDTH KATAKANA LETTER N" #xFF9D)
-    ("HALFWIDTH KATAKANA VOICED SOUND MARK" #xFF9E)
-    ("HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK" #xFF9F)
-    ("HALFWIDTH HANGUL FILLER" #xFFA0)
-    ("HALFWIDTH HANGUL LETTER KIYEOK" #xFFA1)
-    ("HALFWIDTH HANGUL LETTER SSANGKIYEOK" #xFFA2)
-    ("HALFWIDTH HANGUL LETTER KIYEOK-SIOS" #xFFA3)
-    ("HALFWIDTH HANGUL LETTER NIEUN" #xFFA4)
-    ("HALFWIDTH HANGUL LETTER NIEUN-CIEUC" #xFFA5)
-    ("HALFWIDTH HANGUL LETTER NIEUN-HIEUH" #xFFA6)
-    ("HALFWIDTH HANGUL LETTER TIKEUT" #xFFA7)
-    ("HALFWIDTH HANGUL LETTER SSANGTIKEUT" #xFFA8)
-    ("HALFWIDTH HANGUL LETTER RIEUL" #xFFA9)
-    ("HALFWIDTH HANGUL LETTER RIEUL-KIYEOK" #xFFAA)
-    ("HALFWIDTH HANGUL LETTER RIEUL-MIEUM" #xFFAB)
-    ("HALFWIDTH HANGUL LETTER RIEUL-PIEUP" #xFFAC)
-    ("HALFWIDTH HANGUL LETTER RIEUL-SIOS" #xFFAD)
-    ("HALFWIDTH HANGUL LETTER RIEUL-THIEUTH" #xFFAE)
-    ("HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH" #xFFAF)
-    ("HALFWIDTH HANGUL LETTER RIEUL-HIEUH" #xFFB0)
-    ("HALFWIDTH HANGUL LETTER MIEUM" #xFFB1)
-    ("HALFWIDTH HANGUL LETTER PIEUP" #xFFB2)
-    ("HALFWIDTH HANGUL LETTER SSANGPIEUP" #xFFB3)
-    ("HALFWIDTH HANGUL LETTER PIEUP-SIOS" #xFFB4)
-    ("HALFWIDTH HANGUL LETTER SIOS" #xFFB5)
-    ("HALFWIDTH HANGUL LETTER SSANGSIOS" #xFFB6)
-    ("HALFWIDTH HANGUL LETTER IEUNG" #xFFB7)
-    ("HALFWIDTH HANGUL LETTER CIEUC" #xFFB8)
-    ("HALFWIDTH HANGUL LETTER SSANGCIEUC" #xFFB9)
-    ("HALFWIDTH HANGUL LETTER CHIEUCH" #xFFBA)
-    ("HALFWIDTH HANGUL LETTER KHIEUKH" #xFFBB)
-    ("HALFWIDTH HANGUL LETTER THIEUTH" #xFFBC)
-    ("HALFWIDTH HANGUL LETTER PHIEUPH" #xFFBD)
-    ("HALFWIDTH HANGUL LETTER HIEUH" #xFFBE)
-    ("HALFWIDTH HANGUL LETTER A" #xFFC2)
-    ("HALFWIDTH HANGUL LETTER AE" #xFFC3)
-    ("HALFWIDTH HANGUL LETTER YA" #xFFC4)
-    ("HALFWIDTH HANGUL LETTER YAE" #xFFC5)
-    ("HALFWIDTH HANGUL LETTER EO" #xFFC6)
-    ("HALFWIDTH HANGUL LETTER E" #xFFC7)
-    ("HALFWIDTH HANGUL LETTER YEO" #xFFCA)
-    ("HALFWIDTH HANGUL LETTER YE" #xFFCB)
-    ("HALFWIDTH HANGUL LETTER O" #xFFCC)
-    ("HALFWIDTH HANGUL LETTER WA" #xFFCD)
-    ("HALFWIDTH HANGUL LETTER WAE" #xFFCE)
-    ("HALFWIDTH HANGUL LETTER OE" #xFFCF)
-    ("HALFWIDTH HANGUL LETTER YO" #xFFD2)
-    ("HALFWIDTH HANGUL LETTER U" #xFFD3)
-    ("HALFWIDTH HANGUL LETTER WEO" #xFFD4)
-    ("HALFWIDTH HANGUL LETTER WE" #xFFD5)
-    ("HALFWIDTH HANGUL LETTER WI" #xFFD6)
-    ("HALFWIDTH HANGUL LETTER YU" #xFFD7)
-    ("HALFWIDTH HANGUL LETTER EU" #xFFDA)
-    ("HALFWIDTH HANGUL LETTER YI" #xFFDB)
-    ("HALFWIDTH HANGUL LETTER I" #xFFDC)
-    ("FULLWIDTH CENT SIGN" #xFFE0)
-    ("FULLWIDTH POUND SIGN" #xFFE1)
-    ("FULLWIDTH NOT SIGN" #xFFE2)
-    ("FULLWIDTH MACRON" #xFFE3)
-    ("FULLWIDTH BROKEN BAR" #xFFE4)
-    ("FULLWIDTH YEN SIGN" #xFFE5)
-    ("FULLWIDTH WON SIGN" #xFFE6)
-    ("HALFWIDTH FORMS LIGHT VERTICAL" #xFFE8)
-    ("HALFWIDTH LEFTWARDS ARROW" #xFFE9)
-    ("HALFWIDTH UPWARDS ARROW" #xFFEA)
-    ("HALFWIDTH RIGHTWARDS ARROW" #xFFEB)
-    ("HALFWIDTH DOWNWARDS ARROW" #xFFEC)
-    ("HALFWIDTH BLACK SQUARE" #xFFED)
-    ("HALFWIDTH WHITE CIRCLE" #xFFEE)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FFF0-0FFFF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FFF0-0FFFF.el
deleted file mode 100644
index f381a28e05..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/0FFF0-0FFFF.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(nxml-define-char-name-set 'specials
-  '(("INTERLINEAR ANNOTATION ANCHOR" #xFFF9)
-    ("INTERLINEAR ANNOTATION SEPARATOR" #xFFFA)
-    ("INTERLINEAR ANNOTATION TERMINATOR" #xFFFB)
-    ("OBJECT REPLACEMENT CHARACTER" #xFFFC)
-    ("REPLACEMENT CHARACTER" #xFFFD)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10300-1032F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10300-1032F.el
deleted file mode 100644
index fbb5cb8f25..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10300-1032F.el
+++ /dev/null
@@ -1,37 +0,0 @@
-(nxml-define-char-name-set 'old-italic
-  '(("OLD ITALIC LETTER A" #x10300)
-    ("OLD ITALIC LETTER BE" #x10301)
-    ("OLD ITALIC LETTER KE" #x10302)
-    ("OLD ITALIC LETTER DE" #x10303)
-    ("OLD ITALIC LETTER E" #x10304)
-    ("OLD ITALIC LETTER VE" #x10305)
-    ("OLD ITALIC LETTER ZE" #x10306)
-    ("OLD ITALIC LETTER HE" #x10307)
-    ("OLD ITALIC LETTER THE" #x10308)
-    ("OLD ITALIC LETTER I" #x10309)
-    ("OLD ITALIC LETTER KA" #x1030A)
-    ("OLD ITALIC LETTER EL" #x1030B)
-    ("OLD ITALIC LETTER EM" #x1030C)
-    ("OLD ITALIC LETTER EN" #x1030D)
-    ("OLD ITALIC LETTER ESH" #x1030E)
-    ("OLD ITALIC LETTER O" #x1030F)
-    ("OLD ITALIC LETTER PE" #x10310)
-    ("OLD ITALIC LETTER SHE" #x10311)
-    ("OLD ITALIC LETTER KU" #x10312)
-    ("OLD ITALIC LETTER ER" #x10313)
-    ("OLD ITALIC LETTER ES" #x10314)
-    ("OLD ITALIC LETTER TE" #x10315)
-    ("OLD ITALIC LETTER U" #x10316)
-    ("OLD ITALIC LETTER EKS" #x10317)
-    ("OLD ITALIC LETTER PHE" #x10318)
-    ("OLD ITALIC LETTER KHE" #x10319)
-    ("OLD ITALIC LETTER EF" #x1031A)
-    ("OLD ITALIC LETTER ERS" #x1031B)
-    ("OLD ITALIC LETTER CHE" #x1031C)
-    ("OLD ITALIC LETTER II" #x1031D)
-    ("OLD ITALIC LETTER UU" #x1031E)
-    ("OLD ITALIC NUMERAL ONE" #x10320)
-    ("OLD ITALIC NUMERAL FIVE" #x10321)
-    ("OLD ITALIC NUMERAL TEN" #x10322)
-    ("OLD ITALIC NUMERAL FIFTY" #x10323)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10330-1034F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10330-1034F.el
deleted file mode 100644
index 38ba2988a4..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10330-1034F.el
+++ /dev/null
@@ -1,29 +0,0 @@
-(nxml-define-char-name-set 'gothic
-  '(("GOTHIC LETTER AHSA" #x10330)
-    ("GOTHIC LETTER BAIRKAN" #x10331)
-    ("GOTHIC LETTER GIBA" #x10332)
-    ("GOTHIC LETTER DAGS" #x10333)
-    ("GOTHIC LETTER AIHVUS" #x10334)
-    ("GOTHIC LETTER QAIRTHRA" #x10335)
-    ("GOTHIC LETTER IUJA" #x10336)
-    ("GOTHIC LETTER HAGL" #x10337)
-    ("GOTHIC LETTER THIUTH" #x10338)
-    ("GOTHIC LETTER EIS" #x10339)
-    ("GOTHIC LETTER KUSMA" #x1033A)
-    ("GOTHIC LETTER LAGUS" #x1033B)
-    ("GOTHIC LETTER MANNA" #x1033C)
-    ("GOTHIC LETTER NAUTHS" #x1033D)
-    ("GOTHIC LETTER JER" #x1033E)
-    ("GOTHIC LETTER URUS" #x1033F)
-    ("GOTHIC LETTER PAIRTHRA" #x10340)
-    ("GOTHIC LETTER NINETY" #x10341)
-    ("GOTHIC LETTER RAIDA" #x10342)
-    ("GOTHIC LETTER SAUIL" #x10343)
-    ("GOTHIC LETTER TEIWS" #x10344)
-    ("GOTHIC LETTER WINJA" #x10345)
-    ("GOTHIC LETTER FAIHU" #x10346)
-    ("GOTHIC LETTER IGGWS" #x10347)
-    ("GOTHIC LETTER HWAIR" #x10348)
-    ("GOTHIC LETTER OTHAL" #x10349)
-    ("GOTHIC LETTER NINE HUNDRED" #x1034A)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10400-1044F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10400-1044F.el
deleted file mode 100644
index 1637cf666b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/10400-1044F.el
+++ /dev/null
@@ -1,78 +0,0 @@
-(nxml-define-char-name-set 'deseret
-  '(("DESERET CAPITAL LETTER LONG I" #x10400)
-    ("DESERET CAPITAL LETTER LONG E" #x10401)
-    ("DESERET CAPITAL LETTER LONG A" #x10402)
-    ("DESERET CAPITAL LETTER LONG AH" #x10403)
-    ("DESERET CAPITAL LETTER LONG O" #x10404)
-    ("DESERET CAPITAL LETTER LONG OO" #x10405)
-    ("DESERET CAPITAL LETTER SHORT I" #x10406)
-    ("DESERET CAPITAL LETTER SHORT E" #x10407)
-    ("DESERET CAPITAL LETTER SHORT A" #x10408)
-    ("DESERET CAPITAL LETTER SHORT AH" #x10409)
-    ("DESERET CAPITAL LETTER SHORT O" #x1040A)
-    ("DESERET CAPITAL LETTER SHORT OO" #x1040B)
-    ("DESERET CAPITAL LETTER AY" #x1040C)
-    ("DESERET CAPITAL LETTER OW" #x1040D)
-    ("DESERET CAPITAL LETTER WU" #x1040E)
-    ("DESERET CAPITAL LETTER YEE" #x1040F)
-    ("DESERET CAPITAL LETTER H" #x10410)
-    ("DESERET CAPITAL LETTER PEE" #x10411)
-    ("DESERET CAPITAL LETTER BEE" #x10412)
-    ("DESERET CAPITAL LETTER TEE" #x10413)
-    ("DESERET CAPITAL LETTER DEE" #x10414)
-    ("DESERET CAPITAL LETTER CHEE" #x10415)
-    ("DESERET CAPITAL LETTER JEE" #x10416)
-    ("DESERET CAPITAL LETTER KAY" #x10417)
-    ("DESERET CAPITAL LETTER GAY" #x10418)
-    ("DESERET CAPITAL LETTER EF" #x10419)
-    ("DESERET CAPITAL LETTER VEE" #x1041A)
-    ("DESERET CAPITAL LETTER ETH" #x1041B)
-    ("DESERET CAPITAL LETTER THEE" #x1041C)
-    ("DESERET CAPITAL LETTER ES" #x1041D)
-    ("DESERET CAPITAL LETTER ZEE" #x1041E)
-    ("DESERET CAPITAL LETTER ESH" #x1041F)
-    ("DESERET CAPITAL LETTER ZHEE" #x10420)
-    ("DESERET CAPITAL LETTER ER" #x10421)
-    ("DESERET CAPITAL LETTER EL" #x10422)
-    ("DESERET CAPITAL LETTER EM" #x10423)
-    ("DESERET CAPITAL LETTER EN" #x10424)
-    ("DESERET CAPITAL LETTER ENG" #x10425)
-    ("DESERET SMALL LETTER LONG I" #x10428)
-    ("DESERET SMALL LETTER LONG E" #x10429)
-    ("DESERET SMALL LETTER LONG A" #x1042A)
-    ("DESERET SMALL LETTER LONG AH" #x1042B)
-    ("DESERET SMALL LETTER LONG O" #x1042C)
-    ("DESERET SMALL LETTER LONG OO" #x1042D)
-    ("DESERET SMALL LETTER SHORT I" #x1042E)
-    ("DESERET SMALL LETTER SHORT E" #x1042F)
-    ("DESERET SMALL LETTER SHORT A" #x10430)
-    ("DESERET SMALL LETTER SHORT AH" #x10431)
-    ("DESERET SMALL LETTER SHORT O" #x10432)
-    ("DESERET SMALL LETTER SHORT OO" #x10433)
-    ("DESERET SMALL LETTER AY" #x10434)
-    ("DESERET SMALL LETTER OW" #x10435)
-    ("DESERET SMALL LETTER WU" #x10436)
-    ("DESERET SMALL LETTER YEE" #x10437)
-    ("DESERET SMALL LETTER H" #x10438)
-    ("DESERET SMALL LETTER PEE" #x10439)
-    ("DESERET SMALL LETTER BEE" #x1043A)
-    ("DESERET SMALL LETTER TEE" #x1043B)
-    ("DESERET SMALL LETTER DEE" #x1043C)
-    ("DESERET SMALL LETTER CHEE" #x1043D)
-    ("DESERET SMALL LETTER JEE" #x1043E)
-    ("DESERET SMALL LETTER KAY" #x1043F)
-    ("DESERET SMALL LETTER GAY" #x10440)
-    ("DESERET SMALL LETTER EF" #x10441)
-    ("DESERET SMALL LETTER VEE" #x10442)
-    ("DESERET SMALL LETTER ETH" #x10443)
-    ("DESERET SMALL LETTER THEE" #x10444)
-    ("DESERET SMALL LETTER ES" #x10445)
-    ("DESERET SMALL LETTER ZEE" #x10446)
-    ("DESERET SMALL LETTER ESH" #x10447)
-    ("DESERET SMALL LETTER ZHEE" #x10448)
-    ("DESERET SMALL LETTER ER" #x10449)
-    ("DESERET SMALL LETTER EL" #x1044A)
-    ("DESERET SMALL LETTER EM" #x1044B)
-    ("DESERET SMALL LETTER EN" #x1044C)
-    ("DESERET SMALL LETTER ENG" #x1044D)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D000-1D0FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D000-1D0FF.el
deleted file mode 100644
index f1a6f36dff..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D000-1D0FF.el
+++ /dev/null
@@ -1,248 +0,0 @@
-(nxml-define-char-name-set 'byzantine-musical-symbols
-  '(("BYZANTINE MUSICAL SYMBOL PSILI" #x1D000)
-    ("BYZANTINE MUSICAL SYMBOL DASEIA" #x1D001)
-    ("BYZANTINE MUSICAL SYMBOL PERISPOMENI" #x1D002)
-    ("BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON" #x1D003)
-    ("BYZANTINE MUSICAL SYMBOL OXEIA DIPLI" #x1D004)
-    ("BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON" #x1D005)
-    ("BYZANTINE MUSICAL SYMBOL VAREIA DIPLI" #x1D006)
-    ("BYZANTINE MUSICAL SYMBOL KATHISTI" #x1D007)
-    ("BYZANTINE MUSICAL SYMBOL SYRMATIKI" #x1D008)
-    ("BYZANTINE MUSICAL SYMBOL PARAKLITIKI" #x1D009)
-    ("BYZANTINE MUSICAL SYMBOL YPOKRISIS" #x1D00A)
-    ("BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI" #x1D00B)
-    ("BYZANTINE MUSICAL SYMBOL KREMASTI" #x1D00C)
-    ("BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON" #x1D00D)
-    ("BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON" #x1D00E)
-    ("BYZANTINE MUSICAL SYMBOL TELEIA" #x1D00F)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMATA" #x1D010)
-    ("BYZANTINE MUSICAL SYMBOL APOSTROFOS" #x1D011)
-    ("BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI" #x1D012)
-    ("BYZANTINE MUSICAL SYMBOL SYNEVMA" #x1D013)
-    ("BYZANTINE MUSICAL SYMBOL THITA" #x1D014)
-    ("BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION" #x1D015)
-    ("BYZANTINE MUSICAL SYMBOL GORGON ARCHAION" #x1D016)
-    ("BYZANTINE MUSICAL SYMBOL PSILON" #x1D017)
-    ("BYZANTINE MUSICAL SYMBOL CHAMILON" #x1D018)
-    ("BYZANTINE MUSICAL SYMBOL VATHY" #x1D019)
-    ("BYZANTINE MUSICAL SYMBOL ISON ARCHAION" #x1D01A)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION" #x1D01B)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION" #x1D01C)
-    ("BYZANTINE MUSICAL SYMBOL SAXIMATA" #x1D01D)
-    ("BYZANTINE MUSICAL SYMBOL PARICHON" #x1D01E)
-    ("BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA" #x1D01F)
-    ("BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION" #x1D020)
-    ("BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION" #x1D021)
-    ("BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION" #x1D022)
-    ("BYZANTINE MUSICAL SYMBOL APOTHEMA" #x1D023)
-    ("BYZANTINE MUSICAL SYMBOL KLASMA" #x1D024)
-    ("BYZANTINE MUSICAL SYMBOL REVMA" #x1D025)
-    ("BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION" #x1D026)
-    ("BYZANTINE MUSICAL SYMBOL TINAGMA" #x1D027)
-    ("BYZANTINE MUSICAL SYMBOL ANATRICHISMA" #x1D028)
-    ("BYZANTINE MUSICAL SYMBOL SEISMA" #x1D029)
-    ("BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION" #x1D02A)
-    ("BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU" #x1D02B)
-    ("BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION" #x1D02C)
-    ("BYZANTINE MUSICAL SYMBOL THEMA" #x1D02D)
-    ("BYZANTINE MUSICAL SYMBOL LEMOI" #x1D02E)
-    ("BYZANTINE MUSICAL SYMBOL DYO" #x1D02F)
-    ("BYZANTINE MUSICAL SYMBOL TRIA" #x1D030)
-    ("BYZANTINE MUSICAL SYMBOL TESSERA" #x1D031)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMATA" #x1D032)
-    ("BYZANTINE MUSICAL SYMBOL APESO EXO NEO" #x1D033)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION" #x1D034)
-    ("BYZANTINE MUSICAL SYMBOL IMIFTHORA" #x1D035)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION" #x1D036)
-    ("BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON" #x1D037)
-    ("BYZANTINE MUSICAL SYMBOL PELASTON" #x1D038)
-    ("BYZANTINE MUSICAL SYMBOL PSIFISTON" #x1D039)
-    ("BYZANTINE MUSICAL SYMBOL KONTEVMA" #x1D03A)
-    ("BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION" #x1D03B)
-    ("BYZANTINE MUSICAL SYMBOL RAPISMA" #x1D03C)
-    ("BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION" #x1D03D)
-    ("BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION" #x1D03E)
-    ("BYZANTINE MUSICAL SYMBOL ICHADIN" #x1D03F)
-    ("BYZANTINE MUSICAL SYMBOL NANA" #x1D040)
-    ("BYZANTINE MUSICAL SYMBOL PETASMA" #x1D041)
-    ("BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO" #x1D042)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKON ALLO" #x1D043)
-    ("BYZANTINE MUSICAL SYMBOL STRAGGISMATA" #x1D044)
-    ("BYZANTINE MUSICAL SYMBOL GRONTHISMATA" #x1D045)
-    ("BYZANTINE MUSICAL SYMBOL ISON NEO" #x1D046)
-    ("BYZANTINE MUSICAL SYMBOL OLIGON NEO" #x1D047)
-    ("BYZANTINE MUSICAL SYMBOL OXEIA NEO" #x1D048)
-    ("BYZANTINE MUSICAL SYMBOL PETASTI" #x1D049)
-    ("BYZANTINE MUSICAL SYMBOL KOUFISMA" #x1D04A)
-    ("BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA" #x1D04B)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA" #x1D04C)
-    ("BYZANTINE MUSICAL SYMBOL PELASTON NEO" #x1D04D)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO" #x1D04E)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO" #x1D04F)
-    ("BYZANTINE MUSICAL SYMBOL YPSILI" #x1D050)
-    ("BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO" #x1D051)
-    ("BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO" #x1D052)
-    ("BYZANTINE MUSICAL SYMBOL YPORROI" #x1D053)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON" #x1D054)
-    ("BYZANTINE MUSICAL SYMBOL ELAFRON" #x1D055)
-    ("BYZANTINE MUSICAL SYMBOL CHAMILI" #x1D056)
-    ("BYZANTINE MUSICAL SYMBOL MIKRON ISON" #x1D057)
-    ("BYZANTINE MUSICAL SYMBOL VAREIA NEO" #x1D058)
-    ("BYZANTINE MUSICAL SYMBOL PIASMA NEO" #x1D059)
-    ("BYZANTINE MUSICAL SYMBOL PSIFISTON NEO" #x1D05A)
-    ("BYZANTINE MUSICAL SYMBOL OMALON" #x1D05B)
-    ("BYZANTINE MUSICAL SYMBOL ANTIKENOMA" #x1D05C)
-    ("BYZANTINE MUSICAL SYMBOL LYGISMA" #x1D05D)
-    ("BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO" #x1D05E)
-    ("BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO" #x1D05F)
-    ("BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA" #x1D060)
-    ("BYZANTINE MUSICAL SYMBOL KYLISMA" #x1D061)
-    ("BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA" #x1D062)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKON NEO" #x1D063)
-    ("BYZANTINE MUSICAL SYMBOL EKSTREPTON" #x1D064)
-    ("BYZANTINE MUSICAL SYMBOL SYNAGMA NEO" #x1D065)
-    ("BYZANTINE MUSICAL SYMBOL SYRMA" #x1D066)
-    ("BYZANTINE MUSICAL SYMBOL CHOREVMA NEO" #x1D067)
-    ("BYZANTINE MUSICAL SYMBOL EPEGERMA" #x1D068)
-    ("BYZANTINE MUSICAL SYMBOL SEISMA NEO" #x1D069)
-    ("BYZANTINE MUSICAL SYMBOL XIRON KLASMA" #x1D06A)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON" #x1D06B)
-    ("BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA" #x1D06C)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA" #x1D06D)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA" #x1D06E)
-    ("BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA" #x1D06F)
-    ("BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA" #x1D070)
-    ("BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA" #x1D071)
-    ("BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON" #x1D072)
-    ("BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON" #x1D073)
-    ("BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON" #x1D074)
-    ("BYZANTINE MUSICAL SYMBOL OYRANISMA NEO" #x1D075)
-    ("BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO" #x1D076)
-    ("BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO" #x1D077)
-    ("BYZANTINE MUSICAL SYMBOL THEMA APLOUN" #x1D078)
-    ("BYZANTINE MUSICAL SYMBOL THES KAI APOTHES" #x1D079)
-    ("BYZANTINE MUSICAL SYMBOL KATAVASMA" #x1D07A)
-    ("BYZANTINE MUSICAL SYMBOL ENDOFONON" #x1D07B)
-    ("BYZANTINE MUSICAL SYMBOL YFEN KATO" #x1D07C)
-    ("BYZANTINE MUSICAL SYMBOL YFEN ANO" #x1D07D)
-    ("BYZANTINE MUSICAL SYMBOL STAVROS" #x1D07E)
-    ("BYZANTINE MUSICAL SYMBOL KLASMA ANO" #x1D07F)
-    ("BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION" #x1D080)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION" #x1D081)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMA ALLO" #x1D082)
-    ("BYZANTINE MUSICAL SYMBOL KRATIMA NEO" #x1D083)
-    ("BYZANTINE MUSICAL SYMBOL APODERMA NEO" #x1D084)
-    ("BYZANTINE MUSICAL SYMBOL APLI" #x1D085)
-    ("BYZANTINE MUSICAL SYMBOL DIPLI" #x1D086)
-    ("BYZANTINE MUSICAL SYMBOL TRIPLI" #x1D087)
-    ("BYZANTINE MUSICAL SYMBOL TETRAPLI" #x1D088)
-    ("BYZANTINE MUSICAL SYMBOL KORONIS" #x1D089)
-    ("BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU" #x1D08A)
-    ("BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON" #x1D08B)
-    ("BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON" #x1D08C)
-    ("BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON" #x1D08D)
-    ("BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU" #x1D08E)
-    ("BYZANTINE MUSICAL SYMBOL GORGON NEO ANO" #x1D08F)
-    ("BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA" #x1D090)
-    ("BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA" #x1D091)
-    ("BYZANTINE MUSICAL SYMBOL DIGORGON" #x1D092)
-    ("BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO" #x1D093)
-    ("BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO" #x1D094)
-    ("BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA" #x1D095)
-    ("BYZANTINE MUSICAL SYMBOL TRIGORGON" #x1D096)
-    ("BYZANTINE MUSICAL SYMBOL ARGON" #x1D097)
-    ("BYZANTINE MUSICAL SYMBOL IMIDIARGON" #x1D098)
-    ("BYZANTINE MUSICAL SYMBOL DIARGON" #x1D099)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI" #x1D09A)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI" #x1D09B)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI ARGI" #x1D09C)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI METRIA" #x1D09D)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI MESI" #x1D09E)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI GORGI" #x1D09F)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI" #x1D0A0)
-    ("BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI" #x1D0A1)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS" #x1D0A2)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS" #x1D0A3)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS" #x1D0A4)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS" #x1D0A5)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS" #x1D0A6)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS" #x1D0A7)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS" #x1D0A8)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS" #x1D0A9)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS" #x1D0AA)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS" #x1D0AB)
-    ("BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS" #x1D0AC)
-    ("BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS" #x1D0AD)
-    ("BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS" #x1D0AE)
-    ("BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS" #x1D0AF)
-    ("BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS" #x1D0B0)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS" #x1D0B1)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS" #x1D0B2)
-    ("BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS" #x1D0B3)
-    ("BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN" #x1D0B4)
-    ("BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN" #x1D0B5)
-    ("BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU" #x1D0B6)
-    ("BYZANTINE MUSICAL SYMBOL IMIFONON" #x1D0B7)
-    ("BYZANTINE MUSICAL SYMBOL IMIFTHORON" #x1D0B8)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU" #x1D0B9)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA" #x1D0BA)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA" #x1D0BB)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS" #x1D0BC)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI" #x1D0BD)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI" #x1D0BE)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE" #x1D0BF)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO" #x1D0C0)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO" #x1D0C1)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO" #x1D0C2)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS" #x1D0C3)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS" #x1D0C4)
-    ("BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS" #x1D0C5)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI" #x1D0C6)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA NENANO" #x1D0C7)
-    ("BYZANTINE MUSICAL SYMBOL CHROA ZYGOS" #x1D0C8)
-    ("BYZANTINE MUSICAL SYMBOL CHROA KLITON" #x1D0C9)
-    ("BYZANTINE MUSICAL SYMBOL CHROA SPATHI" #x1D0CA)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION" #x1D0CB)
-    ("BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA" #x1D0CC)
-    ("BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION" #x1D0CD)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION" #x1D0CE)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION" #x1D0CF)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA" #x1D0D0)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA" #x1D0D1)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA" #x1D0D2)
-    ("BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA" #x1D0D3)
-    ("BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA" #x1D0D4)
-    ("BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA" #x1D0D5)
-    ("BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA" #x1D0D6)
-    ("BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA" #x1D0D7)
-    ("BYZANTINE MUSICAL SYMBOL GENIKI DIESIS" #x1D0D8)
-    ("BYZANTINE MUSICAL SYMBOL GENIKI YFESIS" #x1D0D9)
-    ("BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI" #x1D0DA)
-    ("BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI" #x1D0DB)
-    ("BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI" #x1D0DC)
-    ("BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS" #x1D0DD)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS" #x1D0DE)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU" #x1D0DF)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU" #x1D0E0)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU" #x1D0E1)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS" #x1D0E2)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU" #x1D0E3)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU" #x1D0E4)
-    ("BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU" #x1D0E5)
-    ("BYZANTINE MUSICAL SYMBOL DIGRAMMA GG" #x1D0E6)
-    ("BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU" #x1D0E7)
-    ("BYZANTINE MUSICAL SYMBOL STIGMA" #x1D0E8)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO PA" #x1D0E9)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO VOU" #x1D0EA)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO GA" #x1D0EB)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO DI" #x1D0EC)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO KE" #x1D0ED)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO ZO" #x1D0EE)
-    ("BYZANTINE MUSICAL SYMBOL ARKTIKO NI" #x1D0EF)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO" #x1D0F0)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO" #x1D0F1)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO" #x1D0F2)
-    ("BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO" #x1D0F3)
-    ("BYZANTINE MUSICAL SYMBOL KLASMA KATO" #x1D0F4)
-    ("BYZANTINE MUSICAL SYMBOL GORGON NEO KATO" #x1D0F5)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D100-1D1FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D100-1D1FF.el
deleted file mode 100644
index 29803dd0a7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D100-1D1FF.el
+++ /dev/null
@@ -1,221 +0,0 @@
-(nxml-define-char-name-set 'musical-symbols
-  '(("MUSICAL SYMBOL SINGLE BARLINE" #x1D100)
-    ("MUSICAL SYMBOL DOUBLE BARLINE" #x1D101)
-    ("MUSICAL SYMBOL FINAL BARLINE" #x1D102)
-    ("MUSICAL SYMBOL REVERSE FINAL BARLINE" #x1D103)
-    ("MUSICAL SYMBOL DASHED BARLINE" #x1D104)
-    ("MUSICAL SYMBOL SHORT BARLINE" #x1D105)
-    ("MUSICAL SYMBOL LEFT REPEAT SIGN" #x1D106)
-    ("MUSICAL SYMBOL RIGHT REPEAT SIGN" #x1D107)
-    ("MUSICAL SYMBOL REPEAT DOTS" #x1D108)
-    ("MUSICAL SYMBOL DAL SEGNO" #x1D109)
-    ("MUSICAL SYMBOL DA CAPO" #x1D10A)
-    ("MUSICAL SYMBOL SEGNO" #x1D10B)
-    ("MUSICAL SYMBOL CODA" #x1D10C)
-    ("MUSICAL SYMBOL REPEATED FIGURE-1" #x1D10D)
-    ("MUSICAL SYMBOL REPEATED FIGURE-2" #x1D10E)
-    ("MUSICAL SYMBOL REPEATED FIGURE-3" #x1D10F)
-    ("MUSICAL SYMBOL FERMATA" #x1D110)
-    ("MUSICAL SYMBOL FERMATA BELOW" #x1D111)
-    ("MUSICAL SYMBOL BREATH MARK" #x1D112)
-    ("MUSICAL SYMBOL CAESURA" #x1D113)
-    ("MUSICAL SYMBOL BRACE" #x1D114)
-    ("MUSICAL SYMBOL BRACKET" #x1D115)
-    ("MUSICAL SYMBOL ONE-LINE STAFF" #x1D116)
-    ("MUSICAL SYMBOL TWO-LINE STAFF" #x1D117)
-    ("MUSICAL SYMBOL THREE-LINE STAFF" #x1D118)
-    ("MUSICAL SYMBOL FOUR-LINE STAFF" #x1D119)
-    ("MUSICAL SYMBOL FIVE-LINE STAFF" #x1D11A)
-    ("MUSICAL SYMBOL SIX-LINE STAFF" #x1D11B)
-    ("MUSICAL SYMBOL SIX-STRING FRETBOARD" #x1D11C)
-    ("MUSICAL SYMBOL FOUR-STRING FRETBOARD" #x1D11D)
-    ("MUSICAL SYMBOL G CLEF" #x1D11E)
-    ("MUSICAL SYMBOL G CLEF OTTAVA ALTA" #x1D11F)
-    ("MUSICAL SYMBOL G CLEF OTTAVA BASSA" #x1D120)
-    ("MUSICAL SYMBOL C CLEF" #x1D121)
-    ("MUSICAL SYMBOL F CLEF" #x1D122)
-    ("MUSICAL SYMBOL F CLEF OTTAVA ALTA" #x1D123)
-    ("MUSICAL SYMBOL F CLEF OTTAVA BASSA" #x1D124)
-    ("MUSICAL SYMBOL DRUM CLEF-1" #x1D125)
-    ("MUSICAL SYMBOL DRUM CLEF-2" #x1D126)
-    ("MUSICAL SYMBOL DOUBLE SHARP" #x1D12A)
-    ("MUSICAL SYMBOL DOUBLE FLAT" #x1D12B)
-    ("MUSICAL SYMBOL FLAT UP" #x1D12C)
-    ("MUSICAL SYMBOL FLAT DOWN" #x1D12D)
-    ("MUSICAL SYMBOL NATURAL UP" #x1D12E)
-    ("MUSICAL SYMBOL NATURAL DOWN" #x1D12F)
-    ("MUSICAL SYMBOL SHARP UP" #x1D130)
-    ("MUSICAL SYMBOL SHARP DOWN" #x1D131)
-    ("MUSICAL SYMBOL QUARTER TONE SHARP" #x1D132)
-    ("MUSICAL SYMBOL QUARTER TONE FLAT" #x1D133)
-    ("MUSICAL SYMBOL COMMON TIME" #x1D134)
-    ("MUSICAL SYMBOL CUT TIME" #x1D135)
-    ("MUSICAL SYMBOL OTTAVA ALTA" #x1D136)
-    ("MUSICAL SYMBOL OTTAVA BASSA" #x1D137)
-    ("MUSICAL SYMBOL QUINDICESIMA ALTA" #x1D138)
-    ("MUSICAL SYMBOL QUINDICESIMA BASSA" #x1D139)
-    ("MUSICAL SYMBOL MULTI REST" #x1D13A)
-    ("MUSICAL SYMBOL WHOLE REST" #x1D13B)
-    ("MUSICAL SYMBOL HALF REST" #x1D13C)
-    ("MUSICAL SYMBOL QUARTER REST" #x1D13D)
-    ("MUSICAL SYMBOL EIGHTH REST" #x1D13E)
-    ("MUSICAL SYMBOL SIXTEENTH REST" #x1D13F)
-    ("MUSICAL SYMBOL THIRTY-SECOND REST" #x1D140)
-    ("MUSICAL SYMBOL SIXTY-FOURTH REST" #x1D141)
-    ("MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST" #x1D142)
-    ("MUSICAL SYMBOL X NOTEHEAD" #x1D143)
-    ("MUSICAL SYMBOL PLUS NOTEHEAD" #x1D144)
-    ("MUSICAL SYMBOL CIRCLE X NOTEHEAD" #x1D145)
-    ("MUSICAL SYMBOL SQUARE NOTEHEAD WHITE" #x1D146)
-    ("MUSICAL SYMBOL SQUARE NOTEHEAD BLACK" #x1D147)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE" #x1D148)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK" #x1D149)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE" #x1D14A)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK" #x1D14B)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE" #x1D14C)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK" #x1D14D)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE" #x1D14E)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK" #x1D14F)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE" #x1D150)
-    ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK" #x1D151)
-    ("MUSICAL SYMBOL MOON NOTEHEAD WHITE" #x1D152)
-    ("MUSICAL SYMBOL MOON NOTEHEAD BLACK" #x1D153)
-    ("MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE" #x1D154)
-    ("MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK" #x1D155)
-    ("MUSICAL SYMBOL PARENTHESIS NOTEHEAD" #x1D156)
-    ("MUSICAL SYMBOL VOID NOTEHEAD" #x1D157)
-    ("MUSICAL SYMBOL NOTEHEAD BLACK" #x1D158)
-    ("MUSICAL SYMBOL NULL NOTEHEAD" #x1D159)
-    ("MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE" #x1D15A)
-    ("MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK" #x1D15B)
-    ("MUSICAL SYMBOL BREVE" #x1D15C)
-    ("MUSICAL SYMBOL WHOLE NOTE" #x1D15D)
-    ("MUSICAL SYMBOL HALF NOTE" #x1D15E)
-    ("MUSICAL SYMBOL QUARTER NOTE" #x1D15F)
-    ("MUSICAL SYMBOL EIGHTH NOTE" #x1D160)
-    ("MUSICAL SYMBOL SIXTEENTH NOTE" #x1D161)
-    ("MUSICAL SYMBOL THIRTY-SECOND NOTE" #x1D162)
-    ("MUSICAL SYMBOL SIXTY-FOURTH NOTE" #x1D163)
-    ("MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE" #x1D164)
-    ("MUSICAL SYMBOL COMBINING STEM" #x1D165)
-    ("MUSICAL SYMBOL COMBINING SPRECHGESANG STEM" #x1D166)
-    ("MUSICAL SYMBOL COMBINING TREMOLO-1" #x1D167)
-    ("MUSICAL SYMBOL COMBINING TREMOLO-2" #x1D168)
-    ("MUSICAL SYMBOL COMBINING TREMOLO-3" #x1D169)
-    ("MUSICAL SYMBOL FINGERED TREMOLO-1" #x1D16A)
-    ("MUSICAL SYMBOL FINGERED TREMOLO-2" #x1D16B)
-    ("MUSICAL SYMBOL FINGERED TREMOLO-3" #x1D16C)
-    ("MUSICAL SYMBOL COMBINING AUGMENTATION DOT" #x1D16D)
-    ("MUSICAL SYMBOL COMBINING FLAG-1" #x1D16E)
-    ("MUSICAL SYMBOL COMBINING FLAG-2" #x1D16F)
-    ("MUSICAL SYMBOL COMBINING FLAG-3" #x1D170)
-    ("MUSICAL SYMBOL COMBINING FLAG-4" #x1D171)
-    ("MUSICAL SYMBOL COMBINING FLAG-5" #x1D172)
-    ("MUSICAL SYMBOL BEGIN BEAM" #x1D173)
-    ("MUSICAL SYMBOL END BEAM" #x1D174)
-    ("MUSICAL SYMBOL BEGIN TIE" #x1D175)
-    ("MUSICAL SYMBOL END TIE" #x1D176)
-    ("MUSICAL SYMBOL BEGIN SLUR" #x1D177)
-    ("MUSICAL SYMBOL END SLUR" #x1D178)
-    ("MUSICAL SYMBOL BEGIN PHRASE" #x1D179)
-    ("MUSICAL SYMBOL END PHRASE" #x1D17A)
-    ("MUSICAL SYMBOL COMBINING ACCENT" #x1D17B)
-    ("MUSICAL SYMBOL COMBINING STACCATO" #x1D17C)
-    ("MUSICAL SYMBOL COMBINING TENUTO" #x1D17D)
-    ("MUSICAL SYMBOL COMBINING STACCATISSIMO" #x1D17E)
-    ("MUSICAL SYMBOL COMBINING MARCATO" #x1D17F)
-    ("MUSICAL SYMBOL COMBINING MARCATO-STACCATO" #x1D180)
-    ("MUSICAL SYMBOL COMBINING ACCENT-STACCATO" #x1D181)
-    ("MUSICAL SYMBOL COMBINING LOURE" #x1D182)
-    ("MUSICAL SYMBOL ARPEGGIATO UP" #x1D183)
-    ("MUSICAL SYMBOL ARPEGGIATO DOWN" #x1D184)
-    ("MUSICAL SYMBOL COMBINING DOIT" #x1D185)
-    ("MUSICAL SYMBOL COMBINING RIP" #x1D186)
-    ("MUSICAL SYMBOL COMBINING FLIP" #x1D187)
-    ("MUSICAL SYMBOL COMBINING SMEAR" #x1D188)
-    ("MUSICAL SYMBOL COMBINING BEND" #x1D189)
-    ("MUSICAL SYMBOL COMBINING DOUBLE TONGUE" #x1D18A)
-    ("MUSICAL SYMBOL COMBINING TRIPLE TONGUE" #x1D18B)
-    ("MUSICAL SYMBOL RINFORZANDO" #x1D18C)
-    ("MUSICAL SYMBOL SUBITO" #x1D18D)
-    ("MUSICAL SYMBOL Z" #x1D18E)
-    ("MUSICAL SYMBOL PIANO" #x1D18F)
-    ("MUSICAL SYMBOL MEZZO" #x1D190)
-    ("MUSICAL SYMBOL FORTE" #x1D191)
-    ("MUSICAL SYMBOL CRESCENDO" #x1D192)
-    ("MUSICAL SYMBOL DECRESCENDO" #x1D193)
-    ("MUSICAL SYMBOL GRACE NOTE SLASH" #x1D194)
-    ("MUSICAL SYMBOL GRACE NOTE NO SLASH" #x1D195)
-    ("MUSICAL SYMBOL TR" #x1D196)
-    ("MUSICAL SYMBOL TURN" #x1D197)
-    ("MUSICAL SYMBOL INVERTED TURN" #x1D198)
-    ("MUSICAL SYMBOL TURN SLASH" #x1D199)
-    ("MUSICAL SYMBOL TURN UP" #x1D19A)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-1" #x1D19B)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-2" #x1D19C)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-3" #x1D19D)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-4" #x1D19E)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-5" #x1D19F)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-6" #x1D1A0)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-7" #x1D1A1)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-8" #x1D1A2)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-9" #x1D1A3)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-10" #x1D1A4)
-    ("MUSICAL SYMBOL ORNAMENT STROKE-11" #x1D1A5)
-    ("MUSICAL SYMBOL HAUPTSTIMME" #x1D1A6)
-    ("MUSICAL SYMBOL NEBENSTIMME" #x1D1A7)
-    ("MUSICAL SYMBOL END OF STIMME" #x1D1A8)
-    ("MUSICAL SYMBOL DEGREE SLASH" #x1D1A9)
-    ("MUSICAL SYMBOL COMBINING DOWN BOW" #x1D1AA)
-    ("MUSICAL SYMBOL COMBINING UP BOW" #x1D1AB)
-    ("MUSICAL SYMBOL COMBINING HARMONIC" #x1D1AC)
-    ("MUSICAL SYMBOL COMBINING SNAP PIZZICATO" #x1D1AD)
-    ("MUSICAL SYMBOL PEDAL MARK" #x1D1AE)
-    ("MUSICAL SYMBOL PEDAL UP MARK" #x1D1AF)
-    ("MUSICAL SYMBOL HALF PEDAL MARK" #x1D1B0)
-    ("MUSICAL SYMBOL GLISSANDO UP" #x1D1B1)
-    ("MUSICAL SYMBOL GLISSANDO DOWN" #x1D1B2)
-    ("MUSICAL SYMBOL WITH FINGERNAILS" #x1D1B3)
-    ("MUSICAL SYMBOL DAMP" #x1D1B4)
-    ("MUSICAL SYMBOL DAMP ALL" #x1D1B5)
-    ("MUSICAL SYMBOL MAXIMA" #x1D1B6)
-    ("MUSICAL SYMBOL LONGA" #x1D1B7)
-    ("MUSICAL SYMBOL BREVIS" #x1D1B8)
-    ("MUSICAL SYMBOL SEMIBREVIS WHITE" #x1D1B9)
-    ("MUSICAL SYMBOL SEMIBREVIS BLACK" #x1D1BA)
-    ("MUSICAL SYMBOL MINIMA" #x1D1BB)
-    ("MUSICAL SYMBOL MINIMA BLACK" #x1D1BC)
-    ("MUSICAL SYMBOL SEMIMINIMA WHITE" #x1D1BD)
-    ("MUSICAL SYMBOL SEMIMINIMA BLACK" #x1D1BE)
-    ("MUSICAL SYMBOL FUSA WHITE" #x1D1BF)
-    ("MUSICAL SYMBOL FUSA BLACK" #x1D1C0)
-    ("MUSICAL SYMBOL LONGA PERFECTA REST" #x1D1C1)
-    ("MUSICAL SYMBOL LONGA IMPERFECTA REST" #x1D1C2)
-    ("MUSICAL SYMBOL BREVIS REST" #x1D1C3)
-    ("MUSICAL SYMBOL SEMIBREVIS REST" #x1D1C4)
-    ("MUSICAL SYMBOL MINIMA REST" #x1D1C5)
-    ("MUSICAL SYMBOL SEMIMINIMA REST" #x1D1C6)
-    ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA" #x1D1C7)
-    ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA" #x1D1C8)
-    ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1" #x1D1C9)
-    ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA" #x1D1CA)
-    ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA" #x1D1CB)
-    ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1" #x1D1CC)
-    ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2" #x1D1CD)
-    ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3" #x1D1CE)
-    ("MUSICAL SYMBOL CROIX" #x1D1CF)
-    ("MUSICAL SYMBOL GREGORIAN C CLEF" #x1D1D0)
-    ("MUSICAL SYMBOL GREGORIAN F CLEF" #x1D1D1)
-    ("MUSICAL SYMBOL SQUARE B" #x1D1D2)
-    ("MUSICAL SYMBOL VIRGA" #x1D1D3)
-    ("MUSICAL SYMBOL PODATUS" #x1D1D4)
-    ("MUSICAL SYMBOL CLIVIS" #x1D1D5)
-    ("MUSICAL SYMBOL SCANDICUS" #x1D1D6)
-    ("MUSICAL SYMBOL CLIMACUS" #x1D1D7)
-    ("MUSICAL SYMBOL TORCULUS" #x1D1D8)
-    ("MUSICAL SYMBOL PORRECTUS" #x1D1D9)
-    ("MUSICAL SYMBOL PORRECTUS FLEXUS" #x1D1DA)
-    ("MUSICAL SYMBOL SCANDICUS FLEXUS" #x1D1DB)
-    ("MUSICAL SYMBOL TORCULUS RESUPINUS" #x1D1DC)
-    ("MUSICAL SYMBOL PES SUBPUNCTIS" #x1D1DD)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D400-1D7FF.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D400-1D7FF.el
deleted file mode 100644
index 98e8c2382c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/1D400-1D7FF.el
+++ /dev/null
@@ -1,993 +0,0 @@
-(nxml-define-char-name-set 'mathematical-alphanumeric-symbols
-  '(("MATHEMATICAL BOLD CAPITAL A" #x1D400)
-    ("MATHEMATICAL BOLD CAPITAL B" #x1D401)
-    ("MATHEMATICAL BOLD CAPITAL C" #x1D402)
-    ("MATHEMATICAL BOLD CAPITAL D" #x1D403)
-    ("MATHEMATICAL BOLD CAPITAL E" #x1D404)
-    ("MATHEMATICAL BOLD CAPITAL F" #x1D405)
-    ("MATHEMATICAL BOLD CAPITAL G" #x1D406)
-    ("MATHEMATICAL BOLD CAPITAL H" #x1D407)
-    ("MATHEMATICAL BOLD CAPITAL I" #x1D408)
-    ("MATHEMATICAL BOLD CAPITAL J" #x1D409)
-    ("MATHEMATICAL BOLD CAPITAL K" #x1D40A)
-    ("MATHEMATICAL BOLD CAPITAL L" #x1D40B)
-    ("MATHEMATICAL BOLD CAPITAL M" #x1D40C)
-    ("MATHEMATICAL BOLD CAPITAL N" #x1D40D)
-    ("MATHEMATICAL BOLD CAPITAL O" #x1D40E)
-    ("MATHEMATICAL BOLD CAPITAL P" #x1D40F)
-    ("MATHEMATICAL BOLD CAPITAL Q" #x1D410)
-    ("MATHEMATICAL BOLD CAPITAL R" #x1D411)
-    ("MATHEMATICAL BOLD CAPITAL S" #x1D412)
-    ("MATHEMATICAL BOLD CAPITAL T" #x1D413)
-    ("MATHEMATICAL BOLD CAPITAL U" #x1D414)
-    ("MATHEMATICAL BOLD CAPITAL V" #x1D415)
-    ("MATHEMATICAL BOLD CAPITAL W" #x1D416)
-    ("MATHEMATICAL BOLD CAPITAL X" #x1D417)
-    ("MATHEMATICAL BOLD CAPITAL Y" #x1D418)
-    ("MATHEMATICAL BOLD CAPITAL Z" #x1D419)
-    ("MATHEMATICAL BOLD SMALL A" #x1D41A)
-    ("MATHEMATICAL BOLD SMALL B" #x1D41B)
-    ("MATHEMATICAL BOLD SMALL C" #x1D41C)
-    ("MATHEMATICAL BOLD SMALL D" #x1D41D)
-    ("MATHEMATICAL BOLD SMALL E" #x1D41E)
-    ("MATHEMATICAL BOLD SMALL F" #x1D41F)
-    ("MATHEMATICAL BOLD SMALL G" #x1D420)
-    ("MATHEMATICAL BOLD SMALL H" #x1D421)
-    ("MATHEMATICAL BOLD SMALL I" #x1D422)
-    ("MATHEMATICAL BOLD SMALL J" #x1D423)
-    ("MATHEMATICAL BOLD SMALL K" #x1D424)
-    ("MATHEMATICAL BOLD SMALL L" #x1D425)
-    ("MATHEMATICAL BOLD SMALL M" #x1D426)
-    ("MATHEMATICAL BOLD SMALL N" #x1D427)
-    ("MATHEMATICAL BOLD SMALL O" #x1D428)
-    ("MATHEMATICAL BOLD SMALL P" #x1D429)
-    ("MATHEMATICAL BOLD SMALL Q" #x1D42A)
-    ("MATHEMATICAL BOLD SMALL R" #x1D42B)
-    ("MATHEMATICAL BOLD SMALL S" #x1D42C)
-    ("MATHEMATICAL BOLD SMALL T" #x1D42D)
-    ("MATHEMATICAL BOLD SMALL U" #x1D42E)
-    ("MATHEMATICAL BOLD SMALL V" #x1D42F)
-    ("MATHEMATICAL BOLD SMALL W" #x1D430)
-    ("MATHEMATICAL BOLD SMALL X" #x1D431)
-    ("MATHEMATICAL BOLD SMALL Y" #x1D432)
-    ("MATHEMATICAL BOLD SMALL Z" #x1D433)
-    ("MATHEMATICAL ITALIC CAPITAL A" #x1D434)
-    ("MATHEMATICAL ITALIC CAPITAL B" #x1D435)
-    ("MATHEMATICAL ITALIC CAPITAL C" #x1D436)
-    ("MATHEMATICAL ITALIC CAPITAL D" #x1D437)
-    ("MATHEMATICAL ITALIC CAPITAL E" #x1D438)
-    ("MATHEMATICAL ITALIC CAPITAL F" #x1D439)
-    ("MATHEMATICAL ITALIC CAPITAL G" #x1D43A)
-    ("MATHEMATICAL ITALIC CAPITAL H" #x1D43B)
-    ("MATHEMATICAL ITALIC CAPITAL I" #x1D43C)
-    ("MATHEMATICAL ITALIC CAPITAL J" #x1D43D)
-    ("MATHEMATICAL ITALIC CAPITAL K" #x1D43E)
-    ("MATHEMATICAL ITALIC CAPITAL L" #x1D43F)
-    ("MATHEMATICAL ITALIC CAPITAL M" #x1D440)
-    ("MATHEMATICAL ITALIC CAPITAL N" #x1D441)
-    ("MATHEMATICAL ITALIC CAPITAL O" #x1D442)
-    ("MATHEMATICAL ITALIC CAPITAL P" #x1D443)
-    ("MATHEMATICAL ITALIC CAPITAL Q" #x1D444)
-    ("MATHEMATICAL ITALIC CAPITAL R" #x1D445)
-    ("MATHEMATICAL ITALIC CAPITAL S" #x1D446)
-    ("MATHEMATICAL ITALIC CAPITAL T" #x1D447)
-    ("MATHEMATICAL ITALIC CAPITAL U" #x1D448)
-    ("MATHEMATICAL ITALIC CAPITAL V" #x1D449)
-    ("MATHEMATICAL ITALIC CAPITAL W" #x1D44A)
-    ("MATHEMATICAL ITALIC CAPITAL X" #x1D44B)
-    ("MATHEMATICAL ITALIC CAPITAL Y" #x1D44C)
-    ("MATHEMATICAL ITALIC CAPITAL Z" #x1D44D)
-    ("MATHEMATICAL ITALIC SMALL A" #x1D44E)
-    ("MATHEMATICAL ITALIC SMALL B" #x1D44F)
-    ("MATHEMATICAL ITALIC SMALL C" #x1D450)
-    ("MATHEMATICAL ITALIC SMALL D" #x1D451)
-    ("MATHEMATICAL ITALIC SMALL E" #x1D452)
-    ("MATHEMATICAL ITALIC SMALL F" #x1D453)
-    ("MATHEMATICAL ITALIC SMALL G" #x1D454)
-    ("MATHEMATICAL ITALIC SMALL I" #x1D456)
-    ("MATHEMATICAL ITALIC SMALL J" #x1D457)
-    ("MATHEMATICAL ITALIC SMALL K" #x1D458)
-    ("MATHEMATICAL ITALIC SMALL L" #x1D459)
-    ("MATHEMATICAL ITALIC SMALL M" #x1D45A)
-    ("MATHEMATICAL ITALIC SMALL N" #x1D45B)
-    ("MATHEMATICAL ITALIC SMALL O" #x1D45C)
-    ("MATHEMATICAL ITALIC SMALL P" #x1D45D)
-    ("MATHEMATICAL ITALIC SMALL Q" #x1D45E)
-    ("MATHEMATICAL ITALIC SMALL R" #x1D45F)
-    ("MATHEMATICAL ITALIC SMALL S" #x1D460)
-    ("MATHEMATICAL ITALIC SMALL T" #x1D461)
-    ("MATHEMATICAL ITALIC SMALL U" #x1D462)
-    ("MATHEMATICAL ITALIC SMALL V" #x1D463)
-    ("MATHEMATICAL ITALIC SMALL W" #x1D464)
-    ("MATHEMATICAL ITALIC SMALL X" #x1D465)
-    ("MATHEMATICAL ITALIC SMALL Y" #x1D466)
-    ("MATHEMATICAL ITALIC SMALL Z" #x1D467)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL A" #x1D468)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL B" #x1D469)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL C" #x1D46A)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL D" #x1D46B)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL E" #x1D46C)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL F" #x1D46D)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL G" #x1D46E)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL H" #x1D46F)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL I" #x1D470)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL J" #x1D471)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL K" #x1D472)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL L" #x1D473)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL M" #x1D474)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL N" #x1D475)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL O" #x1D476)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL P" #x1D477)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL Q" #x1D478)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL R" #x1D479)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL S" #x1D47A)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL T" #x1D47B)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL U" #x1D47C)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL V" #x1D47D)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL W" #x1D47E)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL X" #x1D47F)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL Y" #x1D480)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL Z" #x1D481)
-    ("MATHEMATICAL BOLD ITALIC SMALL A" #x1D482)
-    ("MATHEMATICAL BOLD ITALIC SMALL B" #x1D483)
-    ("MATHEMATICAL BOLD ITALIC SMALL C" #x1D484)
-    ("MATHEMATICAL BOLD ITALIC SMALL D" #x1D485)
-    ("MATHEMATICAL BOLD ITALIC SMALL E" #x1D486)
-    ("MATHEMATICAL BOLD ITALIC SMALL F" #x1D487)
-    ("MATHEMATICAL BOLD ITALIC SMALL G" #x1D488)
-    ("MATHEMATICAL BOLD ITALIC SMALL H" #x1D489)
-    ("MATHEMATICAL BOLD ITALIC SMALL I" #x1D48A)
-    ("MATHEMATICAL BOLD ITALIC SMALL J" #x1D48B)
-    ("MATHEMATICAL BOLD ITALIC SMALL K" #x1D48C)
-    ("MATHEMATICAL BOLD ITALIC SMALL L" #x1D48D)
-    ("MATHEMATICAL BOLD ITALIC SMALL M" #x1D48E)
-    ("MATHEMATICAL BOLD ITALIC SMALL N" #x1D48F)
-    ("MATHEMATICAL BOLD ITALIC SMALL O" #x1D490)
-    ("MATHEMATICAL BOLD ITALIC SMALL P" #x1D491)
-    ("MATHEMATICAL BOLD ITALIC SMALL Q" #x1D492)
-    ("MATHEMATICAL BOLD ITALIC SMALL R" #x1D493)
-    ("MATHEMATICAL BOLD ITALIC SMALL S" #x1D494)
-    ("MATHEMATICAL BOLD ITALIC SMALL T" #x1D495)
-    ("MATHEMATICAL BOLD ITALIC SMALL U" #x1D496)
-    ("MATHEMATICAL BOLD ITALIC SMALL V" #x1D497)
-    ("MATHEMATICAL BOLD ITALIC SMALL W" #x1D498)
-    ("MATHEMATICAL BOLD ITALIC SMALL X" #x1D499)
-    ("MATHEMATICAL BOLD ITALIC SMALL Y" #x1D49A)
-    ("MATHEMATICAL BOLD ITALIC SMALL Z" #x1D49B)
-    ("MATHEMATICAL SCRIPT CAPITAL A" #x1D49C)
-    ("MATHEMATICAL SCRIPT CAPITAL C" #x1D49E)
-    ("MATHEMATICAL SCRIPT CAPITAL D" #x1D49F)
-    ("MATHEMATICAL SCRIPT CAPITAL G" #x1D4A2)
-    ("MATHEMATICAL SCRIPT CAPITAL J" #x1D4A5)
-    ("MATHEMATICAL SCRIPT CAPITAL K" #x1D4A6)
-    ("MATHEMATICAL SCRIPT CAPITAL N" #x1D4A9)
-    ("MATHEMATICAL SCRIPT CAPITAL O" #x1D4AA)
-    ("MATHEMATICAL SCRIPT CAPITAL P" #x1D4AB)
-    ("MATHEMATICAL SCRIPT CAPITAL Q" #x1D4AC)
-    ("MATHEMATICAL SCRIPT CAPITAL S" #x1D4AE)
-    ("MATHEMATICAL SCRIPT CAPITAL T" #x1D4AF)
-    ("MATHEMATICAL SCRIPT CAPITAL U" #x1D4B0)
-    ("MATHEMATICAL SCRIPT CAPITAL V" #x1D4B1)
-    ("MATHEMATICAL SCRIPT CAPITAL W" #x1D4B2)
-    ("MATHEMATICAL SCRIPT CAPITAL X" #x1D4B3)
-    ("MATHEMATICAL SCRIPT CAPITAL Y" #x1D4B4)
-    ("MATHEMATICAL SCRIPT CAPITAL Z" #x1D4B5)
-    ("MATHEMATICAL SCRIPT SMALL A" #x1D4B6)
-    ("MATHEMATICAL SCRIPT SMALL B" #x1D4B7)
-    ("MATHEMATICAL SCRIPT SMALL C" #x1D4B8)
-    ("MATHEMATICAL SCRIPT SMALL D" #x1D4B9)
-    ("MATHEMATICAL SCRIPT SMALL F" #x1D4BB)
-    ("MATHEMATICAL SCRIPT SMALL H" #x1D4BD)
-    ("MATHEMATICAL SCRIPT SMALL I" #x1D4BE)
-    ("MATHEMATICAL SCRIPT SMALL J" #x1D4BF)
-    ("MATHEMATICAL SCRIPT SMALL K" #x1D4C0)
-    ("MATHEMATICAL SCRIPT SMALL M" #x1D4C2)
-    ("MATHEMATICAL SCRIPT SMALL N" #x1D4C3)
-    ("MATHEMATICAL SCRIPT SMALL P" #x1D4C5)
-    ("MATHEMATICAL SCRIPT SMALL Q" #x1D4C6)
-    ("MATHEMATICAL SCRIPT SMALL R" #x1D4C7)
-    ("MATHEMATICAL SCRIPT SMALL S" #x1D4C8)
-    ("MATHEMATICAL SCRIPT SMALL T" #x1D4C9)
-    ("MATHEMATICAL SCRIPT SMALL U" #x1D4CA)
-    ("MATHEMATICAL SCRIPT SMALL V" #x1D4CB)
-    ("MATHEMATICAL SCRIPT SMALL W" #x1D4CC)
-    ("MATHEMATICAL SCRIPT SMALL X" #x1D4CD)
-    ("MATHEMATICAL SCRIPT SMALL Y" #x1D4CE)
-    ("MATHEMATICAL SCRIPT SMALL Z" #x1D4CF)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL A" #x1D4D0)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL B" #x1D4D1)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL C" #x1D4D2)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL D" #x1D4D3)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL E" #x1D4D4)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL F" #x1D4D5)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL G" #x1D4D6)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL H" #x1D4D7)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL I" #x1D4D8)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL J" #x1D4D9)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL K" #x1D4DA)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL L" #x1D4DB)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL M" #x1D4DC)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL N" #x1D4DD)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL O" #x1D4DE)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL P" #x1D4DF)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL Q" #x1D4E0)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL R" #x1D4E1)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL S" #x1D4E2)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL T" #x1D4E3)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL U" #x1D4E4)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL V" #x1D4E5)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL W" #x1D4E6)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL X" #x1D4E7)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL Y" #x1D4E8)
-    ("MATHEMATICAL BOLD SCRIPT CAPITAL Z" #x1D4E9)
-    ("MATHEMATICAL BOLD SCRIPT SMALL A" #x1D4EA)
-    ("MATHEMATICAL BOLD SCRIPT SMALL B" #x1D4EB)
-    ("MATHEMATICAL BOLD SCRIPT SMALL C" #x1D4EC)
-    ("MATHEMATICAL BOLD SCRIPT SMALL D" #x1D4ED)
-    ("MATHEMATICAL BOLD SCRIPT SMALL E" #x1D4EE)
-    ("MATHEMATICAL BOLD SCRIPT SMALL F" #x1D4EF)
-    ("MATHEMATICAL BOLD SCRIPT SMALL G" #x1D4F0)
-    ("MATHEMATICAL BOLD SCRIPT SMALL H" #x1D4F1)
-    ("MATHEMATICAL BOLD SCRIPT SMALL I" #x1D4F2)
-    ("MATHEMATICAL BOLD SCRIPT SMALL J" #x1D4F3)
-    ("MATHEMATICAL BOLD SCRIPT SMALL K" #x1D4F4)
-    ("MATHEMATICAL BOLD SCRIPT SMALL L" #x1D4F5)
-    ("MATHEMATICAL BOLD SCRIPT SMALL M" #x1D4F6)
-    ("MATHEMATICAL BOLD SCRIPT SMALL N" #x1D4F7)
-    ("MATHEMATICAL BOLD SCRIPT SMALL O" #x1D4F8)
-    ("MATHEMATICAL BOLD SCRIPT SMALL P" #x1D4F9)
-    ("MATHEMATICAL BOLD SCRIPT SMALL Q" #x1D4FA)
-    ("MATHEMATICAL BOLD SCRIPT SMALL R" #x1D4FB)
-    ("MATHEMATICAL BOLD SCRIPT SMALL S" #x1D4FC)
-    ("MATHEMATICAL BOLD SCRIPT SMALL T" #x1D4FD)
-    ("MATHEMATICAL BOLD SCRIPT SMALL U" #x1D4FE)
-    ("MATHEMATICAL BOLD SCRIPT SMALL V" #x1D4FF)
-    ("MATHEMATICAL BOLD SCRIPT SMALL W" #x1D500)
-    ("MATHEMATICAL BOLD SCRIPT SMALL X" #x1D501)
-    ("MATHEMATICAL BOLD SCRIPT SMALL Y" #x1D502)
-    ("MATHEMATICAL BOLD SCRIPT SMALL Z" #x1D503)
-    ("MATHEMATICAL FRAKTUR CAPITAL A" #x1D504)
-    ("MATHEMATICAL FRAKTUR CAPITAL B" #x1D505)
-    ("MATHEMATICAL FRAKTUR CAPITAL D" #x1D507)
-    ("MATHEMATICAL FRAKTUR CAPITAL E" #x1D508)
-    ("MATHEMATICAL FRAKTUR CAPITAL F" #x1D509)
-    ("MATHEMATICAL FRAKTUR CAPITAL G" #x1D50A)
-    ("MATHEMATICAL FRAKTUR CAPITAL J" #x1D50D)
-    ("MATHEMATICAL FRAKTUR CAPITAL K" #x1D50E)
-    ("MATHEMATICAL FRAKTUR CAPITAL L" #x1D50F)
-    ("MATHEMATICAL FRAKTUR CAPITAL M" #x1D510)
-    ("MATHEMATICAL FRAKTUR CAPITAL N" #x1D511)
-    ("MATHEMATICAL FRAKTUR CAPITAL O" #x1D512)
-    ("MATHEMATICAL FRAKTUR CAPITAL P" #x1D513)
-    ("MATHEMATICAL FRAKTUR CAPITAL Q" #x1D514)
-    ("MATHEMATICAL FRAKTUR CAPITAL S" #x1D516)
-    ("MATHEMATICAL FRAKTUR CAPITAL T" #x1D517)
-    ("MATHEMATICAL FRAKTUR CAPITAL U" #x1D518)
-    ("MATHEMATICAL FRAKTUR CAPITAL V" #x1D519)
-    ("MATHEMATICAL FRAKTUR CAPITAL W" #x1D51A)
-    ("MATHEMATICAL FRAKTUR CAPITAL X" #x1D51B)
-    ("MATHEMATICAL FRAKTUR CAPITAL Y" #x1D51C)
-    ("MATHEMATICAL FRAKTUR SMALL A" #x1D51E)
-    ("MATHEMATICAL FRAKTUR SMALL B" #x1D51F)
-    ("MATHEMATICAL FRAKTUR SMALL C" #x1D520)
-    ("MATHEMATICAL FRAKTUR SMALL D" #x1D521)
-    ("MATHEMATICAL FRAKTUR SMALL E" #x1D522)
-    ("MATHEMATICAL FRAKTUR SMALL F" #x1D523)
-    ("MATHEMATICAL FRAKTUR SMALL G" #x1D524)
-    ("MATHEMATICAL FRAKTUR SMALL H" #x1D525)
-    ("MATHEMATICAL FRAKTUR SMALL I" #x1D526)
-    ("MATHEMATICAL FRAKTUR SMALL J" #x1D527)
-    ("MATHEMATICAL FRAKTUR SMALL K" #x1D528)
-    ("MATHEMATICAL FRAKTUR SMALL L" #x1D529)
-    ("MATHEMATICAL FRAKTUR SMALL M" #x1D52A)
-    ("MATHEMATICAL FRAKTUR SMALL N" #x1D52B)
-    ("MATHEMATICAL FRAKTUR SMALL O" #x1D52C)
-    ("MATHEMATICAL FRAKTUR SMALL P" #x1D52D)
-    ("MATHEMATICAL FRAKTUR SMALL Q" #x1D52E)
-    ("MATHEMATICAL FRAKTUR SMALL R" #x1D52F)
-    ("MATHEMATICAL FRAKTUR SMALL S" #x1D530)
-    ("MATHEMATICAL FRAKTUR SMALL T" #x1D531)
-    ("MATHEMATICAL FRAKTUR SMALL U" #x1D532)
-    ("MATHEMATICAL FRAKTUR SMALL V" #x1D533)
-    ("MATHEMATICAL FRAKTUR SMALL W" #x1D534)
-    ("MATHEMATICAL FRAKTUR SMALL X" #x1D535)
-    ("MATHEMATICAL FRAKTUR SMALL Y" #x1D536)
-    ("MATHEMATICAL FRAKTUR SMALL Z" #x1D537)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL A" #x1D538)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL B" #x1D539)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL D" #x1D53B)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL E" #x1D53C)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL F" #x1D53D)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL G" #x1D53E)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL I" #x1D540)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL J" #x1D541)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL K" #x1D542)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL L" #x1D543)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL M" #x1D544)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL O" #x1D546)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL S" #x1D54A)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL T" #x1D54B)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL U" #x1D54C)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL V" #x1D54D)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL W" #x1D54E)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL X" #x1D54F)
-    ("MATHEMATICAL DOUBLE-STRUCK CAPITAL Y" #x1D550)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL A" #x1D552)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL B" #x1D553)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL C" #x1D554)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL D" #x1D555)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL E" #x1D556)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL F" #x1D557)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL G" #x1D558)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL H" #x1D559)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL I" #x1D55A)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL J" #x1D55B)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL K" #x1D55C)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL L" #x1D55D)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL M" #x1D55E)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL N" #x1D55F)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL O" #x1D560)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL P" #x1D561)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL Q" #x1D562)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL R" #x1D563)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL S" #x1D564)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL T" #x1D565)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL U" #x1D566)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL V" #x1D567)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL W" #x1D568)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL X" #x1D569)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL Y" #x1D56A)
-    ("MATHEMATICAL DOUBLE-STRUCK SMALL Z" #x1D56B)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL A" #x1D56C)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL B" #x1D56D)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL C" #x1D56E)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL D" #x1D56F)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL E" #x1D570)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL F" #x1D571)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL G" #x1D572)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL H" #x1D573)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL I" #x1D574)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL J" #x1D575)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL K" #x1D576)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL L" #x1D577)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL M" #x1D578)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL N" #x1D579)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL O" #x1D57A)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL P" #x1D57B)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL Q" #x1D57C)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL R" #x1D57D)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL S" #x1D57E)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL T" #x1D57F)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL U" #x1D580)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL V" #x1D581)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL W" #x1D582)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL X" #x1D583)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL Y" #x1D584)
-    ("MATHEMATICAL BOLD FRAKTUR CAPITAL Z" #x1D585)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL A" #x1D586)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL B" #x1D587)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL C" #x1D588)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL D" #x1D589)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL E" #x1D58A)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL F" #x1D58B)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL G" #x1D58C)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL H" #x1D58D)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL I" #x1D58E)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL J" #x1D58F)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL K" #x1D590)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL L" #x1D591)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL M" #x1D592)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL N" #x1D593)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL O" #x1D594)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL P" #x1D595)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL Q" #x1D596)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL R" #x1D597)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL S" #x1D598)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL T" #x1D599)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL U" #x1D59A)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL V" #x1D59B)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL W" #x1D59C)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL X" #x1D59D)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL Y" #x1D59E)
-    ("MATHEMATICAL BOLD FRAKTUR SMALL Z" #x1D59F)
-    ("MATHEMATICAL SANS-SERIF CAPITAL A" #x1D5A0)
-    ("MATHEMATICAL SANS-SERIF CAPITAL B" #x1D5A1)
-    ("MATHEMATICAL SANS-SERIF CAPITAL C" #x1D5A2)
-    ("MATHEMATICAL SANS-SERIF CAPITAL D" #x1D5A3)
-    ("MATHEMATICAL SANS-SERIF CAPITAL E" #x1D5A4)
-    ("MATHEMATICAL SANS-SERIF CAPITAL F" #x1D5A5)
-    ("MATHEMATICAL SANS-SERIF CAPITAL G" #x1D5A6)
-    ("MATHEMATICAL SANS-SERIF CAPITAL H" #x1D5A7)
-    ("MATHEMATICAL SANS-SERIF CAPITAL I" #x1D5A8)
-    ("MATHEMATICAL SANS-SERIF CAPITAL J" #x1D5A9)
-    ("MATHEMATICAL SANS-SERIF CAPITAL K" #x1D5AA)
-    ("MATHEMATICAL SANS-SERIF CAPITAL L" #x1D5AB)
-    ("MATHEMATICAL SANS-SERIF CAPITAL M" #x1D5AC)
-    ("MATHEMATICAL SANS-SERIF CAPITAL N" #x1D5AD)
-    ("MATHEMATICAL SANS-SERIF CAPITAL O" #x1D5AE)
-    ("MATHEMATICAL SANS-SERIF CAPITAL P" #x1D5AF)
-    ("MATHEMATICAL SANS-SERIF CAPITAL Q" #x1D5B0)
-    ("MATHEMATICAL SANS-SERIF CAPITAL R" #x1D5B1)
-    ("MATHEMATICAL SANS-SERIF CAPITAL S" #x1D5B2)
-    ("MATHEMATICAL SANS-SERIF CAPITAL T" #x1D5B3)
-    ("MATHEMATICAL SANS-SERIF CAPITAL U" #x1D5B4)
-    ("MATHEMATICAL SANS-SERIF CAPITAL V" #x1D5B5)
-    ("MATHEMATICAL SANS-SERIF CAPITAL W" #x1D5B6)
-    ("MATHEMATICAL SANS-SERIF CAPITAL X" #x1D5B7)
-    ("MATHEMATICAL SANS-SERIF CAPITAL Y" #x1D5B8)
-    ("MATHEMATICAL SANS-SERIF CAPITAL Z" #x1D5B9)
-    ("MATHEMATICAL SANS-SERIF SMALL A" #x1D5BA)
-    ("MATHEMATICAL SANS-SERIF SMALL B" #x1D5BB)
-    ("MATHEMATICAL SANS-SERIF SMALL C" #x1D5BC)
-    ("MATHEMATICAL SANS-SERIF SMALL D" #x1D5BD)
-    ("MATHEMATICAL SANS-SERIF SMALL E" #x1D5BE)
-    ("MATHEMATICAL SANS-SERIF SMALL F" #x1D5BF)
-    ("MATHEMATICAL SANS-SERIF SMALL G" #x1D5C0)
-    ("MATHEMATICAL SANS-SERIF SMALL H" #x1D5C1)
-    ("MATHEMATICAL SANS-SERIF SMALL I" #x1D5C2)
-    ("MATHEMATICAL SANS-SERIF SMALL J" #x1D5C3)
-    ("MATHEMATICAL SANS-SERIF SMALL K" #x1D5C4)
-    ("MATHEMATICAL SANS-SERIF SMALL L" #x1D5C5)
-    ("MATHEMATICAL SANS-SERIF SMALL M" #x1D5C6)
-    ("MATHEMATICAL SANS-SERIF SMALL N" #x1D5C7)
-    ("MATHEMATICAL SANS-SERIF SMALL O" #x1D5C8)
-    ("MATHEMATICAL SANS-SERIF SMALL P" #x1D5C9)
-    ("MATHEMATICAL SANS-SERIF SMALL Q" #x1D5CA)
-    ("MATHEMATICAL SANS-SERIF SMALL R" #x1D5CB)
-    ("MATHEMATICAL SANS-SERIF SMALL S" #x1D5CC)
-    ("MATHEMATICAL SANS-SERIF SMALL T" #x1D5CD)
-    ("MATHEMATICAL SANS-SERIF SMALL U" #x1D5CE)
-    ("MATHEMATICAL SANS-SERIF SMALL V" #x1D5CF)
-    ("MATHEMATICAL SANS-SERIF SMALL W" #x1D5D0)
-    ("MATHEMATICAL SANS-SERIF SMALL X" #x1D5D1)
-    ("MATHEMATICAL SANS-SERIF SMALL Y" #x1D5D2)
-    ("MATHEMATICAL SANS-SERIF SMALL Z" #x1D5D3)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL A" #x1D5D4)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL B" #x1D5D5)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL C" #x1D5D6)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL D" #x1D5D7)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL E" #x1D5D8)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL F" #x1D5D9)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL G" #x1D5DA)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL H" #x1D5DB)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL I" #x1D5DC)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL J" #x1D5DD)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL K" #x1D5DE)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL L" #x1D5DF)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL M" #x1D5E0)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL N" #x1D5E1)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL O" #x1D5E2)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL P" #x1D5E3)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL Q" #x1D5E4)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL R" #x1D5E5)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL S" #x1D5E6)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL T" #x1D5E7)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL U" #x1D5E8)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL V" #x1D5E9)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL W" #x1D5EA)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL X" #x1D5EB)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL Y" #x1D5EC)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL Z" #x1D5ED)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL A" #x1D5EE)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL B" #x1D5EF)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL C" #x1D5F0)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL D" #x1D5F1)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL E" #x1D5F2)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL F" #x1D5F3)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL G" #x1D5F4)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL H" #x1D5F5)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL I" #x1D5F6)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL J" #x1D5F7)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL K" #x1D5F8)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL L" #x1D5F9)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL M" #x1D5FA)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL N" #x1D5FB)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL O" #x1D5FC)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL P" #x1D5FD)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL Q" #x1D5FE)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL R" #x1D5FF)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL S" #x1D600)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL T" #x1D601)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL U" #x1D602)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL V" #x1D603)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL W" #x1D604)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL X" #x1D605)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL Y" #x1D606)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL Z" #x1D607)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL A" #x1D608)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL B" #x1D609)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL C" #x1D60A)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL D" #x1D60B)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL E" #x1D60C)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL F" #x1D60D)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL G" #x1D60E)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL H" #x1D60F)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL I" #x1D610)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL J" #x1D611)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL K" #x1D612)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL L" #x1D613)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL M" #x1D614)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL N" #x1D615)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL O" #x1D616)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL P" #x1D617)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q" #x1D618)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL R" #x1D619)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL S" #x1D61A)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL T" #x1D61B)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL U" #x1D61C)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL V" #x1D61D)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL W" #x1D61E)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL X" #x1D61F)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y" #x1D620)
-    ("MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z" #x1D621)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL A" #x1D622)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL B" #x1D623)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL C" #x1D624)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL D" #x1D625)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL E" #x1D626)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL F" #x1D627)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL G" #x1D628)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL H" #x1D629)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL I" #x1D62A)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL J" #x1D62B)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL K" #x1D62C)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL L" #x1D62D)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL M" #x1D62E)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL N" #x1D62F)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL O" #x1D630)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL P" #x1D631)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL Q" #x1D632)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL R" #x1D633)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL S" #x1D634)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL T" #x1D635)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL U" #x1D636)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL V" #x1D637)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL W" #x1D638)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL X" #x1D639)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL Y" #x1D63A)
-    ("MATHEMATICAL SANS-SERIF ITALIC SMALL Z" #x1D63B)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A" #x1D63C)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B" #x1D63D)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C" #x1D63E)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D" #x1D63F)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E" #x1D640)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F" #x1D641)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G" #x1D642)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H" #x1D643)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I" #x1D644)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J" #x1D645)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K" #x1D646)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L" #x1D647)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M" #x1D648)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N" #x1D649)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O" #x1D64A)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P" #x1D64B)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q" #x1D64C)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R" #x1D64D)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S" #x1D64E)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T" #x1D64F)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U" #x1D650)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V" #x1D651)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W" #x1D652)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X" #x1D653)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y" #x1D654)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z" #x1D655)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A" #x1D656)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B" #x1D657)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C" #x1D658)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D" #x1D659)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E" #x1D65A)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F" #x1D65B)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G" #x1D65C)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H" #x1D65D)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I" #x1D65E)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J" #x1D65F)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K" #x1D660)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L" #x1D661)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M" #x1D662)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N" #x1D663)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O" #x1D664)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P" #x1D665)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q" #x1D666)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R" #x1D667)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S" #x1D668)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T" #x1D669)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U" #x1D66A)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V" #x1D66B)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W" #x1D66C)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X" #x1D66D)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y" #x1D66E)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z" #x1D66F)
-    ("MATHEMATICAL MONOSPACE CAPITAL A" #x1D670)
-    ("MATHEMATICAL MONOSPACE CAPITAL B" #x1D671)
-    ("MATHEMATICAL MONOSPACE CAPITAL C" #x1D672)
-    ("MATHEMATICAL MONOSPACE CAPITAL D" #x1D673)
-    ("MATHEMATICAL MONOSPACE CAPITAL E" #x1D674)
-    ("MATHEMATICAL MONOSPACE CAPITAL F" #x1D675)
-    ("MATHEMATICAL MONOSPACE CAPITAL G" #x1D676)
-    ("MATHEMATICAL MONOSPACE CAPITAL H" #x1D677)
-    ("MATHEMATICAL MONOSPACE CAPITAL I" #x1D678)
-    ("MATHEMATICAL MONOSPACE CAPITAL J" #x1D679)
-    ("MATHEMATICAL MONOSPACE CAPITAL K" #x1D67A)
-    ("MATHEMATICAL MONOSPACE CAPITAL L" #x1D67B)
-    ("MATHEMATICAL MONOSPACE CAPITAL M" #x1D67C)
-    ("MATHEMATICAL MONOSPACE CAPITAL N" #x1D67D)
-    ("MATHEMATICAL MONOSPACE CAPITAL O" #x1D67E)
-    ("MATHEMATICAL MONOSPACE CAPITAL P" #x1D67F)
-    ("MATHEMATICAL MONOSPACE CAPITAL Q" #x1D680)
-    ("MATHEMATICAL MONOSPACE CAPITAL R" #x1D681)
-    ("MATHEMATICAL MONOSPACE CAPITAL S" #x1D682)
-    ("MATHEMATICAL MONOSPACE CAPITAL T" #x1D683)
-    ("MATHEMATICAL MONOSPACE CAPITAL U" #x1D684)
-    ("MATHEMATICAL MONOSPACE CAPITAL V" #x1D685)
-    ("MATHEMATICAL MONOSPACE CAPITAL W" #x1D686)
-    ("MATHEMATICAL MONOSPACE CAPITAL X" #x1D687)
-    ("MATHEMATICAL MONOSPACE CAPITAL Y" #x1D688)
-    ("MATHEMATICAL MONOSPACE CAPITAL Z" #x1D689)
-    ("MATHEMATICAL MONOSPACE SMALL A" #x1D68A)
-    ("MATHEMATICAL MONOSPACE SMALL B" #x1D68B)
-    ("MATHEMATICAL MONOSPACE SMALL C" #x1D68C)
-    ("MATHEMATICAL MONOSPACE SMALL D" #x1D68D)
-    ("MATHEMATICAL MONOSPACE SMALL E" #x1D68E)
-    ("MATHEMATICAL MONOSPACE SMALL F" #x1D68F)
-    ("MATHEMATICAL MONOSPACE SMALL G" #x1D690)
-    ("MATHEMATICAL MONOSPACE SMALL H" #x1D691)
-    ("MATHEMATICAL MONOSPACE SMALL I" #x1D692)
-    ("MATHEMATICAL MONOSPACE SMALL J" #x1D693)
-    ("MATHEMATICAL MONOSPACE SMALL K" #x1D694)
-    ("MATHEMATICAL MONOSPACE SMALL L" #x1D695)
-    ("MATHEMATICAL MONOSPACE SMALL M" #x1D696)
-    ("MATHEMATICAL MONOSPACE SMALL N" #x1D697)
-    ("MATHEMATICAL MONOSPACE SMALL O" #x1D698)
-    ("MATHEMATICAL MONOSPACE SMALL P" #x1D699)
-    ("MATHEMATICAL MONOSPACE SMALL Q" #x1D69A)
-    ("MATHEMATICAL MONOSPACE SMALL R" #x1D69B)
-    ("MATHEMATICAL MONOSPACE SMALL S" #x1D69C)
-    ("MATHEMATICAL MONOSPACE SMALL T" #x1D69D)
-    ("MATHEMATICAL MONOSPACE SMALL U" #x1D69E)
-    ("MATHEMATICAL MONOSPACE SMALL V" #x1D69F)
-    ("MATHEMATICAL MONOSPACE SMALL W" #x1D6A0)
-    ("MATHEMATICAL MONOSPACE SMALL X" #x1D6A1)
-    ("MATHEMATICAL MONOSPACE SMALL Y" #x1D6A2)
-    ("MATHEMATICAL MONOSPACE SMALL Z" #x1D6A3)
-    ("MATHEMATICAL BOLD CAPITAL ALPHA" #x1D6A8)
-    ("MATHEMATICAL BOLD CAPITAL BETA" #x1D6A9)
-    ("MATHEMATICAL BOLD CAPITAL GAMMA" #x1D6AA)
-    ("MATHEMATICAL BOLD CAPITAL DELTA" #x1D6AB)
-    ("MATHEMATICAL BOLD CAPITAL EPSILON" #x1D6AC)
-    ("MATHEMATICAL BOLD CAPITAL ZETA" #x1D6AD)
-    ("MATHEMATICAL BOLD CAPITAL ETA" #x1D6AE)
-    ("MATHEMATICAL BOLD CAPITAL THETA" #x1D6AF)
-    ("MATHEMATICAL BOLD CAPITAL IOTA" #x1D6B0)
-    ("MATHEMATICAL BOLD CAPITAL KAPPA" #x1D6B1)
-    ("MATHEMATICAL BOLD CAPITAL LAMDA" #x1D6B2)
-    ("MATHEMATICAL BOLD CAPITAL MU" #x1D6B3)
-    ("MATHEMATICAL BOLD CAPITAL NU" #x1D6B4)
-    ("MATHEMATICAL BOLD CAPITAL XI" #x1D6B5)
-    ("MATHEMATICAL BOLD CAPITAL OMICRON" #x1D6B6)
-    ("MATHEMATICAL BOLD CAPITAL PI" #x1D6B7)
-    ("MATHEMATICAL BOLD CAPITAL RHO" #x1D6B8)
-    ("MATHEMATICAL BOLD CAPITAL THETA SYMBOL" #x1D6B9)
-    ("MATHEMATICAL BOLD CAPITAL SIGMA" #x1D6BA)
-    ("MATHEMATICAL BOLD CAPITAL TAU" #x1D6BB)
-    ("MATHEMATICAL BOLD CAPITAL UPSILON" #x1D6BC)
-    ("MATHEMATICAL BOLD CAPITAL PHI" #x1D6BD)
-    ("MATHEMATICAL BOLD CAPITAL CHI" #x1D6BE)
-    ("MATHEMATICAL BOLD CAPITAL PSI" #x1D6BF)
-    ("MATHEMATICAL BOLD CAPITAL OMEGA" #x1D6C0)
-    ("MATHEMATICAL BOLD NABLA" #x1D6C1)
-    ("MATHEMATICAL BOLD SMALL ALPHA" #x1D6C2)
-    ("MATHEMATICAL BOLD SMALL BETA" #x1D6C3)
-    ("MATHEMATICAL BOLD SMALL GAMMA" #x1D6C4)
-    ("MATHEMATICAL BOLD SMALL DELTA" #x1D6C5)
-    ("MATHEMATICAL BOLD SMALL EPSILON" #x1D6C6)
-    ("MATHEMATICAL BOLD SMALL ZETA" #x1D6C7)
-    ("MATHEMATICAL BOLD SMALL ETA" #x1D6C8)
-    ("MATHEMATICAL BOLD SMALL THETA" #x1D6C9)
-    ("MATHEMATICAL BOLD SMALL IOTA" #x1D6CA)
-    ("MATHEMATICAL BOLD SMALL KAPPA" #x1D6CB)
-    ("MATHEMATICAL BOLD SMALL LAMDA" #x1D6CC)
-    ("MATHEMATICAL BOLD SMALL MU" #x1D6CD)
-    ("MATHEMATICAL BOLD SMALL NU" #x1D6CE)
-    ("MATHEMATICAL BOLD SMALL XI" #x1D6CF)
-    ("MATHEMATICAL BOLD SMALL OMICRON" #x1D6D0)
-    ("MATHEMATICAL BOLD SMALL PI" #x1D6D1)
-    ("MATHEMATICAL BOLD SMALL RHO" #x1D6D2)
-    ("MATHEMATICAL BOLD SMALL FINAL SIGMA" #x1D6D3)
-    ("MATHEMATICAL BOLD SMALL SIGMA" #x1D6D4)
-    ("MATHEMATICAL BOLD SMALL TAU" #x1D6D5)
-    ("MATHEMATICAL BOLD SMALL UPSILON" #x1D6D6)
-    ("MATHEMATICAL BOLD SMALL PHI" #x1D6D7)
-    ("MATHEMATICAL BOLD SMALL CHI" #x1D6D8)
-    ("MATHEMATICAL BOLD SMALL PSI" #x1D6D9)
-    ("MATHEMATICAL BOLD SMALL OMEGA" #x1D6DA)
-    ("MATHEMATICAL BOLD PARTIAL DIFFERENTIAL" #x1D6DB)
-    ("MATHEMATICAL BOLD EPSILON SYMBOL" #x1D6DC)
-    ("MATHEMATICAL BOLD THETA SYMBOL" #x1D6DD)
-    ("MATHEMATICAL BOLD KAPPA SYMBOL" #x1D6DE)
-    ("MATHEMATICAL BOLD PHI SYMBOL" #x1D6DF)
-    ("MATHEMATICAL BOLD RHO SYMBOL" #x1D6E0)
-    ("MATHEMATICAL BOLD PI SYMBOL" #x1D6E1)
-    ("MATHEMATICAL ITALIC CAPITAL ALPHA" #x1D6E2)
-    ("MATHEMATICAL ITALIC CAPITAL BETA" #x1D6E3)
-    ("MATHEMATICAL ITALIC CAPITAL GAMMA" #x1D6E4)
-    ("MATHEMATICAL ITALIC CAPITAL DELTA" #x1D6E5)
-    ("MATHEMATICAL ITALIC CAPITAL EPSILON" #x1D6E6)
-    ("MATHEMATICAL ITALIC CAPITAL ZETA" #x1D6E7)
-    ("MATHEMATICAL ITALIC CAPITAL ETA" #x1D6E8)
-    ("MATHEMATICAL ITALIC CAPITAL THETA" #x1D6E9)
-    ("MATHEMATICAL ITALIC CAPITAL IOTA" #x1D6EA)
-    ("MATHEMATICAL ITALIC CAPITAL KAPPA" #x1D6EB)
-    ("MATHEMATICAL ITALIC CAPITAL LAMDA" #x1D6EC)
-    ("MATHEMATICAL ITALIC CAPITAL MU" #x1D6ED)
-    ("MATHEMATICAL ITALIC CAPITAL NU" #x1D6EE)
-    ("MATHEMATICAL ITALIC CAPITAL XI" #x1D6EF)
-    ("MATHEMATICAL ITALIC CAPITAL OMICRON" #x1D6F0)
-    ("MATHEMATICAL ITALIC CAPITAL PI" #x1D6F1)
-    ("MATHEMATICAL ITALIC CAPITAL RHO" #x1D6F2)
-    ("MATHEMATICAL ITALIC CAPITAL THETA SYMBOL" #x1D6F3)
-    ("MATHEMATICAL ITALIC CAPITAL SIGMA" #x1D6F4)
-    ("MATHEMATICAL ITALIC CAPITAL TAU" #x1D6F5)
-    ("MATHEMATICAL ITALIC CAPITAL UPSILON" #x1D6F6)
-    ("MATHEMATICAL ITALIC CAPITAL PHI" #x1D6F7)
-    ("MATHEMATICAL ITALIC CAPITAL CHI" #x1D6F8)
-    ("MATHEMATICAL ITALIC CAPITAL PSI" #x1D6F9)
-    ("MATHEMATICAL ITALIC CAPITAL OMEGA" #x1D6FA)
-    ("MATHEMATICAL ITALIC NABLA" #x1D6FB)
-    ("MATHEMATICAL ITALIC SMALL ALPHA" #x1D6FC)
-    ("MATHEMATICAL ITALIC SMALL BETA" #x1D6FD)
-    ("MATHEMATICAL ITALIC SMALL GAMMA" #x1D6FE)
-    ("MATHEMATICAL ITALIC SMALL DELTA" #x1D6FF)
-    ("MATHEMATICAL ITALIC SMALL EPSILON" #x1D700)
-    ("MATHEMATICAL ITALIC SMALL ZETA" #x1D701)
-    ("MATHEMATICAL ITALIC SMALL ETA" #x1D702)
-    ("MATHEMATICAL ITALIC SMALL THETA" #x1D703)
-    ("MATHEMATICAL ITALIC SMALL IOTA" #x1D704)
-    ("MATHEMATICAL ITALIC SMALL KAPPA" #x1D705)
-    ("MATHEMATICAL ITALIC SMALL LAMDA" #x1D706)
-    ("MATHEMATICAL ITALIC SMALL MU" #x1D707)
-    ("MATHEMATICAL ITALIC SMALL NU" #x1D708)
-    ("MATHEMATICAL ITALIC SMALL XI" #x1D709)
-    ("MATHEMATICAL ITALIC SMALL OMICRON" #x1D70A)
-    ("MATHEMATICAL ITALIC SMALL PI" #x1D70B)
-    ("MATHEMATICAL ITALIC SMALL RHO" #x1D70C)
-    ("MATHEMATICAL ITALIC SMALL FINAL SIGMA" #x1D70D)
-    ("MATHEMATICAL ITALIC SMALL SIGMA" #x1D70E)
-    ("MATHEMATICAL ITALIC SMALL TAU" #x1D70F)
-    ("MATHEMATICAL ITALIC SMALL UPSILON" #x1D710)
-    ("MATHEMATICAL ITALIC SMALL PHI" #x1D711)
-    ("MATHEMATICAL ITALIC SMALL CHI" #x1D712)
-    ("MATHEMATICAL ITALIC SMALL PSI" #x1D713)
-    ("MATHEMATICAL ITALIC SMALL OMEGA" #x1D714)
-    ("MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL" #x1D715)
-    ("MATHEMATICAL ITALIC EPSILON SYMBOL" #x1D716)
-    ("MATHEMATICAL ITALIC THETA SYMBOL" #x1D717)
-    ("MATHEMATICAL ITALIC KAPPA SYMBOL" #x1D718)
-    ("MATHEMATICAL ITALIC PHI SYMBOL" #x1D719)
-    ("MATHEMATICAL ITALIC RHO SYMBOL" #x1D71A)
-    ("MATHEMATICAL ITALIC PI SYMBOL" #x1D71B)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL ALPHA" #x1D71C)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL BETA" #x1D71D)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL GAMMA" #x1D71E)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL DELTA" #x1D71F)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL EPSILON" #x1D720)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL ZETA" #x1D721)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL ETA" #x1D722)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL THETA" #x1D723)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL IOTA" #x1D724)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL KAPPA" #x1D725)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL LAMDA" #x1D726)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL MU" #x1D727)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL NU" #x1D728)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL XI" #x1D729)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL OMICRON" #x1D72A)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL PI" #x1D72B)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL RHO" #x1D72C)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL" #x1D72D)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL SIGMA" #x1D72E)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL TAU" #x1D72F)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL UPSILON" #x1D730)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL PHI" #x1D731)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL CHI" #x1D732)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL PSI" #x1D733)
-    ("MATHEMATICAL BOLD ITALIC CAPITAL OMEGA" #x1D734)
-    ("MATHEMATICAL BOLD ITALIC NABLA" #x1D735)
-    ("MATHEMATICAL BOLD ITALIC SMALL ALPHA" #x1D736)
-    ("MATHEMATICAL BOLD ITALIC SMALL BETA" #x1D737)
-    ("MATHEMATICAL BOLD ITALIC SMALL GAMMA" #x1D738)
-    ("MATHEMATICAL BOLD ITALIC SMALL DELTA" #x1D739)
-    ("MATHEMATICAL BOLD ITALIC SMALL EPSILON" #x1D73A)
-    ("MATHEMATICAL BOLD ITALIC SMALL ZETA" #x1D73B)
-    ("MATHEMATICAL BOLD ITALIC SMALL ETA" #x1D73C)
-    ("MATHEMATICAL BOLD ITALIC SMALL THETA" #x1D73D)
-    ("MATHEMATICAL BOLD ITALIC SMALL IOTA" #x1D73E)
-    ("MATHEMATICAL BOLD ITALIC SMALL KAPPA" #x1D73F)
-    ("MATHEMATICAL BOLD ITALIC SMALL LAMDA" #x1D740)
-    ("MATHEMATICAL BOLD ITALIC SMALL MU" #x1D741)
-    ("MATHEMATICAL BOLD ITALIC SMALL NU" #x1D742)
-    ("MATHEMATICAL BOLD ITALIC SMALL XI" #x1D743)
-    ("MATHEMATICAL BOLD ITALIC SMALL OMICRON" #x1D744)
-    ("MATHEMATICAL BOLD ITALIC SMALL PI" #x1D745)
-    ("MATHEMATICAL BOLD ITALIC SMALL RHO" #x1D746)
-    ("MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA" #x1D747)
-    ("MATHEMATICAL BOLD ITALIC SMALL SIGMA" #x1D748)
-    ("MATHEMATICAL BOLD ITALIC SMALL TAU" #x1D749)
-    ("MATHEMATICAL BOLD ITALIC SMALL UPSILON" #x1D74A)
-    ("MATHEMATICAL BOLD ITALIC SMALL PHI" #x1D74B)
-    ("MATHEMATICAL BOLD ITALIC SMALL CHI" #x1D74C)
-    ("MATHEMATICAL BOLD ITALIC SMALL PSI" #x1D74D)
-    ("MATHEMATICAL BOLD ITALIC SMALL OMEGA" #x1D74E)
-    ("MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL" #x1D74F)
-    ("MATHEMATICAL BOLD ITALIC EPSILON SYMBOL" #x1D750)
-    ("MATHEMATICAL BOLD ITALIC THETA SYMBOL" #x1D751)
-    ("MATHEMATICAL BOLD ITALIC KAPPA SYMBOL" #x1D752)
-    ("MATHEMATICAL BOLD ITALIC PHI SYMBOL" #x1D753)
-    ("MATHEMATICAL BOLD ITALIC RHO SYMBOL" #x1D754)
-    ("MATHEMATICAL BOLD ITALIC PI SYMBOL" #x1D755)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA" #x1D756)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA" #x1D757)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA" #x1D758)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA" #x1D759)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON" #x1D75A)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA" #x1D75B)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA" #x1D75C)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA" #x1D75D)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA" #x1D75E)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA" #x1D75F)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA" #x1D760)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL MU" #x1D761)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL NU" #x1D762)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL XI" #x1D763)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON" #x1D764)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL PI" #x1D765)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO" #x1D766)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL" #x1D767)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA" #x1D768)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU" #x1D769)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON" #x1D76A)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI" #x1D76B)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI" #x1D76C)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI" #x1D76D)
-    ("MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA" #x1D76E)
-    ("MATHEMATICAL SANS-SERIF BOLD NABLA" #x1D76F)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA" #x1D770)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL BETA" #x1D771)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA" #x1D772)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL DELTA" #x1D773)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON" #x1D774)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL ZETA" #x1D775)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL ETA" #x1D776)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL THETA" #x1D777)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL IOTA" #x1D778)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA" #x1D779)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA" #x1D77A)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL MU" #x1D77B)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL NU" #x1D77C)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL XI" #x1D77D)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON" #x1D77E)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL PI" #x1D77F)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL RHO" #x1D780)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA" #x1D781)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA" #x1D782)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL TAU" #x1D783)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON" #x1D784)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL PHI" #x1D785)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL CHI" #x1D786)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL PSI" #x1D787)
-    ("MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA" #x1D788)
-    ("MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL" #x1D789)
-    ("MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL" #x1D78A)
-    ("MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL" #x1D78B)
-    ("MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL" #x1D78C)
-    ("MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL" #x1D78D)
-    ("MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL" #x1D78E)
-    ("MATHEMATICAL SANS-SERIF BOLD PI SYMBOL" #x1D78F)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA" #x1D790)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA" #x1D791)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA" #x1D792)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA" #x1D793)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON" #x1D794)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA" #x1D795)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA" #x1D796)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA" #x1D797)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA" #x1D798)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA" #x1D799)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA" #x1D79A)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU" #x1D79B)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU" #x1D79C)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI" #x1D79D)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON" #x1D79E)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI" #x1D79F)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO" #x1D7A0)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL" #x1D7A1)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA" #x1D7A2)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU" #x1D7A3)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON" #x1D7A4)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI" #x1D7A5)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI" #x1D7A6)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI" #x1D7A7)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA" #x1D7A8)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA" #x1D7A9)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA" #x1D7AA)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA" #x1D7AB)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA" #x1D7AC)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA" #x1D7AD)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON" #x1D7AE)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA" #x1D7AF)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA" #x1D7B0)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA" #x1D7B1)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA" #x1D7B2)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA" #x1D7B3)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA" #x1D7B4)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU" #x1D7B5)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU" #x1D7B6)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI" #x1D7B7)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON" #x1D7B8)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI" #x1D7B9)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO" #x1D7BA)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA" #x1D7BB)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA" #x1D7BC)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU" #x1D7BD)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON" #x1D7BE)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI" #x1D7BF)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI" #x1D7C0)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI" #x1D7C1)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA" #x1D7C2)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL" #x1D7C3)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL" #x1D7C4)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL" #x1D7C5)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL" #x1D7C6)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL" #x1D7C7)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL" #x1D7C8)
-    ("MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL" #x1D7C9)
-    ("MATHEMATICAL BOLD DIGIT ZERO" #x1D7CE)
-    ("MATHEMATICAL BOLD DIGIT ONE" #x1D7CF)
-    ("MATHEMATICAL BOLD DIGIT TWO" #x1D7D0)
-    ("MATHEMATICAL BOLD DIGIT THREE" #x1D7D1)
-    ("MATHEMATICAL BOLD DIGIT FOUR" #x1D7D2)
-    ("MATHEMATICAL BOLD DIGIT FIVE" #x1D7D3)
-    ("MATHEMATICAL BOLD DIGIT SIX" #x1D7D4)
-    ("MATHEMATICAL BOLD DIGIT SEVEN" #x1D7D5)
-    ("MATHEMATICAL BOLD DIGIT EIGHT" #x1D7D6)
-    ("MATHEMATICAL BOLD DIGIT NINE" #x1D7D7)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO" #x1D7D8)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT ONE" #x1D7D9)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT TWO" #x1D7DA)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT THREE" #x1D7DB)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR" #x1D7DC)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE" #x1D7DD)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT SIX" #x1D7DE)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN" #x1D7DF)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT" #x1D7E0)
-    ("MATHEMATICAL DOUBLE-STRUCK DIGIT NINE" #x1D7E1)
-    ("MATHEMATICAL SANS-SERIF DIGIT ZERO" #x1D7E2)
-    ("MATHEMATICAL SANS-SERIF DIGIT ONE" #x1D7E3)
-    ("MATHEMATICAL SANS-SERIF DIGIT TWO" #x1D7E4)
-    ("MATHEMATICAL SANS-SERIF DIGIT THREE" #x1D7E5)
-    ("MATHEMATICAL SANS-SERIF DIGIT FOUR" #x1D7E6)
-    ("MATHEMATICAL SANS-SERIF DIGIT FIVE" #x1D7E7)
-    ("MATHEMATICAL SANS-SERIF DIGIT SIX" #x1D7E8)
-    ("MATHEMATICAL SANS-SERIF DIGIT SEVEN" #x1D7E9)
-    ("MATHEMATICAL SANS-SERIF DIGIT EIGHT" #x1D7EA)
-    ("MATHEMATICAL SANS-SERIF DIGIT NINE" #x1D7EB)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO" #x1D7EC)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT ONE" #x1D7ED)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT TWO" #x1D7EE)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT THREE" #x1D7EF)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR" #x1D7F0)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE" #x1D7F1)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT SIX" #x1D7F2)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN" #x1D7F3)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT" #x1D7F4)
-    ("MATHEMATICAL SANS-SERIF BOLD DIGIT NINE" #x1D7F5)
-    ("MATHEMATICAL MONOSPACE DIGIT ZERO" #x1D7F6)
-    ("MATHEMATICAL MONOSPACE DIGIT ONE" #x1D7F7)
-    ("MATHEMATICAL MONOSPACE DIGIT TWO" #x1D7F8)
-    ("MATHEMATICAL MONOSPACE DIGIT THREE" #x1D7F9)
-    ("MATHEMATICAL MONOSPACE DIGIT FOUR" #x1D7FA)
-    ("MATHEMATICAL MONOSPACE DIGIT FIVE" #x1D7FB)
-    ("MATHEMATICAL MONOSPACE DIGIT SIX" #x1D7FC)
-    ("MATHEMATICAL MONOSPACE DIGIT SEVEN" #x1D7FD)
-    ("MATHEMATICAL MONOSPACE DIGIT EIGHT" #x1D7FE)
-    ("MATHEMATICAL MONOSPACE DIGIT NINE" #x1D7FF)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/E0000-E007F.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/E0000-E007F.el
deleted file mode 100644
index b4aeb1fd2b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/char-name/unicode/E0000-E007F.el
+++ /dev/null
@@ -1,99 +0,0 @@
-(nxml-define-char-name-set 'tags
-  '(("LANGUAGE TAG" #xE0001)
-    ("TAG SPACE" #xE0020)
-    ("TAG EXCLAMATION MARK" #xE0021)
-    ("TAG QUOTATION MARK" #xE0022)
-    ("TAG NUMBER SIGN" #xE0023)
-    ("TAG DOLLAR SIGN" #xE0024)
-    ("TAG PERCENT SIGN" #xE0025)
-    ("TAG AMPERSAND" #xE0026)
-    ("TAG APOSTROPHE" #xE0027)
-    ("TAG LEFT PARENTHESIS" #xE0028)
-    ("TAG RIGHT PARENTHESIS" #xE0029)
-    ("TAG ASTERISK" #xE002A)
-    ("TAG PLUS SIGN" #xE002B)
-    ("TAG COMMA" #xE002C)
-    ("TAG HYPHEN-MINUS" #xE002D)
-    ("TAG FULL STOP" #xE002E)
-    ("TAG SOLIDUS" #xE002F)
-    ("TAG DIGIT ZERO" #xE0030)
-    ("TAG DIGIT ONE" #xE0031)
-    ("TAG DIGIT TWO" #xE0032)
-    ("TAG DIGIT THREE" #xE0033)
-    ("TAG DIGIT FOUR" #xE0034)
-    ("TAG DIGIT FIVE" #xE0035)
-    ("TAG DIGIT SIX" #xE0036)
-    ("TAG DIGIT SEVEN" #xE0037)
-    ("TAG DIGIT EIGHT" #xE0038)
-    ("TAG DIGIT NINE" #xE0039)
-    ("TAG COLON" #xE003A)
-    ("TAG SEMICOLON" #xE003B)
-    ("TAG LESS-THAN SIGN" #xE003C)
-    ("TAG EQUALS SIGN" #xE003D)
-    ("TAG GREATER-THAN SIGN" #xE003E)
-    ("TAG QUESTION MARK" #xE003F)
-    ("TAG COMMERCIAL AT" #xE0040)
-    ("TAG LATIN CAPITAL LETTER A" #xE0041)
-    ("TAG LATIN CAPITAL LETTER B" #xE0042)
-    ("TAG LATIN CAPITAL LETTER C" #xE0043)
-    ("TAG LATIN CAPITAL LETTER D" #xE0044)
-    ("TAG LATIN CAPITAL LETTER E" #xE0045)
-    ("TAG LATIN CAPITAL LETTER F" #xE0046)
-    ("TAG LATIN CAPITAL LETTER G" #xE0047)
-    ("TAG LATIN CAPITAL LETTER H" #xE0048)
-    ("TAG LATIN CAPITAL LETTER I" #xE0049)
-    ("TAG LATIN CAPITAL LETTER J" #xE004A)
-    ("TAG LATIN CAPITAL LETTER K" #xE004B)
-    ("TAG LATIN CAPITAL LETTER L" #xE004C)
-    ("TAG LATIN CAPITAL LETTER M" #xE004D)
-    ("TAG LATIN CAPITAL LETTER N" #xE004E)
-    ("TAG LATIN CAPITAL LETTER O" #xE004F)
-    ("TAG LATIN CAPITAL LETTER P" #xE0050)
-    ("TAG LATIN CAPITAL LETTER Q" #xE0051)
-    ("TAG LATIN CAPITAL LETTER R" #xE0052)
-    ("TAG LATIN CAPITAL LETTER S" #xE0053)
-    ("TAG LATIN CAPITAL LETTER T" #xE0054)
-    ("TAG LATIN CAPITAL LETTER U" #xE0055)
-    ("TAG LATIN CAPITAL LETTER V" #xE0056)
-    ("TAG LATIN CAPITAL LETTER W" #xE0057)
-    ("TAG LATIN CAPITAL LETTER X" #xE0058)
-    ("TAG LATIN CAPITAL LETTER Y" #xE0059)
-    ("TAG LATIN CAPITAL LETTER Z" #xE005A)
-    ("TAG LEFT SQUARE BRACKET" #xE005B)
-    ("TAG REVERSE SOLIDUS" #xE005C)
-    ("TAG RIGHT SQUARE BRACKET" #xE005D)
-    ("TAG CIRCUMFLEX ACCENT" #xE005E)
-    ("TAG LOW LINE" #xE005F)
-    ("TAG GRAVE ACCENT" #xE0060)
-    ("TAG LATIN SMALL LETTER A" #xE0061)
-    ("TAG LATIN SMALL LETTER B" #xE0062)
-    ("TAG LATIN SMALL LETTER C" #xE0063)
-    ("TAG LATIN SMALL LETTER D" #xE0064)
-    ("TAG LATIN SMALL LETTER E" #xE0065)
-    ("TAG LATIN SMALL LETTER F" #xE0066)
-    ("TAG LATIN SMALL LETTER G" #xE0067)
-    ("TAG LATIN SMALL LETTER H" #xE0068)
-    ("TAG LATIN SMALL LETTER I" #xE0069)
-    ("TAG LATIN SMALL LETTER J" #xE006A)
-    ("TAG LATIN SMALL LETTER K" #xE006B)
-    ("TAG LATIN SMALL LETTER L" #xE006C)
-    ("TAG LATIN SMALL LETTER M" #xE006D)
-    ("TAG LATIN SMALL LETTER N" #xE006E)
-    ("TAG LATIN SMALL LETTER O" #xE006F)
-    ("TAG LATIN SMALL LETTER P" #xE0070)
-    ("TAG LATIN SMALL LETTER Q" #xE0071)
-    ("TAG LATIN SMALL LETTER R" #xE0072)
-    ("TAG LATIN SMALL LETTER S" #xE0073)
-    ("TAG LATIN SMALL LETTER T" #xE0074)
-    ("TAG LATIN SMALL LETTER U" #xE0075)
-    ("TAG LATIN SMALL LETTER V" #xE0076)
-    ("TAG LATIN SMALL LETTER W" #xE0077)
-    ("TAG LATIN SMALL LETTER X" #xE0078)
-    ("TAG LATIN SMALL LETTER Y" #xE0079)
-    ("TAG LATIN SMALL LETTER Z" #xE007A)
-    ("TAG LEFT CURLY BRACKET" #xE007B)
-    ("TAG VERTICAL LINE" #xE007C)
-    ("TAG RIGHT CURLY BRACKET" #xE007D)
-    ("TAG TILDE" #xE007E)
-    ("CANCEL TAG" #xE007F)
-    ))
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/dir b/elpa-to-submit/nxhtml/nxml-mode-20041004/dir
deleted file mode 100644
index 731aabdde7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/dir
+++ /dev/null
@@ -1,18 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir,	Node: Top	This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs manual, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu:
-
-Emacs
-* nXML Mode: (nxml-mode.info).
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-enc.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-enc.el
deleted file mode 100644
index ba75580301..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-enc.el
+++ /dev/null
@@ -1,167 +0,0 @@
-;;; nxml-enc.el --- XML encoding auto-detection
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; User entry points are nxml-start-auto-coding and
-;; nxml-stop-auto-coding.  This is separate from nxml-mode, because
-;; this cannot be autoloaded.  It may use
-;; `xmltok-get-declared-encoding-position' which can be autoloaded.
-;; It's separate from rng-auto.el so it can be byte-compiled, and
-;; because it provides independent, useful functionality.
-
-;;; Code:
-
-(defvar nxml-file-name-ignore-case
-  (memq system-type '(vax-vms windows-nt)))
-
-(defvar nxml-cached-file-name-auto-coding-regexp nil)
-(defvar nxml-cached-auto-mode-alist nil)
-
-(defun nxml-file-name-auto-coding-regexp ()
-  "Return regexp for filenames for which XML auto-coding should be done."
-  (if (eq auto-mode-alist nxml-cached-auto-mode-alist)
-      nxml-cached-file-name-auto-coding-regexp
-    (let ((alist auto-mode-alist)
-	  (case-fold-search nxml-file-name-ignore-case)
-	  regexps)
-      (setq nxml-cached-auto-mode-alist alist)
-      (while alist
-	(when (eq (cdar alist) 'nxml-mode)
-	  (setq regexps (cons (caar alist) regexps)))
-	(setq alist (cdr alist)))
-      (setq nxml-cached-file-name-auto-coding-regexp
-	    (if (null (cdr regexps))
-		(car regexps)
-	      (mapconcat (lambda (r)
-			   (concat "\\(?:" r "\\)"))
-			 regexps
-			 "\\|"))))))
-
-(defvar nxml-non-xml-set-auto-coding-function nil
-  "The function that `set-auto-coding-function' should call for non-XML files.")
-(defun nxml-set-auto-coding (file-name size)
-  (if (let ((case-fold-search nxml-file-name-ignore-case)
-	    (regexp (nxml-file-name-auto-coding-regexp)))
-	(and regexp
-	     (string-match regexp file-name)))
-      (nxml-set-xml-coding file-name size)
-    (and nxml-non-xml-set-auto-coding-function
-	 (funcall nxml-non-xml-set-auto-coding-function file-name size))))
-
-(defun nxml-set-xml-coding (file-name size)
-  "Function to use as `set-auto-coding-function' when file is known to be XML."
-  (nxml-detect-coding-system (+ (point) (min size 1024))))
-
-(defun nxml-detect-coding-system (limit)
-  (if (< limit (+ (point) 2))
-      (if (eq (char-after) 0) 'no-conversion 'utf-8)
-    (let ((first-two-chars (list (char-after)
-				 (char-after (1+ (point))))))
-      (cond ((equal first-two-chars '(#xFE #xFF))
-	     (and (coding-system-p 'utf-16-be) 'utf-16-be))
-	    ((equal first-two-chars '(#xFF #xFE))
-	     (and (coding-system-p 'utf-16-le) 'utf-16-le))
-	    ((memq 0 first-two-chars)
-	     ;; Certainly not well-formed XML;
-	     ;; perhaps UTF-16 without BOM.
-	     ;; In any case, we can't handle it.
-	     ;; no-conversion gives the user a chance to fix it.
-	     'no-conversion)
-	    ;; There are other things we might try here in the future
-	    ;; eg UTF-8 BOM, UTF-16 with no BOM 
-	    ;; translate to EBCDIC
-	    (t
-	     (let ((enc-pos (xmltok-get-declared-encoding-position limit)))
-	       (cond ((consp enc-pos)
-		      (or (nxml-mime-charset-coding-system
-			   (buffer-substring-no-properties (car enc-pos)
-							   (cdr enc-pos)))
-			  ;; We have an encoding whose name we don't recognize.
-			  ;; What to do?
-			  ;; raw-text seems the best bet: since we got
-			  ;; the XML decl it must be a superset of ASCII,
-			  ;; so we don't need to go to no-conversion
-			  'raw-text))
-		     (enc-pos 'utf-8)
-		     ;; invalid XML declaration
-		     (t nil))))))))
-
-(defun nxml-mime-charset-coding-system (charset)
-  (let ((charset-sym (intern (downcase charset)))
-	(coding-systems (coding-system-list t))
-	coding-system ret)
-    (while (and coding-systems (not ret))
-      (setq coding-system (car coding-systems))
-      (if (eq (coding-system-get coding-system 'mime-charset)
-	      charset-sym)
-	  (setq ret coding-system)
-	(setq coding-systems (cdr coding-systems))))
-    ret))
-
-(defun nxml-start-auto-coding ()
-  "Do encoding auto-detection as specified in the XML standard.
-Applied to any files that `auto-mode-alist' says should be handled by
-`nxml-mode'."
-  (interactive)
-  (unless (eq set-auto-coding-function 'nxml-set-auto-coding)
-    (let ((inhibit-quit t))
-      (setq nxml-non-xml-set-auto-coding-function set-auto-coding-function)
-      (setq set-auto-coding-function 'nxml-set-auto-coding))))
-
-(defun nxml-stop-auto-coding ()
-  "Stop doing encoding auto-detection as specified in the XML standard."
-  (interactive)
-  (when (eq set-auto-coding-function 'nxml-set-auto-coding)
-    (let ((inhibit-quit t))
-      (setq set-auto-coding-function nxml-non-xml-set-auto-coding-function)
-      (setq nxml-non-xml-set-auto-coding-function nil))))
-
-(unless (coding-system-p 'us-ascii)
-  (make-coding-system
-   ;; Unicode Emacs uses ?- last time I looked
-   'us-ascii 2 ?-
-   "ISO 2022 based 7-bit encoding for ASCII (MIME:US-ASCII)"
-   '(ascii)
-   '((safe-charsets ascii)
-     (mime-charset . us-ascii))))
-
-;; Emacs 21.3.50 makes us-ascii an alias for iso-safe without
-;; giving it a mime-charset property.
-(unless (coding-system-get 'us-ascii 'mime-charset)
-  (coding-system-put 'us-ascii 'mime-charset 'us-ascii))
-
-;; Work around bug in Emacs 21.3
-
-(when (and (coding-system-p 'utf-16-le)
-	   (eq (coding-system-get 'utf-16-le 'pre-write-conversion)
-	       'utf-16-le-pre-write-conversion))
-  (coding-system-put 'utf-16-le 'pre-write-conversion nil))
-
-(when (and (coding-system-p 'utf-16-le)
-	   (eq (coding-system-get 'utf-16-be 'pre-write-conversion)
-	       'utf-16-be-pre-write-conversion))
-  (coding-system-put 'utf-16-be 'pre-write-conversion nil))
-
-(provide 'nxml-enc)
-
-;;; nxml-enc.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-glyph.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-glyph.el
deleted file mode 100644
index b5a70b2694..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-glyph.el
+++ /dev/null
@@ -1,418 +0,0 @@
-;;; nxml-glyph.el --- glyph-handling for nxml-mode
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; The entry point to this file is `nxml-glyph-display-string'.
-;; The current implementation is heuristic due to a lack of
-;; Emacs primitives necessary to implement it properly.  The user
-;; can tweak the heuristics using `nxml-glyph-set-hook'.
-
-;;; Code:
-
-(defconst nxml-ascii-glyph-set
-  [(#x0020 . #x007E)])
-
-(defconst nxml-latin1-glyph-set
-  [(#x0020 . #x007E)
-   (#x00A0 . #x00FF)])
-
-;; These were generated by using nxml-insert-target-repertoire-glyph-set
-;; on the TARGET[123] files in
-;; http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz
-
-(defconst nxml-misc-fixed-1-glyph-set
-  [(#x0020 . #x007E)
-   (#x00A0 . #x00FF)
-   (#x0100 . #x017F)
-   #x018F #x0192
-   (#x0218 . #x021B)
-   #x0259
-   (#x02C6 . #x02C7)
-   (#x02D8 . #x02DD)
-   (#x0374 . #x0375)
-   #x037A #x037E
-   (#x0384 . #x038A)
-   #x038C
-   (#x038E . #x03A1)
-   (#x03A3 . #x03CE)
-   (#x0401 . #x040C)
-   (#x040E . #x044F)
-   (#x0451 . #x045C)
-   (#x045E . #x045F)
-   (#x0490 . #x0491)
-   (#x05D0 . #x05EA)
-   (#x1E02 . #x1E03)
-   (#x1E0A . #x1E0B)
-   (#x1E1E . #x1E1F)
-   (#x1E40 . #x1E41)
-   (#x1E56 . #x1E57)
-   (#x1E60 . #x1E61)
-   (#x1E6A . #x1E6B)
-   (#x1E80 . #x1E85)
-   (#x1EF2 . #x1EF3)
-   (#x2010 . #x2022)
-   #x2026 #x2030
-   (#x2039 . #x203A)
-   #x20AC #x2116 #x2122 #x2126
-   (#x215B . #x215E)
-   (#x2190 . #x2193)
-   #x2260
-   (#x2264 . #x2265)
-   (#x23BA . #x23BD)
-   (#x2409 . #x240D)
-   #x2424 #x2500 #x2502 #x250C #x2510 #x2514 #x2518 #x251C #x2524 #x252C #x2534 #x253C #x2592 #x25C6 #x266A #xFFFD]
-  "Glyph set for TARGET1 glyph repertoire of misc-fixed-* font.
-This repertoire is supported for the bold and oblique fonts.")
-
-(defconst nxml-misc-fixed-2-glyph-set
-  [(#x0020 . #x007E)
-   (#x00A0 . #x00FF)
-   (#x0100 . #x017F)
-   #x018F #x0192
-   (#x01FA . #x01FF)
-   (#x0218 . #x021B)
-   #x0259
-   (#x02C6 . #x02C7)
-   #x02C9
-   (#x02D8 . #x02DD)
-   (#x0300 . #x0311)
-   (#x0374 . #x0375)
-   #x037A #x037E
-   (#x0384 . #x038A)
-   #x038C
-   (#x038E . #x03A1)
-   (#x03A3 . #x03CE)
-   #x03D1
-   (#x03D5 . #x03D6)
-   #x03F1
-   (#x0401 . #x040C)
-   (#x040E . #x044F)
-   (#x0451 . #x045C)
-   (#x045E . #x045F)
-   (#x0490 . #x0491)
-   (#x05D0 . #x05EA)
-   (#x1E02 . #x1E03)
-   (#x1E0A . #x1E0B)
-   (#x1E1E . #x1E1F)
-   (#x1E40 . #x1E41)
-   (#x1E56 . #x1E57)
-   (#x1E60 . #x1E61)
-   (#x1E6A . #x1E6B)
-   (#x1E80 . #x1E85)
-   (#x1EF2 . #x1EF3)
-   (#x2010 . #x2022)
-   #x2026 #x2030
-   (#x2032 . #x2034)
-   (#x2039 . #x203A)
-   #x203C #x203E #x2044
-   (#x2070 . #x2071)
-   (#x2074 . #x208E)
-   (#x20A3 . #x20A4)
-   #x20A7 #x20AC
-   (#x20D0 . #x20D7)
-   #x2102 #x2105 #x2113
-   (#x2115 . #x2116)
-   #x211A #x211D #x2122 #x2124 #x2126 #x212E
-   (#x215B . #x215E)
-   (#x2190 . #x2195)
-   (#x21A4 . #x21A8)
-   (#x21D0 . #x21D5)
-   (#x2200 . #x2209)
-   (#x220B . #x220C)
-   #x220F
-   (#x2211 . #x2213)
-   #x2215
-   (#x2218 . #x221A)
-   (#x221D . #x221F)
-   #x2221
-   (#x2224 . #x222B)
-   #x222E #x223C #x2243 #x2245
-   (#x2248 . #x2249)
-   #x2259
-   (#x225F . #x2262)
-   (#x2264 . #x2265)
-   (#x226A . #x226B)
-   (#x2282 . #x228B)
-   #x2295 #x2297
-   (#x22A4 . #x22A7)
-   (#x22C2 . #x22C3)
-   #x22C5 #x2300 #x2302
-   (#x2308 . #x230B)
-   #x2310
-   (#x2320 . #x2321)
-   (#x2329 . #x232A)
-   (#x23BA . #x23BD)
-   (#x2409 . #x240D)
-   #x2424 #x2500 #x2502 #x250C #x2510 #x2514 #x2518 #x251C #x2524 #x252C #x2534 #x253C
-   (#x254C . #x2573)
-   (#x2580 . #x25A1)
-   (#x25AA . #x25AC)
-   (#x25B2 . #x25B3)
-   #x25BA #x25BC #x25C4 #x25C6
-   (#x25CA . #x25CB)
-   #x25CF
-   (#x25D8 . #x25D9)
-   #x25E6
-   (#x263A . #x263C)
-   #x2640 #x2642 #x2660 #x2663
-   (#x2665 . #x2666)
-   (#x266A . #x266B)
-   (#xFB01 . #xFB02)
-   #xFFFD]
-  "Glyph set for TARGET2 glyph repertoire of the misc-fixed-* fonts.
-This repertoire is supported for the following fonts:
-5x7.bdf 5x8.bdf 6x9.bdf 6x10.bdf 6x12.bdf 7x13.bdf 7x14.bdf clR6x12.bdf")
-
-(defconst nxml-misc-fixed-3-glyph-set
-  [(#x0020 . #x007E)
-   (#x00A0 . #x00FF)
-   (#x0100 . #x01FF)
-   (#x0200 . #x0220)
-   (#x0222 . #x0233)
-   (#x0250 . #x02AD)
-   (#x02B0 . #x02EE)
-   (#x0300 . #x034F)
-   (#x0360 . #x036F)
-   (#x0374 . #x0375)
-   #x037A #x037E
-   (#x0384 . #x038A)
-   #x038C
-   (#x038E . #x03A1)
-   (#x03A3 . #x03CE)
-   (#x03D0 . #x03F6)
-   (#x0400 . #x0486)
-   (#x0488 . #x04CE)
-   (#x04D0 . #x04F5)
-   (#x04F8 . #x04F9)
-   (#x0500 . #x050F)
-   (#x0531 . #x0556)
-   (#x0559 . #x055F)
-   (#x0561 . #x0587)
-   (#x0589 . #x058A)
-   (#x05B0 . #x05B9)
-   (#x05BB . #x05C4)
-   (#x05D0 . #x05EA)
-   (#x05F0 . #x05F4)
-   (#x10D0 . #x10F8)
-   #x10FB
-   (#x1E00 . #x1E9B)
-   (#x1EA0 . #x1EF9)
-   (#x1F00 . #x1F15)
-   (#x1F18 . #x1F1D)
-   (#x1F20 . #x1F45)
-   (#x1F48 . #x1F4D)
-   (#x1F50 . #x1F57)
-   #x1F59 #x1F5B #x1F5D
-   (#x1F5F . #x1F7D)
-   (#x1F80 . #x1FB4)
-   (#x1FB6 . #x1FC4)
-   (#x1FC6 . #x1FD3)
-   (#x1FD6 . #x1FDB)
-   (#x1FDD . #x1FEF)
-   (#x1FF2 . #x1FF4)
-   (#x1FF6 . #x1FFE)
-   (#x2000 . #x200A)
-   (#x2010 . #x2027)
-   (#x202F . #x2052)
-   #x2057
-   (#x205F . #x2063)
-   (#x2070 . #x2071)
-   (#x2074 . #x208E)
-   (#x20A0 . #x20B1)
-   (#x20D0 . #x20EA)
-   (#x2100 . #x213A)
-   (#x213D . #x214B)
-   (#x2153 . #x2183)
-   (#x2190 . #x21FF)
-   (#x2200 . #x22FF)
-   (#x2300 . #x23CE)
-   (#x2400 . #x2426)
-   (#x2440 . #x244A)
-   (#x2500 . #x25FF)
-   (#x2600 . #x2613)
-   (#x2616 . #x2617)
-   (#x2619 . #x267D)
-   (#x2680 . #x2689)
-   (#x27E6 . #x27EB)
-   (#x27F5 . #x27FF)
-   (#x2A00 . #x2A06)
-   #x2A1D #x2A3F #x303F
-   (#xFB00 . #xFB06)
-   (#xFB13 . #xFB17)
-   (#xFB1D . #xFB36)
-   (#xFB38 . #xFB3C)
-   #xFB3E
-   (#xFB40 . #xFB41)
-   (#xFB43 . #xFB44)
-   (#xFB46 . #xFB4F)
-   (#xFE20 . #xFE23)
-   (#xFF61 . #xFF9F)
-   #xFFFD]
-  "Glyph set for TARGET3 glyph repertoire of the misc-fixed-* fonts.
-This repertoire is supported for the following fonts:
-6x13.bdf 8x13.bdf 9x15.bdf 9x18.bdf 10x20.bdf")
-  
-(defconst nxml-wgl4-glyph-set
-  [(#x0020 . #x007E)
-   (#x00A0 . #x017F)
-   #x0192
-   (#x01FA . #x01FF)
-   (#x02C6 . #x02C7)
-   #x02C9
-   (#x02D8 . #x02DB)
-   #x02DD
-   (#x0384 . #x038A)
-   #x038C
-   (#x038E . #x03A1)
-   (#x03A3 . #x03CE)
-   (#x0401 . #x040C)
-   (#x040E . #x044F)
-   (#x0451 . #x045C)
-   (#x045E . #x045F)
-   (#x0490 . #x0491)
-   (#x1E80 . #x1E85)
-   (#x1EF2 . #x1EF3)
-   (#x2013 . #x2015)
-   (#x2017 . #x201E)
-   (#x2020 . #x2022)
-   #x2026 #x2030
-   (#x2032 . #x2033)
-   (#x2039 . #x203A)
-   #x203C #x203E #x2044 #x207F
-   (#x20A3 . #x20A4)
-   #x20A7 #x20AC #x2105 #x2113 #x2116 #x2122 #x2126 #x212E
-   (#x215B . #x215E)
-   (#x2190 . #x2195)
-   #x21A8 #x2202 #x2206 #x220F
-   (#x2211 . #x2212)
-   #x2215
-   (#x2219 . #x221A)
-   (#x221E . #x221F)
-   #x2229 #x222B #x2248
-   (#x2260 . #x2261)
-   (#x2264 . #x2265)
-   #x2302 #x2310
-   (#x2320 . #x2321)
-   #x2500 #x2502 #x250C #x2510 #x2514 #x2518 #x251C #x2524
-   #x252C #x2534 #x253C
-   (#x2550 . #x256C)
-   #x2580 #x2584 #x2588 #x258C
-   (#x2590 . #x2593)
-   (#x25A0 . #x25A1)
-   (#x25AA . #x25AC)
-   #x25B2 #x25BA #x25BC #x25C4
-   (#x25CA . #x25CB)
-   #x25CF
-   (#x25D8 . #x25D9)
-   #x25E6
-   (#x263A . #x263C)
-   #x2640 #x2642 #x2660 #x2663
-   (#x2665 . #x2666)
-   (#x266A . #x266B)
-   (#xFB01 . #xFB02)]
-  "Glyph set corresponding to Windows Glyph List 4.")
-
-(defvar nxml-glyph-set-hook nil
-  "*Hook for determining the set of glyphs in a face.
-The hook will receive a single argument FACE.  If it can determine the
-set of glyphs representable by FACE, it must set the variable
-`nxml-glyph-set' and return non-nil.  Otherwise, it must return
-nil. The hook will be run until success.  The constants
-`nxml-ascii-glyph-set', `nxml-latin1-glyph-set',
-`nxml-misc-fixed-1-glyph-set', `nxml-misc-fixed-2-glyph-set',
-`nxml-misc-fixed-3-glyph-set' and `nxml-wgl4-glyph-set' are predefined
-for use by `nxml-glyph-set-hook'.")
-
-(defvar nxml-glyph-set nil
-  "Used by `nxml-glyph-set-hook' to return set of glyphs in a FACE.
-This should dynamically bound by any function that runs
-`nxml-glyph-set-hook'.  The value must be either nil representing an
-empty set or a vector. Each member of the vector is either a single
-integer or a cons (FIRST . LAST) representing the range of integers
-from FIRST to LAST.  An integer represents a glyph with that Unicode
-code-point.  The vector must be ordered.")
-
-(defun nxml-x-set-glyph-set (face)
-  (setq nxml-glyph-set
-	(if (equal (face-attribute face :family) "misc-fixed")
-	    nxml-misc-fixed-3-glyph-set
-	  nxml-wgl4-glyph-set)))
-
-(defun nxml-w32-set-glyph-set (face)
-  (setq nxml-glyph-set nxml-wgl4-glyph-set))
-
-(defun nxml-window-system-set-glyph-set (face)
-  (setq nxml-glyph-set nxml-latin1-glyph-set))
-
-(defun nxml-terminal-set-glyph-set (face)
-  (setq nxml-glyph-set nxml-ascii-glyph-set))
-
-(add-hook 'nxml-glyph-set-hook
-	  (or (cdr (assq window-system
-			 '((x . nxml-x-set-glyph-set)
-			   (w32 . nxml-w32-set-glyph-set)
-			   (nil . nxml-terminal-set-glyph-set))))
-	      'nxml-window-system-set-glyph-set)
-	  t)
-
-;;;###autoload
-(defun nxml-glyph-display-string (n face)
-  "Return a string that can display a glyph for Unicode code-point N.
-FACE gives the face that will be used for displaying the string.
-Return nil if the face cannot display a glyph for N."
-  (let ((nxml-glyph-set nil))
-    (run-hook-with-args-until-success 'nxml-glyph-set-hook face)
-    (and nxml-glyph-set
-	 (nxml-glyph-set-contains-p n nxml-glyph-set)
-	 (let ((ch (decode-char 'ucs n)))
-	   (and ch (string ch))))))
-      
-(defun nxml-glyph-set-contains-p (n v)
-  (let ((start 0)
-	(end (length v))
-	found mid mid-val mid-start-val mid-end-val)
-    (while (> end start)
-      (setq mid (+ start
-		   (/ (- end start) 2)))
-      (setq mid-val (aref v mid))
-      (if (consp mid-val)
-	  (setq mid-start-val (car mid-val)
-		mid-end-val (cdr mid-val))
-	(setq mid-start-val mid-val
-	      mid-end-val mid-val))
-      (cond ((and (<= mid-start-val n)
-		  (<= n mid-end-val))
-	     (setq found t)
-	     (setq start end))
-	    ((< n mid-start-val)
-	     (setq end mid))
-	    (t
-	     (setq start
-		   (if (eq start mid)
-		       end
-		     mid)))))
-    found))
-
-(provide 'nxml-glyph)
-
-;;; nxml-glyph.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-maint.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-maint.el
deleted file mode 100644
index 015c0c7dad..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-maint.el
+++ /dev/null
@@ -1,106 +0,0 @@
-;;; nxml-maint.el --- commands for maintainers of nxml-*.el
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-;;; Generating files with Unicode char names.
-
-(require 'nxml-uchnm)
-
-(defun nxml-create-unicode-char-name-sets (file)
-  "Generate files containing char names from Unicode standard."
-  (interactive "fUnicodeData file: ")
-  (mapcar (lambda (block)
-	    (let ((nameset (nxml-unicode-block-char-name-set (nth 0 block))))
-	      (save-excursion
-		(find-file (concat (get nameset 'nxml-char-name-set-file)
-				   ".el"))
-		(erase-buffer)
-		(insert "(nxml-define-char-name-set '")
-		(prin1 nameset (current-buffer))
-		(insert "\n  '())\n")
-		(goto-char (- (point) 3)))))
-	  nxml-unicode-blocks)
-  (save-excursion
-    (find-file file)
-    (goto-char (point-min))
-    (let ((blocks nxml-unicode-blocks)
-	  code name)
-      (while (re-search-forward "^\\([0-9A-F]+\\);\\([^<;][^;]*\\);"
-				nil
-				t)
-	(setq code (string-to-number (match-string 1) 16))
-	(setq name (match-string 2))
-	(while (and blocks
-		    (> code (nth 2 (car blocks))))
-	  (setq blocks (cdr blocks)))
-	(when (and (<= (nth 1 (car blocks)) code)
-		   (<= code (nth 2 (car blocks))))
-	  (save-excursion
-	    (find-file (concat (get (nxml-unicode-block-char-name-set
-				     (nth 0 (car blocks)))
-				    'nxml-char-name-set-file)
-			       ".el"))
-	    (insert "(")
-	    (prin1 name (current-buffer))
-	    (insert (format " #x%04X)\n    " code))))))))
-
-;;; Parsing target repertoire files from ucs-fonts.
-;; This is for converting the TARGET? files in
-;; http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz
-;; into a glyph set.
-
-(defun nxml-insert-target-repertoire-glyph-set (file var)
-  (interactive "fTarget file: \nSVariable name: ")
-  (let (lst head)
-    (save-excursion
-      (set-buffer (find-file-noselect file))
-      (goto-char (point-min))
-      (while (re-search-forward "^ *\\([a-FA-F0-9]\\{2\\}\\)[ \t]+" nil t)
-	(let ((row (match-string 1))
-	      (eol (save-excursion (end-of-line) (point))))
-	  (while (re-search-forward "\\([a-FA-F0-9]\\{2\\}\\)-\\([a-FA-F0-9]\\{2\\}\\)\\|\\([a-FA-F0-9]\\{2\\}\\)" eol t)
-	    (setq lst
-		  (cons (if (match-beginning 3)
-			    (concat "#x" row (match-string 3))
-			(concat "(#x" row (match-string 1)
-				" . #x" row (match-string 2) ")"))
-			lst))))))
-    (setq lst (nreverse lst))
-    (insert (format "(defconst %s\n  [" var))
-    (while lst
-      (setq head (car lst))
-      (setq lst (cdr lst))
-      (insert head)
-      (when (= (length head) 6)
-	(while (and lst (= (length (car lst)) 6))
-	  (insert " ")
-	  (insert (car lst))
-	  (setq lst (cdr lst))))
-      (when lst (insert "\n   ")))
-    (insert "])\n")))
-
-(provide 'nxml-maint)
-
-;;; nxml-maint.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode-new.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode-new.el
deleted file mode 100644
index c40b76fcdf..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode-new.el
+++ /dev/null
@@ -1,2706 +0,0 @@
-;;; nxml-mode.el --- a new XML mode
-
-;; ****** THIS IS A MODIFIED VERSION!!!!! ********************
-
-;; This version of nxml-mode.el have been slightly modified to support
-;; nxmlhref.el.  The modifications are small and you find them easily
-;; by searching for "href".
-;;
-;; IMPORTANT: When you compile this file be sure to use the Makefile
-;; that comes with nxml.
-;;
-;; Modifications are done by the author of nxmlhref.el.
-
-;; ***********************************************************
-
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; To use this include rng-auto.el in your .emacs.
-
-;; See nxml-rap.el for description of parsing strategy.
-
-;; The font locking here is independent of font-lock.el.  We want to
-;; do more sophisticated handling of changes and we want to use the
-;; same xmltok rather than regexps for parsing so that we parse
-;; consistently and correctly.
-
-;;; Code:
-
-(when (featurep 'mucs)
-  (error "nxml-mode is not compatible with Mule-UCS"))
-
-(require 'xmltok)
-(require 'nxml-enc)
-(require 'nxml-glyph)
-(require 'nxml-util)
-(require 'nxml-rap)
-(require 'nxml-outln)
-
-;;; Customization
-
-(defgroup nxml nil
-  "New XML editing mode"
-  :group 'languages
-  :group 'wp)
-
-(defgroup nxml-highlighting-faces nil
-  "Faces for XML syntax highlighting."
-  :group 'nxml
-  :group 'font-lock-highlighting-faces)
-
-(defcustom nxml-syntax-highlight-flag t
-  "*Non-nil means nxml-mode should perform syntax highlighting."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-char-ref-display-glyph-flag t
-  "*Non-nil means display glyph following character reference.
-The glyph is displayed in `nxml-glyph-face'.  The hook
-`nxml-glyph-set-hook' can be used to customize for which characters
-glyphs are displayed."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-mode-hook nil
-  "Hook run by command `nxml-mode'."
-  :group 'nxml
-  :type 'hook)
-
-(defcustom nxml-sexp-element-flag nil
-  "*Non-nil means sexp commands treat an element as a single expression."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-slash-auto-complete-flag nil
-  "*Non-nil means typing a slash automatically completes the end-tag.
-This is used by `nxml-electric-slash'."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-child-indent 2
-  "*Indentation for the children of an element relative to the start-tag.
-This only applies when the line or lines containing the start-tag contains
-nothing else other than that start-tag."
-  :group 'nxml
-  :type 'integer)
-
-(defcustom nxml-attribute-indent 4
-  "*Indentation for the attributes of an element relative to the start-tag.
-This only applies when the first attribute of a tag starts a line. In other
-cases, the first attribute on one line is indented the same as the first
-attribute on the previous line."
-  :group 'nxml
-  :type 'integer)
-
-(defvar nxml-fontify-chunk-size 500)
-
-(defcustom nxml-bind-meta-tab-to-complete-flag (not window-system)
-  "*Non-nil means bind M-TAB in `nxml-mode-map' to `nxml-complete'.
-C-return will be bound to `nxml-complete' in any case.
-M-TAB gets swallowed by many window systems/managers, and
-`documentation' will show M-TAB rather than C-return as the
-binding `rng-complete' when both are bound.  So it's better
-to bind M-TAB only when it will work."
-  :group 'nxml
-  :set (lambda (sym flag)
-	 (set-default sym flag)
-	 (when (and (boundp 'nxml-mode-map) nxml-mode-map)
-	   (define-key nxml-mode-map "\M-\t" (and flag 'nxml-complete))))
-  :type 'boolean)
-
-(defcustom nxml-prefer-utf-16-to-utf-8-flag nil
-  "*Non-nil means prefer UTF-16 to UTF-8 when saving a buffer.
-This is used only when a buffer does not contain an encoding declaration
-and when its current `buffer-file-coding-system' specifies neither UTF-16
-nor UTF-8."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-prefer-utf-16-little-to-big-endian-flag (eq system-type
-							    'windows-nt)
-  "*Non-nil means prefer little-endian to big-endian byte-order for UTF-16.
-This is used only for saving a buffer; when reading the byte-order is
-auto-detected. It may be relevant both when there is no encoding declaration
-and when the encoding declaration specifies `UTF-16'."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-default-buffer-file-coding-system nil
-  "*Default value for `buffer-file-coding-system' for a buffer for a new file.
-Nil means use the default value of `buffer-file-coding-system' as normal.
-A buffer's `buffer-file-coding-system' affects what \\[nxml-insert-xml-declaration] inserts."
-  :group 'nxml
-  :type 'coding-system)
-
-(defcustom nxml-auto-insert-xml-declaration-flag nil
-  "*Non-nil means automatically insert an XML declaration in a new file.
-The XML declaration is inserted using `nxml-insert-xml-declaration'."
-  :group 'nxml
-  :type 'boolean)
-
-;; The following are the colors we use with a light background.
-;; The two blues have the same hue but contrasting saturation/value.
-;; The hue of the green is 120 degrees different from that of the
-;; blue.  The red used for highlighting errors is 120 degrees
-;; different again.  We use the light blue only for refs and
-;; delimiters, since these are short (long stretches in a light color
-;; would be too hard to read).  The dark blue is closest to black
-;; (which we use by default for text), so we use it for attribute
-;; values, which are similar to text.
-
-(defconst nxml-light-blue-color "#9292C9") ; hue 240
-(defconst nxml-dark-blue-color "#3A3A7B") ; hue 240
-(defconst nxml-green-color "#257A25") ; hue 120
-
-;; Similar principles apply with a dark background.  However,
-;; we switch green and blue, because darker blues are very hard to
-;; read (for me anyway) on a dark background.
-
-(defconst nxml-sky-blue-color "#ACACFC") ; hue 240
-(defconst nxml-dark-green-color "#00AD00") ; hue 120
-(defconst nxml-light-green-color "#70F170") ; hue 120
-
-(defface nxml-delimited-data-face
-  `((((class color) (background light)) (:foreground ,nxml-dark-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-light-green-color)))
-  "Face used to highlight data enclosed between delimiters.
-By default, this is inherited by `nxml-attribute-value-face'
-and `nxml-processing-instruction-content-face'."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-name-face
-  `((((class color) (background light)) (:foreground ,nxml-green-color))
-    (((class color) (background dark)) (:foreground ,nxml-sky-blue-color)))
-  "Face used to highlight various names.
-This includes element and attribute names, processing
-instruction targets and the CDATA keyword in a CDATA section.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-ref-face
-  `((((class color) (background light)) (:foreground ,nxml-light-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-dark-green-color)))
-  "Face used to highlight character and entity references.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-delimiter-face
-  `((((class color) (background light)) (:foreground ,nxml-light-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-dark-green-color))
-    (t (:bold t)))
-  "Face used to highlight delimiters.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-text-face
-  nil
-  "Face used to highlight text."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-comment-content-face
-  '((t (:italic t)))
-  "Face used to highlight the content of comments."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-comment-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of comments, i.e <!-- and -->."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of processing instructions, i.e <? and ?>."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-target-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the target of processing instructions."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-content-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the content of processing instructions."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of CDATA sections, i.e <![, [, and ]]>."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-CDATA-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the CDATA keyword in CDATA sections."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-content-face
-  '((t (:inherit nxml-text-face)))
-  "Face used for the content of CDATA sections."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-char-ref-number-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the number in character references.
-This includes ths `x' in hex references."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-char-ref-delimiter-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the delimiters of character references, i.e &# and ;."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-entity-ref-name-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the entity name in general entity references."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-entity-ref-delimiter-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the delimiters of entity references, i.e & and ;."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-tag-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the angle brackets delimiting tags.
-`nxml-tag-slash-face' is used for slashes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-tag-slash-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for slashes in tags, both in end-tags and empty-elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix of elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in element names."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-local-name-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the local name of elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in attribute names."
-  :group 'nxml-highlighting-faces)
-  
-(defface nxml-attribute-local-name-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the local name of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-xmlns-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for `xmlns' in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix declared in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-value-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the value of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-value-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of attribute values."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-value-face
-  '((t (:inherit nxml-attribute-value-face)))
-  "Face used for the value of namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-value-delimiter-face
-  '((t (:inherit nxml-attribute-value-delimiter-face)))
-  "Face used for the delimiters of namespace attribute values."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-literal-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of literals in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-literal-content-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the content of literals in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-keyword-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for keywords in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-markup-declaration-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of markup declarations in the prolog.
-The delimiters are <! and >."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-hash-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for # before a name in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-glyph-face
-  '((((type x))
-     (:family
-      "misc-fixed"
-      :background
-      "light grey"
-      :foreground
-      "black"
-      :weight
-      normal 
-      :slant
-      normal))
-    (t
-     (:background
-      "light grey"
-      :foreground
-      "black"
-      :weight
-      normal 
-      :slant
-      normal)))
-  "Face used for glyph for char references."
-  :group 'nxml-highlighting-faces)
-
-;;; Global variables
-
-;; This is initialized in rng-auto.el.
-(defvar nxml-version nil
-  "*The version of nxml-mode that is being used.")
-
-(defvar nxml-prolog-regions nil
-  "List of regions in the prolog to be fontified.
-See the function `xmltok-forward-prolog' for more information.")
-(make-variable-buffer-local 'nxml-prolog-regions)
-
-(defvar nxml-last-fontify-end nil
-  "Position where fontification last ended.
-Nil if the buffer changed since the last fontification.")
-(make-variable-buffer-local 'nxml-last-fontify-end)
-
-(defvar nxml-degraded nil
-  "Non-nil if currently operating in degraded mode.
-Degraded mode is enabled when an internal error is encountered in the
-fontification or after-change functions.")
-(make-variable-buffer-local 'nxml-degraded)
-
-(defvar nxml-completion-hook nil
-  "Hook run by `nxml-complete'.
-This hook is run until success.")
-
-(defvar nxml-in-mixed-content-hook nil
-  "Hook to determine whether point is in mixed content.
-The hook is called without arguments.  It should return nil if it is
-definitely not mixed; non-nil otherwise.  The hook will be run until
-one of the functions returns nil.")
-
-(defvar nxml-mixed-scan-distance 4000
-  "Maximum distance from point to scan when checking for mixed content.")
-
-(defvar nxml-end-tag-indent-scan-distance 4000
-  "Maximum distance from point to scan backwards when indenting end-tag.")
-
-(defvar nxml-char-ref-extra-display t
-  "Non-nil means display extra information for character references.
-The extra information consists of a tooltip with the character name
-and, if `nxml-char-ref-display-glyph-flag' is non-nil, a glyph
-corresponding to the referenced character following the character
-reference.")
-(make-variable-buffer-local 'nxml-char-ref-extra-display)
-
-(defvar nxml-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\M-\C-u" 'nxml-backward-up-element)
-    (define-key map "\M-\C-d" 'nxml-down-element)
-    (define-key map "\M-\C-n" 'nxml-forward-element)
-    (define-key map "\M-\C-p" 'nxml-backward-element)
-    (define-key map "\M-{" 'nxml-backward-paragraph)
-    (define-key map "\M-}" 'nxml-forward-paragraph)
-    (define-key map "\M-h" 'nxml-mark-paragraph)
-    (define-key map "\C-c\C-f" 'nxml-finish-element)
-    (define-key map "\C-c\C-m" 'nxml-split-element)
-    (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block)
-    (define-key map "\C-c\C-i" 'nxml-balanced-close-start-tag-inline)
-    (define-key map "\C-c\C-x" 'nxml-insert-xml-declaration)
-    (define-key map "\C-c\C-d" 'nxml-dynamic-markup-word)
-    ;; u is for Unicode
-    (define-key map "\C-c\C-u" 'nxml-insert-named-char)
-    (define-key map "\C-c\C-o" nxml-outline-prefix-map)
-    (define-key map [S-mouse-2] 'nxml-mouse-hide-direct-text-content)
-    (define-key map "/" 'nxml-electric-slash)
-    (define-key map [C-return] 'nxml-complete) 
-    (when nxml-bind-meta-tab-to-complete-flag
-      (define-key map "\M-\t" 'nxml-complete))
-    map)
-  "Keymap for nxml-mode.")
-
-(defsubst nxml-set-face (start end face)
-  (when (and face (< start end))
-    (put-text-property start end 'face face)))
-
-(defun nxml-clear-face (start end)
-  (remove-text-properties start end '(face nil))
-  (nxml-clear-char-ref-extra-display start end))
-
-(defsubst nxml-set-fontified (start end)
-  (put-text-property start end 'fontified t))
-
-(defsubst nxml-clear-fontified (start end)
-  (remove-text-properties start end '(fontified nil)))
-
-;;;###autoload
-(defun nxml-mode ()
-  ;; We use C-c C-i instead of \\[nxml-balanced-close-start-tag-inline]
-  ;; because Emacs turns C-c C-i into C-c TAB which is hard to type and
-  ;; not mnemonic.
-  "Major mode for editing XML.
-
-Syntax highlighting is performed unless the variable
-`nxml-syntax-highlight-flag' is nil.
-
-\\[nxml-finish-element] finishes the current element by inserting an end-tag.
-C-c C-i closes a start-tag with `>' and then inserts a balancing end-tag
-leaving point between the start-tag and end-tag. 
-\\[nxml-balanced-close-start-tag-block] is similar but for block rather than inline elements:
-the start-tag, point, and end-tag are all left on separate lines.
-If `nxml-slash-auto-complete-flag' is non-nil, then inserting a `</'
-automatically inserts the rest of the end-tag.
-
-\\[nxml-complete] performs completion on the symbol preceding point.
-
-\\[nxml-dynamic-markup-word] uses the contents of the current buffer
-to choose a tag to put around the word preceding point.
-
-Sections of the document can be displayed in outline form.  The
-variable `nxml-section-element-name-regexp' controls when an element
-is recognized as a section.  The same key sequences that change
-visibility in outline mode are used except that they start with C-c C-o
-instead of C-c.
-
-Validation is provided by the related minor-mode `rng-validate-mode'.
-This also makes completion schema- and context- sensitive.  Element
-names, attribute names, attribute values and namespace URIs can all be
-completed. By default, `rng-validate-mode' is automatically enabled by
-`rng-nxml-mode-init' which is normally added to `nxml-mode-hook'. You
-can toggle it using \\[rng-validate-mode].
-
-\\[indent-for-tab-command] indents the current line appropriately.
-This can be customized using the variable `nxml-child-indent'
-and the variable `nxml-attribute-indent'.
-
-\\[nxml-insert-named-char] inserts a character reference using
-the character's name (by default, the Unicode name). \\[universal-argument] \\[nxml-insert-named-char]
-inserts the character directly.
-
-The Emacs commands that normally operate on balanced expressions will
-operate on XML markup items.  Thus \\[forward-sexp] will move forward
-across one markup item; \\[backward-sexp] will move backward across
-one markup item; \\[kill-sexp] will kill the following markup item;
-\\[mark-sexp] will mark the following markup item.  By default, each
-tag each treated as a single markup item; to make the complete element
-be treated as a single markup item, set the variable
-`nxml-sexp-element-flag' to t.  For more details, see the function
-`nxml-forward-balanced-item'.
-
-\\[nxml-backward-up-element] and \\[nxml-down-element] move up and down the element structure.
-
-Many aspects this mode can be customized using
-\\[customize-group] nxml RET."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'nxml-mode)
-  (setq mode-name "nXML")
-  ;; We'll determine the fill prefix ourselves
-  (make-local-variable 'adaptive-fill-mode)
-  (setq adaptive-fill-mode nil)
-  (make-local-variable 'forward-sexp-function)
-  (setq forward-sexp-function 'nxml-forward-balanced-item)
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'nxml-indent-line)
-  (make-local-variable 'fill-paragraph-function)
-  (setq fill-paragraph-function 'nxml-do-fill-paragraph)
-  ;; Comment support
-  ;; This doesn't seem to work too well;
-  ;; I think we should probably roll our own nxml-comment-dwim function.
-  (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'nxml-indent-line)
-  (make-local-variable 'comment-start)
-  (setq comment-start "<!--")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "<!--[ \t\r\n]*")
-  (make-local-variable 'comment-end)
-  (setq comment-end "-->")
-  (make-local-variable 'comment-end-skip)
-  (setq comment-end-skip "[ \t\r\n]*-->")
-  (make-local-variable 'comment-line-break-function)
-  (setq comment-line-break-function 'nxml-newline-and-indent)
-  (use-local-map nxml-mode-map)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-clear-dependent-regions (point-min) (point-max))
-      (setq nxml-scan-end (copy-marker (point-min) nil))
-      (nxml-with-unmodifying-text-property-changes
-	(when nxml-syntax-highlight-flag
-	  (nxml-clear-fontified (point-min) (point-max)))
-	(nxml-clear-inside (point-min) (point-max))
-	(nxml-with-invisible-motion
-	  (nxml-scan-prolog)))))
-  (when nxml-syntax-highlight-flag
-    (add-hook 'fontification-functions 'nxml-fontify nil t))
-  (add-hook 'after-change-functions 'nxml-after-change nil t)
-  (add-hook 'write-contents-hooks 'nxml-prepare-to-save)
-  (when (not (and (buffer-file-name) (file-exists-p (buffer-file-name))))
-    (when (and nxml-default-buffer-file-coding-system
-	       (not (local-variable-p 'buffer-file-coding-system)))
-      (setq buffer-file-coding-system nxml-default-buffer-file-coding-system))
-    (when nxml-auto-insert-xml-declaration-flag
-      (nxml-insert-xml-declaration)))
-  (run-hooks 'nxml-mode-hook))
-
-(defun nxml-degrade (context err)
-  (message "Internal nXML mode error in %s (%s), degrading"
-	   context
-	   (error-message-string err))
-  (ding)
-  (setq nxml-degraded t)
-  (setq nxml-prolog-end 1)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-unmodifying-text-property-changes
-	(nxml-clear-face (point-min) (point-max))
-	(nxml-set-fontified (point-min) (point-max))
-	(nxml-clear-inside (point-min) (point-max)))
-      (setq mode-name "nXML/degraded"))))
-
-;;; Change management
-
-(defun nxml-after-change (start end pre-change-length)
-  ;; Work around bug in insert-file-contents.
-  (when (> end (1+ (buffer-size)))
-    (setq start 1)
-    (setq end (1+ (buffer-size))))
-  (unless nxml-degraded
-    (condition-case err
-	(save-excursion
-	  (save-restriction
-	    (widen)
-	    (save-match-data
-	      (nxml-with-invisible-motion
-		(nxml-with-unmodifying-text-property-changes
-		  (nxml-after-change1 start end pre-change-length))))))
-      (error
-       (nxml-degrade 'nxml-after-change err)))))
-
-(defun nxml-after-change1 (start end pre-change-length)
-  (setq nxml-last-fontify-end nil)
-  (let ((pre-change-end (+ start pre-change-length)))
-    (setq start
-	  (nxml-adjust-start-for-dependent-regions start
-						   end
-						   pre-change-length))
-    (when (<= start
-	      ;; Add 2 so as to include the < and following char
-	      ;; that start the instance, since changing these
-	      ;; can change where the prolog ends.
-	      (+ nxml-prolog-end 2))
-      ;; end must be extended to at least the end of the old prolog
-      (when (< pre-change-end nxml-prolog-end)
-	(setq end
-	      ;; don't let end get out of range even if pre-change-length
-	      ;; is bogus
-	      (min (point-max)
-		   (+ end (- nxml-prolog-end pre-change-end)))))
-      (nxml-scan-prolog)))
-  (cond ((<= end nxml-prolog-end)
-	 (setq end nxml-prolog-end)
-	 (goto-char start)
-	 ;; This is so that Emacs redisplay works
-	 (setq start (line-beginning-position)))
-	((and (<= start nxml-scan-end)
-	      (> start (point-min))
-	      (nxml-get-inside (1- start)))
-	 ;; The closing delimiter might have been removed.
-	 ;; So we may need to redisplay from the beginning
-	 ;; of the token.
-	 (goto-char (1- start))
-	 (nxml-move-outside-backwards)
-	 ;; This is so that Emacs redisplay works
-	 (setq start (line-beginning-position))
-	 (setq end (max (nxml-scan-after-change (point) end)
-			end)))
-	(t
-	 (goto-char start)
-	 ;; This is both for redisplay and to move back
-	 ;; past any incomplete opening delimiters
-	 (setq start (line-beginning-position))
-	 (setq end (max (nxml-scan-after-change start end)
-			end))))
-  (when nxml-syntax-highlight-flag
-    (when (>= start end)
-      ;; Must clear at least one char so as to trigger redisplay.
-      (cond ((< start (point-max))
-	     (setq end (1+ start)))
-	    (t
-	     (setq end (point-max))
-	     (goto-char end)
-	     (setq start (line-beginning-position)))))
-    (nxml-clear-fontified start end)))
-  
-;;; Encodings
-
-(defun nxml-insert-xml-declaration ()
-  "Insert an XML declaration at the beginning of buffer.
-The XML declaration will declare an encoding depending on the buffer's
-`buffer-file-coding-system'."
-  (interactive "*")
-  (let ((coding-system
-	 (if (and buffer-file-coding-system
-		  (coding-system-p buffer-file-coding-system)
-		  (coding-system-get buffer-file-coding-system
-				     'mime-charset))
-	     buffer-file-coding-system
-	   (nxml-choose-utf-coding-system))))
-    (goto-char (point-min))
-    (insert (format "<?xml version=\"1.0\" encoding=\"%s\"?>\n"
-		    (nxml-coding-system-name coding-system)))))
-
-(defun nxml-prepare-to-save ()
-  (unless (and (not enable-multibyte-characters)
-	       (local-variable-p 'buffer-file-coding-system)
-	       buffer-file-coding-system
-	       (or (eq (coding-system-type buffer-file-coding-system) 5)
-		   (eq buffer-file-coding-system 'no-conversion)))
-    (save-excursion
-      (setq buffer-file-coding-system (nxml-select-coding-system))))
-  ;; nil from a function in `write-contents-hooks' means
-  ;; to continue and write the file as normal
-  nil)
-
-(defun nxml-select-coding-system ()
-  (let* ((suitable-coding-systems
-	  (find-coding-systems-region (point-min) (point-max)))
-	 (enc-pos (progn
-		    (goto-char (point-min))
-		    (xmltok-get-declared-encoding-position)))
-	 (enc-name
-	  (and (consp enc-pos)
-	       (buffer-substring-no-properties (car enc-pos)
-					       (cdr enc-pos))))
-	 (coding-system
-	  (cond (enc-name
-		 (if (string= (downcase enc-name) "utf-16")
-		     (nxml-choose-utf-16-coding-system)
-		   (nxml-mime-charset-coding-system enc-name)))
-		(enc-pos (nxml-choose-utf-coding-system)))))
-    ;; Make sure we have a coding-system
-    (unless coding-system
-      (setq coding-system
-	    (and (not buffer-read-only)
-		 (nxml-choose-suitable-coding-system
-		  suitable-coding-systems)))
-      (let ((message
-	     (if enc-name
-		 (format "Unknown encoding %s" enc-name)
-	       "XML declaration is not well-formed")))
-	(cond ((not coding-system)
-	       (error "%s" message))
-	      ((y-or-n-p
-		(concat message
-			". "
-			(format (if enc-name
-				    "Save with %s"
-				  "Modify and save with encoding %s")
-				(nxml-coding-system-name coding-system))
-			" "))
-	       (nxml-fix-encoding-declaration enc-pos coding-system))
-	      (t (signal 'quit nil)))))
-    ;; Make sure it can encode all the characters in the buffer
-    (unless (or (memq (coding-system-base coding-system)
-		      suitable-coding-systems)
-		(equal suitable-coding-systems '(undecided)))
-      (let ((message
-	     (nxml-unsuitable-coding-system-message coding-system
-						    enc-name)))
-	(setq coding-system
-	      (and (not buffer-read-only)
-		   (nxml-choose-suitable-coding-system
-		    suitable-coding-systems)))
-	(cond ((not coding-system) (error "%s" message))
-	      ((y-or-n-p (concat message
-				 (format ". Save with %s "
-					 (nxml-coding-system-name
-					  coding-system))))
-	       (nxml-fix-encoding-declaration enc-pos coding-system))
-	      (t (signal 'quit nil)))))
-    ;; Merge the newline type of our existing encoding
-    (let ((current-eol-type
-	   (coding-system-eol-type buffer-file-coding-system)))
-      (when (and current-eol-type (integerp current-eol-type))
-	(setq coding-system
-	      (coding-system-change-eol-conversion coding-system
-						   current-eol-type))))
-    coding-system))
-
-(defun nxml-unsuitable-coding-system-message (coding-system &optional enc-name)
-  (if (nxml-coding-system-unicode-p coding-system)
-      "Cannot translate some characters to Unicode"
-    (format "Cannot encode some characters with %s"
-	    (or enc-name
-		(nxml-coding-system-name coding-system)))))
-
-(defconst nxml-utf-16-coding-systems (and (coding-system-p 'utf-16-be)
-					  (coding-system-p 'utf-16-le)
-					  '(utf-16-be utf-16-le)))
-
-(defconst nxml-utf-coding-systems (cons 'utf-8 nxml-utf-16-coding-systems))
-
-(defun nxml-coding-system-unicode-p (coding-system)
-  (nxml-coding-system-member (coding-system-base coding-system)
-			     nxml-utf-coding-systems))
-
-(defun nxml-coding-system-name (coding-system)
-  (setq coding-system (coding-system-base coding-system))
-  (symbol-name
-   (if (nxml-coding-system-member coding-system nxml-utf-16-coding-systems)
-       'utf-16
-     (or (coding-system-get coding-system 'mime-charset)
-	 coding-system))))
-
-(defun nxml-fix-encoding-declaration (enc-pos coding-system)
-  (let ((charset (nxml-coding-system-name coding-system)))
-    (cond ((consp enc-pos)
-	   (delete-region (car enc-pos) (cdr enc-pos))
-	   (goto-char (car enc-pos))
-	   (insert charset))
-	  ((integerp enc-pos)
-	   (goto-char enc-pos)
-	   (insert " encoding=\"" charset ?\"))
-	  (t
-	   (goto-char (point-min))
-	   (insert "<?xml version=\"1.0\" encoding=\""
-		   charset
-		   "\"?>\n")
-	   (when (and (not enc-pos)
-		      (let ((case-fold-search t))
-			(looking-at xmltok-bad-xml-decl-regexp)))
-	     (delete-region (point) (match-end 0)))))))
-
-(defun nxml-choose-suitable-coding-system (suitable-coding-systems)
-  (let (ret coding-system)
-    (if (and buffer-file-coding-system
-	     (memq (coding-system-base buffer-file-coding-system)
-		   suitable-coding-systems))
-	buffer-file-coding-system
-      (while (and suitable-coding-systems (not ret))
-	(setq coding-system (car suitable-coding-systems))
-	(if (coding-system-get coding-system 'mime-charset)
-	    (setq ret coding-system)
-	  (setq suitable-coding-systems (cdr suitable-coding-systems))))
-      ret)))
-
-(defun nxml-choose-utf-coding-system ()	     
-  (let ((cur (and (local-variable-p 'buffer-file-coding-system)
-		  buffer-file-coding-system
-		  (coding-system-base buffer-file-coding-system))))
-    (cond ((car (nxml-coding-system-member cur nxml-utf-coding-systems)))
-	  ((and nxml-prefer-utf-16-to-utf-8-flag
-		(coding-system-p 'utf-16-le)
-		(coding-system-p 'utf-16-be))
-	   (if nxml-prefer-utf-16-little-to-big-endian-flag
-	       'utf-16-le
-	     'utf-16-be))
-	  (t 'utf-8))))
-
-(defun nxml-choose-utf-16-coding-system ()
-  (let ((cur (and (local-variable-p 'buffer-file-coding-system)
-		  buffer-file-coding-system
-		  (coding-system-base buffer-file-coding-system))))
-    (cond ((car (nxml-coding-system-member cur nxml-utf-16-coding-systems)))
-	  (nxml-prefer-utf-16-little-to-big-endian-flag
-	   (and (coding-system-p 'utf-16-le) 'utf-16-le))
-	  (t (and (coding-system-p 'utf-16-be) 'utf-16-be)))))
-
-(defun nxml-coding-system-member (coding-system coding-systems)
-  (let (ret)
-    (while (and coding-systems (not ret))
-      (if (coding-system-equal coding-system
-			       (car coding-systems))
-	  (setq ret coding-systems)
-	(setq coding-systems (cdr coding-systems))))
-    ret))
-
-;;; Fontification
-
-(defun nxml-fontify (start)
-  (condition-case err
-      (save-excursion
-	(save-restriction
-	  (widen)
-	  (save-match-data
-	    (nxml-with-invisible-motion
-	      (nxml-with-unmodifying-text-property-changes
-		(if (or nxml-degraded
-			;; just in case we get called in the wrong buffer
-			(not nxml-prolog-end))
-		    (nxml-set-fontified start (point-max))
-		  (nxml-fontify1 start)))))))
-    (error
-     (nxml-degrade 'nxml-fontify err))))
-
-(defun nxml-fontify1 (start)
-  (cond ((< start nxml-prolog-end)
-	 (nxml-fontify-prolog)
-	 (nxml-set-fontified (point-min)
-			     nxml-prolog-end))
-	(t
-	 (goto-char start)
-	 (when (not (eq nxml-last-fontify-end start))
-	   (when (not (equal (char-after) ?\<))
-	     (search-backward "<" nxml-prolog-end t))
-	   (nxml-ensure-scan-up-to-date)
-	   (nxml-move-outside-backwards))
-	 (let ((start (point)))
-	   (nxml-do-fontify (min (point-max)
-				 (+ start nxml-fontify-chunk-size)))
-	   (setq nxml-last-fontify-end (point))
-	   (nxml-set-fontified start nxml-last-fontify-end)))))
-
-(defun nxml-fontify-buffer ()
-  (interactive)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-invisible-motion
-	(goto-char (point-min))
-	(nxml-with-unmodifying-text-property-changes
-	  (nxml-fontify-prolog)
-	  (goto-char nxml-prolog-end)
-	  (nxml-do-fontify))))))
-
-(defun nxml-fontify-prolog ()
-  "Fontify the prolog.
-The buffer is assumed to be prepared for fontification.
-This does not set the fontified property, but it does clear
-faces appropriately."
-  (let ((regions nxml-prolog-regions))
-    (nxml-clear-face (point-min) nxml-prolog-end)
-    (while regions
-      (let ((region (car regions)))
-	(nxml-apply-fontify-rule (aref region 0)
-				 (aref region 1)
-				 (aref region 2)))
-      (setq regions (cdr regions)))))
-
-(defun nxml-do-fontify (&optional bound)
-  "Fontify at least as far as bound.
-Leave point after last fontified position."
-  (unless bound (setq bound (point-max)))
-  (let (xmltok-dependent-regions
-	xmltok-errors)
-    (while (and (< (point) bound)
-		(nxml-tokenize-forward))
-      (nxml-clear-face xmltok-start (point))
-      (nxml-apply-fontify-rule))))
-
-;; Vectors identify a substring of the token to be highlighted in some face.
-
-;; Token types returned by xmltok-forward.
-
-(put 'start-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'partial-start-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'end-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [1 2 nxml-tag-slash-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 2)))
-
-(put 'partial-end-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [1 2 nxml-tag-slash-face]
-       (element-qname . 2)))
-
-(put 'empty-element
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-2 -1 nxml-tag-slash-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'partial-empty-element
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-1 nil nxml-tag-slash-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'char-ref
-     'nxml-fontify-rule
-     '([nil 2 nxml-char-ref-delimiter-face]
-       [2 -1 nxml-char-ref-number-face]
-       [-1 nil nxml-char-ref-delimiter-face]
-       char-ref))
-
-(put 'entity-ref
-     'nxml-fontify-rule
-     '([nil 1 nxml-entity-ref-delimiter-face]
-       [1 -1 nxml-entity-ref-name-face]
-       [-1 nil nxml-entity-ref-delimiter-face]))
-
-(put 'comment
-     'nxml-fontify-rule
-     '([nil 4 nxml-comment-delimiter-face]
-       [4 -3 nxml-comment-content-face]
-       [-3 nil nxml-comment-delimiter-face]))
-
-(put 'processing-instruction
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]
-       processing-instruction-content))
-
-(put 'cdata-section
-     'nxml-fontify-rule
-     '([nil 3 nxml-cdata-section-delimiter-face] ; <![
-       [3 8 nxml-cdata-section-CDATA-face] ; CDATA
-       [8 9 nxml-cdata-section-delimiter-face] ; [
-       [9 -3 nxml-cdata-section-content-face] ; ]]>
-       [-3 nil nxml-cdata-section-delimiter-face]))
-
-(put 'data
-     'nxml-fontify-rule
-     '([nil nil nxml-text-face]))
-
-;; Prolog region types in list returned by xmltok-forward-prolog.
-
-(put 'xml-declaration
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [2 5 nxml-processing-instruction-target-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]))
-
-(put 'xml-declaration-attribute-name
-     'nxml-fontify-rule
-     '([nil nil nxml-attribute-local-name-face]))
-
-(put 'xml-declaration-attribute-value
-     'nxml-fontify-rule
-     '([nil 1 nxml-attribute-value-delimiter-face]
-       [1 -1 nxml-attribute-value-face]
-       [-1 nil nxml-attribute-value-delimiter-face]))
-
-(put 'processing-instruction-left
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [2 nil nxml-processing-instruction-target-face]))
-
-(put 'processing-instruction-right
-     'nxml-fontify-rule
-     '([nil -2 nxml-processing-instruction-content-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]))
-
-(put 'literal
-     'nxml-fontify-rule
-     '([nil 1 nxml-prolog-literal-delimiter-face]
-       [1 -1 nxml-prolog-literal-content-face]
-       [-1 nil nxml-prolog-literal-delimiter-face]))
-
-(put 'keyword
-     'nxml-fontify-rule
-     '([nil nil nxml-prolog-keyword-face]))
-
-(put 'markup-declaration-open
-     'nxml-fontify-rule
-     '([0 2 nxml-markup-declaration-delimiter-face]
-       [2 nil nxml-prolog-keyword-face]))
-
-(put 'markup-declaration-close
-     'nxml-fontify-rule
-     '([nil nil nxml-markup-declaration-delimiter-face]))
-
-(put 'internal-subset-open
-     'nxml-fontify-rule
-     '([nil nil nxml-markup-declaration-delimiter-face]))
-
-(put 'internal-subset-close
-     'nxml-fontify-rule
-     '([nil 1 nxml-markup-declaration-delimiter-face]
-       [-1 nil nxml-markup-declaration-delimiter-face]))
-
-(put 'hash-name
-     'nxml-fontify-rule
-     '([nil 1 nxml-hash-face]
-       [1 nil nxml-prolog-keyword-face]))
-
-(defun nxml-apply-fontify-rule (&optional type start end)
-  (let ((rule (get (or type xmltok-type) 'nxml-fontify-rule)))
-    (unless start (setq start xmltok-start))
-    (unless end (setq end (point)))
-    (while rule
-      (let* ((action (car rule)))
-	(setq rule (cdr rule))
-	(cond ((vectorp action)
-	       (nxml-set-face (let ((offset (aref action 0)))
-				(cond ((not offset) start)
-				      ((< offset 0) (+ end offset))
-				      (t (+ start offset))))
-			      (let ((offset (aref action 1)))
-				(cond ((not offset) end)
-				      ((< offset 0) (+ end offset))
-				      (t (+ start offset))))
-			      (aref action 2)))
-	      ((and (consp action)
-		    (eq (car action) 'element-qname))
-	       (when xmltok-name-end ; maybe nil in partial-end-tag case
-		 (nxml-fontify-qname (+ start (cdr action))
-				     xmltok-name-colon
-				     xmltok-name-end
-				     'nxml-element-prefix-face
-				     'nxml-element-colon-face
-				     'nxml-element-local-name-face)))
-	      ((eq action 'attributes)
-	       (nxml-fontify-attributes))
-	      ((eq action 'processing-instruction-content)
-	       (nxml-set-face (+ start 2)
-			      xmltok-name-end
-			      'nxml-processing-instruction-target-face)
-	       (nxml-set-face (save-excursion
-				(goto-char xmltok-name-end)
-				(skip-chars-forward " \t\r\n")
-				(point))
-			      (- end 2)
-			      'nxml-processing-instruction-content-face))
-	      ((eq action 'char-ref)
-	       (nxml-char-ref-display-extra start
-					    end
-					    (xmltok-char-number start end)))
-	      (t (error "Invalid nxml-fontify-rule action %s" action)))))))
-
-(defun nxml-fontify-attributes ()
-  (while xmltok-namespace-attributes
-    (nxml-fontify-attribute (car xmltok-namespace-attributes)
-			    'namespace)
-    (setq xmltok-namespace-attributes
-	  (cdr xmltok-namespace-attributes)))
-  (while xmltok-attributes
-    (nxml-fontify-attribute (car xmltok-attributes))
-    (setq xmltok-attributes
-	  (cdr xmltok-attributes))))
-
-
-
-;; Please see nxmlhref.el for an explanation of the use of href below.
-
-(defface nxml-href-face
-  `((((class color) (background light)) (:foreground "blue" :underline t))
-    (((class color) (background dark)) (:foreground "cyan" :underline t)))
-  "Face used to highlight href attribute."
-  :group 'nxml-highlighting-faces)
-
-(defvar nxml-href-keymap nil)
-
-
-(defun nxml-fontify-attribute (att &optional namespace-declaration)
-  (let ((name-face 'nxml-attribute-local-name-face))
-    (when nxml-href-keymap
-      (when (equal (buffer-substring-no-properties 
-		    (xmltok-attribute-name-start att)
-		    (xmltok-attribute-name-end att))
-		   "href")
-	;;(message "found href %s %s %s" (xmltok-attribute-name-start att) (xmltok-attribute-name-colon att) (xmltok-attribute-name-end att) )
-	(setq name-face 'nxml-href-face)
-	(put-text-property (xmltok-attribute-name-start att)
-			   (xmltok-attribute-name-end att)
-			   'keymap (symbol-value nxml-href-keymap))
-	)
-      )
-  (if namespace-declaration
-      (nxml-fontify-qname (xmltok-attribute-name-start att)
-			  (xmltok-attribute-name-colon att)
-			  (xmltok-attribute-name-end att)
-			  'nxml-namespace-attribute-xmlns-face
-			  'nxml-namespace-attribute-colon-face
-			  'nxml-namespace-attribute-prefix-face
-			  'nxml-namespace-attribute-xmlns-face)
-    (nxml-fontify-qname (xmltok-attribute-name-start att)
-			(xmltok-attribute-name-colon att)
-			(xmltok-attribute-name-end att)
-			'nxml-attribute-prefix-face
-			'nxml-attribute-colon-face
-			;;'nxml-attribute-local-name-face))
-			name-face))
-  )
-  (let ((start (xmltok-attribute-value-start att))
-	(end (xmltok-attribute-value-end att))
-	(refs (xmltok-attribute-refs att))
-	(delimiter-face (if namespace-declaration
-			    'nxml-namespace-attribute-value-delimiter-face
-			  'nxml-attribute-value-delimiter-face))
-	(value-face (if namespace-declaration
-			'nxml-namespace-attribute-value-face
-		      'nxml-attribute-value-face)))
-    (when start
-      (nxml-set-face (1- start) start delimiter-face)
-      (nxml-set-face end (1+ end) delimiter-face)
-      (while refs
-	(let* ((ref (car refs))
-	       (ref-type (aref ref 0))
-	       (ref-start (aref ref 1))
-	       (ref-end (aref ref 2)))
-	  (nxml-set-face start ref-start value-face)
-	  (nxml-apply-fontify-rule ref-type ref-start ref-end)
-	  (setq start ref-end))
-	(setq refs (cdr refs)))
-      (nxml-set-face start end value-face))))
-
-(defun nxml-fontify-qname (start
-			   colon
-			   end
-			   prefix-face
-			   colon-face
-			   local-name-face
-			   &optional
-			   unprefixed-face)
-  (cond (colon (nxml-set-face start colon prefix-face)
-	       (nxml-set-face colon (1+ colon) colon-face)
-	       (nxml-set-face (1+ colon) end local-name-face))
-	(t (nxml-set-face start end (or unprefixed-face
-					local-name-face)))))
-
-;;; Editing
-
-(defun nxml-electric-slash (arg)
-  "Insert a slash.
-
-With a prefix ARG, do nothing other than insert the slash.
-
-Otherwise, if `nxml-slash-auto-complete-flag' is non-nil, insert the
-rest of the end-tag or empty-element if the slash is potentially part
-of an end-tag or the close of an empty-element.
-
-If the slash is part of an end-tag that is the first non-whitespace
-on the line, reindent the line."
-  (interactive "*P")
-  (nxml-ensure-scan-up-to-date)
-  (let* ((slash-pos (point))
-	 (end-tag-p (and (eq (char-before slash-pos) ?<)
-			 (not (nxml-get-inside slash-pos))))
-	 (at-indentation (save-excursion
-			   (back-to-indentation)
-			   (eq (point) (1- slash-pos)))))
-    (self-insert-command (prefix-numeric-value arg))
-    (unless arg
-      (if nxml-slash-auto-complete-flag
-	  (if end-tag-p
-	      (condition-case err
-		  (let ((start-tag-end
-			 (nxml-scan-element-backward (1- slash-pos) t)))
-		    (when start-tag-end
-		      (insert (xmltok-start-tag-qname) ">")
-		      ;; copy the indentation of the start-tag
-		      (when (and at-indentation
-				 (save-excursion
-				   (goto-char xmltok-start)
-				   (back-to-indentation)
-				   (eq (point) xmltok-start)))
-			(save-excursion
-			  (indent-line-to (save-excursion
-					    (goto-char xmltok-start)
-					    (current-column)))))))
-		(nxml-scan-error nil))
-	    (when (and (eq (nxml-token-before) (point))
-		       (eq xmltok-type 'partial-empty-element))
-	      (insert ">")))
-	(when (and end-tag-p at-indentation)
-	  (nxml-indent-line))))))
-
-(defun nxml-balanced-close-start-tag-block ()
-  "Close the start-tag before point with `>' and insert a balancing end-tag.
-Point is left between the start-tag and the end-tag.
-If there is nothing but whitespace before the `<' that opens the
-start-tag, then put point on a blank line, and put the end-tag on
-another line aligned with the start-tag."
-  (interactive "*")
-  (nxml-balanced-close-start-tag 'block))
-
-(defun nxml-balanced-close-start-tag-inline ()
-  "Close the start-tag before point with `>' and insert a balancing end-tag.
-Point is left between the start-tag and the end-tag.
-No extra whitespace is inserted."
-  (interactive "*")
-  (nxml-balanced-close-start-tag 'inline))
-
-(defun nxml-balanced-close-start-tag (block-or-inline)
-  (let ((token-end (nxml-token-before))
-	(pos (1+ (point))))
-    (unless (or (eq xmltok-type 'partial-start-tag)
-		(and (memq xmltok-type '(start-tag
-					 empty-element
-					 partial-empty-element))
-		     (>= token-end pos)))
-      (error "Not in a start-tag"))
-    (insert "></"
-	    (buffer-substring-no-properties (+ xmltok-start 1)
-					    (min xmltok-name-end (point)))
-	    ">")
-    (if (eq block-or-inline 'inline)
-	(goto-char pos)
-      (goto-char xmltok-start)
-      (back-to-indentation)
-      (if (= (point) xmltok-start)
-	  (let ((indent (current-column)))
-	  (goto-char pos)
-	  (insert "\n")
-	  (indent-line-to indent)
-	  (goto-char pos)
-	  (insert "\n")
-	  (indent-line-to (+ nxml-child-indent indent)))
-	(goto-char pos)))))
-	
-(defun nxml-finish-element ()
-  "Finish the current element by inserting an end-tag."
-  (interactive "*")
-  (nxml-finish-element-1 nil))
-
-(defvar nxml-last-split-position nil
-  "Position where `nxml-split-element' split the current element.")
-
-(defun nxml-split-element ()
-  "Split the current element by inserting an end-tag and a start-tag.
-Point is left after the newly inserted start-tag.  When repeated,
-split immediately before the previously inserted start-tag and leave
-point unchanged."
-  (interactive "*")
-  (setq nxml-last-split-position
-	(if (and (eq last-command this-command)
-		 nxml-last-split-position)
-	    (save-excursion
-	      (goto-char nxml-last-split-position)
-	      (nxml-finish-element-1 t))
-	  (nxml-finish-element-1 t))))
-
-(defun nxml-finish-element-1 (startp)
-  "Insert an end-tag for the current element and optionally a start-tag.
-The start-tag is inserted if STARTP is non-nil.  Return the position
-of the inserted start-tag or nil if none was inserted."
-  (interactive "*")
-  (let* ((token-end (nxml-token-before))
-	 (start-tag-end
-	  (save-excursion
-	    (when (and (< (point) token-end)
-		       (memq xmltok-type
-			     '(cdata-section
-			       processing-instruction
-			       comment
-			       start-tag
-			       end-tag
-			       empty-element)))
-	      (error "Point is inside a %s"
-		     (nxml-token-type-friendly-name xmltok-type)))
-	    (nxml-scan-element-backward token-end t)))
-	 (starts-line
-	  (save-excursion
-	    (unless (eq xmltok-type 'start-tag)
-	      (error "No matching start-tag"))
-	    (goto-char xmltok-start)
-	    (back-to-indentation)
-	    (eq (point) xmltok-start)))
-	 (ends-line
-	  (save-excursion
-	    (goto-char start-tag-end)
-	    (looking-at "[ \t\r\n]*$")))
-	 (start-tag-indent (save-excursion
-			     (goto-char xmltok-start)
-			     (current-column)))
-	 (qname (xmltok-start-tag-qname))
-	 inserted-start-tag-pos)
-    (when (and starts-line ends-line)
-      ;; start-tag is on a line by itself
-      ;; => put the end-tag on a line by itself
-      (unless (<= (point)
-		  (save-excursion
-		    (back-to-indentation)
-		    (point)))
-	(insert "\n"))
-      (indent-line-to start-tag-indent))
-    (insert "</" qname ">")
-    (when startp
-      (when starts-line
-	(insert "\n")
-	(indent-line-to start-tag-indent))
-      (setq inserted-start-tag-pos (point))
-      (insert "<" qname ">")
-      (when (and starts-line ends-line)
-	(insert "\n")
-	(indent-line-to (save-excursion
-			  (goto-char xmltok-start)
-			  (forward-line 1)
-			  (back-to-indentation)
-			  (if (= (current-column)
-				 (+ start-tag-indent nxml-child-indent))
-			      (+ start-tag-indent nxml-child-indent)
-			    start-tag-indent)))))
-    inserted-start-tag-pos))
-
-;;; Indentation
-
-(defun nxml-indent-line ()
-  "Indent current line as XML."
-  (let ((indent (nxml-compute-indent))
-	(from-end (- (point-max) (point))))
-    (when indent
-      (beginning-of-line)
-      (let ((bol (point)))
-	(skip-chars-forward " \t")
-	(delete-region bol (point)))
-      (indent-to indent)
-      (when (> (- (point-max) from-end) (point))
-	(goto-char (- (point-max) from-end))))))
-
-(defun nxml-compute-indent ()
-  "Return the indent for the line containing point."
-  (or (nxml-compute-indent-from-matching-start-tag)
-      (nxml-compute-indent-from-previous-line)))
-
-(defun nxml-compute-indent-from-matching-start-tag ()
-  "Compute the indent for a line with an end-tag using the matching start-tag.
-When the line containing point ends with an end-tag and does not start
-in the middle of a token, return the indent of the line containing the
-matching start-tag, if there is one and it occurs at the beginning of
-its line.  Otherwise return nil."
-  (save-excursion
-    (back-to-indentation)
-    (let ((bol (point)))
-      (let ((inhibit-field-text-motion t))
-	(end-of-line))
-      (skip-chars-backward " \t")
-      (and (= (nxml-token-before) (point))
-	   (memq xmltok-type '(end-tag partial-end-tag))
-	   ;; start of line must not be inside a token
-	   (or (= xmltok-start bol)
-	       (save-excursion
-		 (goto-char bol)
-		 (nxml-token-after)
-		 (= xmltok-start bol))
-	       (eq xmltok-type 'data))
-	   (condition-case err
-	       (nxml-scan-element-backward
-		(point)
-		nil
-		(- (point)
-		   nxml-end-tag-indent-scan-distance))
-	     (nxml-scan-error nil))
-	   (< xmltok-start bol)
-	   (progn
-	     (goto-char xmltok-start)
-	     (skip-chars-backward " \t")
-	     (bolp))
-	   (current-indentation)))))
-
-(defun nxml-compute-indent-from-previous-line ()
-  "Compute the indent for a line using the indentation of a previous line."
-  (save-excursion
-    (end-of-line)
-    (let ((eol (point))
-	  bol prev-bol ref
-	  before-context after-context)
-      (back-to-indentation)
-      (setq bol (point))
-      (catch 'indent
-	;; Move backwards until the start of a non-blank line that is
-	;; not inside a token.
-	(while (progn
-		 (when (= (forward-line -1) -1)
-		   (throw 'indent 0))
-		 (back-to-indentation)
-		 (if (looking-at "[ \t]*$")
-		     t
-		   (or prev-bol
-		       (setq prev-bol (point)))
-		   (nxml-token-after)
-		   (not (or (= xmltok-start (point))
-			    (eq xmltok-type 'data))))))
-	(setq ref (point))
-	;; Now scan over tokens until the end of the line to be indented.
-	;; Determine the context before and after the beginning of the
-	;; line.
-	(while (< (point) eol)
-	  (nxml-tokenize-forward)
-	  (cond ((<= bol xmltok-start)
-		 (setq after-context
-		       (nxml-merge-indent-context-type after-context)))
-		((and (<= (point) bol)
-		      (not (and (eq xmltok-type 'partial-start-tag)
-				(= (point) bol))))
-		 (setq before-context
-		       (nxml-merge-indent-context-type before-context)))
-		((eq xmltok-type 'data)
-		 (setq before-context
-		       (nxml-merge-indent-context-type before-context))
-		 (setq after-context
-		       (nxml-merge-indent-context-type after-context)))
-		;; If in the middle of a token that looks inline,
-		;; then indent relative to the previous non-blank line
-		((eq (nxml-merge-indent-context-type before-context)
-		     'mixed)
-		 (goto-char prev-bol)
-		 (throw 'indent (current-column)))
-		(t
-		 (throw 'indent
-			(nxml-compute-indent-in-token bol))))
-	  (skip-chars-forward " \t\r\n"))
-	(goto-char ref)
-	(+ (current-column)
-	   (* nxml-child-indent
-	      (+ (if (eq before-context 'start-tag) 1 0)
-		 (if (eq after-context 'end-tag) -1 0))))))))
-
-(defun nxml-merge-indent-context-type (context)
-  "Merge the indent context type CONTEXT with the token in `xmltok-type'.
-Return the merged indent context type.  An indent context type is
-either nil or one of the symbols start-tag, end-tag, markup, comment,
-mixed."
-  (cond ((memq xmltok-type '(start-tag partial-start-tag))
-	 (if (memq context '(nil start-tag comment))
-	     'start-tag
-	   'mixed))
-	((memq xmltok-type '(end-tag partial-end-tag))
-	 (if (memq context '(nil end-tag comment))
-	     'end-tag
-	   'mixed))
-	((eq xmltok-type 'comment)
-	 (cond ((memq context '(start-tag end-tag comment))
-		context)
-	       (context 'mixed)
-	       (t 'comment)))
-	(context 'mixed)
-	(t 'markup)))
-
-(defun nxml-compute-indent-in-token (pos)
-  "Return the indent for a line that starts inside a token.
-POS is the position of the first non-whitespace character of the line.
-This expects the xmltok-* variables to be set up as by `xmltok-forward'."
-  (cond ((memq xmltok-type '(start-tag
-			     partial-start-tag
-			     empty-element
-			     partial-empty-element))
-	 (nxml-compute-indent-in-start-tag pos))
-	((eq xmltok-type 'comment)
-	 (nxml-compute-indent-in-delimited-token pos "<!--" "-->"))
-	((eq xmltok-type 'cdata-section)
-	 (nxml-compute-indent-in-delimited-token pos "<![CDATA[" "]]>"))
-	((eq xmltok-type 'processing-instruction)
-	 (nxml-compute-indent-in-delimited-token pos "<?" "?>"))
-	(t
-	 (goto-char pos)
-	 (if (and (= (forward-line -1) 0)
-		  (< xmltok-start (point)))
-	     (back-to-indentation)
-	   (goto-char xmltok-start))
-	 (current-column))))
-
-(defun nxml-compute-indent-in-start-tag (pos)
-  "Return the indent for a line that starts inside a start-tag.
-Also for a line that starts inside an empty element.
-POS is the position of the first non-whitespace character of the line.
-This expects the xmltok-* variables to be set up as by `xmltok-forward'."
-  (let ((value-boundary (nxml-attribute-value-boundary pos))
-	(off 0))
-    (if value-boundary
-	;; inside an attribute value
-	(let ((value-start (car value-boundary))
-	      (value-end (cdr value-boundary)))
-	  (goto-char pos)
-	  (forward-line -1)
-	  (if (< (point) value-start)
-	      (goto-char value-start)
-	    (back-to-indentation)))
-      ;; outside an attribute value
-      (goto-char pos)
-      (while (and (= (forward-line -1) 0)
-		  (nxml-attribute-value-boundary (point))))
-      (cond ((<= (point) xmltok-start)
-	     (goto-char xmltok-start)
-	     (setq off nxml-attribute-indent)
-	     (let ((atts (xmltok-merge-attributes)))
-	       (when atts
-		 (let* ((att (car atts))
-			(start (xmltok-attribute-name-start att)))
-		   (when (< start pos)
-		     (goto-char start)
-		     (setq off 0))))))
-	    (t
-	     (back-to-indentation))))
-    (+ (current-column) off)))
-
-(defun nxml-attribute-value-boundary (pos)
-  "Return a pair (START . END) if POS is inside an attribute value.
-Otherwise return nil.  START and END are the positions of the start
-and end of the attribute value containing POS.  This expects the
-xmltok-* variables to be set up as by `xmltok-forward'."
-  (let ((atts (xmltok-merge-attributes))
-	att value-start value-end value-boundary)
-    (while atts
-      (setq att (car atts))
-      (setq value-start (xmltok-attribute-value-start att))
-      (setq value-end (xmltok-attribute-value-end att))
-      (cond ((and value-start (< pos value-start))
-	     (setq atts nil))
-	    ((and value-start value-end (<= pos value-end))
-	     (setq value-boundary (cons value-start value-end))
-	     (setq atts nil))
-	    (t (setq atts (cdr atts)))))
-    value-boundary))
-	     
-(defun nxml-compute-indent-in-delimited-token (pos open-delim close-delim)
-  "Return the indent for a line that starts inside a token with delimiters.
-OPEN-DELIM and CLOSE-DELIM are strings giving the opening and closing
-delimiters.  POS is the position of the first non-whitespace character
-of the line.  This expects the xmltok-* variables to be set up as by
-`xmltok-forward'."
-  (cond ((let ((end (+ pos (length close-delim))))
-	   (and (<= end (point-max))
-		(string= (buffer-substring-no-properties pos end)
-			 close-delim)))
-	 (goto-char xmltok-start))
-	((progn
-	   (goto-char pos)
-	   (forward-line -1)
-	   (<= (point) xmltok-start))
-	 (goto-char (+ xmltok-start (length open-delim)))
-	 (when (and (string= open-delim "<!--")
-		    (looking-at " "))
-	   (goto-char (1+ (point)))))
-	(t (back-to-indentation)))
-  (current-column))
-
-;;; Completion
-
-(defun nxml-complete ()
-  "Perform completion on the symbol preceding point.
-
-Inserts as many characters as can be completed.  However, if not even
-one character can be completed, then a buffer with the possibilities
-is popped up and the symbol is read from the minibuffer with
-completion. If the symbol is complete, then any characters that must
-follow the symbol are also inserted.
-
-The name space used for completion and what is treated as a symbol
-depends on the context.  The contexts in which completion is performed
-depend on `nxml-completion-hook'."
-  (interactive)
-  (unless (run-hook-with-args-until-success 'nxml-completion-hook)
-    ;; Eventually we will complete on entity names here.
-    (ding)
-    (message "Cannot complete in this context")))
-
-;;; Movement
-
-(defun nxml-forward-balanced-item (&optional arg)
-  "Move forward across one balanced item.
-With ARG, do it that many times.  Negative arg -N means
-move backward across N balanced expressions.
-This is the equivalent of `forward-sexp' for XML.
-
-An element contains as items strings with no markup, tags, processing
-instructions, comments, CDATA sections, entity references and
-characters references. However, if the variable
-`nxml-sexp-element-flag' is non-nil, then an element is treated as a
-single markup item.  A start-tag contains an element name followed by
-one or more attributes.  An end-tag contains just an element name.  An
-attribute value literals contains strings with no markup, entity
-references and character references.  A processing instruction
-consists of a target and a content string.  A comment or a CDATA
-section contains a single string.  An entity reference contains a
-single name.  A character reference contains a character number."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((> arg 0)
-	 (while (progn
-		  (nxml-forward-single-balanced-item)
-		  (> (setq arg (1- arg)) 0))))
-	((< arg 0)
-	 (while (progn
-		  (nxml-backward-single-balanced-item)
-		  (< (setq arg (1+ arg)) 0))))))
-
-(defun nxml-forward-single-balanced-item ()
-  (condition-case err
-      (goto-char (let ((end (nxml-token-after)))
-		   (save-excursion
-		     (while (eq xmltok-type 'space)
-		       (goto-char end)
-		       (setq end (nxml-token-after)))
-		     (cond ((/= (point) xmltok-start)
-			    (nxml-scan-forward-within end))
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'start-tag))
-			    ;; can't ever return nil here
-			    (nxml-scan-element-forward xmltok-start))
-			   ((and nxml-sexp-element-flag
-				 (memq xmltok-type
-				       '(end-tag partial-end-tag)))
-			    (error "Already at end of element"))
-			   (t end)))))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err)))))
-
-(defun nxml-backward-single-balanced-item ()
-  (condition-case err
-      (goto-char (let ((end (nxml-token-before)))
-		   (save-excursion
-		     (while (eq xmltok-type 'space)
-		       (goto-char xmltok-start)
-		       (setq end (nxml-token-before)))
-		     (cond ((/= (point) end)
-			    (nxml-scan-backward-within end))
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'end-tag))
-			    ;; can't ever return nil here
-			    (nxml-scan-element-backward end)
-			    xmltok-start)
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'start-tag))
-			    (error "Already at start of element"))
-			   (t xmltok-start)))))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err)))))
-
-(defun nxml-scan-forward-within (end)
-  (setq end (- end (nxml-end-delimiter-length xmltok-type)))
-  (when (<= end (point))
-    (error "Already at end of %s"
-	   (nxml-token-type-friendly-name xmltok-type)))
-  (cond ((memq xmltok-type '(start-tag
-			     empty-element
-			     partial-start-tag
-			     partial-empty-element))
-	 (if (< (point) xmltok-name-end)
-	     xmltok-name-end
-	   (let ((att (nxml-find-following-attribute)))
-	     (cond ((not att) end)
-		   ((and (xmltok-attribute-value-start att)
-			 (<= (xmltok-attribute-value-start att)
-			     (point)))
-		    (nxml-scan-forward-in-attribute-value att))
-		   ((xmltok-attribute-value-end att)
-		    (1+ (xmltok-attribute-value-end att)))
-		   ((save-excursion
-		      (goto-char (xmltok-attribute-name-end att))
-		      (looking-at "[ \t\r\n]*="))
-		    (match-end 0))
-		   (t (xmltok-attribute-name-end att))))))
-	((and (eq xmltok-type 'processing-instruction)
-	      (< (point) xmltok-name-end))
-	 xmltok-name-end)
-	(t end)))
-
-(defun nxml-scan-backward-within (end)
-  (setq xmltok-start
-	(+ xmltok-start
-	   (nxml-start-delimiter-length xmltok-type)))
-  (when (<= (point) xmltok-start)
-    (error "Already at start of %s"
-	   (nxml-token-type-friendly-name xmltok-type)))
-  (cond ((memq xmltok-type '(start-tag
-			     empty-element
-			     partial-start-tag
-			     partial-empty-element))
-	 (let ((att (nxml-find-preceding-attribute)))
-	   (cond ((not att) xmltok-start)
-		 ((and (xmltok-attribute-value-start att)
-		       (<= (xmltok-attribute-value-start att)
-			   (point))
-		       (<= (point)
-			   (xmltok-attribute-value-end att)))
-		  (nxml-scan-backward-in-attribute-value att))
-		 (t (xmltok-attribute-name-start att)))))
-	((and (eq xmltok-type 'processing-instruction)
-	      (let ((content-start (save-excursion
-				     (goto-char xmltok-name-end)
-				     (skip-chars-forward " \r\t\n")
-				     (point))))
-		(and (< content-start (point))
-		     content-start))))
-	(t xmltok-start)))
-
-(defun nxml-scan-forward-in-attribute-value (att)
-  (when (= (point) (xmltok-attribute-value-end att))
-    (error "Already at end of attribute value"))
-  (let ((refs (xmltok-attribute-refs att))
-	ref)
-    (while refs
-      (setq ref (car refs))
-      (if (< (point) (aref ref 2))
-	  (setq refs nil)
-	(setq ref nil)
-	(setq refs (cdr refs))))
-    (cond ((not ref)
-	   (xmltok-attribute-value-end att))
-	  ((< (point) (aref ref 1))
-	   (aref ref 1))
-	  ((= (point) (aref ref 1))
-	   (aref ref 2))
-	  (t
-	   (let ((end (- (aref ref 2)
-			 (nxml-end-delimiter-length (aref ref 0)))))
-	     (if (< (point) end)
-		 end
-	       (error "Already at end of %s"
-		      (nxml-token-type-friendly-name (aref ref 0)))))))))
-
-(defun nxml-scan-backward-in-attribute-value (att)
-  (when (= (point) (xmltok-attribute-value-start att))
-    (error "Already at start of attribute value"))
-  (let ((refs (reverse (xmltok-attribute-refs att)))
-	ref)
-    (while refs
-      (setq ref (car refs))
-      (if (< (aref ref 1) (point))
-	  (setq refs nil)
-	(setq ref nil)
-	(setq refs (cdr refs))))
-    (cond ((not ref)
-	   (xmltok-attribute-value-start att))
-	  ((< (aref ref 2) (point))
-	   (aref ref 2))
-	  ((= (point) (aref ref 2))
-	   (aref ref 1))
-	  (t
-	   (let ((start (+ (aref ref 1)
-			   (nxml-start-delimiter-length (aref ref 0)))))
-	     (if (< start (point))
-		 start
-	       (error "Already at start of %s"
-		      (nxml-token-type-friendly-name (aref ref 0)))))))))
-
-(defun nxml-find-following-attribute ()
-  (let ((ret nil)
-	(atts (or xmltok-attributes xmltok-namespace-attributes))
-	(more-atts (and xmltok-attributes xmltok-namespace-attributes)))
-    (while atts
-      (let* ((att (car atts))
-	     (name-start (xmltok-attribute-name-start att)))
-	(cond ((and (<= name-start (point))
-		    (xmltok-attribute-value-end att)
-		    ;; <= because end is before quote
-		    (<= (point) (xmltok-attribute-value-end att)))
-	       (setq atts nil)
-	       (setq ret att))
-	      ((and (< (point) name-start)
-		    (or (not ret)
-			(< name-start
-			   (xmltok-attribute-name-start ret))))
-	       (setq ret att))))
-      (setq atts (cdr atts))
-      (unless atts
-	(setq atts more-atts)
-	(setq more-atts nil)))
-    ret))
-
-(defun nxml-find-preceding-attribute ()
-  (let ((ret nil)
-	(atts (or xmltok-attributes xmltok-namespace-attributes))
-	(more-atts (and xmltok-attributes xmltok-namespace-attributes)))
-    (while atts
-      (let* ((att (car atts))
-	     (name-start (xmltok-attribute-name-start att)))
-	(cond ((and (< name-start (point))
-		    (xmltok-attribute-value-end att)
-		    ;; <= because end is before quote
-		    (<= (point) (xmltok-attribute-value-end att)))
-	       (setq atts nil)
-	       (setq ret att))
-	      ((and (< name-start (point))
-		    (or (not ret)
-			(< (xmltok-attribute-name-start ret)
-			   name-start)))
-	       (setq ret att))))
-      (setq atts (cdr atts))
-      (unless atts
-	(setq atts more-atts)
-	(setq more-atts nil)))
-    ret))
-
-(defun nxml-up-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-up-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point) (point-max)))
-	  (let ((token-end (nxml-token-after)))
-	    (goto-char (cond ((or (memq xmltok-type '(end-tag
-						      partial-end-tag))
-				  (and (memq xmltok-type
-					     '(empty-element
-					       partial-empty-element))
-				       (< xmltok-start (point))))
-			      token-end)
-			     ((nxml-scan-element-forward
-			       (if (and (eq xmltok-type 'start-tag)
-					(= (point) xmltok-start))
-				   xmltok-start
-				 token-end)
-			       t))
-			     (t (error "No parent element")))))
-	  (setq arg (1- arg)))
-      (nxml-scan-error
-       (goto-char (cadr err))
-       (apply 'error (cddr err))))))
-
-(defun nxml-backward-up-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-up-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point-min) (point)))
-	  (let ((token-end (nxml-token-before)))
-	    (goto-char (cond ((or (memq xmltok-type '(start-tag
-						      partial-start-tag))
-				  (and (memq xmltok-type
-					     '(empty-element
-					       partial-empty-element))
-				       (< (point) token-end)))
-			      xmltok-start)
-			     ((nxml-scan-element-backward
-			       (if (and (eq xmltok-type 'end-tag)
-					(= (point) token-end))
-				   token-end
-				 xmltok-start)
-			       t)
-			      xmltok-start)
-			     (t (error "No parent element")))))
-	  (setq arg (1- arg)))
-      (nxml-scan-error
-       (goto-char (cadr err))
-       (apply 'error (cddr err))))))
-
-(defun nxml-down-element (&optional arg)
-  "Move forward down into the content of an element.
-With ARG, do this that many times.
-Negative ARG means move backward but still down."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-down-element (- arg))
-    (while (> arg 0)
-      (goto-char
-       (let ((token-end (nxml-token-after)))
-	 (save-excursion
-	   (goto-char token-end)
-	   (while (progn
-		    (when (memq xmltok-type '(nil end-tag partial-end-tag))
-		      (error "No following start-tags in this element"))
-		    (not (memq xmltok-type '(start-tag partial-start-tag))))
-	     (nxml-tokenize-forward))
-	   (point))))
-      (setq arg (1- arg)))))
-
-(defun nxml-backward-down-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-down-element (- arg))
-    (while (> arg 0)
-      (goto-char
-	 (save-excursion
-	   (nxml-token-before)
-	   (goto-char xmltok-start)
-	   (while (progn
-		    (when (memq xmltok-type '(start-tag
-					      partial-start-tag
-					      prolog
-					      nil))
-		      (error "No preceding end-tags in this element"))
-		    (not (memq xmltok-type '(end-tag partial-end-tag))))
-	     (if (or (<= (point) nxml-prolog-end)
-		     (not (search-backward "<" nxml-prolog-end t)))
-		 (setq xmltok-type nil)
-	       (nxml-move-outside-backwards)
-	       (xmltok-forward)))
-	   xmltok-start))
-      (setq arg (1- arg)))))
-
-(defun nxml-forward-element (&optional arg)
-  "Move forward over one element.
-With ARG, do it that many times.
-Negative ARG means move backward."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point) (point-max)))
-	  (goto-char
-	   (or (nxml-scan-element-forward (nxml-token-before))
-	       (error "No more elements")))
-	  (setq arg (1- arg)))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err))))))
-
-(defun nxml-backward-element (&optional arg)
-  "Move backward over one element.
-With ARG, do it that many times.
-Negative ARG means move forward."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-forward-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point-min) (point)))
-	  (goto-char
-	   (or (and (nxml-scan-element-backward (progn
-						  (nxml-token-after)
-						  xmltok-start))
-		    xmltok-start)
-	       (error "No preceding elements")))
-	  (setq arg (1- arg)))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err))))))
-
-(defun nxml-mark-token-after ()
-  (interactive)
-  (push-mark (nxml-token-after) nil t)
-  (goto-char xmltok-start)
-  (message "Marked %s" xmltok-type))
-
-;;; Paragraphs
-
-(defun nxml-mark-paragraph ()
-  "Put point at beginning of this paragraph, mark at end.
-The paragraph marked is the one that contains point or follows point."
-  (interactive)
-  (nxml-forward-paragraph)
-  (push-mark nil t t)
-  (nxml-backward-paragraph))
-
-(defun nxml-forward-paragraph (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((< arg 0)
-	 (nxml-backward-paragraph (- arg)))
-	((> arg 0)
-	 (forward-line 0)
-	 (while (and (nxml-forward-single-paragraph)
-		     (> (setq arg (1- arg)) 0))))))
-
-(defun nxml-backward-paragraph (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((< arg 0)
-	 (nxml-forward-paragraph (- arg)))
-	((> arg 0)
-	 (unless (bolp)
-	   (let ((inhibit-field-text-motion t))
-	     (end-of-line)))
-	 (while (and (nxml-backward-single-paragraph)
-		     (> (setq arg (1- arg)) 0))))))
-
-(defun nxml-forward-single-paragraph ()
-  "Move forward over a single paragraph.
-Return nil at end of buffer, t otherwise."
-  (let* ((token-end (nxml-token-after))
-	 (offset (- (point) xmltok-start))
-	 pos had-data)
-    (goto-char token-end)
-    (while (and (< (point) (point-max))
-		(not (setq pos
-			   (nxml-paragraph-end-pos had-data offset))))
-      (when (nxml-token-contains-data-p offset)
-	(setq had-data t))
-      (nxml-tokenize-forward)
-      (setq offset 0))
-    (when pos (goto-char pos))))
-
-(defun nxml-backward-single-paragraph ()
-  "Move backward over a single paragraph.
-Return nil at start of buffer, t otherwise."
-  (let* ((token-end (nxml-token-before))
-	 (offset (- token-end (point)))
-	 (last-tag-pos xmltok-start)
-	 pos had-data last-data-pos)
-    (goto-char token-end)
-    (unless (setq pos (nxml-paragraph-start-pos nil offset))
-      (setq had-data (nxml-token-contains-data-p nil offset))
-      (goto-char xmltok-start)
-      (while (and (not pos) (< (point-min) (point)))
-	(cond ((search-backward "<" nxml-prolog-end t)
-	       (nxml-move-outside-backwards)
-	       (save-excursion
-		 (while (< (point) last-tag-pos)
-		   (xmltok-forward)
-		   (when (and (not had-data) (nxml-token-contains-data-p))
-		     (setq pos nil)
-		     (setq last-data-pos xmltok-start))
-		   (let ((tem (nxml-paragraph-start-pos had-data 0)))
-		     (when tem (setq pos tem)))))
-	       (when (and (not had-data) last-data-pos (not pos))
-		 (setq had-data t)
-		 (save-excursion
-		   (while (< (point) last-data-pos)
-		     (xmltok-forward))
-		   (let ((tem (nxml-paragraph-start-pos had-data 0)))
-		     (when tem (setq pos tem)))))
-	       (setq last-tag-pos (point)))
-	      (t (goto-char (point-min))))))
-    (when pos (goto-char pos))))
-
-(defun nxml-token-contains-data-p (&optional start end)
-  (setq start (+ xmltok-start (or start 0)))
-  (setq end (- (point) (or end 0)))
-  (when (eq xmltok-type 'cdata-section)
-    (setq start (max start (+ xmltok-start 9)))
-    (setq end (min end (- (point) 3))))
-  (or (and (eq xmltok-type 'data)
-	   (eq start xmltok-start)
-	   (eq end (point)))
-      (eq xmltok-type 'char-ref)
-      (and (memq xmltok-type '(data cdata-section))
-	   (< start end)
-	   (save-excursion
-	     (goto-char start)
-	     (re-search-forward "[^ \t\r\n]" end t)))))
-
-(defun nxml-paragraph-end-pos (had-data offset)
-  "Return the position of the paragraph end if contained in the current token.
-Return nil if the current token does not contain the paragraph end.
-Only characters after OFFSET from the start of the token are eligible.
-HAD-DATA says whether there have been non-whitespace data characters yet."
-  (cond ((not had-data)
-	 (cond ((memq xmltok-type '(data cdata-section))
-		(save-excursion
-		  (let ((end (point)))
-		    (goto-char (+ xmltok-start
-				  (max (if (eq xmltok-type 'cdata-section)
-					   9
-					 0)
-				       offset)))
-		    (and (re-search-forward "[^ \t\r\n]" end t)
-			 (re-search-forward "^[ \t]*$" end t)
-			 (match-beginning 0)))))
-	       ((and (eq xmltok-type 'comment)
-		     (nxml-token-begins-line-p)
-		     (nxml-token-ends-line-p))
-		(save-excursion
-		  (let ((end (point)))
-		    (goto-char (+ xmltok-start (max 4 offset)))
-		    (when (re-search-forward "[^ \t\r\n]" (- end 3) t)
-		      (if (re-search-forward "^[ \t]*$" end t)
-			  (match-beginning 0)
-			(goto-char (- end 3))
-			(skip-chars-backward " \t")
-			(unless (bolp)
-			  (beginning-of-line 2))
-			(point))))))))
-	((memq xmltok-type '(data space cdata-section))
-	 (save-excursion
-	   (let ((end (point)))
-	     (goto-char (+ xmltok-start offset))
-	     (and (re-search-forward "^[ \t]*$" end t)
-		  (match-beginning 0)))))
-	((and (memq xmltok-type '(start-tag 
-				  end-tag
-				  empty-element
-				  comment
-				  processing-instruction
-				  entity-ref))
-	      (nxml-token-begins-line-p)
-	      (nxml-token-ends-line-p))
-	 (save-excursion
-	   (goto-char xmltok-start)
-	   (skip-chars-backward " \t")
-	   (point)))
-	((and (eq xmltok-type 'end-tag)
-	      (looking-at "[ \t]*$")
-	      (not (nxml-in-mixed-content-p t)))
-	 (save-excursion
-	   (or (search-forward "\n" nil t) 
-	       (point-max))))))
-
-(defun nxml-paragraph-start-pos (had-data offset)
-  "Return the position of the paragraph start if contained in the current token.
-Return nil if the current token does not contain the paragraph start.
-Only characters before OFFSET from the end of the token are eligible.
-HAD-DATA says whether there have been non-whitespace data characters yet."
-  (cond ((not had-data)
-	 (cond ((memq xmltok-type '(data cdata-section))
-		(save-excursion
-		  (goto-char (- (point)
-				(max (if (eq xmltok-type 'cdata-section)
-					 3
-				       0)
-				     offset)))
-		  (and (re-search-backward "[^ \t\r\n]" xmltok-start t)
-		       (re-search-backward "^[ \t]*$" xmltok-start t)
-		       (match-beginning 0))))
-	       ((and (eq xmltok-type 'comment)
-		     (nxml-token-ends-line-p)
-		     (nxml-token-begins-line-p))
-		(save-excursion
-		  (goto-char (- (point) (max 3 offset)))
-		  (when (and (< (+ xmltok-start 4) (point))
-			     (re-search-backward "[^ \t\r\n]"
-						 (+ xmltok-start 4)
-						 t))
-		    (if (re-search-backward "^[ \t]*$" xmltok-start t)
-			(match-beginning 0)
-		      (goto-char xmltok-start)
-		      (if (looking-at "<!--[ \t]*\n")
-			  (match-end 0)
-			(skip-chars-backward " \t")
-			(point))))))))
-	((memq xmltok-type '(data space cdata-section))
-	 (save-excursion
-	   (goto-char (- (point) offset))
-	   (and (re-search-backward "^[ \t]*$" xmltok-start t)
-		(match-beginning 0))))
-	((and (memq xmltok-type '(start-tag 
-				  end-tag
-				  empty-element
-				  comment
-				  processing-instruction
-				  entity-ref))
-	      (nxml-token-ends-line-p)
-	      (nxml-token-begins-line-p))
-	 (or (search-forward "\n" nil t) 
-	     (point-max)))
-	((and (eq xmltok-type 'start-tag)
-	      (nxml-token-begins-line-p)
-	      (not (save-excursion
-		     (goto-char xmltok-start)
-		     (nxml-in-mixed-content-p nil))))
-	 (save-excursion
-	   (goto-char xmltok-start)
-	   (skip-chars-backward " \t")
-	   ;; include any blank line before
-	   (or (and (eq (char-before) ?\n)
-		    (save-excursion
-		      (goto-char (1- (point)))
-		      (skip-chars-backward " \t")
-		      (and (bolp) (point))))
-	       (point))))))
-
-(defun nxml-token-ends-line-p () (looking-at "[ \t]*$"))
-
-(defun nxml-token-begins-line-p ()
-  (save-excursion
-    (goto-char xmltok-start)
-    (skip-chars-backward " \t")
-    (bolp)))
-
-(defun nxml-in-mixed-content-p (endp)
-  "Return non-nil if point is in mixed content.
-Point must be after an end-tag or before a start-tag.
-ENDP is t in the former case, nil in the latter."
-  (let (matching-tag-pos)
-    (cond ((not (run-hook-with-args-until-failure
-		 'nxml-in-mixed-content-hook))
-	   nil)
-	  ;; See if the matching tag does not start or end a line.
-	  ((condition-case err
-	       (progn
-		 (setq matching-tag-pos
-		       (xmltok-save
-			 (if endp
-			     (and (nxml-scan-element-backward (point))
-				  xmltok-start)
-			   (nxml-scan-element-forward (point)))))
-		 (and matching-tag-pos
-		      (save-excursion
-			(goto-char matching-tag-pos)
-			(not (if endp
-				 (progn
-				   (skip-chars-backward " \t")
-				   (bolp))
-			       (looking-at "[ \t]*$"))))))
-	     (nxml-scan-error nil))
-	   t)
-	  ;; See if there's data at the same level.
-	  ((let (start end)
-	     (if endp
-		 (setq start matching-tag-pos
-		       end (point))
-	       (setq start (point)
-		     end matching-tag-pos))
-	     (save-excursion
-	       (or (when start
-		     (goto-char start)
-		     (nxml-preceding-sibling-data-p))
-		   (when end
-		     (goto-char end)
-		     (nxml-following-sibling-data-p)))))
-	   t)
-	  ;; Otherwise, treat as not mixed
-	  (t nil))))
-
-(defun nxml-preceding-sibling-data-p ()
-  "Return non-nil if there is a previous sibling that is data."
-  (let ((lim (max (- (point) nxml-mixed-scan-distance)
-		  nxml-prolog-end))
-	(level 0)
-	found end)
-    (xmltok-save
-      (save-excursion
-	(while (and (< lim (point))
-		    (>= level 0)
-		    (not found)
-		    (progn
-		      (setq end (point))
-		      (search-backward "<" lim t)))
-	  (nxml-move-outside-backwards)
-	  (save-excursion
-	    (xmltok-forward)
-	    (let ((prev-level level))
-	      (cond ((eq xmltok-type 'end-tag)
-		     (setq level (1+ level)))
-		    ((eq xmltok-type 'start-tag)
-		     (setq level (1- level))))
-	      (when (eq prev-level 0)
-		(while (and (< (point) end) (not found))
-		  (xmltok-forward)
-		  (when (memq xmltok-type '(data cdata-section char-ref))
-		    (setq found t)))))))))
-    found))
-
-(defun nxml-following-sibling-data-p ()
-  (let ((lim (min (+ (point) nxml-mixed-scan-distance)
-		  (point-max)))
-	(level 0)
-	found)
-    (xmltok-save
-      (save-excursion
-	(while (and (< (point) lim)
-		    (>= level 0)
-		    (nxml-tokenize-forward)
-		    (not found))
-	  (cond ((eq xmltok-type 'start-tag)
-		 (setq level (1+ level)))
-		((eq xmltok-type 'end-tag)
-		 (setq level (1- level)))
-		((and (eq level 0)
-		      (memq xmltok-type '(data cdata-section char-ref)))
-		 (setq found t))))))
-    found))
-
-;;; Filling
-
-(defun nxml-do-fill-paragraph (arg)
-  (let (fill-paragraph-function
-	fill-prefix
-	start end)
-    (save-excursion
-      (nxml-forward-paragraph)
-      (setq end (point))
-      (nxml-backward-paragraph)
-      (skip-chars-forward " \t\r\n")
-      (setq start (point))
-      (beginning-of-line)
-      (setq fill-prefix (buffer-substring-no-properties (point) start))
-      (when (and (not (nxml-get-inside (point)))
-		 (looking-at "[ \t]*<!--"))
-	(setq fill-prefix (concat fill-prefix "     ")))
-      (fill-region-as-paragraph start end arg))
-    (skip-line-prefix fill-prefix)
-    fill-prefix))
-    
-(defun nxml-newline-and-indent (soft)
-  (delete-horizontal-space)
-  (if soft (insert-and-inherit ?\n) (newline 1))
-  (nxml-indent-line))
-
-
-;;; Dynamic markup
-
-(defvar nxml-dynamic-markup-prev-pos nil)
-(defvar nxml-dynamic-markup-prev-lengths nil)
-(defvar nxml-dynamic-markup-prev-found-marker nil)
-(defvar nxml-dynamic-markup-prev-start-tags (make-hash-table :test 'equal))
-
-(defun nxml-dynamic-markup-word ()
-  "Dynamically markup the word before point.
-This attempts to find a tag to put around the word before point based
-on the contents of the current buffer. The end-tag will be inserted at
-point.  The start-tag will be inserted at or before the beginning of
-the word before point; the contents of the current buffer is used to
-decide where.
-
-It works in a similar way to \\[dabbrev-expand]. It searches first
-backwards from point, then forwards from point for an element whose
-content is a string which matches the contents of the buffer before
-point and which includes at least the word before point. It then
-copies the start- and end-tags from that element and uses them to
-surround the matching string before point.
-
-Repeating \\[nxml-dynamic-markup-word] immediately after successful
-\\[nxml-dynamic-markup-word] removes the previously inserted markup
-and attempts to find another possible way to do the markup."
-  (interactive "*")
-  (let (search-start-pos done)
-    (if (and (integerp nxml-dynamic-markup-prev-pos)
-	     (= nxml-dynamic-markup-prev-pos (point))
-	     (eq last-command this-command)
-	     nxml-dynamic-markup-prev-lengths)
-	(let* ((end-tag-open-pos
-		(- nxml-dynamic-markup-prev-pos
-		   (nth 2 nxml-dynamic-markup-prev-lengths)))
-	       (start-tag-close-pos
-		(- end-tag-open-pos
-		   (nth 1 nxml-dynamic-markup-prev-lengths)))
-	       (start-tag-open-pos
-		(- start-tag-close-pos
-		   (nth 0 nxml-dynamic-markup-prev-lengths))))
-	  (delete-region end-tag-open-pos nxml-dynamic-markup-prev-pos)
-	  (delete-region start-tag-open-pos start-tag-close-pos)
-	  (setq search-start-pos
-		(marker-position nxml-dynamic-markup-prev-found-marker)))
-      (clrhash nxml-dynamic-markup-prev-start-tags))
-    (setq nxml-dynamic-markup-prev-pos nil)
-    (setq nxml-dynamic-markup-prev-lengths nil)
-    (setq nxml-dynamic-markup-prev-found-marker nil)
-    (goto-char
-     (save-excursion
-       (let* ((pos (point))
-	      (word (progn
-		      (backward-word 1)
-		      (unless (< (point) pos)
-			(error "No word to markup"))
-		      (buffer-substring-no-properties (point) pos)))
-	      (search (concat word "</"))
-	      done)
-	 (when search-start-pos
-	   (goto-char search-start-pos))
-	 (while (and (not done)
-		     (or (and (< (point) pos)
-			      (or (search-backward search nil t)
-				  (progn (goto-char pos) nil)))
-			 (search-forward search nil t)))
-	   (goto-char (- (match-end 0) 2))
-	   (setq done (nxml-try-copy-markup pos)))
-	 (or done
-	     (error (if (zerop (hash-table-count
-				nxml-dynamic-markup-prev-start-tags))
-			"No possible markup found for `%s'"
-		      "No more markup possibilities found for `%s'")
-		    word)))))))
-
-(defun nxml-try-copy-markup (word-end-pos)
-  (save-excursion
-    (let ((end-tag-pos (point)))
-      (when (and (not (nxml-get-inside end-tag-pos))
-		 (search-backward "<" nil t)
-		 (not (nxml-get-inside (point))))
-	(xmltok-forward)
-	(when (and (eq xmltok-type 'start-tag)
-		   (< (point) end-tag-pos))
-	  (let* ((start-tag-close-pos (point))
-		 (start-tag
-		  (buffer-substring-no-properties xmltok-start
-						  start-tag-close-pos))
-		 (words
-		  (nreverse
-		   (split-string
-		    (buffer-substring-no-properties start-tag-close-pos
-						    end-tag-pos)
-		    "[ \t\r\n]+"))))
-	    (goto-char word-end-pos)
-	    (while (and words
-			(re-search-backward (concat
-					     (regexp-quote (car words))
-					     "\\=")
-					    nil
-					    t))
-	      (setq words (cdr words))
-	      (skip-chars-backward " \t\r\n"))
-	    (when (and (not words)
-		       (progn
-			 (skip-chars-forward " \t\r\n")
-			 (not (gethash (cons (point) start-tag)
-				       nxml-dynamic-markup-prev-start-tags)))
-		       (or (< end-tag-pos (point))
-			   (< word-end-pos xmltok-start)))
-	      (setq nxml-dynamic-markup-prev-found-marker
-		    (copy-marker end-tag-pos t))
-	      (puthash (cons (point) start-tag)
-		       t
-		       nxml-dynamic-markup-prev-start-tags)
-	      (setq nxml-dynamic-markup-prev-lengths
-		    (list (- start-tag-close-pos xmltok-start)
-			  (-  word-end-pos (point))
-			  (+ (- xmltok-name-end xmltok-start) 2)))
-	      (let ((name (xmltok-start-tag-qname)))
-		(insert start-tag)
-		(goto-char (+ word-end-pos
-			      (- start-tag-close-pos xmltok-start)))
-		(insert "</" name ">")
-		(setq nxml-dynamic-markup-prev-pos (point))))))))))
-							   
-
-;;; Character names
-
-(defvar nxml-char-name-ignore-case nil)
-
-(defvar nxml-char-name-alist nil
-  "Alist of character names.
-Each member of the list has the form (NAME CODE . NAMESET),
-where NAME is a string naming a character, NAMESET is a symbol
-identifying a set of names and CODE is an integer specifying the
-Unicode scalar value of the named character.
-The NAME will only be used for completion if NAMESET has
-a non-nil `nxml-char-name-set-enabled' property.
-If NAMESET does does not have `nxml-char-name-set-defined' property,
-then it must have a `nxml-char-name-set-file' property and `load'
-will be applied to the value of this property if the nameset
-is enabled.")
-
-(defvar nxml-char-name-table (make-hash-table :test 'eq)
-  "Hash table for mapping char codes to names.
-Each key is a Unicode scalar value.
-Each value is a list of pairs of the form (NAMESET . NAME),
-where NAMESET is a symbol identifying a set of names,
-and NAME is a string naming a character.")
-
-(defvar nxml-autoload-char-name-set-list nil
-  "List of char namesets that can be autoloaded.")
-
-(defun nxml-enable-char-name-set (nameset)    
-  (put nameset 'nxml-char-name-set-enabled t))
-
-(defun nxml-disable-char-name-set (nameset)    
-  (put nameset 'nxml-char-name-set-enabled nil))
-
-(defun nxml-char-name-set-enabled-p (nameset)
-  (get nameset 'nxml-char-name-set-enabled))
-
-(defun nxml-autoload-char-name-set (nameset file)
-  (unless (memq nameset nxml-autoload-char-name-set-list)
-    (setq nxml-autoload-char-name-set-list
-	  (cons nameset nxml-autoload-char-name-set-list)))
-  (put nameset 'nxml-char-name-set-file file))
-
-(defun nxml-define-char-name-set (nameset alist)
-  "Define a set of character names.
-NAMESET is a symbol identifying the set.
-Alist is a list where each member has the form (NAME CODE),
-where NAME is a string naming a character and code
-is an integer giving the Unicode scalar value of the character."
-  (when (get nameset 'nxml-char-name-set-defined)
-    (error "Nameset `%s' already defined" nameset))
-  (let ((iter alist))
-    (while iter
-      (let* ((name-code (car iter))
-	     (name (car name-code))
-	     (code (cadr name-code)))
-	(puthash code
-		 (cons (cons nameset name)
-		       (gethash code nxml-char-name-table))
-		 nxml-char-name-table))
-      (setcdr (cdr (car iter)) nameset)
-      (setq iter (cdr iter))))
-  (setq nxml-char-name-alist
-	(nconc alist nxml-char-name-alist))
-  (put nameset 'nxml-char-name-set-defined t))
-
-(defun nxml-get-char-name (code)
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
-  (let ((names (gethash code nxml-char-name-table))
-	name)
-    (while (and names (not name))
-      (if (nxml-char-name-set-enabled-p (caar names))
-	  (setq name (cdar names))
-	(setq names (cdr names))))
-    name))
-
-(defvar nxml-named-char-history nil)
-
-(defun nxml-insert-named-char (arg)
-  "Insert a character using its name.
-The name is read from the minibuffer.
-Normally, inserts the character as a numeric character reference.
-With a prefix argument, inserts the character directly."
-  (interactive "*P")
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
-  (let ((name
-	 (let ((completion-ignore-case nxml-char-name-ignore-case))
-	   (completing-read "Character name: "
-			    nxml-char-name-alist
-			    (lambda (member)
-			      (get (cddr member) 'nxml-char-name-set-enabled))
-			    t
-			    nil
-			    'nxml-named-char-history)))
-	(alist nxml-char-name-alist)
-	elt code)
-    (while (and alist (not code))
-      (setq elt (assoc name alist))
-      (if (get (cddr elt) 'nxml-char-name-set-enabled)
-	  (setq code (cadr elt))
-	(setq alist (cdr (member elt alist)))))
-    (when code
-      (insert (if arg
-		  (or (decode-char 'ucs code)
-		      (error "Character %x is not supported by Emacs"
-			     code))
-		(format "&#x%X;" code))))))
-  
-(defun nxml-maybe-load-char-name-set (sym)
-  (when (and (get sym 'nxml-char-name-set-enabled)
-	     (not (get sym 'nxml-char-name-set-defined))
-	     (stringp (get sym 'nxml-char-name-set-file)))
-    (load (get sym 'nxml-char-name-set-file))))
-
-(defun nxml-toggle-char-ref-extra-display (arg)
-  "*Toggle the display of extra information for character references."
-  (interactive "P")
-  (let ((new (if (null arg)
-		 (not nxml-char-ref-extra-display)
-	       (> (prefix-numeric-value arg) 0))))
-    (when (not (eq new nxml-char-ref-extra-display))
-      (setq nxml-char-ref-extra-display new)
-      (save-excursion
-	(save-restriction
-	  (widen)
-	  (if nxml-char-ref-extra-display
-	      (nxml-with-unmodifying-text-property-changes
-		(nxml-clear-fontified (point-min) (point-max)))
-	    (nxml-clear-char-ref-extra-display (point-min) (point-max))))))))
-
-(put 'nxml-char-ref 'evaporate t)
-
-(defun nxml-char-ref-display-extra (start end n)
-  (when nxml-char-ref-extra-display
-    (let ((name (nxml-get-char-name n))
-	  (glyph-string (and nxml-char-ref-display-glyph-flag
-			     (nxml-glyph-display-string n 'nxml-glyph-face)))
-	  ov)
-    (when (or name glyph-string)
-      (setq ov (make-overlay start end nil t))
-      (overlay-put ov 'category 'nxml-char-ref)
-      (when name
-	(overlay-put ov 'help-echo name))
-      (when glyph-string
-	(overlay-put ov
-		     'after-string
-		     (propertize glyph-string 'face 'nxml-glyph-face)))))))
-
-(defun nxml-clear-char-ref-extra-display (start end)
-  (let ((ov (overlays-in start end)))
-    (while ov
-      (when (eq (overlay-get (car ov) 'category) 'nxml-char-ref)
-	(delete-overlay (car ov)))
-      (setq ov (cdr ov)))))
-
-;;; Versioning
-
-(defun nxml-version ()
-  "Show the version of nXML mode that is being used."
-  (interactive)
-  (if nxml-version
-      (message "nXML mode version %s" nxml-version)
-    (message "nXML mode version unknown")))
-
-
-(defun nxml-start-delimiter-length (type)
-  (or (get type 'nxml-start-delimiter-length)
-      0))
-			
-(put 'cdata-section 'nxml-start-delimiter-length 9)
-(put 'comment 'nxml-start-delimiter-length 4)
-(put 'processing-instruction 'nxml-start-delimiter-length 2)
-(put 'start-tag 'nxml-start-delimiter-length 1)
-(put 'empty-element 'nxml-start-delimiter-length 1)
-(put 'partial-empty-element 'nxml-start-delimiter-length 1)
-(put 'entity-ref 'nxml-start-delimiter-length 1)
-(put 'char-ref 'nxml-start-delimiter-length 2)
-
-(defun nxml-end-delimiter-length (type)
-  (or (get type 'nxml-end-delimiter-length)
-      0))
-			
-(put 'cdata-section 'nxml-end-delimiter-length 3)
-(put 'comment 'nxml-end-delimiter-length 3)
-(put 'processing-instruction 'nxml-end-delimiter-length 2)
-(put 'start-tag 'nxml-end-delimiter-length 1)
-(put 'empty-element 'nxml-end-delimiter-length 2)
-(put 'partial-empty-element 'nxml-end-delimiter-length 1)
-(put 'entity-ref 'nxml-end-delimiter-length 1)
-(put 'char-ref 'nxml-end-delimiter-length 1)
-
-(defun nxml-token-type-friendly-name (type)
-  (or (get type 'nxml-friendly-name)
-      (symbol-name type)))
-
-(put 'cdata-section 'nxml-friendly-name "CDATA section")
-(put 'processing-instruction 'nxml-friendly-name "processing instruction")
-(put 'entity-ref 'nxml-friendly-name "entity reference")
-(put 'char-ref 'nxml-friendly-name "character reference")
-
-(provide 'nxml-mode)
-
-;;; nxml-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.el
deleted file mode 100644
index 821b40621f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.el
+++ /dev/null
@@ -1,2665 +0,0 @@
-;;; nxml-mode.el --- a new XML mode
-
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; To use this include rng-auto.el in your .emacs.
-
-;; See nxml-rap.el for description of parsing strategy.
-
-;; The font locking here is independent of font-lock.el.  We want to
-;; do more sophisticated handling of changes and we want to use the
-;; same xmltok rather than regexps for parsing so that we parse
-;; consistently and correctly.
-
-;;; Code:
-
-(when (featurep 'mucs)
-  (error "nxml-mode is not compatible with Mule-UCS"))
-
-(require 'xmltok)
-(require 'nxml-enc)
-(require 'nxml-glyph)
-(require 'nxml-util)
-(require 'nxml-rap)
-(require 'nxml-outln)
-
-;;; Customization
-
-(defgroup nxml nil
-  "New XML editing mode"
-  :group 'languages
-  :group 'wp)
-
-(defgroup nxml-highlighting-faces nil
-  "Faces for XML syntax highlighting."
-  :group 'nxml
-  :group 'font-lock-highlighting-faces)
-
-(defcustom nxml-syntax-highlight-flag t
-  "*Non-nil means nxml-mode should perform syntax highlighting."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-char-ref-display-glyph-flag t
-  "*Non-nil means display glyph following character reference.
-The glyph is displayed in `nxml-glyph-face'.  The hook
-`nxml-glyph-set-hook' can be used to customize for which characters
-glyphs are displayed."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-mode-hook nil
-  "Hook run by command `nxml-mode'."
-  :group 'nxml
-  :type 'hook)
-
-(defcustom nxml-sexp-element-flag nil
-  "*Non-nil means sexp commands treat an element as a single expression."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-slash-auto-complete-flag nil
-  "*Non-nil means typing a slash automatically completes the end-tag.
-This is used by `nxml-electric-slash'."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-child-indent 2
-  "*Indentation for the children of an element relative to the start-tag.
-This only applies when the line or lines containing the start-tag contains
-nothing else other than that start-tag."
-  :group 'nxml
-  :type 'integer)
-
-(defcustom nxml-attribute-indent 4
-  "*Indentation for the attributes of an element relative to the start-tag.
-This only applies when the first attribute of a tag starts a line. In other
-cases, the first attribute on one line is indented the same as the first
-attribute on the previous line."
-  :group 'nxml
-  :type 'integer)
-
-(defvar nxml-fontify-chunk-size 500)
-
-(defcustom nxml-bind-meta-tab-to-complete-flag (not window-system)
-  "*Non-nil means bind M-TAB in `nxml-mode-map' to `nxml-complete'.
-C-return will be bound to `nxml-complete' in any case.
-M-TAB gets swallowed by many window systems/managers, and
-`documentation' will show M-TAB rather than C-return as the
-binding `rng-complete' when both are bound.  So it's better
-to bind M-TAB only when it will work."
-  :group 'nxml
-  :set (lambda (sym flag)
-	 (set-default sym flag)
-	 (when (and (boundp 'nxml-mode-map) nxml-mode-map)
-	   (define-key nxml-mode-map "\M-\t" (and flag 'nxml-complete))))
-  :type 'boolean)
-
-(defcustom nxml-prefer-utf-16-to-utf-8-flag nil
-  "*Non-nil means prefer UTF-16 to UTF-8 when saving a buffer.
-This is used only when a buffer does not contain an encoding declaration
-and when its current `buffer-file-coding-system' specifies neither UTF-16
-nor UTF-8."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-prefer-utf-16-little-to-big-endian-flag (eq system-type
-							    'windows-nt)
-  "*Non-nil means prefer little-endian to big-endian byte-order for UTF-16.
-This is used only for saving a buffer; when reading the byte-order is
-auto-detected. It may be relevant both when there is no encoding declaration
-and when the encoding declaration specifies `UTF-16'."
-  :group 'nxml
-  :type 'boolean)
-
-(defcustom nxml-default-buffer-file-coding-system nil
-  "*Default value for `buffer-file-coding-system' for a buffer for a new file.
-Nil means use the default value of `buffer-file-coding-system' as normal.
-A buffer's `buffer-file-coding-system' affects what \\[nxml-insert-xml-declaration] inserts."
-  :group 'nxml
-  :type 'coding-system)
-
-(defcustom nxml-auto-insert-xml-declaration-flag nil
-  "*Non-nil means automatically insert an XML declaration in a new file.
-The XML declaration is inserted using `nxml-insert-xml-declaration'."
-  :group 'nxml
-  :type 'boolean)
-
-;; The following are the colors we use with a light background.
-;; The two blues have the same hue but contrasting saturation/value.
-;; The hue of the green is 120 degrees different from that of the
-;; blue.  The red used for highlighting errors is 120 degrees
-;; different again.  We use the light blue only for refs and
-;; delimiters, since these are short (long stretches in a light color
-;; would be too hard to read).  The dark blue is closest to black
-;; (which we use by default for text), so we use it for attribute
-;; values, which are similar to text.
-
-(defconst nxml-light-blue-color "#9292C9") ; hue 240
-(defconst nxml-dark-blue-color "#3A3A7B") ; hue 240
-(defconst nxml-green-color "#257A25") ; hue 120
-
-;; Similar principles apply with a dark background.  However,
-;; we switch green and blue, because darker blues are very hard to
-;; read (for me anyway) on a dark background.
-
-(defconst nxml-sky-blue-color "#ACACFC") ; hue 240
-(defconst nxml-dark-green-color "#00AD00") ; hue 120
-(defconst nxml-light-green-color "#70F170") ; hue 120
-
-(defface nxml-delimited-data-face
-  `((((class color) (background light)) (:foreground ,nxml-dark-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-light-green-color)))
-  "Face used to highlight data enclosed between delimiters.
-By default, this is inherited by `nxml-attribute-value-face'
-and `nxml-processing-instruction-content-face'."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-name-face
-  `((((class color) (background light)) (:foreground ,nxml-green-color))
-    (((class color) (background dark)) (:foreground ,nxml-sky-blue-color)))
-  "Face used to highlight various names.
-This includes element and attribute names, processing
-instruction targets and the CDATA keyword in a CDATA section.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-ref-face
-  `((((class color) (background light)) (:foreground ,nxml-light-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-dark-green-color)))
-  "Face used to highlight character and entity references.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-delimiter-face
-  `((((class color) (background light)) (:foreground ,nxml-light-blue-color))
-    (((class color) (background dark)) (:foreground ,nxml-dark-green-color))
-    (t (:bold t)))
-  "Face used to highlight delimiters.
-This is not used directly, but only via inheritance by other faces."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-text-face
-  nil
-  "Face used to highlight text."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-comment-content-face
-  '((t (:italic t)))
-  "Face used to highlight the content of comments."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-comment-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of comments, i.e <!-- and -->."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of processing instructions, i.e <? and ?>."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-target-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the target of processing instructions."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-processing-instruction-content-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the content of processing instructions."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of CDATA sections, i.e <![, [, and ]]>."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-CDATA-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the CDATA keyword in CDATA sections."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-cdata-section-content-face
-  '((t (:inherit nxml-text-face)))
-  "Face used for the content of CDATA sections."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-char-ref-number-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the number in character references.
-This includes ths `x' in hex references."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-char-ref-delimiter-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the delimiters of character references, i.e &# and ;."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-entity-ref-name-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the entity name in general entity references."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-entity-ref-delimiter-face
-  '((t (:inherit nxml-ref-face)))
-  "Face used for the delimiters of entity references, i.e & and ;."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-tag-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the angle brackets delimiting tags.
-`nxml-tag-slash-face' is used for slashes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-tag-slash-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for slashes in tags, both in end-tags and empty-elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix of elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in element names."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-element-local-name-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the local name of elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in attribute names."
-  :group 'nxml-highlighting-faces)
-  
-(defface nxml-attribute-local-name-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the local name of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-xmlns-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for `xmlns' in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-colon-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the colon in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-prefix-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for the prefix declared in namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-value-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the value of attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-attribute-value-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of attribute values."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-value-face
-  '((t (:inherit nxml-attribute-value-face)))
-  "Face used for the value of namespace attributes."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-namespace-attribute-value-delimiter-face
-  '((t (:inherit nxml-attribute-value-delimiter-face)))
-  "Face used for the delimiters of namespace attribute values."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-literal-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of literals in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-literal-content-face
-  '((t (:inherit nxml-delimited-data-face)))
-  "Face used for the content of literals in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-prolog-keyword-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for keywords in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-markup-declaration-delimiter-face
-  '((t (:inherit nxml-delimiter-face)))
-  "Face used for the delimiters of markup declarations in the prolog.
-The delimiters are <! and >."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-hash-face
-  '((t (:inherit nxml-name-face)))
-  "Face used for # before a name in the prolog."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-glyph-face
-  '((((type x))
-     (:family
-      "misc-fixed"
-      :background
-      "light grey"
-      :foreground
-      "black"
-      :weight
-      normal 
-      :slant
-      normal))
-    (t
-     (:background
-      "light grey"
-      :foreground
-      "black"
-      :weight
-      normal 
-      :slant
-      normal)))
-  "Face used for glyph for char references."
-  :group 'nxml-highlighting-faces)
-
-;;; Global variables
-
-;; This is initialized in rng-auto.el.
-(defvar nxml-version nil
-  "*The version of nxml-mode that is being used.")
-
-(defvar nxml-prolog-regions nil
-  "List of regions in the prolog to be fontified.
-See the function `xmltok-forward-prolog' for more information.")
-(make-variable-buffer-local 'nxml-prolog-regions)
-
-(defvar nxml-last-fontify-end nil
-  "Position where fontification last ended.
-Nil if the buffer changed since the last fontification.")
-(make-variable-buffer-local 'nxml-last-fontify-end)
-
-(defvar nxml-degraded nil
-  "Non-nil if currently operating in degraded mode.
-Degraded mode is enabled when an internal error is encountered in the
-fontification or after-change functions.")
-(make-variable-buffer-local 'nxml-degraded)
-
-(defvar nxml-completion-hook nil
-  "Hook run by `nxml-complete'.
-This hook is run until success.")
-
-(defvar nxml-in-mixed-content-hook nil
-  "Hook to determine whether point is in mixed content.
-The hook is called without arguments.  It should return nil if it is
-definitely not mixed; non-nil otherwise.  The hook will be run until
-one of the functions returns nil.")
-
-(defvar nxml-mixed-scan-distance 4000
-  "Maximum distance from point to scan when checking for mixed content.")
-
-(defvar nxml-end-tag-indent-scan-distance 4000
-  "Maximum distance from point to scan backwards when indenting end-tag.")
-
-(defvar nxml-char-ref-extra-display t
-  "Non-nil means display extra information for character references.
-The extra information consists of a tooltip with the character name
-and, if `nxml-char-ref-display-glyph-flag' is non-nil, a glyph
-corresponding to the referenced character following the character
-reference.")
-(make-variable-buffer-local 'nxml-char-ref-extra-display)
-
-(defvar nxml-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\M-\C-u" 'nxml-backward-up-element)
-    (define-key map "\M-\C-d" 'nxml-down-element)
-    (define-key map "\M-\C-n" 'nxml-forward-element)
-    (define-key map "\M-\C-p" 'nxml-backward-element)
-    (define-key map "\M-{" 'nxml-backward-paragraph)
-    (define-key map "\M-}" 'nxml-forward-paragraph)
-    (define-key map "\M-h" 'nxml-mark-paragraph)
-    (define-key map "\C-c\C-f" 'nxml-finish-element)
-    (define-key map "\C-c\C-m" 'nxml-split-element)
-    (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block)
-    (define-key map "\C-c\C-i" 'nxml-balanced-close-start-tag-inline)
-    (define-key map "\C-c\C-x" 'nxml-insert-xml-declaration)
-    (define-key map "\C-c\C-d" 'nxml-dynamic-markup-word)
-    ;; u is for Unicode
-    (define-key map "\C-c\C-u" 'nxml-insert-named-char)
-    (define-key map "\C-c\C-o" nxml-outline-prefix-map)
-    (define-key map [S-mouse-2] 'nxml-mouse-hide-direct-text-content)
-    (define-key map "/" 'nxml-electric-slash)
-    (define-key map [C-return] 'nxml-complete) 
-    (when nxml-bind-meta-tab-to-complete-flag
-      (define-key map "\M-\t" 'nxml-complete))
-    map)
-  "Keymap for nxml-mode.")
-
-(defsubst nxml-set-face (start end face)
-  (when (and face (< start end))
-    (put-text-property start end 'face face)))
-
-(defun nxml-clear-face (start end)
-  (remove-text-properties start end '(face nil))
-  (nxml-clear-char-ref-extra-display start end))
-
-(defsubst nxml-set-fontified (start end)
-  (put-text-property start end 'fontified t))
-
-(defsubst nxml-clear-fontified (start end)
-  (remove-text-properties start end '(fontified nil)))
-
-;;;###autoload
-(defun nxml-mode ()
-  ;; We use C-c C-i instead of \\[nxml-balanced-close-start-tag-inline]
-  ;; because Emacs turns C-c C-i into C-c TAB which is hard to type and
-  ;; not mnemonic.
-  "Major mode for editing XML.
-
-Syntax highlighting is performed unless the variable
-`nxml-syntax-highlight-flag' is nil.
-
-\\[nxml-finish-element] finishes the current element by inserting an end-tag.
-C-c C-i closes a start-tag with `>' and then inserts a balancing end-tag
-leaving point between the start-tag and end-tag. 
-\\[nxml-balanced-close-start-tag-block] is similar but for block rather than inline elements:
-the start-tag, point, and end-tag are all left on separate lines.
-If `nxml-slash-auto-complete-flag' is non-nil, then inserting a `</'
-automatically inserts the rest of the end-tag.
-
-\\[nxml-complete] performs completion on the symbol preceding point.
-
-\\[nxml-dynamic-markup-word] uses the contents of the current buffer
-to choose a tag to put around the word preceding point.
-
-Sections of the document can be displayed in outline form.  The
-variable `nxml-section-element-name-regexp' controls when an element
-is recognized as a section.  The same key sequences that change
-visibility in outline mode are used except that they start with C-c C-o
-instead of C-c.
-
-Validation is provided by the related minor-mode `rng-validate-mode'.
-This also makes completion schema- and context- sensitive.  Element
-names, attribute names, attribute values and namespace URIs can all be
-completed. By default, `rng-validate-mode' is automatically enabled by
-`rng-nxml-mode-init' which is normally added to `nxml-mode-hook'. You
-can toggle it using \\[rng-validate-mode].
-
-\\[indent-for-tab-command] indents the current line appropriately.
-This can be customized using the variable `nxml-child-indent'
-and the variable `nxml-attribute-indent'.
-
-\\[nxml-insert-named-char] inserts a character reference using
-the character's name (by default, the Unicode name). \\[universal-argument] \\[nxml-insert-named-char]
-inserts the character directly.
-
-The Emacs commands that normally operate on balanced expressions will
-operate on XML markup items.  Thus \\[forward-sexp] will move forward
-across one markup item; \\[backward-sexp] will move backward across
-one markup item; \\[kill-sexp] will kill the following markup item;
-\\[mark-sexp] will mark the following markup item.  By default, each
-tag each treated as a single markup item; to make the complete element
-be treated as a single markup item, set the variable
-`nxml-sexp-element-flag' to t.  For more details, see the function
-`nxml-forward-balanced-item'.
-
-\\[nxml-backward-up-element] and \\[nxml-down-element] move up and down the element structure.
-
-Many aspects this mode can be customized using
-\\[customize-group] nxml RET."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'nxml-mode)
-  (setq mode-name "nXML")
-  ;; We'll determine the fill prefix ourselves
-  (make-local-variable 'adaptive-fill-mode)
-  (setq adaptive-fill-mode nil)
-  (make-local-variable 'forward-sexp-function)
-  (setq forward-sexp-function 'nxml-forward-balanced-item)
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'nxml-indent-line)
-  (make-local-variable 'fill-paragraph-function)
-  (setq fill-paragraph-function 'nxml-do-fill-paragraph)
-  ;; Comment support
-  ;; This doesn't seem to work too well;
-  ;; I think we should probably roll our own nxml-comment-dwim function.
-  (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'nxml-indent-line)
-  (make-local-variable 'comment-start)
-  (setq comment-start "<!--")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "<!--[ \t\r\n]*")
-  (make-local-variable 'comment-end)
-  (setq comment-end "-->")
-  (make-local-variable 'comment-end-skip)
-  (setq comment-end-skip "[ \t\r\n]*-->")
-  (make-local-variable 'comment-line-break-function)
-  (setq comment-line-break-function 'nxml-newline-and-indent)
-  (use-local-map nxml-mode-map)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-clear-dependent-regions (point-min) (point-max))
-      (setq nxml-scan-end (copy-marker (point-min) nil))
-      (nxml-with-unmodifying-text-property-changes
-	(when nxml-syntax-highlight-flag
-	  (nxml-clear-fontified (point-min) (point-max)))
-	(nxml-clear-inside (point-min) (point-max))
-	(nxml-with-invisible-motion
-	  (nxml-scan-prolog)))))
-  (when nxml-syntax-highlight-flag
-    (add-hook 'fontification-functions 'nxml-fontify nil t))
-  (add-hook 'after-change-functions 'nxml-after-change nil t)
-  (add-hook 'write-contents-hooks 'nxml-prepare-to-save)
-  (when (not (and (buffer-file-name) (file-exists-p (buffer-file-name))))
-    (when (and nxml-default-buffer-file-coding-system
-	       (not (local-variable-p 'buffer-file-coding-system)))
-      (setq buffer-file-coding-system nxml-default-buffer-file-coding-system))
-    (when nxml-auto-insert-xml-declaration-flag
-      (nxml-insert-xml-declaration)))
-  (run-hooks 'nxml-mode-hook))
-
-(defun nxml-degrade (context err)
-  (message "Internal nXML mode error in %s (%s), degrading"
-	   context
-	   (error-message-string err))
-  (ding)
-  (setq nxml-degraded t)
-  (setq nxml-prolog-end 1)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-unmodifying-text-property-changes
-	(nxml-clear-face (point-min) (point-max))
-	(nxml-set-fontified (point-min) (point-max))
-	(nxml-clear-inside (point-min) (point-max)))
-      (setq mode-name "nXML/degraded"))))
-
-;;; Change management
-
-(defun nxml-after-change (start end pre-change-length)
-  ;; Work around bug in insert-file-contents.
-  (when (> end (1+ (buffer-size)))
-    (setq start 1)
-    (setq end (1+ (buffer-size))))
-  (unless nxml-degraded
-    (condition-case err
-	(save-excursion
-	  (save-restriction
-	    (widen)
-	    (save-match-data
-	      (nxml-with-invisible-motion
-		(nxml-with-unmodifying-text-property-changes
-		  (nxml-after-change1 start end pre-change-length))))))
-      (error
-       (nxml-degrade 'nxml-after-change err)))))
-
-(defun nxml-after-change1 (start end pre-change-length)
-  (setq nxml-last-fontify-end nil)
-  (let ((pre-change-end (+ start pre-change-length)))
-    (setq start
-	  (nxml-adjust-start-for-dependent-regions start
-						   end
-						   pre-change-length))
-    (when (<= start
-	      ;; Add 2 so as to include the < and following char
-	      ;; that start the instance, since changing these
-	      ;; can change where the prolog ends.
-	      (+ nxml-prolog-end 2))
-      ;; end must be extended to at least the end of the old prolog
-      (when (< pre-change-end nxml-prolog-end)
-	(setq end
-	      ;; don't let end get out of range even if pre-change-length
-	      ;; is bogus
-	      (min (point-max)
-		   (+ end (- nxml-prolog-end pre-change-end)))))
-      (nxml-scan-prolog)))
-  (cond ((<= end nxml-prolog-end)
-	 (setq end nxml-prolog-end)
-	 (goto-char start)
-	 ;; This is so that Emacs redisplay works
-	 (setq start (line-beginning-position)))
-	((and (<= start nxml-scan-end)
-	      (> start (point-min))
-	      (nxml-get-inside (1- start)))
-	 ;; The closing delimiter might have been removed.
-	 ;; So we may need to redisplay from the beginning
-	 ;; of the token.
-	 (goto-char (1- start))
-	 (nxml-move-outside-backwards)
-	 ;; This is so that Emacs redisplay works
-	 (setq start (line-beginning-position))
-	 (setq end (max (nxml-scan-after-change (point) end)
-			end)))
-	(t
-	 (goto-char start)
-	 ;; This is both for redisplay and to move back
-	 ;; past any incomplete opening delimiters
-	 (setq start (line-beginning-position))
-	 (setq end (max (nxml-scan-after-change start end)
-			end))))
-  (when nxml-syntax-highlight-flag
-    (when (>= start end)
-      ;; Must clear at least one char so as to trigger redisplay.
-      (cond ((< start (point-max))
-	     (setq end (1+ start)))
-	    (t
-	     (setq end (point-max))
-	     (goto-char end)
-	     (setq start (line-beginning-position)))))
-    (nxml-clear-fontified start end)))
-  
-;;; Encodings
-
-(defun nxml-insert-xml-declaration ()
-  "Insert an XML declaration at the beginning of buffer.
-The XML declaration will declare an encoding depending on the buffer's
-`buffer-file-coding-system'."
-  (interactive "*")
-  (let ((coding-system
-	 (if (and buffer-file-coding-system
-		  (coding-system-p buffer-file-coding-system)
-		  (coding-system-get buffer-file-coding-system
-				     'mime-charset))
-	     buffer-file-coding-system
-	   (nxml-choose-utf-coding-system))))
-    (goto-char (point-min))
-    (insert (format "<?xml version=\"1.0\" encoding=\"%s\"?>\n"
-		    (nxml-coding-system-name coding-system)))))
-
-(defun nxml-prepare-to-save ()
-  (unless (and (not enable-multibyte-characters)
-	       (local-variable-p 'buffer-file-coding-system)
-	       buffer-file-coding-system
-	       (or (eq (coding-system-type buffer-file-coding-system) 5)
-		   (eq buffer-file-coding-system 'no-conversion)))
-    (save-excursion
-      (setq buffer-file-coding-system (nxml-select-coding-system))))
-  ;; nil from a function in `write-contents-hooks' means
-  ;; to continue and write the file as normal
-  nil)
-
-(defun nxml-select-coding-system ()
-  (let* ((suitable-coding-systems
-	  (find-coding-systems-region (point-min) (point-max)))
-	 (enc-pos (progn
-		    (goto-char (point-min))
-		    (xmltok-get-declared-encoding-position)))
-	 (enc-name
-	  (and (consp enc-pos)
-	       (buffer-substring-no-properties (car enc-pos)
-					       (cdr enc-pos))))
-	 (coding-system
-	  (cond (enc-name
-		 (if (string= (downcase enc-name) "utf-16")
-		     (nxml-choose-utf-16-coding-system)
-		   (nxml-mime-charset-coding-system enc-name)))
-		(enc-pos (nxml-choose-utf-coding-system)))))
-    ;; Make sure we have a coding-system
-    (unless coding-system
-      (setq coding-system
-	    (and (not buffer-read-only)
-		 (nxml-choose-suitable-coding-system
-		  suitable-coding-systems)))
-      (let ((message
-	     (if enc-name
-		 (format "Unknown encoding %s" enc-name)
-	       "XML declaration is not well-formed")))
-	(cond ((not coding-system)
-	       (error "%s" message))
-	      ((y-or-n-p
-		(concat message
-			". "
-			(format (if enc-name
-				    "Save with %s"
-				  "Modify and save with encoding %s")
-				(nxml-coding-system-name coding-system))
-			" "))
-	       (nxml-fix-encoding-declaration enc-pos coding-system))
-	      (t (signal 'quit nil)))))
-    ;; Make sure it can encode all the characters in the buffer
-    (unless (or (memq (coding-system-base coding-system)
-		      suitable-coding-systems)
-		(equal suitable-coding-systems '(undecided)))
-      (let ((message
-	     (nxml-unsuitable-coding-system-message coding-system
-						    enc-name)))
-	(setq coding-system
-	      (and (not buffer-read-only)
-		   (nxml-choose-suitable-coding-system
-		    suitable-coding-systems)))
-	(cond ((not coding-system) (error "%s" message))
-	      ((y-or-n-p (concat message
-				 (format ". Save with %s "
-					 (nxml-coding-system-name
-					  coding-system))))
-	       (nxml-fix-encoding-declaration enc-pos coding-system))
-	      (t (signal 'quit nil)))))
-    ;; Merge the newline type of our existing encoding
-    (let ((current-eol-type
-	   (coding-system-eol-type buffer-file-coding-system)))
-      (when (and current-eol-type (integerp current-eol-type))
-	(setq coding-system
-	      (coding-system-change-eol-conversion coding-system
-						   current-eol-type))))
-    coding-system))
-
-(defun nxml-unsuitable-coding-system-message (coding-system &optional enc-name)
-  (if (nxml-coding-system-unicode-p coding-system)
-      "Cannot translate some characters to Unicode"
-    (format "Cannot encode some characters with %s"
-	    (or enc-name
-		(nxml-coding-system-name coding-system)))))
-
-(defconst nxml-utf-16-coding-systems (and (coding-system-p 'utf-16-be)
-					  (coding-system-p 'utf-16-le)
-					  '(utf-16-be utf-16-le)))
-
-(defconst nxml-utf-coding-systems (cons 'utf-8 nxml-utf-16-coding-systems))
-
-(defun nxml-coding-system-unicode-p (coding-system)
-  (nxml-coding-system-member (coding-system-base coding-system)
-			     nxml-utf-coding-systems))
-
-(defun nxml-coding-system-name (coding-system)
-  (setq coding-system (coding-system-base coding-system))
-  (symbol-name
-   (if (nxml-coding-system-member coding-system nxml-utf-16-coding-systems)
-       'utf-16
-     (or (coding-system-get coding-system 'mime-charset)
-	 coding-system))))
-
-(defun nxml-fix-encoding-declaration (enc-pos coding-system)
-  (let ((charset (nxml-coding-system-name coding-system)))
-    (cond ((consp enc-pos)
-	   (delete-region (car enc-pos) (cdr enc-pos))
-	   (goto-char (car enc-pos))
-	   (insert charset))
-	  ((integerp enc-pos)
-	   (goto-char enc-pos)
-	   (insert " encoding=\"" charset ?\"))
-	  (t
-	   (goto-char (point-min))
-	   (insert "<?xml version=\"1.0\" encoding=\""
-		   charset
-		   "\"?>\n")
-	   (when (and (not enc-pos)
-		      (let ((case-fold-search t))
-			(looking-at xmltok-bad-xml-decl-regexp)))
-	     (delete-region (point) (match-end 0)))))))
-
-(defun nxml-choose-suitable-coding-system (suitable-coding-systems)
-  (let (ret coding-system)
-    (if (and buffer-file-coding-system
-	     (memq (coding-system-base buffer-file-coding-system)
-		   suitable-coding-systems))
-	buffer-file-coding-system
-      (while (and suitable-coding-systems (not ret))
-	(setq coding-system (car suitable-coding-systems))
-	(if (coding-system-get coding-system 'mime-charset)
-	    (setq ret coding-system)
-	  (setq suitable-coding-systems (cdr suitable-coding-systems))))
-      ret)))
-
-(defun nxml-choose-utf-coding-system ()	     
-  (let ((cur (and (local-variable-p 'buffer-file-coding-system)
-		  buffer-file-coding-system
-		  (coding-system-base buffer-file-coding-system))))
-    (cond ((car (nxml-coding-system-member cur nxml-utf-coding-systems)))
-	  ((and nxml-prefer-utf-16-to-utf-8-flag
-		(coding-system-p 'utf-16-le)
-		(coding-system-p 'utf-16-be))
-	   (if nxml-prefer-utf-16-little-to-big-endian-flag
-	       'utf-16-le
-	     'utf-16-be))
-	  (t 'utf-8))))
-
-(defun nxml-choose-utf-16-coding-system ()
-  (let ((cur (and (local-variable-p 'buffer-file-coding-system)
-		  buffer-file-coding-system
-		  (coding-system-base buffer-file-coding-system))))
-    (cond ((car (nxml-coding-system-member cur nxml-utf-16-coding-systems)))
-	  (nxml-prefer-utf-16-little-to-big-endian-flag
-	   (and (coding-system-p 'utf-16-le) 'utf-16-le))
-	  (t (and (coding-system-p 'utf-16-be) 'utf-16-be)))))
-
-(defun nxml-coding-system-member (coding-system coding-systems)
-  (let (ret)
-    (while (and coding-systems (not ret))
-      (if (coding-system-equal coding-system
-			       (car coding-systems))
-	  (setq ret coding-systems)
-	(setq coding-systems (cdr coding-systems))))
-    ret))
-
-;;; Fontification
-
-(defun nxml-fontify (start)
-  (condition-case err
-      (save-excursion
-	(save-restriction
-	  (widen)
-	  (save-match-data
-	    (nxml-with-invisible-motion
-	      (nxml-with-unmodifying-text-property-changes
-		(if (or nxml-degraded
-			;; just in case we get called in the wrong buffer
-			(not nxml-prolog-end))
-		    (nxml-set-fontified start (point-max))
-		  (nxml-fontify1 start)))))))
-    (error
-     (nxml-degrade 'nxml-fontify err))))
-
-(defun nxml-fontify1 (start)
-  (cond ((< start nxml-prolog-end)
-	 (nxml-fontify-prolog)
-	 (nxml-set-fontified (point-min)
-			     nxml-prolog-end))
-	(t
-	 (goto-char start)
-	 (when (not (eq nxml-last-fontify-end start))
-	   (when (not (equal (char-after) ?\<))
-	     (search-backward "<" nxml-prolog-end t))
-	   (nxml-ensure-scan-up-to-date)
-	   (nxml-move-outside-backwards))
-	 (let ((start (point)))
-	   (nxml-do-fontify (min (point-max)
-				 (+ start nxml-fontify-chunk-size)))
-	   (setq nxml-last-fontify-end (point))
-	   (nxml-set-fontified start nxml-last-fontify-end)))))
-
-(defun nxml-fontify-buffer ()
-  (interactive)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-invisible-motion
-	(goto-char (point-min))
-	(nxml-with-unmodifying-text-property-changes
-	  (nxml-fontify-prolog)
-	  (goto-char nxml-prolog-end)
-	  (nxml-do-fontify))))))
-
-(defun nxml-fontify-prolog ()
-  "Fontify the prolog.
-The buffer is assumed to be prepared for fontification.
-This does not set the fontified property, but it does clear
-faces appropriately."
-  (let ((regions nxml-prolog-regions))
-    (nxml-clear-face (point-min) nxml-prolog-end)
-    (while regions
-      (let ((region (car regions)))
-	(nxml-apply-fontify-rule (aref region 0)
-				 (aref region 1)
-				 (aref region 2)))
-      (setq regions (cdr regions)))))
-
-(defun nxml-do-fontify (&optional bound)
-  "Fontify at least as far as bound.
-Leave point after last fontified position."
-  (unless bound (setq bound (point-max)))
-  (let (xmltok-dependent-regions
-	xmltok-errors)
-    (while (and (< (point) bound)
-		(nxml-tokenize-forward))
-      (nxml-clear-face xmltok-start (point))
-      (nxml-apply-fontify-rule))))
-
-;; Vectors identify a substring of the token to be highlighted in some face.
-
-;; Token types returned by xmltok-forward.
-
-(put 'start-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'partial-start-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'end-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [1 2 nxml-tag-slash-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 2)))
-
-(put 'partial-end-tag
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [1 2 nxml-tag-slash-face]
-       (element-qname . 2)))
-
-(put 'empty-element
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-2 -1 nxml-tag-slash-face]
-       [-1 nil nxml-tag-delimiter-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'partial-empty-element
-     'nxml-fontify-rule
-     '([nil 1 nxml-tag-delimiter-face]
-       [-1 nil nxml-tag-slash-face]
-       (element-qname . 1)
-       attributes))
-
-(put 'char-ref
-     'nxml-fontify-rule
-     '([nil 2 nxml-char-ref-delimiter-face]
-       [2 -1 nxml-char-ref-number-face]
-       [-1 nil nxml-char-ref-delimiter-face]
-       char-ref))
-
-(put 'entity-ref
-     'nxml-fontify-rule
-     '([nil 1 nxml-entity-ref-delimiter-face]
-       [1 -1 nxml-entity-ref-name-face]
-       [-1 nil nxml-entity-ref-delimiter-face]))
-
-(put 'comment
-     'nxml-fontify-rule
-     '([nil 4 nxml-comment-delimiter-face]
-       [4 -3 nxml-comment-content-face]
-       [-3 nil nxml-comment-delimiter-face]))
-
-(put 'processing-instruction
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]
-       processing-instruction-content))
-
-(put 'cdata-section
-     'nxml-fontify-rule
-     '([nil 3 nxml-cdata-section-delimiter-face] ; <![
-       [3 8 nxml-cdata-section-CDATA-face] ; CDATA
-       [8 9 nxml-cdata-section-delimiter-face] ; [
-       [9 -3 nxml-cdata-section-content-face] ; ]]>
-       [-3 nil nxml-cdata-section-delimiter-face]))
-
-(put 'data
-     'nxml-fontify-rule
-     '([nil nil nxml-text-face]))
-
-;; Prolog region types in list returned by xmltok-forward-prolog.
-
-(put 'xml-declaration
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [2 5 nxml-processing-instruction-target-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]))
-
-(put 'xml-declaration-attribute-name
-     'nxml-fontify-rule
-     '([nil nil nxml-attribute-local-name-face]))
-
-(put 'xml-declaration-attribute-value
-     'nxml-fontify-rule
-     '([nil 1 nxml-attribute-value-delimiter-face]
-       [1 -1 nxml-attribute-value-face]
-       [-1 nil nxml-attribute-value-delimiter-face]))
-
-(put 'processing-instruction-left
-     'nxml-fontify-rule
-     '([nil 2 nxml-processing-instruction-delimiter-face]
-       [2 nil nxml-processing-instruction-target-face]))
-
-(put 'processing-instruction-right
-     'nxml-fontify-rule
-     '([nil -2 nxml-processing-instruction-content-face]
-       [-2 nil nxml-processing-instruction-delimiter-face]))
-
-(put 'literal
-     'nxml-fontify-rule
-     '([nil 1 nxml-prolog-literal-delimiter-face]
-       [1 -1 nxml-prolog-literal-content-face]
-       [-1 nil nxml-prolog-literal-delimiter-face]))
-
-(put 'keyword
-     'nxml-fontify-rule
-     '([nil nil nxml-prolog-keyword-face]))
-
-(put 'markup-declaration-open
-     'nxml-fontify-rule
-     '([0 2 nxml-markup-declaration-delimiter-face]
-       [2 nil nxml-prolog-keyword-face]))
-
-(put 'markup-declaration-close
-     'nxml-fontify-rule
-     '([nil nil nxml-markup-declaration-delimiter-face]))
-
-(put 'internal-subset-open
-     'nxml-fontify-rule
-     '([nil nil nxml-markup-declaration-delimiter-face]))
-
-(put 'internal-subset-close
-     'nxml-fontify-rule
-     '([nil 1 nxml-markup-declaration-delimiter-face]
-       [-1 nil nxml-markup-declaration-delimiter-face]))
-
-(put 'hash-name
-     'nxml-fontify-rule
-     '([nil 1 nxml-hash-face]
-       [1 nil nxml-prolog-keyword-face]))
-
-(defun nxml-apply-fontify-rule (&optional type start end)
-  (let ((rule (get (or type xmltok-type) 'nxml-fontify-rule)))
-    (unless start (setq start xmltok-start))
-    (unless end (setq end (point)))
-    (while rule
-      (let* ((action (car rule)))
-	(setq rule (cdr rule))
-	(cond ((vectorp action)
-	       (nxml-set-face (let ((offset (aref action 0)))
-				(cond ((not offset) start)
-				      ((< offset 0) (+ end offset))
-				      (t (+ start offset))))
-			      (let ((offset (aref action 1)))
-				(cond ((not offset) end)
-				      ((< offset 0) (+ end offset))
-				      (t (+ start offset))))
-			      (aref action 2)))
-	      ((and (consp action)
-		    (eq (car action) 'element-qname))
-	       (when xmltok-name-end ; maybe nil in partial-end-tag case
-		 (nxml-fontify-qname (+ start (cdr action))
-				     xmltok-name-colon
-				     xmltok-name-end
-				     'nxml-element-prefix-face
-				     'nxml-element-colon-face
-				     'nxml-element-local-name-face)))
-	      ((eq action 'attributes)
-	       (nxml-fontify-attributes))
-	      ((eq action 'processing-instruction-content)
-	       (nxml-set-face (+ start 2)
-			      xmltok-name-end
-			      'nxml-processing-instruction-target-face)
-	       (nxml-set-face (save-excursion
-				(goto-char xmltok-name-end)
-				(skip-chars-forward " \t\r\n")
-				(point))
-			      (- end 2)
-			      'nxml-processing-instruction-content-face))
-	      ((eq action 'char-ref)
-	       (nxml-char-ref-display-extra start
-					    end
-					    (xmltok-char-number start end)))
-	      (t (error "Invalid nxml-fontify-rule action %s" action)))))))
-
-(defun nxml-fontify-attributes ()
-  (while xmltok-namespace-attributes
-    (nxml-fontify-attribute (car xmltok-namespace-attributes)
-			    'namespace)
-    (setq xmltok-namespace-attributes
-	  (cdr xmltok-namespace-attributes)))
-  (while xmltok-attributes
-    (nxml-fontify-attribute (car xmltok-attributes))
-    (setq xmltok-attributes
-	  (cdr xmltok-attributes))))
-
-(defun nxml-fontify-attribute (att &optional namespace-declaration)
-  (if namespace-declaration
-      (nxml-fontify-qname (xmltok-attribute-name-start att)
-			  (xmltok-attribute-name-colon att)
-			  (xmltok-attribute-name-end att)
-			  'nxml-namespace-attribute-xmlns-face
-			  'nxml-namespace-attribute-colon-face
-			  'nxml-namespace-attribute-prefix-face
-			  'nxml-namespace-attribute-xmlns-face)
-    (nxml-fontify-qname (xmltok-attribute-name-start att)
-			(xmltok-attribute-name-colon att)
-			(xmltok-attribute-name-end att)
-			'nxml-attribute-prefix-face
-			'nxml-attribute-colon-face
-			'nxml-attribute-local-name-face))
-  (let ((start (xmltok-attribute-value-start att))
-	(end (xmltok-attribute-value-end att))
-	(refs (xmltok-attribute-refs att))
-	(delimiter-face (if namespace-declaration
-			    'nxml-namespace-attribute-value-delimiter-face
-			  'nxml-attribute-value-delimiter-face))
-	(value-face (if namespace-declaration
-			'nxml-namespace-attribute-value-face
-		      'nxml-attribute-value-face)))
-    (when start
-      (nxml-set-face (1- start) start delimiter-face)
-      (nxml-set-face end (1+ end) delimiter-face)
-      (while refs
-	(let* ((ref (car refs))
-	       (ref-type (aref ref 0))
-	       (ref-start (aref ref 1))
-	       (ref-end (aref ref 2)))
-	  (nxml-set-face start ref-start value-face)
-	  (nxml-apply-fontify-rule ref-type ref-start ref-end)
-	  (setq start ref-end))
-	(setq refs (cdr refs)))
-      (nxml-set-face start end value-face))))
-
-(defun nxml-fontify-qname (start
-			   colon
-			   end
-			   prefix-face
-			   colon-face
-			   local-name-face
-			   &optional
-			   unprefixed-face)
-  (cond (colon (nxml-set-face start colon prefix-face)
-	       (nxml-set-face colon (1+ colon) colon-face)
-	       (nxml-set-face (1+ colon) end local-name-face))
-	(t (nxml-set-face start end (or unprefixed-face
-					local-name-face)))))
-
-;;; Editing
-
-(defun nxml-electric-slash (arg)
-  "Insert a slash.
-
-With a prefix ARG, do nothing other than insert the slash.
-
-Otherwise, if `nxml-slash-auto-complete-flag' is non-nil, insert the
-rest of the end-tag or empty-element if the slash is potentially part
-of an end-tag or the close of an empty-element.
-
-If the slash is part of an end-tag that is the first non-whitespace
-on the line, reindent the line."
-  (interactive "*P")
-  (nxml-ensure-scan-up-to-date)
-  (let* ((slash-pos (point))
-	 (end-tag-p (and (eq (char-before slash-pos) ?<)
-			 (not (nxml-get-inside slash-pos))))
-	 (at-indentation (save-excursion
-			   (back-to-indentation)
-			   (eq (point) (1- slash-pos)))))
-    (self-insert-command (prefix-numeric-value arg))
-    (unless arg
-      (if nxml-slash-auto-complete-flag
-	  (if end-tag-p
-	      (condition-case err
-		  (let ((start-tag-end
-			 (nxml-scan-element-backward (1- slash-pos) t)))
-		    (when start-tag-end
-		      (insert (xmltok-start-tag-qname) ">")
-		      ;; copy the indentation of the start-tag
-		      (when (and at-indentation
-				 (save-excursion
-				   (goto-char xmltok-start)
-				   (back-to-indentation)
-				   (eq (point) xmltok-start)))
-			(save-excursion
-			  (indent-line-to (save-excursion
-					    (goto-char xmltok-start)
-					    (current-column)))))))
-		(nxml-scan-error nil))
-	    (when (and (eq (nxml-token-before) (point))
-		       (eq xmltok-type 'partial-empty-element))
-	      (insert ">")))
-	(when (and end-tag-p at-indentation)
-	  (nxml-indent-line))))))
-
-(defun nxml-balanced-close-start-tag-block ()
-  "Close the start-tag before point with `>' and insert a balancing end-tag.
-Point is left between the start-tag and the end-tag.
-If there is nothing but whitespace before the `<' that opens the
-start-tag, then put point on a blank line, and put the end-tag on
-another line aligned with the start-tag."
-  (interactive "*")
-  (nxml-balanced-close-start-tag 'block))
-
-(defun nxml-balanced-close-start-tag-inline ()
-  "Close the start-tag before point with `>' and insert a balancing end-tag.
-Point is left between the start-tag and the end-tag.
-No extra whitespace is inserted."
-  (interactive "*")
-  (nxml-balanced-close-start-tag 'inline))
-
-(defun nxml-balanced-close-start-tag (block-or-inline)
-  (let ((token-end (nxml-token-before))
-	(pos (1+ (point))))
-    (unless (or (eq xmltok-type 'partial-start-tag)
-		(and (memq xmltok-type '(start-tag
-					 empty-element
-					 partial-empty-element))
-		     (>= token-end pos)))
-      (error "Not in a start-tag"))
-    (insert "></"
-	    (buffer-substring-no-properties (+ xmltok-start 1)
-					    (min xmltok-name-end (point)))
-	    ">")
-    (if (eq block-or-inline 'inline)
-	(goto-char pos)
-      (goto-char xmltok-start)
-      (back-to-indentation)
-      (if (= (point) xmltok-start)
-	  (let ((indent (current-column)))
-	  (goto-char pos)
-	  (insert "\n")
-	  (indent-line-to indent)
-	  (goto-char pos)
-	  (insert "\n")
-	  (indent-line-to (+ nxml-child-indent indent)))
-	(goto-char pos)))))
-	
-(defun nxml-finish-element ()
-  "Finish the current element by inserting an end-tag."
-  (interactive "*")
-  (nxml-finish-element-1 nil))
-
-(defvar nxml-last-split-position nil
-  "Position where `nxml-split-element' split the current element.")
-
-(defun nxml-split-element ()
-  "Split the current element by inserting an end-tag and a start-tag.
-Point is left after the newly inserted start-tag.  When repeated,
-split immediately before the previously inserted start-tag and leave
-point unchanged."
-  (interactive "*")
-  (setq nxml-last-split-position
-	(if (and (eq last-command this-command)
-		 nxml-last-split-position)
-	    (save-excursion
-	      (goto-char nxml-last-split-position)
-	      (nxml-finish-element-1 t))
-	  (nxml-finish-element-1 t))))
-
-(defun nxml-finish-element-1 (startp)
-  "Insert an end-tag for the current element and optionally a start-tag.
-The start-tag is inserted if STARTP is non-nil.  Return the position
-of the inserted start-tag or nil if none was inserted."
-  (interactive "*")
-  (let* ((token-end (nxml-token-before))
-	 (start-tag-end
-	  (save-excursion
-	    (when (and (< (point) token-end)
-		       (memq xmltok-type
-			     '(cdata-section
-			       processing-instruction
-			       comment
-			       start-tag
-			       end-tag
-			       empty-element)))
-	      (error "Point is inside a %s"
-		     (nxml-token-type-friendly-name xmltok-type)))
-	    (nxml-scan-element-backward token-end t)))
-	 (starts-line
-	  (save-excursion
-	    (unless (eq xmltok-type 'start-tag)
-	      (error "No matching start-tag"))
-	    (goto-char xmltok-start)
-	    (back-to-indentation)
-	    (eq (point) xmltok-start)))
-	 (ends-line
-	  (save-excursion
-	    (goto-char start-tag-end)
-	    (looking-at "[ \t\r\n]*$")))
-	 (start-tag-indent (save-excursion
-			     (goto-char xmltok-start)
-			     (current-column)))
-	 (qname (xmltok-start-tag-qname))
-	 inserted-start-tag-pos)
-    (when (and starts-line ends-line)
-      ;; start-tag is on a line by itself
-      ;; => put the end-tag on a line by itself
-      (unless (<= (point)
-		  (save-excursion
-		    (back-to-indentation)
-		    (point)))
-	(insert "\n"))
-      (indent-line-to start-tag-indent))
-    (insert "</" qname ">")
-    (when startp
-      (when starts-line
-	(insert "\n")
-	(indent-line-to start-tag-indent))
-      (setq inserted-start-tag-pos (point))
-      (insert "<" qname ">")
-      (when (and starts-line ends-line)
-	(insert "\n")
-	(indent-line-to (save-excursion
-			  (goto-char xmltok-start)
-			  (forward-line 1)
-			  (back-to-indentation)
-			  (if (= (current-column)
-				 (+ start-tag-indent nxml-child-indent))
-			      (+ start-tag-indent nxml-child-indent)
-			    start-tag-indent)))))
-    inserted-start-tag-pos))
-
-;;; Indentation
-
-(defun nxml-indent-line ()
-  "Indent current line as XML."
-  (let ((indent (nxml-compute-indent))
-	(from-end (- (point-max) (point))))
-    (when indent
-      (beginning-of-line)
-      (let ((bol (point)))
-	(skip-chars-forward " \t")
-	(delete-region bol (point)))
-      (indent-to indent)
-      (when (> (- (point-max) from-end) (point))
-	(goto-char (- (point-max) from-end))))))
-
-(defun nxml-compute-indent ()
-  "Return the indent for the line containing point."
-  (or (nxml-compute-indent-from-matching-start-tag)
-      (nxml-compute-indent-from-previous-line)))
-
-(defun nxml-compute-indent-from-matching-start-tag ()
-  "Compute the indent for a line with an end-tag using the matching start-tag.
-When the line containing point ends with an end-tag and does not start
-in the middle of a token, return the indent of the line containing the
-matching start-tag, if there is one and it occurs at the beginning of
-its line.  Otherwise return nil."
-  (save-excursion
-    (back-to-indentation)
-    (let ((bol (point)))
-      (let ((inhibit-field-text-motion t))
-	(end-of-line))
-      (skip-chars-backward " \t")
-      (and (= (nxml-token-before) (point))
-	   (memq xmltok-type '(end-tag partial-end-tag))
-	   ;; start of line must not be inside a token
-	   (or (= xmltok-start bol)
-	       (save-excursion
-		 (goto-char bol)
-		 (nxml-token-after)
-		 (= xmltok-start bol))
-	       (eq xmltok-type 'data))
-	   (condition-case err
-	       (nxml-scan-element-backward
-		(point)
-		nil
-		(- (point)
-		   nxml-end-tag-indent-scan-distance))
-	     (nxml-scan-error nil))
-	   (< xmltok-start bol)
-	   (progn
-	     (goto-char xmltok-start)
-	     (skip-chars-backward " \t")
-	     (bolp))
-	   (current-indentation)))))
-
-(defun nxml-compute-indent-from-previous-line ()
-  "Compute the indent for a line using the indentation of a previous line."
-  (save-excursion
-    (end-of-line)
-    (let ((eol (point))
-	  bol prev-bol ref
-	  before-context after-context)
-      (back-to-indentation)
-      (setq bol (point))
-      (catch 'indent
-	;; Move backwards until the start of a non-blank line that is
-	;; not inside a token.
-	(while (progn
-		 (when (= (forward-line -1) -1)
-		   (throw 'indent 0))
-		 (back-to-indentation)
-		 (if (looking-at "[ \t]*$")
-		     t
-		   (or prev-bol
-		       (setq prev-bol (point)))
-		   (nxml-token-after)
-		   (not (or (= xmltok-start (point))
-			    (eq xmltok-type 'data))))))
-	(setq ref (point))
-	;; Now scan over tokens until the end of the line to be indented.
-	;; Determine the context before and after the beginning of the
-	;; line.
-	(while (< (point) eol)
-	  (nxml-tokenize-forward)
-	  (cond ((<= bol xmltok-start)
-		 (setq after-context
-		       (nxml-merge-indent-context-type after-context)))
-		((and (<= (point) bol)
-		      (not (and (eq xmltok-type 'partial-start-tag)
-				(= (point) bol))))
-		 (setq before-context
-		       (nxml-merge-indent-context-type before-context)))
-		((eq xmltok-type 'data)
-		 (setq before-context
-		       (nxml-merge-indent-context-type before-context))
-		 (setq after-context
-		       (nxml-merge-indent-context-type after-context)))
-		;; If in the middle of a token that looks inline,
-		;; then indent relative to the previous non-blank line
-		((eq (nxml-merge-indent-context-type before-context)
-		     'mixed)
-		 (goto-char prev-bol)
-		 (throw 'indent (current-column)))
-		(t
-		 (throw 'indent
-			(nxml-compute-indent-in-token bol))))
-	  (skip-chars-forward " \t\r\n"))
-	(goto-char ref)
-	(+ (current-column)
-	   (* nxml-child-indent
-	      (+ (if (eq before-context 'start-tag) 1 0)
-		 (if (eq after-context 'end-tag) -1 0))))))))
-
-(defun nxml-merge-indent-context-type (context)
-  "Merge the indent context type CONTEXT with the token in `xmltok-type'.
-Return the merged indent context type.  An indent context type is
-either nil or one of the symbols start-tag, end-tag, markup, comment,
-mixed."
-  (cond ((memq xmltok-type '(start-tag partial-start-tag))
-	 (if (memq context '(nil start-tag comment))
-	     'start-tag
-	   'mixed))
-	((memq xmltok-type '(end-tag partial-end-tag))
-	 (if (memq context '(nil end-tag comment))
-	     'end-tag
-	   'mixed))
-	((eq xmltok-type 'comment)
-	 (cond ((memq context '(start-tag end-tag comment))
-		context)
-	       (context 'mixed)
-	       (t 'comment)))
-	(context 'mixed)
-	(t 'markup)))
-
-(defun nxml-compute-indent-in-token (pos)
-  "Return the indent for a line that starts inside a token.
-POS is the position of the first non-whitespace character of the line.
-This expects the xmltok-* variables to be set up as by `xmltok-forward'."
-  (cond ((memq xmltok-type '(start-tag
-			     partial-start-tag
-			     empty-element
-			     partial-empty-element))
-	 (nxml-compute-indent-in-start-tag pos))
-	((eq xmltok-type 'comment)
-	 (nxml-compute-indent-in-delimited-token pos "<!--" "-->"))
-	((eq xmltok-type 'cdata-section)
-	 (nxml-compute-indent-in-delimited-token pos "<![CDATA[" "]]>"))
-	((eq xmltok-type 'processing-instruction)
-	 (nxml-compute-indent-in-delimited-token pos "<?" "?>"))
-	(t
-	 (goto-char pos)
-	 (if (and (= (forward-line -1) 0)
-		  (< xmltok-start (point)))
-	     (back-to-indentation)
-	   (goto-char xmltok-start))
-	 (current-column))))
-
-(defun nxml-compute-indent-in-start-tag (pos)
-  "Return the indent for a line that starts inside a start-tag.
-Also for a line that starts inside an empty element.
-POS is the position of the first non-whitespace character of the line.
-This expects the xmltok-* variables to be set up as by `xmltok-forward'."
-  (let ((value-boundary (nxml-attribute-value-boundary pos))
-	(off 0))
-    (if value-boundary
-	;; inside an attribute value
-	(let ((value-start (car value-boundary))
-	      (value-end (cdr value-boundary)))
-	  (goto-char pos)
-	  (forward-line -1)
-	  (if (< (point) value-start)
-	      (goto-char value-start)
-	    (back-to-indentation)))
-      ;; outside an attribute value
-      (goto-char pos)
-      (while (and (= (forward-line -1) 0)
-		  (nxml-attribute-value-boundary (point))))
-      (cond ((<= (point) xmltok-start)
-	     (goto-char xmltok-start)
-	     (setq off nxml-attribute-indent)
-	     (let ((atts (xmltok-merge-attributes)))
-	       (when atts
-		 (let* ((att (car atts))
-			(start (xmltok-attribute-name-start att)))
-		   (when (< start pos)
-		     (goto-char start)
-		     (setq off 0))))))
-	    (t
-	     (back-to-indentation))))
-    (+ (current-column) off)))
-
-(defun nxml-attribute-value-boundary (pos)
-  "Return a pair (START . END) if POS is inside an attribute value.
-Otherwise return nil.  START and END are the positions of the start
-and end of the attribute value containing POS.  This expects the
-xmltok-* variables to be set up as by `xmltok-forward'."
-  (let ((atts (xmltok-merge-attributes))
-	att value-start value-end value-boundary)
-    (while atts
-      (setq att (car atts))
-      (setq value-start (xmltok-attribute-value-start att))
-      (setq value-end (xmltok-attribute-value-end att))
-      (cond ((and value-start (< pos value-start))
-	     (setq atts nil))
-	    ((and value-start value-end (<= pos value-end))
-	     (setq value-boundary (cons value-start value-end))
-	     (setq atts nil))
-	    (t (setq atts (cdr atts)))))
-    value-boundary))
-	     
-(defun nxml-compute-indent-in-delimited-token (pos open-delim close-delim)
-  "Return the indent for a line that starts inside a token with delimiters.
-OPEN-DELIM and CLOSE-DELIM are strings giving the opening and closing
-delimiters.  POS is the position of the first non-whitespace character
-of the line.  This expects the xmltok-* variables to be set up as by
-`xmltok-forward'."
-  (cond ((let ((end (+ pos (length close-delim))))
-	   (and (<= end (point-max))
-		(string= (buffer-substring-no-properties pos end)
-			 close-delim)))
-	 (goto-char xmltok-start))
-	((progn
-	   (goto-char pos)
-	   (forward-line -1)
-	   (<= (point) xmltok-start))
-	 (goto-char (+ xmltok-start (length open-delim)))
-	 (when (and (string= open-delim "<!--")
-		    (looking-at " "))
-	   (goto-char (1+ (point)))))
-	(t (back-to-indentation)))
-  (current-column))
-
-;;; Completion
-
-(defun nxml-complete ()
-  "Perform completion on the symbol preceding point.
-
-Inserts as many characters as can be completed.  However, if not even
-one character can be completed, then a buffer with the possibilities
-is popped up and the symbol is read from the minibuffer with
-completion. If the symbol is complete, then any characters that must
-follow the symbol are also inserted.
-
-The name space used for completion and what is treated as a symbol
-depends on the context.  The contexts in which completion is performed
-depend on `nxml-completion-hook'."
-  (interactive)
-  (unless (run-hook-with-args-until-success 'nxml-completion-hook)
-    ;; Eventually we will complete on entity names here.
-    (ding)
-    (message "Cannot complete in this context")))
-
-;;; Movement
-
-(defun nxml-forward-balanced-item (&optional arg)
-  "Move forward across one balanced item.
-With ARG, do it that many times.  Negative arg -N means
-move backward across N balanced expressions.
-This is the equivalent of `forward-sexp' for XML.
-
-An element contains as items strings with no markup, tags, processing
-instructions, comments, CDATA sections, entity references and
-characters references. However, if the variable
-`nxml-sexp-element-flag' is non-nil, then an element is treated as a
-single markup item.  A start-tag contains an element name followed by
-one or more attributes.  An end-tag contains just an element name.  An
-attribute value literals contains strings with no markup, entity
-references and character references.  A processing instruction
-consists of a target and a content string.  A comment or a CDATA
-section contains a single string.  An entity reference contains a
-single name.  A character reference contains a character number."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((> arg 0)
-	 (while (progn
-		  (nxml-forward-single-balanced-item)
-		  (> (setq arg (1- arg)) 0))))
-	((< arg 0)
-	 (while (progn
-		  (nxml-backward-single-balanced-item)
-		  (< (setq arg (1+ arg)) 0))))))
-
-(defun nxml-forward-single-balanced-item ()
-  (condition-case err
-      (goto-char (let ((end (nxml-token-after)))
-		   (save-excursion
-		     (while (eq xmltok-type 'space)
-		       (goto-char end)
-		       (setq end (nxml-token-after)))
-		     (cond ((/= (point) xmltok-start)
-			    (nxml-scan-forward-within end))
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'start-tag))
-			    ;; can't ever return nil here
-			    (nxml-scan-element-forward xmltok-start))
-			   ((and nxml-sexp-element-flag
-				 (memq xmltok-type
-				       '(end-tag partial-end-tag)))
-			    (error "Already at end of element"))
-			   (t end)))))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err)))))
-
-(defun nxml-backward-single-balanced-item ()
-  (condition-case err
-      (goto-char (let ((end (nxml-token-before)))
-		   (save-excursion
-		     (while (eq xmltok-type 'space)
-		       (goto-char xmltok-start)
-		       (setq end (nxml-token-before)))
-		     (cond ((/= (point) end)
-			    (nxml-scan-backward-within end))
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'end-tag))
-			    ;; can't ever return nil here
-			    (nxml-scan-element-backward end)
-			    xmltok-start)
-			   ((and nxml-sexp-element-flag
-				 (eq xmltok-type 'start-tag))
-			    (error "Already at start of element"))
-			   (t xmltok-start)))))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err)))))
-
-(defun nxml-scan-forward-within (end)
-  (setq end (- end (nxml-end-delimiter-length xmltok-type)))
-  (when (<= end (point))
-    (error "Already at end of %s"
-	   (nxml-token-type-friendly-name xmltok-type)))
-  (cond ((memq xmltok-type '(start-tag
-			     empty-element
-			     partial-start-tag
-			     partial-empty-element))
-	 (if (< (point) xmltok-name-end)
-	     xmltok-name-end
-	   (let ((att (nxml-find-following-attribute)))
-	     (cond ((not att) end)
-		   ((and (xmltok-attribute-value-start att)
-			 (<= (xmltok-attribute-value-start att)
-			     (point)))
-		    (nxml-scan-forward-in-attribute-value att))
-		   ((xmltok-attribute-value-end att)
-		    (1+ (xmltok-attribute-value-end att)))
-		   ((save-excursion
-		      (goto-char (xmltok-attribute-name-end att))
-		      (looking-at "[ \t\r\n]*="))
-		    (match-end 0))
-		   (t (xmltok-attribute-name-end att))))))
-	((and (eq xmltok-type 'processing-instruction)
-	      (< (point) xmltok-name-end))
-	 xmltok-name-end)
-	(t end)))
-
-(defun nxml-scan-backward-within (end)
-  (setq xmltok-start
-	(+ xmltok-start
-	   (nxml-start-delimiter-length xmltok-type)))
-  (when (<= (point) xmltok-start)
-    (error "Already at start of %s"
-	   (nxml-token-type-friendly-name xmltok-type)))
-  (cond ((memq xmltok-type '(start-tag
-			     empty-element
-			     partial-start-tag
-			     partial-empty-element))
-	 (let ((att (nxml-find-preceding-attribute)))
-	   (cond ((not att) xmltok-start)
-		 ((and (xmltok-attribute-value-start att)
-		       (<= (xmltok-attribute-value-start att)
-			   (point))
-		       (<= (point)
-			   (xmltok-attribute-value-end att)))
-		  (nxml-scan-backward-in-attribute-value att))
-		 (t (xmltok-attribute-name-start att)))))
-	((and (eq xmltok-type 'processing-instruction)
-	      (let ((content-start (save-excursion
-				     (goto-char xmltok-name-end)
-				     (skip-chars-forward " \r\t\n")
-				     (point))))
-		(and (< content-start (point))
-		     content-start))))
-	(t xmltok-start)))
-
-(defun nxml-scan-forward-in-attribute-value (att)
-  (when (= (point) (xmltok-attribute-value-end att))
-    (error "Already at end of attribute value"))
-  (let ((refs (xmltok-attribute-refs att))
-	ref)
-    (while refs
-      (setq ref (car refs))
-      (if (< (point) (aref ref 2))
-	  (setq refs nil)
-	(setq ref nil)
-	(setq refs (cdr refs))))
-    (cond ((not ref)
-	   (xmltok-attribute-value-end att))
-	  ((< (point) (aref ref 1))
-	   (aref ref 1))
-	  ((= (point) (aref ref 1))
-	   (aref ref 2))
-	  (t
-	   (let ((end (- (aref ref 2)
-			 (nxml-end-delimiter-length (aref ref 0)))))
-	     (if (< (point) end)
-		 end
-	       (error "Already at end of %s"
-		      (nxml-token-type-friendly-name (aref ref 0)))))))))
-
-(defun nxml-scan-backward-in-attribute-value (att)
-  (when (= (point) (xmltok-attribute-value-start att))
-    (error "Already at start of attribute value"))
-  (let ((refs (reverse (xmltok-attribute-refs att)))
-	ref)
-    (while refs
-      (setq ref (car refs))
-      (if (< (aref ref 1) (point))
-	  (setq refs nil)
-	(setq ref nil)
-	(setq refs (cdr refs))))
-    (cond ((not ref)
-	   (xmltok-attribute-value-start att))
-	  ((< (aref ref 2) (point))
-	   (aref ref 2))
-	  ((= (point) (aref ref 2))
-	   (aref ref 1))
-	  (t
-	   (let ((start (+ (aref ref 1)
-			   (nxml-start-delimiter-length (aref ref 0)))))
-	     (if (< start (point))
-		 start
-	       (error "Already at start of %s"
-		      (nxml-token-type-friendly-name (aref ref 0)))))))))
-
-(defun nxml-find-following-attribute ()
-  (let ((ret nil)
-	(atts (or xmltok-attributes xmltok-namespace-attributes))
-	(more-atts (and xmltok-attributes xmltok-namespace-attributes)))
-    (while atts
-      (let* ((att (car atts))
-	     (name-start (xmltok-attribute-name-start att)))
-	(cond ((and (<= name-start (point))
-		    (xmltok-attribute-value-end att)
-		    ;; <= because end is before quote
-		    (<= (point) (xmltok-attribute-value-end att)))
-	       (setq atts nil)
-	       (setq ret att))
-	      ((and (< (point) name-start)
-		    (or (not ret)
-			(< name-start
-			   (xmltok-attribute-name-start ret))))
-	       (setq ret att))))
-      (setq atts (cdr atts))
-      (unless atts
-	(setq atts more-atts)
-	(setq more-atts nil)))
-    ret))
-
-(defun nxml-find-preceding-attribute ()
-  (let ((ret nil)
-	(atts (or xmltok-attributes xmltok-namespace-attributes))
-	(more-atts (and xmltok-attributes xmltok-namespace-attributes)))
-    (while atts
-      (let* ((att (car atts))
-	     (name-start (xmltok-attribute-name-start att)))
-	(cond ((and (< name-start (point))
-		    (xmltok-attribute-value-end att)
-		    ;; <= because end is before quote
-		    (<= (point) (xmltok-attribute-value-end att)))
-	       (setq atts nil)
-	       (setq ret att))
-	      ((and (< name-start (point))
-		    (or (not ret)
-			(< (xmltok-attribute-name-start ret)
-			   name-start)))
-	       (setq ret att))))
-      (setq atts (cdr atts))
-      (unless atts
-	(setq atts more-atts)
-	(setq more-atts nil)))
-    ret))
-
-(defun nxml-up-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-up-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point) (point-max)))
-	  (let ((token-end (nxml-token-after)))
-	    (goto-char (cond ((or (memq xmltok-type '(end-tag
-						      partial-end-tag))
-				  (and (memq xmltok-type
-					     '(empty-element
-					       partial-empty-element))
-				       (< xmltok-start (point))))
-			      token-end)
-			     ((nxml-scan-element-forward
-			       (if (and (eq xmltok-type 'start-tag)
-					(= (point) xmltok-start))
-				   xmltok-start
-				 token-end)
-			       t))
-			     (t (error "No parent element")))))
-	  (setq arg (1- arg)))
-      (nxml-scan-error
-       (goto-char (cadr err))
-       (apply 'error (cddr err))))))
-
-(defun nxml-backward-up-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-up-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point-min) (point)))
-	  (let ((token-end (nxml-token-before)))
-	    (goto-char (cond ((or (memq xmltok-type '(start-tag
-						      partial-start-tag))
-				  (and (memq xmltok-type
-					     '(empty-element
-					       partial-empty-element))
-				       (< (point) token-end)))
-			      xmltok-start)
-			     ((nxml-scan-element-backward
-			       (if (and (eq xmltok-type 'end-tag)
-					(= (point) token-end))
-				   token-end
-				 xmltok-start)
-			       t)
-			      xmltok-start)
-			     (t (error "No parent element")))))
-	  (setq arg (1- arg)))
-      (nxml-scan-error
-       (goto-char (cadr err))
-       (apply 'error (cddr err))))))
-
-(defun nxml-down-element (&optional arg)
-  "Move forward down into the content of an element.
-With ARG, do this that many times.
-Negative ARG means move backward but still down."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-down-element (- arg))
-    (while (> arg 0)
-      (goto-char
-       (let ((token-end (nxml-token-after)))
-	 (save-excursion
-	   (goto-char token-end)
-	   (while (progn
-		    (when (memq xmltok-type '(nil end-tag partial-end-tag))
-		      (error "No following start-tags in this element"))
-		    (not (memq xmltok-type '(start-tag partial-start-tag))))
-	     (nxml-tokenize-forward))
-	   (point))))
-      (setq arg (1- arg)))))
-
-(defun nxml-backward-down-element (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-down-element (- arg))
-    (while (> arg 0)
-      (goto-char
-	 (save-excursion
-	   (nxml-token-before)
-	   (goto-char xmltok-start)
-	   (while (progn
-		    (when (memq xmltok-type '(start-tag
-					      partial-start-tag
-					      prolog
-					      nil))
-		      (error "No preceding end-tags in this element"))
-		    (not (memq xmltok-type '(end-tag partial-end-tag))))
-	     (if (or (<= (point) nxml-prolog-end)
-		     (not (search-backward "<" nxml-prolog-end t)))
-		 (setq xmltok-type nil)
-	       (nxml-move-outside-backwards)
-	       (xmltok-forward)))
-	   xmltok-start))
-      (setq arg (1- arg)))))
-
-(defun nxml-forward-element (&optional arg)
-  "Move forward over one element.
-With ARG, do it that many times.
-Negative ARG means move backward."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-backward-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point) (point-max)))
-	  (goto-char
-	   (or (nxml-scan-element-forward (nxml-token-before))
-	       (error "No more elements")))
-	  (setq arg (1- arg)))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err))))))
-
-(defun nxml-backward-element (&optional arg)
-  "Move backward over one element.
-With ARG, do it that many times.
-Negative ARG means move forward."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (nxml-forward-element (- arg))
-    (condition-case err
-	(while (and (> arg 0)
-		    (< (point-min) (point)))
-	  (goto-char
-	   (or (and (nxml-scan-element-backward (progn
-						  (nxml-token-after)
-						  xmltok-start))
-		    xmltok-start)
-	       (error "No preceding elements")))
-	  (setq arg (1- arg)))
-    (nxml-scan-error
-     (goto-char (cadr err))
-     (apply 'error (cddr err))))))
-
-(defun nxml-mark-token-after ()
-  (interactive)
-  (push-mark (nxml-token-after) nil t)
-  (goto-char xmltok-start)
-  (message "Marked %s" xmltok-type))
-
-;;; Paragraphs
-
-(defun nxml-mark-paragraph ()
-  "Put point at beginning of this paragraph, mark at end.
-The paragraph marked is the one that contains point or follows point."
-  (interactive)
-  (nxml-forward-paragraph)
-  (push-mark nil t t)
-  (nxml-backward-paragraph))
-
-(defun nxml-forward-paragraph (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((< arg 0)
-	 (nxml-backward-paragraph (- arg)))
-	((> arg 0)
-	 (forward-line 0)
-	 (while (and (nxml-forward-single-paragraph)
-		     (> (setq arg (1- arg)) 0))))))
-
-(defun nxml-backward-paragraph (&optional arg)
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond ((< arg 0)
-	 (nxml-forward-paragraph (- arg)))
-	((> arg 0)
-	 (unless (bolp)
-	   (let ((inhibit-field-text-motion t))
-	     (end-of-line)))
-	 (while (and (nxml-backward-single-paragraph)
-		     (> (setq arg (1- arg)) 0))))))
-
-(defun nxml-forward-single-paragraph ()
-  "Move forward over a single paragraph.
-Return nil at end of buffer, t otherwise."
-  (let* ((token-end (nxml-token-after))
-	 (offset (- (point) xmltok-start))
-	 pos had-data)
-    (goto-char token-end)
-    (while (and (< (point) (point-max))
-		(not (setq pos
-			   (nxml-paragraph-end-pos had-data offset))))
-      (when (nxml-token-contains-data-p offset)
-	(setq had-data t))
-      (nxml-tokenize-forward)
-      (setq offset 0))
-    (when pos (goto-char pos))))
-
-(defun nxml-backward-single-paragraph ()
-  "Move backward over a single paragraph.
-Return nil at start of buffer, t otherwise."
-  (let* ((token-end (nxml-token-before))
-	 (offset (- token-end (point)))
-	 (last-tag-pos xmltok-start)
-	 pos had-data last-data-pos)
-    (goto-char token-end)
-    (unless (setq pos (nxml-paragraph-start-pos nil offset))
-      (setq had-data (nxml-token-contains-data-p nil offset))
-      (goto-char xmltok-start)
-      (while (and (not pos) (< (point-min) (point)))
-	(cond ((search-backward "<" nxml-prolog-end t)
-	       (nxml-move-outside-backwards)
-	       (save-excursion
-		 (while (< (point) last-tag-pos)
-		   (xmltok-forward)
-		   (when (and (not had-data) (nxml-token-contains-data-p))
-		     (setq pos nil)
-		     (setq last-data-pos xmltok-start))
-		   (let ((tem (nxml-paragraph-start-pos had-data 0)))
-		     (when tem (setq pos tem)))))
-	       (when (and (not had-data) last-data-pos (not pos))
-		 (setq had-data t)
-		 (save-excursion
-		   (while (< (point) last-data-pos)
-		     (xmltok-forward))
-		   (let ((tem (nxml-paragraph-start-pos had-data 0)))
-		     (when tem (setq pos tem)))))
-	       (setq last-tag-pos (point)))
-	      (t (goto-char (point-min))))))
-    (when pos (goto-char pos))))
-
-(defun nxml-token-contains-data-p (&optional start end)
-  (setq start (+ xmltok-start (or start 0)))
-  (setq end (- (point) (or end 0)))
-  (when (eq xmltok-type 'cdata-section)
-    (setq start (max start (+ xmltok-start 9)))
-    (setq end (min end (- (point) 3))))
-  (or (and (eq xmltok-type 'data)
-	   (eq start xmltok-start)
-	   (eq end (point)))
-      (eq xmltok-type 'char-ref)
-      (and (memq xmltok-type '(data cdata-section))
-	   (< start end)
-	   (save-excursion
-	     (goto-char start)
-	     (re-search-forward "[^ \t\r\n]" end t)))))
-
-(defun nxml-paragraph-end-pos (had-data offset)
-  "Return the position of the paragraph end if contained in the current token.
-Return nil if the current token does not contain the paragraph end.
-Only characters after OFFSET from the start of the token are eligible.
-HAD-DATA says whether there have been non-whitespace data characters yet."
-  (cond ((not had-data)
-	 (cond ((memq xmltok-type '(data cdata-section))
-		(save-excursion
-		  (let ((end (point)))
-		    (goto-char (+ xmltok-start
-				  (max (if (eq xmltok-type 'cdata-section)
-					   9
-					 0)
-				       offset)))
-		    (and (re-search-forward "[^ \t\r\n]" end t)
-			 (re-search-forward "^[ \t]*$" end t)
-			 (match-beginning 0)))))
-	       ((and (eq xmltok-type 'comment)
-		     (nxml-token-begins-line-p)
-		     (nxml-token-ends-line-p))
-		(save-excursion
-		  (let ((end (point)))
-		    (goto-char (+ xmltok-start (max 4 offset)))
-		    (when (re-search-forward "[^ \t\r\n]" (- end 3) t)
-		      (if (re-search-forward "^[ \t]*$" end t)
-			  (match-beginning 0)
-			(goto-char (- end 3))
-			(skip-chars-backward " \t")
-			(unless (bolp)
-			  (beginning-of-line 2))
-			(point))))))))
-	((memq xmltok-type '(data space cdata-section))
-	 (save-excursion
-	   (let ((end (point)))
-	     (goto-char (+ xmltok-start offset))
-	     (and (re-search-forward "^[ \t]*$" end t)
-		  (match-beginning 0)))))
-	((and (memq xmltok-type '(start-tag 
-				  end-tag
-				  empty-element
-				  comment
-				  processing-instruction
-				  entity-ref))
-	      (nxml-token-begins-line-p)
-	      (nxml-token-ends-line-p))
-	 (save-excursion
-	   (goto-char xmltok-start)
-	   (skip-chars-backward " \t")
-	   (point)))
-	((and (eq xmltok-type 'end-tag)
-	      (looking-at "[ \t]*$")
-	      (not (nxml-in-mixed-content-p t)))
-	 (save-excursion
-	   (or (search-forward "\n" nil t) 
-	       (point-max))))))
-
-(defun nxml-paragraph-start-pos (had-data offset)
-  "Return the position of the paragraph start if contained in the current token.
-Return nil if the current token does not contain the paragraph start.
-Only characters before OFFSET from the end of the token are eligible.
-HAD-DATA says whether there have been non-whitespace data characters yet."
-  (cond ((not had-data)
-	 (cond ((memq xmltok-type '(data cdata-section))
-		(save-excursion
-		  (goto-char (- (point)
-				(max (if (eq xmltok-type 'cdata-section)
-					 3
-				       0)
-				     offset)))
-		  (and (re-search-backward "[^ \t\r\n]" xmltok-start t)
-		       (re-search-backward "^[ \t]*$" xmltok-start t)
-		       (match-beginning 0))))
-	       ((and (eq xmltok-type 'comment)
-		     (nxml-token-ends-line-p)
-		     (nxml-token-begins-line-p))
-		(save-excursion
-		  (goto-char (- (point) (max 3 offset)))
-		  (when (and (< (+ xmltok-start 4) (point))
-			     (re-search-backward "[^ \t\r\n]"
-						 (+ xmltok-start 4)
-						 t))
-		    (if (re-search-backward "^[ \t]*$" xmltok-start t)
-			(match-beginning 0)
-		      (goto-char xmltok-start)
-		      (if (looking-at "<!--[ \t]*\n")
-			  (match-end 0)
-			(skip-chars-backward " \t")
-			(point))))))))
-	((memq xmltok-type '(data space cdata-section))
-	 (save-excursion
-	   (goto-char (- (point) offset))
-	   (and (re-search-backward "^[ \t]*$" xmltok-start t)
-		(match-beginning 0))))
-	((and (memq xmltok-type '(start-tag 
-				  end-tag
-				  empty-element
-				  comment
-				  processing-instruction
-				  entity-ref))
-	      (nxml-token-ends-line-p)
-	      (nxml-token-begins-line-p))
-	 (or (search-forward "\n" nil t) 
-	     (point-max)))
-	((and (eq xmltok-type 'start-tag)
-	      (nxml-token-begins-line-p)
-	      (not (save-excursion
-		     (goto-char xmltok-start)
-		     (nxml-in-mixed-content-p nil))))
-	 (save-excursion
-	   (goto-char xmltok-start)
-	   (skip-chars-backward " \t")
-	   ;; include any blank line before
-	   (or (and (eq (char-before) ?\n)
-		    (save-excursion
-		      (goto-char (1- (point)))
-		      (skip-chars-backward " \t")
-		      (and (bolp) (point))))
-	       (point))))))
-
-(defun nxml-token-ends-line-p () (looking-at "[ \t]*$"))
-
-(defun nxml-token-begins-line-p ()
-  (save-excursion
-    (goto-char xmltok-start)
-    (skip-chars-backward " \t")
-    (bolp)))
-
-(defun nxml-in-mixed-content-p (endp)
-  "Return non-nil if point is in mixed content.
-Point must be after an end-tag or before a start-tag.
-ENDP is t in the former case, nil in the latter."
-  (let (matching-tag-pos)
-    (cond ((not (run-hook-with-args-until-failure
-		 'nxml-in-mixed-content-hook))
-	   nil)
-	  ;; See if the matching tag does not start or end a line.
-	  ((condition-case err
-	       (progn
-		 (setq matching-tag-pos
-		       (xmltok-save
-			 (if endp
-			     (and (nxml-scan-element-backward (point))
-				  xmltok-start)
-			   (nxml-scan-element-forward (point)))))
-		 (and matching-tag-pos
-		      (save-excursion
-			(goto-char matching-tag-pos)
-			(not (if endp
-				 (progn
-				   (skip-chars-backward " \t")
-				   (bolp))
-			       (looking-at "[ \t]*$"))))))
-	     (nxml-scan-error nil))
-	   t)
-	  ;; See if there's data at the same level.
-	  ((let (start end)
-	     (if endp
-		 (setq start matching-tag-pos
-		       end (point))
-	       (setq start (point)
-		     end matching-tag-pos))
-	     (save-excursion
-	       (or (when start
-		     (goto-char start)
-		     (nxml-preceding-sibling-data-p))
-		   (when end
-		     (goto-char end)
-		     (nxml-following-sibling-data-p)))))
-	   t)
-	  ;; Otherwise, treat as not mixed
-	  (t nil))))
-
-(defun nxml-preceding-sibling-data-p ()
-  "Return non-nil if there is a previous sibling that is data."
-  (let ((lim (max (- (point) nxml-mixed-scan-distance)
-		  nxml-prolog-end))
-	(level 0)
-	found end)
-    (xmltok-save
-      (save-excursion
-	(while (and (< lim (point))
-		    (>= level 0)
-		    (not found)
-		    (progn
-		      (setq end (point))
-		      (search-backward "<" lim t)))
-	  (nxml-move-outside-backwards)
-	  (save-excursion
-	    (xmltok-forward)
-	    (let ((prev-level level))
-	      (cond ((eq xmltok-type 'end-tag)
-		     (setq level (1+ level)))
-		    ((eq xmltok-type 'start-tag)
-		     (setq level (1- level))))
-	      (when (eq prev-level 0)
-		(while (and (< (point) end) (not found))
-		  (xmltok-forward)
-		  (when (memq xmltok-type '(data cdata-section char-ref))
-		    (setq found t)))))))))
-    found))
-
-(defun nxml-following-sibling-data-p ()
-  (let ((lim (min (+ (point) nxml-mixed-scan-distance)
-		  (point-max)))
-	(level 0)
-	found)
-    (xmltok-save
-      (save-excursion
-	(while (and (< (point) lim)
-		    (>= level 0)
-		    (nxml-tokenize-forward)
-		    (not found))
-	  (cond ((eq xmltok-type 'start-tag)
-		 (setq level (1+ level)))
-		((eq xmltok-type 'end-tag)
-		 (setq level (1- level)))
-		((and (eq level 0)
-		      (memq xmltok-type '(data cdata-section char-ref)))
-		 (setq found t))))))
-    found))
-
-;;; Filling
-
-(defun nxml-do-fill-paragraph (arg)
-  (let (fill-paragraph-function
-	fill-prefix
-	start end)
-    (save-excursion
-      (nxml-forward-paragraph)
-      (setq end (point))
-      (nxml-backward-paragraph)
-      (skip-chars-forward " \t\r\n")
-      (setq start (point))
-      (beginning-of-line)
-      (setq fill-prefix (buffer-substring-no-properties (point) start))
-      (when (and (not (nxml-get-inside (point)))
-		 (looking-at "[ \t]*<!--"))
-	(setq fill-prefix (concat fill-prefix "     ")))
-      (fill-region-as-paragraph start end arg))
-    (skip-line-prefix fill-prefix)
-    fill-prefix))
-    
-(defun nxml-newline-and-indent (soft)
-  (delete-horizontal-space)
-  (if soft (insert-and-inherit ?\n) (newline 1))
-  (nxml-indent-line))
-
-
-;;; Dynamic markup
-
-(defvar nxml-dynamic-markup-prev-pos nil)
-(defvar nxml-dynamic-markup-prev-lengths nil)
-(defvar nxml-dynamic-markup-prev-found-marker nil)
-(defvar nxml-dynamic-markup-prev-start-tags (make-hash-table :test 'equal))
-
-(defun nxml-dynamic-markup-word ()
-  "Dynamically markup the word before point.
-This attempts to find a tag to put around the word before point based
-on the contents of the current buffer. The end-tag will be inserted at
-point.  The start-tag will be inserted at or before the beginning of
-the word before point; the contents of the current buffer is used to
-decide where.
-
-It works in a similar way to \\[dabbrev-expand]. It searches first
-backwards from point, then forwards from point for an element whose
-content is a string which matches the contents of the buffer before
-point and which includes at least the word before point. It then
-copies the start- and end-tags from that element and uses them to
-surround the matching string before point.
-
-Repeating \\[nxml-dynamic-markup-word] immediately after successful
-\\[nxml-dynamic-markup-word] removes the previously inserted markup
-and attempts to find another possible way to do the markup."
-  (interactive "*")
-  (let (search-start-pos done)
-    (if (and (integerp nxml-dynamic-markup-prev-pos)
-	     (= nxml-dynamic-markup-prev-pos (point))
-	     (eq last-command this-command)
-	     nxml-dynamic-markup-prev-lengths)
-	(let* ((end-tag-open-pos
-		(- nxml-dynamic-markup-prev-pos
-		   (nth 2 nxml-dynamic-markup-prev-lengths)))
-	       (start-tag-close-pos
-		(- end-tag-open-pos
-		   (nth 1 nxml-dynamic-markup-prev-lengths)))
-	       (start-tag-open-pos
-		(- start-tag-close-pos
-		   (nth 0 nxml-dynamic-markup-prev-lengths))))
-	  (delete-region end-tag-open-pos nxml-dynamic-markup-prev-pos)
-	  (delete-region start-tag-open-pos start-tag-close-pos)
-	  (setq search-start-pos
-		(marker-position nxml-dynamic-markup-prev-found-marker)))
-      (clrhash nxml-dynamic-markup-prev-start-tags))
-    (setq nxml-dynamic-markup-prev-pos nil)
-    (setq nxml-dynamic-markup-prev-lengths nil)
-    (setq nxml-dynamic-markup-prev-found-marker nil)
-    (goto-char
-     (save-excursion
-       (let* ((pos (point))
-	      (word (progn
-		      (backward-word 1)
-		      (unless (< (point) pos)
-			(error "No word to markup"))
-		      (buffer-substring-no-properties (point) pos)))
-	      (search (concat word "</"))
-	      done)
-	 (when search-start-pos
-	   (goto-char search-start-pos))
-	 (while (and (not done)
-		     (or (and (< (point) pos)
-			      (or (search-backward search nil t)
-				  (progn (goto-char pos) nil)))
-			 (search-forward search nil t)))
-	   (goto-char (- (match-end 0) 2))
-	   (setq done (nxml-try-copy-markup pos)))
-	 (or done
-	     (error (if (zerop (hash-table-count
-				nxml-dynamic-markup-prev-start-tags))
-			"No possible markup found for `%s'"
-		      "No more markup possibilities found for `%s'")
-		    word)))))))
-
-(defun nxml-try-copy-markup (word-end-pos)
-  (save-excursion
-    (let ((end-tag-pos (point)))
-      (when (and (not (nxml-get-inside end-tag-pos))
-		 (search-backward "<" nil t)
-		 (not (nxml-get-inside (point))))
-	(xmltok-forward)
-	(when (and (eq xmltok-type 'start-tag)
-		   (< (point) end-tag-pos))
-	  (let* ((start-tag-close-pos (point))
-		 (start-tag
-		  (buffer-substring-no-properties xmltok-start
-						  start-tag-close-pos))
-		 (words
-		  (nreverse
-		   (split-string
-		    (buffer-substring-no-properties start-tag-close-pos
-						    end-tag-pos)
-		    "[ \t\r\n]+"))))
-	    (goto-char word-end-pos)
-	    (while (and words
-			(re-search-backward (concat
-					     (regexp-quote (car words))
-					     "\\=")
-					    nil
-					    t))
-	      (setq words (cdr words))
-	      (skip-chars-backward " \t\r\n"))
-	    (when (and (not words)
-		       (progn
-			 (skip-chars-forward " \t\r\n")
-			 (not (gethash (cons (point) start-tag)
-				       nxml-dynamic-markup-prev-start-tags)))
-		       (or (< end-tag-pos (point))
-			   (< word-end-pos xmltok-start)))
-	      (setq nxml-dynamic-markup-prev-found-marker
-		    (copy-marker end-tag-pos t))
-	      (puthash (cons (point) start-tag)
-		       t
-		       nxml-dynamic-markup-prev-start-tags)
-	      (setq nxml-dynamic-markup-prev-lengths
-		    (list (- start-tag-close-pos xmltok-start)
-			  (-  word-end-pos (point))
-			  (+ (- xmltok-name-end xmltok-start) 2)))
-	      (let ((name (xmltok-start-tag-qname)))
-		(insert start-tag)
-		(goto-char (+ word-end-pos
-			      (- start-tag-close-pos xmltok-start)))
-		(insert "</" name ">")
-		(setq nxml-dynamic-markup-prev-pos (point))))))))))
-							   
-
-;;; Character names
-
-(defvar nxml-char-name-ignore-case nil)
-
-(defvar nxml-char-name-alist nil
-  "Alist of character names.
-Each member of the list has the form (NAME CODE . NAMESET),
-where NAME is a string naming a character, NAMESET is a symbol
-identifying a set of names and CODE is an integer specifying the
-Unicode scalar value of the named character.
-The NAME will only be used for completion if NAMESET has
-a non-nil `nxml-char-name-set-enabled' property.
-If NAMESET does does not have `nxml-char-name-set-defined' property,
-then it must have a `nxml-char-name-set-file' property and `load'
-will be applied to the value of this property if the nameset
-is enabled.")
-
-(defvar nxml-char-name-table (make-hash-table :test 'eq)
-  "Hash table for mapping char codes to names.
-Each key is a Unicode scalar value.
-Each value is a list of pairs of the form (NAMESET . NAME),
-where NAMESET is a symbol identifying a set of names,
-and NAME is a string naming a character.")
-
-(defvar nxml-autoload-char-name-set-list nil
-  "List of char namesets that can be autoloaded.")
-
-(defun nxml-enable-char-name-set (nameset)    
-  (put nameset 'nxml-char-name-set-enabled t))
-
-(defun nxml-disable-char-name-set (nameset)    
-  (put nameset 'nxml-char-name-set-enabled nil))
-
-(defun nxml-char-name-set-enabled-p (nameset)
-  (get nameset 'nxml-char-name-set-enabled))
-
-(defun nxml-autoload-char-name-set (nameset file)
-  (unless (memq nameset nxml-autoload-char-name-set-list)
-    (setq nxml-autoload-char-name-set-list
-	  (cons nameset nxml-autoload-char-name-set-list)))
-  (put nameset 'nxml-char-name-set-file file))
-
-(defun nxml-define-char-name-set (nameset alist)
-  "Define a set of character names.
-NAMESET is a symbol identifying the set.
-Alist is a list where each member has the form (NAME CODE),
-where NAME is a string naming a character and code
-is an integer giving the Unicode scalar value of the character."
-  (when (get nameset 'nxml-char-name-set-defined)
-    (error "Nameset `%s' already defined" nameset))
-  (let ((iter alist))
-    (while iter
-      (let* ((name-code (car iter))
-	     (name (car name-code))
-	     (code (cadr name-code)))
-	(puthash code
-		 (cons (cons nameset name)
-		       (gethash code nxml-char-name-table))
-		 nxml-char-name-table))
-      (setcdr (cdr (car iter)) nameset)
-      (setq iter (cdr iter))))
-  (setq nxml-char-name-alist
-	(nconc alist nxml-char-name-alist))
-  (put nameset 'nxml-char-name-set-defined t))
-
-(defun nxml-get-char-name (code)
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
-  (let ((names (gethash code nxml-char-name-table))
-	name)
-    (while (and names (not name))
-      (if (nxml-char-name-set-enabled-p (caar names))
-	  (setq name (cdar names))
-	(setq names (cdr names))))
-    name))
-
-(defvar nxml-named-char-history nil)
-
-(defun nxml-insert-named-char (arg)
-  "Insert a character using its name.
-The name is read from the minibuffer.
-Normally, inserts the character as a numeric character reference.
-With a prefix argument, inserts the character directly."
-  (interactive "*P")
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
-  (let ((name
-	 (let ((completion-ignore-case nxml-char-name-ignore-case))
-	   (completing-read "Character name: "
-			    nxml-char-name-alist
-			    (lambda (member)
-			      (get (cddr member) 'nxml-char-name-set-enabled))
-			    t
-			    nil
-			    'nxml-named-char-history)))
-	(alist nxml-char-name-alist)
-	elt code)
-    (while (and alist (not code))
-      (setq elt (assoc name alist))
-      (if (get (cddr elt) 'nxml-char-name-set-enabled)
-	  (setq code (cadr elt))
-	(setq alist (cdr (member elt alist)))))
-    (when code
-      (insert (if arg
-		  (or (decode-char 'ucs code)
-		      (error "Character %x is not supported by Emacs"
-			     code))
-		(format "&#x%X;" code))))))
-  
-(defun nxml-maybe-load-char-name-set (sym)
-  (when (and (get sym 'nxml-char-name-set-enabled)
-	     (not (get sym 'nxml-char-name-set-defined))
-	     (stringp (get sym 'nxml-char-name-set-file)))
-    (load (get sym 'nxml-char-name-set-file))))
-
-(defun nxml-toggle-char-ref-extra-display (arg)
-  "*Toggle the display of extra information for character references."
-  (interactive "P")
-  (let ((new (if (null arg)
-		 (not nxml-char-ref-extra-display)
-	       (> (prefix-numeric-value arg) 0))))
-    (when (not (eq new nxml-char-ref-extra-display))
-      (setq nxml-char-ref-extra-display new)
-      (save-excursion
-	(save-restriction
-	  (widen)
-	  (if nxml-char-ref-extra-display
-	      (nxml-with-unmodifying-text-property-changes
-		(nxml-clear-fontified (point-min) (point-max)))
-	    (nxml-clear-char-ref-extra-display (point-min) (point-max))))))))
-
-(put 'nxml-char-ref 'evaporate t)
-
-(defun nxml-char-ref-display-extra (start end n)
-  (when nxml-char-ref-extra-display
-    (let ((name (nxml-get-char-name n))
-	  (glyph-string (and nxml-char-ref-display-glyph-flag
-			     (nxml-glyph-display-string n 'nxml-glyph-face)))
-	  ov)
-    (when (or name glyph-string)
-      (setq ov (make-overlay start end nil t))
-      (overlay-put ov 'category 'nxml-char-ref)
-      (when name
-	(overlay-put ov 'help-echo name))
-      (when glyph-string
-	(overlay-put ov
-		     'after-string
-		     (propertize glyph-string 'face 'nxml-glyph-face)))))))
-
-(defun nxml-clear-char-ref-extra-display (start end)
-  (let ((ov (overlays-in start end)))
-    (while ov
-      (when (eq (overlay-get (car ov) 'category) 'nxml-char-ref)
-	(delete-overlay (car ov)))
-      (setq ov (cdr ov)))))
-
-;;; Versioning
-
-(defun nxml-version ()
-  "Show the version of nXML mode that is being used."
-  (interactive)
-  (if nxml-version
-      (message "nXML mode version %s" nxml-version)
-    (message "nXML mode version unknown")))
-
-
-(defun nxml-start-delimiter-length (type)
-  (or (get type 'nxml-start-delimiter-length)
-      0))
-			
-(put 'cdata-section 'nxml-start-delimiter-length 9)
-(put 'comment 'nxml-start-delimiter-length 4)
-(put 'processing-instruction 'nxml-start-delimiter-length 2)
-(put 'start-tag 'nxml-start-delimiter-length 1)
-(put 'empty-element 'nxml-start-delimiter-length 1)
-(put 'partial-empty-element 'nxml-start-delimiter-length 1)
-(put 'entity-ref 'nxml-start-delimiter-length 1)
-(put 'char-ref 'nxml-start-delimiter-length 2)
-
-(defun nxml-end-delimiter-length (type)
-  (or (get type 'nxml-end-delimiter-length)
-      0))
-			
-(put 'cdata-section 'nxml-end-delimiter-length 3)
-(put 'comment 'nxml-end-delimiter-length 3)
-(put 'processing-instruction 'nxml-end-delimiter-length 2)
-(put 'start-tag 'nxml-end-delimiter-length 1)
-(put 'empty-element 'nxml-end-delimiter-length 2)
-(put 'partial-empty-element 'nxml-end-delimiter-length 1)
-(put 'entity-ref 'nxml-end-delimiter-length 1)
-(put 'char-ref 'nxml-end-delimiter-length 1)
-
-(defun nxml-token-type-friendly-name (type)
-  (or (get type 'nxml-friendly-name)
-      (symbol-name type)))
-
-(put 'cdata-section 'nxml-friendly-name "CDATA section")
-(put 'processing-instruction 'nxml-friendly-name "processing instruction")
-(put 'entity-ref 'nxml-friendly-name "entity reference")
-(put 'char-ref 'nxml-friendly-name "character reference")
-
-(provide 'nxml-mode)
-
-;;; nxml-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.info b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.info
deleted file mode 100644
index 28b2512fc5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.info
+++ /dev/null
@@ -1,745 +0,0 @@
-This is nxml-mode.info, produced by makeinfo version 4.7 from
-nxml-mode.texi.
-
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* nXML Mode: (nxml-mode.info).
-END-INFO-DIR-ENTRY
-
-
-File: nxml-mode.info,  Node: Top,  Next: Completion,  Up: (dir)
-
-nXML Mode
-*********
-
-This manual documents nxml-mode, an Emacs major mode for editing XML
-with RELAX NG support.  This manual is not yet complete.
-
-* Menu:
-
-* Completion::
-* Inserting end-tags::
-* Paragraphs::
-* Outlining::
-* Locating a schema::
-* DTDs::
-* Limitations::
-
-
-File: nxml-mode.info,  Node: Completion,  Next: Inserting end-tags,  Prev: Top,  Up: Top
-
-1 Completion
-************
-
-Apart from real-time validation, the most important feature that
-nxml-mode provides for assisting in document creation is "completion".
-Completion assists the user in inserting characters at point, based on
-knowledge of the schema and on the contents of the buffer before point.
-
-   The traditional GNU Emacs key combination for completion in a buffer
-is `M-<TAB>'. However, many window systems and window managers use this
-key combination themselves (typically for switching between windows)
-and do not pass it to applications. It's hard to find key combinations
-in GNU Emacs that are both easy to type and not taken by something
-else.  `C-<RET>' (i.e.  pressing the Enter or Return key, while the
-Ctrl key is held down) is available.  It won't be available on a
-traditional terminal (because it is indistinguishable from Return), but
-it will work with a window system.  Therefore we adopt the following
-solution by default: use `C-<RET>' when there's a window system and
-`M-<TAB>' when there's not.  In the following, I will assume that a
-window system is being used and will therefore refer to `C-<RET>'.
-
-   Completion works by examining the symbol preceding point.  This is
-the symbol to be completed. The symbol to be completed may be the
-empty. Completion considers what symbols starting with the symbol to be
-completed would be valid replacements for the symbol to be completed,
-given the schema and the contents of the buffer before point.  These
-symbols are the possible completions.  An example may make this
-clearer.  Suppose the buffer looks like this (where -!- indicates
-point):
-
-     <html xmlns="http://www.w3.org/1999/xhtml">
-     <h-!-
-
-and the schema is XHTML.  In this context, the symbol to be completed
-is `h'.  The possible completions consist of just `head'.  Another
-example, is
-
-     <html xmlns="http://www.w3.org/1999/xhtml">
-     <head>
-     <-!-
-
-In this case, the symbol to be completed is empty, and the possible
-completions are `base', `isindex', `link', `meta', `script', `style',
-`title'.  Another example is:
-
-     <html xmlns="-!-
-
-In this case, the symbol to be completed is empty, and the possible
-completions are just `http://www.w3.org/1999/xhtml'.
-
-   When you type `C-<RET>', what happens depends on what the set of
-possible completions are.
-
-   * If the set of completions is empty, nothing happens.
-
-   * If there is one possible completion, then that completion is
-     inserted, together with any following characters that are
-     required. For example, in this case:
-
-          <html xmlns="http://www.w3.org/1999/xhtml">
-          <-!-
-
-     `C-<RET>' will yield
-
-          <html xmlns="http://www.w3.org/1999/xhtml">
-          <head-!-
-
-   * If there is more than one possible completion, but all possible
-     completions share a common non-empty prefix, then that prefix is
-     inserted. For example, suppose the buffer is:
-
-          <html x-!-
-
-     The symbol to be completed is `x'. The possible completions are
-     `xmlns' and `xml:lang'.  These share a common prefix of `xml'.
-     Thus, `C-<RET>' will yield:
-
-          <html xml-!-
-
-     Typically, you would do `C-<RET>' again, which would have the
-     result described in the next item.
-
-   * If there is more than one possible completion, but the possible
-     completions do not share a non-empty prefix, then Emacs will
-     prompt you to input the symbol in the minibuffer, initializing the
-     minibuffer with the symbol to be completed, and popping up a buffer
-     showing the possible completions.  You can now input the symbol to
-     be inserted.  The symbol you input will be inserted in the buffer
-     instead of the symbol to be completed.  Emacs will then insert any
-     required characters after the symbol.  For example, if it contains:
-
-          <html xml-!-
-
-     Emacs will prompt you in the minibuffer with
-
-          Attribute: xml-!-
-
-     and the buffer showing possible completions will contain
-
-          Possible completions are:
-          xml:lang			   xmlns
-
-     If you input `xmlns', the result will be:
-
-          <html xmlns="-!-
-
-     (If you do `C-<RET>' again, the namespace URI will be inserted.
-     Should that happen automatically?)
-
-
-File: nxml-mode.info,  Node: Inserting end-tags,  Next: Paragraphs,  Prev: Completion,  Up: Top
-
-2 Inserting end-tags
-********************
-
-The main redundancy in XML syntax is end-tags.  nxml-mode provides
-several ways to make it easier to enter end-tags.  You can use all of
-these without a schema.
-
-   You can use `C-<RET>' after `</' to complete the rest of the end-tag.
-
-   `C-c C-f' inserts an end-tag for the element containing point. This
-command is useful when you want to input the start-tag, then input the
-content and finally input the end-tag. The `f' is mnemonic for finish.
-
-   If you want to keep tags balanced and input the end-tag at the same
-time as the start-tag, before inputting the content, then you can use
-`C-c C-i'. This inserts a `>', then inserts the end-tag and leaves
-point before the end-tag.  `C-c C-b' is similar but more convenient for
-block-level elements: it puts the start-tag, point and the end-tag on
-successive lines, appropriately indented. The `i' is mnemonic for
-inline and the `b' is mnemonic for block.
-
-   Finally, you can customize nxml-mode so that `/' automatically
-inserts the rest of the end-tag when it occurs after `<', by doing
-
-     `M-x customize-variable <RET> nxml-slash-auto-complete-flag <RET>'
-
-and then following the instructions in the displayed buffer.
-
-
-File: nxml-mode.info,  Node: Paragraphs,  Next: Outlining,  Prev: Inserting end-tags,  Up: Top
-
-3 Paragraphs
-************
-
-Emacs has several commands that operate on paragraphs, most notably
-`M-q'. nXML mode redefines these to work in a way that is useful for
-XML.  The exact rules that are used to find the beginning and end of a
-paragraph are complicated; they are designed mainly to ensure that
-`M-q' does the right thing.
-
-   A paragraph consists of one or more complete, consecutive lines.  A
-group of lines is not considered a paragraph unless it contains some
-non-whitespace characters between tags or inside comments.  A blank
-line separates paragraphs.  A single tag on a line by itself also
-separates paragraphs.  More precisely, if one tag together with any
-leading and trailing whitespace completely occupy one or more lines,
-then those lines will not be included in any paragraph.
-
-   A start-tag at the beginning of the line (possibly indented) may be
-treated as starting a paragraph.  Similarly, an end-tag at the end of
-the line may be treated as ending a paragraph. The following rules are
-used to determine whether such a tag is in fact treated as a paragraph
-boundary:
-
-   * If the schema does not allow text at that point, then it is a
-     paragraph boundary.
-
-   * If the end-tag corresponding to the start-tag is not at the end of
-     its line, or the start-tag corresponding to the end-tag is not at
-     the beginning of its line, then it is not a paragraph boundary.
-     For example, in
-
-          <p>This is a paragraph with an
-          <emph>emphasized</emph> phrase.
-
-     the `<emph>' start-tag would not be considered as starting a
-     paragraph, because its corresponding end-tag is not at the end of
-     the line.
-
-   * If there is text that is a sibling in element tree, then it is not
-     a paragraph boundary.  For example, in
-
-          <p>This is a paragraph with an
-          <emph>emphasized phrase that takes one source line</emph>
-
-     the `<emph>' start-tag would not be considered as starting a
-     paragraph, even though its end-tag is at the end of its line,
-     because there the text `This is a paragraph with an' is a sibling
-     of the `emph' element.
-
-   * Otherwise, it is a paragraph boundary.
-
-
-File: nxml-mode.info,  Node: Outlining,  Next: Locating a schema,  Prev: Paragraphs,  Up: Top
-
-4 Outlining
-***********
-
-nXML mode allows you to display all or part of a buffer as an outline,
-in a similar way to Emacs' outline mode.  An outline in nXML mode is
-based on recognizing two kinds of element: sections and headings.
-There is one heading for every section and one section for every
-heading.  A section contains its heading as or within its first child
-element.  A section also contains its subordinate sections (its
-subsections).  The text content of a section consists of anything in a
-section that is neither a subsection nor a heading.
-
-   Note that this is a different model from that used by XHTML.  nXML
-mode's outline support will not be useful for XHTML unless you adopt a
-convention of adding a `div' to enclose each section, rather than
-having sections implicitly delimited by different `hN' elements.  This
-limitation may be removed in a future version.
-
-   The variable `nxml-section-element-name-regexp' gives a regexp for
-the local names (i.e. the part of the name following any prefix) of
-section elements. The variable `nxml-heading-element-name-regexp' gives
-a regexp for the local names of heading elements. For an element to be
-recognized as a section
-
-   * its start-tag must occur at the beginning of a line (possibly
-     indented);
-
-   * its local name must match `nxml-section-element-name-regexp';
-
-   * either its first child element or a descendant of that first child
-     element must have a local name that matches
-     `nxml-heading-element-name-regexp'; the first such element is
-     treated as the section's heading.
-
-You can customize these variables using `M-x customize-variable'.
-
-   There are three possible outline states for a section:
-
-   * normal, showing everything, including its heading, text content
-     and subsections; each subsection is displayed according to the
-     state of that subsection;
-
-   * showing just its heading, with both its text content and its
-     subsections hidden; all subsections are hidden regardless of their
-     state;
-
-   * showing its heading and its subsections, with its text content
-     hidden; each subsection is displayed according to the state of
-     that subsection.
-
-   In the last two states, where the text content is hidden, the
-heading is displayed specially, in an abbreviated form. An element like
-this:
-
-     <section>
-     <title>Food</title>
-     <para>There are many kinds of food.</para>
-     </section>
-
-would be displayed on a single line like this:
-
-     <-section>Food...</>
-
-If there are hidden subsections, then a `+' will be used instead of a
-`-' like this:
-
-     <+section>Food...</>
-
-If there are non-hidden subsections, then the section will instead be
-displayed like this:
-
-     <-section>Food...
-       <-section>Delicious Food...</>
-       <-section>Distasteful Food...</>
-     </-section>
-
-The heading is always displayed with an indent that corresponds to its
-depth in the outline, even it is not actually indented in the buffer.
-The variable `nxml-outline-child-indent' controls how much a subheading
-is indented with respect to its parent heading when the heading is
-being displayed specially.
-
-   Commands to change the outline state of sections are bound to key
-sequences that start with `C-c C-o' (`o' is mnemonic for outline).  The
-third and final key has been chosen to be consistent with outline mode.
-In the following descriptions current section means the section
-containing point, or, more precisely, the innermost section containing
-the character immediately following point.
-
-   * `C-c C-o C-a' shows all sections in the buffer normally.
-
-   * `C-c C-o C-t' hides the text content of all sections in the buffer.
-
-   * `C-c C-o C-c' hides the text content of the current section.
-
-   * `C-c C-o C-e' shows the text content of the current section.
-
-   * `C-c C-o C-d' hides the text content and subsections of the
-     current section.
-
-   * `C-c C-o C-s' shows the current section and all its direct and
-     indirect subsections normally.
-
-   * `C-c C-o C-k' shows the headings of the direct and indirect
-     subsections of the current section.
-
-   * `C-c C-o C-l' hides the text content of the current section and of
-     its direct and indirect subsections.
-
-   * `C-c C-o C-i' shows the headings of the direct subsections of the
-     current section.
-
-   * `C-c C-o C-o' hides as much as possible without hiding the current
-     section's text content; the headings of ancestor sections of the
-     current section and their child section sections will not be
-     hidden.
-
-   When a heading is displayed specially, you can use <RET> in that
-heading to show the text content of the section in the same way as `C-c
-C-o C-e'.
-
-   You can also use the mouse to change the outline state: `S-mouse-2'
-hides the text content of a section in the same way as`C-c C-o C-c';
-`mouse-2' on a specially displayed heading shows the text content of
-the section in the same way as `C-c C-o C-e'; `mouse-1' on a specially
-displayed start-tag toggles the display of subheadings on and off.
-
-   The outline state for each section is stored with the first
-character of the section (as a text property). Every command that
-changes the outline state of any section updates the display of the
-buffer so that each section is displayed correctly according to its
-outline state.  If the section structure is subsequently changed, then
-it is possible for the display to no longer correctly reflect the
-stored outline state. `C-c C-o C-r' can be used to refresh the display
-so it is correct again.
-
-
-File: nxml-mode.info,  Node: Locating a schema,  Next: DTDs,  Prev: Outlining,  Up: Top
-
-5 Locating a schema
-*******************
-
-nXML mode has a configurable set of rules to locate a schema for the
-file being edited.  The rules are contained in one or more schema
-locating files, which are XML documents.
-
-   The variable `rng-schema-locating-files' specifies the list of the
-file-names of schema locating files that nXML mode should use.  The
-order of the list is significant: when file X occurs in the list before
-file Y then rules from file X have precedence over rules from file Y.
-A filename specified in `rng-schema-locating-files' may be relative. If
-so, it will be resolved relative to the document for which a schema is
-being located. It is not an error if relative file-names in
-`rng-schema-locating-files' do not not exist. You can use `M-x
-customize-variable <RET> rng-schema-locating-files <RET>' to customize
-the list of schema locating files.
-
-   By default, `rng-schema-locating-files' list has two members:
-`schemas.xml', and `DIST-DIR/schema/schemas.xml' where `DIST-DIR' is
-the directory containing the nXML distribution. The first member will
-cause nXML mode to use a file `schemas.xml' in the same directory as
-the document being edited if such a file exist.  The second member
-contains rules for the schemas that are included with the nXML
-distribution.
-
-* Menu:
-
-* Commands for locating a schema::
-* Schema locating files::
-
-
-File: nxml-mode.info,  Node: Commands for locating a schema,  Next: Schema locating files,  Up: Locating a schema
-
-5.1 Commands for locating a schema
-==================================
-
-The command `C-c C-s C-w' will tell you what schema is currently being
-used.
-
-   The rules for locating a schema are applied automatically when you
-visit a file in nXML mode. However, if you have just created a new file
-and the schema cannot be inferred from the file-name, then this will
-not locate the right schema.  In this case, you should insert the
-start-tag of the root element and then use the command `C-c C-a', which
-reapplies the rules based on the current content of the document.  It
-is usually not necessary to insert the complete start-tag; often just
-`<NAME' is enough.
-
-   If you want to use a schema that has not yet been added to the
-schema locating files, you can use the command `C-c C-s C-f' to
-manually select the file contaiing the schema for the document in
-current buffer.  Emacs will read the file-name of the schema from the
-minibuffer. After reading the file-name, Emacs will ask whether you
-wish to add a rule to a schema locating file that persistently
-associates the document with the selected schema.  The rule will be
-added to the first file in the list specified
-`rng-schema-locating-files'; it will create the file if necessary, but
-will not create a directory. If the variable
-`rng-schema-locating-files' has not been customized, this means that
-the rule will be added to the file `schemas.xml' in the same directory
-as the document being edited.
-
-   The command `C-c C-s C-t' allows you to select a schema by
-specifying an identifier for the type of the document.  The schema
-locating files determine the available type identifiers and what schema
-is used for each type identifier. This is useful when it is impossible
-to infer the right schema from either the file-name or the content of
-the document, even though the schema is already in the schema locating
-file.  A situation in which this can occur is when there are multiple
-variants of a schema where all valid documents have the same document
-element.  For example, XHTML has Strict and Transitional variants.  In
-a situation like this, a schema locating file can define a type
-identifier for each variant. As with `C-c C-s C-f', Emacs will ask
-whether you wish to add a rule to a schema locating file that
-persistently associates the document with the specified type identifier.
-
-   The command `C-c C-s C-l' adds a rule to a schema locating file that
-persistently associates the document with the schema that is currently
-being used.
-
-
-File: nxml-mode.info,  Node: Schema locating files,  Prev: Commands for locating a schema,  Up: Locating a schema
-
-5.2 Schema locating files
-=========================
-
-Each schema locating file specifies a list of rules.  The rules from
-each file are appended in order. To locate a schema each rule is
-applied in turn until a rule matches.  The first matching rule is then
-used to determine the schema.
-
-   Schema locating files are designed to be useful for other
-applications that need to locate a schema for a document. In fact,
-there is nothing specific to locating schemas in the design; it could
-equally well be used for locating a stylesheet.
-
-* Menu:
-
-* Schema locating file syntax basics::
-* Using the document's URI to locate a schema::
-* Using the document element to locate a schema::
-* Using type identifiers in schema locating files::
-* Using multiple schema locating files::
-
-
-File: nxml-mode.info,  Node: Schema locating file syntax basics,  Next: Using the document's URI to locate a schema,  Up: Schema locating files
-
-5.2.1 Schema locating file syntax basics
-----------------------------------------
-
-There is a schema for schema locating files in the file `locate.rnc' in
-the schema directory.  Schema locating files must be valid with respect
-to this schema.
-
-   The document element of a schema locating file must be
-`locatingRules' and the namespace URI must be
-`http://thaiopensource.com/ns/locating-rules/1.0'.  The children of the
-document element specify rules. The order of the children is the same
-as the order of the rules.  Here's a complete example of a schema
-locating file:
-
-     <?xml version="1.0"?>
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-       <documentElement localName="book" uri="docbook.rnc"/>
-     </locatingRules>
-
-This says to use the schema `xhtml.rnc' for a document with namespace
-`http://www.w3.org/1999/xhtml', and to use the schema `docbook.rnc' for
-a document whose local name is `book'.  If the document element had
-both a namespace URI of `http://www.w3.org/1999/xhtml' and a local name
-of `book', then the matching rule that comes first will be used and so
-the schema `xhtml.rnc' would be used.  There is no precedence between
-different types of rule; the first matching rule of any type is used.
-
-   As usual with XML-related technologies, resources are identified by
-URIs.  The `uri' attribute identifies the schema by specifying the URI.
-The URI may be relative.  If so, it is resolved relative to the URI of
-the schema locating file that contains attribute. This means that if
-the value of `uri' attribute does not contain a `/', then it will refer
-to a filename in the same directory as the schema locating file.
-
-
-File: nxml-mode.info,  Node: Using the document's URI to locate a schema,  Next: Using the document element to locate a schema,  Prev: Schema locating file syntax basics,  Up: Schema locating files
-
-5.2.2 Using the document's URI to locate a schema
--------------------------------------------------
-
-A `uri' rule locates a schema based on the URI of the document.  The
-`uri' attribute specifies the URI of the schema.  The `resource'
-attribute can be used to specify the schema for a particular document.
-For example,
-
-     <uri resource="spec.xml" uri="docbook.rnc"/>
-
-specifies that that the schema for `spec.xml' is `docbook.rnc'.
-
-   The `pattern' attribute can be used instead of the `resource'
-attribute to specify the schema for any document whose URI matches a
-pattern.  The pattern has the same syntax as an absolute or relative
-URI except that the path component of the URI can use a `*' character
-to stand for zero or more characters within a path segment (i.e. any
-character other `/').  Typically, the URI pattern looks like a relative
-URI, but, whereas a relative URI in the `resource' attribute is
-resolved into a particular absolute URI using the base URI of the
-schema locating file, a relative URI pattern matches if it matches some
-number of complete path segments of the document's URI ending with the
-last path segment of the document's URI. For example,
-
-     <uri pattern="*.xsl" uri="xslt.rnc"/>
-
-specifies that the schema for documents with a URI whose path ends with
-`.xsl' is `xslt.rnc'.
-
-   A `transformURI' rule locates a schema by transforming the URI of
-the document. The `fromPattern' attribute specifies a URI pattern with
-the same meaning as the `pattern' attribute of the `uri' element.  The
-`toPattern' attribute is a URI pattern that is used to generate the URI
-of the schema.  Each `*' in the `toPattern' is replaced by the string
-that matched the corresponding `*' in the `fromPattern'.  The resulting
-string is appended to the initial part of the document's URI that was
-not explicitly matched by the `fromPattern'.  The rule matches only if
-the transformed URI identifies an existing resource.  For example, the
-rule
-
-     <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
-
-would transform the URI `file:///home/jjc/docs/spec.xml' into the URI
-`file:///home/jjc/docs/spec.rnc'.  Thus, this rule specifies that to
-locate a schema for a document `FOO.xml', Emacs should test whether a
-file `FOO.rnc' exists in the same directory as `FOO.xml', and, if so,
-should use it as the schema.
-
-
-File: nxml-mode.info,  Node: Using the document element to locate a schema,  Next: Using type identifiers in schema locating files,  Prev: Using the document's URI to locate a schema,  Up: Schema locating files
-
-5.2.3 Using the document element to locate a schema
----------------------------------------------------
-
-A `documentElement' rule locates a schema based on the local name and
-prefix of the document element. For example, a rule
-
-     <documentElement prefix="xsl" localName="stylesheet" uri="xslt.rnc"/>
-
-specifies that when the name of the document element is
-`xsl:stylesheet', then `xslt.rnc' should be used as the schema. Either
-the `prefix' or `localName' attribute may be omitted to allow any
-prefix or local name.
-
-   A `namespace' rule locates a schema based on the namespace URI of
-the document element. For example, a rule
-
-     <namespace ns="http://www.w3.org/1999/XSL/Transform" uri="xslt.rnc"/>
-
-specifies that when the namespace URI of the document is
-`http://www.w3.org/1999/XSL/Transform', then `xslt.rnc' should be used
-as the schema.
-
-
-File: nxml-mode.info,  Node: Using type identifiers in schema locating files,  Next: Using multiple schema locating files,  Prev: Using the document element to locate a schema,  Up: Schema locating files
-
-5.2.4 Using type identifiers in schema locating files
------------------------------------------------------
-
-Type identifiers allow a level of indirection in locating the schema
-for a document.  Instead of associating the document directly with a
-schema URI, the document is associated with a type identifier, which is
-in turn associated with a schema URI. nXML mode does not constrain the
-format of type identifiers.  They can be simply strings without any
-formal structure or they can be public identifiers or URIs.  Note that
-these type identifiers have nothing to do with the DOCTYPE declaration.
-When comparing type identifiers, whitespace is normalized in the same
-way as with the `xsd:token' datatype: leading and trailing whitespace
-is stripped; other sequences of whitespace are normalized to a single
-space character.
-
-   Each of the rules described in previous sections that uses a `uri'
-attribute to specify a schema, can instead use a `typeId' attribute to
-specify a type identifier.  The type identifier can be associated with
-a URI using a `typeId' element. For example,
-
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
-       <typeId id="XHTML" typeId="XHTML Strict"/>
-       <typeId id="XHTML Strict" uri="xhtml-strict.rnc"/>
-       <typeId id="XHTML Transitional" uri="xhtml-transitional.rnc"/>
-     </locatingRules>
-
-declares three type identifiers `XHTML' (representing the default
-variant of XHTML to be used), `XHTML Strict' and `XHTML Transitional'.
-Such a schema locating file would use `xhtml-strict.rnc' for a document
-whose namespace is `http://www.w3.org/1999/xhtml'.  But it is
-considerably more flexible than a schema locating file that simply
-specified
-
-     <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml-strict.rnc"/>
-
-A user can easily use `C-c C-s C-t' to select between XHTML Strict and
-XHTML Transitional. Also, a user can easily add a catalog
-
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <typeId id="XHTML" typeId="XHTML Transitional"/>
-     </locatingRules>
-
-that makes the default variant of XHTML be XHTML Transitional.
-
-
-File: nxml-mode.info,  Node: Using multiple schema locating files,  Prev: Using type identifiers in schema locating files,  Up: Schema locating files
-
-5.2.5 Using multiple schema locating files
-------------------------------------------
-
-The `include' element includes rules from another schema locating file.
-The behavior is exactly as if the rules from that file were included
-in place of the `include' element.  Relative URIs are resolved into
-absolute URIs before the inclusion is performed. For example,
-
-     <include rules="../rules.xml"/>
-
-includes the rules from `rules.xml'.
-
-   The process of locating a schema takes as input a list of schema
-locating files.  The rules in all these files and in the files they
-include are resolved into a single list of rules, which are applied
-strictly in order.  Sometimes this order is not what is needed.  For
-example, suppose you have two schema locating files, a private file
-
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-     </locatingRules>
-
-followed by a public file
-
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <transformURI pathSuffix=".xml" replacePathSuffix=".rnc"/>
-       <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
-     </locatingRules>
-
-The effect of these two files is that the XHTML `namespace' rule takes
-precedence over the `transformURI' rule, which is almost certainly not
-what is needed.  This can be solved by adding an `applyFollowingRules'
-to the private file.
-
-     <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-       <applyFollowingRules ruleType="transformURI"/>
-       <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-     </locatingRules>
-
-
-File: nxml-mode.info,  Node: DTDs,  Next: Limitations,  Prev: Locating a schema,  Up: Top
-
-6 DTDs
-******
-
-nxml-mode is designed to support the creation of standalone XML
-documents that do not depend on a DTD.  Although it is common practice
-to insert a DOCTYPE declaration referencing an external DTD, this has
-undesirable side-effects.  It means that the document is no longer
-self-contained. It also means that different XML parsers may interpret
-the document in different ways, since the XML Recommendation does not
-require XML parsers to read the DTD.  With DTDs, it was impractical to
-get validation without using an external DTD or reference to an
-parameter entity.  With RELAX NG and other schema languages, you can
-simulataneously get the benefits of validation and standalone XML
-documents.  Therefore, I recommend that you do not reference an
-external DOCTYPE in your XML documents.
-
-   One problem is entities for characters. Typically, as well as
-providing validation, DTDs also provide a set of character entities for
-documents to use. Schemas cannot provide this functionality, because
-schema validation happens after XML parsing.  The recommended solution
-is to either use the Unicode characters directly, or, if this is
-impractical, use character references.  nXML mode supports this by
-providing commands for entering characters and character references
-using the Unicode names, and can display the glyph corresponding to a
-character reference.
-
-
-File: nxml-mode.info,  Node: Limitations,  Prev: DTDs,  Up: Top
-
-7 Limitations
-*************
-
-nXML mode has some limitations:
-
-   * DTD support is limited.  Internal parsed general entities declared
-     in the internal subset are supported provided they do not contain
-     elements. Other usage of DTDs is ignored.
-
-   * The restrictions on RELAX NG schemas in section 7 of the RELAX NG
-     specification are not enforced.
-
-   * Unicode support has problems. This stems mostly from the fact that
-     the XML (and RELAX NG) character model is based squarely on
-     Unicode, whereas the Emacs character model is not.  Emacs 22 is
-     slated to have full Unicode support, which should improve the
-     situation here.
-
-
-
-Tag Table:
-Node: Top174
-Node: Completion513
-Node: Inserting end-tags4826
-Node: Paragraphs6146
-Node: Outlining8406
-Node: Locating a schema14021
-Node: Commands for locating a schema15472
-Node: Schema locating files18092
-Node: Schema locating file syntax basics18985
-Node: Using the document's URI to locate a schema20877
-Node: Using the document element to locate a schema23407
-Node: Using type identifiers in schema locating files24473
-Node: Using multiple schema locating files26889
-Node: DTDs28717
-Node: Limitations30182
-
-End Tag Table
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.rnc
deleted file mode 100644
index b32f524201..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.rnc
+++ /dev/null
@@ -1,20 +0,0 @@
-# A small subset of Texinfo
-start = section
-section = element section { title, desc?, block*, section* }
-title = element title { text }
-desc = element desc { text }
-block = para | example | display | ulist
-para = element para { (text|inline|block)* }
-example = element example { (text|var|point)* }
-display = element display { (text|inline)* }
-ulist = element ulist { item+ }
-item = element item { block+ }
-inline = kbd | key | samp | code | var | emph | uref | point
-kbd = element kbd  { (text | key | var)* }
-key = element key { xsd:string { pattern = "[A-Z]{2,}" } }
-samp = element samp { (text | var)* }
-code = element code { (text | var)* }
-var = element var { text }
-emph = element emph { text }
-uref = element uref { attribute url { xsd:anyURI }, text }
-point = element point { empty }
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.texi b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.texi
deleted file mode 100644
index e2ab3fdbd5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.texi
+++ /dev/null
@@ -1,834 +0,0 @@
-\input texinfo @c -*- texinfo -*-
-@c %**start of header
-@setfilename nxml-mode.info
-@settitle nXML Mode
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* nXML Mode: (nxml-mode.info).
-@end direntry
-
-@node Top
-@top nXML Mode
-
-This manual documents nxml-mode, an Emacs major mode for editing
-XML with RELAX NG support.  This manual is not yet complete.
-
-@menu
-* Completion::                  
-* Inserting end-tags::          
-* Paragraphs::                  
-* Outlining::                   
-* Locating a schema::           
-* DTDs::                        
-* Limitations::                 
-@end menu
-
-@node Completion
-@chapter Completion
-
-Apart from real-time validation, the most important feature that
-nxml-mode provides for assisting in document creation is "completion".
-Completion assists the user in inserting characters at point, based on
-knowledge of the schema and on the contents of the buffer before
-point.
-
-The traditional GNU Emacs key combination for completion in a
-buffer is @kbd{M-@key{TAB}}. However, many window systems
-and window managers use this key combination themselves (typically for
-switching between windows) and do not pass it to applications. It's
-hard to find key combinations in GNU Emacs that are both easy to type
-and not taken by something else.  @kbd{C-@key{RET}} (i.e.
-pressing the Enter or Return key, while the Ctrl key is held down) is
-available.  It won't be available on a traditional terminal (because
-it is indistinguishable from Return), but it will work with a window
-system.  Therefore we adopt the following solution by default: use
-@kbd{C-@key{RET}} when there's a window system and
-@kbd{M-@key{TAB}} when there's not.  In the following, I
-will assume that a window system is being used and will therefore
-refer to @kbd{C-@key{RET}}.
-
-Completion works by examining the symbol preceding point.  This
-is the symbol to be completed. The symbol to be completed may be the
-empty. Completion considers what symbols starting with the symbol to
-be completed would be valid replacements for the symbol to be
-completed, given the schema and the contents of the buffer before
-point.  These symbols are the possible completions.  An example may
-make this clearer.  Suppose the buffer looks like this (where @point{}
-indicates point):
-
-@example
-<html xmlns="http://www.w3.org/1999/xhtml">
-<h@point{}
-@end example
-
-@noindent
-and the schema is XHTML.  In this context, the symbol to be completed
-is @samp{h}.  The possible completions consist of just
-@samp{head}.  Another example, is
-
-@example
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<@point{}
-@end example
-
-@noindent
-In this case, the symbol to be completed is empty, and the possible
-completions are @samp{base}, @samp{isindex},
-@samp{link}, @samp{meta}, @samp{script},
-@samp{style}, @samp{title}.  Another example is:
-
-@example
-<html xmlns="@point{}
-@end example
-
-@noindent
-In this case, the symbol to be completed is empty, and the possible
-completions are just @samp{http://www.w3.org/1999/xhtml}.
-
-When you type @kbd{C-@key{RET}}, what happens depends
-on what the set of possible completions are.
-
-@itemize @bullet
-@item
-If the set of completions is empty, nothing
-happens.
-@item
-If there is one possible completion, then that completion is
-inserted, together with any following characters that are
-required. For example, in this case:
-
-@example
-<html xmlns="http://www.w3.org/1999/xhtml">
-<@point{}
-@end example
-
-@noindent
-@kbd{C-@key{RET}} will yield
-
-@example
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head@point{}
-@end example
-@item
-If there is more than one possible completion, but all
-possible completions share a common non-empty prefix, then that prefix
-is inserted. For example, suppose the buffer is:
-
-@example
-<html x@point{}
-@end example
-
-@noindent
-The symbol to be completed is @samp{x}. The possible completions
-are @samp{xmlns} and @samp{xml:lang}.  These share a
-common prefix of @samp{xml}.  Thus, @kbd{C-@key{RET}}
-will yield:
-
-@example
-<html xml@point{}
-@end example
-
-@noindent
-Typically, you would do @kbd{C-@key{RET}} again, which would
-have the result described in the next item.
-@item
-If there is more than one possible completion, but the
-possible completions do not share a non-empty prefix, then Emacs will
-prompt you to input the symbol in the minibuffer, initializing the
-minibuffer with the symbol to be completed, and popping up a buffer
-showing the possible completions.  You can now input the symbol to be
-inserted.  The symbol you input will be inserted in the buffer instead
-of the symbol to be completed.  Emacs will then insert any required
-characters after the symbol.  For example, if it contains:
-
-@example
-<html xml@point{}
-@end example
-
-@noindent
-Emacs will prompt you in the minibuffer with
-
-@example
-Attribute: xml@point{}
-@end example
-
-@noindent
-and the buffer showing possible completions will contain
-
-@example
-Possible completions are:
-xml:lang			   xmlns
-@end example
-
-@noindent
-If you input @kbd{xmlns}, the result will be:
-
-@example
-<html xmlns="@point{}
-@end example
-
-@noindent
-(If you do @kbd{C-@key{RET}} again, the namespace URI will
-be inserted. Should that happen automatically?)
-@end itemize
-
-@node Inserting end-tags
-@chapter Inserting end-tags
-
-The main redundancy in XML syntax is end-tags.  nxml-mode provides
-several ways to make it easier to enter end-tags.  You can use all of
-these without a schema.
-
-You can use @kbd{C-@key{RET}} after @samp{</}
-to complete the rest of the end-tag.
-
-@kbd{C-c C-f} inserts an end-tag for the element containing
-point. This command is useful when you want to input the start-tag,
-then input the content and finally input the end-tag. The @samp{f}
-is mnemonic for finish.
-
-If you want to keep tags balanced and input the end-tag at the
-same time as the start-tag, before inputting the content, then you can
-use @kbd{C-c C-i}. This inserts a @samp{>}, then inserts
-the end-tag and leaves point before the end-tag.  @kbd{C-c C-b}
-is similar but more convenient for block-level elements: it puts the
-start-tag, point and the end-tag on successive lines, appropriately
-indented. The @samp{i} is mnemonic for inline and the
-@samp{b} is mnemonic for block.
-
-Finally, you can customize nxml-mode so that @kbd{/}
-automatically inserts the rest of the end-tag when it occurs after
-@samp{<}, by doing
-
-@display
-@kbd{M-x customize-variable @key{RET} nxml-slash-auto-complete-flag @key{RET}}
-@end display
-
-@noindent
-and then following the instructions in the displayed buffer.
-
-@node Paragraphs
-@chapter Paragraphs
-
-Emacs has several commands that operate on paragraphs, most
-notably @kbd{M-q}. nXML mode redefines these to work in a way
-that is useful for XML.  The exact rules that are used to find the
-beginning and end of a paragraph are complicated; they are designed
-mainly to ensure that @kbd{M-q} does the right thing.
-
-A paragraph consists of one or more complete, consecutive lines.
-A group of lines is not considered a paragraph unless it contains some
-non-whitespace characters between tags or inside comments.  A blank
-line separates paragraphs.  A single tag on a line by itself also
-separates paragraphs.  More precisely, if one tag together with any
-leading and trailing whitespace completely occupy one or more lines,
-then those lines will not be included in any paragraph.
-
-A start-tag at the beginning of the line (possibly indented) may
-be treated as starting a paragraph.  Similarly, an end-tag at the end
-of the line may be treated as ending a paragraph. The following rules
-are used to determine whether such a tag is in fact treated as a
-paragraph boundary:
-
-@itemize @bullet
-@item
-If the schema does not allow text at that point, then it
-is a paragraph boundary.
-@item
-If the end-tag corresponding to the start-tag is not at
-the end of its line, or the start-tag corresponding to the end-tag is
-not at the beginning of its line, then it is not a paragraph
-boundary. For example, in
-
-@example
-<p>This is a paragraph with an
-<emph>emphasized</emph> phrase.
-@end example
-
-@noindent
-the @samp{<emph>} start-tag would not be considered as
-starting a paragraph, because its corresponding end-tag is not at the
-end of the line.
-@item
-If there is text that is a sibling in element tree, then
-it is not a paragraph boundary.  For example, in
-
-@example
-<p>This is a paragraph with an
-<emph>emphasized phrase that takes one source line</emph>
-@end example
-
-@noindent
-the @samp{<emph>} start-tag would not be considered as
-starting a paragraph, even though its end-tag is at the end of its
-line, because there the text @samp{This is a paragraph with an}
-is a sibling of the @samp{emph} element.
-@item
-Otherwise, it is a paragraph boundary.
-@end itemize
-
-@node Outlining
-@chapter Outlining
-
-nXML mode allows you to display all or part of a buffer as an
-outline, in a similar way to Emacs' outline mode.  An outline in nXML
-mode is based on recognizing two kinds of element: sections and
-headings.  There is one heading for every section and one section for
-every heading.  A section contains its heading as or within its first
-child element.  A section also contains its subordinate sections (its
-subsections).  The text content of a section consists of anything in a
-section that is neither a subsection nor a heading.
-
-Note that this is a different model from that used by XHTML.
-nXML mode's outline support will not be useful for XHTML unless you
-adopt a convention of adding a @code{div} to enclose each
-section, rather than having sections implicitly delimited by different
-@code{h@var{n}} elements.  This limitation may be removed
-in a future version.
-
-The variable @code{nxml-section-element-name-regexp} gives
-a regexp for the local names (i.e. the part of the name following any
-prefix) of section elements. The variable
-@code{nxml-heading-element-name-regexp} gives a regexp for the
-local names of heading elements. For an element to be recognized
-as a section
-
-@itemize @bullet
-@item
-its start-tag must occur at the beginning of a line
-(possibly indented);
-@item
-its local name must match
-@code{nxml-section-element-name-regexp};
-@item
-either its first child element or a descendant of that
-first child element must have a local name that matches
-@code{nxml-heading-element-name-regexp}; the first such element
-is treated as the section's heading.
-@end itemize
-
-@noindent
-You can customize these variables using @kbd{M-x
-customize-variable}.
-
-There are three possible outline states for a section:
-
-@itemize @bullet
-@item
-normal, showing everything, including its heading, text
-content and subsections; each subsection is displayed according to the
-state of that subsection;
-@item
-showing just its heading, with both its text content and
-its subsections hidden; all subsections are hidden regardless of their
-state;
-@item
-showing its heading and its subsections, with its text
-content hidden; each subsection is displayed according to the state of
-that subsection.
-@end itemize
-
-In the last two states, where the text content is hidden, the
-heading is displayed specially, in an abbreviated form. An element
-like this:
-
-@example
-<section>
-<title>Food</title>
-<para>There are many kinds of food.</para>
-</section>
-@end example
-
-@noindent
-would be displayed on a single line like this:
-
-@example
-<-section>Food...</>
-@end example
-
-@noindent
-If there are hidden subsections, then a @code{+} will be used
-instead of a @code{-} like this:
-
-@example
-<+section>Food...</>
-@end example
-
-@noindent
-If there are non-hidden subsections, then the section will instead be
-displayed like this:
-
-@example
-<-section>Food...
-  <-section>Delicious Food...</>
-  <-section>Distasteful Food...</>
-</-section>
-@end example
-
-@noindent
-The heading is always displayed with an indent that corresponds to its
-depth in the outline, even it is not actually indented in the buffer.
-The variable @code{nxml-outline-child-indent} controls how much
-a subheading is indented with respect to its parent heading when the
-heading is being displayed specially.
-
-Commands to change the outline state of sections are bound to
-key sequences that start with @kbd{C-c C-o} (@kbd{o} is
-mnemonic for outline).  The third and final key has been chosen to be
-consistent with outline mode.  In the following descriptions
-current section means the section containing point, or, more precisely,
-the innermost section containing the character immediately following
-point.
-
-@itemize @bullet
-@item
-@kbd{C-c C-o C-a} shows all sections in the buffer
-normally.
-@item
-@kbd{C-c C-o C-t} hides the text content
-of all sections in the buffer.
-@item
-@kbd{C-c C-o C-c} hides the text content
-of the current section.
-@item
-@kbd{C-c C-o C-e} shows the text content
-of the current section.
-@item
-@kbd{C-c C-o C-d} hides the text content
-and subsections of the current section.
-@item
-@kbd{C-c C-o C-s} shows the current section 
-and all its direct and indirect subsections normally.
-@item
-@kbd{C-c C-o C-k} shows the headings of the
-direct and indirect subsections of the current section.
-@item
-@kbd{C-c C-o C-l} hides the text content of the
-current section and of its direct and indirect
-subsections.
-@item
-@kbd{C-c C-o C-i} shows the headings of the
-direct subsections of the current section.
-@item
-@kbd{C-c C-o C-o} hides as much as possible without
-hiding the current section's text content; the headings of ancestor
-sections of the current section and their child section sections will
-not be hidden.
-@end itemize
-
-When a heading is displayed specially, you can use
-@key{RET} in that heading to show the text content of the section
-in the same way as @kbd{C-c C-o C-e}.
-
-You can also use the mouse to change the outline state:
-@kbd{S-mouse-2} hides the text content of a section in the same
-way as@kbd{C-c C-o C-c}; @kbd{mouse-2} on a specially
-displayed heading shows the text content of the section in the same
-way as @kbd{C-c C-o C-e}; @kbd{mouse-1} on a specially
-displayed start-tag toggles the display of subheadings on and
-off.
-
-The outline state for each section is stored with the first
-character of the section (as a text property). Every command that
-changes the outline state of any section updates the display of the
-buffer so that each section is displayed correctly according to its
-outline state.  If the section structure is subsequently changed, then
-it is possible for the display to no longer correctly reflect the
-stored outline state. @kbd{C-c C-o C-r} can be used to refresh
-the display so it is correct again.
-
-@node Locating a schema
-@chapter Locating a schema
-
-nXML mode has a configurable set of rules to locate a schema for
-the file being edited.  The rules are contained in one or more schema
-locating files, which are XML documents.
-
-The variable @samp{rng-schema-locating-files} specifies
-the list of the file-names of schema locating files that nXML mode
-should use.  The order of the list is significant: when file
-@var{x} occurs in the list before file @var{y} then rules
-from file @var{x} have precedence over rules from file
-@var{y}.  A filename specified in
-@samp{rng-schema-locating-files} may be relative. If so, it will
-be resolved relative to the document for which a schema is being
-located. It is not an error if relative file-names in
-@samp{rng-schema-locating-files} do not not exist. You can use
-@kbd{M-x customize-variable @key{RET} rng-schema-locating-files
-@key{RET}} to customize the list of schema locating
-files.
-
-By default, @samp{rng-schema-locating-files} list has two
-members: @samp{schemas.xml}, and
-@samp{@var{dist-dir}/schema/schemas.xml} where
-@samp{@var{dist-dir}} is the directory containing the nXML
-distribution. The first member will cause nXML mode to use a file
-@samp{schemas.xml} in the same directory as the document being
-edited if such a file exist.  The second member contains rules for the
-schemas that are included with the nXML distribution.
-
-@menu
-* Commands for locating a schema::  
-* Schema locating files::       
-@end menu
-
-@node Commands for locating a schema
-@section Commands for locating a schema
-
-The command @kbd{C-c C-s C-w} will tell you what schema
-is currently being used.
-
-The rules for locating a schema are applied automatically when
-you visit a file in nXML mode. However, if you have just created a new
-file and the schema cannot be inferred from the file-name, then this
-will not locate the right schema.  In this case, you should insert the
-start-tag of the root element and then use the command @kbd{C-c
-C-a}, which reapplies the rules based on the current content of
-the document.  It is usually not necessary to insert the complete
-start-tag; often just @samp{<@var{name}} is
-enough.
-
-If you want to use a schema that has not yet been added to the
-schema locating files, you can use the command @kbd{C-c C-s C-f}
-to manually select the file contaiing the schema for the document in
-current buffer.  Emacs will read the file-name of the schema from the
-minibuffer. After reading the file-name, Emacs will ask whether you
-wish to add a rule to a schema locating file that persistently
-associates the document with the selected schema.  The rule will be
-added to the first file in the list specified
-@samp{rng-schema-locating-files}; it will create the file if
-necessary, but will not create a directory. If the variable
-@samp{rng-schema-locating-files} has not been customized, this
-means that the rule will be added to the file @samp{schemas.xml}
-in the same directory as the document being edited.
-
-The command @kbd{C-c C-s C-t} allows you to select a schema by
-specifying an identifier for the type of the document.  The schema
-locating files determine the available type identifiers and what
-schema is used for each type identifier. This is useful when it is
-impossible to infer the right schema from either the file-name or the
-content of the document, even though the schema is already in the
-schema locating file.  A situation in which this can occur is when
-there are multiple variants of a schema where all valid documents have
-the same document element.  For example, XHTML has Strict and
-Transitional variants.  In a situation like this, a schema locating file
-can define a type identifier for each variant. As with @kbd{C-c
-C-s C-f}, Emacs will ask whether you wish to add a rule to a schema
-locating file that persistently associates the document with the
-specified type identifier.
-
-The command @kbd{C-c C-s C-l} adds a rule to a schema
-locating file that persistently associates the document with
-the schema that is currently being used.
-
-@node Schema locating files
-@section Schema locating files
-
-Each schema locating file specifies a list of rules.  The rules
-from each file are appended in order. To locate a schema each rule is
-applied in turn until a rule matches.  The first matching rule is then
-used to determine the schema.
-
-Schema locating files are designed to be useful for other
-applications that need to locate a schema for a document. In fact,
-there is nothing specific to locating schemas in the design; it could
-equally well be used for locating a stylesheet.
-
-@menu
-* Schema locating file syntax basics::  
-* Using the document's URI to locate a schema::  
-* Using the document element to locate a schema::  
-* Using type identifiers in schema locating files::  
-* Using multiple schema locating files::  
-@end menu
-
-@node Schema locating file syntax basics
-@subsection Schema locating file syntax basics
-
-There is a schema for schema locating files in the file
-@samp{locate.rnc} in the schema directory.  Schema locating
-files must be valid with respect to this schema.
-
-The document element of a schema locating file must be
-@samp{locatingRules} and the namespace URI must be
-@samp{http://thaiopensource.com/ns/locating-rules/1.0}.  The
-children of the document element specify rules. The order of the
-children is the same as the order of the rules.  Here's a complete
-example of a schema locating file:
-
-@example
-<?xml version="1.0"?>
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-  <documentElement localName="book" uri="docbook.rnc"/>
-</locatingRules>
-@end example
-
-@noindent
-This says to use the schema @samp{xhtml.rnc} for a document with
-namespace @samp{http://www.w3.org/1999/xhtml}, and to use the
-schema @samp{docbook.rnc} for a document whose local name is
-@samp{book}.  If the document element had both a namespace URI
-of @samp{http://www.w3.org/1999/xhtml} and a local name of
-@samp{book}, then the matching rule that comes first will be
-used and so the schema @samp{xhtml.rnc} would be used.  There is
-no precedence between different types of rule; the first matching rule
-of any type is used.
-
-As usual with XML-related technologies, resources are identified
-by URIs.  The @samp{uri} attribute identifies the schema by
-specifying the URI.  The URI may be relative.  If so, it is resolved
-relative to the URI of the schema locating file that contains
-attribute. This means that if the value of @samp{uri} attribute
-does not contain a @samp{/}, then it will refer to a filename in
-the same directory as the schema locating file.
-
-@node Using the document's URI to locate a schema
-@subsection Using the document's URI to locate a schema
-
-A @samp{uri} rule locates a schema based on the URI of the
-document.  The @samp{uri} attribute specifies the URI of the
-schema.  The @samp{resource} attribute can be used to specify
-the schema for a particular document.  For example,
-
-@example
-<uri resource="spec.xml" uri="docbook.rnc"/>
-@end example
-
-@noindent
-specifies that that the schema for @samp{spec.xml} is
-@samp{docbook.rnc}.
-
-The @samp{pattern} attribute can be used instead of the
-@samp{resource} attribute to specify the schema for any document
-whose URI matches a pattern.  The pattern has the same syntax as an
-absolute or relative URI except that the path component of the URI can
-use a @samp{*} character to stand for zero or more characters
-within a path segment (i.e. any character other @samp{/}).
-Typically, the URI pattern looks like a relative URI, but, whereas a
-relative URI in the @samp{resource} attribute is resolved into a
-particular absolute URI using the base URI of the schema locating
-file, a relative URI pattern matches if it matches some number of
-complete path segments of the document's URI ending with the last path
-segment of the document's URI. For example,
-
-@example
-<uri pattern="*.xsl" uri="xslt.rnc"/>
-@end example
-
-@noindent
-specifies that the schema for documents with a URI whose path ends
-with @samp{.xsl} is @samp{xslt.rnc}.
-
-A @samp{transformURI} rule locates a schema by
-transforming the URI of the document. The @samp{fromPattern}
-attribute specifies a URI pattern with the same meaning as the
-@samp{pattern} attribute of the @samp{uri} element.  The
-@samp{toPattern} attribute is a URI pattern that is used to
-generate the URI of the schema.  Each @samp{*} in the
-@samp{toPattern} is replaced by the string that matched the
-corresponding @samp{*} in the @samp{fromPattern}.  The
-resulting string is appended to the initial part of the document's URI
-that was not explicitly matched by the @samp{fromPattern}.  The
-rule matches only if the transformed URI identifies an existing
-resource.  For example, the rule
-
-@example
-<transformURI fromPattern="*.xml" toPattern="*.rnc"/>
-@end example
-
-@noindent
-would transform the URI @samp{file:///home/jjc/docs/spec.xml}
-into the URI @samp{file:///home/jjc/docs/spec.rnc}.  Thus, this
-rule specifies that to locate a schema for a document
-@samp{@var{foo}.xml}, Emacs should test whether a file
-@samp{@var{foo}.rnc} exists in the same directory as
-@samp{@var{foo}.xml}, and, if so, should use it as the
-schema.
-
-@node Using the document element to locate a schema
-@subsection Using the document element to locate a schema
-
-A @samp{documentElement} rule locates a schema based on
-the local name and prefix of the document element. For example, a rule
-
-@example
-<documentElement prefix="xsl" localName="stylesheet" uri="xslt.rnc"/>
-@end example
-
-@noindent
-specifies that when the name of the document element is
-@samp{xsl:stylesheet}, then @samp{xslt.rnc} should be used
-as the schema. Either the @samp{prefix} or
-@samp{localName} attribute may be omitted to allow any prefix or
-local name.
-
-A @samp{namespace} rule locates a schema based on the
-namespace URI of the document element. For example, a rule
-
-@example
-<namespace ns="http://www.w3.org/1999/XSL/Transform" uri="xslt.rnc"/>
-@end example
-
-@noindent
-specifies that when the namespace URI of the document is
-@samp{http://www.w3.org/1999/XSL/Transform}, then
-@samp{xslt.rnc} should be used as the schema.
-
-@node Using type identifiers in schema locating files
-@subsection Using type identifiers in schema locating files
-
-Type identifiers allow a level of indirection in locating the
-schema for a document.  Instead of associating the document directly
-with a schema URI, the document is associated with a type identifier,
-which is in turn associated with a schema URI. nXML mode does not
-constrain the format of type identifiers.  They can be simply strings
-without any formal structure or they can be public identifiers or
-URIs.  Note that these type identifiers have nothing to do with the
-DOCTYPE declaration.  When comparing type identifiers, whitespace is
-normalized in the same way as with the @samp{xsd:token}
-datatype: leading and trailing whitespace is stripped; other sequences
-of whitespace are normalized to a single space character.
-
-Each of the rules described in previous sections that uses a
-@samp{uri} attribute to specify a schema, can instead use a
-@samp{typeId} attribute to specify a type identifier.  The type
-identifier can be associated with a URI using a @samp{typeId}
-element. For example,
-
-@example
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
-  <typeId id="XHTML" typeId="XHTML Strict"/>
-  <typeId id="XHTML Strict" uri="xhtml-strict.rnc"/>
-  <typeId id="XHTML Transitional" uri="xhtml-transitional.rnc"/>
-</locatingRules>
-@end example
-
-@noindent
-declares three type identifiers @samp{XHTML} (representing the
-default variant of XHTML to be used), @samp{XHTML Strict} and
-@samp{XHTML Transitional}.  Such a schema locating file would
-use @samp{xhtml-strict.rnc} for a document whose namespace is
-@samp{http://www.w3.org/1999/xhtml}.  But it is considerably
-more flexible than a schema locating file that simply specified
-
-@example
-<namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml-strict.rnc"/>
-@end example
-
-@noindent
-A user can easily use @kbd{C-c C-s C-t} to select between XHTML
-Strict and XHTML Transitional. Also, a user can easily add a catalog
-
-@example
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <typeId id="XHTML" typeId="XHTML Transitional"/>
-</locatingRules>
-@end example
-
-@noindent
-that makes the default variant of XHTML be XHTML Transitional.
-
-@node Using multiple schema locating files
-@subsection Using multiple schema locating files
-
-The @samp{include} element includes rules from another
-schema locating file.  The behavior is exactly as if the rules from
-that file were included in place of the @samp{include} element.
-Relative URIs are resolved into absolute URIs before the inclusion is
-performed. For example,
-
-@example
-<include rules="../rules.xml"/>
-@end example
-
-@noindent
-includes the rules from @samp{rules.xml}.
-
-The process of locating a schema takes as input a list of schema
-locating files.  The rules in all these files and in the files they
-include are resolved into a single list of rules, which are applied
-strictly in order.  Sometimes this order is not what is needed.
-For example, suppose you have two schema locating files, a private
-file
-
-@example
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-</locatingRules>
-@end example
-
-@noindent
-followed by a public file
-
-@example
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <transformURI pathSuffix=".xml" replacePathSuffix=".rnc"/>
-  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
-</locatingRules>
-@end example
-
-@noindent
-The effect of these two files is that the XHTML @samp{namespace}
-rule takes precedence over the @samp{transformURI} rule, which
-is almost certainly not what is needed.  This can be solved by adding
-an @samp{applyFollowingRules} to the private file.
-
-@example
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <applyFollowingRules ruleType="transformURI"/>
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-</locatingRules>
-@end example
-
-@node DTDs
-@chapter DTDs
-
-nxml-mode is designed to support the creation of standalone XML
-documents that do not depend on a DTD.  Although it is common practice
-to insert a DOCTYPE declaration referencing an external DTD, this has
-undesirable side-effects.  It means that the document is no longer
-self-contained. It also means that different XML parsers may interpret
-the document in different ways, since the XML Recommendation does not
-require XML parsers to read the DTD.  With DTDs, it was impractical to
-get validation without using an external DTD or reference to an
-parameter entity.  With RELAX NG and other schema languages, you can
-simulataneously get the benefits of validation and standalone XML
-documents.  Therefore, I recommend that you do not reference an
-external DOCTYPE in your XML documents.
-
-One problem is entities for characters. Typically, as well as
-providing validation, DTDs also provide a set of character entities
-for documents to use. Schemas cannot provide this functionality,
-because schema validation happens after XML parsing.  The recommended
-solution is to either use the Unicode characters directly, or, if this
-is impractical, use character references.  nXML mode supports this by
-providing commands for entering characters and character references
-using the Unicode names, and can display the glyph corresponding to a
-character reference.
-
-@node Limitations
-@chapter Limitations
-
-nXML mode has some limitations:
-
-@itemize @bullet
-@item
-DTD support is limited.  Internal parsed general entities declared
-in the internal subset are supported provided they do not contain
-elements. Other usage of DTDs is ignored.
-@item
-The restrictions on RELAX NG schemas in section 7 of the RELAX NG
-specification are not enforced.
-@item
-Unicode support has problems. This stems mostly from the fact that
-the XML (and RELAX NG) character model is based squarely on Unicode,
-whereas the Emacs character model is not.  Emacs 22 is slated to have
-full Unicode support, which should improve the situation here.
-@end itemize
-
-@bye
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.xml b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.xml
deleted file mode 100644
index 324b3604c9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-mode.xml
+++ /dev/null
@@ -1,852 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<section>
-<title>nXML Mode</title>
-
-<para>This manual documents nxml-mode, an Emacs major mode for editing
-XML with RELAX NG support.  This manual is not yet complete.</para>
-
-<section>
-<title>Completion</title>
-
-<para>Apart from real-time validation, the most important feature that
-nxml-mode provides for assisting in document creation is "completion".
-Completion assists the user in inserting characters at point, based on
-knowledge of the schema and on the contents of the buffer before
-point.</para>
-
-<para>The traditional GNU Emacs key combination for completion in a
-buffer is <kbd>M-<key>TAB</key></kbd>. However, many window systems
-and window managers use this key combination themselves (typically for
-switching between windows) and do not pass it to applications. It's
-hard to find key combinations in GNU Emacs that are both easy to type
-and not taken by something else.  <kbd>C-<key>RET</key></kbd> (i.e.
-pressing the Enter or Return key, while the Ctrl key is held down) is
-available.  It won't be available on a traditional terminal (because
-it is indistinguishable from Return), but it will work with a window
-system.  Therefore we adopt the following solution by default: use
-<kbd>C-<key>RET</key></kbd> when there's a window system and
-<kbd>M-<key>TAB</key></kbd> when there's not.  In the following, I
-will assume that a window system is being used and will therefore
-refer to <kbd>C-<key>RET</key></kbd>.</para>
-
-<para>Completion works by examining the symbol preceding point.  This
-is the symbol to be completed. The symbol to be completed may be the
-empty. Completion considers what symbols starting with the symbol to
-be completed would be valid replacements for the symbol to be
-completed, given the schema and the contents of the buffer before
-point.  These symbols are the possible completions.  An example may
-make this clearer.  Suppose the buffer looks like this (where <point/>
-indicates point):
-
-<example>
-&lt;html xmlns="http://www.w3.org/1999/xhtml">
-&lt;h<point/>
-</example>
-
-and the schema is XHTML.  In this context, the symbol to be completed
-is <samp>h</samp>.  The possible completions consist of just
-<samp>head</samp>.  Another example, is
-
-<example>
-&lt;html xmlns="http://www.w3.org/1999/xhtml">
-&lt;head>
-&lt;<point/>
-</example>
-
-In this case, the symbol to be completed is empty, and the possible
-completions are <samp>base</samp>, <samp>isindex</samp>,
-<samp>link</samp>, <samp>meta</samp>, <samp>script</samp>,
-<samp>style</samp>, <samp>title</samp>.  Another example is:
-
-<example>
-&lt;html xmlns="<point/>
-</example>
-
-In this case, the symbol to be completed is empty, and the possible
-completions are just <samp>http://www.w3.org/1999/xhtml</samp>.</para>
-
-<para>When you type <kbd>C-<key>RET</key></kbd>, what happens depends
-on what the set of possible completions are.</para>
-
-<ulist>
-
-<item><para>If the set of completions is empty, nothing
-happens.</para></item>
-
-<item><para>If there is one possible completion, then that completion is
-inserted, together with any following characters that are
-required. For example, in this case:
-
-<example>
-&lt;html xmlns="http://www.w3.org/1999/xhtml">
-&lt;<point/>
-</example>
-
-<kbd>C-<key>RET</key></kbd> will yield
-
-<example>
-&lt;html xmlns="http://www.w3.org/1999/xhtml">
-&lt;head<point/>
-</example>
-</para>
-</item>
-
-<item><para>If there is more than one possible completion, but all
-possible completions share a common non-empty prefix, then that prefix
-is inserted. For example, suppose the buffer is:
-
-<example>
-&lt;html x<point/>
-</example>
-
-The symbol to be completed is <samp>x</samp>. The possible completions
-are <samp>xmlns</samp> and <samp>xml:lang</samp>.  These share a
-common prefix of <samp>xml</samp>.  Thus, <kbd>C-<key>RET</key></kbd>
-will yield:
-
-<example>
-&lt;html xml<point/>
-</example>
-
-Typically, you would do <kbd>C-<key>RET</key></kbd> again, which would
-have the result described in the next item.</para></item>
-
-<item><para>If there is more than one possible completion, but the
-possible completions do not share a non-empty prefix, then Emacs will
-prompt you to input the symbol in the minibuffer, initializing the
-minibuffer with the symbol to be completed, and popping up a buffer
-showing the possible completions.  You can now input the symbol to be
-inserted.  The symbol you input will be inserted in the buffer instead
-of the symbol to be completed.  Emacs will then insert any required
-characters after the symbol.  For example, if it contains:
-
-<example>
-&lt;html xml<point/>
-</example>
-
-Emacs will prompt you in the minibuffer with
-
-<example>
-Attribute: xml<point/>
-</example>
-
-and the buffer showing possible completions will contain
-
-<example>
-Possible completions are:
-xml:lang			   xmlns
-</example>
-
-If you input <kbd>xmlns</kbd>, the result will be:
-
-<example>
-&lt;html xmlns="<point/>
-</example>
-
-(If you do <kbd>C-<key>RET</key></kbd> again, the namespace URI will
-be inserted. Should that happen automatically?)</para>
-</item>
-</ulist>
-
-</section>
-
-<section>
-<title>Inserting end-tags</title>
-
-<para>The main redundancy in XML syntax is end-tags.  nxml-mode provides
-several ways to make it easier to enter end-tags.  You can use all of
-these without a schema.</para>
-
-<para>You can use <kbd>C-<key>RET</key></kbd> after <samp>&lt;/</samp>
-to complete the rest of the end-tag.</para>
-
-<para><kbd>C-c C-f</kbd> inserts an end-tag for the element containing
-point. This command is useful when you want to input the start-tag,
-then input the content and finally input the end-tag. The <samp>f</samp>
-is mnemonic for finish.</para>
-
-<para>If you want to keep tags balanced and input the end-tag at the
-same time as the start-tag, before inputting the content, then you can
-use <kbd>C-c C-i</kbd>. This inserts a <samp>&gt;</samp>, then inserts
-the end-tag and leaves point before the end-tag.  <kbd>C-c C-b</kbd>
-is similar but more convenient for block-level elements: it puts the
-start-tag, point and the end-tag on successive lines, appropriately
-indented. The <samp>i</samp> is mnemonic for inline and the
-<samp>b</samp> is mnemonic for block.</para>
-
-<para>Finally, you can customize nxml-mode so that <kbd>/</kbd>
-automatically inserts the rest of the end-tag when it occurs after
-<samp>&lt;</samp>, by doing
-
-<display>
-<kbd>M-x customize-variable <key>RET</key> nxml-slash-auto-complete-flag <key>RET</key></kbd>
-</display>
-
-and then following the instructions in the displayed buffer.</para>
-
-</section>
-
-<section>
-<title>Paragraphs</title>
-
-<para>Emacs has several commands that operate on paragraphs, most
-notably <kbd>M-q</kbd>. nXML mode redefines these to work in a way
-that is useful for XML.  The exact rules that are used to find the
-beginning and end of a paragraph are complicated; they are designed
-mainly to ensure that <kbd>M-q</kbd> does the right thing.</para>
-
-<para>A paragraph consists of one or more complete, consecutive lines.
-A group of lines is not considered a paragraph unless it contains some
-non-whitespace characters between tags or inside comments.  A blank
-line separates paragraphs.  A single tag on a line by itself also
-separates paragraphs.  More precisely, if one tag together with any
-leading and trailing whitespace completely occupy one or more lines,
-then those lines will not be included in any paragraph.</para>
-
-<para>A start-tag at the beginning of the line (possibly indented) may
-be treated as starting a paragraph.  Similarly, an end-tag at the end
-of the line may be treated as ending a paragraph. The following rules
-are used to determine whether such a tag is in fact treated as a
-paragraph boundary:
-<ulist>
-<item><para>If the schema does not allow text at that point, then it
-is a paragraph boundary.</para></item>
-<item><para>If the end-tag corresponding to the start-tag is not at
-the end of its line, or the start-tag corresponding to the end-tag is
-not at the beginning of its line, then it is not a paragraph
-boundary. For example, in
-<example>
-<![CDATA[<p>This is a paragraph with an
-<emph>emphasized</emph> phrase.]]>
-</example>
-the <samp>&lt;emph&gt;</samp> start-tag would not be considered as
-starting a paragraph, because its corresponding end-tag is not at the
-end of the line.</para></item>
-<item><para>If there is text that is a sibling in element tree, then
-it is not a paragraph boundary.  For example, in
-<example>
-<![CDATA[<p>This is a paragraph with an
-<emph>emphasized phrase that takes one source line</emph>]]>
-</example>
-the <samp>&lt;emph&gt;</samp> start-tag would not be considered as
-starting a paragraph, even though its end-tag is at the end of its
-line, because there the text <samp>This is a paragraph with an</samp>
-is a sibling of the <samp>emph</samp> element.</para></item>
-<item><para>Otherwise, it is a paragraph boundary.</para></item>
-</ulist>
-</para>
-
-</section>
-
-<section>
-<title>Outlining</title>
-
-<para>nXML mode allows you to display all or part of a buffer as an
-outline, in a similar way to Emacs' outline mode.  An outline in nXML
-mode is based on recognizing two kinds of element: sections and
-headings.  There is one heading for every section and one section for
-every heading.  A section contains its heading as or within its first
-child element.  A section also contains its subordinate sections (its
-subsections).  The text content of a section consists of anything in a
-section that is neither a subsection nor a heading.</para>
-
-<para>Note that this is a different model from that used by XHTML.
-nXML mode's outline support will not be useful for XHTML unless you
-adopt a convention of adding a <code>div</code> to enclose each
-section, rather than having sections implicitly delimited by different
-<code>h<var>n</var></code> elements.  This limitation may be removed
-in a future version.</para>
-
-<para>The variable <code>nxml-section-element-name-regexp</code> gives
-a regexp for the local names (i.e. the part of the name following any
-prefix) of section elements. The variable
-<code>nxml-heading-element-name-regexp</code> gives a regexp for the
-local names of heading elements. For an element to be recognized
-as a section
-<ulist>
-<item><para>its start-tag must occur at the beginning of a line
-(possibly indented);</para></item>
-<item><para>its local name must match
-<code>nxml-section-element-name-regexp</code>;</para></item>
-<item><para>either its first child element or a descendant of that
-first child element must have a local name that matches
-<code>nxml-heading-element-name-regexp</code>; the first such element
-is treated as the section's heading.</para></item>
-</ulist>
-You can customize these variables using <kbd>M-x
-customize-variable</kbd>.</para>
-
-<para>There are three possible outline states for a section:
-<ulist>
-<item><para>normal, showing everything, including its heading, text
-content and subsections; each subsection is displayed according to the
-state of that subsection;</para></item>
-<item><para>showing just its heading, with both its text content and
-its subsections hidden; all subsections are hidden regardless of their
-state;</para></item>
-<item><para>showing its heading and its subsections, with its text
-content hidden; each subsection is displayed according to the state of
-that subsection.</para></item>
-</ulist>
-</para>
-
-<para>In the last two states, where the text content is hidden, the
-heading is displayed specially, in an abbreviated form. An element
-like this:
-<example>
-<![CDATA[<section>
-<title>Food</title>
-<para>There are many kinds of food.</para>
-</section>]]>
-</example>
-would be displayed on a single line like this:
-<example>
-<![CDATA[<-section>Food...</>]]>
-</example>
-If there are hidden subsections, then a <code>+</code> will be used
-instead of a <code>-</code> like this:
-<example>
-<![CDATA[<+section>Food...</>]]>
-</example>
-If there are non-hidden subsections, then the section will instead be
-displayed like this:
-<example>
-<![CDATA[<-section>Food...
-  <-section>Delicious Food...</>
-  <-section>Distasteful Food...</>
-</-section>]]>
-</example>
-The heading is always displayed with an indent that corresponds to its
-depth in the outline, even it is not actually indented in the buffer.
-The variable <code>nxml-outline-child-indent</code> controls how much
-a subheading is indented with respect to its parent heading when the
-heading is being displayed specially.</para>
-
-<para>Commands to change the outline state of sections are bound to
-key sequences that start with <kbd>C-c C-o</kbd> (<kbd>o</kbd> is
-mnemonic for outline).  The third and final key has been chosen to be
-consistent with outline mode.  In the following descriptions
-current section means the section containing point, or, more precisely,
-the innermost section containing the character immediately following
-point.</para>
-<ulist>
-<item><para><kbd>C-c C-o C-a</kbd> shows all sections in the buffer
-normally.</para></item>
-<item><para><kbd>C-c C-o C-t</kbd> hides the text content
-of all sections in the buffer.</para></item>
-<item><para><kbd>C-c C-o C-c</kbd> hides the text content
-of the current section.</para></item>
-<item><para><kbd>C-c C-o C-e</kbd> shows the text content
-of the current section.</para></item>
-<item><para><kbd>C-c C-o C-d</kbd> hides the text content
-and subsections of the current section.</para></item>
-<item><para><kbd>C-c C-o C-s</kbd> shows the current section 
-and all its direct and indirect subsections normally.</para></item>
-<item><para><kbd>C-c C-o C-k</kbd> shows the headings of the
-direct and indirect subsections of the current section.</para></item>
-<item><para><kbd>C-c C-o C-l</kbd> hides the text content of the
-current section and of its direct and indirect
-subsections.</para></item>
-<item><para><kbd>C-c C-o C-i</kbd> shows the headings of the
-direct subsections of the current section.</para></item>
-<item><para><kbd>C-c C-o C-o</kbd> hides as much as possible without
-hiding the current section's text content; the headings of ancestor
-sections of the current section and their child section sections will
-not be hidden.</para></item>
-<!--
-<item><para><kbd>C-c C-o C-q</kbd></para></item>
--->
-</ulist>
-
-<para>When a heading is displayed specially, you can use
-<key>RET</key> in that heading to show the text content of the section
-in the same way as <kbd>C-c C-o C-e</kbd>.</para>
-
-<para>You can also use the mouse to change the outline state:
-<kbd>S-mouse-2</kbd> hides the text content of a section in the same
-way as<kbd>C-c C-o C-c</kbd>; <kbd>mouse-2</kbd> on a specially
-displayed heading shows the text content of the section in the same
-way as <kbd>C-c C-o C-e</kbd>; <kbd>mouse-1</kbd> on a specially
-displayed start-tag toggles the display of subheadings on and
-off.</para>
-
-<para>The outline state for each section is stored with the first
-character of the section (as a text property). Every command that
-changes the outline state of any section updates the display of the
-buffer so that each section is displayed correctly according to its
-outline state.  If the section structure is subsequently changed, then
-it is possible for the display to no longer correctly reflect the
-stored outline state. <kbd>C-c C-o C-r</kbd> can be used to refresh
-the display so it is correct again.</para>
-
-</section>
-
-<section>
-<title>Locating a schema</title>
-
-<para>nXML mode has a configurable set of rules to locate a schema for
-the file being edited.  The rules are contained in one or more schema
-locating files, which are XML documents.</para>
-
-<para>The variable <samp>rng-schema-locating-files</samp> specifies
-the list of the file-names of schema locating files that nXML mode
-should use.  The order of the list is significant: when file
-<var>x</var> occurs in the list before file <var>y</var> then rules
-from file <var>x</var> have precedence over rules from file
-<var>y</var>.  A filename specified in
-<samp>rng-schema-locating-files</samp> may be relative. If so, it will
-be resolved relative to the document for which a schema is being
-located. It is not an error if relative file-names in
-<samp>rng-schema-locating-files</samp> do not not exist. You can use
-<kbd>M-x customize-variable <key>RET</key> rng-schema-locating-files
-<key>RET</key></kbd> to customize the list of schema locating
-files.</para>
-
-<para>By default, <samp>rng-schema-locating-files</samp> list has two
-members: <samp>schemas.xml</samp>, and
-<samp><var>dist-dir</var>/schema/schemas.xml</samp> where
-<samp><var>dist-dir</var></samp> is the directory containing the nXML
-distribution. The first member will cause nXML mode to use a file
-<samp>schemas.xml</samp> in the same directory as the document being
-edited if such a file exist.  The second member contains rules for the
-schemas that are included with the nXML distribution.</para>
-
-<section>
-<title>Commands for locating a schema</title>
-
-<para>The command <kbd>C-c C-s C-w</kbd> will tell you what schema
-is currently being used.</para>
-
-<para>The rules for locating a schema are applied automatically when
-you visit a file in nXML mode. However, if you have just created a new
-file and the schema cannot be inferred from the file-name, then this
-will not locate the right schema.  In this case, you should insert the
-start-tag of the root element and then use the command <kbd>C-c
-C-a</kbd>, which reapplies the rules based on the current content of
-the document.  It is usually not necessary to insert the complete
-start-tag; often just <samp>&lt;<var>name</var></samp> is
-enough.</para>
-
-<para>If you want to use a schema that has not yet been added to the
-schema locating files, you can use the command <kbd>C-c C-s C-f</kbd>
-to manually select the file contaiing the schema for the document in
-current buffer.  Emacs will read the file-name of the schema from the
-minibuffer. After reading the file-name, Emacs will ask whether you
-wish to add a rule to a schema locating file that persistently
-associates the document with the selected schema.  The rule will be
-added to the first file in the list specified
-<samp>rng-schema-locating-files</samp>; it will create the file if
-necessary, but will not create a directory. If the variable
-<samp>rng-schema-locating-files</samp> has not been customized, this
-means that the rule will be added to the file <samp>schemas.xml</samp>
-in the same directory as the document being edited.</para>
-
-<para>The command <kbd>C-c C-s C-t</kbd> allows you to select a schema by
-specifying an identifier for the type of the document.  The schema
-locating files determine the available type identifiers and what
-schema is used for each type identifier. This is useful when it is
-impossible to infer the right schema from either the file-name or the
-content of the document, even though the schema is already in the
-schema locating file.  A situation in which this can occur is when
-there are multiple variants of a schema where all valid documents have
-the same document element.  For example, XHTML has Strict and
-Transitional variants.  In a situation like this, a schema locating file
-can define a type identifier for each variant. As with <kbd>C-c
-C-s C-f</kbd>, Emacs will ask whether you wish to add a rule to a schema
-locating file that persistently associates the document with the
-specified type identifier.</para>
-
-<para>The command <kbd>C-c C-s C-l</kbd> adds a rule to a schema
-locating file that persistently associates the document with
-the schema that is currently being used.</para>
-
-</section>
-
-<section>
-<title>Schema locating files</title>
-
-<para>Each schema locating file specifies a list of rules.  The rules
-from each file are appended in order. To locate a schema each rule is
-applied in turn until a rule matches.  The first matching rule is then
-used to determine the schema.</para>
-
-<para>Schema locating files are designed to be useful for other
-applications that need to locate a schema for a document. In fact,
-there is nothing specific to locating schemas in the design; it could
-equally well be used for locating a stylesheet.</para>
-
-<section>
-<title>Schema locating file syntax basics</title>
-
-<para>There is a schema for schema locating files in the file
-<samp>locate.rnc</samp> in the schema directory.  Schema locating
-files must be valid with respect to this schema.</para>
-
-<para>The document element of a schema locating file must be
-<samp>locatingRules</samp> and the namespace URI must be
-<samp>http://thaiopensource.com/ns/locating-rules/1.0</samp>.  The
-children of the document element specify rules. The order of the
-children is the same as the order of the rules.  Here's a complete
-example of a schema locating file:
-
-<example>
-<![CDATA[<?xml version="1.0"?>
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-  <documentElement localName="book" uri="docbook.rnc"/>
-</locatingRules>]]>
-</example>
-
-This says to use the schema <samp>xhtml.rnc</samp> for a document with
-namespace <samp>http://www.w3.org/1999/xhtml</samp>, and to use the
-schema <samp>docbook.rnc</samp> for a document whose local name is
-<samp>book</samp>.  If the document element had both a namespace URI
-of <samp>http://www.w3.org/1999/xhtml</samp> and a local name of
-<samp>book</samp>, then the matching rule that comes first will be
-used and so the schema <samp>xhtml.rnc</samp> would be used.  There is
-no precedence between different types of rule; the first matching rule
-of any type is used.</para>
-
-<para>As usual with XML-related technologies, resources are identified
-by URIs.  The <samp>uri</samp> attribute identifies the schema by
-specifying the URI.  The URI may be relative.  If so, it is resolved
-relative to the URI of the schema locating file that contains
-attribute. This means that if the value of <samp>uri</samp> attribute
-does not contain a <samp>/</samp>, then it will refer to a filename in
-the same directory as the schema locating file.<!--  The
-<samp>xml:base</samp> attribute may be used to change the base URI
-used for resolving relative URIs.--></para>
-
-</section>
-
-<section>
-<title>Using the document's URI to locate a schema</title>
-
-<para>A <samp>uri</samp> rule locates a schema based on the URI of the
-document.  The <samp>uri</samp> attribute specifies the URI of the
-schema.  The <samp>resource</samp> attribute can be used to specify
-the schema for a particular document.  For example,
-
-<example>
-<![CDATA[<uri resource="spec.xml" uri="docbook.rnc"/>]]>
-</example>
-
-specifies that that the schema for <samp>spec.xml</samp> is
-<samp>docbook.rnc</samp>.</para>
-
-<para>The <samp>pattern</samp> attribute can be used instead of the
-<samp>resource</samp> attribute to specify the schema for any document
-whose URI matches a pattern.  The pattern has the same syntax as an
-absolute or relative URI except that the path component of the URI can
-use a <samp>*</samp> character to stand for zero or more characters
-within a path segment (i.e. any character other <samp>/</samp>).
-Typically, the URI pattern looks like a relative URI, but, whereas a
-relative URI in the <samp>resource</samp> attribute is resolved into a
-particular absolute URI using the base URI of the schema locating
-file, a relative URI pattern matches if it matches some number of
-complete path segments of the document's URI ending with the last path
-segment of the document's URI. For example,
-
-<example>
-<![CDATA[<uri pattern="*.xsl" uri="xslt.rnc"/>]]>
-</example>
-
-specifies that the schema for documents with a URI whose path ends
-with <samp>.xsl</samp> is <samp>xslt.rnc</samp>.</para>
-
-<para>A <samp>transformURI</samp> rule locates a schema by
-transforming the URI of the document. The <samp>fromPattern</samp>
-attribute specifies a URI pattern with the same meaning as the
-<samp>pattern</samp> attribute of the <samp>uri</samp> element.  The
-<samp>toPattern</samp> attribute is a URI pattern that is used to
-generate the URI of the schema.  Each <samp>*</samp> in the
-<samp>toPattern</samp> is replaced by the string that matched the
-corresponding <samp>*</samp> in the <samp>fromPattern</samp>.  The
-resulting string is appended to the initial part of the document's URI
-that was not explicitly matched by the <samp>fromPattern</samp>.  The
-rule matches only if the transformed URI identifies an existing
-resource.  For example, the rule
-
-<example>
-<![CDATA[<transformURI fromPattern="*.xml" toPattern="*.rnc"/>]]>
-</example>
-
-would transform the URI <samp>file:///home/jjc/docs/spec.xml</samp>
-into the URI <samp>file:///home/jjc/docs/spec.rnc</samp>.  Thus, this
-rule specifies that to locate a schema for a document
-<samp><var>foo</var>.xml</samp>, Emacs should test whether a file
-<samp><var>foo</var>.rnc</samp> exists in the same directory as
-<samp><var>foo</var>.xml</samp>, and, if so, should use it as the
-schema.</para>
-
-</section>
-
-<section>
-<title>Using the document element to locate a schema</title>
-
-<para>A <samp>documentElement</samp> rule locates a schema based on
-the local name and prefix of the document element. For example, a rule
-
-<example>
-<![CDATA[<documentElement prefix="xsl" localName="stylesheet" uri="xslt.rnc"/>]]>
-</example>
-
-specifies that when the name of the document element is
-<samp>xsl:stylesheet</samp>, then <samp>xslt.rnc</samp> should be used
-as the schema. Either the <samp>prefix</samp> or
-<samp>localName</samp> attribute may be omitted to allow any prefix or
-local name.</para>
-
-<para>A <samp>namespace</samp> rule locates a schema based on the
-namespace URI of the document element. For example, a rule
-
-<example>
-<![CDATA[<namespace ns="http://www.w3.org/1999/XSL/Transform" uri="xslt.rnc"/>]]>
-</example>
-
-specifies that when the namespace URI of the document is
-<samp>http://www.w3.org/1999/XSL/Transform</samp>, then
-<samp>xslt.rnc</samp> should be used as the schema.</para>
-
-</section>
-
-<!--
-<section>
-<title>Using the DOCTYPE declaration to locate a schema</title>
-
-<para>A <samp>doctypePublicId</samp> rule locates a schema based on
-the public identifier specified in the <samp>DOCTYPE</samp>
-declaration. For example, a rule
-
-<example>
-<![CDATA[<doctypePublicId publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
-  uri="xhtml1-transitional.rnc"/>]]>
-</example>
-
-specifies that when the document has a <samp>DOCTYPE</samp>
-declaration with a public identifier <samp>-//W3C//DTD XHTML 1.0
-Transitional//EN</samp>, then <samp>xhtml1-transitional.rnc</samp>
-should be used as the schema.</para>
-
-</section>
-
-<section>
-<title>Specifying a default schema</title>
-
-<para>A <samp>default</samp> rule specifies a default schema. This
-rule always matches.  For example,
-
-<example>
-<![CDATA[<default uri="docbook.rnc"/>]]>
-</example>
-
-says to use the schema <samp>docbook.rnc</samp>.</para>
-
-</section>
--->
-<section>
-<title>Using type identifiers in schema locating files</title>
-
-<para>Type identifiers allow a level of indirection in locating the
-schema for a document.  Instead of associating the document directly
-with a schema URI, the document is associated with a type identifier,
-which is in turn associated with a schema URI. nXML mode does not
-constrain the format of type identifiers.  They can be simply strings
-without any formal structure or they can be public identifiers or
-URIs.  Note that these type identifiers have nothing to do with the
-DOCTYPE declaration.  When comparing type identifiers, whitespace is
-normalized in the same way as with the <samp>xsd:token</samp>
-datatype: leading and trailing whitespace is stripped; other sequences
-of whitespace are normalized to a single space character.</para>
-
-<para>Each of the rules described in previous sections that uses a
-<samp>uri</samp> attribute to specify a schema, can instead use a
-<samp>typeId</samp> attribute to specify a type identifier.  The type
-identifier can be associated with a URI using a <samp>typeId</samp>
-element. For example,
-
-<example>
-<![CDATA[<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
-  <typeId id="XHTML" typeId="XHTML Strict"/>
-  <typeId id="XHTML Strict" uri="xhtml-strict.rnc"/>
-  <typeId id="XHTML Transitional" uri="xhtml-transitional.rnc"/>
-</locatingRules>]]>
-</example>
-
-declares three type identifiers <samp>XHTML</samp> (representing the
-default variant of XHTML to be used), <samp>XHTML Strict</samp> and
-<samp>XHTML Transitional</samp>.  Such a schema locating file would
-use <samp>xhtml-strict.rnc</samp> for a document whose namespace is
-<samp>http://www.w3.org/1999/xhtml</samp>.  But it is considerably
-more flexible than a schema locating file that simply specified
-
-<example>
-<![CDATA[<namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml-strict.rnc"/>]]>
-</example>
-
-A user can easily use <kbd>C-c C-s C-t</kbd> to select between XHTML
-Strict and XHTML Transitional. Also, a user can easily add a catalog
-
-<example>
-<![CDATA[<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <typeId id="XHTML" typeId="XHTML Transitional"/>
-</locatingRules>]]>
-</example>
-
-that makes the default variant of XHTML be XHTML Transitional.</para>
-
-<!--
-<para>A <samp>typeIdProcessingInstruction</samp> rule allows a
-document to specify its own typeId with a processing instruction.  The
-<samp>target</samp> attribute specifies the processing instruction
-target that should be recognized as specifying a typeId in its
-value. For example, with an additional rule
-
-<example>
-<![CDATA[<typeIdProcessingInstruction target="my-doctype"/>]]>
-</example>
-
-a document that started
-
-<example>
-<![CDATA[<?my-doctype XHTML Transitional?>
-<html xmlns="http://www.w3.org/1999/xhtml">]]>
-</example>
-
-would be validated against <samp>xhtml-transitional.rnc</samp>.</para>
--->
-<!--
-<para>A <samp>typeIdBase</samp> rule makes it possible to avoid having
-to add an explicit rule for every typeId. For example, a rule
-
-<example>
-<![CDATA[<typeIdBase append=".rnc"/>]]>
-</example>
-
-occuring in a schema locating file
-<samp>/home/jjc/schema/schemas.xml</samp> would make Emacs try to use
-file <samp>/home/jjc/schema/DocBook.rnc</samp> for a type identifier
-of <samp>DocBook</samp>; it would test whether that file existed, and
-if it did, it would use it.  In terms of URIs, Emacs appends the value
-of the <samp>append</samp> attribute to the typeId; it then %-escapes
-all URI-significant characters; this is then treated as a relative URI
-and resolved relative to the base URI applicable to the
-<samp>typeIdBased</samp> element.  The typeId will be mapped to this
-URI, provided that the URI identifies an existing resource.</para>
--->
-</section>
-
-<section>
-<title>Using multiple schema locating files</title>
-
-<para>The <samp>include</samp> element includes rules from another
-schema locating file.  The behavior is exactly as if the rules from
-that file were included in place of the <samp>include</samp> element.
-Relative URIs are resolved into absolute URIs before the inclusion is
-performed. For example,
-
-<example>
-<![CDATA[<include rules="../rules.xml"/>]]>
-</example>
-
-includes the rules from <samp>rules.xml</samp>.</para>
-
-<para>The process of locating a schema takes as input a list of schema
-locating files.  The rules in all these files and in the files they
-include are resolved into a single list of rules, which are applied
-strictly in order.  Sometimes this order is not what is needed.
-For example, suppose you have two schema locating files, a private
-file
-
-<example>
-<![CDATA[<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-</locatingRules>]]>
-</example>
-
-followed by a public file
-
-<example>
-<![CDATA[<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <transformURI pathSuffix=".xml" replacePathSuffix=".rnc"/>
-  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
-</locatingRules>]]>
-</example>
-
-The effect of these two files is that the XHTML <samp>namespace</samp>
-rule takes precedence over the <samp>transformURI</samp> rule, which
-is almost certainly not what is needed.  This can be solved by adding
-an <samp>applyFollowingRules</samp> to the private file.
-
-<example>
-<![CDATA[<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <applyFollowingRules ruleType="transformURI"/>
-  <namespace ns="http://www.w3.org/1999/xhtml" uri="xhtml.rnc"/>
-</locatingRules>]]>
-</example>
-</para>
-
-</section>
-
-</section>
-
-</section>
-
-<section>
-<title>DTDs</title>
-
-<para>nxml-mode is designed to support the creation of standalone XML
-documents that do not depend on a DTD.  Although it is common practice
-to insert a DOCTYPE declaration referencing an external DTD, this has
-undesirable side-effects.  It means that the document is no longer
-self-contained. It also means that different XML parsers may interpret
-the document in different ways, since the XML Recommendation does not
-require XML parsers to read the DTD.  With DTDs, it was impractical to
-get validation without using an external DTD or reference to an
-parameter entity.  With RELAX NG and other schema languages, you can
-simulataneously get the benefits of validation and standalone XML
-documents.  Therefore, I recommend that you do not reference an
-external DOCTYPE in your XML documents.</para>
-
-<para>One problem is entities for characters. Typically, as well as
-providing validation, DTDs also provide a set of character entities
-for documents to use. Schemas cannot provide this functionality,
-because schema validation happens after XML parsing.  The recommended
-solution is to either use the Unicode characters directly, or, if this
-is impractical, use character references.  nXML mode supports this by
-providing commands for entering characters and character references
-using the Unicode names, and can display the glyph corresponding to a
-character reference.</para>
-
-</section>
-
-<section>
-<title>Limitations</title>
-
-<para>nXML mode has some limitations:
-
-<ulist>
-<item>
-<para>DTD support is limited.  Internal parsed general entities declared
-in the internal subset are supported provided they do not contain
-elements. Other usage of DTDs is ignored.</para>
-</item>
-
-<item>
-<para>The restrictions on RELAX NG schemas in section 7 of the RELAX NG
-specification are not enforced.</para>
-</item>
-
-<item>
-<para>Unicode support has problems. This stems mostly from the fact that
-the XML (and RELAX NG) character model is based squarely on Unicode,
-whereas the Emacs character model is not.  Emacs 22 is slated to have
-full Unicode support, which should improve the situation here.</para>
-</item>
-</ulist>
-</para>
-
-</section>
-
-</section>
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-ns.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-ns.el
deleted file mode 100644
index 6306d93713..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-ns.el
+++ /dev/null
@@ -1,148 +0,0 @@
-;;; nxml-ns.el --- XML namespace processing
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This file uses a prefix of `nxml-ns'.
-
-;;; Code:
-
-(require 'nxml-util)
-
-(defvar nxml-ns-state nil
-  "Contains the state of namespace processing.  The state
-is never modified destructively and so can be saved and restored
-without copying.
-
-The value is a stack represented by a list. The list has length N + 1
-where N is the number of open elements.  Each member of the list
-represents the bindings in effect for a particular element.  Each
-member is itself a list whose car is the default namespace
-\(a symbol or nil) and whose cdr is an alist of (PREFIX . NS) pairs
-where PREFIX is a string (never nil) and NS is the namespace URI
-symbol.")
-
-(defconst nxml-ns-initial-state
-  (list (list nil (cons "xml" nxml-xml-namespace-uri)))
-  "A list to be used as the initial value of nxml-ns-state.  This
-represents the state with no open elements and with the default
-namespace bindings (no default namespace and only the xml prefix bound).")
-
-(defsubst nxml-ns-state () nxml-ns-state)
-
-(defsubst nxml-ns-set-state (state)
-  (setq nxml-ns-state state))
-
-(defsubst nxml-ns-state-equal (state)
-  (equal nxml-ns-state state))
-
-(defmacro nxml-ns-save (&rest body)
-  `(let ((nxml-ns-state nxml-ns-initial-state))
-     ,@body))
-
-(put 'nxml-ns-save 'lisp-indent-function 0)
-(def-edebug-spec nxml-ns-save t)
-
-(defun nxml-ns-init ()
-  (setq nxml-ns-state nxml-ns-initial-state))
-
-(defun nxml-ns-push-state ()
-  "Change the state by starting a new element. Namespace declarations
-are inherited from the parent state."
-  (setq nxml-ns-state (cons (car nxml-ns-state) nxml-ns-state)))
-
-(defun nxml-ns-pop-state ()
-  "Change the state by ending an element.  The behaviour is undefined
-if there is no open element."
-  (setq nxml-ns-state (cdr nxml-ns-state)))
-
-(defun nxml-ns-get-prefix (prefix)
-  "Return the symbol for namespace bound to PREFIX, or nil if PREFIX
-is unbound. PREFIX is a string, never nil."
-  (let ((binding (assoc prefix (cdar nxml-ns-state))))
-    (and binding (cdr binding))))
-
-(defun nxml-ns-set-prefix (prefix ns)
-  "Change the binding of PREFIX. PREFIX is a string (never nil).  NS
-is a symbol (never nil). The change will be in effect until the end of
-the current element."
-  (setq nxml-ns-state
-	(let ((bindings (car nxml-ns-state)))
-	  (cons (cons (car bindings)
-		      (cons (cons prefix ns) (cdr bindings)))
-		(cdr nxml-ns-state)))))
-
-(defun nxml-ns-get-default ()
-  "Return the current default namespace as a symbol, or nil
-if there is no default namespace."
-  (caar nxml-ns-state))
-
-(defun nxml-ns-set-default (ns)
-  "Changes the current default namespace.  The change
-will be in effect until the end of the current element.
-NS is a symbol or nil."
-  (setq nxml-ns-state
-	(cons (cons ns (cdar nxml-ns-state))
-	      (cdr nxml-ns-state))))
-
-(defun nxml-ns-get-context ()
-  (car nxml-ns-state))
-
-(defun nxml-ns-prefixes-for (ns &optional attributep)
-  (let ((current (car nxml-ns-state))
-	prefixes)
-    (when (if attributep
-	      (not ns)
-	    (eq (car current) ns))
-      (setq prefixes '(nil)))
-    (setq current (cdr current))
-    (while (let ((binding (rassq ns current)))
-	     (when binding
-	       (when (eq (nxml-ns-get-prefix (car binding)) ns)
-		 (add-to-list 'prefixes
-			      (car binding)))
-	       (setq current
-		     (cdr (member binding current))))))
-    prefixes))
-
-(defun nxml-ns-prefix-for (ns)
-  (car (rassq ns (cdar nxml-ns-state))))
-
-(defun nxml-ns-changed-prefixes ()
-  (let ((old (cadr nxml-ns-state))
-	(new (car nxml-ns-state))
-	changed)
-    (if (eq old new)
-	nil
-      (unless (eq (car new) (car old))
-	(setq changed '(nil)))
-      (setq new (cdr new))
-      (setq old (cdr old))
-      (while (not (eq new old))
-	(setq changed
-	      (cons (caar new) changed))
-	(setq new (cdr new))))
-    changed))
-    
-(provide 'nxml-ns)
-
-;;; nxml-ns.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-outln.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-outln.el
deleted file mode 100644
index 5bc39c86e8..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-outln.el
+++ /dev/null
@@ -1,1040 +0,0 @@
-;;; nxml-outln.el --- outline support for nXML mode
-
-;; Copyright (C) 2004 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; A section can be in one of three states
-;; 1. display normally; this displays each child section
-;; according to its state; anything not part of child sections is also
-;; displayed normally
-;; 2. display just the title specially; child sections are not displayed
-;; regardless of their state; anything not part of child sections is
-;; not displayed
-;; 3. display the title specially and display child sections
-;; according to their state; anything not part of the child section is
-;; not displayed
-;; The state of a section is determined by the value of the
-;; nxml-outline-state text property of the < character that starts
-;; the section.
-;; For state 1 the value is nil or absent.
-;; For state 2 it is the symbol hide-children.
-;; For state 3 it is t.
-;; The special display is achieved by using overlays.  The overlays
-;; are computed from the nxml-outline-state property by
-;; `nxml-refresh-outline'. There overlays all have a category property
-;; with an nxml-outline-display property with value t.
-;;
-;; For a section to be recognized as such, the following conditions must
-;; be satisfied:
-;; - its start-tag must occur at the start of a line (possibly indented)
-;; - its local name must match `nxml-section-element-name-regexp'
-;; - it must have a heading element; a heading element is an
-;; element whose name matches `nxml-heading-element-name-regexp',
-;; and that occurs as, or as a descendant of, the first child element
-;; of the section
-;;
-;; XXX What happens if an nxml-outline-state property is attached to a
-;; character that doesn't start a section element?
-;;
-;; An outlined section (an section with a non-nil nxml-outline-state
-;; property) can be displayed in either single-line or multi-line
-;; form.  Single-line form is used when the outline state is hide-children
-;; or there are no child sections; multi-line form is used otherwise.
-;; There are two flavors of single-line form: with children and without.
-;; The with-childen flavor is used when there are child sections.
-;; Single line with children looks like
-;;    <+section>A section title...</>
-;; Single line without children looks like
-;;    <-section>A section title...</>
-;; Multi line looks likes
-;;    <-section>A section title...
-;;    [child sections displayed here]
-;;    </-section>
-;; The indent of an outlined section is computed relative to the
-;; outermost containing outlined element.  The indent of the
-;; outermost containing element comes from the non-outlined
-;; indent of the section start-tag.
-
-;;; Code:
-
-(require 'xmltok)
-(require 'nxml-util)
-(require 'nxml-rap)
-
-(defcustom nxml-section-element-name-regexp
-  "article\\|\\(sub\\)*section\\|chapter\\|div\\|appendix\\|part\\|preface\\|reference\\|simplesect\\|bibliography\\|bibliodiv\\|glossary\\|glossdiv"
-  "*Regular expression matching the name of elements used as sections.
-An XML element is treated as a section if:
-
-- its local name (that is, the name without the prefix) matches
-this regexp;
-
-- either its first child element or a descendant of that first child
-element has a local name matching the variable
-`nxml-heading-element-name-regexp'; and
-
-- its start-tag occurs at the beginning of a line (possibly indented)."
-  :group 'nxml
-  :type 'regexp)
-
-(defcustom nxml-heading-element-name-regexp "title\\|head"
-  "*Regular expression matching the name of elements used as headings.
-An XML element is only recognized as a heading if it occurs as or
-within the first child of an element that is recognized as a section.
-See the variable `nxml-section-element-name-regexp' for more details."
-  :group 'nxml
-  :type 'regexp)
-
-(defcustom nxml-outline-child-indent 2
-  "*Indentation in an outline for child element relative to parent element."
-  :group 'nxml
-  :type 'integer)
-
-(defface nxml-heading-face
-  '((t (:weight bold)))
-  "Face used for the contents of abbreviated heading elements."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-outline-indicator-face
-  '((t (:inherit default)))
-  "Face used for `+' or `-' before element names in outlines."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-outline-active-indicator-face
-  '((t (:box t :inherit nxml-outline-indicator-face)))
-  "Face used for clickable `+' or `-' before element names in outlines."
-  :group 'nxml-highlighting-faces)
-
-(defface nxml-outline-ellipsis-face
-  '((t (:bold t :inherit default)))
-  "Face used for `...' in outlines."
-  :group 'nxml-highlighting-faces)
-
-(defvar nxml-heading-scan-distance 1000
-  "Maximum distance from section to scan for heading.")
-
-(defvar nxml-outline-prefix-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-a" 'nxml-show-all)
-    (define-key map "\C-t" 'nxml-hide-all-text-content)
-    (define-key map "\C-r" 'nxml-refresh-outline)
-    (define-key map "\C-c" 'nxml-hide-direct-text-content)
-    (define-key map "\C-e" 'nxml-show-direct-text-content)
-    (define-key map "\C-d" 'nxml-hide-subheadings)
-    (define-key map "\C-s" 'nxml-show)
-    (define-key map "\C-k" 'nxml-show-subheadings)
-    (define-key map "\C-l" 'nxml-hide-text-content)
-    (define-key map "\C-i" 'nxml-show-direct-subheadings)
-    (define-key map "\C-o" 'nxml-hide-other)
-    map))
-
-;;; Commands for changing visibility
-
-(defun nxml-show-all ()
-  "Show all elements in the buffer normally."
-  (interactive)
-  (nxml-with-unmodifying-text-property-changes
-    (remove-text-properties (point-min)
-			    (point-max)
-			    '(nxml-outline-state nil)))
-  (nxml-outline-set-overlay nil (point-min) (point-max)))
-
-(defun nxml-hide-all-text-content ()
-  "Hide all text content in the buffer.
-Anything that is in a section but is not a heading will be hidden.
-The visibility of headings at any level will not be changed. See the
-variable `nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (nxml-transform-buffer-outline '((nil . t))))
-
-(defun nxml-show-direct-text-content ()
-  "Show the text content that is directly part of the section containing point.
-Each subsection will be shown according to its individual state, which
-will not be changed. The section containing point is the innermost
-section that contains the character following point. See the variable
-`nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (nxml-outline-pre-adjust-point)
-  (nxml-set-outline-state (nxml-section-start-position) nil)
-  (nxml-refresh-outline)
-  (nxml-outline-adjust-point))
-
-(defun nxml-show-direct-subheadings ()
-  "Show the immediate subheadings of the section containing point.
-The section containing point is the innermost section that contains
-the character following point. See the variable
-`nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (let ((pos (nxml-section-start-position)))
-    (when (eq (nxml-get-outline-state pos) 'hide-children)
-      (nxml-set-outline-state pos t)))
-  (nxml-refresh-outline)
-  (nxml-outline-adjust-point))
-
-(defun nxml-hide-direct-text-content ()
-  "Hide the text content that is directly part of the section containing point.
-The heading of the section will remain visible.  The state of
-subsections will not be changed.  The section containing point is the
-innermost section that contains the character following point. See the
-variable `nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (let ((pos (nxml-section-start-position)))
-    (when (null (nxml-get-outline-state pos))
-      (nxml-set-outline-state pos t)))
-  (nxml-refresh-outline)
-  (nxml-outline-adjust-point))
-
-(defun nxml-hide-subheadings ()
-  "Hide the subheadings that are part of the section containing point.
-The text content will also be hidden, leaving only the heading of the
-section itself visible.  The state of the subsections will also be
-changed to hide their headings, so that \\[nxml-show-direct-text-content]
-would show only the heading of the subsections. The section containing
-point is the innermost section that contains the character following
-point.  See the variable `nxml-section-element-name-regexp' for more
-details on how to customize which elements are recognized as sections
-and headings."
-  (interactive)
-  (nxml-transform-subtree-outline '((nil . hide-children)
-				    (t . hide-children))))
-
-(defun nxml-show ()
-  "Show the section containing point normally, without hiding anything.
-This includes everything in the section at any level.  The section
-containing point is the innermost section that contains the character
-following point.  See the variable `nxml-section-element-name-regexp'
-for more details on how to customize which elements are recognized as
-sections and headings."
-  (interactive)
-  (nxml-transform-subtree-outline '((hide-children . nil)
-				    (t . nil))))
-
-(defun nxml-hide-text-content ()
-  "Hide text content at all levels in the section containing point.
-The section containing point is the innermost section that contains
-the character following point. See the variable
-`nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (nxml-transform-subtree-outline '((nil . t))))
-
-(defun nxml-show-subheadings ()
-  "Show the subheadings at all levels of the section containing point.
-The visibility of the text content at all levels in the section is not
-changed.  The section containing point is the innermost section that
-contains the character following point. See the variable
-`nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (nxml-transform-subtree-outline '((hide-children . t))))
-
-(defun nxml-hide-other ()
-  "Hide text content other than that directly in the section containing point.
-Hide headings other than those of ancestors of that section and their
-immediate subheadings.  The section containing point is the innermost
-section that contains the character following point. See the variable
-`nxml-section-element-name-regexp' for more details on how to
-customize which elements are recognized as sections and headings."
-  (interactive)
-  (let ((nxml-outline-state-transform-exceptions nil))
-    (save-excursion
-      (while (and (condition-case err
-		      (nxml-back-to-section-start)
-		    (nxml-outline-error (nxml-report-outline-error
-					 "Couldn't find containing section: %s"
-					 err)))
-		  (progn
-		    (when (and nxml-outline-state-transform-exceptions
-			       (null (nxml-get-outline-state (point))))
-		      (nxml-set-outline-state (point) t))
-		    (setq nxml-outline-state-transform-exceptions
-			  (cons (point)
-				nxml-outline-state-transform-exceptions))
-		    (< nxml-prolog-end (point))))
-	(goto-char (1- (point)))))
-    (nxml-transform-buffer-outline '((nil . hide-children)
-				     (t . hide-children)))))
-
-;; These variables are dynamically bound.  They are use to pass information to
-;; nxml-section-tag-transform-outline-state.
-
-(defvar nxml-outline-state-transform-exceptions nil)
-(defvar nxml-target-section-pos nil)
-(defvar nxml-depth-in-target-section nil)
-(defvar nxml-outline-state-transform-alist nil)
-
-(defun nxml-transform-buffer-outline (alist)
-  (let ((nxml-target-section-pos nil)
-	(nxml-depth-in-target-section 0)
-	(nxml-outline-state-transform-alist alist)
-	(nxml-outline-display-section-tag-function
-	 'nxml-section-tag-transform-outline-state))
-    (nxml-refresh-outline))
-  (nxml-outline-adjust-point))
-
-(defun nxml-transform-subtree-outline (alist)
-  (let ((nxml-target-section-pos (nxml-section-start-position))
-	(nxml-depth-in-target-section nil)
-	(nxml-outline-state-transform-alist alist)
-	(nxml-outline-display-section-tag-function
-	 'nxml-section-tag-transform-outline-state))
-    (nxml-refresh-outline))
-  (nxml-outline-adjust-point))
-
-(defun nxml-outline-pre-adjust-point ()
-  (cond ((and (< (point-min) (point))
-	      (get-char-property (1- (point)) 'invisible)
-	      (not (get-char-property (point) 'invisible))
-	      (let ((str (or (get-char-property (point) 'before-string)
-			     (get-char-property (point) 'display))))
-		(and (stringp str)
-		     (>= (length str) 3)
-		     (string= (substring str 0 3) "..."))))
-	 ;; The ellipsis is a display property on a visible character
-	 ;; following an invisible region. The position of the event
-	 ;; will be the position before that character. We want to
-	 ;; move point to the other side of the invisible region, i.e.
-	 ;; following the last visible character before that invisible
-	 ;; region.
-	 (goto-char (previous-single-char-property-change (1- (point))
-							  'invisible)))
-	((and (< (point) (point-max))
-	      (get-char-property (point) 'display)
-	      (get-char-property (1+ (point)) 'invisible))
-	 (goto-char (next-single-char-property-change (1+ (point))
-						      'invisible)))
-	((and (< (point) (point-max))
-	      (get-char-property (point) 'invisible))
-	 (goto-char (next-single-char-property-change (point)
-						      'invisible)))))
-
-(defun nxml-outline-adjust-point ()
-  "Adjust point after showing or hiding elements."
-  (when (and (get-char-property (point) 'invisible)
-	     (< (point-min) (point))
-	     (get-char-property (1- (point)) 'invisible))
-    (goto-char (previous-single-char-property-change (point)
-						     'invisible
-						     nil
-						     nxml-prolog-end))))
-
-(defun nxml-transform-outline-state (section-start-pos)
-  (let* ((old-state
-	  (nxml-get-outline-state section-start-pos))
-	 (change (assq old-state
-		       nxml-outline-state-transform-alist)))
-    (when change
-      (nxml-set-outline-state section-start-pos
-			      (cdr change)))))
-  
-(defun nxml-section-tag-transform-outline-state (startp
-						 section-start-pos
-						 &optional
-						 heading-start-pos)
-  (if (not startp)
-      (setq nxml-depth-in-target-section
-	    (and nxml-depth-in-target-section
-		 (> nxml-depth-in-target-section 0)
-		 (1- nxml-depth-in-target-section)))
-    (cond (nxml-depth-in-target-section
-	   (setq nxml-depth-in-target-section
-		 (1+ nxml-depth-in-target-section)))
-	  ((= section-start-pos nxml-target-section-pos)
-	   (setq nxml-depth-in-target-section 0)))
-    (when (and nxml-depth-in-target-section
-	       (not (member section-start-pos
-			    nxml-outline-state-transform-exceptions)))
-      (nxml-transform-outline-state section-start-pos))))
-
-(defun nxml-get-outline-state (pos)
-  (get-text-property pos 'nxml-outline-state))
-
-(defun nxml-set-outline-state (pos state)
-  (nxml-with-unmodifying-text-property-changes
-    (if state
-	(put-text-property pos (1+ pos) 'nxml-outline-state state)
-      (remove-text-properties pos (1+ pos) '(nxml-outline-state nil)))))
-
-;;; Mouse interface
-
-(defun nxml-mouse-show-direct-text-content (event)
-  "Do the same as \\[nxml-show-direct-text-content] from a mouse click."
-  (interactive "e")
-  (and (nxml-mouse-set-point event)
-       (nxml-show-direct-text-content)))
-
-(defun nxml-mouse-hide-direct-text-content (event)
-  "Do the same as \\[nxml-hide-direct-text-content] from a mouse click."
-  (interactive "e")
-  (and (nxml-mouse-set-point event)
-       (nxml-hide-direct-text-content)))
-
-(defun nxml-mouse-hide-subheadings (event)
-  "Do the same as \\[nxml-hide-subheadings] from a mouse click."
-  (interactive "e")
-  (and (nxml-mouse-set-point event)
-       (nxml-hide-subheadings)))
-
-(defun nxml-mouse-show-direct-subheadings (event)
-  "Do the same as \\[nxml-show-direct-subheadings] from a mouse click."
-  (interactive "e")
-  (and (nxml-mouse-set-point event)
-       (nxml-show-direct-subheadings)))
-
-(defun nxml-mouse-set-point (event)
-  (mouse-set-point event)
-  (and nxml-prolog-end t))
-
-;; Display
-
-(defun nxml-refresh-outline () 
-  "Refresh the outline to correspond to the current XML element structure."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (kill-local-variable 'line-move-ignore-invisible)
-    (make-local-variable 'line-move-ignore-invisible)
-    (condition-case err
-	(nxml-outline-display-rest nil nil nil)
-      (nxml-outline-error
-       (nxml-report-outline-error "Cannot display outline: %s" err)))))
-
-(defvar nxml-outline-display-section-tag-function nil)
-
-(defun nxml-outline-display-rest (outline-state start-tag-indent tag-qnames)
-  "Display up to and including the end of the current element.
-OUTLINE-STATE can be nil, t, hide-children.  START-TAG-INDENT is the
-indent of the start-tag of the current element, or nil if no
-containing element has a non-nil OUTLINE-STATE.  TAG-QNAMES is a list
-of the qnames of the open elements.  Point is after the title content.
-Leave point after the closing end-tag Return t if we had a
-non-transparent child section."
-  (let ((last-pos (point))
-	(transparent-depth 0)
-	;; don't want ellipsis before root element
-	(had-children (not tag-qnames)))
-    (while
-	(cond ((not (nxml-section-tag-forward))
-	       (if (null tag-qnames)
-		   nil
-		 (nxml-outline-error "missing end-tag %s"
-				     (car tag-qnames))))
-	      ;; section end-tag
-	      ((nxml-token-end-tag-p)
-	       (when nxml-outline-display-section-tag-function
-		 (funcall nxml-outline-display-section-tag-function
-			  nil
-			  xmltok-start))
-	       (let ((qname (xmltok-end-tag-qname)))
-		 (unless tag-qnames
-		   (nxml-outline-error "extra end-tag %s" qname))
-		 (unless (string= (car tag-qnames) qname)
-		   (nxml-outline-error "mismatched end-tag; expected %s, got %s"
-				       (car tag-qnames)
-				       qname)))
-	       (cond ((> transparent-depth 0)
-		      (setq transparent-depth (1- transparent-depth))
-		      (setq tag-qnames (cdr tag-qnames))
-		      t)
-		     ((not outline-state)
-		      (nxml-outline-set-overlay nil last-pos (point))
-		      nil)
-		     ((or (not had-children)
-			  (eq outline-state 'hide-children))
-		      (nxml-outline-display-single-line-end-tag last-pos)
-		      nil)
-		     (t
-		      (nxml-outline-display-multi-line-end-tag last-pos
-							       start-tag-indent)
-		      nil)))
-	      ;; section start-tag
-	      (t
-	       (let* ((qname (xmltok-start-tag-qname))
-		      (section-start-pos xmltok-start)
-		      (heading-start-pos
-		       (and (or nxml-outline-display-section-tag-function
-				(not (eq outline-state 'had-children))
-				(not had-children))
-			    (nxml-token-starts-line-p)
-			    (nxml-heading-start-position))))
-		 (when nxml-outline-display-section-tag-function
-		   (funcall nxml-outline-display-section-tag-function
-			    t
-			    section-start-pos
-			    heading-start-pos))
-		 (setq tag-qnames (cons qname tag-qnames))
-		 (if (or (not heading-start-pos)
-			 (and (eq outline-state 'hide-children)
-			      (setq had-children t)))
-		     (setq transparent-depth (1+ transparent-depth))
-		   (nxml-display-section last-pos
-					 section-start-pos
-					 heading-start-pos
-					 start-tag-indent
-					 outline-state
-					 had-children
-					 tag-qnames)
-		   (setq had-children t)
-		   (setq tag-qnames (cdr tag-qnames))
-		   (setq last-pos (point))))
-	       t)))
-    had-children))
-
-(defconst nxml-highlighted-less-than
-  (propertize "<" 'face 'nxml-tag-delimiter-face))
-
-(defconst nxml-highlighted-greater-than
-  (propertize ">" 'face 'nxml-tag-delimiter-face))
-
-(defconst nxml-highlighted-colon
-  (propertize ":" 'face 'nxml-element-colon-face))
-
-(defconst nxml-highlighted-slash
-  (propertize "/" 'face 'nxml-tag-slash-face))
-
-(defconst nxml-highlighted-ellipsis
-  (propertize "..." 'face 'nxml-outline-ellipsis-face))
-
-(defconst nxml-highlighted-empty-end-tag
-  (concat nxml-highlighted-ellipsis
-	  nxml-highlighted-less-than
-	  nxml-highlighted-slash
-	  nxml-highlighted-greater-than))
-
-(defconst nxml-highlighted-inactive-minus
-  (propertize "-" 'face 'nxml-outline-indicator-face))
-
-(defconst nxml-highlighted-active-minus
-  (propertize "-" 'face 'nxml-outline-active-indicator-face))
-
-(defconst nxml-highlighted-active-plus
-  (propertize "+" 'face 'nxml-outline-active-indicator-face))
-
-(defun nxml-display-section (last-pos
-			     section-start-pos
-			     heading-start-pos
-			     parent-indent
-			     parent-outline-state
-			     had-children
-			     tag-qnames)
-  (let* ((section-start-pos-bol
-	  (save-excursion
-	    (goto-char section-start-pos)
-	    (skip-chars-backward " \t")
-	    (point)))
-	 (outline-state (nxml-get-outline-state section-start-pos))
-	 (newline-before-section-start-category
-	  (cond ((and (not had-children) parent-outline-state)
-		 'nxml-outline-display-ellipsis)
-		 (outline-state 'nxml-outline-display-show)
-		 (t nil))))
-    (nxml-outline-set-overlay (and parent-outline-state
-				   'nxml-outline-display-hide)
-			      last-pos
-			      (1- section-start-pos-bol)
-			      nil
-			      t)
-    (if outline-state
-      (let* ((indent (if parent-indent
-			 (+ parent-indent nxml-outline-child-indent)
-		       (save-excursion
-			 (goto-char section-start-pos)
-			 (current-column))))
-	     start-tag-overlay)
-	(nxml-outline-set-overlay newline-before-section-start-category
-				  (1- section-start-pos-bol)
-				  section-start-pos-bol
-				  t)
-	(nxml-outline-set-overlay 'nxml-outline-display-hide
-				  section-start-pos-bol
-				  section-start-pos)
-	(setq start-tag-overlay
-	    (nxml-outline-set-overlay 'nxml-outline-display-show
-				      section-start-pos
-				      (1+ section-start-pos)
-				      t))
-	;; line motion commands don't work right if start-tag-overlay
-	;; covers multiple lines
-	(nxml-outline-set-overlay 'nxml-outline-display-hide
-				  (1+ section-start-pos)
-				  heading-start-pos)
-	(goto-char heading-start-pos)
-	(nxml-end-of-heading)
-	(nxml-outline-set-overlay 'nxml-outline-display-heading
-				  heading-start-pos
-				  (point))
-	(let* ((had-children
-		(nxml-outline-display-rest outline-state
-					   indent
-					   tag-qnames)))
-	  (overlay-put start-tag-overlay
-		       'display
-		       (concat
-			;; indent
-			(make-string indent ?\ )
-			;; <
-			nxml-highlighted-less-than
-			;; + or - indicator
-			(cond ((not had-children)
-			       nxml-highlighted-inactive-minus)
-			      ((eq outline-state 'hide-children)
-			       (overlay-put start-tag-overlay
-					    'category
-					    'nxml-outline-display-hiding-tag)
-			       nxml-highlighted-active-plus)
-			      (t
-			       (overlay-put start-tag-overlay
-					    'category
-					    'nxml-outline-display-showing-tag)
-			       nxml-highlighted-active-minus))
-			;; qname
-			(nxml-highlighted-qname (car tag-qnames))
-			;; >
-			nxml-highlighted-greater-than))))
-      ;; outline-state nil
-      (goto-char heading-start-pos)
-      (nxml-end-of-heading)
-      (nxml-outline-set-overlay newline-before-section-start-category
-				(1- section-start-pos-bol)
-				(point)
-				t)
-      (nxml-outline-display-rest outline-state
-				 (and parent-indent
-				      (+ parent-indent
-					 nxml-outline-child-indent))
-				 tag-qnames))))
-
-(defun nxml-highlighted-qname (qname)
-  (let ((colon (string-match ":" qname)))
-    (if colon
-	(concat (propertize (substring qname 0 colon)
-			    'face
-			    'nxml-element-prefix-face)
-		nxml-highlighted-colon
-		(propertize (substring qname (1+ colon))
-			    'face
-			    'nxml-element-local-name-face))
-      (propertize qname
-		  'face
-		  'nxml-element-local-name-face))))
-
-(defun nxml-outline-display-single-line-end-tag (last-pos)
-  (nxml-outline-set-overlay 'nxml-outline-display-hide
-			    last-pos
-			    xmltok-start
-			    nil
-			    t)
-  (overlay-put (nxml-outline-set-overlay 'nxml-outline-display-show
-					 xmltok-start
-					 (point)
-					 t)
-	       'display
-	       nxml-highlighted-empty-end-tag))
-    
-(defun nxml-outline-display-multi-line-end-tag (last-pos start-tag-indent)
-  (let ((indentp (save-excursion
-		   (goto-char last-pos)
-		   (skip-chars-forward " \t")
-		   (and (eq (char-after) ?\n)
-			(progn
-			  (goto-char (1+ (point)))
-			  (nxml-outline-set-overlay nil last-pos (point))
-			  (setq last-pos (point))
-			  (goto-char xmltok-start)
-			  (beginning-of-line)
-			  t))))
-	end-tag-overlay)
-    (nxml-outline-set-overlay 'nxml-outline-display-hide
-			      last-pos
-			      xmltok-start
-			      nil
-			      t)
-    (setq end-tag-overlay
-	  (nxml-outline-set-overlay 'nxml-outline-display-showing-tag
-				    xmltok-start
-				    (point)
-				    t))
-    (overlay-put end-tag-overlay
-		 'display
-		 (concat (if indentp
-			     (make-string start-tag-indent ?\ )
-			   "")
-			 nxml-highlighted-less-than
-			 nxml-highlighted-slash
-			 nxml-highlighted-active-minus
-			 (nxml-highlighted-qname (xmltok-end-tag-qname))
-			 nxml-highlighted-greater-than))))
-
-(defvar nxml-outline-show-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-m" 'nxml-show-direct-text-content)
-    (define-key map [mouse-2] 'nxml-mouse-show-direct-text-content)
-    map))
-
-(defvar nxml-outline-show-help "mouse-2: show")
-
-(put 'nxml-outline-display-show 'nxml-outline-display t)
-(put 'nxml-outline-display-show 'evaporate t)
-(put 'nxml-outline-display-show 'keymap nxml-outline-show-map)
-(put 'nxml-outline-display-show 'help-echo nxml-outline-show-help)
-
-(put 'nxml-outline-display-hide 'nxml-outline-display t)
-(put 'nxml-outline-display-hide 'evaporate t)
-(put 'nxml-outline-display-hide 'invisible t)
-(put 'nxml-outline-display-hide 'keymap nxml-outline-show-map)
-(put 'nxml-outline-display-hide 'help-echo nxml-outline-show-help)
-
-(put 'nxml-outline-display-ellipsis 'nxml-outline-display t)
-(put 'nxml-outline-display-ellipsis 'evaporate t)
-(put 'nxml-outline-display-ellipsis 'keymap nxml-outline-show-map)
-(put 'nxml-outline-display-ellipsis 'help-echo nxml-outline-show-help)
-(put 'nxml-outline-display-ellipsis 'before-string nxml-highlighted-ellipsis)
-
-(put 'nxml-outline-display-heading 'keymap nxml-outline-show-map)
-(put 'nxml-outline-display-heading 'help-echo nxml-outline-show-help)
-(put 'nxml-outline-display-heading 'nxml-outline-display t)
-(put 'nxml-outline-display-heading 'evaporate t)
-(put 'nxml-outline-display-heading 'face 'nxml-heading-face)
-
-(defvar nxml-outline-hiding-tag-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'nxml-mouse-show-direct-subheadings)
-    (define-key map [mouse-2] 'nxml-mouse-show-direct-text-content)
-    (define-key map "\C-m" 'nxml-show-direct-text-content)
-    map))
-
-(defvar nxml-outline-hiding-tag-help
-  "mouse-1: show subheadings, mouse-2: show text content")
-
-(put 'nxml-outline-display-hiding-tag 'nxml-outline-display t)
-(put 'nxml-outline-display-hiding-tag 'evaporate t)
-(put 'nxml-outline-display-hiding-tag 'keymap nxml-outline-hiding-tag-map)
-(put 'nxml-outline-display-hiding-tag 'help-echo nxml-outline-hiding-tag-help)
-
-(defvar nxml-outline-showing-tag-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'nxml-mouse-hide-subheadings)
-    (define-key map [mouse-2] 'nxml-mouse-show-direct-text-content)
-    (define-key map "\C-m" 'nxml-show-direct-text-content)
-    map))
-
-(defvar nxml-outline-showing-tag-help
-  "mouse-1: hide subheadings, mouse-2: show text content")
-
-(put 'nxml-outline-display-showing-tag 'nxml-outline-display t)
-(put 'nxml-outline-display-showing-tag 'evaporate t)
-(put 'nxml-outline-display-showing-tag 'keymap nxml-outline-showing-tag-map)
-(put 'nxml-outline-display-showing-tag
-     'help-echo
-     nxml-outline-showing-tag-help)
-
-(defun nxml-outline-set-overlay (category
-				 start
-				 end
-				 &optional
-				 front-advance
-				 rear-advance)
-  "Replace any nxml-outline-display overlays between START and END.
-Overlays are removed if they overlay the region between START and END,
-and have a non-nil nxml-outline-display property (typically via their
-category). If CATEGORY is non-nil, they will be replaced with a new overlay
-with that category from START to END. If CATEGORY is nil, no new
-overlay will be created."
-  (when (< start end)
-    (let ((overlays (overlays-in start end))
-	  overlay)
-      (while overlays
-	(setq overlay (car overlays))
-	(setq overlays (cdr overlays))
-	(when (overlay-get overlay 'nxml-outline-display)
-	  (delete-overlay overlay))))
-    (and category
-	 (let ((overlay (make-overlay start
-				      end
-				      nil
-				      front-advance
-				      rear-advance)))
-	   (overlay-put overlay 'category category)
-	   (setq line-move-ignore-invisible t)
-	   overlay))))
-
-(defun nxml-end-of-heading ()
-  "Move from the start of the content of the heading to the end.
-Do not move past the end of the line."
-  (let ((pos (condition-case err
-		 (and (nxml-scan-element-forward (point) t)
-		      xmltok-start)
-	       nil)))
-    (end-of-line)
-    (skip-chars-backward " \t")
-    (cond ((not pos)
-	   (setq pos (nxml-token-before))
-	   (when (eq xmltok-type 'end-tag)
-	     (goto-char pos)))
-	  ((< pos (point))
-	   (goto-char pos)))
-    (skip-chars-backward " \t")
-    (point)))
-
-;;; Navigating section structure
-
-(defsubst nxml-token-start-tag-p ()
-  (or (eq xmltok-type 'start-tag)
-      (eq xmltok-type 'partial-start-tag)))
-
-(defsubst nxml-token-end-tag-p ()
-  (or (eq xmltok-type 'end-tag)
-      (eq xmltok-type 'partial-end-tag)))
-
-(defun nxml-token-starts-line-p ()
-  (save-excursion
-    (goto-char xmltok-start)
-    (skip-chars-backward " \t")
-    (bolp)))
-
-(defvar nxml-cached-section-tag-regexp nil)
-(defvar nxml-cached-section-element-name-regexp nil)
-
-(defsubst nxml-make-section-tag-regexp ()
-  (if (eq nxml-cached-section-element-name-regexp
-	  nxml-section-element-name-regexp)
-      nxml-cached-section-tag-regexp
-    (nxml-make-section-tag-regexp-1)))
-
-(defun nxml-make-section-tag-regexp-1 ()
-  (setq nxml-cached-section-element-name-regexp nil)
-  (setq nxml-cached-section-tag-regexp
-	(concat "</?\\("
-		"\\(" xmltok-ncname-regexp ":\\)?"
-		nxml-section-element-name-regexp
-		"\\)[ \t\r\n>]"))
-  (setq nxml-cached-section-element-name-regexp
-	nxml-section-element-name-regexp)
-  nxml-cached-section-tag-regexp)
-
-(defun nxml-section-tag-forward ()
-  "Move forward past the first tag that is a section start- or end-tag.
-Return xmltok-type for tag.
-If no tag found, return nil and move to the end of the buffer."
-  (let ((case-fold-search nil)
-	(tag-regexp (nxml-make-section-tag-regexp))
-	match-end)
-    (when (< (point) nxml-prolog-end)
-      (goto-char nxml-prolog-end))
-    (while (cond ((not (re-search-forward tag-regexp nil 'move))
-		  (setq xmltok-type nil)
-		  nil)
-		 ((progn
-		    (goto-char (match-beginning 0))
-		    (setq match-end (match-end 0))
-		    (nxml-ensure-scan-up-to-date)
-		    (let ((end (nxml-inside-end (point))))
-		      (when end
-			(goto-char end)
-			t))))
-		 ((progn
-		    (xmltok-forward)
-		    (and (memq xmltok-type '(start-tag
-					     partial-start-tag
-					     end-tag
-					     partial-end-tag))
-			 ;; just in case wildcard matched non-name chars
-			 (= xmltok-name-end (1- match-end))))
-		  nil)
-		 (t))))
-    xmltok-type)
-	 
-(defun nxml-section-tag-backward ()
-  "Move backward to the end of a tag that is a section start- or end-tag.
-The position of the end of the tag must be <= point
-Point is at the end of the tag.  `xmltok-start' is the start."
-  (let ((case-fold-search nil)
-	(start (point))
-	(tag-regexp (nxml-make-section-tag-regexp))
-	match-end)
-    (if (< (point) nxml-prolog-end)
-	(progn
-	  (goto-char (point-min))
-	  nil)
-      (while (cond ((not (re-search-backward tag-regexp
-					     nxml-prolog-end
-					     'move))
-		    (setq xmltok-type nil)
-		    (goto-char (point-min))
-		    nil)
-		   ((progn
-		      (goto-char (match-beginning 0))
-		      (setq match-end (match-end 0))
-		      (nxml-ensure-scan-up-to-date)
-		      (let ((pos (nxml-inside-start (point))))
-			(when pos
-			  (goto-char (1- pos))
-			  t))))
-		   ((progn
-		      (xmltok-forward)
-		      (and (<= (point) start)
-			   (memq xmltok-type '(start-tag
-					       partial-start-tag
-					       end-tag
-					       partial-end-tag))
-			   ;; just in case wildcard matched non-name chars
-			   (= xmltok-name-end (1- match-end))))
-		    nil)
-		   (t (goto-char xmltok-start)
-		      t)))
-      xmltok-type)))
-
-(defun nxml-section-start-position ()
-  "Return the position of the start of the section containing point.
-Signal an error on failure."
-  (condition-case err
-      (save-excursion (if (nxml-back-to-section-start)
-			  (point)
-			(error "Not in section")))
-    (nxml-outline-error
-     (nxml-report-outline-error "Couldn't determine containing section: %s"
-				err))))
-
-(defun nxml-back-to-section-start (&optional invisible-ok)
-  "Try to move back to the start of the section containing point.
-The start of the section must be <= point.
-Only visible sections are included unless INVISIBLE-OK is non-nil.
-If found, return t.  Otherwise move to point-min and return nil.
-If unbalanced section tags are found, signal an `nxml-outline-error'."
-  (when (or (nxml-after-section-start-tag)
-	    (nxml-section-tag-backward))
-    (let (open-tags found)
-      (while (let (section-start-pos)
-	       (setq section-start-pos xmltok-start)
-	       (if (nxml-token-end-tag-p)
-		   (setq open-tags (cons (xmltok-end-tag-qname)
-					 open-tags))
-		 (if (not open-tags)
-		     (when (and (nxml-token-starts-line-p)
-				(or invisible-ok
-				    (not (get-char-property section-start-pos
-							    'invisible)))
-				(nxml-heading-start-position))
-		       (setq found t))
-		   (let ((qname (xmltok-start-tag-qname)))
-		     (unless (string= (car open-tags) qname)
-		       (nxml-outline-error "mismatched end-tag"))
-		     (setq open-tags (cdr open-tags)))))
-	       (goto-char section-start-pos)
-	       (and (not found)
-		    (nxml-section-tag-backward))))
-      found)))
-
-(defun nxml-after-section-start-tag ()
-  "If the character after point is in a section start-tag, move after it.
-Return the token type.  Otherwise return nil.
-Set up variables like `xmltok-forward'."
-  (let ((pos (nxml-token-after))
-	(case-fold-search nil))
-   (when (and (memq xmltok-type '(start-tag partial-start-tag))
-	      (save-excursion
-		(goto-char xmltok-start)
-		(looking-at (nxml-make-section-tag-regexp))))
-     (goto-char pos)
-     xmltok-type)))
-
-(defun nxml-heading-start-position ()
-  "Return the position of the start of the content of a heading element.
-Adjust the position to be after initial leading whitespace.
-Return nil if no heading element is found.  Requires point to be
-immediately after the section's start-tag."
-  (let ((depth 0)
-	(heading-regexp (concat "\\`\\("
-				nxml-heading-element-name-regexp
-				"\\)\\'"))
-	
-	(section-regexp (concat "\\`\\("
-				nxml-section-element-name-regexp
-				"\\)\\'"))
-	(start (point))
-	found)
-    (save-excursion
-      (while (and (xmltok-forward)
-		  (cond ((memq xmltok-type '(end-tag partial-end-tag))
-			 (and (not (string-match section-regexp
-						 (xmltok-end-tag-local-name)))
-			      (> depth 0)
-			      (setq depth (1- depth))))
-			;; XXX Not sure whether this is a good idea
-			;;((eq xmltok-type 'empty-element)
-			;; nil)
-			((not (memq xmltok-type
-				    '(start-tag partial-start-tag)))
-			 t)
-			((string-match section-regexp
-				       (xmltok-start-tag-local-name))
-			 nil)
-			((string-match heading-regexp
-				       (xmltok-start-tag-local-name))
-			 (skip-chars-forward " \t\r\n")
-			 (setq found (point))
-			 nil)
-			(t
-			 (setq depth (1+ depth))
-			 t))
-		  (<= (- (point) start) nxml-heading-scan-distance))))
-    found))
-
-;;; Error handling
-
-(defun nxml-report-outline-error (msg err)
-  (error msg (apply 'format (cdr err))))
-
-(defun nxml-outline-error (&rest args)
-  (signal 'nxml-outline-error args))
-
-(put 'nxml-outline-error
-     'error-conditions
-     '(error nxml-error nxml-outline-error))
-
-(put 'nxml-outline-error
-     'error-message
-     "Cannot create outline of buffer that is not well-formed")
-
-;;; Debugging
-
-(defun nxml-debug-overlays ()
-  (interactive)
-  (let ((overlays (nreverse (overlays-in (point-min) (point-max))))
-	overlay)
-    (while overlays
-      (setq overlay (car overlays))
-      (setq overlays (cdr overlays))
-      (when (overlay-get overlay 'nxml-outline-display)
-	(message "overlay %s: %s...%s (%s)"
-		 (overlay-get overlay 'category)
-		 (overlay-start overlay)
-		 (overlay-end overlay)
-		 (overlay-get overlay 'display))))))
-
-(provide 'nxml-outln)
-
-;;; nxml-outln.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-parse.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-parse.el
deleted file mode 100644
index 0e93f10103..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-parse.el
+++ /dev/null
@@ -1,320 +0,0 @@
-;;; nxml-parse.el --- XML parser, sharing infrastructure with nxml-mode
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; Entry point is `nxml-parse-file'.
-
-;;; Code:
-
-(require 'nxml-util)
-(require 'xmltok)
-(require 'nxml-enc)
-(require 'nxml-ns)
-
-(defvar nxml-parse-file-name nil)
-
-(defvar nxml-validate-function nil
-  "Nil or a function to be called by `nxml-parse-file' to perform validation.
-The function will be called once for each start-tag or end-tag.  The
-function is passed two arguments TEXT and START-TAG.  For a start-tag,
-START-TAG is a list (NAME ATTRIBUTES) where NAME and ATTRIBUTES are in
-the same form as returned by `nxml-parse-file.  For an end-tag,
-START-TAG is nil.  TEXT is a string containing the text immediately
-preceding the tag, or nil if there was no such text.  An empty element
-is treated as a start-tag followed by an end-tag.
-
-For a start-tag, the namespace state will be the state after
-processing the namespace declarations in the start-tag. For an
-end-tag, the namespace state will be the state before popping the
-namespace declarations for the corresponding start-tag.
-
-The function must return nil if no error is detected or a
-cons (MESSAGE . LOCATION) where MESSAGE is a string containing
-an error message and LOCATION indicates what caused the error
-as follows:
-
-- nil indicates the tag as whole caused it; this is always allowed;
-
-- text indicates the text caused it; this is allowed only if
-TEXT is non-nil;
-
-- tag-close indicates the close of the tag caused it; this is
-allowed only if START-TAG is non-nil;
-
-- (attribute-name . N) indicates that the name of the Nth attribute
-caused it; N counts from 0; this is allowed only if START-TAG is non-nil
-and N must be less than the number of attributes;
-
-- (attribute-value . N) indicates that the value of the Nth attribute
-caused it; N counts from 0; this is allowed only if START-TAG is non-nil
-and N must be less than the number of attributes.")
-
-(defun nxml-parse-file (file)
-  "Parse the XML document in FILE and return it as a list.
-An XML element is represented as a list (NAME ATTRIBUTES . CHILDREN).
-NAME is either a string, in the case where the name does not have a
-namespace, or a cons (NAMESPACE . LOCAL-NAME), where NAMESPACE is a
-symbol and LOCAL-NAME is a string, in the case where the name does
-have a namespace. NAMESPACE is a keyword whose name is `:URI', where
-URI is the namespace name.  ATTRIBUTES is an alist of attributes where
-each attribute has the form (NAME . VALUE), where NAME has the same
-form as an element name, and VALUE is a string.  A namespace
-declaration is represented as an attribute whose name is
-\(:http://www.w3.org/2000/xmlns/ . LOCAL-NAME).  CHILDREN is a list
-containing strings and child elements; CHILDREN never contains two
-consecutive strings and never contains an empty string.  Processing
-instructions and comments are not represented.  The return value is a
-list representing the document element.
-
-If the XML document is not well-formed, an error having the condition
-`nxml-file-parse-error' will be signaled; the error data will be a
-list of the \(FILE POSITION MESSAGE), where POSITION is an integer
-specifying the position where the error was detected, and MESSAGE is a
-string describing the error.
-
-The current contents of FILE will be parsed even if there is a
-modified buffer currently visiting FILE.
-
-If the variable `nxml-validation-function' is non-nil, it will be
-called twice for each element, and any reported error will be signaled
-in the same way as well-formedness error."
-  (save-excursion
-    (set-buffer (nxml-parse-find-file file))
-    (unwind-protect
-	(let ((nxml-parse-file-name file))
-	  (nxml-parse-instance))
-      (kill-buffer nil))))
-
-(defun nxml-parse-find-file (file)
-  (save-excursion
-    (set-buffer (get-buffer-create " *nXML Parse*"))
-    (erase-buffer)
-    (let ((set-auto-coding-function 'nxml-set-xml-coding))
-      (insert-file-contents file))
-    (current-buffer)))
-      
-(defun nxml-parse-instance ()
-  (let (xmltok-dtd)
-    (xmltok-save
-      (xmltok-forward-prolog)
-      (nxml-check-xmltok-errors)
-      (nxml-ns-save
-	(nxml-parse-instance-1)))))
-
-(defun nxml-parse-instance-1 ()
-  (let* ((top (cons nil nil))
-	 ;; tail is a cons cell, whose cdr is nil
-	 ;; additional elements will destructively appended to tail
-	 (tail top)
-	 ;; stack of tails one for each open element
-	 tail-stack
-	 ;; list of QNames of open elements
-	 open-element-tags
-	 ;; list of strings buffering a text node, in reverse order
-	 text
-	 ;; position of beginning of first (in buffer) string in text
-	 text-pos)
-    (while (xmltok-forward)
-      (nxml-check-xmltok-errors)
-      (cond ((memq xmltok-type '(start-tag end-tag empty-element))
-	     (when text
-	       (setq text (apply 'concat (nreverse text)))
-	       (setcdr tail (cons text nil))
-	       (setq tail (cdr tail)))
-	     (when (not (eq xmltok-type 'end-tag))
-	       (when (and (not open-element-tags)
-			  (not (eq tail top)))
-		 (nxml-parse-error nil "Multiple top-level elements"))
-	       (setq open-element-tags
-		     (cons (xmltok-start-tag-qname)
-			   open-element-tags))
-	       (nxml-ns-push-state)
-	       (let ((tag (nxml-parse-start-tag)))
-		 (nxml-validate-tag text text-pos tag)
-		 (setq text nil)
-		 (setcdr tail (cons tag nil))
-		 (setq tail (cdr tail))
-		 (setq tail-stack (cons tail tail-stack))
-		 (setq tail (last tag))))
-	     (when (not (eq xmltok-type 'start-tag))
-	       (or (eq xmltok-type 'empty-element)
-		   (equal (car open-element-tags)
-			  (xmltok-end-tag-qname))
-		   (if open-element-tags
-		       (nxml-parse-error nil
-					 "Unbalanced end-tag; expected </%s>"
-					 (car open-element-tags))
-		     (nxml-parse-error nil "Extra end-tag")))
-	       (nxml-validate-tag text text-pos nil)
-	       (setq text nil)
-	       (nxml-ns-pop-state)
-	       (setq open-element-tags (cdr open-element-tags))
-	       (setq tail (car tail-stack))
-	       (setq tail-stack (cdr tail-stack)))
-	     (setq text-pos nil))
-	    ((memq xmltok-type '(space data entity-ref char-ref cdata-section))
-	     (cond (open-element-tags
-		    (unless text-pos
-		      (setq text-pos xmltok-start))
-		    (setq text
-			  (cons (nxml-current-text-string) text)))
-		   ((not (eq xmltok-type 'space))
-		    (nxml-parse-error
-		     nil
-		     "%s at top-level"
-		     (cdr (assq xmltok-type
-				'((data . "Text characters")
-				  (entity-ref . "Entity reference")
-				  (char-ref . "Character reference")
-				  (cdata-section . "CDATA section"))))))))))
-    (unless (cdr top)
-      (nxml-parse-error (point-max) "Missing document element"))
-    (cadr top)))
-
-(defun nxml-parse-start-tag ()
-  (let (parsed-attributes
-	parsed-namespace-attributes
-	atts att prefixes prefix ns value name)
-    (setq atts xmltok-namespace-attributes)
-    (while atts
-      (setq att (car atts))
-      (setq value (or (xmltok-attribute-value att)
-		      (nxml-parse-error nil "Invalid attribute value")))
-      (setq ns (nxml-make-namespace value))
-      (setq prefix (and (xmltok-attribute-prefix att)
-			(xmltok-attribute-local-name att)))
-      (cond ((member prefix prefixes)
-	     (nxml-parse-error nil "Duplicate namespace declaration"))
-	    ((not prefix)
-	     (nxml-ns-set-default ns))
-	    (ns
-	     (nxml-ns-set-prefix prefix ns))
-	    (t (nxml-parse-error nil "Cannot undeclare namespace prefix")))
-      (setq prefixes (cons prefix prefixes))
-      (setq parsed-namespace-attributes
-	    (cons (cons (nxml-make-name nxml-xmlns-namespace-uri
-					(xmltok-attribute-local-name att))
-			value)
-		  parsed-namespace-attributes))
-      (setq atts (cdr atts)))
-    (setq name
-	  (nxml-make-name
-	   (let ((prefix (xmltok-start-tag-prefix)))
-	     (if prefix
-		 (or (nxml-ns-get-prefix prefix)
-		     (nxml-parse-error (1+ xmltok-start)
-				       "Prefix `%s' undeclared"
-				       prefix))
-	       (nxml-ns-get-default)))
-	   (xmltok-start-tag-local-name)))
-    (setq atts xmltok-attributes)
-    (while atts
-      (setq att (car atts))
-      (setq ns
-	    (let ((prefix (xmltok-attribute-prefix att)))
-	      (and prefix
-		   (or (nxml-ns-get-prefix prefix)
-		       (nxml-parse-error (xmltok-attribute-name-start att)
-					 "Prefix `%s' undeclared"
-					 prefix)))))
-      (setq parsed-attributes
-	    (let ((nm (nxml-make-name ns
-				      (xmltok-attribute-local-name att))))
-	      (when (assoc nm parsed-attributes)
-		(nxml-parse-error (xmltok-attribute-name-start att)
-				  "Duplicate attribute"))
-	      (cons (cons nm (or (xmltok-attribute-value att)
-				 (nxml-parse-error nil "Invalid attribute value")))
-		    parsed-attributes)))
-      (setq atts (cdr atts)))
-    ;; We want to end up with the attributes followed by the
-    ;; the namespace attributes in the same order as
-    ;; xmltok-attributes and xmltok-namespace-attributes respectively.
-    (when parsed-namespace-attributes
-      (setq parsed-attributes
-	    (nconc parsed-namespace-attributes parsed-attributes)))
-    (list name (nreverse parsed-attributes))))
-
-(defun nxml-validate-tag (text text-pos tag)
-  (when nxml-validate-function
-    (let ((err (funcall nxml-validate-function text tag))
-	  pos)
-      (when err
-	(setq pos (nxml-validate-error-position (cdr err)
-						(and text text-pos)
-						tag))
-	(or pos (error "Incorrect return value from %s"
-		       nxml-validate-function))
-	(nxml-parse-error pos (car err))))))
-
-(defun nxml-validate-error-position (location text-pos tag)
-  (cond ((null location) xmltok-start)
-	((eq location 'text)  text-pos)
-	((eq location 'tag-close)
-	 (and tag (- (point) (if (eq xmltok-type 'empty-element ) 2 1))))
-	((consp location)
-	 (let ((att (nth (cdr location) xmltok-attributes)))
-	   (when (not att)
-	     (setq att (nth (- (cdr location) (length xmltok-attributes))
-			    xmltok-namespace-attributes)))
-	   (cond ((not att))
-		 ((eq (car location) 'attribute-name)
-		  (xmltok-attribute-name-start att))
-		 ((eq (car location) 'attribute-value)
-		  (xmltok-attribute-value-start att)))))))
-
-(defun nxml-make-name (ns local-name)
-  (if ns
-      (cons ns local-name)
-    local-name))
-
-(defun nxml-current-text-string ()
-  (cond ((memq xmltok-type '(space data))
-	 (buffer-substring-no-properties xmltok-start
-					 (point)))
-	((eq xmltok-type 'cdata-section)
-	 (buffer-substring-no-properties (+ xmltok-start 9)
-					 (- (point) 3)))
-	((memq xmltok-type '(char-ref entity-ref))
-	 (unless xmltok-replacement
-	   (nxml-parse-error nil
-			     (if (eq xmltok-type 'char-ref)
-				 "Reference to unsupported Unicode character"
-			       "Unresolvable entity reference")))
-	 xmltok-replacement)))
-
-(defun nxml-parse-error (position &rest args)
-  (nxml-signal-file-parse-error nxml-parse-file-name
-				(or position xmltok-start)
-				(apply 'format args)))
-
-(defun nxml-check-xmltok-errors ()
-  (when xmltok-errors
-    (let ((err (car (last xmltok-errors))))
-      (nxml-signal-file-parse-error nxml-parse-file-name
-				    (xmltok-error-start err)
-				    (xmltok-error-message err)))))
-
-(provide 'nxml-parse)
-
-;;; nxml-parse.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-rap.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-rap.el
deleted file mode 100644
index 8b0c55e573..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-rap.el
+++ /dev/null
@@ -1,467 +0,0 @@
-;;; nxml-rap.el --- low-level support for random access parsing for nXML mode
-
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This uses xmltok.el to do XML parsing. The fundamental problem is
-;; how to handle changes. We don't want to maintain a complete parse
-;; tree.  We also don't want to reparse from the start of the document
-;; on every keystroke.  However, it is not possible in general to
-;; parse an XML document correctly starting at a random point in the
-;; middle.  The main problems are comments, CDATA sections and
-;; processing instructions: these can all contain things that are
-;; indistinguishable from elements. Literals in the prolog are also a
-;; problem.  Attribute value literals are not a problem because
-;; attribute value literals cannot contain less-than signs.
-;;
-;; Our strategy is to keep track of just the problematic things.
-;; Specifically, we keep track of all comments, CDATA sections and
-;; processing instructions in the instance.  We do this by marking all
-;; except the first character of these with a non-nil nxml-inside text
-;; property. The value of the nxml-inside property is comment,
-;; cdata-section or processing-instruction.  The first character does
-;; not have the nxml-inside property so we can find the beginning of
-;; the construct by looking for a change in a text property value
-;; (Emacs provides primitives for this).  We use text properties
-;; rather than overlays, since the implementation of overlays doesn't
-;; look like it scales to large numbers of overlays in a buffer.
-;;
-;; We don't in fact track all these constructs, but only track them in
-;; some initial part of the instance. The variable `nxml-scan-end'
-;; contains the limit of where we have scanned up to for them.
-;;
-;; Thus to parse some random point in the file we first ensure that we
-;; have scanned up to that point.  Then we search backwards for a
-;; <. Then we check whether the < has an nxml-inside property. If it
-;; does we go backwards to first character that does not have an
-;; nxml-inside property (this character must be a <).  Then we start
-;; parsing forward from the < we have found.
-;;
-;; The prolog has to be parsed specially, so we also keep track of the
-;; end of the prolog in `nxml-prolog-end'. The prolog is reparsed on
-;; every change to the prolog.  This won't work well if people try to
-;; edit huge internal subsets. Hopefully that will be rare.
-;;
-;; We keep track of the changes by adding to the buffer's
-;; after-change-functions hook.  Scanning is also done as a
-;; prerequisite to fontification by adding to fontification-functions
-;; (in the same way as jit-lock).  This means that scanning for these
-;; constructs had better be quick.  Fortunately it is. Firstly, the
-;; typical proportion of comments, CDATA sections and processing
-;; instructions is small relative to other things.  Secondly, to scan
-;; we just search for the regexp <[!?].
-;;
-;; One problem is unclosed comments, processing instructions and CDATA
-;; sections.  Suppose, for example, we encounter a <!-- but there's no
-;; matching -->.  This is not an unexpected situation if the user is
-;; creating a comment. It is not helpful to treat the whole of the
-;; file starting from the <!-- onwards as a single unclosed comment
-;; token. Instead we treat just the <!-- as a piece of not well-formed
-;; markup and continue.  The problem is that if at some later stage a
-;; --> gets added to the buffer after the unclosed <!--, we will need
-;; to reparse the buffer starting from the <!--.  We need to keep
-;; track of these reparse dependencies; they are called dependent
-;; regions in the code.
-
-;;; Code:
-
-(require 'xmltok)
-(require 'nxml-util)
-
-(defvar nxml-prolog-end nil
-  "Integer giving position following end of the prolog.")
-(make-variable-buffer-local 'nxml-prolog-end)
-
-(defvar nxml-scan-end nil
-  "Marker giving position up to which we have scanned.
-nxml-scan-end must be >= nxml-prolog-end.  Furthermore, nxml-scan-end
-must not an inside position in the following sense. A position is
-inside if the following character is a part of, but not the first
-character of, a CDATA section, comment or processing instruction.
-Furthermore all positions >= nxml-prolog-end and < nxml-scan-end that
-are inside positions must have a non-nil nxml-inside property whose
-value is a symbol specifying what it is inside. Any characters with a
-non-nil fontified property must have position < nxml-scan-end and the
-correct face. Dependent regions must also be established for any
-unclosed constructs starting before nxml-scan-end.
-There must be no nxml-inside properties after nxml-scan-end.")
-(make-variable-buffer-local 'nxml-scan-end)
-
-(defsubst nxml-get-inside (pos)
-  (get-text-property pos 'nxml-inside))
-
-(defsubst nxml-clear-inside (start end)
-  (remove-text-properties start end '(nxml-inside nil)))
-
-(defsubst nxml-set-inside (start end type)
-  (put-text-property start end 'nxml-inside type))
-
-(defun nxml-inside-end (pos)
-  "Return the end of the inside region containing POS.
-Return nil if the character at POS is not inside."
-  (if (nxml-get-inside pos)
-      (or (next-single-property-change pos 'nxml-inside)
-	  (point-max))
-    nil))
-
-(defun nxml-inside-start (pos)
-  "Return the start of the inside region containing POS.
-Return nil if the character at POS is not inside."
-  (if (nxml-get-inside pos)
-      (or (previous-single-property-change (1+ pos) 'nxml-inside)
-	  (point-min))
-    nil))
-
-;;; Change management
-
-(defun nxml-scan-after-change (start end)
-  "Restore `nxml-scan-end' invariants after a change.
-The change happened between START and END.
-Return position after which lexical state is unchanged.
-END must be > nxml-prolog-end."
-  (if (>= start nxml-scan-end)
-      nxml-scan-end
-    (goto-char start)
-    (nxml-move-outside-backwards)
-    (setq start (point))
-    (let ((inside-remove-start start)
-	  xmltok-errors
-	  xmltok-dependent-regions)
-      (while (or (when (xmltok-forward-special (min end nxml-scan-end))
-		   (when (memq xmltok-type
-			       '(comment
-				 cdata-section
-				 processing-instruction))
-		     (nxml-clear-inside inside-remove-start
-					(1+ xmltok-start))
-		     (nxml-set-inside (1+ xmltok-start)
-				      (point)
-				      xmltok-type)
-		     (setq inside-remove-start (point)))
-		   (if (< (point) (min end nxml-scan-end))
-		       t
-		     (setq end (point))
-		     nil))
-		 ;; The end of the change was inside but is now outside.
-		 ;; Imagine something really weird like
-		 ;; <![CDATA[foo <!-- bar ]]> <![CDATA[ stuff --> <!-- ]]> -->
-		 ;; and suppose we deleted "<![CDATA[f"
-		 (let ((inside-end (nxml-inside-end end)))
-		   (when inside-end
-		     (setq end inside-end)
-		     t))))
-      (nxml-clear-inside inside-remove-start end)
-      (nxml-clear-dependent-regions start end)
-      (nxml-mark-parse-dependent-regions))
-    (when (> end nxml-scan-end)
-      (set-marker nxml-scan-end end))
-    end))
-
-(defun nxml-scan-prolog ()
-  (goto-char (point-min))
-  (let (xmltok-dtd
-	xmltok-errors
-	xmltok-dependent-regions)
-    (setq nxml-prolog-regions (xmltok-forward-prolog))
-    (setq nxml-prolog-end (point))
-    (nxml-clear-inside (point-min) nxml-prolog-end)
-    (nxml-clear-dependent-regions (point-min) nxml-prolog-end)
-    (nxml-mark-parse-dependent-regions))
-  (when (< nxml-scan-end nxml-prolog-end)
-    (set-marker nxml-scan-end nxml-prolog-end)))
-
-
-;;; Dependent regions
-
-(defun nxml-adjust-start-for-dependent-regions (start end pre-change-length)
-  (let ((overlays (overlays-in (1- start) start))
-	(adjusted-start start))
-    (while overlays
-      (let* ((overlay (car overlays))
-	     (ostart (overlay-start overlay)))
-	(when (and (eq (overlay-get overlay 'category) 'nxml-dependent)
-		   (< ostart adjusted-start))
-	  (let ((funargs (overlay-get overlay 'nxml-funargs)))
-	    (when (apply (car funargs)
-			 (append (list start
-				       end
-				       pre-change-length
-				       ostart
-				       (overlay-end overlay))
-				 (cdr funargs)))
-	      (setq adjusted-start ostart)))))
-      (setq overlays (cdr overlays)))
-    adjusted-start))
-		  
-(defun nxml-mark-parse-dependent-regions ()
-  (while xmltok-dependent-regions
-    (apply 'nxml-mark-parse-dependent-region
-	   (car xmltok-dependent-regions))
-    (setq xmltok-dependent-regions
-	  (cdr xmltok-dependent-regions))))
-
-(defun nxml-mark-parse-dependent-region (fun start end &rest args)
-  (let ((overlay (make-overlay start end nil t t)))
-    (overlay-put overlay 'category 'nxml-dependent)
-    (overlay-put overlay 'nxml-funargs (cons fun args))))
-
-(put 'nxml-dependent 'evaporate t)
-
-(defun nxml-clear-dependent-regions (start end)
-  (let ((overlays (overlays-in start end)))
-    (while overlays
-      (let* ((overlay (car overlays))
-	     (category (overlay-get overlay 'category)))
-	(when (and (eq category 'nxml-dependent)
-		   (<= start (overlay-start overlay)))
-	  (delete-overlay overlay)))
-      (setq overlays (cdr overlays)))))
-
-;;; Random access parsing
-
-(defun nxml-token-after ()
-  "Return the position after the token containing the char after point.
-Sets up the variables `xmltok-type', `xmltok-start',
-`xmltok-name-end', `xmltok-name-colon', `xmltok-attributes',
-`xmltok-namespace-attributes' in the same was as does
-`xmltok-forward'.  The prolog will be treated as a single token with
-type `prolog'."
-  (let ((pos (point)))
-    (if (< pos nxml-prolog-end)
-	(progn
-	  (setq xmltok-type 'prolog
-		xmltok-start (point-min))
-	  (min nxml-prolog-end (point-max)))
-      (nxml-ensure-scan-up-to-date)
-      (if (nxml-get-inside pos)
-	  (save-excursion
-	    (nxml-move-outside-backwards)
-	    (xmltok-forward)
-	    (point))
-	(save-excursion
-	  (if (or (eq (char-after) ?<)
-		      (search-backward "<"
-				       (max (point-min) nxml-prolog-end)
-				       t))
-	      (nxml-move-outside-backwards)
-	    (goto-char (if (<= (point-min) nxml-prolog-end)
-			   nxml-prolog-end
-			 (or (nxml-inside-end (point-min))
-			     (point-min)))))
-	  (while (and (nxml-tokenize-forward)
-		      (<= (point) pos)))
-	  (point))))))
-
-(defun nxml-token-before ()
-  "Return the position after the token containing the char before point.
-Sets variables like `nxml-token-after'."
-  (if (/= (point-min) (point))
-      (save-excursion
-	(goto-char (1- (point)))
-	(nxml-token-after))
-    (setq xmltok-start (point))
-    (setq xmltok-type nil)
-    (point)))
-
-(defun nxml-tokenize-forward ()
-  (let (xmltok-dependent-regions
-	xmltok-errors)
-    (when (and (xmltok-forward)
-	       (> (point) nxml-scan-end))
-      (cond ((memq xmltok-type '(comment
-				 cdata-section
-				 processing-instruction))
-	     (nxml-with-unmodifying-text-property-changes
-	       (nxml-set-inside (1+ xmltok-start) (point) xmltok-type)))
-	    (xmltok-dependent-regions
-	     (nxml-mark-parse-dependent-regions)))
-      (set-marker nxml-scan-end (point)))
-    xmltok-type))
-
-(defun nxml-move-outside-backwards ()
-  "Move point to first character of the containing special thing.
-Leave point unmoved if it is not inside anything special."
-  (let ((start (nxml-inside-start (point))))
-    (when start
-      (goto-char (1- start))
-      (when (nxml-get-inside (point))
-	(error "Char before inside-start at %s had nxml-inside property %s"
-	       (point)
-	       (nxml-get-inside (point)))))))
-
-(defun nxml-ensure-scan-up-to-date ()
-  (let ((pos (point)))
-    (when (< nxml-scan-end pos)
-      (save-excursion
-	(goto-char nxml-scan-end)
-	(let (xmltok-errors
-	      xmltok-dependent-regions)
-	  (while (when (xmltok-forward-special pos)
-		   (when (memq xmltok-type
-			       '(comment
-				 processing-instruction
-				 cdata-section))
-		     (nxml-with-unmodifying-text-property-changes
-		       (nxml-set-inside (1+ xmltok-start)
-					(point)
-					xmltok-type)))
-		   (if (< (point) pos)
-		       t
-		     (setq pos (point))
-		     nil)))
-	  (nxml-clear-dependent-regions nxml-scan-end pos)
-	  (nxml-mark-parse-dependent-regions)
-	  (set-marker nxml-scan-end pos))))))
-
-;;; Element scanning
-
-(defun nxml-scan-element-forward (from &optional up)
-  "Scan forward from FROM over a single balanced element.
-Point must between tokens.  Return the position of the end of the tag
-that ends the element. `xmltok-start' will contain the position of the
-start of the tag. If UP is non-nil, then scan past end-tag of element
-containing point.  If no element is found, return nil.  If a
-well-formedness error prevents scanning, signal an nxml-scan-error.
-Point is not moved."
-  (let ((open-tags (and up t))
-	found)
-    (save-excursion
-      (goto-char from)
-      (while (cond ((not (nxml-tokenize-forward))
-		    (when (consp open-tags)
-		      (nxml-scan-error (cadr open-tags)
-				       "Start-tag has no end-tag"))
-		    nil)
-		   ((eq xmltok-type 'start-tag)
-		    (setq open-tags
-			  (cons (xmltok-start-tag-qname)
-				(cons xmltok-start
-				      open-tags)))
-		    t)
-		   ((eq xmltok-type 'end-tag)
-		    (cond ((not open-tags) nil)
-			  ((not (consp open-tags)) (setq found (point)) nil)
-			  ((not (string= (car open-tags)
-					 (xmltok-end-tag-qname)))
-			   (nxml-scan-error (+ 2 xmltok-start)
-					    "Mismatched end-tag; \
-expected `%s'"
-					    (car open-tags)))
-			  ((setq open-tags (cddr open-tags)) t)
-			  (t (setq found (point)) nil)))
-		   ((memq xmltok-type '(empty-element
-					partial-empty-element))
-		    (if open-tags
-			t
-		      (setq found (point))
-		      nil))
-		   ((eq xmltok-type 'partial-end-tag)
-		    (cond ((not open-tags) nil)
-			  ((not (consp open-tags)) (setq found (point)) nil)
-			  ((setq open-tags (cddr open-tags)) t)
-			  (t (setq found (point)) nil)))
-		   ((eq xmltok-type 'partial-start-tag)
-		    (nxml-scan-error xmltok-start
-				     "Missing `>'"))
-		   (t t))))
-    found))
-
-(defun nxml-scan-element-backward (from &optional up bound)
-  "Scan backward from FROM over a single balanced element.
-Point must between tokens.  Return the position of the end of the tag
-that starts the element. `xmltok-start' will contain the position of
-the start of the tag.  If UP is non-nil, then scan past start-tag of
-element containing point.  If BOUND is non-nil, then don't scan back
-past BOUND.  If no element is found, return nil.  If a well-formedness
-error prevents scanning, signal an nxml-scan-error.  Point is not
-moved."
-  (let ((open-tags (and up t))
-	token-end found)
-    (save-excursion
-      (goto-char from)
-      (while (cond ((or (< (point) nxml-prolog-end)
-			(not (search-backward "<"
-					      (max (or bound 0)
-						   nxml-prolog-end)
-					      t)))
-		    (when (and (consp open-tags) (not bound))
-		      (nxml-scan-error (cadr open-tags)
-				       "End-tag has no start-tag"))
-		    nil)
-		   ((progn
-		      (nxml-move-outside-backwards)
-		      (save-excursion
-			(nxml-tokenize-forward)
-			(setq token-end (point)))
-		      (eq xmltok-type 'end-tag))
-		    (setq open-tags
-			  (cons (xmltok-end-tag-qname)
-				(cons xmltok-start open-tags)))
-		    t)
-		   ((eq xmltok-type 'start-tag)
-		    (cond ((not open-tags) nil)
-			  ((not (consp open-tags))
-			   (setq found token-end)
-			   nil)
-			  ((and (car open-tags)
-				(not (string= (car open-tags)
-					      (xmltok-start-tag-qname))))
-			   (nxml-scan-error (1+ xmltok-start)
-					    "Mismatched start-tag; \
-expected `%s'"
-					    (car open-tags)))
-			  ((setq open-tags (cddr open-tags)) t)
-			  (t (setq found token-end) nil)))
-		   ((memq xmltok-type '(empty-element
-					partial-empty-element))
-		    (if open-tags
-			t
-		      (setq found token-end)
-		      nil))
-		   ((eq xmltok-type 'partial-end-tag)
-		    (setq open-tags
-			  (cons nil (cons xmltok-start open-tags)))
-		    t)
-		   ((eq xmltok-type 'partial-start-tag)
-		    ;; if we have only a partial-start-tag
-		    ;; then it's unlikely that there's a matching
-		    ;; end-tag, so it's probably not helpful
-		    ;; to treat it as a complete start-tag
-		    (nxml-scan-error xmltok-start
-				     "Missing `>'"))
-		   (t t))))
-    found))
-
-(defun nxml-scan-error (&rest args)
-  (signal 'nxml-scan-error args))
-
-(put 'nxml-scan-error
-     'error-conditions
-     '(error nxml-error nxml-scan-error))
-
-(put 'nxml-scan-error
-     'error-message
-     "Scan over element that is not well-formed")
-
-(provide 'nxml-rap)
-
-;;; nxml-rap.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-uchnm.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-uchnm.el
deleted file mode 100644
index fbb6074515..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-uchnm.el
+++ /dev/null
@@ -1,257 +0,0 @@
-;;; nxml-uchnm.el --- support for Unicode standard cha names in nxml-mode
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This enables the use of the character names defined in the Unicode
-;; Standard.  The use of the names can be controlled on a per-block
-;; basis, so as both to reduce memory usage and loading time,
-;; and to make completion work better.
-;; The main entry point is `nxml-enable-unicode-char-name-sets'.  Typically,
-;; this is added to `nxml-mode-hook' (rng-auto.el does this already).
-;; To customize the blocks for which names are used
-
-;;; Code:
-
-(require 'nxml-mode)
-
-(defconst nxml-unicode-blocks
-  '(("Basic Latin" #x0000 #x007F)
-    ("Latin-1 Supplement" #x0080 #x00FF)
-    ("Latin Extended-A" #x0100 #x017F)
-    ("Latin Extended-B" #x0180 #x024F)
-    ("IPA Extensions" #x0250 #x02AF)
-    ("Spacing Modifier Letters" #x02B0 #x02FF)
-    ("Combining Diacritical Marks" #x0300 #x036F)
-    ("Greek and Coptic" #x0370 #x03FF)
-    ("Cyrillic" #x0400 #x04FF)
-    ("Cyrillic Supplementary" #x0500 #x052F)
-    ("Armenian" #x0530 #x058F)
-    ("Hebrew" #x0590 #x05FF)
-    ("Arabic" #x0600 #x06FF)
-    ("Syriac" #x0700 #x074F)
-    ("Thaana" #x0780 #x07BF)
-    ("Devanagari" #x0900 #x097F)
-    ("Bengali" #x0980 #x09FF)
-    ("Gurmukhi" #x0A00 #x0A7F)
-    ("Gujarati" #x0A80 #x0AFF)
-    ("Oriya" #x0B00 #x0B7F)
-    ("Tamil" #x0B80 #x0BFF)
-    ("Telugu" #x0C00 #x0C7F)
-    ("Kannada" #x0C80 #x0CFF)
-    ("Malayalam" #x0D00 #x0D7F)
-    ("Sinhala" #x0D80 #x0DFF)
-    ("Thai" #x0E00 #x0E7F)
-    ("Lao" #x0E80 #x0EFF)
-    ("Tibetan" #x0F00 #x0FFF)
-    ("Myanmar" #x1000 #x109F)
-    ("Georgian" #x10A0 #x10FF)
-    ("Hangul Jamo" #x1100 #x11FF)
-    ("Ethiopic" #x1200 #x137F)
-    ("Cherokee" #x13A0 #x13FF)
-    ("Unified Canadian Aboriginal Syllabics" #x1400 #x167F)
-    ("Ogham" #x1680 #x169F)
-    ("Runic" #x16A0 #x16FF)
-    ("Tagalog" #x1700 #x171F)
-    ("Hanunoo" #x1720 #x173F)
-    ("Buhid" #x1740 #x175F)
-    ("Tagbanwa" #x1760 #x177F)
-    ("Khmer" #x1780 #x17FF)
-    ("Mongolian" #x1800 #x18AF)
-    ("Latin Extended Additional" #x1E00 #x1EFF)
-    ("Greek Extended" #x1F00 #x1FFF)
-    ("General Punctuation" #x2000 #x206F)
-    ("Superscripts and Subscripts" #x2070 #x209F)
-    ("Currency Symbols" #x20A0 #x20CF)
-    ("Combining Diacritical Marks for Symbols" #x20D0 #x20FF)
-    ("Letterlike Symbols" #x2100 #x214F)
-    ("Number Forms" #x2150 #x218F)
-    ("Arrows" #x2190 #x21FF)
-    ("Mathematical Operators" #x2200 #x22FF)
-    ("Miscellaneous Technical" #x2300 #x23FF)
-    ("Control Pictures" #x2400 #x243F)
-    ("Optical Character Recognition" #x2440 #x245F)
-    ("Enclosed Alphanumerics" #x2460 #x24FF)
-    ("Box Drawing" #x2500 #x257F)
-    ("Block Elements" #x2580 #x259F)
-    ("Geometric Shapes" #x25A0 #x25FF)
-    ("Miscellaneous Symbols" #x2600 #x26FF)
-    ("Dingbats" #x2700 #x27BF)
-    ("Miscellaneous Mathematical Symbols-A" #x27C0 #x27EF)
-    ("Supplemental Arrows-A" #x27F0 #x27FF)
-    ("Braille Patterns" #x2800 #x28FF)
-    ("Supplemental Arrows-B" #x2900 #x297F)
-    ("Miscellaneous Mathematical Symbols-B" #x2980 #x29FF)
-    ("Supplemental Mathematical Operators" #x2A00 #x2AFF)
-    ("CJK Radicals Supplement" #x2E80 #x2EFF)
-    ("Kangxi Radicals" #x2F00 #x2FDF)
-    ("Ideographic Description Characters" #x2FF0 #x2FFF)
-    ("CJK Symbols and Punctuation" #x3000 #x303F)
-    ("Hiragana" #x3040 #x309F)
-    ("Katakana" #x30A0 #x30FF)
-    ("Bopomofo" #x3100 #x312F)
-    ("Hangul Compatibility Jamo" #x3130 #x318F)
-    ("Kanbun" #x3190 #x319F)
-    ("Bopomofo Extended" #x31A0 #x31BF)
-    ("Katakana Phonetic Extensions" #x31F0 #x31FF)
-    ("Enclosed CJK Letters and Months" #x3200 #x32FF)
-    ("CJK Compatibility" #x3300 #x33FF)
-    ("CJK Unified Ideographs Extension A" #x3400 #x4DBF)
-    ;;("CJK Unified Ideographs" #x4E00 #x9FFF)
-    ("Yi Syllables" #xA000 #xA48F)
-    ("Yi Radicals" #xA490 #xA4CF)
-    ;;("Hangul Syllables" #xAC00 #xD7AF)
-    ;;("High Surrogates" #xD800 #xDB7F)
-    ;;("High Private Use Surrogates" #xDB80 #xDBFF)
-    ;;("Low Surrogates" #xDC00 #xDFFF)
-    ;;("Private Use Area" #xE000 #xF8FF)
-    ;;("CJK Compatibility Ideographs" #xF900 #xFAFF)
-    ("Alphabetic Presentation Forms" #xFB00 #xFB4F)
-    ("Arabic Presentation Forms-A" #xFB50 #xFDFF)
-    ("Variation Selectors" #xFE00 #xFE0F)
-    ("Combining Half Marks" #xFE20 #xFE2F)
-    ("CJK Compatibility Forms" #xFE30 #xFE4F)
-    ("Small Form Variants" #xFE50 #xFE6F)
-    ("Arabic Presentation Forms-B" #xFE70 #xFEFF)
-    ("Halfwidth and Fullwidth Forms" #xFF00 #xFFEF)
-    ("Specials" #xFFF0 #xFFFF)
-    ("Old Italic" #x10300 #x1032F)
-    ("Gothic" #x10330 #x1034F)
-    ("Deseret" #x10400 #x1044F)
-    ("Byzantine Musical Symbols" #x1D000 #x1D0FF)
-    ("Musical Symbols" #x1D100 #x1D1FF)
-    ("Mathematical Alphanumeric Symbols" #x1D400 #x1D7FF)
-    ;;("CJK Unified Ideographs Extension B" #x20000 #x2A6DF)
-    ;;("CJK Compatibility Ideographs Supplement" #x2F800 #x2FA1F)
-    ("Tags" #xE0000 #xE007F)
-    ;;("Supplementary Private Use Area-A" #xF0000 #xFFFFF)
-    ;;("Supplementary Private Use Area-B" #x100000 #x10FFFF)
-    )
-  "List of Unicode blocks.
-For each block there is a list (NAME FIRST LAST), where
-NAME is a string giving the offical name of the block,
-FIRST is the first code-point and LAST is the last code-point.
-Blocks containing only characters with algorithmic names or no names
-are omitted.")
-
-(defun nxml-unicode-block-char-name-set (name)
-  "Return a symbol for a block whose offical Unicode name is NAME.
-The symbol is generated by downcasing and replacing each space
-by a hyphen."
-  (intern (replace-regexp-in-string " " "-" (downcase name))))
-
-;; This is intended to be a superset of the coverage
-;; of existing standard entity sets.
-(defvar nxml-enabled-unicode-blocks-default
-  '(basic-latin
-    latin-1-supplement
-    latin-extended-a
-    latin-extended-b
-    ipa-extensions
-    spacing-modifier-letters
-    combining-diacritical-marks
-    greek-and-coptic
-    cyrillic
-    general-punctuation
-    superscripts-and-subscripts
-    currency-symbols
-    combining-diacritical-marks-for-symbols
-    letterlike-symbols
-    number-forms
-    arrows
-    mathematical-operators
-    miscellaneous-technical
-    control-pictures
-    optical-character-recognition
-    enclosed-alphanumerics
-    box-drawing
-    block-elements
-    geometric-shapes
-    miscellaneous-symbols
-    dingbats
-    miscellaneous-mathematical-symbols-a
-    supplemental-arrows-a
-    supplemental-arrows-b
-    miscellaneous-mathematical-symbols-b
-    supplemental-mathematical-operators
-    cjk-symbols-and-punctuation
-    alphabetic-presentation-forms
-    variation-selectors
-    small-form-variants
-    specials
-    mathematical-alphanumeric-symbols)
-  "Default value for `nxml-enabled-unicode-blocks'.")
-
-(let ((dir (file-name-directory load-file-name)))
-  (mapcar (lambda (block)
-	    (let ((sym (nxml-unicode-block-char-name-set (car block))))
-	      (nxml-autoload-char-name-set
-	       sym
-	       (expand-file-name
-		(format "char-name/unicode/%05X-%05X"
-			(nth 1 block)
-			(nth 2 block))
-		dir))))
-	  nxml-unicode-blocks))
-
-(defvar nxml-enable-unicode-char-name-sets-flag nil)
-
-(defcustom nxml-enabled-unicode-blocks nxml-enabled-unicode-blocks-default
-  "List of Unicode blocks for which Unicode character names are enabled.
-Each block is identified by a symbol derived from the name
-of the block by downcasing and replacing each space by a hyphen."
-  :set (lambda (sym value)
-	 (set-default 'nxml-enabled-unicode-blocks value)
-	 (when nxml-enable-unicode-char-name-sets-flag
-	   (nxml-enable-unicode-char-name-sets-1)))
-  :type (cons 'set
-	      (mapcar (lambda (block)
-			`(const :tag ,(format "%s (%04X-%04X)"
-					      (nth 0 block)
-					      (nth 1 block)
-					      (nth 2 block))
-				,(nxml-unicode-block-char-name-set
-				  (nth 0 block))))
-		      nxml-unicode-blocks)))
-
-;;;###autoload
-(defun nxml-enable-unicode-char-name-sets ()
-  "Enable the use of Unicode standard names for characters.
-The Unicode blocks for which names are enabled is controlled by
-the variable `nxml-enabled-unicode-blocks'."
-  (interactive)
-  (setq nxml-char-name-ignore-case t)
-  (setq nxml-enable-unicode-char-name-sets-flag t)
-  (nxml-enable-unicode-char-name-sets-1))
-
-(defun nxml-enable-unicode-char-name-sets-1 ()
-  (mapcar (lambda (block)
-	    (nxml-disable-char-name-set
-	     (nxml-unicode-block-char-name-set (car block))))
-	  nxml-unicode-blocks)
-  (mapcar (lambda (nameset)
-	    (nxml-enable-char-name-set nameset))
-	  nxml-enabled-unicode-blocks))
-
-(provide 'nxml-uchnm)
-
-;;; nxml-uchnm.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-util.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-util.el
deleted file mode 100644
index 070bdf8ea9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/nxml-util.el
+++ /dev/null
@@ -1,100 +0,0 @@
-;;; nxml-util.el --- utility functions for nxml-*.el
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(defun nxml-make-namespace (str)
-  "Return a symbol for the namespace URI STR.
-STR must be a string. If STR is the empty string, return nil.
-Otherwise, return the symbol whose name is STR prefixed with a colon."
-  (if (string-equal str "")
-      nil
-    (intern (concat ":" str))))
-
-(defun nxml-namespace-name (ns)
-  "Return the namespace URI corresponding to the symbol NS.
-This is the inverse of `nxml-make-namespace'."
-  (and ns (substring (symbol-name ns) 1)))
-
-(defconst nxml-xml-namespace-uri 
-  (nxml-make-namespace "http://www.w3.org/XML/1998/namespace"))
-
-(defconst nxml-xmlns-namespace-uri
-  (nxml-make-namespace "http://www.w3.org/2000/xmlns/"))
-
-(defmacro nxml-with-unmodifying-text-property-changes (&rest body)
-  "Evaluate BODY without any text property changes modifying the buffer.
-Any text properties changes happen as usual but the changes are not treated as
-modifications to the buffer."
-  (let ((modified (make-symbol "modified")))
-    `(let ((,modified (buffer-modified-p))
-	   (inhibit-read-only t)
-	   (inhibit-modification-hooks t)
-	   (buffer-undo-list t)
-	   (deactivate-mark nil)
-	   ;; Apparently these avoid file locking problems.
-	   (buffer-file-name nil)
-	   (buffer-file-truename nil))
-       (unwind-protect
-	   (progn ,@body)
-	 (unless ,modified
-	   (restore-buffer-modified-p nil))))))
-
-(put 'nxml-with-unmodifying-text-property-changes 'lisp-indent-function 0)
-(def-edebug-spec nxml-with-unmodifying-text-property-changes t)
-
-(defmacro nxml-with-invisible-motion (&rest body)
-  "Evaluate body without calling any point motion hooks."
-  `(let ((inhibit-point-motion-hooks t))
-     ,@body))
-
-(put 'nxml-with-invisible-motion 'lisp-indent-function 0)
-(def-edebug-spec nxml-with-invisible-motion t)
-
-(defun nxml-display-file-parse-error (err)
-  (let* ((filename (nth 1 err))
-	 (buffer (find-file-noselect filename))
-	 (pos (nth 2 err))
-	 (message (nth 3 err)))
-    (pop-to-buffer buffer)
-    ;; What's the right thing to do if the buffer's modified?
-    ;; The position in the saved file could be completely different.
-    (goto-char (if (buffer-modified-p) 1 pos))
-    (error "%s" message)))
-
-(defun nxml-signal-file-parse-error (file pos message &optional error-symbol)
-  (signal (or error-symbol 'nxml-file-parse-error)
-	  (list file pos message)))
-
-(put 'nxml-file-parse-error
-     'error-conditions
-     '(error nxml-file-parse-error))
-
-(put 'nxml-parse-file-error
-     'error-message
-     "Error parsing file")
-
-(provide 'nxml-util)
-
-;;; nxml-util.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-auto.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-auto.el
deleted file mode 100644
index 56a50333e5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-auto.el
+++ /dev/null
@@ -1,278 +0,0 @@
-;;; rng-auto.el --- automatically extracted autoloads for RELAX NG
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-(setq nxml-version "20041004")
-
-(unless (and (fboundp 'make-hash-table)
-	     (boundp 'fontification-functions))
-  (error "FSF GNU Emacs version 21 or later required"))
-
-(when (featurep 'mucs)
-  (error "nxml-mode is not compatible with Mule-UCS"))
-
-;; Add fix for Unicode-display bug in Emacs 21.1 on Windows (fixed in 21.2)
-(when (and (fboundp 'w32-add-charset-info)
-	   (boundp 'w32-charset-info-alist)
-	   (not (assoc "iso10646-1" w32-charset-info-alist)))
-  (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
-
-(defun rng-add-info-dir (dir)
-  (cond ((and (boundp 'Info-directory-list) Info-directory-list)
-	 (unless (member dir Info-directory-list)
-	   (setq Info-directory-list
-		 (append Info-directory-list (list dir)))
-	   (when (boundp 'Info-dir-contents)
-	     (setq Info-dir-contents nil))
-	   (when (and (boundp 'Info-current-file)
-		      (equal Info-current-file "dir")
-		      (fboundp 'Info-find-node-2)
-		      (get-buffer "*info*"))
-	     (save-excursion
-	       (set-buffer (get-buffer "*info*"))
-	       (Info-find-node-2 t "Top")))))
-	(t
-	 (unless (member dir Info-default-directory-list)
-	   (setq Info-default-directory-list
-		 (append Info-default-directory-list (list dir)))))))
-
-(let* ((dir (file-name-directory load-file-name))
-       (schema-dir (concat dir "schema/")))
-  (unless (member dir load-path)
-    (setq load-path (cons dir load-path)))
-  (setq rng-schema-locating-files-default
-	(list "schemas.xml"
-	      (abbreviate-file-name
-	       (expand-file-name "schemas.xml" schema-dir))))
-  (setq rng-schema-locating-file-schema-file
-	(expand-file-name "locate.rnc" schema-dir))
-  (rng-add-info-dir dir))
-
-;; Users shouldn't edit this.
-;; Instead they should customize `rng-preferred-prefix-alist'.
-
-(setq rng-preferred-prefix-alist-default
-      ;; For XHTML and RELAX NG, prefer no prefix
-      '(("http://www.w3.org/1999/XSL/Transform" . "xsl")
-	("http://www.w3.org/1999/02/22-rdf-syntax-ns#" . "rdf")))
-
-(add-hook 'nxml-mode-hook 'rng-nxml-mode-init)
-(add-hook 'nxml-mode-hook 'nxml-enable-unicode-char-name-sets)
-
-(setq rng-schema-loader-alist '(("rnc" . rng-c-load-schema)))
-
-;; This is needed for compatibility with versions before 21.4.
-;; We need mode-line-process to be risky because otherwise we can't
-;; :eval in its value.
-(put 'mode-line-process 'risky-local-variable t)
-
-(require 'nxml-enc)
-;; Install our own `set-auto-coding-function'.
-(nxml-start-auto-coding)
-
-
-;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml-glyph.el"
-;;;;;;  (16278 18099))
-;;; Generated autoloads from nxml-glyph.el
-
-(autoload (quote nxml-glyph-display-string) "nxml-glyph" "\
-Return a string that can display a glyph for Unicode code-point N.
-FACE gives the face that will be used for displaying the string.
-Return nil if the face cannot display a glyph for N." nil nil)
-
-;;;***
-
-;;;### (autoloads (nxml-mode) "nxml-mode" "nxml-mode.el" (16702 54517))
-;;; Generated autoloads from nxml-mode.el
-
-(autoload (quote nxml-mode) "nxml-mode" "\
-Major mode for editing XML.
-
-Syntax highlighting is performed unless the variable
-`nxml-syntax-highlight-flag' is nil.
-
-\\[nxml-finish-element] finishes the current element by inserting an end-tag.
-C-c C-i closes a start-tag with `>' and then inserts a balancing end-tag
-leaving point between the start-tag and end-tag. 
-\\[nxml-balanced-close-start-tag-block] is similar but for block rather than inline elements:
-the start-tag, point, and end-tag are all left on separate lines.
-If `nxml-slash-auto-complete-flag' is non-nil, then inserting a `</'
-automatically inserts the rest of the end-tag.
-
-\\[nxml-complete] performs completion on the symbol preceding point.
-
-\\[nxml-dynamic-markup-word] uses the contents of the current buffer
-to choose a tag to put around the word preceding point.
-
-Validation is provided by the related minor-mode `rng-validate-mode'.
-This also makes completion schema- and context- sensitive.  Element
-names, attribute names, attribute values and namespace URIs can all be
-completed. By default, `rng-validate-mode' is automatically enabled by
-`rng-nxml-mode-init' which is normally added to `nxml-mode-hook'. You
-can toggle it using \\[rng-validate-mode].
-
-\\[indent-for-tab-command] indents the current line appropriately.
-This can be customized using the variable `nxml-child-indent'
-and the variable `nxml-attribute-indent'.
-
-\\[nxml-insert-named-char] inserts a character reference using
-the character's name (by default, the Unicode name). \\[universal-argument] \\[nxml-insert-named-char]
-inserts the character directly.
-
-The Emacs commands that normally operate on balanced expressions will
-operate on XML markup items.  Thus \\[forward-sexp] will move forward
-across one markup item; \\[backward-sexp] will move backward across
-one markup item; \\[kill-sexp] will kill the following markup item;
-\\[mark-sexp] will mark the following markup item.  By default, each
-tag each treated as a single markup item; to make the complete element
-be treated as a single markup item, set the variable
-`nxml-sexp-element-flag' to t.  For more details, see the function
-`nxml-forward-balanced-item'.
-
-\\[nxml-backward-up-element] and \\[nxml-down-element] move up and
-down the element structure.
-
-Many aspects this mode can be customized using
-\\[customize-group] nxml RET." t nil)
-
-;;;***
-
-;;;### (autoloads (nxml-enable-unicode-char-name-sets) "nxml-uchnm"
-;;;;;;  "nxml-uchnm.el" (16270 38352))
-;;; Generated autoloads from nxml-uchnm.el
-
-(autoload (quote nxml-enable-unicode-char-name-sets) "nxml-uchnm" "\
-Enable the use of Unicode standard names for characters.
-The Unicode blocks for which names are enabled is controlled by
-the variable `nxml-enabled-unicode-blocks'." t nil)
-
-;;;***
-
-;;;### (autoloads (rng-c-load-schema) "rng-cmpct" "rng-cmpct.el"
-;;;;;;  (16280 36493))
-;;; Generated autoloads from rng-cmpct.el
-
-(autoload (quote rng-c-load-schema) "rng-cmpct" "\
-Load a schema in RELAX NG compact syntax from FILENAME.
-Return a pattern." nil nil)
-
-;;;***
-
-;;;### (autoloads (rng-write-version rng-format-manual rng-byte-compile-load
-;;;;;;  rng-update-autoloads) "rng-maint" "rng-maint.el" (16279 23645))
-;;; Generated autoloads from rng-maint.el
-
-(autoload (quote rng-update-autoloads) "rng-maint" "\
-Update the autoloads in rng-auto.el." t nil)
-
-(autoload (quote rng-byte-compile-load) "rng-maint" "\
-Byte-compile and load all of the RELAX NG library in an appropriate order." t nil)
-
-(autoload (quote rng-format-manual) "rng-maint" "\
-Create manual.texi from manual.xml." t nil)
-
-(autoload (quote rng-write-version) "rng-maint" nil nil nil)
-
-;;;***
-
-;;;### (autoloads (rng-nxml-mode-init) "rng-nxml" "rng-nxml.el" (16294
-;;;;;;  8571))
-;;; Generated autoloads from rng-nxml.el
-
-(autoload (quote rng-nxml-mode-init) "rng-nxml" "\
-Initialize `nxml-mode' to take advantage of `rng-validate-mode'.
-This is typically called from `nxml-mode-hook'.
-Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil." t nil)
-
-;;;***
-
-;;;### (autoloads (rng-validate-mode) "rng-valid" "rng-valid.el"
-;;;;;;  (16664 9855))
-;;; Generated autoloads from rng-valid.el
-
-(autoload (quote rng-validate-mode) "rng-valid" "\
-Minor mode performing continual validation against a RELAX NG schema.
-
-Checks whether the buffer is a well-formed XML 1.0 document,
-conforming to the XML Namespaces Recommendation and valid against a
-RELAX NG schema. The mode-line indicates whether it is or not.  Any
-parts of the buffer that cause it not to be are considered errors and
-are highlighted with `rng-error-face'. A description of each error is
-available as a tooltip.  \\[rng-next-error] goes to the next error
-after point. Clicking mouse-1 on the word `Invalid' in the mode-line
-goes to the first error in the buffer. If the buffer changes, then it
-will be automatically rechecked when Emacs becomes idle; the
-rechecking will be paused whenever there is input pending..
-
-By default, uses a vacuous schema that allows any well-formed XML
-document. A schema can be specified explictly using
-\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
-file name or on the root element name.  In each case the schema must
-be a RELAX NG schema using the compact schema (such schemas
-conventionally have a suffix of `.rnc').  The variable
-`rng-schema-locating-files' specifies files containing rules
-to use for finding the schema." t nil)
-
-;;;***
-
-;;;### (autoloads (rng-xsd-compile) "rng-xsd" "rng-xsd.el" (16216
-;;;;;;  26672))
-;;; Generated autoloads from rng-xsd.el
-
-(put (quote http://www\.w3\.org/2001/XMLSchema-datatypes) (quote rng-dt-compile) (quote rng-xsd-compile))
-
-(autoload (quote rng-xsd-compile) "rng-xsd" "\
-Provides W3C XML Schema as a RELAX NG datatypes library. NAME is a
-symbol giving the local name of the datatype.  PARAMS is a list of
-pairs (PARAM-NAME . PARAM-VALUE) where PARAM-NAME is a symbol giving
-the name of the parameter and PARAM-VALUE is a string giving its
-value.  If NAME or PARAMS are invalid, it calls rng-dt-error passing
-it arguments in the same style as format; the value from rng-dt-error
-will be returned.  Otherwise, it returns a list.  The first member of
-the list is t if any string is a legal value for the datatype and nil
-otherwise.  The second argument is a symbol; this symbol will be
-called as a function passing it a string followed by the remaining
-members of the list.  The function must return an object representing
-the value of the datatype that was represented by the string, or nil
-if the string is not a representation of any value. The object
-returned can be any convenient non-nil value, provided that, if two
-strings represent the same value, the returned objects must be equal." nil nil)
-
-;;;***
-
-;;;### (autoloads (xmltok-get-declared-encoding-position) "xmltok"
-;;;;;;  "xmltok.el" (16664 8418))
-;;; Generated autoloads from xmltok.el
-
-(autoload (quote xmltok-get-declared-encoding-position) "xmltok" "\
-Return the position of the encoding in the XML declaration at point.
-If there is a well-formed XML declaration starting at point and it
-contains an encoding declaration, then return (START . END)
-where START and END are the positions of the start and the end
-of the encoding name; if there is no encoding declaration return
-the position where and encoding declaration could be inserted.
-If there is XML that is not well-formed that looks like an XML declaration,
-return nil.  Otherwise, return t.
-If LIMIT is non-nil, then do not consider characters beyond LIMIT." nil nil)
-
-;;;***
-
-;;; rng-auto.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-cmpct.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-cmpct.el
deleted file mode 100644
index 29699b6012..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-cmpct.el
+++ /dev/null
@@ -1,937 +0,0 @@
-;;; rng-cmpct.el --- parsing of RELAX NG Compact Syntax schemas
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This parses a RELAX NG Compact Syntax schema into the form
-;; specified in rng-pttrn.el.
-;;
-;; RELAX NG Compact Syntax is specified by
-;;    http://relaxng.org/compact.html
-;;
-;; This file uses the prefix "rng-c-".
-
-;;; Code:
-
-(require 'nxml-util)
-(require 'rng-util)
-(require 'rng-uri)
-(require 'rng-pttrn)
-
-;;;###autoload
-(defun rng-c-load-schema (filename)
-  "Load a schema in RELAX NG compact syntax from FILENAME.
-Return a pattern."
-  (rng-c-parse-file filename))
-
-;;; Error handling
-
-(put 'rng-c-incorrect-schema
-     'error-conditions
-     '(error rng-error nxml-file-parse-error rng-c-incorrect-schema))
-
-(put 'rng-c-incorrect-schema
-     'error-message
-     "Incorrect schema")
-
-(defun rng-c-signal-incorrect-schema (filename pos message)
-  (nxml-signal-file-parse-error filename
-				pos
-				message
-				'rng-c-incorrect-schema))
-
-;;; Lexing
-
-(defconst rng-c-keywords
-  '("attribute"
-    "default"
-    "datatypes"
-    "div"
-    "element"
-    "empty"
-    "external"
-    "grammar"
-    "include"
-    "inherit"
-    "list"
-    "mixed"
-    "namespace"
-    "notAllowed"
-    "parent"
-    "start"
-    "string"
-    "text"
-    "token")
-  "List of strings that are keywords in the compact syntax.")
-
-(defconst rng-c-anchored-keyword-re
-  (concat "\\`\\(" (regexp-opt rng-c-keywords) "\\)\\'")
-  "Regular expression to match a keyword in the compact syntax.")
-
-(defvar rng-c-syntax-table nil
-  "Syntax table for parsing the compact syntax.")
-
-(if rng-c-syntax-table
-    ()
-  (setq rng-c-syntax-table (make-syntax-table))
-  (modify-syntax-entry ?# "<" rng-c-syntax-table)
-  (modify-syntax-entry ?\n ">" rng-c-syntax-table)
-  (modify-syntax-entry ?- "w" rng-c-syntax-table)
-  (modify-syntax-entry ?. "w" rng-c-syntax-table)
-  (modify-syntax-entry ?_ "w" rng-c-syntax-table)
-  (modify-syntax-entry ?: "_" rng-c-syntax-table))
-
-(defconst rng-c-literal-1-re
-  "'\\(''\\([^']\\|'[^']\\|''[^']\\)*''\\|[^'\n]*\\)'"
-  "Regular expression to match a single-quoted literal.")
-
-(defconst rng-c-literal-2-re
-  (replace-regexp-in-string "'" "\"" rng-c-literal-1-re)
-  "Regular expression to match a double-quoted literal.")
-
-(defconst rng-c-ncname-re "\\w+")
-
-(defconst rng-c-anchored-ncname-re
-  (concat "\\`" rng-c-ncname-re "\\'"))
-
-(defconst rng-c-token-re
-  (concat "[&|]=" "\\|"
-	  "[][()|&,*+?{}~=-]" "\\|"
-	  rng-c-literal-1-re "\\|"
-	  rng-c-literal-2-re "\\|"
-	  rng-c-ncname-re "\\(:\\(\\*\\|" rng-c-ncname-re "\\)\\)?" "\\|"
-	  "\\\\" rng-c-ncname-re "\\|"
-	  ">>")
-  "Regular expression to match a token in the compact syntax.")
-
-(defun rng-c-init-buffer ()
-  (setq case-fold-search nil) ; automatically becomes buffer-local when set
-  (set-buffer-multibyte t)
-  (set-syntax-table rng-c-syntax-table))
-
-(defvar rng-c-current-token nil)
-(make-variable-buffer-local 'rng-c-current-token)
-
-(defun rng-c-advance ()
-  (cond ((looking-at rng-c-token-re)
-	 (setq rng-c-current-token (match-string 0))
-	 (goto-char (match-end 0))
-	 (forward-comment (point-max)))
-	((= (point) (point-max))
-	 (setq rng-c-current-token ""))
-	(t (rng-c-error "Invalid token"))))
-
-(defconst rng-c-anchored-datatype-name-re
-  (concat "\\`" rng-c-ncname-re ":"  rng-c-ncname-re "\\'"))
-
-(defsubst rng-c-current-token-keyword-p ()
-  (string-match rng-c-anchored-keyword-re rng-c-current-token))
-
-(defsubst rng-c-current-token-prefixed-name-p ()
-  (string-match rng-c-anchored-datatype-name-re rng-c-current-token))
-
-(defsubst rng-c-current-token-literal-p ()
-  (string-match "\\`['\"]" rng-c-current-token))
-
-(defsubst rng-c-current-token-quoted-identifier-p ()
-  (string-match "\\`\\\\" rng-c-current-token))
-
-(defsubst rng-c-current-token-ncname-p ()
-  (string-match rng-c-anchored-ncname-re rng-c-current-token))
-
-(defsubst rng-c-current-token-ns-name-p ()
-  (let ((len (length rng-c-current-token)))
-    (and (> len 0)
-	 (= (aref rng-c-current-token (- len 1)) ?*))))
-
-;;; Namespaces
-
-(defvar rng-c-inherit-namespace nil)
-
-(defvar rng-c-default-namespace nil)
-
-(defvar rng-c-default-namespace-declared nil)
-
-(defvar rng-c-namespace-decls nil
-  "Alist of namespace declarations.")
-
-(defconst rng-c-no-namespace nil)
-
-(defun rng-c-declare-standard-namespaces ()
-  (setq rng-c-namespace-decls
-	(cons (cons "xml" nxml-xml-namespace-uri)
-	      rng-c-namespace-decls))
-  (when (and (not rng-c-default-namespace-declared)
-	     rng-c-inherit-namespace)
-    (setq rng-c-default-namespace rng-c-inherit-namespace)))
-
-(defun rng-c-expand-name (prefixed-name)
-  (let ((i (string-match ":" prefixed-name)))
-    (rng-make-name (rng-c-lookup-prefix (substring prefixed-name
-						   0
-						   i))
-		   (substring prefixed-name (+ i 1)))))
-
-(defun rng-c-lookup-prefix (prefix)
-  (let ((binding (assoc prefix rng-c-namespace-decls)))
-    (or binding (rng-c-error "Undefined prefix %s" prefix))
-    (cdr binding)))
-
-(defun rng-c-unqualified-namespace (attribute)
-  (if attribute
-      rng-c-no-namespace
-    rng-c-default-namespace))
-
-(defun rng-c-make-context ()
-  (cons rng-c-default-namespace rng-c-namespace-decls))
-
-;;; Datatypes
-
-(defconst rng-string-datatype
-  (rng-make-datatype rng-builtin-datatypes-uri "string"))
-
-(defconst rng-token-datatype
-  (rng-make-datatype rng-builtin-datatypes-uri "token"))
-
-(defvar rng-c-datatype-decls nil
-  "Alist of datatype declarations.
-Contains a list of pairs (PREFIX . URI) where PREFIX is a string
-and URI is a symbol.")
-
-(defun rng-c-declare-standard-datatypes ()
-  (setq rng-c-datatype-decls
-	(cons (cons "xsd" rng-xsd-datatypes-uri)
-	      rng-c-datatype-decls)))
-
-(defun rng-c-lookup-datatype-prefix (prefix)
-  (let ((binding (assoc prefix rng-c-datatype-decls)))
-    (or binding (rng-c-error "Undefined prefix %s" prefix))
-    (cdr binding)))
-
-(defun rng-c-expand-datatype (prefixed-name)
-  (let ((i (string-match ":" prefixed-name)))
-    (rng-make-datatype
-     (rng-c-lookup-datatype-prefix (substring prefixed-name 0 i))
-     (substring prefixed-name (+ i 1)))))
-
-;;; Grammars
-
-(defvar rng-c-current-grammar nil)
-(defvar rng-c-parent-grammar nil)
-
-(defun rng-c-make-grammar ()
-  (make-hash-table :test 'equal))
-
-(defconst rng-c-about-override-slot 0)
-(defconst rng-c-about-combine-slot 1)
-
-(defun rng-c-lookup-create (name grammar)
-  "Return a def object for NAME.  A def object is a pair
-\(ABOUT . REF) where REF is returned by `rng-make-ref'.  ABOUT is a
-two-element vector [OVERRIDE COMBINE].  COMBINE is either nil, choice
-or interleave.  OVERRIDE is either nil, require or t."
-  (let ((def (gethash name grammar)))
-    (if def
-	def
-      (progn 
-	(setq def (cons (vector nil nil) (rng-make-ref name)))
-	(puthash name def grammar)
-	def))))
-
-(defun rng-c-make-ref (name)
-  (or rng-c-current-grammar
-      (rng-c-error "Reference not in a grammar"))
-  (cdr (rng-c-lookup-create name rng-c-current-grammar)))
-
-(defun rng-c-make-parent-ref (name)
-  (or rng-c-parent-grammar
-      (rng-c-error "Reference to non-existent parent grammar"))
-  (cdr (rng-c-lookup-create name rng-c-parent-grammar)))
-
-(defvar rng-c-overrides nil
-  "Contains a list of (NAME . DEF) pairs.")
-
-(defun rng-c-merge-combine (def combine name)
-  (let* ((about (car def))
-	 (current-combine (aref about rng-c-about-combine-slot)))
-    (if combine
-	(if current-combine
-	    (or (eq combine current-combine)
-		(rng-c-error "Inconsistent combine for %s" name))
-	  (aset about rng-c-about-combine-slot combine))
-      current-combine)))
-
-(defun rng-c-prepare-define (name combine in-include)
-  (let* ((def (rng-c-lookup-create name rng-c-current-grammar))
-	 (about (car def))
-	 (overridden (aref about rng-c-about-override-slot)))
-    (and in-include
-	 (setq rng-c-overrides (cons (cons name def) rng-c-overrides)))
-    (cond (overridden (and (eq overridden 'require)
-			   (aset about rng-c-about-override-slot t))
-		      nil)
-	  (t (setq combine (rng-c-merge-combine def combine name))
-	     (and (rng-ref-get (cdr def))
-		  (not combine)
-		  (rng-c-error "Duplicate definition of %s" name))
-	     def))))
-
-(defun rng-c-start-include (overrides)
-  (mapcar (lambda (name-def)
-	    (let* ((def (cdr name-def))
-		   (about (car def))
-		   (save (aref about rng-c-about-override-slot)))
-	      (aset about rng-c-about-override-slot 'require)
-	      (cons save name-def)))
-	  overrides))
-
-(defun rng-c-end-include (overrides)
-  (mapcar (lambda (o)
-	    (let* ((saved (car o))
-		   (name-def (cdr o))
-		   (name (car name-def))
-		   (def (cdr name-def))
-		   (about (car def)))
-	      (and (eq (aref about rng-c-about-override-slot) 'require)
-		   (rng-c-error "Definition of %s in include did not override definition in included file" name))
-	      (aset about rng-c-about-override-slot saved)))
-	  overrides))
-
-(defun rng-c-define (def value)
-  (and def
-       (let ((current-value (rng-ref-get (cdr def))))
-	 (rng-ref-set (cdr def)
-		      (if current-value
-			  (if (eq (aref (car def) rng-c-about-combine-slot)
-				  'choice)
-			      (rng-make-choice (list current-value value))
-			    (rng-make-interleave (list current-value value)))
-			value)))))
-
-(defun rng-c-finish-grammar ()
-  (maphash (lambda (key def)
-	     (or (rng-ref-get (cdr def))
-		 (rng-c-error "Reference to undefined pattern %s" key)))
-	   rng-c-current-grammar)
-  (rng-ref-get (cdr (or (gethash 'start rng-c-current-grammar)
-			(rng-c-error "No definition of start")))))
-
-;;; Parsing
-
-(defvar rng-c-escape-positions nil)
-(make-variable-buffer-local 'rng-c-escape-positions)
-
-(defvar rng-c-file-name nil)
-(make-variable-buffer-local 'rng-c-file-name)
-
-(defvar rng-c-file-index nil)
-
-(defun rng-c-parse-file (filename &optional context)
-  (save-excursion
-    (set-buffer (get-buffer-create (rng-c-buffer-name context)))
-    (erase-buffer)
-    (rng-c-init-buffer)
-    (setq rng-c-file-name
-	  (car (insert-file-contents filename)))
-    (setq rng-c-escape-positions nil)
-    (rng-c-process-escapes)
-    (rng-c-parse-top-level context)))
-
-(defun rng-c-buffer-name (context)
-  (concat " *RNC Input"
-	  (if context
-	      (concat "<"
-		      (number-to-string (setq rng-c-file-index
-					      (1+ rng-c-file-index)))
-		      ">*")
-	    (setq rng-c-file-index 1)
-	    "*")))
-
-(defun rng-c-process-escapes ()
-  ;; Check for any nuls, since we will use nul chars
-  ;; for internal purposes.
-  (let ((pos (search-forward "\C-@" nil t)))
-    (and pos
-	 (rng-c-error "Nul character found (binary file?)")))
-  (let ((offset 0))
-    (while (re-search-forward "\\\\x+{\\([0-9a-fA-F]+\\)}"
-			      (point-max)
-			      t)
-      (let* ((ch (decode-char 'ucs (string-to-number (match-string 1) 16))))
-	(if (and ch (> ch 0))
-	    (let ((begin (match-beginning 0))
-		  (end (match-end 0)))
-	      (delete-region begin end)
-	      ;; Represent an escaped newline by nul, so
-	      ;; that we can distinguish it from a literal newline.
-	      ;; We will translate it back into a real newline later.
-	      (insert (if (eq ch ?\n) 0 ch))
-	      (setq offset (+ offset (- end begin 1)))
-	      (setq rng-c-escape-positions
-		    (cons (cons (point) offset)
-			  rng-c-escape-positions)))
-	  (rng-c-error "Invalid character escape")))))
-  (goto-char 1))
-
-(defun rng-c-translate-position (pos)
-  (let ((tem rng-c-escape-positions))
-    (while (and tem
-		(> (caar tem) pos))
-      (setq tem (cdr tem)))
-    (if tem
-	(+ pos (cdar tem))
-      pos)))
-
-(defun rng-c-error (&rest args)
-  (rng-c-signal-incorrect-schema rng-c-file-name
-				 (rng-c-translate-position (point))
-				 (apply 'format args)))
-
-(defun rng-c-parse-top-level (context)
-  (let ((rng-c-namespace-decls nil)
-	(rng-c-default-namespace nil)
-	(rng-c-datatype-decls nil))
-    (goto-char (point-min))
-    (forward-comment (point-max))
-    (rng-c-advance)
-    (rng-c-parse-decls)
-    (let ((p (if (eq context 'include)
-		 (if (rng-c-implicit-grammar-p)
-		     (rng-c-parse-grammar-body "")
-		   (rng-c-parse-included-grammar))
-	       (if (rng-c-implicit-grammar-p)
-		   (rng-c-parse-implicit-grammar)
-		 (rng-c-parse-pattern)))))
-      (or (string-equal rng-c-current-token "")
-	  (rng-c-error "Unexpected characters after pattern"))
-      p)))
-
-(defun rng-c-parse-included-grammar ()
-  (or (string-equal rng-c-current-token "grammar")
-      (rng-c-error "Included schema is not a grammar"))
-  (rng-c-advance)
-  (rng-c-expect "{")
-  (rng-c-parse-grammar-body "}"))
-
-(defun rng-c-implicit-grammar-p ()
-  (or (and (or (rng-c-current-token-prefixed-name-p)
-	       (rng-c-current-token-quoted-identifier-p)
-	       (and (rng-c-current-token-ncname-p)
-		    (not (rng-c-current-token-keyword-p))))
-	   (looking-at "\\["))
-      (and (string-equal rng-c-current-token "[")
-	   (rng-c-parse-lead-annotation)
-	   nil)
-      (member rng-c-current-token '("div" "include" ""))
-      (looking-at "[|&]?=")))
-
-(defun rng-c-parse-decls ()
-  (setq rng-c-default-namespace-declared nil)
-  (while (progn
-	   (let ((binding
-		  (assoc rng-c-current-token
-			 '(("namespace" . rng-c-parse-namespace)
-			   ("datatypes" . rng-c-parse-datatypes)
-			   ("default" . rng-c-parse-default)))))
-	     (if binding
-		 (progn
-		   (rng-c-advance)
-		   (funcall (cdr binding))
-		   t)
-	       nil))))
-  (rng-c-declare-standard-datatypes)
-  (rng-c-declare-standard-namespaces))
-
-(defun rng-c-parse-datatypes ()
-  (let ((prefix (rng-c-parse-identifier-or-keyword)))
-    (or (not (assoc prefix rng-c-datatype-decls))
-	(rng-c-error "Duplicate datatypes declaration for prefix %s" prefix))
-    (rng-c-expect "=")
-    (setq rng-c-datatype-decls
-	  (cons (cons prefix
-		      (rng-make-datatypes-uri (rng-c-parse-literal)))
-		rng-c-datatype-decls))))
-    
-(defun rng-c-parse-namespace ()
-  (rng-c-declare-namespace nil
-			   (rng-c-parse-identifier-or-keyword)))
-
-(defun rng-c-parse-default ()
-  (rng-c-expect "namespace")
-  (rng-c-declare-namespace t 
-			   (if (string-equal rng-c-current-token "=")
-			       nil
-			     (rng-c-parse-identifier-or-keyword))))
-
-(defun rng-c-declare-namespace (declare-default prefix)
-  (rng-c-expect "=")
-  (let ((ns (cond ((string-equal rng-c-current-token "inherit")
-		   (rng-c-advance)
-		   rng-c-inherit-namespace)
-		  (t
-		   (nxml-make-namespace (rng-c-parse-literal))))))
-    (and prefix
-	 (or (not (assoc prefix rng-c-namespace-decls))
-	     (rng-c-error "Duplicate namespace declaration for prefix %s"
-			  prefix))
-	 (setq rng-c-namespace-decls
-	       (cons (cons prefix ns) rng-c-namespace-decls)))
-    (and declare-default
-	 (or (not rng-c-default-namespace-declared)
-	     (rng-c-error "Duplicate default namespace declaration"))
-	 (setq rng-c-default-namespace-declared t)
-	 (setq rng-c-default-namespace ns))))
-
-(defun rng-c-parse-implicit-grammar ()
-  (let* ((rng-c-parent-grammar rng-c-current-grammar)
-	 (rng-c-current-grammar (rng-c-make-grammar)))
-    (rng-c-parse-grammar-body "")
-    (rng-c-finish-grammar)))
-
-(defun rng-c-parse-grammar-body (close-token &optional in-include)
-  (while (not (string-equal rng-c-current-token close-token))
-    (cond ((rng-c-current-token-keyword-p)
-	   (let ((kw (intern rng-c-current-token)))
-	     (cond ((eq kw 'start)
-		    (rng-c-parse-define 'start in-include))
-		   ((eq kw 'div)
-		    (rng-c-advance)
-		    (rng-c-parse-div in-include))
-		   ((eq kw 'include)
-		    (and in-include
-			 (rng-c-error "Nested include"))
-		    (rng-c-advance)
-		    (rng-c-parse-include))
-		   (t (rng-c-error "Invalid grammar keyword")))))
-	  ((rng-c-current-token-ncname-p)
-	   (if (looking-at "\\[")
-	       (rng-c-parse-annotation-element)
-	     (rng-c-parse-define rng-c-current-token
-				 in-include)))
-	  ((rng-c-current-token-quoted-identifier-p)
-	   (if (looking-at "\\[")
-	       (rng-c-parse-annotation-element)
-	     (rng-c-parse-define (substring rng-c-current-token 1)
-				 in-include)))
-	  ((rng-c-current-token-prefixed-name-p)
-	   (rng-c-parse-annotation-element))
-	  ((string-equal rng-c-current-token "[")
-	   (rng-c-parse-lead-annotation)
-	   (and (string-equal rng-c-current-token close-token)
-		(rng-c-error "Missing annotation subject"))
-	   (and (looking-at "\\[")
-		(rng-c-error "Leading annotation applied to annotation")))
-	  (t (rng-c-error "Invalid grammar content"))))
-  (or (string-equal rng-c-current-token "")
-      (rng-c-advance)))
-
-(defun rng-c-parse-div (in-include)
-  (rng-c-expect "{")
-  (rng-c-parse-grammar-body "}" in-include))
-
-(defun rng-c-parse-include ()
-  (let* ((filename (rng-c-expand-file (rng-c-parse-literal)))
-	 (rng-c-inherit-namespace (rng-c-parse-opt-inherit))
-	 overrides)
-    (cond ((string-equal rng-c-current-token "{")
-	   (rng-c-advance)
-	   (let ((rng-c-overrides nil))
-	     (rng-c-parse-grammar-body "}" t)
-	     (setq overrides rng-c-overrides))
-	   (setq overrides (rng-c-start-include overrides))
-	   (rng-c-parse-file filename 'include)
-	   (rng-c-end-include overrides))
-	  (t (rng-c-parse-file filename 'include)))))
-
-(defun rng-c-parse-define (name in-include)
-  (rng-c-advance)
-  (let ((assign (assoc rng-c-current-token
-		       '(("=" . nil)
-			 ("|=" . choice)
-			 ("&=" . interleave)))))
-    (or assign
-	(rng-c-error "Expected assignment operator"))
-    (rng-c-advance)
-    (let ((ref (rng-c-prepare-define name (cdr assign) in-include)))
-      (rng-c-define ref (rng-c-parse-pattern)))))
-
-(defvar rng-c-had-except nil)
-
-(defun rng-c-parse-pattern ()
-  (let* ((rng-c-had-except nil)
-	 (p (rng-c-parse-repeated))
-	 (op (assoc rng-c-current-token
-		    '(("|" . rng-make-choice)
-		      ("," . rng-make-group)
-		      ("&" . rng-make-interleave)))))
-    (if op
-	(if rng-c-had-except
-	    (rng-c-error "Parentheses required around pattern using -")
-	  (let* ((patterns (cons p nil))
-		 (tail patterns)
-		 (connector rng-c-current-token))
-	    (while (progn
-		     (rng-c-advance)
-		     (let ((newcdr (cons (rng-c-parse-repeated) nil)))
-		       (setcdr tail newcdr)
-		       (setq tail newcdr))
-		     (string-equal rng-c-current-token connector)))
-	    (funcall (cdr op) patterns)))
-      p)))
-
-(defun rng-c-parse-repeated ()
-  (let ((p (rng-c-parse-follow-annotations
-	    (rng-c-parse-primary)))
-	(op (assoc rng-c-current-token
-		   '(("*" . rng-make-zero-or-more)
-		     ("+" . rng-make-one-or-more)
-		     ("?" . rng-make-optional)))))
-    (if op
-	(if rng-c-had-except
-	    (rng-c-error "Parentheses required around pattern using -")
-	  (rng-c-parse-follow-annotations
-	   (progn
-	     (rng-c-advance)
-	     (funcall (cdr op) p))))
-      p)))
-
-(defun rng-c-parse-primary ()
-  "Parse a primary expression.  The current token must be the first
-token of the expression.  After parsing the current token should be
-token following the primary expression."
-  (cond ((rng-c-current-token-keyword-p)
-	 (let ((parse-function (get (intern rng-c-current-token)
-				    'rng-c-pattern)))
-	   (or parse-function
-	       (rng-c-error "Keyword %s does not introduce a pattern"
-			    rng-c-current-token))
-	   (rng-c-advance)
-	   (funcall parse-function)))
-	((rng-c-current-token-ncname-p)
-	 (rng-c-advance-with (rng-c-make-ref rng-c-current-token)))
-	((string-equal rng-c-current-token "(")
- 	 (rng-c-advance)
-	 (let ((p (rng-c-parse-pattern)))
-	   (rng-c-expect ")")
-	   p))
-	((rng-c-current-token-prefixed-name-p)
-	 (let ((name (rng-c-expand-datatype rng-c-current-token)))
-	   (rng-c-advance)
-	   (rng-c-parse-data name)))
-	((rng-c-current-token-literal-p)
-	 (rng-make-value rng-token-datatype (rng-c-parse-literal) nil))
-	((rng-c-current-token-quoted-identifier-p)
-	 (rng-c-advance-with
-	  (rng-c-make-ref (substring rng-c-current-token 1))))
-	((string-equal rng-c-current-token "[")
-	 (rng-c-parse-lead-annotation)
-	 (rng-c-parse-primary))
-	(t (rng-c-error "Invalid pattern"))))
-
-(defun rng-c-parse-parent ()
-  (and (rng-c-current-token-keyword-p)
-       (rng-c-error "Keyword following parent was not quoted"
-		    rng-c-current-token))
-  (rng-c-make-parent-ref (rng-c-parse-identifier-or-keyword)))
-
-(defun rng-c-parse-literal ()
-  (rng-c-fix-escaped-newlines
-   (apply 'concat (rng-c-parse-literal-segments))))
-
-(defun rng-c-parse-literal-segments ()
-  (let ((str (rng-c-parse-literal-segment)))
-    (cons str
-	  (cond ((string-equal rng-c-current-token "~")
-		 (rng-c-advance)
-		 (rng-c-parse-literal-segments))
-		(t nil)))))
-
-(defun rng-c-parse-literal-segment ()
-  (or (rng-c-current-token-literal-p)
-      (rng-c-error "Expected a literal"))
-  (rng-c-advance-with
-   (let ((n (if (and (>= (length rng-c-current-token) 6)
-		     (eq (aref rng-c-current-token 0)
-			 (aref rng-c-current-token 1)))
-		3
-	      1)))
-     (substring rng-c-current-token n (- n)))))
-
-(defun rng-c-fix-escaped-newlines (str)
-  (let ((pos 0))
-    (while (progn
-	     (let ((n (string-match "\C-@" str pos)))
-	       (and n
-		    (aset str n ?\n)
-		    (setq pos (1+ n)))))))
-  str)
-
-(defun rng-c-parse-identifier-or-keyword ()
-  (cond ((rng-c-current-token-ncname-p)
-	 (rng-c-advance-with rng-c-current-token))
-	((rng-c-current-token-quoted-identifier-p)
-	 (rng-c-advance-with (substring rng-c-current-token 1)))
-	(t (rng-c-error "Expected identifier or keyword"))))
-   
-(put 'string 'rng-c-pattern 'rng-c-parse-string)
-(put 'token 'rng-c-pattern 'rng-c-parse-token)
-(put 'element 'rng-c-pattern 'rng-c-parse-element)
-(put 'attribute 'rng-c-pattern 'rng-c-parse-attribute)
-(put 'list 'rng-c-pattern 'rng-c-parse-list)
-(put 'mixed 'rng-c-pattern 'rng-c-parse-mixed)
-(put 'text 'rng-c-pattern 'rng-c-parse-text)
-(put 'empty 'rng-c-pattern 'rng-c-parse-empty)
-(put 'notAllowed 'rng-c-pattern 'rng-c-parse-not-allowed)
-(put 'grammar 'rng-c-pattern 'rng-c-parse-grammar)
-(put 'parent 'rng-c-pattern 'rng-c-parse-parent)
-(put 'external 'rng-c-pattern 'rng-c-parse-external)
-
-(defun rng-c-parse-element ()
-  (let ((name-class (rng-c-parse-name-class nil)))
-    (rng-c-expect "{")
-    (let ((pattern (rng-c-parse-pattern)))
-      (rng-c-expect "}")
-      (rng-make-element name-class pattern))))
-
-(defun rng-c-parse-attribute ()
-  (let ((name-class (rng-c-parse-name-class 'attribute)))
-    (rng-c-expect "{")
-    (let ((pattern (rng-c-parse-pattern)))
-      (rng-c-expect "}")
-      (rng-make-attribute name-class pattern))))
-
-(defun rng-c-parse-name-class (attribute)
-  (let* ((rng-c-had-except nil)
-	 (name-class
-	  (rng-c-parse-follow-annotations
-	   (rng-c-parse-primary-name-class attribute))))
-    (if (string-equal rng-c-current-token "|")
-	(let* ((name-classes (cons name-class nil))
-	       (tail name-classes))
-	  (or (not rng-c-had-except)
-	      (rng-c-error "Parentheses required around name-class using - operator"))
-	  (while (progn
-		   (rng-c-advance)
-		   (let ((newcdr
-			  (cons (rng-c-parse-follow-annotations
-				 (rng-c-parse-primary-name-class attribute))
-				nil)))
-		     (setcdr tail newcdr)
-		     (setq tail newcdr))
-		   (string-equal rng-c-current-token "|")))
-	  (rng-make-choice-name-class name-classes))
-      name-class)))
-	  
-(defun rng-c-parse-primary-name-class (attribute)
-  (cond ((rng-c-current-token-ncname-p)
-	 (rng-c-advance-with
-	  (rng-make-name-name-class
-	   (rng-make-name (rng-c-unqualified-namespace attribute)
-			  rng-c-current-token))))
-	((rng-c-current-token-prefixed-name-p)
-	 (rng-c-advance-with
-	  (rng-make-name-name-class
-	   (rng-c-expand-name rng-c-current-token))))
-	((string-equal rng-c-current-token "*")
-	 (let ((except (rng-c-parse-opt-except-name-class attribute)))
-	   (if except
-	       (rng-make-any-name-except-name-class except)
-	     (rng-make-any-name-name-class))))
-	((rng-c-current-token-ns-name-p)
-	 (let* ((ns
-		 (rng-c-lookup-prefix (substring rng-c-current-token
-						 0
-						 -2)))
-		(except (rng-c-parse-opt-except-name-class attribute)))
-	   (if except
-	       (rng-make-ns-name-except-name-class ns except)
-	     (rng-make-ns-name-name-class ns))))
-	((string-equal rng-c-current-token "(")
-	 (rng-c-advance)
-	 (let ((name-class (rng-c-parse-name-class attribute)))
-	   (rng-c-expect ")")
-	   name-class))
-	((rng-c-current-token-quoted-identifier-p)
-	 (rng-c-advance-with
-	  (rng-make-name-name-class
-	   (rng-make-name (rng-c-unqualified-namespace attribute)
-			  (substring rng-c-current-token 1)))))
-	((string-equal rng-c-current-token "[")
-	 (rng-c-parse-lead-annotation)
-	 (rng-c-parse-primary-name-class attribute))
-	(t (rng-c-error "Bad name class"))))
-
-(defun rng-c-parse-opt-except-name-class (attribute)
-  (rng-c-advance)
-  (and (string-equal rng-c-current-token "-")
-       (or (not rng-c-had-except)
-	   (rng-c-error "Parentheses required around name-class using - operator"))
-       (setq rng-c-had-except t)
-       (progn
-	 (rng-c-advance)
-	 (rng-c-parse-primary-name-class attribute))))
-
-(defun rng-c-parse-mixed ()
-  (rng-c-expect "{")
-  (let ((pattern (rng-make-mixed (rng-c-parse-pattern))))
-    (rng-c-expect "}")
-    pattern))
-
-(defun rng-c-parse-list ()
-  (rng-c-expect "{")
-  (let ((pattern (rng-make-list (rng-c-parse-pattern))))
-    (rng-c-expect "}")
-    pattern))
-
-(defun rng-c-parse-text ()
-  (rng-make-text))
-
-(defun rng-c-parse-empty ()
-  (rng-make-empty))
-
-(defun rng-c-parse-not-allowed ()
-  (rng-make-not-allowed))
-
-(defun rng-c-parse-string ()
-  (rng-c-parse-data rng-string-datatype))
-
-(defun rng-c-parse-token ()
-  (rng-c-parse-data rng-token-datatype))
-
-(defun rng-c-parse-data (name)
-  (if (rng-c-current-token-literal-p)
-      (rng-make-value name
-		      (rng-c-parse-literal)
-		      (and (car name)
-			   (rng-c-make-context)))
-    (let ((params (rng-c-parse-optional-params)))
-      (if (string-equal rng-c-current-token "-")
-	  (progn
-	    (if rng-c-had-except
-		(rng-c-error "Parentheses required around pattern using -")
-	      (setq rng-c-had-except t))
-	    (rng-c-advance)
-	    (rng-make-data-except name
-				  params
-				  (rng-c-parse-primary)))
-	(rng-make-data name params)))))
-
-(defun rng-c-parse-optional-params ()
-  (and (string-equal rng-c-current-token "{")
-       (let* ((head (cons nil nil))
-	      (tail head))
-	 (rng-c-advance)
-	 (while (not (string-equal rng-c-current-token "}"))
-	   (and (string-equal rng-c-current-token "[")
-		(rng-c-parse-lead-annotation))
-	   (let ((name (rng-c-parse-identifier-or-keyword)))
-	     (rng-c-expect "=")
-	     (let ((newcdr (cons (cons (intern name)
-				       (rng-c-parse-literal))
-				 nil)))
-	       (setcdr tail newcdr)
-	       (setq tail newcdr))))
-	 (rng-c-advance)
-	 (cdr head))))
-
-(defun rng-c-parse-external ()
-  (let* ((filename (rng-c-expand-file (rng-c-parse-literal)))
-	 (rng-c-inherit-namespace (rng-c-parse-opt-inherit)))
-    (rng-c-parse-file filename 'external)))
-
-(defun rng-c-expand-file (uri)
-  (condition-case err
-      (rng-uri-file-name (rng-uri-resolve uri
-					  (rng-file-name-uri rng-c-file-name)))
-    (rng-uri-error
-     (rng-c-error (cadr err)))))
-
-(defun rng-c-parse-opt-inherit ()
-  (cond ((string-equal rng-c-current-token "inherit")
-	 (rng-c-advance)
-	 (rng-c-expect "=")
-	 (rng-c-lookup-prefix (rng-c-parse-identifier-or-keyword)))
-	(t rng-c-default-namespace)))
-
-(defun rng-c-parse-grammar ()
-  (rng-c-expect "{")
-  (let* ((rng-c-parent-grammar rng-c-current-grammar)
-	 (rng-c-current-grammar (rng-c-make-grammar)))
-    (rng-c-parse-grammar-body "}")
-    (rng-c-finish-grammar)))
-
-(defun rng-c-parse-lead-annotation ()
-  (rng-c-parse-annotation-body)
-  (and (string-equal rng-c-current-token "[")
-       (rng-c-error "Multiple leading annotations")))
-
-(defun rng-c-parse-follow-annotations (obj)
-  (while (string-equal rng-c-current-token ">>")
-    (rng-c-advance)
-    (if (rng-c-current-token-prefixed-name-p)
-	(rng-c-advance)
-      (rng-c-parse-identifier-or-keyword))
-    (rng-c-parse-annotation-body t))
-  obj)
-
-(defun rng-c-parse-annotation-element ()
-  (rng-c-advance)
-  (rng-c-parse-annotation-body t))
-
-;; XXX need stricter checking of attribute names
-;; XXX don't allow attributes after text
-
-(defun rng-c-parse-annotation-body (&optional allow-text)
-  "Current token is [.  Parse up to matching ]. Current token after
-parse is token following ]."
-  (or (string-equal rng-c-current-token "[")
-      (rng-c-error "Expected ["))
-  (rng-c-advance)
-  (while (not (string-equal rng-c-current-token "]"))
-    (cond ((rng-c-current-token-literal-p)
-	   (or allow-text
-	       (rng-c-error "Out of place text within annotation"))
-	   (rng-c-parse-literal))
-	  (t
-	   (if (rng-c-current-token-prefixed-name-p)
-	       (rng-c-advance)
-	     (rng-c-parse-identifier-or-keyword))
-	   (cond ((string-equal rng-c-current-token "[")
-		  (rng-c-parse-annotation-body t))
-		 ((string-equal rng-c-current-token "=")
-		  (rng-c-advance)
-		  (rng-c-parse-literal))
-		 (t (rng-c-error "Expected = or ["))))))
-  (rng-c-advance))
-	     
-(defun rng-c-advance-with (pattern)
-  (rng-c-advance)
-  pattern)
-
-(defun rng-c-expect (str)
-  (or (string-equal rng-c-current-token str)
-      (rng-c-error "Expected `%s' but got `%s'" str rng-c-current-token))
-  (rng-c-advance))
-
-(provide 'rng-cmpct)
-
-;;; rng-cmpct.el
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-dt.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-dt.el
deleted file mode 100644
index ba0689130c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-dt.el
+++ /dev/null
@@ -1,64 +0,0 @@
-;;; rng-dt.el --- datatype library interface for RELAX NG
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'rng-util)
-
-(defvar rng-dt-error-reporter nil)
-
-(defun rng-dt-error (string &rest objs)
-  (if rng-dt-error-reporter
-      (apply rng-dt-error-reporter (cons string objs))
-    nil))
-
-(defvar rng-dt-namespace-context-getter nil
-  "A list used by datatype libraries to expand names.  The car of the
-list is a symbol which is the name of a function.  This function is
-applied to the cdr of the list.  The function must return a list whose
-car is the default namespace and whose cdr is an alist of (PREFIX
-. NAMESPACE) pairs, where PREFIX is a string and NAMESPACE is a
-symbol.  This must be dynamically bound before calling a datatype
-library.")
-
-(defsubst rng-dt-make-value (dt str)
-  (apply (car dt) (cons str (cdr dt))))
-
-(defun rng-dt-builtin-compile (name params)
-  (cond ((eq name 'string)
-	 (if (null params)
-	     '(t identity)
-	   (rng-dt-error "The string datatype does not take any parameters")))
-	((eq name 'token)
-	 (if (null params)
-	     '(t rng-collapse-space)
-	   (rng-dt-error "The token datatype does not take any parameters")))
-	(t
-	 (rng-dt-error "There is no built-in datatype %s" name))))
-
-(put (rng-make-datatypes-uri "") 'rng-dt-compile 'rng-dt-builtin-compile)
-
-(provide 'rng-dt)
-
-;;; rng-dt.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-loc.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-loc.el
deleted file mode 100644
index b81bfe009f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-loc.el
+++ /dev/null
@@ -1,548 +0,0 @@
-;;; rng-loc.el --- locate the schema to use for validation
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'nxml-util)
-(require 'nxml-parse)
-(require 'rng-parse)
-(require 'rng-uri)
-(require 'rng-util)
-(require 'xmltok)
-
-(defvar rng-current-schema-file-name nil
-  "Filename of schema being used for current buffer.
-Nil if using a vacuous schema.")
-(make-variable-buffer-local 'rng-current-schema-file-name)
-
-(defvar rng-schema-locating-files-default nil
-  "Default value for variable `rng-schema-locating-files'.")
-
-(defvar rng-schema-locating-file-schema-file nil
-  "File containing schema for schema locating files.")
-
-(defvar rng-schema-locating-file-schema nil
-  "Schema for schema locating files or nil if not yet loaded.")
-
-(defcustom rng-schema-locating-files rng-schema-locating-files-default
-  "*List of schema locating files."
-  :type '(repeat file)
-  :group 'relax-ng)
-
-(defvar rng-schema-loader-alist nil
-  "Alist of schema extensions vs schema loader functions.")
-
-(defvar rng-cached-document-element nil)
-
-(defvar rng-document-type-history nil)
-
-(defun rng-set-document-type (type-id)
-  (interactive (list (rng-read-type-id)))
-  (condition-case err
-      (when (not (string= type-id ""))
-	(let ((schema-file (rng-locate-schema-file type-id)))
-	  (unless schema-file
-	    (error "Could not locate schema for type id `%s'" type-id))
-	  (rng-set-schema-file-1 schema-file))
-	(rng-save-schema-location-1 t type-id)
-	(rng-what-schema))
-    (nxml-file-parse-error
-     (nxml-display-file-parse-error err))))
-
-(defun rng-read-type-id ()
-  (condition-case err
-      (let ((type-ids (rng-possible-type-ids))
-	    (completion-ignore-case nil))
-	(completing-read "Document type id: "
-			 (mapcar (lambda (x) (cons x nil))
-				 type-ids)
-			 nil
-			 t
-			 nil
-			 'rng-document-type-history))
-    (nxml-file-parse-error
-     (nxml-display-file-parse-error err))))
-
-(defun rng-set-schema-file (filename)
-  "Set the schema for the current buffer to the schema in FILENAME.
-FILENAME must be the name of a file containing a schema.
-The extension of FILENAME is used to determine what kind of schema it
-is.  The variable `rng-schema-loader-alist' maps from schema
-extensions to schema loader functions. The function
-`rng-c-load-schema' is the loader for RELAX NG compact syntax.  The
-association is between the buffer and the schema: the association is
-lost when the buffer is killed."
-  (interactive "fSchema file: ")
-  (condition-case err
-      (progn
-	(rng-set-schema-file-1 filename)
-	(rng-save-schema-location-1 t))
-    (nxml-file-parse-error
-     (nxml-display-file-parse-error err))))
-
-(defun rng-set-vacuous-schema ()
-  "Set the schema for the current buffer to allow any well-formed XML."
-  (interactive)
-  (rng-set-schema-file-1 nil)
-  (rng-what-schema))
-
-(defun rng-set-schema-file-1 (filename)
-  (setq filename (and filename (expand-file-name filename)))
-  (setq rng-current-schema
-	(if filename
-	    (rng-load-schema filename)
-	  rng-any-element))
-  (setq rng-current-schema-file-name filename)
-  (run-hooks 'rng-schema-change-hook))
-  
-(defun rng-load-schema (filename)
-  (let* ((extension (file-name-extension filename))
-	 (loader (cdr (assoc extension rng-schema-loader-alist))))
-    (or loader
-	(if extension
-	    (error "No schema loader available for file extension `%s'"
-		   extension)
-	  (error "No schema loader available for null file extension")))
-    (funcall loader filename)))
-
-(defun rng-what-schema ()
-  "Display a message saying what schema `rng-validate-mode' is using."
-  (interactive)
-  (if rng-current-schema-file-name
-      (message "Using schema %s" 
-	       (abbreviate-file-name rng-current-schema-file-name))
-    (message "Using vacuous schema")))
-
-(defun rng-auto-set-schema (&optional no-display-error)
-  "Set the schema for this buffer based on the buffer's contents and file-name."
-  (interactive)
-  (condition-case err
-      (progn
-	(rng-set-schema-file-1 (rng-locate-schema-file))
-	(rng-what-schema))
-    (nxml-file-parse-error
-     (if no-display-error
-	 (error "%s at position %s in %s"
-		(nth 3 err)
-		(nth 2 err)
-		(abbreviate-file-name (nth 1 err)))
-       (nxml-display-file-parse-error err)))))
-
-(defun rng-locate-schema-file (&optional type-id)
-  "Return the file-name of the schema to use for the current buffer.
-Return nil if no schema could be located.
-If TYPE-ID is non-nil, then locate the schema for this TYPE-ID."
-  (let* ((rng-cached-document-element nil)
-	 (schema
-	  (if type-id
-	      (cons type-id nil)
-	    (rng-locate-schema-file-using rng-schema-locating-files)))
-	 files type-ids)
-    (while (consp schema)
-      (setq files rng-schema-locating-files)
-      (setq type-id (car schema))
-      (setq schema nil)
-      (when (member type-id type-ids)
-	(error "Type-id loop for type-id `%s'" type-id))
-      (setq type-ids (cons type-id type-ids))
-      (while (and files (not schema))
-	(setq schema
-	      (rng-locate-schema-file-from-type-id type-id
-						   (car files)))
-	(setq files (cdr files))))
-    (and schema
-	 (rng-uri-file-name schema))))
-
-(defun rng-possible-type-ids ()
-  "Return a list of the known type IDs."
-  (let ((files rng-schema-locating-files)
-	type-ids)
-    (while files
-      (setq type-ids (rng-possible-type-ids-using (car files) type-ids))
-      (setq files (cdr files)))
-    (rng-uniquify-equal (sort type-ids 'string<))))
-
-(defun rng-locate-schema-file-using (files)
-  "Locate a schema using the schema locating files FILES.
-FILES is a list of file-names.
-Return either a URI, a list (TYPE-ID) where TYPE-ID is a string
-or nil."
-  (let (rules
-	;; List of types that override normal order-based
-	;; priority, most important first
-	preferred-types
-	;; Best result found so far; same form as return value.
-	best-so-far)
-    (while (and (progn
-		  (while (and (not rules) files)
-		    (setq rules (rng-get-parsed-schema-locating-file
-				 (car files)))
-		    (setq files (cdr files)))
-		  rules)
-		(or (not best-so-far) preferred-types))
-      (let* ((rule (car rules))
-	     (rule-type (car rule))
-	     (rule-matcher (get rule-type 'rng-rule-matcher)))
-	(setq rules (cdr rules))
-	(cond (rule-matcher
-	       (when (and (or (not best-so-far)
-			      (memq rule-type preferred-types)))
-			  (setq best-so-far
-				(funcall rule-matcher (cdr rule)))
-			  preferred-types)
-		 (setq preferred-types
-		       (nbutlast preferred-types
-				 (length (memq rule-type preferred-types)))))
-	      ((eq rule-type 'applyFollowingRules)
-	       (when (not best-so-far)
-		 (let ((prefer (cdr (assq 'ruleType (cdr rule)))))
-		   (when (and prefer
-			      (not (memq (setq prefer (intern prefer))
-					 preferred-types)))
-		     (setq preferred-types
-			   (nconc preferred-types (list prefer)))))))
-	      ((eq rule-type 'include)
-	       (let ((uri (cdr (assq 'rules (cdr rule)))))
-		 (when uri
-		   (setq rules
-			 (append (rng-get-parsed-schema-locating-file
-				  (rng-uri-file-name uri))
-				 rules))))))))
-    best-so-far))
-
-(put 'documentElement 'rng-rule-matcher 'rng-match-document-element-rule)
-(put 'namespace 'rng-rule-matcher 'rng-match-namespace-rule)
-(put 'uri 'rng-rule-matcher 'rng-match-uri-rule)
-(put 'transformURI 'rng-rule-matcher 'rng-match-transform-uri-rule)
-(put 'default 'rng-rule-matcher 'rng-match-default-rule)
-
-(defun rng-match-document-element-rule (props)
-  (let ((document-element (rng-document-element))
-	(prefix (cdr (assq 'prefix props)))
-	(local-name (cdr (assq 'localName props))))
-    (and (or (not prefix)
-	     (if (= (length prefix) 0)
-		 (not (nth 1 document-element))
-	       (string= prefix (nth 1 document-element))))
-	 (or (not local-name)
-	     (string= local-name
-		      (nth 2 document-element)))
-	 (rng-match-default-rule props))))
-
-(defun rng-match-namespace-rule (props)
-  (let ((document-element (rng-document-element))
-	(ns (cdr (assq 'ns props))))
-    (and document-element
-	 ns
-	 (eq (nth 0 document-element)
-	     (if (string= ns "")
-		 nil
-	       (nxml-make-namespace ns)))
-	 (rng-match-default-rule props))))
-
-(defun rng-document-element ()
-  "Return a list (NS PREFIX LOCAL-NAME).
-NS is t if the document has a non-nil, but not otherwise known namespace."
-  (or rng-cached-document-element
-      (setq rng-cached-document-element
-	    (save-excursion
-	      (save-restriction
-		(widen)
-		(goto-char (point-min))
-		(let (xmltok-dtd)
-		  (xmltok-save
-		   (xmltok-forward-prolog)
-		   (xmltok-forward)
-		   (when (memq xmltok-type '(start-tag
-					     partial-start-tag
-					     empty-element
-					     partial-empty-element))
-		     (list (rng-get-start-tag-namespace)
-			   (xmltok-start-tag-prefix)
-			   (xmltok-start-tag-local-name))))))))))
-
-(defun rng-get-start-tag-namespace ()
-  (let ((prefix (xmltok-start-tag-prefix))
-	namespace att value)
-    (while xmltok-namespace-attributes
-      (setq att (car xmltok-namespace-attributes))
-      (setq xmltok-namespace-attributes (cdr xmltok-namespace-attributes))
-      (when (if prefix
-		(and (xmltok-attribute-prefix att)
-		     (string= (xmltok-attribute-local-name att)
-			      prefix))
-	      (not (xmltok-attribute-prefix att)))
-	(setq value (xmltok-attribute-value att))
-	(setq namespace (if value (nxml-make-namespace value) t))))
-    (if (and prefix (not namespace))
-	t
-      namespace)))
-
-(defun rng-match-transform-uri-rule (props)
-  (let ((from-pattern (cdr (assq 'fromPattern props)))
-	(to-pattern (cdr (assq 'toPattern props)))
-	(file-name (buffer-file-name)))
-    (and file-name
-	 (setq file-name (expand-file-name file-name))
-	 (rng-file-name-matches-uri-pattern-p file-name from-pattern)
-	 (condition-case ()
-	     (let ((new-file-name
-		    (replace-match
-		     (save-match-data
-		       (rng-uri-pattern-file-name-replace-match to-pattern))
-		     t
-		     nil
-		     file-name)))
-	       (and (file-name-absolute-p new-file-name)
-		    (file-exists-p new-file-name)
-		    (rng-file-name-uri new-file-name)))
-	     (rng-uri-error nil)))))
-
-(defun rng-match-uri-rule (props)
-  (let ((resource (cdr (assq 'resource props)))
-	(pattern (cdr (assq 'pattern props)))
-	(file-name (buffer-file-name)))
-    (and file-name
-	 (setq file-name (expand-file-name file-name))
-	 (cond (resource
-		(condition-case ()
-		    (eq (compare-strings (rng-uri-file-name resource)
-					 0
-					 nil
-					 (expand-file-name file-name)
-					 0
-					 nil
-					 nxml-file-name-ignore-case)
-			t)
-		  (rng-uri-error nil)))
-	       (pattern
-		(rng-file-name-matches-uri-pattern-p file-name
-						     pattern)))
-	 (rng-match-default-rule props))))
-
-(defun rng-file-name-matches-uri-pattern-p (file-name pattern)
-  (condition-case ()
-      (and (let ((case-fold-search nxml-file-name-ignore-case))
-	     (string-match (rng-uri-pattern-file-name-regexp pattern)
-			   file-name))
-	   t)
-    (rng-uri-error nil)))
-
-(defun rng-match-default-rule (props)
-  (or (cdr (assq 'uri props))
-      (let ((type-id (cdr (assq 'typeId props))))
-	(and type-id
-	     (cons (rng-collapse-space type-id) nil)))))
-
-(defun rng-possible-type-ids-using (file type-ids)
-  (let ((rules (rng-get-parsed-schema-locating-file file))
-	rule)
-    (while rules
-      (setq rule (car rules))
-      (setq rules (cdr rules))
-      (cond ((eq (car rule) 'typeId)
-	     (let ((id (cdr (assq 'id (cdr rule)))))
-	       (when id
-		 (setq type-ids
-		       (cons (rng-collapse-space id)
-			     type-ids)))))
-	    ((eq (car rule) 'include)
-	     (let ((uri (cdr (assq 'rules (cdr rule)))))
-	       (when uri
-		 (setq type-ids
-		       (rng-possible-type-ids-using
-			(rng-get-parsed-schema-locating-file
-			 (rng-uri-file-name uri))
-			type-ids)))))))
-    type-ids))
-
-(defun rng-locate-schema-file-from-type-id (type-id file)
-  "Locate the schema for type id TYPE-ID using schema locating file FILE.
-Return either a URI, a list (TYPE-ID) where TYPE-ID is a string
-or nil."
-  (let ((rules (rng-get-parsed-schema-locating-file file))
-	schema rule)
-    (while (and rules (not schema))
-      (setq rule (car rules))
-      (setq rules (cdr rules))
-      (cond ((and (eq (car rule) 'typeId)
-		  (let ((id (assq 'id (cdr rule))))
-		    (and id
-			 (string= (rng-collapse-space (cdr id)) type-id))))
-	     (setq schema (rng-match-default-rule (cdr rule))))
-	    ((eq (car rule) 'include)
-	     (let ((uri (cdr (assq 'rules (cdr rule)))))
-	       (when uri
-		 (setq schema
-		       (rng-locate-schema-file-from-type-id
-			type-id
-			(rng-uri-file-name uri))))))))
-    schema))
-
-(defvar rng-schema-locating-file-alist nil)
-
-(defun rng-get-parsed-schema-locating-file (file)
-  "Return a list of rules for the schema locating file FILE."
-  (setq file (expand-file-name file))
-  (let ((cached (assoc file rng-schema-locating-file-alist))
-	(mtime (nth 5 (file-attributes file)))
-	parsed)
-    (cond ((not mtime)
-	   (when cached
-	     (setq rng-schema-locating-file-alist
-		   (delq cached rng-schema-locating-file-alist)))
-	   nil)
-	  ((and cached (equal (nth 1 cached) mtime))
-	   (nth 2 cached))
-	  (t
-	   (setq parsed (rng-parse-schema-locating-file file))
-	   (if cached
-	       (setcdr cached (list mtime parsed))
-	     (setq rng-schema-locating-file-alist
-		   (cons (list file mtime parsed)
-			 rng-schema-locating-file-alist)))
-	   parsed))))
-  
-(defconst rng-locate-namespace-uri
-  (nxml-make-namespace "http://thaiopensource.com/ns/locating-rules/1.0"))
-
-(defun rng-parse-schema-locating-file (file)
-  "Return list of rules.
-Each rule has the form (TYPE (ATTR . VAL) ...), where
-TYPE is a symbol for the element name, ATTR is a symbol for the attribute
-and VAL is a string for the value.
-Attribute values representing URIs are made absolute and xml:base
-attributes are removed."
-  (when (and (not rng-schema-locating-file-schema)
-	     rng-schema-locating-file-schema-file)
-    (setq rng-schema-locating-file-schema
-	  (rng-load-schema rng-schema-locating-file-schema-file)))
-  (let* ((element
-	  (if rng-schema-locating-file-schema
-	      (rng-parse-validate-file rng-schema-locating-file-schema
-				       file)
-	    (nxml-parse-file file)))
-	 (children (cddr element))
-	 (base-uri (rng-file-name-uri file))
-	 child name rules atts att props prop-name prop-value)
-    (when (equal (car element)
-		 (cons rng-locate-namespace-uri "locatingRules"))
-      (while children
-	(setq child (car children))
-	(setq children (cdr children))
-	(when (consp child)
-	  (setq name (car child))
-	  (when (eq (car name) rng-locate-namespace-uri)
-	    (setq atts (cadr child))
-	    (setq props nil)
-	    (while atts
-	      (setq att (car atts))
-	      (when (stringp (car att))
-		(setq prop-name (intern (car att)))
-		(setq prop-value (cdr att))
-		(when (memq prop-name '(uri rules resource))
-		  (setq prop-value
-			(rng-uri-resolve prop-value base-uri)))
-		(setq props (cons (cons prop-name prop-value)
-				  props)))
-	      (setq atts (cdr atts)))
-	    (setq rules
-		  (cons (cons (intern (cdr name)) (nreverse props))
-			rules))))))
-    (nreverse rules)))
-
-(defun rng-save-schema-location ()
-  "Save the association between the buffer's file and the current schema.
-This ensures that the schema that is currently being used will be used
-if the file is edited in a future session.  The association will be
-saved to the first writable file in `rng-schema-locating-files'."
-  (interactive)
-  (rng-save-schema-location-1 nil))
-
-(defun rng-save-schema-location-1 (prompt &optional type-id)
-  (unless (or rng-current-schema-file-name type-id)
-    (error "Buffer is using a vacuous schema"))
-  (let ((files rng-schema-locating-files)
-	(document-file-name (buffer-file-name))
-	(schema-file-name rng-current-schema-file-name)
-	file)
-    (while (and files (not file))
-      (if (file-writable-p (car files))
-	  (setq file (expand-file-name (car files)))
-	(setq files (cdr files))))
-    (cond ((not file)
-	   (if prompt
-	       nil
-	     (error "No writable schema locating file configured")))
-	  ((not document-file-name)
-	   (if prompt
-	       nil
-	     (error "Buffer does not have a filename")))
-	  ((and prompt
-		(not (y-or-n-p (format "Save %s to %s "
-				       (if type-id
-					   "type identifier"
-					 "schema location")
-				       file)))))
-	  (t
-	   (save-excursion
-	     (set-buffer (find-file-noselect file))
-	     (let ((modified (buffer-modified-p)))
-	       (if (> (buffer-size) 0)
-		   (let (xmltok-dtd)
-		     (goto-char (point-min))
-		     (xmltok-save
-		       (xmltok-forward-prolog)
-		       (xmltok-forward)
-		       (unless (eq xmltok-type 'start-tag)
-			 (error "Locating file `%s' invalid" file))))
-		 (insert "<?xml version=\"1.0\"?>\n"
-			 "<locatingRules xmlns=\""
-			 (nxml-namespace-name rng-locate-namespace-uri)
-			 "\">")
-		 (let ((pos (point)))
-		   (insert "\n</locatingRules>\n")
-		   (goto-char pos)))
-	       (insert "\n")
-	       (insert (let ((locating-file-uri (rng-file-name-uri file)))
-			 (format "<uri resource=\"%s\" %s=\"%s\"/>"
-				 (rng-escape-string
-				  (rng-relative-uri
-				   (rng-file-name-uri document-file-name)
-				   locating-file-uri))
-				 (if type-id "typeId" "uri")
-				 (rng-escape-string
-				  (or type-id
-				      (rng-relative-uri
-				       (rng-file-name-uri schema-file-name)
-				       locating-file-uri))))))
-	       (indent-according-to-mode)
-	       (when (or (not modified)
-			 (y-or-n-p (format "Save file %s "
-					   (buffer-file-name))))
-		 (save-buffer))))))))
-
-(provide 'rng-loc)
-
-;;; rng-loc.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-maint.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-maint.el
deleted file mode 100644
index ecf1ff1bc9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-maint.el
+++ /dev/null
@@ -1,343 +0,0 @@
-;;; rng-maint.el --- commands for RELAX NG maintainers
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'xmltok)
-(require 'nxml-mode)
-(require 'texnfo-upd)
-
-(defvar rng-dir (file-name-directory load-file-name))
-
-(defconst rng-autoload-modules
-  '(xmltok
-    nxml-mode
-    nxml-uchnm
-    nxml-glyph
-    rng-cmpct
-    rng-maint
-    rng-valid
-    rng-xsd
-    rng-nxml))
-
-;;;###autoload
-(defun rng-update-autoloads ()
-  "Update the autoloads in rng-auto.el."
-  (interactive)
-  (let* ((generated-autoload-file (expand-file-name "rng-auto.el"
-						    rng-dir)))
-    (mapcar (lambda (x)
-	      (update-file-autoloads
-	       (expand-file-name (concat (symbol-name x) ".el") rng-dir)))
-	    rng-autoload-modules)))
-
-
-(defconst rng-compile-modules
-  '(xmltok
-    nxml-util
-    nxml-enc
-    nxml-glyph
-    nxml-rap
-    nxml-outln
-    nxml-mode
-    nxml-uchnm
-    nxml-ns
-    nxml-parse
-    nxml-maint
-    xsd-regexp
-    rng-util
-    rng-dt
-    rng-xsd
-    rng-uri
-    rng-pttrn
-    rng-cmpct
-    rng-match
-    rng-parse
-    rng-loc
-    rng-valid
-    rng-nxml
-    rng-maint))
-
-;;;###autoload
-(defun rng-byte-compile-load ()
-  "Byte-compile and load all of the RELAX NG library in an appropriate order."
-  (interactive)
-  (mapcar (lambda (x)
-	    (byte-compile-file (expand-file-name (concat (symbol-name x) ".el")
-						 rng-dir)
-			       t))
-	  rng-compile-modules))
-
-
-;;; Conversion from XML to texinfo.
-;; This is all a hack and is just enough to make the conversion work.
-;; It's not intended for public use.
-
-(defvar rng-manual-base "nxml-mode")
-(defvar rng-manual-xml (concat rng-manual-base ".xml"))
-(defvar rng-manual-texi (concat rng-manual-base ".texi"))
-(defvar rng-manual-info (concat rng-manual-base ".info"))
-
-;;;###autoload
-(defun rng-format-manual ()
-  "Create manual.texi from manual.xml."
-  (interactive)
-  (let ((xml-buf (find-file-noselect (expand-file-name rng-manual-xml
-						       rng-dir)))
-	(texi-buf (find-file-noselect (expand-file-name rng-manual-texi
-							rng-dir))))
-    (save-excursion
-      (set-buffer texi-buf)
-      (erase-buffer)
-      (let ((standard-output texi-buf))
-	(princ (format "\\input texinfo @c -*- texinfo -*-\n\
-@c %%**start of header\n\
-@setfilename %s\n\
-@settitle \n\
-@c %%**end of header\n" rng-manual-info))
-	(set-buffer xml-buf)
-	(goto-char (point-min))
-	(xmltok-save
-	  (xmltok-forward-prolog)
-	  (rng-process-tokens))
-	(princ "\n@bye\n"))
-      (set-buffer texi-buf)
-      (rng-manual-fixup)
-      (texinfo-insert-node-lines (point-min) (point-max) t)
-      (texinfo-all-menus-update)
-      (save-buffer))))
-
-(defun rng-manual-fixup ()
-  (goto-char (point-min))
-  (search-forward "@top ")
-  (let ((pos (point)))
-    (search-forward "\n")
-    (let ((title (buffer-substring-no-properties pos (1- (point)))))
-      (goto-char (point-min))
-      (search-forward "@settitle ")
-      (insert title)
-      (search-forward "@node")
-      (goto-char (match-beginning 0))
-      (insert "@dircategory Emacs\n"
-	      "@direntry\n* "
-	      title
-	      ": ("
-	      rng-manual-info
-	      ").\n@end direntry\n\n"))))
-
-(defvar rng-manual-inline-elements '(kbd key samp code var emph uref point))
-
-(defun rng-process-tokens ()
-  (let ((section-depth 0)
-	;; stack of per-element space treatment
-	;; t means keep, nil means discard, fill means no blank lines
-	(keep-space-stack (list nil))
-	(ignore-following-newline nil)
-	(want-blank-line nil)
-	name startp endp data keep-space-for-children)
-    (while (xmltok-forward)
-      (cond ((memq xmltok-type '(start-tag empty-element end-tag))
-	     (setq startp (memq xmltok-type '(start-tag empty-element)))
-	     (setq endp (memq xmltok-type '(end-tag empty-element)))
-	     (setq name (intern (if startp
-				    (xmltok-start-tag-qname)
-				  (xmltok-end-tag-qname))))
-	     (setq keep-space-for-children nil)
-	     (setq ignore-following-newline nil)
-	     (cond ((memq name rng-manual-inline-elements)
-		    (when startp
-		      (when want-blank-line
-			(rng-manual-output-force-blank-line)
-			(when (eq want-blank-line 'noindent)
-			  (princ "@noindent\n"))
-			(setq want-blank-line nil))
-		      (setq keep-space-for-children t)
-		      (princ (format "@%s{" name)))
-		    (when endp (princ "}")))
-		   ((eq name 'ulist)
-		    (when startp
-		      (rng-manual-output-force-blank-line)
-		      (setq want-blank-line nil)
-		      (princ "@itemize @bullet\n"))
-		    (when endp
-		      (rng-manual-output-force-new-line)
-		      (setq want-blank-line 'noindent)
-		      (princ "@end itemize\n")))
-		   ((eq name 'item)
-		    (rng-manual-output-force-new-line)
-		    (setq want-blank-line endp)
-		    (when startp (princ "@item\n")))
-		   ((memq name '(example display))
-		    (when startp
-		      (setq ignore-following-newline t)
-		      (rng-manual-output-force-blank-line)
-		      (setq want-blank-line nil)
-		      (setq keep-space-for-children t)
-		      (princ (format "@%s\n" name)))
-		    (when endp
-		      (rng-manual-output-force-new-line)
-		      (setq want-blank-line 'noindent)
-		      (princ (format "@end %s\n" name))))
-		   ((eq name 'para)
-		    (rng-manual-output-force-new-line)
-		    (when startp
-		      (when want-blank-line
-			(setq want-blank-line t))
-		      (setq keep-space-for-children 'fill))
-		    (when endp (setq want-blank-line t)))
-		   ((eq name 'section)
-		    (when startp
-		      (rng-manual-output-force-blank-line)
-		      (when (eq section-depth 0)
-			(princ "@node Top\n"))
-		      (princ "@")
-		      (princ (nth section-depth '(top
-						  chapter
-						  section
-						  subsection
-						  subsubsection)))
-		      (princ " ")
-		      (setq want-blank-line nil)
-		      (setq section-depth (1+ section-depth)))
-		    (when endp
-		      (rng-manual-output-force-new-line)
-		      (setq want-blank-line nil)
-		      (setq section-depth (1- section-depth))))
-		   ((eq name 'title)
-		    (when startp
-		      (setq keep-space-for-children 'fill))
-		    (when endp
-		      (setq want-blank-line t)
-		      (princ "\n"))))
-	     (when startp
-	       (setq keep-space-stack (cons keep-space-for-children
-					    keep-space-stack)))
-	     (when endp
-	       (setq keep-space-stack (cdr keep-space-stack))))
-	    ((memq xmltok-type '(data
-				 space
-				 char-ref
-				 entity-ref
-				 cdata-section))
-	     (setq data nil)
-	     (cond ((memq xmltok-type '(data space))
-		    (setq data (buffer-substring-no-properties xmltok-start
-							       (point))))
-		   ((and (memq xmltok-type '(char-ref entity-ref))
-			 xmltok-replacement)
-		    (setq data xmltok-replacement))
-		   ((eq xmltok-type 'cdata-section)
-		    (setq data
-			  (buffer-substring-no-properties (+ xmltok-start 9)
-							  (- (point) 3)))))
-	     (when (and data (car keep-space-stack))
-	       (setq data (replace-regexp-in-string "[@{}]"
-						    "@\\&"
-						    data
-						    t))
-	       (when ignore-following-newline
-		 (setq data (replace-regexp-in-string "\\`\n" "" data t)))
-	       (setq ignore-following-newline nil)
-;;	       (when (eq (car keep-space-stack) 'fill)
-;;		 (setq data (replace-regexp-in-string "\n" " " data t)))
-	       (when (eq want-blank-line 'noindent)
-		 (setq data (replace-regexp-in-string "\\`\n*" "" data t)))
-	       (when (> (length data) 0)
-		 (when want-blank-line
-		   (rng-manual-output-force-blank-line)
-		   (when (eq want-blank-line 'noindent)
-		     (princ "@noindent\n"))
-		   (setq want-blank-line nil))
-		 (princ data))))
-	     ))))
-
-(defun rng-manual-output-force-new-line ()
-  (save-excursion
-    (set-buffer standard-output)
-    (unless (eq (char-before) ?\n)
-      (insert ?\n))))
-
-(defun rng-manual-output-force-blank-line ()
-  (save-excursion
-    (set-buffer standard-output)
-    (if (eq (char-before) ?\n)
-	(unless (eq (char-before (1- (point))) ?\n)
-	  (insert ?\n))
-      (insert "\n\n"))))
-
-;;; Versioning
-
-;;;###autoload
-(defun rng-write-version ()
-  (find-file "VERSION")
-  (erase-buffer)
-  (insert nxml-version "\n")
-  (save-buffer))
-
-;;; Timing
-
-(defun rng-time-to-float (time)
-  (+ (* (nth 0 time) 65536.0)
-     (nth 1 time)
-     (/ (nth 2 time) 1000000.0)))
-
-(defun rng-time-function (function &rest args)
-  (let* ((start (current-time))
-	 (val (apply function args))
-	 (end (current-time)))
-    (message "%s ran in %g seconds"
-	     function
-	     (- (rng-time-to-float end)
-		(rng-time-to-float start)))
-    val))
-
-(defun rng-time-tokenize-buffer ()
-  (interactive)
-  (rng-time-function 'rng-tokenize-buffer))
-
-(defun rng-tokenize-buffer ()
-  (save-excursion
-    (goto-char (point-min))
-    (xmltok-save
-      (xmltok-forward-prolog)
-      (while (xmltok-forward)))))
-
-(defun rng-time-validate-buffer ()
-  (interactive)
-  (rng-time-function 'rng-validate-buffer))
-
-(defun rng-validate-buffer ()
-  (save-restriction
-    (widen)
-    (nxml-with-unmodifying-text-property-changes
-      (rng-clear-cached-state (point-min) (point-max)))
-    ;; 1+ to clear empty overlays at (point-max)
-    (rng-clear-overlays (point-min) (1+ (point-max))))
-  (setq rng-validate-up-to-date-end 1)
-  (rng-clear-conditional-region)
-  (setq rng-error-count 0)
-  (while (rng-do-some-validation
-	  (lambda () t))))
-
-;;; rng-maint.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-match.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-match.el
deleted file mode 100644
index d369261554..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-match.el
+++ /dev/null
@@ -1,1739 +0,0 @@
-;;; rng-match.el --- matching of RELAX NG patterns against XML events
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This uses the algorithm described in
-;;   http://www.thaiopensource.com/relaxng/derivative.html
-;;
-;; The schema to be used is contained in the variable
-;; rng-current-schema.  It has the form described in the file
-;; rng-pttrn.el.
-;;
-;;; Code:
-
-(require 'rng-pttrn)
-(require 'rng-util)
-(require 'rng-dt)
-
-(defvar rng-not-allowed-ipattern nil)
-(defvar rng-empty-ipattern nil)
-(defvar rng-text-ipattern nil)
-
-(defvar rng-compile-table nil)
-
-(defvar rng-being-compiled nil
-  "Contains a list of ref patterns currently being compiled.
-Used to detect illegal recursive references.")
-
-(defvar rng-ipattern-table nil)
-
-(defvar rng-last-ipattern-index nil)
-
-(defvar rng-match-state nil
-  "An ipattern representing the current state of validation.")
-
-;;; Inline functions
-
-(defsubst rng-update-match-state (new-state)
-  (if (and (eq new-state rng-not-allowed-ipattern)
-	   (not (eq rng-match-state rng-not-allowed-ipattern)))
-      nil
-    (setq rng-match-state new-state)
-    t))
-
-;;; Interned patterns
-
-(eval-when-compile
-  (defun rng-ipattern-slot-accessor-name (slot-name)
-    (intern (concat "rng-ipattern-get-"
-		    (symbol-name slot-name))))
-  
-  (defun rng-ipattern-slot-setter-name (slot-name)
-    (intern (concat "rng-ipattern-set-"
-		    (symbol-name slot-name)))))
-
-(defmacro rng-ipattern-defslot (slot-name index)
-  `(progn
-     (defsubst ,(rng-ipattern-slot-accessor-name slot-name) (ipattern)
-       (aref ipattern ,index))
-     (defsubst ,(rng-ipattern-slot-setter-name slot-name) (ipattern value)
-       (aset ipattern ,index value))))
-
-(rng-ipattern-defslot type 0)
-(rng-ipattern-defslot index 1)
-(rng-ipattern-defslot name-class 2)
-(rng-ipattern-defslot datatype 2)
-(rng-ipattern-defslot after 2)
-(rng-ipattern-defslot child 3)
-(rng-ipattern-defslot value-object 3)
-(rng-ipattern-defslot nullable 4)
-(rng-ipattern-defslot memo-text-typed 5)
-(rng-ipattern-defslot memo-map-start-tag-open-deriv 6)
-(rng-ipattern-defslot memo-map-start-attribute-deriv 7)
-(rng-ipattern-defslot memo-start-tag-close-deriv 8)
-(rng-ipattern-defslot memo-text-only-deriv 9)
-(rng-ipattern-defslot memo-mixed-text-deriv 10)
-(rng-ipattern-defslot memo-map-data-deriv 11)
-(rng-ipattern-defslot memo-end-tag-deriv 12)
-
-(defconst rng-memo-map-alist-max 10)
-
-(defsubst rng-memo-map-get (key mm)
-  "Return the value associated with KEY in memo-map MM."
-  (let ((found (assoc key mm)))
-    (if found
-	(cdr found)
-      (and mm
-	   (let ((head (car mm)))
-	     (and (hash-table-p head)
-		  (gethash key head)))))))
-
-(defun rng-memo-map-add (key value mm &optional weakness)
-  "Associate KEY with VALUE in memo-map MM and return the new memo-map.
-The new memo-map may or may not be a different object from MM.
-
-Alists are better for small maps. Hash tables are better for large
-maps.  A memo-map therefore starts off as an alist and switches to a
-hash table for large memo-maps. A memo-map is always a list.  An empty
-memo-map is represented by nil. A large memo-map is represented by a
-list containing just a hash-table.  A small memo map is represented by
-a list whose cdr is an alist and whose car is the number of entries in
-the alist. The complete memo-map can be passed to assoc without
-problems: assoc ignores any members that are not cons cells.  There is
-therefore minimal overhead in successful lookups on small lists
-\(which is the most common case)."
-  (if (null mm)
-      (list 1 (cons key value))
-    (let ((head (car mm)))
-      (cond ((hash-table-p head)
-	     (puthash key value head)
-	     mm)
-	    ((>= head rng-memo-map-alist-max)
-	     (let ((ht (make-hash-table :test 'equal
-					:weakness weakness
-					:size (* 2 rng-memo-map-alist-max))))
-	       (setq mm (cdr mm))
-	       (while mm
-		 (setq head (car mm))
-		 (puthash (car head) (cdr head) ht)
-		 (setq mm (cdr mm)))
-	       (cons ht nil)))
-	    (t (cons (1+ head)
-		     (cons (cons key value)
-			   (cdr mm))))))))
-	     
-(defsubst rng-make-ipattern (type index name-class child nullable)
-  (vector type index name-class child nullable
-	  ;; 5 memo-text-typed
-	  'unknown
-	  ;; 6 memo-map-start-tag-open-deriv
-	  nil
-	  ;; 7 memo-map-start-attribute-deriv
-	  nil
-	  ;; 8 memo-start-tag-close-deriv
-	  nil
-	  ;; 9 memo-text-only-deriv
-	  nil
-	  ;; 10 memo-mixed-text-deriv
-	  nil
-	  ;; 11 memo-map-data-deriv
-	  nil
-	  ;; 12 memo-end-tag-deriv
-	  nil))
-
-(defun rng-ipattern-maybe-init ()
-  (unless rng-ipattern-table
-    (setq rng-ipattern-table (make-hash-table :test 'equal))
-    (setq rng-last-ipattern-index -1)))
-
-(defun rng-ipattern-clear ()
-  (when rng-ipattern-table
-    (clrhash rng-ipattern-table))
-  (setq rng-last-ipattern-index -1))
-
-(defsubst rng-gen-ipattern-index ()
-  (setq rng-last-ipattern-index (1+ rng-last-ipattern-index)))
-
-(defun rng-put-ipattern (key type name-class child nullable)
-  (let ((ipattern
-	 (rng-make-ipattern type
-			    (rng-gen-ipattern-index)
-			    name-class
-			    child
-			    nullable)))
-    (puthash key ipattern rng-ipattern-table)
-    ipattern))
-
-(defun rng-get-ipattern (key)
-  (gethash key rng-ipattern-table))
-
-(or rng-not-allowed-ipattern
-    (setq rng-not-allowed-ipattern
-	  (rng-make-ipattern 'not-allowed -3 nil nil nil)))
-
-(or rng-empty-ipattern
-    (setq rng-empty-ipattern
-	  (rng-make-ipattern 'empty -2 nil nil t)))
-
-(or rng-text-ipattern
-    (setq rng-text-ipattern
-	  (rng-make-ipattern 'text -1 nil nil t)))
-
-(defconst rng-const-ipatterns
-  (list rng-not-allowed-ipattern
-	rng-empty-ipattern
-	rng-text-ipattern))
-
-(defun rng-intern-after (child after)
-  (if (eq child rng-not-allowed-ipattern)
-      rng-not-allowed-ipattern
-    (let ((key (list 'after
-		     (rng-ipattern-get-index child)
-		     (rng-ipattern-get-index after))))
-      (or (rng-get-ipattern key)
-	  (rng-put-ipattern key
-			    'after
-			    after
-			    child
-			    nil)))))
-  
-(defun rng-intern-attribute (name-class ipattern)
-  (if (eq ipattern rng-not-allowed-ipattern)
-      rng-not-allowed-ipattern
-    (let ((key (list 'attribute
-		     name-class
-		     (rng-ipattern-get-index ipattern))))
-      (or (rng-get-ipattern key)
-	  (rng-put-ipattern key
-			    'attribute
-			    name-class
-			    ipattern
-			    nil)))))
-
-(defun rng-intern-data (dt matches-anything)
-  (let ((key (list 'data dt)))
-    (or (rng-get-ipattern key)
-	(let ((ipattern (rng-put-ipattern key
-					  'data
-					  dt
-					  nil
-					  matches-anything)))
-	  (rng-ipattern-set-memo-text-typed ipattern
-					    (not matches-anything))
-	  ipattern))))
-
-(defun rng-intern-data-except (dt ipattern)
-  (let ((key (list 'data-except dt ipattern)))
-    (or (rng-get-ipattern key)
-	(rng-put-ipattern key
-			  'data-except
-			  dt
-			  ipattern
-			  nil))))
-
-(defun rng-intern-value (dt obj)
-  (let ((key (list 'value dt obj)))
-    (or (rng-get-ipattern key)
-	(rng-put-ipattern key
-			  'value
-			  dt
-			  obj
-			  nil))))
-
-(defun rng-intern-one-or-more (ipattern)
-  (or (rng-intern-one-or-more-shortcut ipattern)
-      (let ((key (cons 'one-or-more
-		       (list (rng-ipattern-get-index ipattern)))))
-	(or (rng-get-ipattern key)
-	    (rng-put-ipattern key
-			      'one-or-more
-			      nil
-			      ipattern
-			      (rng-ipattern-get-nullable ipattern))))))
-
-(defun rng-intern-one-or-more-shortcut (ipattern)
-  (cond ((eq ipattern rng-not-allowed-ipattern)
-	 rng-not-allowed-ipattern)
-	((eq ipattern rng-empty-ipattern)
-	 rng-empty-ipattern)
-	((eq (rng-ipattern-get-type ipattern) 'one-or-more)
-	 ipattern)
-	(t nil)))
-
-(defun rng-intern-list (ipattern)
-  (if (eq ipattern rng-not-allowed-ipattern)
-      rng-not-allowed-ipattern
-    (let ((key (cons 'list
-		     (list (rng-ipattern-get-index ipattern)))))
-      (or (rng-get-ipattern key)
-	  (rng-put-ipattern key
-			    'list
-			    nil
-			    ipattern
-			    nil)))))
-
-(defun rng-intern-group (ipatterns)
-  "Return a ipattern for the list of group members in IPATTERNS."
-  (or (rng-intern-group-shortcut ipatterns)
-      (let* ((tem (rng-normalize-group-list ipatterns))
-	     (normalized (cdr tem)))
-	(or (rng-intern-group-shortcut normalized)
-	    (let ((key (cons 'group
-			     (mapcar 'rng-ipattern-get-index normalized))))
-	      (or (rng-get-ipattern key)
-		  (rng-put-ipattern key
-				    'group
-				    nil
-				    normalized
-				    (car tem))))))))
-
-(defun rng-intern-group-shortcut (ipatterns)
-  "Try to shortcut interning a group list.  If successful, return the
-interned pattern.  Otherwise return nil."
-  (while (and ipatterns
-	      (eq (car ipatterns) rng-empty-ipattern))
-    (setq ipatterns (cdr ipatterns)))
-  (if ipatterns
-      (let ((ret (car ipatterns)))
-	(if (eq ret rng-not-allowed-ipattern)
-	    rng-not-allowed-ipattern
-	  (setq ipatterns (cdr ipatterns))
-	  (while (and ipatterns ret)
-	    (let ((tem (car ipatterns)))
-	      (cond ((eq tem rng-not-allowed-ipattern)
-		     (setq ret tem)
-		     (setq ipatterns nil))
-		    ((eq tem rng-empty-ipattern)
-		     (setq ipatterns (cdr ipatterns)))
-		    (t
-		     ;; Stop here rather than continuing
-		     ;; looking for not-allowed patterns.
-		     ;; We do a complete scan elsewhere.
-		     (setq ret nil)))))
-	  ret))
-    rng-empty-ipattern))
-
-(defun rng-normalize-group-list (ipatterns)
-  "Normalize a list containing members of a group.
-Expands nested groups, removes empty members, handles notAllowed.
-Returns a pair whose car says whether the list is nullable and whose
-cdr is the normalized list."
-  (let ((nullable t)
-	(result nil)
-	member)
-    (while ipatterns
-      (setq member (car ipatterns))
-      (setq ipatterns (cdr ipatterns))
-      (when nullable
-	(setq nullable (rng-ipattern-get-nullable member)))
-      (cond ((eq (rng-ipattern-get-type member) 'group)
-	     (setq result
-		   (nconc (reverse (rng-ipattern-get-child member))
-			  result)))
-	    ((eq member rng-not-allowed-ipattern)
-	     (setq result (list rng-not-allowed-ipattern))
-	     (setq ipatterns nil))
-	    ((not (eq member rng-empty-ipattern))
-	     (setq result (cons member result)))))
-    (cons nullable (nreverse result))))
-
-(defun rng-intern-interleave (ipatterns)
-  (or (rng-intern-group-shortcut ipatterns)
-      (let* ((tem (rng-normalize-interleave-list ipatterns))
-	     (normalized (cdr tem)))
-	(or (rng-intern-group-shortcut normalized)
-	    (let ((key (cons 'interleave
-			     (mapcar 'rng-ipattern-get-index normalized))))
-	      (or (rng-get-ipattern key)
-		  (rng-put-ipattern key
-				    'interleave
-				    nil
-				    normalized
-				    (car tem))))))))
-
-(defun rng-normalize-interleave-list (ipatterns)
-  "Normalize a list containing members of an interleave.
-Expands nested groups, removes empty members, handles notAllowed.
-Returns a pair whose car says whether the list is nullable and whose
-cdr is the normalized list."
-  (let ((nullable t)
-	(result nil)
-	member)
-    (while ipatterns
-      (setq member (car ipatterns))
-      (setq ipatterns (cdr ipatterns))
-      (when nullable
-	(setq nullable (rng-ipattern-get-nullable member)))
-      (cond ((eq (rng-ipattern-get-type member) 'interleave)
-	     (setq result
-		   (append (rng-ipattern-get-child member)
-			    result)))
-	    ((eq member rng-not-allowed-ipattern)
-	     (setq result (list rng-not-allowed-ipattern))
-	     (setq ipatterns nil))
-	    ((not (eq member rng-empty-ipattern))
-	     (setq result (cons member result)))))
-    (cons nullable (sort result 'rng-compare-ipattern))))
-
-;; Would be cleaner if this didn't modify IPATTERNS.
-
-(defun rng-intern-choice (ipatterns)
-  "Return a choice ipattern for the list of choices in IPATTERNS.
-May alter IPATTERNS."
-  (or (rng-intern-choice-shortcut ipatterns)
-      (let* ((tem (rng-normalize-choice-list ipatterns))
-	     (normalized (cdr tem)))
-	(or (rng-intern-choice-shortcut normalized)
-	    (rng-intern-choice1 normalized (car tem))))))
-
-(defun rng-intern-optional (ipattern)
-  (cond ((rng-ipattern-get-nullable ipattern) ipattern)
-	((eq ipattern rng-not-allowed-ipattern) rng-empty-ipattern)
-	(t (rng-intern-choice1
-	    ;; This is sorted since the empty pattern
-	    ;; is before everything except not allowed.
-	    ;; It cannot have a duplicate empty pattern,
-	    ;; since it is not nullable.
-	    (cons rng-empty-ipattern
-		  (if (eq (rng-ipattern-get-type ipattern) 'choice)
-		      (rng-ipattern-get-child ipattern)
-		    (list ipattern)))
-	    t))))
-
-
-(defun rng-intern-choice1 (normalized nullable)
-  (let ((key (cons 'choice
-		   (mapcar 'rng-ipattern-get-index normalized))))
-    (or (rng-get-ipattern key)
-	(rng-put-ipattern key
-			  'choice
-			  nil
-			  normalized
-			  nullable))))
-					    
-(defun rng-intern-choice-shortcut (ipatterns)
-  "Try to shortcut interning a choice list.  If successful, return the
-interned pattern.  Otherwise return nil."
-  (while (and ipatterns
-	      (eq (car ipatterns)
-		  rng-not-allowed-ipattern))
-    (setq ipatterns (cdr ipatterns)))
-  (if ipatterns
-      (let ((ret (car ipatterns)))
-	(setq ipatterns (cdr ipatterns))
-	(while (and ipatterns ret)
-	  (or (eq (car ipatterns) rng-not-allowed-ipattern)
-	      (eq (car ipatterns) ret)
-	      (setq ret nil))
-	  (setq ipatterns (cdr ipatterns)))
-	ret)
-    rng-not-allowed-ipattern))
-
-(defun rng-normalize-choice-list (ipatterns)
-  "Normalize a list of choices, expanding nested choices, removing
-not-allowed members, sorting by index and removing duplicates.  Return
-a pair whose car says whether the list is nullable and whose cdr is
-the normalized list."
-  (let ((sorted t)
-	(nullable nil)
-	(head (cons nil ipatterns)))
-    (let ((tail head)
-	  (final-tail nil)
-	  (prev-index -100)
-	  (cur ipatterns)
-	  member)
-      ;; the cdr of tail is always cur
-      (while cur
-	(setq member (car cur))
-	(or nullable
-	    (setq nullable (rng-ipattern-get-nullable member)))
-	(cond ((eq (rng-ipattern-get-type member) 'choice)
-	       (setq final-tail
-		     (append (rng-ipattern-get-child member)
-			     final-tail))
-	       (setq cur (cdr cur))
-	       (setq sorted nil)
-	       (setcdr tail cur))
-	      ((eq member rng-not-allowed-ipattern)
-	       (setq cur (cdr cur))
-	       (setcdr tail cur))
-	      (t
-	       (if (and sorted
-			(let ((cur-index (rng-ipattern-get-index member)))
-			  (if (>= prev-index cur-index)
-			      (or (= prev-index cur-index) ; will remove it
-				  (setq sorted nil)) ; won't remove it
-			    (setq prev-index cur-index)
-			    ;; won't remove it
-			    nil)))
-		   (progn
-		     ;; remove it
-		     (setq cur (cdr cur))
-		     (setcdr tail cur))
-		 ;; don't remove it
-		 (setq tail cur)
-		 (setq cur (cdr cur))))))
-      (setcdr tail final-tail))
-    (setq head (cdr head))
-    (cons nullable
-	  (if sorted
-	      head
-	    (rng-uniquify-eq (sort head 'rng-compare-ipattern))))))
-
-(defun rng-compare-ipattern (p1 p2)
-  (< (rng-ipattern-get-index p1)
-     (rng-ipattern-get-index p2)))
-
-;;; Name classes
-
-(defsubst rng-name-class-contains (nc nm)
-  (if (consp nc)
-      (equal nm nc)
-    (rng-name-class-contains1 nc nm)))
-
-(defun rng-name-class-contains1 (nc nm)
-  (let ((type (aref nc 0)))
-    (cond ((eq type 'any-name) t)
-	  ((eq type 'any-name-except)
-	   (not (rng-name-class-contains (aref nc 1) nm)))
-	  ((eq type 'ns-name)
-	   (eq (car nm) (aref nc 1)))
-	  ((eq type 'ns-name-except)
-	   (and (eq (car nm) (aref nc 1))
-		(not (rng-name-class-contains (aref nc 2) nm))))
-	  ((eq type 'choice)
-	   (let ((choices (aref nc 1))
-		 (ret nil))
-	     (while choices
-	       (if (rng-name-class-contains (car choices) nm)
-		   (progn
-		     (setq choices nil)
-		     (setq ret t))
-		 (setq choices (cdr choices))))
-	     ret)))))
-
-(defun rng-name-class-possible-names (nc accum)
-  "Return a list of possible names that nameclass NC can match.
-
-Each possible name should be returned as a (NAMESPACE . LOCAL-NAME)
-pair, where NAMESPACE is a symbol or nil and LOCAL-NAME is a string.
-nil for NAMESPACE matches the absent namespace.  ACCUM is a list of
-names which should be appended to the returned list. The returned list
-may contain duplicates."
-  (if (consp nc)
-      (cons nc accum)
-    (when (eq (aref nc 0) 'choice)
-      (let ((members (aref nc 1)) member)
-	(while members
-	  (setq member (car members))
-	  (setq accum
-		(if (consp member)
-		    (cons member accum)
-		  (rng-name-class-possible-names member
-						 accum)))
-	  (setq members (cdr members)))))
-    accum))
-
-;;; Debugging utilities
-
-(defun rng-ipattern-to-string (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (concat (rng-ipattern-to-string
-		    (rng-ipattern-get-child ipattern))
-		   " </> "
-		   (rng-ipattern-to-string
-		    (rng-ipattern-get-after ipattern))))
-	  ((eq type 'element)
-	   (concat "element "
-		   (rng-name-class-to-string
-		    (rng-ipattern-get-name-class ipattern))
-		   ;; we can get cycles with elements so don't print it out
-		   " {...}"))
-	  ((eq type 'attribute)
-	   (concat "attribute "
-		   (rng-name-class-to-string
-		    (rng-ipattern-get-name-class ipattern))
-		   " { "
-		   (rng-ipattern-to-string
-		    (rng-ipattern-get-child ipattern))
-		   " } "))
-	  ((eq type 'empty) "empty")
-	  ((eq type 'text) "text")
-	  ((eq type 'not-allowed) "notAllowed")
-	  ((eq type 'one-or-more)
-	   (concat (rng-ipattern-to-string
-		    (rng-ipattern-get-child ipattern))
-		   "+"))
-	  ((eq type 'choice)
-	   (concat "("
-		   (mapconcat 'rng-ipattern-to-string
-			      (rng-ipattern-get-child ipattern)
-			      " | ")
-		   ")"))
-	  ((eq type 'group)
-	   (concat "("
-		   (mapconcat 'rng-ipattern-to-string
-			      (rng-ipattern-get-child ipattern)
-			      ", ")
-		   ")"))
-	  ((eq type 'interleave)
-	   (concat "("
-		   (mapconcat 'rng-ipattern-to-string
-			      (rng-ipattern-get-child ipattern)
-			      " & ")
-		   ")"))
-	  (t (symbol-name type)))))
-
-(defun rng-name-class-to-string (nc)
-  (if (consp nc)
-      (cdr nc)
-    (let ((type (aref nc 0)))
-      (cond ((eq type 'choice)
-	     (mapconcat 'rng-name-class-to-string
-			(aref nc 1)
-			"|"))
-	    (t (concat (symbol-name type) "*"))))))
-
-
-;;; Compiling
-
-(defun rng-compile-maybe-init ()
-  (unless rng-compile-table
-    (setq rng-compile-table (make-hash-table :test 'eq))))
-
-(defun rng-compile-clear ()
-  (when rng-compile-table
-    (clrhash rng-compile-table)))
-
-(defun rng-compile (pattern)
-  (or (gethash pattern rng-compile-table)
-      (let ((ipattern (apply (get (car pattern) 'rng-compile)
-			     (cdr pattern))))
-	(puthash pattern ipattern rng-compile-table)
-	ipattern)))
-
-(put 'empty 'rng-compile 'rng-compile-empty)
-(put 'text 'rng-compile 'rng-compile-text)
-(put 'not-allowed 'rng-compile 'rng-compile-not-allowed)
-(put 'element 'rng-compile 'rng-compile-element)
-(put 'attribute 'rng-compile 'rng-compile-attribute)
-(put 'choice 'rng-compile 'rng-compile-choice)
-(put 'optional 'rng-compile 'rng-compile-optional)
-(put 'group 'rng-compile 'rng-compile-group)
-(put 'interleave 'rng-compile 'rng-compile-interleave)
-(put 'ref 'rng-compile 'rng-compile-ref)
-(put 'one-or-more 'rng-compile 'rng-compile-one-or-more)
-(put 'zero-or-more 'rng-compile 'rng-compile-zero-or-more)
-(put 'mixed 'rng-compile 'rng-compile-mixed)
-(put 'data 'rng-compile 'rng-compile-data)
-(put 'data-except 'rng-compile 'rng-compile-data-except)
-(put 'value 'rng-compile 'rng-compile-value)
-(put 'list 'rng-compile 'rng-compile-list)
-
-(defun rng-compile-not-allowed () rng-not-allowed-ipattern)
-(defun rng-compile-empty () rng-empty-ipattern)
-(defun rng-compile-text () rng-text-ipattern)
-
-(defun rng-compile-element (name-class pattern)
-  ;; don't intern
-  (rng-make-ipattern 'element
-		     (rng-gen-ipattern-index)
-		     (rng-compile-name-class name-class)
-		     pattern		; compile lazily
-		     nil))
-
-(defun rng-element-get-child (element)
-  (let ((tem (rng-ipattern-get-child element)))
-    (if (vectorp tem)
-	tem
-      (rng-ipattern-set-child element (rng-compile tem)))))
-
-(defun rng-compile-attribute (name-class pattern)
-  (rng-intern-attribute (rng-compile-name-class name-class)
-			(rng-compile pattern)))
-
-(defun rng-compile-ref (pattern name)
-  (and (memq pattern rng-being-compiled)
-       (rng-compile-error "Reference loop on symbol %s" name))
-  (setq rng-being-compiled
-	(cons pattern rng-being-compiled))
-  (unwind-protect
-      (rng-compile pattern)
-    (setq rng-being-compiled
-	  (cdr rng-being-compiled))))
-	   
-(defun rng-compile-one-or-more (pattern)
-  (rng-intern-one-or-more (rng-compile pattern)))
-
-(defun rng-compile-zero-or-more (pattern)
-  (rng-intern-optional
-   (rng-intern-one-or-more (rng-compile pattern))))
-
-(defun rng-compile-optional (pattern)
-  (rng-intern-optional (rng-compile pattern)))
-
-(defun rng-compile-mixed (pattern)
-  (rng-intern-interleave (cons rng-text-ipattern
-			       (list (rng-compile pattern)))))
-
-(defun rng-compile-list (pattern)
-  (rng-intern-list (rng-compile pattern)))
-
-(defun rng-compile-choice (&rest patterns)
-  (rng-intern-choice (mapcar 'rng-compile patterns)))
-
-(defun rng-compile-group (&rest patterns)
-  (rng-intern-group (mapcar 'rng-compile patterns)))
-
-(defun rng-compile-interleave (&rest patterns)
-  (rng-intern-interleave (mapcar 'rng-compile patterns)))
-
-(defun rng-compile-dt (name params)
-  (let ((rng-dt-error-reporter 'rng-compile-error))
-    (funcall (let ((uri (car name)))
-	       (or (get uri 'rng-dt-compile)
-		   (rng-compile-error "Unknown datatype library %s" uri)))
-	     (cdr name)
-	     params)))
-
-(defun rng-compile-data (name params)
-  (let ((dt (rng-compile-dt name params)))
-    (rng-intern-data (cdr dt) (car dt))))
-
-(defun rng-compile-data-except (name params pattern)
-  (rng-intern-data-except (cdr (rng-compile-dt name params))
-			  (rng-compile pattern)))
-
-(defun rng-compile-value (name str context)
-  (let* ((dt (cdr (rng-compile-dt name '())))
-	 (rng-dt-namespace-context-getter (list 'identity context))
-	 (obj (rng-dt-make-value dt str)))
-    (if obj
-	(rng-intern-value dt obj)
-      (rng-compile-error "Value %s is not a valid instance of the datatype %s"
-			 str
-			 name))))
-      
-(defun rng-compile-name-class (nc)
-  (let ((type (car nc)))
-    (cond ((eq type 'name) (nth 1 nc))
-	  ((eq type 'any-name) [any-name])
-	  ((eq type 'any-name-except)
-	   (vector 'any-name-except
-		   (rng-compile-name-class (nth 1 nc))))
-	  ((eq type 'ns-name)
-	   (vector 'ns-name (nth 1 nc)))
-	  ((eq type 'ns-name-except)
-	   (vector 'ns-name-except
-		   (nth 1 nc)
-		   (rng-compile-name-class (nth 2 nc))))
-	  ((eq type 'choice)
-	   (vector 'choice
-		   (mapcar 'rng-compile-name-class (cdr nc))))
-	  (t (error "Bad name-class type %s" type)))))
-
-;;; Searching patterns
-
-;; We write this non-recursively to avoid hitting max-lisp-eval-depth
-;; on large schemas.
-
-(defun rng-map-element-attribute (function pattern accum &rest args)
-  (let ((searched (make-hash-table :test 'eq))
-	type todo patterns)
-    (while (progn
-	     (setq type (car pattern))
-	     (cond ((memq type '(element attribute))
-		    (setq accum
-			  (apply function
-				 (cons pattern
-				       (cons accum args))))
-		    (setq pattern (nth 2 pattern)))
-		   ((eq type 'ref)
-		    (setq pattern (nth 1 pattern))
-		    (if (gethash pattern searched)
-			(setq pattern nil)
-		      (puthash pattern t searched)))
-		   ((memq type '(choice group interleave))
-		    (setq todo (cons (cdr pattern) todo))
-		    (setq pattern nil))
-		   ((memq type '(one-or-more
-				 zero-or-more
-				 optional
-				 mixed))
-		    (setq pattern (nth 1 pattern)))
-		   (t (setq pattern nil)))
-	     (cond (pattern)
-		   (patterns
-		    (setq pattern (car patterns))
-		    (setq patterns (cdr patterns))
-		    t)
-		   (todo
-		    (setq patterns (car todo))
-		    (setq todo (cdr todo))
-		    (setq pattern (car patterns))
-		    (setq patterns (cdr patterns))
-		    t))))
-    accum))
-
-(defun rng-find-element-content-pattern (pattern accum name)
-  (if (and (eq (car pattern) 'element)
-	   (rng-search-name name (nth 1 pattern)))
-      (cons (rng-compile (nth 2 pattern)) accum)
-    accum))
-
-(defun rng-search-name (name nc)
-  (let ((type (car nc)))
-    (cond ((eq type 'name)
-	   (equal (cadr nc) name))
-	  ((eq type 'choice)
-	   (let ((choices (cdr nc))
-		 (found nil))
-	     (while (and choices (not found))
-	       (if (rng-search-name name (car choices))
-		   (setq found t)
-		 (setq choices (cdr choices))))
-	     found))
-	  (t nil))))
-
-(defun rng-find-name-class-uris (nc accum)
-  (let ((type (car nc)))
-    (cond ((eq type 'name)
-	   (rng-accum-namespace-uri (car (nth 1 nc)) accum))
-	  ((memq type '(ns-name ns-name-except))
-	   (rng-accum-namespace-uri (nth 1 nc) accum))
-	  ((eq type 'choice)
-	   (let ((choices (cdr nc)))
-	     (while choices
-	       (setq accum
-		     (rng-find-name-class-uris (car choices) accum))
-	       (setq choices (cdr choices))))
-	   accum)
-	  (t accum))))
-
-(defun rng-accum-namespace-uri (ns accum)
-  (if (and ns (not (memq ns accum)))
-      (cons ns accum)
-    accum))
-
-;;; Derivatives
-
-(defun rng-ipattern-text-typed-p (ipattern)
-  (let ((memo (rng-ipattern-get-memo-text-typed ipattern)))
-    (if (eq memo 'unknown)
-	(rng-ipattern-set-memo-text-typed
-	 ipattern
-	 (rng-ipattern-compute-text-typed-p ipattern))
-      memo)))
-
-(defun rng-ipattern-compute-text-typed-p (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'choice)
-	   (let ((cur (rng-ipattern-get-child ipattern))
-		 (ret nil))
-	     (while (and cur (not ret))
-	       (if (rng-ipattern-text-typed-p (car cur))
-		   (setq ret t)
-		 (setq cur (cdr cur))))
-	     ret))
-	  ((eq type 'group)
-	   (let ((cur (rng-ipattern-get-child ipattern))
-		 (ret nil)
-		 member)
-	     (while (and cur (not ret))
-	       (setq member (car cur))
-	       (if (rng-ipattern-text-typed-p member)
-		   (setq ret t))
-	       (setq cur
-		     (and (rng-ipattern-get-nullable member)
-			  (cdr cur))))
-	     ret))
-	  ((eq type 'after)
-	   (rng-ipattern-text-typed-p (rng-ipattern-get-child ipattern)))
-	  (t (and (memq type '(value list data data-except)) t)))))
-						   
-(defun rng-start-tag-open-deriv (ipattern nm)
-  (or (rng-memo-map-get
-       nm
-       (rng-ipattern-get-memo-map-start-tag-open-deriv ipattern))
-      (rng-ipattern-memo-start-tag-open-deriv
-       ipattern
-       nm 
-       (rng-compute-start-tag-open-deriv ipattern nm))))
-							     
-(defun rng-ipattern-memo-start-tag-open-deriv (ipattern nm deriv)
-  (or (memq ipattern rng-const-ipatterns)
-      (rng-ipattern-set-memo-map-start-tag-open-deriv
-       ipattern
-       (rng-memo-map-add nm
-			 deriv
-			 (rng-ipattern-get-memo-map-start-tag-open-deriv
-			  ipattern))))
-  deriv)
-
-(defun rng-compute-start-tag-open-deriv (ipattern nm)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'choice)
-	   (rng-transform-choice `(lambda (p)
-				    (rng-start-tag-open-deriv p ',nm))
-				 ipattern))
-	  ((eq type 'element)
-	   (if (rng-name-class-contains
-		(rng-ipattern-get-name-class ipattern)
-		nm)
-	       (rng-intern-after (rng-element-get-child ipattern)
-				 rng-empty-ipattern)
-	     rng-not-allowed-ipattern))
-	  ((eq type 'group)
-	   (rng-transform-group-nullable
-	    `(lambda (p) (rng-start-tag-open-deriv p ',nm))
-	    'rng-cons-group-after 
-	    ipattern))
-	  ((eq type 'interleave)
-	   (rng-transform-interleave-single
-	    `(lambda (p) (rng-start-tag-open-deriv p ',nm))
-	    'rng-subst-interleave-after
-	    ipattern))
-	  ((eq type 'one-or-more)
-	   (rng-apply-after
-	    `(lambda (p)
-	       (rng-intern-group (list p ,(rng-intern-optional ipattern))))
-	    (rng-start-tag-open-deriv (rng-ipattern-get-child ipattern)
-				      nm)))
-	  ((eq type 'after)
-	   (rng-apply-after
-	    `(lambda (p)
-	       (rng-intern-after p
-				 ,(rng-ipattern-get-after ipattern)))
-	    (rng-start-tag-open-deriv (rng-ipattern-get-child ipattern)
-				      nm)))
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-start-attribute-deriv (ipattern nm)
-  (or (rng-memo-map-get
-       nm
-       (rng-ipattern-get-memo-map-start-attribute-deriv ipattern))
-      (rng-ipattern-memo-start-attribute-deriv
-       ipattern
-       nm 
-       (rng-compute-start-attribute-deriv ipattern nm))))
-							     
-(defun rng-ipattern-memo-start-attribute-deriv (ipattern nm deriv)
-  (or (memq ipattern rng-const-ipatterns)
-      (rng-ipattern-set-memo-map-start-attribute-deriv
-       ipattern
-       (rng-memo-map-add
-	nm
-	deriv
-	(rng-ipattern-get-memo-map-start-attribute-deriv ipattern))))
-  deriv)
-
-(defun rng-compute-start-attribute-deriv (ipattern nm)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'choice)
-	   (rng-transform-choice `(lambda (p)
-				    (rng-start-attribute-deriv p ',nm))
-				 ipattern))
-	  ((eq type 'attribute)
-	   (if (rng-name-class-contains
-		(rng-ipattern-get-name-class ipattern)
-		nm)
-	       (rng-intern-after (rng-ipattern-get-child ipattern)
-				 rng-empty-ipattern)
-	     rng-not-allowed-ipattern))
-	  ((eq type 'group)
-	   (rng-transform-interleave-single
-	    `(lambda (p) (rng-start-attribute-deriv p ',nm))
-	    'rng-subst-group-after 
-	    ipattern))
-	  ((eq type 'interleave)
-	   (rng-transform-interleave-single
-	    `(lambda (p) (rng-start-attribute-deriv p ',nm))
-	    'rng-subst-interleave-after
-	    ipattern))
-	  ((eq type 'one-or-more)
-	   (rng-apply-after
-	    `(lambda (p)
-	       (rng-intern-group (list p ,(rng-intern-optional ipattern))))
-	    (rng-start-attribute-deriv (rng-ipattern-get-child ipattern)
-				       nm)))
-	  ((eq type 'after)
-	   (rng-apply-after
-	    `(lambda (p)
-	       (rng-intern-after p ,(rng-ipattern-get-after ipattern)))
-	    (rng-start-attribute-deriv (rng-ipattern-get-child ipattern)
-				       nm)))
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-cons-group-after (x y)
-  (rng-apply-after `(lambda (p) (rng-intern-group (cons p ',y)))
-		   x))
-
-(defun rng-subst-group-after (new old list)
-  (rng-apply-after `(lambda (p)
-		      (rng-intern-group (rng-substq p ,old ',list)))
-		   new))
-
-(defun rng-subst-interleave-after (new old list)
-  (rng-apply-after `(lambda (p)
-		      (rng-intern-interleave (rng-substq p ,old ',list)))
-		   new))
-
-(defun rng-apply-after (f ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (rng-intern-after
-	    (rng-ipattern-get-child ipattern)
-	    (funcall f
-		     (rng-ipattern-get-after ipattern))))
-	  ((eq type 'choice)
-	   (rng-transform-choice `(lambda (x) (rng-apply-after ,f x))
-				 ipattern))
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-start-tag-close-deriv (ipattern)
-  (or (rng-ipattern-get-memo-start-tag-close-deriv ipattern)
-      (rng-ipattern-set-memo-start-tag-close-deriv
-       ipattern
-       (rng-compute-start-tag-close-deriv ipattern))))
-
-(defconst rng-transform-map
-  '((choice . rng-transform-choice)
-    (group . rng-transform-group)
-    (interleave . rng-transform-interleave)
-    (one-or-more . rng-transform-one-or-more)
-    (after . rng-transform-after-child)))
-
-(defun rng-compute-start-tag-close-deriv (ipattern)
-  (let* ((type (rng-ipattern-get-type ipattern)))
-    (if (eq type 'attribute)
-	rng-not-allowed-ipattern
-      (let ((transform (assq type rng-transform-map)))
-	(if transform
-	    (funcall (cdr transform)
-		     'rng-start-tag-close-deriv
-		     ipattern)
-	  ipattern)))))
-
-(defun rng-ignore-attributes-deriv (ipattern)
-  (let* ((type (rng-ipattern-get-type ipattern)))
-    (if (eq type 'attribute)
-	rng-empty-ipattern
-      (let ((transform (assq type rng-transform-map)))
-	(if transform
-	    (funcall (cdr transform)
-		     'rng-ignore-attributes-deriv
-		     ipattern)
-	  ipattern)))))
-  
-(defun rng-text-only-deriv (ipattern)
-  (or (rng-ipattern-get-memo-text-only-deriv ipattern)
-      (rng-ipattern-set-memo-text-only-deriv
-       ipattern
-       (rng-compute-text-only-deriv ipattern))))
-
-(defun rng-compute-text-only-deriv (ipattern)
-  (let* ((type (rng-ipattern-get-type ipattern)))
-    (if (eq type 'element)
-	rng-not-allowed-ipattern
-      (let ((transform (assq type
-			     '((choice . rng-transform-choice)
-			       (group . rng-transform-group)
-			       (interleave . rng-transform-interleave)
-			       (one-or-more . rng-transform-one-or-more)
-			       (after . rng-transform-after-child)))))
-	(if transform
-	    (funcall (cdr transform)
-		     'rng-text-only-deriv
-		     ipattern)
-	  ipattern)))))
-
-(defun rng-mixed-text-deriv (ipattern)
-  (or (rng-ipattern-get-memo-mixed-text-deriv ipattern)
-      (rng-ipattern-set-memo-mixed-text-deriv
-       ipattern
-       (rng-compute-mixed-text-deriv ipattern))))
-
-(defun rng-compute-mixed-text-deriv (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'text) ipattern)
-	  ((eq type 'after)
-	   (rng-transform-after-child 'rng-mixed-text-deriv
-				      ipattern))
-	  ((eq type 'choice)
-	   (rng-transform-choice 'rng-mixed-text-deriv
-				 ipattern))
-	  ((eq type 'one-or-more)
-	   (rng-intern-group
-	    (list (rng-mixed-text-deriv
-		   (rng-ipattern-get-child ipattern))
-		  (rng-intern-optional ipattern))))
-	  ((eq type 'group)
-	   (rng-transform-group-nullable
-	    'rng-mixed-text-deriv
-	    (lambda (x y) (rng-intern-group (cons x y)))
-	    ipattern))
-	  ((eq type 'interleave)
-	   (rng-transform-interleave-single
-	    'rng-mixed-text-deriv
-	    (lambda (new old list) (rng-intern-interleave
-				    (rng-substq new old list)))
-	    ipattern))
-	  ((and (eq type 'data)
-		(not (rng-ipattern-get-memo-text-typed ipattern)))
-	   ipattern)
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-end-tag-deriv (ipattern)
-  (or (rng-ipattern-get-memo-end-tag-deriv ipattern)
-      (rng-ipattern-set-memo-end-tag-deriv
-       ipattern
-       (rng-compute-end-tag-deriv ipattern))))
-
-(defun rng-compute-end-tag-deriv (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'choice)
-	   (rng-intern-choice
-	    (mapcar 'rng-end-tag-deriv
-		    (rng-ipattern-get-child ipattern))))
-	  ((eq type 'after)
-	   (if (rng-ipattern-get-nullable
-		(rng-ipattern-get-child ipattern))
-	       (rng-ipattern-get-after ipattern)
-	     rng-not-allowed-ipattern))
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-data-deriv (ipattern value)
-  (or (rng-memo-map-get value
-			(rng-ipattern-get-memo-map-data-deriv ipattern))
-      (and (rng-memo-map-get
-	    (cons value (rng-namespace-context-get-no-trace))
-	    (rng-ipattern-get-memo-map-data-deriv ipattern))
-	   (rng-memo-map-get
-	    (cons value (apply (car rng-dt-namespace-context-getter)
-			       (cdr rng-dt-namespace-context-getter)))
-	    (rng-ipattern-get-memo-map-data-deriv ipattern)))
-      (let* ((used-context (vector nil))
-	     (rng-dt-namespace-context-getter
-	      (cons 'rng-namespace-context-tracer
-		    (cons used-context
-			  rng-dt-namespace-context-getter)))
-	     (deriv (rng-compute-data-deriv ipattern value)))
-	(rng-ipattern-memo-data-deriv ipattern
-				      value
-				      (aref used-context 0)
-				      deriv))))
-
-(defun rng-namespace-context-tracer (used getter &rest args)
-  (let ((context (apply getter args)))
-    (aset used 0 context)
-    context))
-
-(defun rng-namespace-context-get-no-trace ()
-  (let ((tem rng-dt-namespace-context-getter))
-    (while (and tem (eq (car tem) 'rng-namespace-context-tracer))
-      (setq tem (cddr tem)))
-    (apply (car tem) (cdr tem))))
-
-(defconst rng-memo-data-deriv-max-length 80
-  "Don't memoize data-derivs for values longer than this.")
-
-(defun rng-ipattern-memo-data-deriv (ipattern value context deriv)
-  (or (memq ipattern rng-const-ipatterns)
-      (> (length value) rng-memo-data-deriv-max-length)
-      (rng-ipattern-set-memo-map-data-deriv
-       ipattern
-       (rng-memo-map-add (if context (cons value context) value)
-			 deriv
-			 (rng-ipattern-get-memo-map-data-deriv ipattern)
-			 t)))
-  deriv)
-
-(defun rng-compute-data-deriv (ipattern value)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'text) ipattern)
-	  ((eq type 'choice)
-	   (rng-transform-choice `(lambda (p) (rng-data-deriv p ,value))
-				 ipattern))
-	  ((eq type 'group)
-	   (rng-transform-group-nullable
-	    `(lambda (p) (rng-data-deriv p ,value))
-	    (lambda (x y) (rng-intern-group (cons x y)))
-	    ipattern))
-	  ((eq type 'one-or-more)
-	   (rng-intern-group (list (rng-data-deriv
-				    (rng-ipattern-get-child ipattern)
-				    value)
-				   (rng-intern-optional ipattern))))
-	  ((eq type 'after)
-	   (let ((child (rng-ipattern-get-child ipattern)))
-	     (if (or (rng-ipattern-get-nullable
-		      (rng-data-deriv child value))
-		     (and (rng-ipattern-get-nullable child)
-			  (rng-blank-p value)))
-		 (rng-ipattern-get-after ipattern)
-	       rng-not-allowed-ipattern)))
-	  ((eq type 'data)
-	   (if (rng-dt-make-value (rng-ipattern-get-datatype ipattern)
-				  value)
-	       rng-empty-ipattern
-	     rng-not-allowed-ipattern))
-	  ((eq type 'data-except)
-	   (if (and (rng-dt-make-value (rng-ipattern-get-datatype ipattern)
-				       value)
-		    (not (rng-ipattern-get-nullable
-			  (rng-data-deriv
-			   (rng-ipattern-get-child ipattern)
-			   value))))
-	       rng-empty-ipattern
-	     rng-not-allowed-ipattern))
-	  ((eq type 'value)
-	   (if (equal (rng-dt-make-value (rng-ipattern-get-datatype ipattern)
-					 value)
-		      (rng-ipattern-get-value-object ipattern))
-	       rng-empty-ipattern
-	     rng-not-allowed-ipattern))
-	  ((eq type 'list)
-	   (let ((tokens (split-string value))
-		 (state (rng-ipattern-get-child ipattern)))
-	     (while (and tokens
-			 (not (eq state rng-not-allowed-ipattern)))
-	       (setq state (rng-data-deriv state (car tokens)))
-	       (setq tokens (cdr tokens)))
-	     (if (rng-ipattern-get-nullable state)
-		 rng-empty-ipattern
-	       rng-not-allowed-ipattern)))
-	  ;; don't think interleave can occur
-	  ;; since we do text-only-deriv first
-	  (t rng-not-allowed-ipattern))))
-
-(defun rng-transform-multi (f ipattern interner)
-  (let* ((members (rng-ipattern-get-child ipattern))
-	 (transformed (mapcar f members)))
-    (if (rng-members-eq members transformed)
-	ipattern
-      (funcall interner transformed))))
-
-(defun rng-transform-choice (f ipattern)
-  (rng-transform-multi f ipattern 'rng-intern-choice))
-
-(defun rng-transform-group (f ipattern)
-  (rng-transform-multi f ipattern 'rng-intern-group))
-
-(defun rng-transform-interleave (f ipattern)
-  (rng-transform-multi f ipattern 'rng-intern-interleave))
-
-(defun rng-transform-one-or-more (f ipattern)
-  (let* ((child (rng-ipattern-get-child ipattern))
-	 (transformed (funcall f child)))
-    (if (eq child transformed)
-	ipattern
-      (rng-intern-one-or-more transformed))))
-
-(defun rng-transform-after-child (f ipattern)
-  (let* ((child (rng-ipattern-get-child ipattern))
-	 (transformed (funcall f child)))
-    (if (eq child transformed)
-	ipattern
-      (rng-intern-after transformed
-			(rng-ipattern-get-after ipattern)))))
-
-(defun rng-transform-interleave-single (f subster ipattern)
-  (let ((children (rng-ipattern-get-child ipattern))
-	found)
-    (while (and children (not found))
-      (let* ((child (car children))
-	     (transformed (funcall f child)))
-	(if (eq transformed rng-not-allowed-ipattern)
-	    (setq children (cdr children))
-	  (setq found
-		(funcall subster
-			 transformed
-			 child
-			 (rng-ipattern-get-child ipattern))))))
-    (or found
-	rng-not-allowed-ipattern)))
-
-(defun rng-transform-group-nullable (f conser ipattern)
-  "Given a group x1,...,xn,y1,...,yn where the xs are all
-nullable and y1 isn't, return a choice
-  (conser f(x1) x2,...,xm,y1,...,yn)
-  |(conser f(x2) x3,...,xm,y1,...,yn)
-  |...
-  |(conser f(xm) y1,...,yn)
-  |(conser f(y1) y2,...,yn)"
-  (rng-intern-choice
-   (rng-transform-group-nullable-gen-choices
-    f
-    conser
-    (rng-ipattern-get-child ipattern))))
-
-(defun rng-transform-group-nullable-gen-choices (f conser members)
-  (let ((head (car members))
-	(tail (cdr members)))
-    (if tail
-	(cons (funcall conser (funcall f head) tail)
-	      (if (rng-ipattern-get-nullable head)
-		  (rng-transform-group-nullable-gen-choices f conser tail)
-		nil))
-      (list (funcall f head)))))
-
-(defun rng-members-eq (list1 list2)
-  (while (and list1
-	      list2
-	      (eq (car list1) (car list2)))
-    (setq list1 (cdr list1))
-    (setq list2 (cdr list2)))
-  (and (null list1) (null list2)))
-    
-
-(defun rng-ipattern-after (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'choice)
-	   (rng-transform-choice 'rng-ipattern-after ipattern))
-	  ((eq type 'after)
-	   (rng-ipattern-get-after ipattern))
-	  ((eq  type 'not-allowed)
-	   ipattern)
-	  (t (error "Internal error in rng-ipattern-after: unexpected type %s" type)))))
-
-(defun rng-unknown-start-tag-open-deriv (ipattern)
-  (rng-intern-after (rng-compile rng-any-content) ipattern))
-
-(defun rng-ipattern-optionalize-elements (ipattern)
-  (let* ((type (rng-ipattern-get-type ipattern))
-	 (transform (assq type rng-transform-map)))
-    (cond (transform
-	   (funcall (cdr transform)
-		    'rng-ipattern-optionalize-elements
-		    ipattern))
-	  ((eq type 'element)
-	   (rng-intern-optional ipattern))
-	  (t ipattern))))
-
-(defun rng-ipattern-empty-before-p (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (eq (rng-ipattern-get-child ipattern) rng-empty-ipattern))
-	  ((eq type 'choice)
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 (ret t))
-	     (while (and members ret)
-	       (or (rng-ipattern-empty-before-p (car members))
-		   (setq ret nil))
-	       (setq members (cdr members)))
-	     ret))
-	  (t nil))))
-
-(defun rng-ipattern-possible-start-tags (ipattern accum)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (rng-ipattern-possible-start-tags
-	    (rng-ipattern-get-child ipattern)
-	    accum))
-	  ((memq type '(choice interleave))
-	   (let ((members (rng-ipattern-get-child ipattern)))
-	     (while members
-	       (setq accum
-		     (rng-ipattern-possible-start-tags (car members)
-						       accum))
-	       (setq members (cdr members))))
-	   accum)
-	  ((eq type 'group)
-	   (let ((members (rng-ipattern-get-child ipattern)))
-	     (while members
-	       (setq accum
-		     (rng-ipattern-possible-start-tags (car members)
-						       accum))
-	       (setq members
-		     (and (rng-ipattern-get-nullable (car members))
-			  (cdr members)))))
-	   accum)
-	  ((eq type 'element)
-	   (if (eq (rng-element-get-child ipattern) rng-not-allowed-ipattern)
-	       accum
-	     (rng-name-class-possible-names
-	      (rng-ipattern-get-name-class ipattern)
-	      accum)))
-	  ((eq type 'one-or-more)
-	   (rng-ipattern-possible-start-tags
-	    (rng-ipattern-get-child ipattern)
-	    accum))
-	  (t accum))))
-
-(defun rng-ipattern-start-tag-possible-p (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((memq type '(after one-or-more))
-	   (rng-ipattern-start-tag-possible-p
-	    (rng-ipattern-get-child ipattern)))
-	  ((memq type '(choice interleave))
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 (possible nil))
-	     (while (and members (not possible))
-	       (setq possible
-		     (rng-ipattern-start-tag-possible-p (car members)))
-	       (setq members (cdr members)))
-	     possible))
-	  ((eq type 'group)
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 (possible nil))
-	     (while (and members (not possible))
-	       (setq possible
-		     (rng-ipattern-start-tag-possible-p (car members)))
-	       (setq members
-		     (and (rng-ipattern-get-nullable (car members))
-			  (cdr members))))
-	     possible))
-	  ((eq type 'element)
-	   (not (eq (rng-element-get-child ipattern)
-		    rng-not-allowed-ipattern)))
-	  (t nil))))
-
-(defun rng-ipattern-possible-attributes (ipattern accum)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (rng-ipattern-possible-attributes (rng-ipattern-get-child ipattern)
-					     accum))
-	  ((memq type '(choice interleave group))
-	   (let ((members (rng-ipattern-get-child ipattern)))
-	     (while members
-	       (setq accum
-		     (rng-ipattern-possible-attributes (car members)
-						       accum))
-	       (setq members (cdr members))))
-	   accum)
-	  ((eq type 'attribute)
-	   (rng-name-class-possible-names
-	    (rng-ipattern-get-name-class ipattern)
-	    accum))
-	  ((eq type 'one-or-more)
-	   (rng-ipattern-possible-attributes
-	    (rng-ipattern-get-child ipattern)
-	    accum))
-	  (t accum))))
-
-(defun rng-ipattern-possible-values (ipattern accum)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (rng-ipattern-possible-values (rng-ipattern-get-child ipattern)
-					 accum))
-	  ((eq type 'choice)
-	   (let ((members (rng-ipattern-get-child ipattern)))
-	     (while members
-	       (setq accum
-		     (rng-ipattern-possible-values (car members)
-						   accum))
-	       (setq members (cdr members))))
-	   accum)
-	  ((eq type 'value)
-	   (let ((value-object (rng-ipattern-get-value-object ipattern)))
-	     (if (stringp value-object)
-		 (cons value-object accum)
-	       accum)))
-	  (t accum))))
-
-(defun rng-ipattern-required-element (ipattern)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((memq type '(after one-or-more))
-	   (rng-ipattern-required-element (rng-ipattern-get-child ipattern)))
-	  ((eq type 'choice)
-	   (let* ((members (rng-ipattern-get-child ipattern))
-		  (required (rng-ipattern-required-element (car members))))
-	     (while (and required
-			 (setq members (cdr members)))
-	       (unless (equal required
-			      (rng-ipattern-required-element (car members)))
-		   (setq required nil)))
-	     required))
-	  ((eq type 'group)
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 required)
-	     (while (and (not (setq required
-				    (rng-ipattern-required-element
-				     (car members))))
-			 (rng-ipattern-get-nullable (car members))
-			 (setq members (cdr members))))
-	     required))
-	  ((eq type 'interleave)
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 required)
-	     (while members
-	       (let ((tem (rng-ipattern-required-element (car members))))
-		 (cond ((not tem)
-			(setq members (cdr members)))
-		       ((not required)
-			(setq required tem)
-			(setq members (cdr members)))
-		       ((equal required tem)
-			(setq members (cdr members)))
-		       (t
-			(setq required nil)
-			(setq members nil)))))
-	     required))
-	  ((eq type 'element)
-	   (let ((nc (rng-ipattern-get-name-class ipattern)))
-	     (and (consp nc)
-		  (not (eq (rng-element-get-child ipattern)
-			   rng-not-allowed-ipattern))
-		  nc))))))
-
-(defun rng-ipattern-required-attributes (ipattern accum)
-  (let ((type (rng-ipattern-get-type ipattern)))
-    (cond ((eq type 'after)
-	   (rng-ipattern-required-attributes (rng-ipattern-get-child ipattern)
-					     accum))
-	  ((memq type '(interleave group))
-	   (let ((members (rng-ipattern-get-child ipattern)))
-	     (while members
-	       (setq accum
-		     (rng-ipattern-required-attributes (car members)
-						       accum))
-	       (setq members (cdr members))))
-	   accum)
-	  ((eq type 'choice)
-	   (let ((members (rng-ipattern-get-child ipattern))
-		 in-all in-this new-in-all)
-	     (setq in-all
-		   (rng-ipattern-required-attributes (car members)
-						     nil))
-	     (while (and in-all (setq members (cdr members)))
-	       (setq in-this
-		     (rng-ipattern-required-attributes (car members) nil))
-	       (setq new-in-all nil)
-	       (while in-this
-		 (when (member (car in-this) in-all)
-		   (setq new-in-all
-			 (cons (car in-this) new-in-all)))
-		 (setq in-this (cdr in-this)))
-	       (setq in-all new-in-all))
-	     (append in-all accum)))
-	  ((eq type 'attribute)
-	   (let ((nc (rng-ipattern-get-name-class ipattern)))
-	     (if (consp nc)
-		 (cons nc accum)
-	       accum)))
-	  ((eq type 'one-or-more)
-	   (rng-ipattern-required-attributes (rng-ipattern-get-child ipattern)
-					     accum))
-	  (t accum))))
-
-(defun rng-compile-error (&rest args)
-  (signal 'rng-compile-error
-	  (list (apply 'format args))))
-
-(put 'rng-compile-error
-     'error-conditions
-     '(error rng-error rng-compile-error))
-
-(put 'rng-compile-error
-     'error-message
-     "Incorrect schema")
-
-
-;;; External API
-
-(defsubst rng-match-state () rng-match-state)
-
-(defsubst rng-set-match-state (state)
-  (setq rng-match-state state))
-      
-(defsubst rng-match-state-equal (state)
-  (eq state rng-match-state))
-
-(defun rng-schema-changed ()
-  (rng-ipattern-clear)
-  (rng-compile-clear))
-
-(defun rng-match-init-buffer ()
-  (make-local-variable 'rng-compile-table)
-  (make-local-variable 'rng-ipattern-table)
-  (make-local-variable 'rng-last-ipattern-index))
-
-(defun rng-match-start-document ()
-  (rng-ipattern-maybe-init)
-  (rng-compile-maybe-init)
-  (add-hook 'rng-schema-change-hook 'rng-schema-changed nil t)
-  (setq rng-match-state (rng-compile rng-current-schema)))
-
-(defun rng-match-start-tag-open (name)
-  (rng-update-match-state (rng-start-tag-open-deriv rng-match-state
-						    name)))
-
-(defun rng-match-attribute-name (name)
-  (rng-update-match-state (rng-start-attribute-deriv rng-match-state
-						     name)))
-
-(defun rng-match-attribute-value (value)
-  (rng-update-match-state (rng-data-deriv rng-match-state
-					  value)))
-
-(defun rng-match-element-value (value)
-  (and (rng-update-match-state (rng-text-only-deriv rng-match-state))
-       (rng-update-match-state (rng-data-deriv rng-match-state
-					       value))))
-
-(defun rng-match-start-tag-close ()
-  (rng-update-match-state (rng-start-tag-close-deriv rng-match-state)))
-
-(defun rng-match-mixed-text ()
-  (rng-update-match-state (rng-mixed-text-deriv rng-match-state)))
-
-(defun rng-match-end-tag ()
-  (rng-update-match-state (rng-end-tag-deriv rng-match-state)))
-
-(defun rng-match-after ()
-  (rng-update-match-state
-   (rng-ipattern-after rng-match-state)))
-
-(defun rng-match-out-of-context-start-tag-open (name)
-  (let* ((found (rng-map-element-attribute 'rng-find-element-content-pattern
-					   rng-current-schema
-					   nil
-					   name))
-	 (content-pattern (if found
-			      (rng-intern-choice found)
-			    rng-not-allowed-ipattern)))
-    (rng-update-match-state
-     (rng-intern-after content-pattern rng-match-state))))
-
-(defun rng-match-possible-namespace-uris ()
-  "Return a list of all the namespace URIs used in the current schema.
-The absent URI is not included, so the result is always list of symbols."
-  (rng-map-element-attribute (lambda (pattern accum)
-			       (rng-find-name-class-uris (nth 1 pattern)
-							 accum))
-			     rng-current-schema
-			     nil))
-
-(defun rng-match-unknown-start-tag-open ()
-  (rng-update-match-state
-   (rng-unknown-start-tag-open-deriv rng-match-state)))
-
-(defun rng-match-optionalize-elements ()
-  (rng-update-match-state
-   (rng-ipattern-optionalize-elements rng-match-state)))
-
-(defun rng-match-ignore-attributes ()
-  (rng-update-match-state
-   (rng-ignore-attributes-deriv rng-match-state)))
-
-(defun rng-match-text-typed-p ()
-  (rng-ipattern-text-typed-p rng-match-state))
-
-(defun rng-match-empty-content ()
-  (if (rng-match-text-typed-p)
-      (rng-match-element-value "")
-    (rng-match-end-tag)))
-
-(defun rng-match-empty-before-p ()
-  "Return non-nil if what can be matched before an end-tag is empty.
-In other words, return non-nil if the pattern for what can be matched
-for an end-tag is equivalent to empty."
-  (rng-ipattern-empty-before-p rng-match-state))
-
-(defun rng-match-infer-start-tag-namespace (local-name)
-  (let ((ncs (rng-ipattern-possible-start-tags rng-match-state nil))
-	(nc nil)
-	(ns nil))
-    (while ncs
-      (setq nc (car ncs))
-      (if (and (equal (cdr nc) local-name)
-	       (symbolp (car nc)))
-	  (cond ((not ns)
-		 ;; first possible namespace
-		 (setq ns (car nc))
-		 (setq ncs (cdr ncs)))
-		((equal ns (car nc))
-		 ;; same as first namespace
-		 (setq ncs (cdr ncs)))
-		(t
-		 ;; more than one possible namespace
-		 (setq ns nil)
-		 (setq ncs nil)))
-	(setq ncs (cdr ncs))))
-    ns))
-
-(defun rng-match-nullable-p ()
-  (rng-ipattern-get-nullable rng-match-state))
-
-(defun rng-match-possible-start-tag-names ()
-  "Return a list of possible names that would be valid for start-tags.
-
-Each possible name is returned as a (NAMESPACE . LOCAL-NAME) pair,
-where NAMESPACE is a symbol or nil (meaning the absent namespace) and
-LOCAL-NAME is a string. The returned list may contain duplicates."
-  (rng-ipattern-possible-start-tags rng-match-state nil))
-
-;; This is no longer used.  It might be useful so leave it in for now.
-(defun rng-match-start-tag-possible-p ()
-  "Return non-nil if a start-tag is possible."
-  (rng-ipattern-start-tag-possible-p rng-match-state))
-
-(defun rng-match-possible-attribute-names ()
-  "Return a list of possible names that would be valid for attributes.
-
-See the function `rng-match-possible-start-tag-names' for
-more information."
-  (rng-ipattern-possible-attributes rng-match-state nil))
-
-(defun rng-match-possible-value-strings ()
-  "Return a list of strings that would be valid as content.
-The list may contain duplicates. Typically, the list will not
-be exhaustive."
-  (rng-ipattern-possible-values rng-match-state nil))
-
-(defun rng-match-required-element-name ()
-  "Return the name of an element which must occur, or nil if none."
-  (rng-ipattern-required-element rng-match-state))
-
-(defun rng-match-required-attribute-names ()
-  "Return a list of names of attributes which must all occur."
-  (rng-ipattern-required-attributes rng-match-state nil))
-
-(defmacro rng-match-save (&rest body)
-  (let ((state (make-symbol "state")))
-    `(let ((,state rng-match-state))
-       (unwind-protect
-	   (progn ,@body)
-	 (setq rng-match-state ,state)))))
-
-(put 'rng-match-save 'lisp-indent-function 0)
-(def-edebug-spec rng-match-save t)
-
-(defmacro rng-match-with-schema (schema &rest body)
-  `(let ((rng-current-schema ,schema)
-	 rng-match-state
-	 rng-compile-table
-	 rng-ipattern-table
-	 rng-last-ipattern-index)
-     (rng-ipattern-maybe-init)
-     (rng-compile-maybe-init)
-     (setq rng-match-state (rng-compile rng-current-schema))
-     ,@body))
-
-(put 'rng-match-with-schema 'lisp-indent-function 1)
-(def-edebug-spec rng-match-with-schema t)
-
-(provide 'rng-match)
-    
-;;; rng-match.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-nxml.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-nxml.el
deleted file mode 100644
index a571a26b5a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-nxml.el
+++ /dev/null
@@ -1,592 +0,0 @@
-;;; rng-nxml.el --- make nxml-mode take advantage of rng-validate-mode
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'easymenu)
-(require 'xmltok)
-(require 'nxml-util)
-(require 'nxml-ns)
-(require 'rng-match)
-(require 'rng-util)
-(require 'rng-valid)
-(require 'nxml-mode)
-(require 'rng-loc)
-
-(defcustom rng-nxml-auto-validate-flag t
-  "*Non-nil means automatically turn on validation with nxml-mode."
-  :type 'boolean
-  :group 'relax-ng)
-
-(defvar rng-preferred-prefix-alist-default nil
-  "Default value for variable `rng-preferred-prefix-alist'.")
-
-(defcustom rng-preferred-prefix-alist rng-preferred-prefix-alist-default
-  "*Alist of namespaces vs preferred prefixes."
-  :type '(repeat (cons :tag "With"
-		       (string :tag "this namespace URI")
-		       (string :tag "use this prefix")))
-  :group 'relax-ng)
-
-(defvar rng-complete-end-tags-after-< t
-  "*Non-nil means immediately after < complete on end-tag names.
-Complete on start-tag names regardless.")
-
-(defvar rng-nxml-easy-menu
-  '("XML"
-    ["Show Outline Only" nxml-hide-all-text-content]
-    ["Show Everything" nxml-show-all]
-    "---"
-    ["Validation" rng-validate-mode
-     :style toggle
-     :selected rng-validate-mode]
-    "---"
-    ("Set Schema"
-     ["Automatically" rng-auto-set-schema]
-     ("For Document Type"
-      :filter (lambda (menu)
-		(mapcar (lambda (type-id)
-			  (vector type-id
-				  (list 'rng-set-document-type
-					type-id)))
-			(rng-possible-type-ids))))
-     ["Any Well-Formed XML" rng-set-vacuous-schema]
-     ["File..." rng-set-schema-file])
-    ["Show Schema Location" rng-what-schema]
-    ["Save Schema Location" rng-save-schema-location :help
-     "Save the location of the schema currently being used for this buffer"]
-    "---"
-    ["First Error" rng-first-error :active rng-validate-mode]
-    ["Next Error" rng-next-error :active rng-validate-mode]
-    "---"
-    ["Customize nXML" (customize-group 'nxml)]
-    "---"
-    ["Show nXML Version" nxml-version]))
-
-;;;###autoload
-(defun rng-nxml-mode-init ()
-  "Initialize `nxml-mode' to take advantage of `rng-validate-mode'.
-This is typically called from `nxml-mode-hook'.
-Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil."
-  (interactive)
-  (define-key nxml-mode-map "\C-c\C-v" 'rng-validate-mode)
-  (define-key nxml-mode-map "\C-c\C-s\C-w" 'rng-what-schema)
-  (define-key nxml-mode-map "\C-c\C-s\C-a" 'rng-auto-set-schema-and-validate)
-  (define-key nxml-mode-map "\C-c\C-s\C-f" 'rng-set-schema-file-and-validate)
-  (define-key nxml-mode-map "\C-c\C-s\C-l" 'rng-save-schema-location)
-  (define-key nxml-mode-map "\C-c\C-s\C-t" 'rng-set-document-type-and-validate)
-  (define-key nxml-mode-map "\C-c\C-n" 'rng-next-error)
-  (easy-menu-define rng-nxml-menu nxml-mode-map
-    "Menu for nxml-mode used with rng-validate-mode."
-    rng-nxml-easy-menu)
-  (setq mode-line-process
-	'(rng-validate-mode (:eval (rng-compute-mode-line-string))))
-  (cond (rng-nxml-auto-validate-flag
-	 (rng-validate-mode 1)
-	 (add-hook 'nxml-completion-hook 'rng-complete nil t)
-	 (add-hook 'nxml-in-mixed-content-hook 'rng-in-mixed-content-p nil t))
-	(t
-	 (rng-validate-mode 0)
-	 (remove-hook 'nxml-completion-hook 'rng-complete t)
-	 (remove-hook 'nxml-in-mixed-content-hook 'rng-in-mixed-content-p t))))
-
-(defvar rng-tag-history nil)
-(defvar rng-attribute-name-history nil)
-(defvar rng-attribute-value-history nil)
-
-(defvar rng-complete-target-names nil)
-(defvar rng-complete-name-attribute-flag nil)
-(defvar rng-complete-extra-strings nil)
-
-(defun rng-complete ()
-  "Complete the string before point using the current schema.
-Return non-nil if in a context it understands."
-  (interactive)
-  (and rng-validate-mode
-       (let ((lt-pos (save-excursion (search-backward "<" nil t)))
-	     xmltok-dtd)
-	 (and lt-pos
-	      (= (rng-set-state-after lt-pos) lt-pos)
-	      (or (rng-complete-tag lt-pos)
-		  (rng-complete-end-tag lt-pos)
-		  (rng-complete-attribute-name lt-pos)
-		  (rng-complete-attribute-value lt-pos))))))
-
-(defconst rng-in-start-tag-name-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   "<\\(?:w\\(?::w?\\)?\\)?\\="
-   t
-   t))
-
-(defun rng-complete-tag (lt-pos)
-  (let (rng-complete-extra-strings)
-    (when (and (= lt-pos (1- (point)))
-	       rng-complete-end-tags-after-<
-	       rng-open-elements
-	       (not (eq (car rng-open-elements) t))
-	       (or rng-collecting-text
-		   (rng-match-save
-		     (rng-match-end-tag))))
-      (setq rng-complete-extra-strings
-	    (cons (concat "/"
-			  (if (caar rng-open-elements)
-			      (concat (caar rng-open-elements)
-				      ":"
-				      (cdar rng-open-elements))
-			    (cdar rng-open-elements)))
-		  rng-complete-extra-strings)))
-    (when (save-excursion
-	    (re-search-backward rng-in-start-tag-name-regex
-				lt-pos
-				t))
-      (and rng-collecting-text (rng-flush-text))
-      (let ((completion
-	     (let ((rng-complete-target-names
-		    (rng-match-possible-start-tag-names))
-		   (rng-complete-name-attribute-flag nil))
-	       (rng-complete-before-point (1+ lt-pos)
-					  'rng-complete-qname-function
-					  "Tag: "
-					  nil
-					  'rng-tag-history)))
-	    name)
-	(when completion
-	  (cond ((rng-qname-p completion)
-		 (setq name (rng-expand-qname completion
-					      t
-					      'rng-start-tag-expand-recover))
-		 (when (and name
-			    (rng-match-start-tag-open name)
-			    (or (not (rng-match-start-tag-close))
-				;; need a namespace decl on the root element
-				(and (car name)
-				     (not rng-open-elements))))
-		   ;; attributes are required
-		   (insert " ")))
-		((member completion rng-complete-extra-strings)
-		 (insert ">")))))
-      t)))
-
-(defconst rng-in-end-tag-name-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   "</\\(?:w\\(?::w?\\)?\\)?\\="
-   t
-   t))
-
-(defun rng-complete-end-tag (lt-pos)
-  (when (save-excursion
-	  (re-search-backward rng-in-end-tag-name-regex
-			      lt-pos
-			      t))
-    (cond ((or (not rng-open-elements)
-	       (eq (car rng-open-elements) t))
-	   (message "No matching start-tag")
-	   (ding))
-	  (t
-	   (let ((start-tag-name
-		  (if (caar rng-open-elements)
-		      (concat (caar rng-open-elements)
-			      ":"
-			      (cdar rng-open-elements))
-		    (cdar rng-open-elements)))
-		 (end-tag-name
-		  (buffer-substring-no-properties (+ (match-beginning 0) 2)
-						  (point))))
-	     (cond ((or (> (length end-tag-name)
-			   (length start-tag-name))
-			(not (string= (substring start-tag-name
-						 0
-						 (length end-tag-name))
-				      end-tag-name)))
-		    (message "Expected end-tag %s"
-			     (rng-quote-string
-			      (concat "</" start-tag-name ">")))
-		    (ding))
-		   (t
-		    (delete-region (- (point) (length end-tag-name))
-				   (point))
-		    (insert start-tag-name ">")
-		    (when (not (or rng-collecting-text
-				   (rng-match-end-tag)))
-		      (message "Element %s is incomplete"
-			       (rng-quote-string start-tag-name))))))))
-    t))
-
-(defconst rng-in-attribute-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   ;; Added escape to [ first on lines below:
-   "<w\\(?::w\\)?\
-\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
-\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
-\[ \t\r\n]+\\(\\(?:w\\(?::w?\\)?\\)?\\)\\="
-   t
-   t))
-
-(defvar rng-undeclared-prefixes nil)
-
-(defun rng-complete-attribute-name (lt-pos)
-  (when (save-excursion
-	  (re-search-backward rng-in-attribute-regex lt-pos t))
-    (let ((attribute-start (match-beginning 1))
-	  rng-undeclared-prefixes)
-      (and (rng-adjust-state-for-attribute lt-pos
-					   attribute-start)
-	   (let ((rng-complete-target-names
-		  (rng-match-possible-attribute-names))
-		 (rng-complete-extra-strings
-		  (mapcar (lambda (prefix)
-			    (if prefix
-				(concat "xmlns:" prefix)
-			      "xmlns"))
-			  rng-undeclared-prefixes))
-		 (rng-complete-name-attribute-flag t))
-	     (rng-complete-before-point attribute-start
-					'rng-complete-qname-function
-					"Attribute: "
-					nil
-					'rng-attribute-name-history))
-	   (insert "=\"")))
-    t))
-
-(defconst rng-in-attribute-value-regex
-  (replace-regexp-in-string
-   "w"
-   xmltok-ncname-regexp
-   "<w\\(?::w\\)?\
-\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
-[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
-[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
-\\(\"[^\"]*\\|'[^']*\\)\\="
-   t
-   t))
-
-(defun rng-complete-attribute-value (lt-pos)
-  (when (save-excursion
-	  (re-search-backward rng-in-attribute-value-regex lt-pos t))
-    (let ((name-start (match-beginning 1))
-	  (name-end (match-end 1))
-	  (colon (match-beginning 2))
-	  (value-start (1+ (match-beginning 3))))
-      (and (rng-adjust-state-for-attribute lt-pos
-					   name-start)
-	   (if (string= (buffer-substring-no-properties name-start
-							(or colon name-end))
-			"xmlns")
-	       (rng-complete-before-point
-		value-start
-		(rng-strings-to-completion-alist
-		 (rng-possible-namespace-uris
-		  (and colon
-		       (buffer-substring-no-properties (1+ colon) name-end))))
-		"Namespace URI: "
-		nil
-		'rng-namespace-uri-history)
-	     (rng-adjust-state-for-attribute-value name-start
-						   colon
-						   name-end)
-	     (rng-complete-before-point
-	      value-start
-	      (rng-strings-to-completion-alist
-	       (rng-match-possible-value-strings))
-	      "Value: "
-	      nil
-	      'rng-attribute-value-history))
-	   (insert (char-before value-start))))
-    t))
-
-(defun rng-possible-namespace-uris (prefix)
-  (let ((ns (if prefix (nxml-ns-get-prefix prefix)
-	      (nxml-ns-get-default))))
-    (if (and ns (memq prefix (nxml-ns-changed-prefixes)))
-	(list (nxml-namespace-name ns))
-      (mapcar 'nxml-namespace-name
-	      (delq nxml-xml-namespace-uri
-		    (rng-match-possible-namespace-uris))))))
-
-(defconst rng-qname-regexp
-  (concat "\\`"
-	  xmltok-ncname-regexp
-	  "\\(?:" ":" xmltok-ncname-regexp "\\)" "?" "\\'"))
-
-(defun rng-qname-p (string)
-  (and (string-match rng-qname-regexp string) t))
-
-(defun rng-expand-qname (qname &optional defaultp recover-fun)
-  (setq qname (rng-split-qname qname))
-  (let ((prefix (car qname)))
-    (if prefix
-	(let ((ns (nxml-ns-get-prefix qname)))
-	  (cond (ns (cons ns (cdr qname)))
-		(recover-fun (funcall recover-fun prefix (cdr qname)))))
-      (cons (and defaultp (nxml-ns-get-default)) (cdr qname)))))
-
-(defun rng-start-tag-expand-recover (prefix local-name)
-  (let ((ns (rng-match-infer-start-tag-namespace local-name)))
-    (and ns
-	 (cons ns local-name))))
-
-(defun rng-split-qname (qname)
-  (if (string-match ":" qname)
-      (cons (substring qname 0 (match-beginning 0))
-	    (substring qname (match-end 0)))
-    (cons nil qname)))
-
-(defun rng-in-mixed-content-p ()
-  "Return non-nil if point is in mixed content.
-Return nil only if point is definitely not in mixed content.
-If unsure, return non-nil."
-  (if (eq rng-current-schema rng-any-element)
-      t
-    (rng-set-state-after)
-    (rng-match-mixed-text)))
-
-(defun rng-set-state-after (&optional pos)
-  "Set the state for after parsing the first token with endpoint >= POS.
-This does not change the xmltok state or point.  However, it does
-set `xmltok-dtd'. Returns the position of the end of the token."
-  (unless pos (setq pos (point)))
-  (when (< rng-validate-up-to-date-end pos)
-    (message "Parsing...")
-    (while (and (rng-do-some-validation)
-		(< rng-validate-up-to-date-end pos))
-      ;; Display percentage validated.
-      (force-mode-line-update)
-      ;; Force redisplay but don't allow idle timers to run.
-      (let ((timer-idle-list nil))
-	(sit-for 0)))
-    (message "Parsing...done"))
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-invisible-motion
-	(if (= pos 1)
-	    (rng-set-initial-state)
-	  (let ((state (get-text-property (1- pos) 'rng-state)))
-	    (cond (state
-		   (rng-restore-state state)
-		   (goto-char pos))
-		  (t
-		   (let ((start (previous-single-property-change pos
-								 'rng-state)))
-		     (cond (start
-			    (rng-restore-state (get-text-property (1- start)
-								  'rng-state))
-			    (goto-char start))
-			   (t (rng-set-initial-state))))))))
-	(xmltok-save
-	  (if (= (point) 1)
-	      (xmltok-forward-prolog)
-	    (setq xmltok-dtd rng-dtd))
-	  (cond ((and (< pos (point))
-		      ;; This handles the case where the prolog ends
-		      ;; with a < without any following name-start
-		      ;; character. This will be treated by the parser
-		      ;; as part of the prolog, but we want to treat
-		      ;; it as the start of the instance.
-		      (eq (char-after pos) ?<)
-		      (<= (point)
-			  (save-excursion
-			    (goto-char (1+ pos))
-			    (skip-chars-forward " \t\r\n")
-			    (point))))
-		 pos)
-		((< (point) pos)
-		 (let ((rng-dt-namespace-context-getter
-			'(nxml-ns-get-context))
-		       (rng-parsing-for-state t))
-		   (rng-forward pos))
-		 (point))
-		(t pos)))))))
-
-(defun rng-adjust-state-for-attribute (lt-pos start)
-  (xmltok-save
-    (save-excursion
-      (goto-char lt-pos)
-      (when (memq (xmltok-forward)
-		  '(start-tag
-		    partial-start-tag
-		    empty-element
-		    partial-empty-element))
-	(when (< start (point))
-	  (setq xmltok-namespace-attributes
-		(rng-prune-attribute-at start
-					xmltok-namespace-attributes))
-	  (setq xmltok-attributes
-		(rng-prune-attribute-at start
-					xmltok-attributes)))
-	(let ((rng-parsing-for-state t)
-	      (rng-dt-namespace-context-getter '(nxml-ns-get-context)))
-	  (rng-process-start-tag 'stop)
-	  (rng-find-undeclared-prefixes)
-	  t)))))
-	
-(defun rng-find-undeclared-prefixes ()
-  ;; Start with the newly effective namespace declarations.
-  ;; (Includes declarations added during recovery.)
-  (setq rng-undeclared-prefixes (nxml-ns-changed-prefixes))
-  (let ((iter xmltok-attributes)
-	(ns-state (nxml-ns-state))
-	att)
-    ;; Add namespace prefixes used in this tag,
-    ;; but not declared in the parent.
-    (nxml-ns-pop-state)
-    (while iter
-      (setq att (car iter))
-      (let ((prefix (xmltok-attribute-prefix att)))
-	(when (and prefix
-		   (not (member prefix rng-undeclared-prefixes))
-		   (not (nxml-ns-get-prefix prefix)))
-	  (setq rng-undeclared-prefixes
-		(cons prefix rng-undeclared-prefixes))))
-      (setq iter (cdr iter)))
-    (nxml-ns-set-state ns-state)
-    ;; Remove namespace prefixes explicitly declared.
-    (setq iter xmltok-namespace-attributes)
-    (while iter
-      (setq att (car iter))
-      (setq rng-undeclared-prefixes
-	    (delete (and (xmltok-attribute-prefix att)
-			 (xmltok-attribute-local-name att))
-		  rng-undeclared-prefixes))
-      (setq iter (cdr iter)))))
-
-(defun rng-prune-attribute-at (start atts)
-  (when atts
-    (let ((cur atts))
-      (while (if (eq (xmltok-attribute-name-start (car cur)) start)
-		 (progn
-		   (setq atts (delq (car cur) atts))
-		   nil)
-	       (setq cur (cdr cur)))))
-    atts))
-
-(defun rng-adjust-state-for-attribute-value (name-start
-					     colon
-					     name-end)
-  (let* ((prefix (if colon
-		     (buffer-substring-no-properties name-start colon)
-		   nil))
-	 (local-name (buffer-substring-no-properties (if colon
-							 (1+ colon)
-						       name-start)
-						     name-end))
-	 (ns (and prefix (nxml-ns-get-prefix prefix))))
-    (and (or (not prefix) ns)
-	 (rng-match-attribute-name (cons ns local-name)))))
-
-(defun rng-complete-qname-function (string predicate flag)
-  (let ((alist (mapcar (lambda (name) (cons name nil))
-		       (rng-generate-qname-list string))))
-    (cond ((not flag)
-	   (try-completion string alist predicate))
-	  ((eq flag t)
-	   (all-completions string alist predicate))
-	  ((eq flag 'lambda)
-	   (and (assoc string alist) t)))))
-
-(defun rng-generate-qname-list (&optional string)
-  (let ((forced-prefix (and string
-			    (string-match ":" string)
-			    (> (match-beginning 0) 0)
-			    (substring string
-				       0
-				       (match-beginning 0))))
-	(namespaces (mapcar 'car rng-complete-target-names))
-	ns-prefixes-alist ns-prefixes iter ns prefer)
-    (while namespaces
-      (setq ns (car namespaces))
-      (when ns
-	(setq ns-prefixes-alist
-	      (cons (cons ns (nxml-ns-prefixes-for
-			      ns
-			      rng-complete-name-attribute-flag))
-		    ns-prefixes-alist)))
-      (setq namespaces (delq ns (cdr namespaces))))
-    (setq iter ns-prefixes-alist)
-    (while iter
-      (setq ns-prefixes (car iter))
-      (setq ns (car ns-prefixes))
-      (when (null (cdr ns-prefixes))
-	;; No declared prefix for the namespace
-	(if forced-prefix
-	    ;; If namespace non-nil and prefix undeclared,
-	    ;; use forced prefix.
-	    (when (and ns
-		       (not (nxml-ns-get-prefix forced-prefix)))
-	      (setcdr ns-prefixes (list forced-prefix)))
-	  (setq prefer (rng-get-preferred-unused-prefix ns))
-	  (when prefer
-	    (setcdr ns-prefixes (list prefer)))
-	  ;; Unless it's an attribute with a non-nil namespace,
-	  ;; allow no prefix for this namespace.
-	  (unless rng-complete-name-attribute-flag
-	    (setcdr ns-prefixes (cons nil (cdr ns-prefixes))))))
-      (setq iter (cdr iter)))
-    (rng-uniquify-equal
-     (sort (apply 'append
-		  (cons rng-complete-extra-strings
-			(mapcar (lambda (name)
-				  (if (car name)
-				      (mapcar (lambda (prefix)
-						(if prefix
-						    (concat prefix
-							    ":"
-							    (cdr name))
-						  (cdr name)))
-					(cdr (assoc (car name)
-						    ns-prefixes-alist)))
-				    (list (cdr name))))
-				rng-complete-target-names)))
-	   'string<))))
-	
-(defun rng-get-preferred-unused-prefix (ns)
-  (let ((ns-prefix (assoc (symbol-name ns) rng-preferred-prefix-alist))
-	iter prefix)
-    (when ns-prefix
-      (setq prefix (cdr ns-prefix))
-      (when (nxml-ns-get-prefix prefix)
-	;; try to find an unused prefix
-	(setq iter (memq ns-prefix rng-preferred-prefix-alist))
-	(while (and iter
-		    (setq ns-prefix (assoc ns iter)))
-	  (if (nxml-ns-get-prefix (cdr ns-prefix))
-	      (setq iter (memq ns-prefix iter))
-	    (setq prefix (cdr ns-prefix))
-	    nil))))
-    prefix))
-
-(defun rng-strings-to-completion-alist (strings)
-  (mapcar (lambda (s) (cons s s))
-	  (rng-uniquify-equal (sort (mapcar 'rng-escape-string strings)
-				    'string<))))
-
-(provide 'rng-nxml)
-
-;;; rng-nxml.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-parse.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-parse.el
deleted file mode 100644
index f4a0a4cc4c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-parse.el
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; rng-parse.el --- parse an XML file and validate it against a schema
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This combines the validation machinery in rng-match.el with the
-;; parser in nxml-parse.el by using the `nxml-validate-function' hook.
-
-;;; Code:
-
-(require 'nxml-parse)
-(require 'rng-match)
-(require 'rng-dt)
-
-(defvar rng-parse-prev-was-start-tag nil)
-
-(defun rng-parse-validate-file (schema file)
-  "Parse and validate the XML document in FILE and return it as a list.
-The returned list has the same form as that returned by
-`nxml-parse-file'.  SCHEMA is a list representing the schema to use
-for validation, such as returned by the function `rng-c-load-schema'.
-If the XML document is invalid with respect to schema, an error will
-be signaled in the same way as when it is not well-formed."
-  (save-excursion
-    (set-buffer (nxml-parse-find-file file))
-    (unwind-protect
-	(let ((nxml-parse-file-name file)
-	      (nxml-validate-function 'rng-parse-do-validate)
-	      (rng-dt-namespace-context-getter '(nxml-ns-get-context))
-	      rng-parse-prev-was-start-tag)
-	  ;; We don't simply call nxml-parse-file, because
-	  ;; we want to do rng-match-with-schema in the same
-	  ;; buffer in which we will call the other rng-match-* functions.
-	  (rng-match-with-schema schema
-	    (nxml-parse-instance)))
-      (kill-buffer nil))))
-
-(defun rng-parse-do-validate (text start-tag)
-  (cond ((and (let ((tem rng-parse-prev-was-start-tag))
-		(setq rng-parse-prev-was-start-tag (and start-tag t))
-		tem)
-	      (not start-tag)
-	      (rng-match-text-typed-p))
-	 (unless (rng-match-element-value (or text ""))
-	   (cons "Invalid data" (and text 'text))))
-	((and text
-	      (not (rng-blank-p text))
-	      (not (rng-match-mixed-text)))
-	 (cons "Text not allowed" 'text))
-	((not start-tag)
-	 (unless (rng-match-end-tag)
-	   (cons "Missing elements" nil)))
-	((not (rng-match-start-tag-open
-	       (rng-parse-to-match-name (car start-tag))))
-	 (cons "Element not allowed" nil))
-	(t
-	 (let ((atts (cadr start-tag))
-	       (i 0)
-	       att err)
-	   (while (and atts (not err))
-	     (setq att (car atts))
-	     (when (not (and (consp (car att))
-			     (eq (caar att) nxml-xmlns-namespace-uri)))
-	       (setq err
-		     (cond ((not (rng-match-attribute-name
-				  (rng-parse-to-match-name (car att))))
-			    (cons "Attribute not allowed"
-				  (cons 'attribute-name i)))
-			   ((not (rng-match-attribute-value (cdr att)))
-			    (cons "Invalid attribute value"
-				  (cons 'attribute-value i))))))
-	     (setq atts (cdr atts))
-	     (setq i (1+ i)))
-	   (or err
-	       (unless (rng-match-start-tag-close)
-		 (cons "Missing attributes" 'tag-close)))))))
-
-(defun rng-parse-to-match-name (name)
-  (if (consp name)
-      name
-    (cons nil name)))
-
-(provide 'rng-parse)
-
-;;; rng-parse.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-pttrn.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-pttrn.el
deleted file mode 100644
index c3ae4c6812..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-pttrn.el
+++ /dev/null
@@ -1,189 +0,0 @@
-;;; rng-pttrn.el --- RELAX NG patterns
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; pattern ::=
-;;   (ref <pattern> <local-name>)
-;;   | (choice <pattern> <pattern> ...)
-;;   | (group <pattern> <pattern> ...)
-;;   | (interleave <pattern> <pattern> ...)
-;;   | (zero-or-more <pattern>)
-;;   | (one-or-more <pattern>)
-;;   | (optional <pattern>)
-;;   | (mixed <pattern>)
-;;   | (value <datatype> <string> <context>)
-;;   | (data <datatype> <params>)
-;;   | (data-except <datatype> <params> <pattern>)
-;;   | (list <pattern>)
-;;   | (element <name-class> <pattern>)
-;;   | (attribute <name-class> <pattern>)
-;;   | (text)
-;;   | (empty)
-;;   | (not-allowed)
-;;
-;; params ::=
-;;   ((<param-name> . <param-value> ) ...)
-;; param-name ::= <symbol>
-;; param-value ::= <string>
-;;
-;; name-class ::=
-;;   (name <name>)
-;;   | (any-name)
-;;   | (any-name-except <name-class>)
-;;   | (ns-name <ns>)
-;;   | (ns-name-except <ns> <name-class>)
-;;   | (choice <name-class> <name-class> ...)
-;;
-;; name ::= (<ns> . <local-name>)
-;; ns ::= nil | <symbol>
-;; local-name ::= <string>
-;; datatype ::= (<datatype-uri> . <datatype-local-name>)
-;; datatype-uri ::= nil | <symbol>
-;; datatype-local-name ::= <symbol>
-
-;;; Code:
-
-(defvar rng-schema-change-hook nil
-  "Hook to be run after `rng-current-schema' changes.")
-
-(defvar rng-current-schema nil
-  "Pattern to be used as schema for the current buffer.")
-(make-variable-buffer-local 'rng-current-schema)
-
-(defun rng-make-ref (name)
-  (list 'ref nil name))
-
-(defun rng-ref-set (ref pattern)
-  (setcar (cdr ref) pattern))
-
-(defun rng-ref-get (ref) (cadr ref))
-
-(defun rng-make-choice (patterns)
-  (cons 'choice patterns))
-
-(defun rng-make-group (patterns)
-  (cons 'group patterns))
-
-(defun rng-make-interleave (patterns)
-  (cons 'interleave patterns))
-
-(defun rng-make-zero-or-more (pattern)
-  (list 'zero-or-more pattern))
-
-(defun rng-make-one-or-more (pattern)
-  (list 'one-or-more pattern))
-
-(defun rng-make-optional (pattern)
-  (list 'optional pattern))
-
-(defun rng-make-mixed (pattern)
-  (list 'mixed pattern))
-
-(defun rng-make-value (datatype str context)
-  (list 'value datatype str context))
-
-(defun rng-make-data (name params)
-  (list 'data name params))
-
-(defun rng-make-data-except (name params pattern)
-  (list 'data-except name params pattern))
-
-(defun rng-make-list (pattern)
-  (list 'list pattern))
-
-(defun rng-make-element (name-class pattern)
-  (list 'element name-class pattern))
-
-(defun rng-make-attribute (name-class pattern)
-  (list 'attribute name-class pattern))
-
-(defun rng-make-text ()
-  '(text))
-
-(defun rng-make-empty ()
-  '(empty))
-
-(defun rng-make-not-allowed ()
-  '(not-allowed))
-
-(defun rng-make-any-name-name-class ()
-  '(any-name))
-
-(defun rng-make-any-name-except-name-class (name-class)
-  (list 'any-name-except name-class))
-
-(defun rng-make-ns-name-name-class (ns)
-  (list 'ns-name ns))
-
-(defun rng-make-ns-name-except-name-class (ns name-class)
-  (list 'ns-name-except ns name-class))
-
-(defun rng-make-name-name-class (name)
-  (list 'name name))
-
-(defun rng-make-choice-name-class (name-classes)
-  (cons 'choice name-classes))
-
-(defconst rng-any-content
-  (let* ((ref (rng-make-ref "any-content"))
-	 (pattern (rng-make-zero-or-more
-		    (rng-make-choice
-		     (list
-		      (rng-make-text)
-		      (rng-make-attribute (rng-make-any-name-name-class)
-					  (rng-make-text))
-		      (rng-make-element (rng-make-any-name-name-class)
-					ref))))))
-    (rng-ref-set ref pattern)
-    pattern)
-  "A pattern that matches the attributes and content of any element.")
-
-(defconst rng-any-element
-  (let* ((ref (rng-make-ref "any-element"))
-	 (pattern
-	  (rng-make-element
-	   (rng-make-any-name-name-class)
-	   (rng-make-zero-or-more
-	    (rng-make-choice
-	     (list
-	      (rng-make-text)
-	      (rng-make-attribute (rng-make-any-name-name-class)
-				  (rng-make-text))
-	      ref))))))
-    (rng-ref-set ref pattern)
-    pattern)
-  "A pattern that matches any element.")
-
-;;; Names
-
-(defun rng-make-name (ns local-name)
-  (cons ns local-name))
-
-;;; Datatypes
-
-(defun rng-make-datatype (uri local-name)
-  (cons uri (intern local-name)))
-
-(provide 'rng-pttrn)
-
-;;; rng-pttrn.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-uri.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-uri.el
deleted file mode 100644
index 7ed8befc90..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-uri.el
+++ /dev/null
@@ -1,355 +0,0 @@
-;;; rng-uri.el --- URI parsing and manipulation
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(defun rng-file-name-uri (f)
-  "Return a URI for the filename F.
-Multibyte characters are left as is. Use `rng-uri-escape-multibyte' to
-escape them using %HH."
-  (setq f (expand-file-name f))
-  (let ((url
-	 (replace-regexp-in-string "[\000-\032\177<>#%\"{}|\\^[]`%?;]"
-				   'rng-percent-encode
-				   f)))
-    (concat "file:"
-	    (if (and (> (length url) 0)
-		     (= (aref url 0) ?/))
-		"//"
-	      "///")
-	    url)))
-
-(defun rng-uri-escape-multibyte (uri)
-  "Escape multibyte characters in URI."
-  (replace-regexp-in-string "[:nonascii:]"
-			    'rng-percent-encode
-			    (encode-coding-string uri 'utf-8)))
-
-(defun rng-percent-encode (str)
-  (apply 'concat
-	 (mapcar (lambda (ch)
-		   (format "%%%x%x" (/ ch 16) (% ch 16)))
-		 (string-to-list str))))
-
-
-(defun rng-uri-file-name (uri)
-  "Return the filename represented by a URI.
-Signal an error if URI is not a valid file URL."
-  (rng-uri-file-name-1 uri nil))
-
-(defun rng-uri-pattern-file-name-regexp (pattern)
-  "Return a regexp for filenames represented by URIs that match PATTERN."
-  (rng-uri-file-name-1 pattern 'match))
-
-(defun rng-uri-pattern-file-name-replace-match (pattern)
-  (rng-uri-file-name-1 pattern 'replace))
-
-;; pattern is either nil or match or replace
-(defun rng-uri-file-name-1 (uri pattern)
-  (unless (string-match "\\`\\(?:[^%]\\|%[0-9a-fA-F]{2}\\)*\\'" uri)
-    (rng-uri-error "Bad escapes in URI `%s'" uri))
-  (setq uri (rng-uri-unescape-multibyte uri))
-  (let* ((components
-	  (or (rng-uri-split uri)
-	      (rng-uri-error "Cannot split URI `%s' into its components" uri)))
-	 (scheme (nth 0 components))
-	 (authority (nth 1 components))
-	 (path (nth 2 components))
-	 (absolutep (string-match "\\`/" path))
-	 (query (nth 3 components))
-	 (fragment-id (nth 4 components)))
-    (cond ((not scheme)
-	   (unless pattern
-	     (rng-uri-error "URI `%s' does not have a scheme" uri)))
-	  ((not (string= (downcase scheme) "file"))
-	   (rng-uri-error "URI `%s' does not use the `file:' scheme" uri)))
-    (when (not (member authority
-		       (cons system-name '(nil "" "localhost"))))
-      (rng-uri-error "URI `%s' does not start with `file:///' or `file://localhost/'"
-	     uri))
-    (when query
-      (rng-uri-error "`?' not escaped in file URI `%s'" uri))
-    (when fragment-id
-      (rng-uri-error "URI `%s' has a fragment identifier" uri))
-    (when (string-match ";" path)
-      (rng-uri-error "`;' not escaped in URI `%s'" uri))
-    (when (string-match "%2[fF]" path) ;; 2f is hex code of slash
-      (rng-uri-error "Escaped slash in URI `%s'" uri))
-    (when (and (eq system-type 'windows-nt)
-	       absolutep
-	       (file-name-absolute-p (substring path 1)))
-      (setq path (substring path 1)))
-    (when (and pattern (string-match "\\`\\./" path))
-      (setq path (substring path 2)))
-    (setq path 
-	  (cond ((eq pattern 'match)
-		 (rng-uri-unescape-unibyte-match path))
-		((eq pattern 'replace)
-		 (rng-uri-unescape-unibyte-replace path 2))
-		(t
-		 (rng-uri-unescape-unibyte path))))
-    (when (string-match "\000" path)
-      (rng-uri-error "URI `%s' has NUL character in path" uri))
-    (when (eq pattern 'match)
-      (setq path
-	    (concat (if absolutep
-			"\\(\\)"
-		      "\\(\\(?:[^/]*/\\)*\\)")
-		    path)))
-    (cond ((eq pattern 'match)
-	   (concat "\\`" path "\\'"))
-	  ((and (eq pattern 'replace)
-		(not absolutep))
-	   (concat "\\1" path))
-	  (t path))))
-
-(defun rng-uri-error (&rest args)
-  (signal 'rng-uri-error (list (apply 'format args))))
-
-(put 'rng-uri-error 'error-conditions '(error rng-uri-error))
-(put 'rng-uri-error 'error-message "Invalid URI")
-
-(defun rng-uri-split (str)
-  (and (string-match "\\`\\(?:\\([^:/?#]+\\):\\)?\
-\\(?://\\([^/?#]*\\)\\)?\
-\\([^?#]*\\)\
-\\(?:\\?\\([^#]*\\)\\)?\
-\\(?:#\\(\\(?:.\\|\n\\)*\\)\\)?\\'"
-		     str)
-       (list (match-string 1 str)
-	     (match-string 2 str)
-	     (match-string 3 str)
-	     (match-string 4 str)
-	     (match-string 5 str))))
-
-(defun rng-uri-join (scheme authority path &optional query fragment-id)
-  (when path
-    (let (parts)
-      (when fragment-id
-	(setq parts (list "#" fragment-id)))
-      (when query
-	(setq parts
-	      (cons "?"
-		    (cons query parts))))
-      (setq parts (cons path parts))
-      (when authority
-	(setq parts
-	      (cons "//"
-		    (cons authority parts))))
-      (when scheme
-	(setq parts
-	      (cons scheme
-		    (cons ":" parts))))
-      (apply 'concat parts))))
-			
-(defun rng-uri-resolve (uri-ref base-uri)
-  "Resolve a possibly relative URI reference into absolute form.
-URI-REF is the URI reference to be resolved.
-BASE-URI is the base URI to use for resolving it.
-The algorithm is specified by RFC 2396.
-If there is some problem with URI-REF or BASE-URI, then
-URI-REF will be returned."
-  (let* ((components (rng-uri-split uri-ref))
-	 (scheme (nth 0 components))
-	 (authority (nth 1 components))
-	 (path (nth 2 components))
-	 (query (nth 3 components))
-	 (fragment-id (nth 4 components))
-	 (base-components (rng-uri-split base-uri)))
-    (if (or (not components)
-	    scheme
-	    (not base-components)
-	    (not (nth 0 base-components)))
-	uri-ref
-      (setq scheme (nth 0 base-components))
-      (when (not authority)
-	(setq authority (nth 1 base-components))
-	(if (and (equal path "") (not query))
-	    ;; Handle same document reference by returning
-	    ;; same URI (RFC 2396bis does this too).
-	    (setq path (nth 2 base-components)
-		  query (nth 3 base-components))
-	  (setq path (rng-resolve-path path (nth 2 base-components)))))
-      (rng-uri-join scheme
-		    authority
-		    path
-		    query
-		    fragment-id))))
-
-;; See RFC 2396 5.2, steps 5 and 6
-(defun rng-resolve-path (path base-path)
-  ;; Step 5
-  (if (or (string-match "\\`/" path)
-	  (not (string-match "\\`/" base-path)))
-      path
-    ;; Step 6
-    ;; (a), (b)
-    (let ((segments (rng-split-path path))
-	  (base-segments (rng-split-path base-path)))
-      (if (> (length base-segments) 1)
-	  (setq segments (nconc (nbutlast base-segments)
-				segments))
-	(setcar segments
-		(concat (car base-segments) (car segments))))
-      ;; (d)
-      (let ((last-segment (last segments)))
-	(when (equal (car last-segment) ".")
-	  (setcar last-segment "")))
-      ;; (c)
-      (setq segments (delete "." segments))
-      ;; (e)
-      (let (iter matched)
-	(while (progn
-		 (setq matched nil)
-		 (setq iter (cdr segments))
-		 (while (and iter (not matched))
-		   (if (or (not (equal (cadr iter) ".."))
-			   (equal (car iter) ".."))
-		       (setq iter (cdr iter))
-		     (setcar iter nil)
-		     (setcar (cdr iter)
-			     ;; (f)
-			     (if (cddr iter) nil ""))
-		     (setq matched t)
-		     (setq segments (delq nil segments))))
-		 matched)))
-      (rng-join-path segments))))
-
-(defun rng-relative-uri (full base)
-  "Return a URI that relative to BASE is equivalent to FULL.
-The returned URI will be relative if possible.
-Both FULL and BASE must be absolute URIs."
-  (let* ((components (rng-uri-split full))
-	 (scheme (nth 0 components))
-	 (authority (nth 1 components))
-	 (path (nth 2 components))
-	 (query (nth 3 components))
-	 (fragment-id (nth 4 components))
-	 (base-components (rng-uri-split base)))
-    (if (and components
-	     base-components
-	     scheme
-	     (equal scheme
-		    (nth 0 base-components)))
-	(progn
-	  (setq scheme nil)
-	  (when (and authority
-		     (equal authority
-			    (nth 1 base-components)))
-	    (setq authority nil)
-	    (setq path (rng-relative-path path (nth 2 base-components))))
-	  (rng-uri-join scheme authority path query fragment-id))
-      full)))
-
-(defun rng-relative-path (path base-path)
-  (let ((segments (rng-split-path path))
-	(base-segments (rng-split-path base-path)))
-    (when (> (length base-segments) 1)
-      (setq base-segments (nbutlast base-segments)))
-    (if (or (member "." segments)
-	    (member ".." segments)
-	    (member "." base-segments)
-	    (member ".." base-segments))
-	path
-      (while (and segments
-		  base-segments
-		  (string= (car segments)
-			   (car base-segments)))
-	(setq segments (cdr segments))
-	(setq base-segments (cdr base-segments)))
-      (while base-segments
-	(setq base-segments (cdr base-segments))
-	(setq segments (cons ".." segments)))
-      (when (equal (car segments) "")
-	(setq segments (cons "." segments)))
-      (rng-join-path segments))))
-
-(defun rng-split-path (path)
-  (let ((start 0)
-	segments)
-    (while (string-match "/" path start)
-      (setq segments (cons (substring path start (match-beginning 0))
-			   segments))
-      (setq start (match-end 0)))
-    (nreverse (cons (substring path start) segments))))
-
-(defun rng-join-path (segments)
-  (and segments
-       (mapconcat 'identity segments "/")))
-
-(defun rng-uri-unescape-multibyte (str)
-  (replace-regexp-in-string "\\(?:%[89a-fA-F][0-9a-fA-F]\\)+"
-			    'rng-multibyte-percent-decode
-			    str))
-
-(defun rng-multibyte-percent-decode (str)
-  (decode-coding-string  (apply 'string
-				(mapcar (lambda (h) (string-to-number h 16))
-					(split-string str "%")))
-			 'utf-8))
-    
-(defun rng-uri-unescape-unibyte (str)
-  (replace-regexp-in-string "%[0-7][0-9a-fA-F]"
-			    (lambda (h)
-			      (string-to-number (substring h 1) 16))
-			    str
-			    t
-			    t))
-
-(defun rng-uri-unescape-unibyte-match (str)
-  (replace-regexp-in-string "%[0-7][0-9a-fA-F]\\|[^%]"
-			    (lambda (match)
-			      (if (string= match "*")
-				  "\\([^/]*\\)"
-				(regexp-quote
-				 (if (= (length match) 1)
-				     match
-				   (string-to-number (substring match 1)
-						     16)))))
-			    str
-			    t
-			    t))
-
-(defun rng-uri-unescape-unibyte-replace (str next-match-index)
-  (replace-regexp-in-string
-   "%[0-7][0-9a-fA-F]\\|[^%]"
-   (lambda (match)
-     (if (string= match "*")
-	 (let ((n next-match-index))
-	   (setq next-match-index (1+ n))
-	   (format "\\%s" n))
-       (let ((ch (if (= (length match) 1)
-		     (aref match 0)
-		   (string-to-number (substring match 1)
-				     16))))
-	 (if (eq ch ?\\)
-	     (string ?\\ ?\\)
-	   (string ch)))))
-     str
-     t
-     t))
-
-(provide 'rng-uri)
-
-;;; rng-uri.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-util.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-util.el
deleted file mode 100644
index 865da0ff70..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-util.el
+++ /dev/null
@@ -1,172 +0,0 @@
-;;; rng-util.el --- utility functions for RELAX NG library
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;;; Code:
-
-(defun rng-make-datatypes-uri (uri)
-  (if (string-equal uri "")
-      ;; The spec doesn't say to do this, but it's perfectly conformant
-      ;; and better than using nil, I think.
-      'http://relaxng.org/ns/structure/1.0
-    (intern uri)))
-
-(defconst rng-xsd-datatypes-uri
-  (rng-make-datatypes-uri "http://www.w3.org/2001/XMLSchema-datatypes"))
-
-(defconst rng-builtin-datatypes-uri (rng-make-datatypes-uri ""))
-
-(defun rng-uniquify-eq (list)
-  "Destructively remove any element from LIST that is eq to
-its predecessor."
-  (and list
-       (let ((head list))
-	 (while (cdr head)
-	   (if (eq (car head) (cadr head))
-	       (setcdr head (cddr head)))
-	   (setq head (cdr head)))
-	 list)))
-
-(defun rng-uniquify-equal (list)
-  "Destructively remove any element from LIST that is equal to
-its predecessor."
-  (and list
-       (let ((head list))
-	 (while (cdr head)
-	   (if (equal (car head) (cadr head))
-	       (setcdr head (cddr head)))
-	   (setq head (cdr head)))
-	 list)))
-
-(defun rng-blank-p (str) (string-match "\\`[ \t\n\r]*\\'" str))
-
-(defun rng-substq (new old list)
-  "Replace first member of LIST (if any) that is eq to OLD by NEW.
-LIST is not modified."
-  (cond ((null list) nil)
-	((eq (car list) old)
-	 (cons new (cdr list)))
-	(t
-	 (let ((tail (cons (car list)
-			   nil))
-	       (rest (cdr list)))
-	   (setq list tail)
-	   (while rest
-	     (let ((item (car rest)))
-	       (setq rest (cdr rest))
-	       (cond ((eq item old)
-		      (setcdr tail
-			      (cons new rest))
-		      (setq rest nil))
-		     (t
-		      (setq tail
-			    (setcdr tail
-				    (cons item nil))))))))
-	 list)))
-
-(defun rng-complete-before-point (start table prompt &optional predicate hist)
-  "Complete text between START and point.
-Replaces the text between START and point with a string chosen using a
-completion table and, when needed, input read from the user with the
-minibuffer.
-Returns the new string if either a complete and unique completion was
-determined automatically or input was read from the user. Otherwise,
-returns nil.
-TABLE is an alist, a symbol bound to a function or an obarray as with
-the function `completing-read'.
-PROMPT is the string to prompt with if user input is needed.
-PREDICATE is nil or a function as with `completing-read'.
-HIST, if non-nil, specifies a history list as with `completing-read'."
-  (let* ((orig (buffer-substring-no-properties start (point)))
-	 (completion (try-completion orig table predicate)))
-    (cond ((not completion)
-	   (if (string= orig "")
-	       (message "No completions available")
-	     (message "No completion for %s" (rng-quote-string orig)))
-	   (ding)
-	   nil)
-	  ((eq completion t) orig)
-	  ((not (string= completion orig))
-	   (delete-region start (point))
-	   (insert completion)
-	   (cond ((not (rng-completion-exact-p completion table predicate))
-		  (message "Incomplete")
-		  nil)
-		 ((eq (try-completion completion table predicate) t)
-		  completion)
-		 (t
-		  (message "Complete but not unique")
-		  nil)))
-	  (t
-	   (setq completion
-		 (let ((saved-minibuffer-setup-hook
-			(default-value 'minibuffer-setup-hook)))
-		   (add-hook 'minibuffer-setup-hook
-			     'minibuffer-completion-help
-			     t)
-		   (unwind-protect
-		       (completing-read prompt
-					table
-					predicate
-					nil
-					orig
-					hist)
-		     (setq-default minibuffer-setup-hook
-				   saved-minibuffer-setup-hook))))
-	   (delete-region start (point))
-	   (insert completion)
-	   completion))))
-
-(defun rng-completion-exact-p (string table predicate)
-  (cond ((symbolp table)
-	 (funcall table string predicate 'lambda))
-	((vectorp table)
-	 (intern-soft string table))
-	(t (assoc string table))))
-
-(defun rng-quote-string (s)
-  (concat "\"" s "\""))
-
-(defun rng-escape-string (s)
-  (replace-regexp-in-string "[&\"<>]"
-			    (lambda (match)
-			      (cdr (assoc match
-					  '(("&" . "&amp;")
-					    ("\"" . "&quot;")
-					    (">" . "&gt;")
-					    ("<" . "&lt;")))))
-			    s
-			    t))
-
-(defun rng-collapse-space (string)
-  (setq string
-	(replace-regexp-in-string "[ \t\r\n]+" " " string t t))
-  (when (string-match "\\` " string)
-    (setq string (substring string 1)))
-  (when (string-match " \\'" string)
-    (setq string (substring string 0 -1)))
-  string)
-
-(provide 'rng-util)
-
-;;; rng-util.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-valid.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-valid.el
deleted file mode 100644
index d5ecb3aae0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-valid.el
+++ /dev/null
@@ -1,1467 +0,0 @@
-;;; rng-valid.el --- real-time validation of XML using RELAX NG
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; For usage information, see the documentation for rng-validate-mode.
-;;
-;; This file provides a minor mode that continually validates a buffer
-;; against a RELAX NG schema. The validation state is used to support
-;; schema-sensitive editing as well as validation. Validation is
-;; performed while Emacs is idle.  XML parsing is done using
-;; xmltok.el. This file is responsible for checking that end-tags
-;; match their start-tags.  Namespace processing is handled by
-;; nxml-ns.el. The RELAX NG Compact Syntax schema is parsed into
-;; internal form by rng-cmpct.el.  This internal form is described by
-;; rng-pttrn.el.  Validation of the document by matching against this
-;; internal form is done by rng-match.el. Handling of W3C XML Schema
-;; datatypes is delegated by rng-match.el to rng-xsd.el.  The minor
-;; mode is intended to be used in conjunction with the nxml major
-;; mode, but does not have to be.
-;;
-;; The major responsibility of this file is to allow validation to
-;; happen incrementally.  If a buffer has been validated and is then
-;; changed, we can often revalidate it without having to completely
-;; parse and validate it from start to end.  As we parse and validate
-;; the buffer, we periodically cache the state.  The state has three
-;; components: the stack of open elements, the namespace processing
-;; state and the RELAX NG validation state. The state is cached as the
-;; value of the rng-state text property on the closing greater-than of
-;; tags (but at intervals, not on every tag).  We keep track of the
-;; position up to which cached state is known to be correct by adding
-;; a function to the buffer's after-change-functions. This is stored
-;; in the rng-validate-up-to-date-end variable.  The first way in
-;; which we make validation incremental is obvious: we start
-;; validation from the first cached state before
-;; rng-validate-up-to-date-end.
-;;
-;; To make this work efficiently, we have to be able to copy the
-;; current parsing and validation state efficiently.  We do this by
-;; minimizing destructive changes to the objects storing the state.
-;; When state is changed, we use the old state to create new objects
-;; representing the new state rather than destructively modifying the
-;; objects representing the old state. Copying the state is just a
-;; matter of making a list of three objects, one for each component of
-;; the state; the three objects themselves can be shared and do not
-;; need to be copied.
-;;
-;; There's one other idea that is used to make validation incremental.
-;; Suppose we have a buffer that's 4000 bytes long and suppose we
-;; validated it, caching state at positions 1000, 2000 and 3000.  Now
-;; suppose we make a change at position 1500 inserting 100 characters.
-;; rng-validate-up-to-date-end will be changed to 1500.  When Emacs
-;; becomes idle and we revalidate, validation will restart using the
-;; cached state at position 1000.  However, we take advantage of the
-;; cached state beyond rng-validate-up-to-date-end as follows.  When
-;; our validation reaches position 2100 (the current position of the
-;; character that was at 2000), we compare our current state with the
-;; cached state.  If they are the same, then we can stop parsing
-;; immediately and set rng-validate-up-to-date-end to the end of the
-;; buffer: we already know that the state cached at position 3100 is
-;; correct.  If they are not the same, then we have to continue
-;; parsing.  After the change, but before revalidation, we call the
-;; region from 1600 to the end of the buffer "conditionally
-;; up-to-date".
-;;
-;; As well as the cached parsing and validation state, we also keep
-;; track of the errors in the file.  Errors are stored as overlays
-;; with a category of rng-error.  The number of such overlays in the
-;; buffer must always be equal to rng-error-count.
-
-;;; Code:
-
-(require 'xmltok)
-(require 'nxml-enc)
-(require 'nxml-util)
-(require 'nxml-ns)
-(require 'rng-match)
-(require 'rng-util)
-(require 'rng-loc)
-
-;;; Customizable variables
-
-(defgroup relax-ng nil
-  "Validation of XML using RELAX NG."
-  :group 'wp
-  :group 'nxml
-  :group 'languages)
-
-(defface rng-error-face '((t (:underline "red")))
-  "Face for highlighting XML errors."
-  :group 'relax-ng)
-
-(defcustom rng-state-cache-distance 2000
-  "*Distance in characters between each parsing and validation state cache."
-  :type 'integer
-  :group 'relax-ng)
-
-(defcustom rng-validate-chunk-size 8000
-  "*Number of characters in a RELAX NG validation chunk.
-A validation chunk will be the smallest chunk that is at least this
-size and ends with a tag.  After validating a chunk, validation will
-continue only if Emacs is still idle."
-  :type 'integer
-  :group 'relax-ng)
-
-(defcustom rng-validate-delay 1.5
-  "*Time in seconds that Emacs must be idle before starting a full validation.
-A full validation continues until either validation is up to date
-or Emacs is no longer idle."
-  :type 'number
-  :group 'relax-ng)
-
-(defcustom rng-validate-quick-delay 0.3
-  "*Time in seconds that Emacs must be idle before starting a quick validation.
-A quick validation validates at most one chunk."
-  :type 'number
-  :group 'relax-ng)
-
-;; Global variables
-
-(defvar rng-validate-timer nil)
-(make-variable-buffer-local 'rng-validate-timer)
-;; ensure that we can cancel the timer even after a kill-all-local-variables
-(put 'rng-validate-timer 'permanent-local t)
-
-(defvar rng-validate-quick-timer nil)
-(make-variable-buffer-local 'rng-validate-quick-timer)
-;; ensure that we can cancel the timer even after a kill-all-local-variables
-(put 'rng-validate-quick-timer 'permanent-local t)
-
-(defvar rng-error-count nil
-  "Number of errors in the current buffer.  Always equal to number of
-overlays with category rng-error.")
-(make-variable-buffer-local 'rng-error-count)
-
-(defvar rng-message-overlay nil
-  "Overlay in this buffer whose help-echo property was last printed.
-Nil if none.")
-(make-variable-buffer-local 'rng-message-overlay)
-
-(defvar rng-message-overlay-inhibit-point nil
-  "Position at which message from overlay should be inhibited.
-If point is equal to this and the error overlay around
-point is `rng-message-overlay', then the `help-echo' property
-of the error overlay should not be printed with `message'.")
-(make-variable-buffer-local 'rng-message-overlay-inhibit-point)
-
-(defvar rng-message-overlay-current nil
-  "Non-nil if `rng-message-overlay' is still the current message.")
-(make-variable-buffer-local 'rng-message-overlay-current)
-
-(defvar rng-open-elements nil
-  "Stack of names of open elements represented as a list.
-Each member of the list is either t or a (PREFIX . LOCAL-NAME) pair.
-\(PREFIX . LOCAL-NAME) is pushed for a start-tag; t is pushed
-for a mismatched end-tag.")
-
-(defvar rng-pending-contents nil
-  "Text content of current element that has yet to be processed.
-Value is a list of segments (VALUE START END) positions in reverse
-order.  VALUE is a string or nil.  If VALUE is nil, then the value is
-the string between START and END.  A segment can also be nil
-indicating an unresolvable entity or character reference.")
-
-(defvar rng-collecting-text nil)
-
-(defvar rng-validate-up-to-date-end nil
-  "Last position where validation is known to be up to date.")
-(make-variable-buffer-local 'rng-validate-up-to-date-end)
-
-(defvar rng-conditional-up-to-date-start nil
-  "Marker for the start of the conditionally up-to-date region.
-Nil if there is no conditionally up-to-date region.  The conditionally
-up-to-date region must be such that for any cached state S with
-position P in the conditionally up-to-date region, if at some point it
-is determined that S becomes correct for P, then all states with
-position >= P in the conditionally up to date region must also then be
-correct and all errors between P and the end of the region must then
-be correctly marked.")
-(make-variable-buffer-local 'rng-conditional-up-to-date-start)
-
-(defvar rng-conditional-up-to-date-end nil
-  "Marker for the end of the conditionally up-to-date region.
-Nil if there is no conditionally up-to-date region.  See the variable
-`rng-conditional-up-to-date-start'.")
-(make-variable-buffer-local 'rng-conditional-up-to-date-end)
-
-(defvar rng-parsing-for-state nil
-  "Non-nil means we are currently parsing just to compute the state.
-Should be dynamically bound.")
-
-(defvar rng-validate-mode nil)
-(make-variable-buffer-local 'rng-validate-mode)
-
-(defvar rng-dtd nil)
-(make-variable-buffer-local 'rng-dtd)
-
-;;;###autoload
-(defun rng-validate-mode (&optional arg no-change-schema)
-  "Minor mode performing continual validation against a RELAX NG schema.
-
-Checks whether the buffer is a well-formed XML 1.0 document,
-conforming to the XML Namespaces Recommendation and valid against a
-RELAX NG schema. The mode-line indicates whether it is or not.  Any
-parts of the buffer that cause it not to be are considered errors and
-are highlighted with `rng-error-face'. A description of each error is
-available as a tooltip.  \\[rng-next-error] goes to the next error
-after point. Clicking mouse-1 on the word `Invalid' in the mode-line
-goes to the first error in the buffer. If the buffer changes, then it
-will be automatically rechecked when Emacs becomes idle; the
-rechecking will be paused whenever there is input pending..
-
-By default, uses a vacuous schema that allows any well-formed XML
-document. A schema can be specified explictly using
-\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
-file name or on the root element name.  In each case the schema must
-be a RELAX NG schema using the compact schema \(such schemas
-conventionally have a suffix of `.rnc').  The variable
-`rng-schema-locating-files' specifies files containing rules
-to use for finding the schema."
-  (interactive "P")
-  (setq rng-validate-mode
-	(if (null arg)
-	    (not rng-validate-mode)
-	  (> (prefix-numeric-value arg) 0)))
-  (save-restriction
-    (widen)
-    (nxml-with-unmodifying-text-property-changes
-      (rng-clear-cached-state (point-min) (point-max)))
-    ;; 1+ to clear empty overlays at (point-max)
-    (rng-clear-overlays (point-min) (1+ (point-max))))
-  (setq rng-validate-up-to-date-end 1)
-  (rng-clear-conditional-region)
-  (setq rng-error-count 0)
-  ;; do this here to avoid infinite loop if we set the schema
-  (remove-hook 'rng-schema-change-hook 'rng-validate-clear t)
-  (cond (rng-validate-mode
-	 (unwind-protect
-	     (save-excursion
-	       ;; An error can change the current buffer
-	       (when (or (not rng-current-schema)
-			 (and (eq rng-current-schema rng-any-element)
-			      (not no-change-schema)))
-		 (rng-auto-set-schema t)))
-	   (unless rng-current-schema (rng-set-schema-file-1 nil))
-	   (add-hook 'rng-schema-change-hook 'rng-validate-clear nil t)
-	   (add-hook 'after-change-functions 'rng-after-change-function nil t)
-	   (add-hook 'kill-buffer-hook 'rng-kill-timers nil t)
-	   (add-hook 'echo-area-clear-hook 'rng-echo-area-clear-function nil t)
-	   (add-hook 'post-command-hook 'rng-maybe-echo-error-at-point nil t)
-	   (rng-match-init-buffer)
-	   (rng-activate-timers)
-	   ;; Start validating right away if the buffer is visible.
-	   ;; If it's not visible, don't do this, because the user
-	   ;; won't get any progress indication. When the user finds
-	   ;; a new file, then the buffer won't be visible
-	   ;; when this is invoked.
-	   (when (get-buffer-window (current-buffer) 'visible)
-	     (rng-validate-while-idle (current-buffer)))))
-	(t
-	 (rng-cancel-timers)
-	 (force-mode-line-update)
-	 (remove-hook 'kill-buffer-hook 'rng-cancel-timers t)
-	 (remove-hook 'post-command-hook 'rng-maybe-echo-error-at-point t)
-	 (remove-hook 'echo-area-clear-hook 'rng-echo-area-clear-function t)
-	 (remove-hook 'after-change-functions 'rng-after-change-function t))))
-
-(defun rng-set-schema-file-and-validate (filename)
-  "Sets the schema and turns on `rng-validate-mode' if not already on.
-The schema is set like `rng-set-schema'."
-  (interactive "fSchema file: ")
-  (rng-set-schema-file filename)
-  (or rng-validate-mode (rng-validate-mode)))
-
-(defun rng-set-document-type-and-validate (type-id)
-  (interactive (list (rng-read-type-id)))
-  (and (rng-set-document-type type-id)
-       (or rng-validate-mode (rng-validate-mode))))
-    
-(defun rng-auto-set-schema-and-validate ()
-  "Set the schema for this buffer automatically and turn on `rng-validate-mode'.
-The schema is set like `rng-auto-set-schema'."
-  (interactive)
-  (rng-auto-set-schema)
-  (or rng-validate-mode (rng-validate-mode)))
-
-(defun rng-after-change-function (start end pre-change-len)
-  ;; Work around bug in insert-file-contents.
-  (when (> end (1+ (buffer-size)))
-    (setq start 1)
-    (setq end (1+ (buffer-size))))
-  (setq rng-message-overlay-inhibit-point nil)
-  (nxml-with-unmodifying-text-property-changes
-    (rng-clear-cached-state start end))
-  ;; rng-validate-up-to-date-end holds the position before the change
-  ;; Adjust it to reflect the change.
-  (if (< start rng-validate-up-to-date-end)
-      (setq rng-validate-up-to-date-end
-	    (if (<= (+ start pre-change-len) rng-validate-up-to-date-end)
-		(+ rng-validate-up-to-date-end
-		   (- end start pre-change-len))
-	      start)))
-  ;; Adjust the conditional zone
-  (cond (rng-conditional-up-to-date-start
-	 (when (< rng-conditional-up-to-date-start end)
-	   (if (< end rng-conditional-up-to-date-end)
-	       (set-marker rng-conditional-up-to-date-start end)
-	     (rng-clear-conditional-region))))
-	((< end rng-validate-up-to-date-end)
-	 (setq rng-conditional-up-to-date-end
-	       (copy-marker rng-validate-up-to-date-end nil))
-	 (setq rng-conditional-up-to-date-start
-	       (copy-marker end t))))
-  ;; Adjust rng-validate-up-to-date-end
-  (if (< start rng-validate-up-to-date-end)
-      (setq rng-validate-up-to-date-end start))
-  ;; Must make rng-validate-up-to-date-end < point-max
-  ;; (unless the buffer is empty).
-  ;; otherwise validate-prepare will say there's nothing to do.
-  ;; Don't use (point-max) because we may be narrowed.
-  (if (> rng-validate-up-to-date-end (buffer-size))
-      (setq rng-validate-up-to-date-end
-	    (max 1 (1- rng-validate-up-to-date-end))))
-  ;; Arrange to revalidate
-  (rng-activate-timers)
-  ;; Need to do this after activating the timer
-  (force-mode-line-update))
-
-(defun rng-compute-mode-line-string ()
-  (cond (rng-validate-timer
-	 (concat " Validated:"
-		 (number-to-string
-		  ;; Use floor rather than round because we want
-		  ;; to show 99% rather than 100% for changes near
-		  ;; the end.
-		  (floor (if (eq (buffer-size) 0)
-			     0.0
-			   (/ (* (- rng-validate-up-to-date-end 1) 100.0)
-			      (buffer-size)))))
-		 "%%"))
-	((> rng-error-count 0)
-	 (concat " "
-		 (propertize "Invalid"
-			     'help-echo "mouse-1: go to first error"
-			     'local-map (make-mode-line-mouse-map
-					 'mouse-1
-					 'rng-mouse-first-error))))
-	(t " Valid")))
-   
-(defun rng-cancel-timers ()
-  (let ((inhibit-quit t))
-    (when rng-validate-timer
-      (cancel-timer rng-validate-timer)
-      (setq rng-validate-timer nil))
-    (when rng-validate-quick-timer
-      (cancel-timer rng-validate-quick-timer)
-      (setq rng-validate-quick-timer nil))))
-
-(defun rng-kill-timers ()
-  ;; rng-validate-timer and rng-validate-quick-timer have the
-  ;; permanent-local property, so that the timers can be
-  ;; cancelled even after changing mode.
-  ;; This function takes care of cancelling the timers and
-  ;; then killing the local variables.
-  (when (local-variable-p 'rng-validate-timer)
-    (when rng-validate-timer
-      (cancel-timer rng-validate-timer))
-    (kill-local-variable 'rng-validate-timer))
-  (when (local-variable-p 'rng-validate-quick-timer)
-    (when rng-validate-quick-timer
-      (cancel-timer rng-validate-quick-timer))
-    (kill-local-variable 'rng-validate-quick-timer)))
-      
-(defun rng-activate-timers ()
-  (unless rng-validate-timer
-    (let ((inhibit-quit t))
-      (setq rng-validate-timer
-	    (run-with-idle-timer rng-validate-delay
-				 t
-				 'rng-validate-while-idle
-				 (current-buffer)))
-      (setq rng-validate-quick-timer
-	    (run-with-idle-timer rng-validate-quick-delay
-				 t
-				 'rng-validate-quick-while-idle
-				 (current-buffer))))))
-
-(defun rng-validate-clear ()
-  (rng-validate-mode 1 t))
-
-;; These two variables are dynamically bound and used
-;; to pass information between rng-validate-while-idle
-;; and rng-validate-while-idle-continue-p.
-
-(defvar rng-validate-display-point nil)
-(defvar rng-validate-display-modified-p nil)
-
-(defun rng-validate-while-idle-continue-p ()
-  ;; input-pending-p and sit-for run timers that are
-  ;; ripe.  Binding timer-idle-list to nil prevents
-  ;; this.  If we don't do this, then any ripe timers
-  ;; will get run, and we won't get any chance to
-  ;; validate until Emacs becomes idle again or until
-  ;; the other lower priority timers finish (which
-  ;; can take a very long time in the case of
-  ;; jit-lock).
-  (let ((timer-idle-list nil))
-    (and (not (input-pending-p))
-	 ;; Fake rng-validate-up-to-date-end so that the mode line
-	 ;; shows progress.  Also use this to save point.
-	 (let ((rng-validate-up-to-date-end (point)))
-	   (goto-char rng-validate-display-point)
-	   (when (not rng-validate-display-modified-p)
-	     (restore-buffer-modified-p nil))
-	   (force-mode-line-update)
-	   (let ((continue (sit-for 0)))
-	     (goto-char rng-validate-up-to-date-end)
-	     continue)))))
-
-;; Calling rng-do-some-validation once with a continue-p function, as
-;; opposed to calling it repeatedly, helps on initial validation of a
-;; large buffer with lots of errors.  The overlays for errors will all
-;; get added when rng-do-some-validation returns and won't slow the
-;; validation process down.
-
-(defun rng-validate-while-idle (buffer)
-  (with-current-buffer buffer
-    (if rng-validate-mode
-	(if (let ((rng-validate-display-point (point))
-		  (rng-validate-display-modified-p (buffer-modified-p)))
-	      (rng-do-some-validation 'rng-validate-while-idle-continue-p))
-	    (force-mode-line-update)
-	  (rng-validate-done))
-      ;; must have done kill-all-local-variables
-      (rng-kill-timers))))
-
-(defun rng-validate-quick-while-idle (buffer)
-  (with-current-buffer buffer
-    (if rng-validate-mode
-	(if (rng-do-some-validation)
-	    (force-mode-line-update)
-	  (rng-validate-done))
-      ;; must have done kill-all-local-variables
-      (rng-kill-timers))))
-
-(defun rng-validate-done ()
-  (when (or (not (current-message))
-	    (rng-current-message-from-error-overlay-p))
-    (rng-error-overlay-message (or (rng-error-overlay-after (point)) 
-				   (rng-error-overlay-after (1- (point))))))
-  (rng-cancel-timers)
-  (force-mode-line-update))
-
-(defun rng-do-some-validation (&optional continue-p-function)
-  "Do some validation work. Return t if more to do, nil otherwise."
-  (save-excursion
-    (save-restriction
-      (widen)
-      (nxml-with-invisible-motion
-	(condition-case err
-	    (and (rng-validate-prepare)
-		 (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context)))
-		   (nxml-with-unmodifying-text-property-changes
-		     (rng-do-some-validation-1 continue-p-function))))
-	  ;; errors signalled from a function run by an idle timer
-	  ;; are ignored; if we don't catch them, validation
-	  ;; will get mysteriously stuck at a single place
-	  (rng-compile-error
-	   (message "Incorrect schema. %s" (nth 1 err))
-	   (rng-validate-mode 0)
-	   nil)
-	  (error
-	   (message "Internal error in rng-validate-mode triggered at buffer position %d. %s"
-		    (point)
-		    (error-message-string err))
-	   (rng-validate-mode 0)
-	   nil))))))
-
-(defun rng-validate-prepare ()
-  "Prepare to do some validation, initializing point and the state.
-Return t if there is work to do, nil otherwise."
-  (cond ((= rng-validate-up-to-date-end (point-min))
-	 (rng-set-initial-state)
-	 t)
-	((= rng-validate-up-to-date-end (point-max))
-	 nil)
-	(t (let ((state (get-text-property (1- rng-validate-up-to-date-end)
-					   'rng-state)))
-	     (cond (state
-		    (rng-restore-state state)
-		    (goto-char rng-validate-up-to-date-end))
-		   (t
-		    (let ((pos (previous-single-property-change
-				rng-validate-up-to-date-end
-				'rng-state)))
-		      (cond (pos
-			     (rng-restore-state
-			      (or (get-text-property (1- pos) 'rng-state)
-				  (error "Internal error: state null")))
-			     (goto-char pos))
-			    (t (rng-set-initial-state))))))))))
-
-
-(defun rng-do-some-validation-1 (&optional continue-p-function)
-  (let ((limit (+ rng-validate-up-to-date-end
-		  rng-validate-chunk-size))
-	(remove-start rng-validate-up-to-date-end)
-	(next-cache-point (+ (point) rng-state-cache-distance))
-	(continue t)
-	(xmltok-dtd rng-dtd)
-	have-remaining-chars
-	xmltok-type
-	xmltok-start
-	xmltok-name-colon
-	xmltok-name-end
-	xmltok-replacement
-	xmltok-attributes
-	xmltok-namespace-attributes
-	xmltok-dependent-regions
-	xmltok-errors)
-    (when (= (point) 1)
-      (let ((regions (xmltok-forward-prolog)))
-	(rng-clear-overlays 1 (point))
-	(while regions
-	  (when (eq (aref (car regions) 0) 'encoding-name)
-	    (rng-process-encoding-name (aref (car regions) 1)
-				       (aref (car regions) 2)))
-	  (setq regions (cdr regions))))
-      (unless (equal rng-dtd xmltok-dtd)
-	(rng-clear-conditional-region))
-      (setq rng-dtd xmltok-dtd))
-    (while continue
-      (setq have-remaining-chars (rng-forward))
-      (let ((pos (point)))
-	(setq continue
-	      (and have-remaining-chars
-		   (or (< pos limit)
-		       (and continue-p-function
-			    (funcall continue-p-function)
-			    (setq limit (+ limit rng-validate-chunk-size))
-			    t))))
-	(cond ((and rng-conditional-up-to-date-start
-		    ;; > because we are getting the state from (1- pos)
-		    (> pos rng-conditional-up-to-date-start)
-		    (< pos rng-conditional-up-to-date-end)
-		    (rng-state-matches-current (get-text-property (1- pos)
-								  'rng-state)))
-	       (when (< remove-start (1- pos))
-		 (rng-clear-cached-state remove-start (1- pos)))
-	       ;; sync up with cached validation state
-	       (setq continue nil)
-	       ;; do this before settting rng-validate-up-to-date-end
-	       ;; in case we get a quit
-	       (rng-mark-xmltok-errors)
-	       (rng-mark-xmltok-dependent-regions)
-	       (setq rng-validate-up-to-date-end
-		     (marker-position rng-conditional-up-to-date-end))
-	       (rng-clear-conditional-region)
-	       (setq have-remaining-chars
-		     (< rng-validate-up-to-date-end (point-max))))
-	      ((or (>= pos next-cache-point)
-		   (not continue))
-	       (setq next-cache-point (+ pos rng-state-cache-distance))
-	       (rng-clear-cached-state remove-start pos)
-	       (when have-remaining-chars
-		 (rng-cache-state (1- pos)))
-	       (setq remove-start pos)
-	       (unless continue
-		 ;; if we have just blank chars skip to the end
-		 (when have-remaining-chars
-		   (skip-chars-forward " \t\r\n")
-		   (when (= (point) (point-max))
-		     (rng-clear-overlays pos (point))
-		     (rng-clear-cached-state pos (point))
-		     (setq have-remaining-chars nil)
-		     (setq pos (point))))
-		 (when (not have-remaining-chars)
-		   (rng-process-end-document))
-		 (rng-mark-xmltok-errors)
-		 (rng-mark-xmltok-dependent-regions)
-		 (setq rng-validate-up-to-date-end pos)
-		 (when rng-conditional-up-to-date-end
-		   (cond ((<= rng-conditional-up-to-date-end pos)
-			  (rng-clear-conditional-region))
-			 ((< rng-conditional-up-to-date-start pos)
-			  (set-marker rng-conditional-up-to-date-start
-				      pos)))))))))
-    have-remaining-chars))
-    
-(defun rng-clear-conditional-region ()
-  (when rng-conditional-up-to-date-start
-    (set-marker rng-conditional-up-to-date-start nil)
-    (setq rng-conditional-up-to-date-start nil))
-  (when rng-conditional-up-to-date-end
-    (set-marker rng-conditional-up-to-date-end nil)
-    (setq rng-conditional-up-to-date-end nil)))
-
-(defun rng-clear-cached-state (start end)
-  "Clear cached state between START and END."
-  (remove-text-properties start end '(rng-state nil)))
-
-(defun rng-cache-state (pos)
-  "Save the current state in a text property on the character at pos."
-  (put-text-property pos
-		     (1+ pos)
-		     'rng-state
-		     (rng-get-state)))
-
-(defun rng-state-matches-current (state)
-  (and state
-       (rng-match-state-equal (car state))
-       (nxml-ns-state-equal (nth 1 state))
-       (equal (nth 2 state) rng-open-elements)))
-
-(defun rng-get-state ()
-  (list (rng-match-state)
-	(nxml-ns-state)
-	rng-open-elements))
-
-(defun rng-restore-state (state)
-  (rng-set-match-state (car state))
-  (setq state (cdr state))
-  (nxml-ns-set-state (car state))
-  (setq rng-open-elements (cadr state))
-  (setq rng-pending-contents nil)
-  (setq rng-collecting-text (rng-match-text-typed-p)))
-
-(defun rng-set-initial-state ()
-  (nxml-ns-init)
-  (rng-match-start-document)
-  (setq rng-open-elements nil)
-  (setq rng-pending-contents nil)
-  (goto-char (point-min)))
-
-(defun rng-clear-overlays (beg end)
-  (unless rng-parsing-for-state
-    (let ((overlays (overlays-in beg end)))
-      (while overlays
-	(let* ((overlay (car overlays))
-	       (category (overlay-get overlay 'category)))
-	  (cond ((eq category 'rng-error)
-		 (let ((inhibit-quit t))
-		   (when (eq overlay rng-message-overlay)
-		     (rng-error-overlay-message nil))
-		   (delete-overlay overlay)
-		   ;; rng-error-count could be nil
-		   ;; if overlays left over from a previous use
-		   ;; of rng-validate-mode that ended with a change of mode
-		   (when rng-error-count
-		     (setq rng-error-count (1- rng-error-count)))))
-		((and (eq category 'rng-dependent)
-		      (<= beg (overlay-start overlay)))
-		 (delete-overlay overlay))))
-	(setq overlays (cdr overlays))))))
-
-;;; Dependent regions
-
-(defun rng-mark-xmltok-dependent-regions ()
-  (while xmltok-dependent-regions
-    (apply 'rng-mark-xmltok-dependent-region
-	   (car xmltok-dependent-regions))
-    (setq xmltok-dependent-regions
-	  (cdr xmltok-dependent-regions))))
-
-(defun rng-mark-xmltok-dependent-region (fun start end &rest args)
-  (let ((overlay (make-overlay start end nil t t)))
-    (overlay-put overlay 'category 'rng-dependent)
-    (overlay-put overlay 'rng-funargs (cons fun args))))
-
-(put 'rng-dependent 'evaporate t)
-(put 'rng-dependent 'modification-hooks '(rng-dependent-region-changed))
-(put 'rng-dependent 'insert-behind-hooks '(rng-dependent-region-changed))
-
-(defun rng-dependent-region-changed (overlay
-				     after-p
-				     change-start
-				     change-end
-				     &optional pre-change-length)
-  (when (and after-p
-	     ;; Emacs sometimes appears to call deleted overlays
-	     (overlay-start overlay)
-	     (let ((funargs (overlay-get overlay 'rng-funargs)))
-	       (save-match-data
-		 (save-excursion
-		   (save-restriction
-		     (widen)
-		     (apply (car funargs)
-			    (append (list change-start
-					  change-end
-					  pre-change-length
-					  (overlay-start overlay)
-					  (overlay-end overlay))
-				    (cdr funargs))))))))
-    (rng-after-change-function (overlay-start overlay)
-			       change-end
-			       (+ pre-change-length
-				  (- (overlay-start overlay)
-				     change-start)))
-    (delete-overlay overlay)))
-
-;;; Error state
-
-(defun rng-mark-xmltok-errors ()
-  (while xmltok-errors
-    (let ((err (car xmltok-errors)))
-      (rng-mark-not-well-formed (xmltok-error-message err)
-				(xmltok-error-start err)
-				(xmltok-error-end err)))
-    (setq xmltok-errors (cdr xmltok-errors))))
-
-(defun rng-mark-invalid (message beg end)
-  (rng-mark-error message beg end))
-
-(defun rng-mark-not-well-formed (message beg end)
-  ;; Don't try to validate further
-  ;;(rng-set-match-state rng-not-allowed-ipattern)
-  (rng-mark-error message beg end))
-
-(defun rng-mark-error (message beg end)
-  (unless rng-parsing-for-state
-    (let ((overlays (overlays-in beg end)))
-      (while (and overlays message)
-	(let ((o (car overlays)))
-	  (when (and (eq (overlay-get o 'category) 'rng-error)
-		     (= (overlay-start o) beg)
-		     (= (overlay-end o) end))
-	    (overlay-put o
-			 'help-echo
-			 (concat (overlay-get o 'help-echo)
-				 "\n"
-				 message))
-	    (setq message nil)))
-	(setq overlays (cdr overlays))))
-    (when message
-      (let ((inhibit-quit t))
-	(setq rng-error-count (1+ rng-error-count))
-	(let ((overlay
-	       (make-overlay beg end nil t
-			     ;; Need to make the rear delimiter advance
-			     ;; with the front delimiter when the overlay
-			     ;; is empty, otherwise the front delimiter
-			     ;; will move past the rear delimiter.
-			     (= beg end))))
-	  ;; Ensure when we have two overlapping messages, the help-echo
-	  ;; of the one that starts first is shown
-	  (overlay-put overlay 'priority beg)
-	  (overlay-put overlay 'category 'rng-error)
-	  (overlay-put overlay 'help-echo message))))))
-
-(put 'rng-error 'face 'rng-error-face)
-(put 'rng-error 'modification-hooks '(rng-error-modified))
-
-;; If we don't do this, then the front delimiter can move
-;; past the end delimiter.
-(defun rng-error-modified (overlay after-p beg end &optional pre-change-len)
-  (when (and after-p
-	     (overlay-start overlay)	; check not deleted
-	     (>= (overlay-start overlay)
-		 (overlay-end overlay)))
-    (let ((inhibit-quit t))
-      (delete-overlay overlay)
-      (setq rng-error-count (1- rng-error-count)))))
-
-(defun rng-echo-area-clear-function ()
-  (setq rng-message-overlay-current nil))
-
-;;; Error navigation
-	     
-(defun rng-maybe-echo-error-at-point ()
-  (when (or (not (current-message))
-	    (rng-current-message-from-error-overlay-p))
-    (rng-error-overlay-message (rng-error-overlay-after (point)))))
-
-(defun rng-error-overlay-after (pos)
-  (let ((overlays (overlays-in pos (1+ pos)))
-	(best nil))
-    (while overlays
-      (let ((overlay (car overlays)))
-	(when (and (eq (overlay-get overlay 'category)
-		       'rng-error)
-		   (or (not best)
-		       (< (overlay-start best)
-			  (overlay-start overlay))))
-	  (setq best overlay)))
-      (setq overlays (cdr overlays)))
-    best))
-
-(defun rng-first-error ()
-  "Go to the first validation error.
-Turn on `rng-validate-mode' if it is not already on."
-  (interactive)
-  (or rng-validate-mode (rng-validate-mode))
-  (when (and (eq rng-validate-up-to-date-end 1)
-	     (< rng-validate-up-to-date-end (point-max)))
-    (rng-do-some-validation))
-  (let ((err (rng-find-next-error-overlay (1- (point-min)))))
-    (if err
-	(rng-goto-error-overlay err)
-      (let ((pos (save-excursion
-		   (goto-char (point-min))
-		   (rng-next-error 1))))
-	(when pos
-	  (goto-char pos))))))
-
-(defun rng-mouse-first-error (event)
-  "Go to the first validation error from a mouse click."
-  (interactive "e")
-  (select-window (posn-window (event-start event)))
-  (rng-first-error))
-
-(defun rng-next-error (arg)
-  "Go to the next validation error after point.
-Turn on `rng-validate-mode' if it is not already on.
-A prefix ARG specifies how many errors to move. A negative ARG
-moves backwards. Just \\[universal-argument] as a prefix
-means goto the first error."
-  (interactive "P")
-  (if (consp arg)
-      (rng-first-error)
-    (or rng-validate-mode (rng-validate-mode))
-    (setq arg (prefix-numeric-value arg))
-    (if (< arg 0)
-	(rng-previous-error-1 (- arg))
-      (rng-next-error-1 arg))))
-
-(defun rng-previous-error (arg)
-  "Go to the previous validation error before point.
-Turn on `rng-validate-mode' if it is not already on.
-A prefix ARG specifies how many errors to move. A negative ARG
-moves forwards. Just \\[universal-argument] as a prefix
-means goto the first error."
-  (interactive "P")
-  (if (consp arg)
-      (rng-first-error)
-    (or rng-validate-mode (rng-validate-mode))
-    (setq arg (prefix-numeric-value arg))
-    (if (< arg 0)
-	(rng-next-error-1 (- arg))
-      (rng-previous-error-1 arg))))
-
-(defun rng-next-error-1 (arg)
-  (let* ((pos (point))
-	 err last-err)
-    (while (and (> arg 0)
-		(setq err (rng-find-next-error-overlay pos)))
-      (setq arg (1- arg))
-      (setq last-err err)
-      (setq pos (overlay-start err)))
-    (when (> arg 0)
-      (setq pos (max pos (1- rng-validate-up-to-date-end)))      
-      (when (< rng-validate-up-to-date-end (point-max))
-	(message "Parsing...")
-	(while (let ((more-to-do (rng-do-some-validation)))
-		 (while (and (> arg 0)
-			     (setq err (rng-find-next-error-overlay pos)))
-		   (setq arg (1- arg))
-		   (setq last-err err)
-		   (setq pos (overlay-start err)))
-		 (when (and (> arg 0)
-			    more-to-do
-			    (< rng-validate-up-to-date-end (point-max)))
-		   ;; Display percentage validated.
-		   (force-mode-line-update)
-		   ;; Force redisplay but don't allow idle timers to run.
-		   (let ((timer-idle-list nil))
-		     (sit-for 0))
-		   (setq pos
-			 (max pos (1- rng-validate-up-to-date-end)))
-		   t)))))
-    (if last-err
-	(rng-goto-error-overlay last-err)
-      (message "No more errors")
-      nil)))
-
-(defun rng-previous-error-1 (arg)
-  (let* ((pos (point))
-	 err last-err)
-    (while (and (> arg 0)
-		(setq err (rng-find-previous-error-overlay pos)))
-      (setq pos (overlay-start err))
-      (setq last-err err)
-      (setq arg (1- arg)))
-    (when (and (> arg 0)
-	       (< rng-validate-up-to-date-end (min pos (point-max))))
-      (message "Parsing...")
-      (while (and (rng-do-some-validation)
-		  (< rng-validate-up-to-date-end (min pos (point-max))))
-	(force-mode-line-update)
-	;; Force redisplay but don't allow idle timers to run.
-	(let ((timer-idle-list nil))
-	  (sit-for 0)))
-      (while (and (> arg 0)
-		  (setq err (rng-find-previous-error-overlay pos)))
-	(setq pos (overlay-start err))
-	(setq last-err err)
-	(setq arg (1- arg))))
-    (if last-err
-	(rng-goto-error-overlay last-err)
-      (message "No previous errors")
-      nil)))
-      
-(defun rng-goto-error-overlay (err)
-  "Goto the start of error overlay ERR and print its message."
-  (goto-char (overlay-start err))
-  (setq rng-message-overlay-inhibit-point nil)
-  (rng-error-overlay-message err))
-
-(defun rng-error-overlay-message (err)
-  (if err
-      (unless (or (and (eq rng-message-overlay-inhibit-point (point))
-		       (eq rng-message-overlay err))
-		  (= (point-max) 1))
-	(message "%s" (overlay-get err 'help-echo))
-	(setq rng-message-overlay-current t)
-	(setq rng-message-overlay-inhibit-point (point)))
-    (when (rng-current-message-from-error-overlay-p)
-      (message nil))
-    (setq rng-message-overlay-inhibit-point nil))
-  (setq rng-message-overlay err))
-
-(defun rng-current-message-from-error-overlay-p ()
-  (and rng-message-overlay-current
-       rng-message-overlay
-       (equal (overlay-get rng-message-overlay 'help-echo)
-	      (current-message))))
-
-(defun rng-find-next-error-overlay (pos)
-  "Return the overlay for the next error starting after POS.
-Return nil if there is no such overlay or it is out of date.
-Do not do any additional validation."
-  (when rng-error-count
-    (let (done found overlays)
-      (while (not done)
-	(cond (overlays
-	       (let ((overlay (car overlays)))
-		 (setq overlays (cdr overlays))
-		 (when (and (eq (overlay-get overlay 'category) 'rng-error)
-			    ;; Is it the first?
-			    (= (overlay-start overlay) pos)
-			    ;; Is it up to date?
-			    (<= (overlay-end overlay)
-				rng-validate-up-to-date-end))
-		   (setq done t)
-		   (setq found overlay))))
-	      ((or (= pos (point-max))
-		   (> (setq pos (next-overlay-change pos))
-		      rng-validate-up-to-date-end))
-	       (setq done t))
-	      (t (setq overlays (overlays-in pos (1+ pos))))))
-      found)))
-
-(defun rng-find-previous-error-overlay (pos)
-  "Return the overlay for the last error starting before POS.
-Return nil if there is no such overlay or it is out of date.
-Do not do any additional validation."
-  (when (and rng-error-count
-	     (<= pos rng-validate-up-to-date-end))
-    (let (done found overlays)
-      (while (not done)
-	(cond (overlays
-	       (let ((overlay (car overlays)))
-		 (setq overlays (cdr overlays))
-		 (when (and (eq (overlay-get overlay 'category) 'rng-error)
-			    ;; Is it the first?
-			    (= (overlay-start overlay) pos))
-		   (setq done t)
-		   (setq found overlay))))
-	      ((= pos (point-min))
-	       (setq done t))
-	      (t
-	       (setq pos (previous-overlay-change pos))
-	       (setq overlays (overlays-in pos (1+ pos))))))
-      found)))
-
-;;; Parsing
-
-(defun rng-forward (&optional limit)
-  "Move forward over one or more tokens updating the state.
-If LIMIT is nil, stop after tags.
-If LIMIT is non-nil, stop when end of last token parsed is >= LIMIT.
-Return nil at end of buffer, t otherwise."
-  (let (type)
-    (while (progn
-	     (setq type (xmltok-forward))
-	     (rng-clear-overlays xmltok-start (point))
-	     (let ((continue
-		    (cond ((eq type 'start-tag)
-			   (rng-process-start-tag 'start-tag)
-			   nil)
-			  ((eq type 'end-tag)
-			   (rng-process-end-tag)
-			   nil)
-			  ((eq type 'empty-element)
-			   (rng-process-start-tag 'empty-element)
-			   nil)
-			  ((eq type 'space)
-			   (rng-process-text xmltok-start nil t)
-			   t)
-			  ((eq type 'data)
-			   (rng-process-text xmltok-start nil nil)
-			   t)
-			  ((memq type '(entity-ref char-ref))
-			   (cond (xmltok-replacement
-				  (rng-process-text xmltok-start
-						    nil
-						    'maybe
-						    xmltok-replacement))
-				 ((eq type 'char-ref)
-				  (rng-process-unknown-char))
-				 (t
-				  (rng-process-unknown-entity)))
-			   t)
-			  ((eq type 'cdata-section)
-			   (rng-process-text (+ xmltok-start 9)	; "<![CDATA["
-					     (- (point) 3) ; "]]>"
-					     'maybe)
-			   t)
-			  ((eq type 'partial-start-tag)
-			   (rng-process-start-tag 'partial-start-tag)
-			   t)
-			  ((eq type 'partial-empty-element)
-			   (rng-process-start-tag 'empty-element)
-			   t)
-			  ((eq type 'partial-end-tag)
-			   (rng-process-end-tag 'partial)
-			   t)
-			  (t type))))
-	       (if limit
-		   (< (point) limit)
-		 continue))))
-    (and type t)))
-
-(defun rng-process-start-tag (tag-type)
-  "TAG-TYPE is `start-tag' for a start-tag, `empty-element' for
-an empty element.  partial-empty-element should be passed
-as empty-element."
-  (and rng-collecting-text (rng-flush-text))
-  (setq rng-collecting-text nil)
-  (setq rng-pending-contents nil)
-  (rng-process-namespaces)
-  (let ((tag (rng-process-tag-name)))
-    (rng-process-attributes)
-    ;; set the state appropriately
-    (cond ((eq tag-type 'empty-element)
-	   (rng-process-start-tag-close)
-	   ;; deal with missing content with empty element
-	   (when (not (rng-match-empty-content))
-	     (rng-match-after)
-	     (rng-mark-start-tag-close "Empty content not allowed"))
-	   (nxml-ns-pop-state))
-	  ((eq tag-type 'start-tag)
-	   (rng-process-start-tag-close)
-	   (setq rng-collecting-text (rng-match-text-typed-p))
-	   (rng-push-tag tag))
-	  ((eq tag-type 'partial-start-tag)
-	   (rng-process-start-tag-close)
-	   (rng-match-after)
-	   (nxml-ns-pop-state)))))
-
-(defun rng-process-namespaces ()
-  (let ((nsatts xmltok-namespace-attributes)
-	prefixes)
-    (nxml-ns-push-state)
-    (while nsatts
-      (let* ((att (car nsatts))
-	     (value (xmltok-attribute-value att)))
-	(when value
-	  (let ((ns (nxml-make-namespace value))
-		(prefix (and (xmltok-attribute-prefix att)
-			     (xmltok-attribute-local-name att))))
-	    (cond ((member prefix prefixes)
-		   (rng-mark-invalid "Duplicate namespace declaration"
-				     (xmltok-attribute-name-start att)
-				     (xmltok-attribute-name-end att)))
-		  ((not prefix)
-		   (nxml-ns-set-default ns))
-		  (ns
-		   (nxml-ns-set-prefix prefix ns))
-		  (t
-		   ;; cannot have xmlns:foo=""
-		   (rng-mark-invalid "Namespace prefix cannot be undeclared"
-				     (1- (xmltok-attribute-value-start att))
-				     (1+ (xmltok-attribute-value-end att)))))
-	    (setq prefixes (cons prefix prefixes)))))
-      (setq nsatts (cdr nsatts)))))
-
-(defun rng-process-tag-name ()
-  (let* ((prefix (xmltok-start-tag-prefix))
-	 (local-name (xmltok-start-tag-local-name))
-	 (name
-	  (if prefix
-	      (let ((ns (nxml-ns-get-prefix prefix)))
-		(cond (ns (cons ns local-name))
-		      ((and (setq ns
-				  (rng-match-infer-start-tag-namespace
-				   local-name))
-			    (rng-match-start-tag-open (cons ns local-name)))
-		       (nxml-ns-set-prefix prefix ns)
-		       (rng-mark-start-tag-close "Missing xmlns:%s=\"%s\""
-						 prefix
-						 (nxml-namespace-name ns))
-		       nil)
-		      (t
-		       (rng-recover-bad-element-prefix)
-		       nil)))
-	    (cons (nxml-ns-get-default) local-name))))
-    (when (and name
-	       (not (rng-match-start-tag-open name)))
-      (unless (and (not (car name))
-		   (let ((ns (rng-match-infer-start-tag-namespace (cdr name))))
-		     (and ns
-			  (rng-match-start-tag-open (cons ns local-name))
-			  (progn
-			    (nxml-ns-set-default ns)
-			    ;; XXX need to check we don't have xmlns=""
-			    (rng-mark-start-tag-close "Missing xmlns=\"%s\""
-						      (nxml-namespace-name ns))
-			    t))))
-	(rng-recover-start-tag-open name)))
-    (cons prefix local-name)))
-
-(defun rng-process-attributes ()
-  (let ((atts xmltok-attributes)
-	names)
-    (while atts
-      (let* ((att (car atts))
-	     (prefix (xmltok-attribute-prefix att))
-	     (local-name (xmltok-attribute-local-name att))
-	     (name
-	      (if prefix
-		  (let ((ns (nxml-ns-get-prefix prefix)))
-		    (and ns
-			 (cons ns local-name)))
-		(cons nil local-name))))
-	(cond ((not name)
-	       (rng-recover-bad-attribute-prefix att))
-	      ((member name names)
-	       (rng-recover-duplicate-attribute-name att))
-	      ((not (rng-match-attribute-name name))
-	       (rng-recover-attribute-name att))
-	      ((rng-match-text-typed-p)
-	       (let ((value (xmltok-attribute-value att)))
-		 (if value
-		     (or (rng-match-attribute-value value)
-			 (rng-recover-attribute-value att))
-		   (rng-match-after))))
-	      (t (or (rng-match-end-tag)
-		     (error "Internal error:\
- invalid on untyped attribute value"))))
-	(setq names (cons name names)))
-      (setq atts (cdr atts)))))
-
-(defun rng-process-start-tag-close ()
-  ;; deal with missing attributes
-  (unless (rng-match-start-tag-close)
-    (rng-mark-start-tag-close (rng-missing-attributes-message))
-    (rng-match-ignore-attributes)))
-
-(defun rng-mark-start-tag-close (&rest args)
-  (when (not (eq xmltok-type 'partial-start-tag))
-    (rng-mark-invalid (apply 'format args)
-		      (- (point)
-			 (if (eq xmltok-type 'empty-element)
-			     2
-			   1))
-		      (point))))
-
-(defun rng-recover-bad-element-prefix ()
-  (rng-mark-invalid "Prefix not declared"
-		    (1+ xmltok-start)
-		    xmltok-name-colon)
-  (rng-match-unknown-start-tag-open))
-
-(defun rng-recover-bad-attribute-prefix (att)
-  (rng-mark-invalid "Prefix not declared"
-		    (xmltok-attribute-name-start att)
-		    (xmltok-attribute-name-colon att)))
-
-(defun rng-recover-duplicate-attribute-name (att)
-  (rng-mark-invalid "Duplicate attribute"
-		    (xmltok-attribute-name-start att)
-		    (xmltok-attribute-name-end att)))
-
-(defun rng-recover-start-tag-open (name)
-  (let ((required (rng-match-required-element-name)))
-    (cond ((and required
-		(rng-match-start-tag-open required)
-		(rng-match-after)
-		(rng-match-start-tag-open name))
-	   (rng-mark-invalid (concat "Missing element "
-				     (rng-quote-string
-				      (rng-name-to-string required)))
-			     xmltok-start
-			     (1+ xmltok-start)))
-	  ((and (rng-match-optionalize-elements)
-		(rng-match-start-tag-open name))
-	   (rng-mark-invalid "Required elements missing"
-			     xmltok-start
-			     (1+ xmltok-start)))
-	  ((rng-match-out-of-context-start-tag-open name)
-	   (rng-mark-invalid "Element not allowed in this context"
-			     (1+ xmltok-start)
-			     xmltok-name-end))
-	  (t
-	   (rng-match-unknown-start-tag-open)
-	   (rng-mark-invalid "Unknown element"
-			     (1+ xmltok-start)
-			     xmltok-name-end)))))
-
-(defun rng-recover-attribute-value (att)
-  (let ((start (xmltok-attribute-value-start att))
-	(end (xmltok-attribute-value-end att)))
-    (if (= start end)
-	(rng-mark-invalid "Empty attribute value invalid" start (1+ end))
-      (rng-mark-invalid "Attribute value invalid" start end)))
-  (rng-match-after))
-
-(defun rng-recover-attribute-name (att)
-  (rng-mark-invalid "Attribute not allowed"
-		    (xmltok-attribute-name-start att)
-		    (xmltok-attribute-name-end att)))
-
-(defun rng-missing-attributes-message ()
-  (let ((required-attributes
-	 (rng-match-required-attribute-names)))
-    (cond ((not required-attributes)
-	   "Required attributes missing")
-	  ((not (cdr required-attributes))
-	   (concat "Missing attribute "
-		   (rng-quote-string
-		    (rng-name-to-string (car required-attributes) t))))
-	  (t
-	   (concat "Missing attributes "
-		   (mapconcat (lambda (nm)
-				(rng-quote-string
-				 (rng-name-to-string nm t)))
-			      required-attributes
-			      ", "))))))
-      
-(defun rng-process-end-tag (&optional partial)
-  (cond ((not rng-open-elements)
-	 (rng-mark-not-well-formed "Extra end-tag"
-				   xmltok-start
-				   (point)))
-	((or partial
-	     (equal (cons (xmltok-end-tag-prefix)
-			  (xmltok-end-tag-local-name))
-		    (car rng-open-elements)))
-	 (rng-end-element))
-	(t (rng-recover-mismatched-end-tag))))
-
-(defun rng-end-element ()
-  (if rng-collecting-text
-      (let ((contents (rng-contents-string)))
-	(cond ((not contents) (rng-match-after))
-	      ((not (rng-match-element-value contents))
-	       (let* ((region (rng-contents-region)))
-		 (if (not region)
-		     (rng-mark-invalid "Empty content not allowed"
-				       xmltok-start
-				       (+ xmltok-start 2))
-		   (rng-mark-invalid "Invalid data"
-				     (car region)
-				     (cdr region))))
-	       (rng-match-after)))
-	(setq rng-collecting-text nil)
-	(setq rng-pending-contents nil))
-    (unless (rng-match-end-tag)
-       (rng-mark-invalid (rng-missing-element-message)
-			 xmltok-start
-			 (+ xmltok-start 2))
-       (rng-match-after)))
-  (nxml-ns-pop-state)
-  (when (eq (car rng-open-elements) t)
-    (rng-pop-tag))
-  (rng-pop-tag))
-
-(defun rng-missing-element-message ()
-  (let ((element (rng-match-required-element-name)))
-    (if element
-	(concat "Missing element "
-		(rng-quote-string (rng-name-to-string element)))
-      "Required child elements missing")))
-
-(defun rng-recover-mismatched-end-tag ()
-  (let* ((name (cons (xmltok-end-tag-prefix)
-		     (xmltok-end-tag-local-name))))
-    (cond ((member name (cdr rng-open-elements))
-	   (let* ((suppress-error (eq (car rng-open-elements) t))
-		  missing top)
-	     (while (progn
-		      (setq top (car rng-open-elements))
-		      (rng-pop-tag)
-		      (unless (eq top t)
-			(setq missing (cons top missing))
-			(nxml-ns-pop-state)
-			(rng-match-after))
-		      (not (equal top name))))
-	     (unless suppress-error
-	       (rng-mark-missing-end-tags (cdr missing)))))
-	  ((rng-match-empty-before-p)
-	   (rng-mark-mismatched-end-tag)
-	   (rng-end-element))
-	  (t (rng-mark-mismatched-end-tag)
-	     (setq rng-open-elements
-		   (cons t rng-open-elements))))))
-
-(defun rng-mark-missing-end-tags (missing)
-  (rng-mark-not-well-formed
-   (format "Missing end-tag%s %s"
-	   (if (null (cdr missing)) "" "s")
-	   (mapconcat (lambda (name)
-			(rng-quote-string
-			 (if (car name)
-			     (concat (car name)
-				     ":"
-				     (cdr name))
-			   (cdr name))))
-		      missing
-		      ", "))
-   xmltok-start
-   (+ xmltok-start 2)))
-
-(defun rng-mark-mismatched-end-tag ()
-  (rng-mark-not-well-formed "Mismatched end-tag"
-			    (+ xmltok-start 2)
-			    xmltok-name-end))
-
-(defun rng-push-tag (prefix-local-name)
-  (setq rng-open-elements
-	(cons prefix-local-name rng-open-elements)))
-
-(defun rng-pop-tag ()
-  (setq rng-open-elements (cdr rng-open-elements)))
-
-(defun rng-contents-string ()
-  (let ((contents rng-pending-contents))
-    (cond ((not contents) "")
-	  ((memq nil contents) nil)
-	  ((not (cdr contents))
-	   (rng-segment-string (car contents)))
-	  (t (apply 'concat
-		    (nreverse (mapcar 'rng-segment-string
-				      contents)))))))
-
-(defun rng-segment-string (segment)
-  (or (car segment)
-      (apply 'buffer-substring-no-properties
-	     (cdr segment))))
-
-(defun rng-segment-blank-p (segment)
-  (if (car segment)
-      (rng-blank-p (car segment))
-    (apply 'rng-region-blank-p
-	   (cdr segment))))
-
-(defun rng-contents-region ()
-  (if (null rng-pending-contents)
-      nil
-    (let* ((contents rng-pending-contents)
-	   (head (cdar contents))
-	   (start (car head))
-	   (end (cadr head)))
-      (while (setq contents (cdr contents))
-	(setq start (car (cdar contents))))
-      (cons start end))))
-
-(defun rng-process-text (start end whitespace &optional value)
-  "Process characters between position START and END as text.
-END nil means point. WHITESPACE t means known to be whitespace, nil
-means known not to be, anything else means unknown whether whitespace
-or not. END must not be nil if WHITESPACE is neither t nor nil.
-VALUE is a string or nil; nil means the value is equal to the
-string between START and END."
-  (cond (rng-collecting-text
-	 (setq rng-pending-contents (cons (list value start (or end (point)))
-					  rng-pending-contents)))
-	((not (or (and whitespace
-		       (or (eq whitespace t)
-			   (if value
-			       (rng-blank-p value)
-			     (rng-region-blank-p start end))))
-		  (rng-match-mixed-text)))
-	 (rng-mark-invalid "Text not allowed" start (or end (point))))))
-
-(defun rng-process-unknown-char ()
-  (when rng-collecting-text
-    (setq rng-pending-contents
-	  (cons nil rng-pending-contents))))
-
-(defun rng-process-unknown-entity ()
-  (rng-process-unknown-char)
-  (rng-match-optionalize-elements))
-
-(defun rng-region-blank-p (beg end)
-  (save-excursion
-    (goto-char beg)
-    (= (skip-chars-forward " \n\r\t" end)
-       (- end beg))))
-
-(defun rng-flush-text ()
-  (while rng-pending-contents
-    (let ((segment (car rng-pending-contents)))
-      (unless (or (rng-segment-blank-p segment)
-		  (rng-match-mixed-text))
-	(let ((region (cdr segment)))
-	  (rng-mark-invalid "In this context text cannot be mixed with elements"
-			    (car region)
-			    (cadr region)))))
-    (setq rng-pending-contents (cdr rng-pending-contents))))
-
-(defun rng-process-end-document ()
-  ;; this is necessary to clear empty overlays at (point-max)
-  (rng-clear-overlays (point) (point))
-  (let ((start (save-excursion
-		 (skip-chars-backward " \t\r\n")
-		 (point))))
-    (cond (rng-open-elements
-	   (unless (eq (car rng-open-elements) t)
-	     (rng-mark-not-well-formed "Missing end-tag"
-				       start
-				       (point))))
-	  ((not (rng-match-nullable-p))
-	   (rng-mark-not-well-formed "No document element"
-				     start
-				     (point))))))
-
-(defun rng-process-encoding-name (beg end)
-  (unless (let ((charset (buffer-substring-no-properties beg end)))
-	    (or (nxml-mime-charset-coding-system charset)
-		(string= (downcase charset) "utf-16")))
-    (rng-mark-not-well-formed "Unsupported encoding" beg end)))
-
-(defun rng-name-to-string (name &optional attributep)
-  (let ((ns (car name))
-	(local-name (cdr name)))
-    (if (or (not ns)
-	    (and (not attributep)
-		 (eq (nxml-ns-get-default) ns)))
-	local-name
-      (let ((prefix (nxml-ns-prefix-for ns)))
-	(if prefix
-	    (concat prefix ":" local-name)
-	  (concat "{" (symbol-name ns) "}" local-name))))))
-
-(provide 'rng-valid)
-
-;;; rng-valid.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-xsd.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-xsd.el
deleted file mode 100644
index 65091ef879..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/rng-xsd.el
+++ /dev/null
@@ -1,858 +0,0 @@
-;;; rng-xsd.el --- W3C XML Schema datatypes library for RELAX NG
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, RelaxNG
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; The main entry point is `rng-xsd-compile'. The validator
-;; knows to use this for the datatype library with URI
-;; http://www.w3.org/2001/XMLSchema-datatypes because it
-;; is the value of the rng-dt-compile property on that URI
-;; as a symbol.
-;;
-;; W3C XML Schema Datatypes are specified by
-;;   http://www.w3.org/TR/xmlschema-2/
-;; Guidelines for using them with RELAX NG are described in
-;;   http://relaxng.org/xsd.html
-
-;;; Code:
-
-(require 'rng-dt)
-(require 'rng-util)
-(require 'xsd-regexp)
-
-;;;###autoload
-(put 'http://www.w3.org/2001/XMLSchema-datatypes
-     'rng-dt-compile
-     'rng-xsd-compile)
-
-;;;###autoload
-(defun rng-xsd-compile (name params)
-  "Provides W3C XML Schema as a RELAX NG datatypes library. NAME is a
-symbol giving the local name of the datatype.  PARAMS is a list of
-pairs (PARAM-NAME . PARAM-VALUE) where PARAM-NAME is a symbol giving
-the name of the parameter and PARAM-VALUE is a string giving its
-value.  If NAME or PARAMS are invalid, it calls rng-dt-error passing
-it arguments in the same style as format; the value from rng-dt-error
-will be returned.  Otherwise, it returns a list.  The first member of
-the list is t if any string is a legal value for the datatype and nil
-otherwise.  The second argument is a symbol; this symbol will be
-called as a function passing it a string followed by the remaining
-members of the list.  The function must return an object representing
-the value of the datatype that was represented by the string, or nil
-if the string is not a representation of any value. The object
-returned can be any convenient non-nil value, provided that, if two
-strings represent the same value, the returned objects must be equal."
-  (let ((convert (get name 'rng-xsd-convert)))
-    (if (not convert)
-	(rng-dt-error "There is no XSD datatype named %s" name)
-      (rng-xsd-compile1 name params convert))))
-
-;;; Parameters
-
-(defun rng-xsd-compile1 (name params convert)
-  (if (null params)
-      (cons (equal convert '(identity))
-	    (cond ((eq name 'string) convert)
-		  ((eq name 'normalizedString)
-		   (cons 'rng-xsd-replace-space convert))
-		  ((and (not (eq name 'string))
-			(or (memq 'identity convert)
-			    (memq 'rng-xsd-convert-any-uri convert)
-			    (memq 'rng-xsd-check-pattern convert)))
-		   (cons 'rng-xsd-collapse-space convert))
-		  (t convert)))
-    (let* ((param (car params))
-	   (param-name (car param))
-	   (param-value (cdr param)))
-      (cond ((memq param-name
-		   '(minExclusive maxExclusive minInclusive maxInclusive))
-	     (let ((limit (apply (car convert)
-				 (cons param-value
-				       (cdr convert))))
-		   (less-than-fun (get name 'rng-xsd-less-than)))
-	       (cond ((not limit)
-		      (rng-dt-error "Minimum value %s is not valid"
-				    param-value))
-		     ((not less-than-fun)
-		      (rng-dt-error "Values of type %s are not ordered"
-				    param-name))
-		     (t
-		      (rng-xsd-compile1 name
-					(cdr params)
-					(cons (get param-name
-						   'rng-xsd-check)
-					      (cons less-than-fun
-						    (cons limit convert))))))))
-	    ((memq param-name '(length minLength maxLength))
-	     (let ((limit (rng-xsd-string-to-non-negative-integer param-value))
-		   (length-fun (get name 'rng-xsd-length)))
-	       (cond ((not limit)
-		      (rng-dt-error "Length %s is not valid" param-value))
-		     ((not length-fun)
-		      (rng-dt-error "Values of type %s do not have a length"
-				    param-name))
-		     (t
-		      (rng-xsd-compile1 name
-					(cdr params)
-					(cons (get param-name
-						   'rng-xsd-check)
-					      (cons length-fun
-						    (cons limit convert))))))))
-	    ((memq param-name '(fractionDigits totalDigits))
-	     (let ((n (rng-xsd-string-to-non-negative-integer param-value)))
-	       (cond ((not n)
-		      (rng-dt-error "Number of digits %s is not valid"
-				    param-value))
-		     (t
-		      (rng-xsd-compile1 name
-					(cdr params)
-					(cons (get param-name
-						   'rng-xsd-check)
-					      (cons n convert)))))))
-	    ((eq param-name 'pattern)
-	     (condition-case err
-		 (rng-xsd-compile1 name
-				   (cdr params)
-				   (cons 'rng-xsd-check-pattern
-					 (cons (concat
-						"\\`"
-						(xsdre-translate param-value)
-						"\\'")
-					       convert)))
-	       (xsdre-invalid-regexp
-		(rng-dt-error "Invalid regular expression (%s)"
-			      (nth 1 err)))))
-	    ((memq param-name '(enumeration whiteSpace))
-	     (rng-dt-error "Facet %s cannot be used in RELAX NG" param-name))
-	    (t (rng-dt-error "Unknown facet %s" param-name))))))
-	  
-(defun rng-xsd-string-to-non-negative-integer (str)
-  (and (rng-xsd-convert-integer str)
-       (let ((n (string-to-number str)))
-	 (and (integerp n)
-	      (>= n 0)
-	      n))))
-
-(defun rng-xsd-collapse-space (str convert &rest args)
-  (apply convert (cons (mapconcat 'identity (split-string str "[ \t\n\r]+")
-				  " ")
-		       args)))
-
-(defun rng-xsd-replace-space (str convert &rest args)
-  (apply convert
-	 (cons (let ((i 0)
-		     copied)
-		 (while (and (setq i (string-match "[\r\n\t]" str i))
-			     (or copied (setq copied (copy-sequence str)))
-			     (aset copied i 32)
-			     (setq i (1+ i))))
-		 (or copied str))
-	       args)))
-
-(put 'minExclusive 'rng-xsd-check 'rng-xsd-check-min-exclusive)
-(put 'minInclusive 'rng-xsd-check 'rng-xsd-check-min-inclusive)
-(put 'maxExclusive 'rng-xsd-check 'rng-xsd-check-max-exclusive)
-(put 'maxInclusive 'rng-xsd-check 'rng-xsd-check-max-inclusive)
-(put 'length 'rng-xsd-check 'rng-xsd-check-length)
-(put 'minLength 'rng-xsd-check 'rng-xsd-check-min-length)
-(put 'maxLength 'rng-xsd-check 'rng-xsd-check-max-length)
-(put 'fractionDigits 'rng-xsd-check 'rng-xsd-check-fraction-digits)
-(put 'totalDigits 'rng-xsd-check 'rng-xsd-check-total-digits)
-
-(defun rng-xsd-check-min-exclusive (str less-than-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (funcall less-than-fun limit obj)
-	 obj)))
-
-(defun rng-xsd-check-min-inclusive (str less-than-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (or (funcall less-than-fun limit obj)
-	     (equal limit obj))
-	 obj)))
-
-(defun rng-xsd-check-max-exclusive (str less-than-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (funcall less-than-fun obj limit)
-	 obj)))
-
-(defun rng-xsd-check-max-inclusive (str less-than-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (or (funcall less-than-fun obj limit)
-	     (equal obj limit))
-	 obj)))
-
-(defun rng-xsd-check-min-length (str length-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (>= (funcall length-fun obj) limit)
-	 obj)))
-
-(defun rng-xsd-check-max-length (str length-fun limit convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (<= (funcall length-fun obj) limit)
-	 obj)))
-
-(defun rng-xsd-check-length (str length-fun len convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (= (funcall length-fun obj) len)
-	 obj)))
-
-(defun rng-xsd-check-fraction-digits (str n convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (<= (length (aref obj 2)) n)
-	 obj)))
-
-(defun rng-xsd-check-total-digits (str n convert &rest args)
-  (let ((obj (apply convert (cons str args))))
-    (and obj
-	 (<= (+ (length (aref obj 1))
-		(length (aref obj 2)))
-	     n)
-	 obj)))
-
-(defun rng-xsd-check-pattern (str regexp convert &rest args)
-  (and (string-match regexp str)
-       (apply convert (cons str args))))
-
-  
-(defun rng-xsd-convert-boolean (string)
-  (and (string-match "\\`[ \t\n\r]*\\(?:\\(true\\|1\\)\\|false\\|0\\)[ \t\n\r]*\\'" string)
-       (if (match-beginning 1) 'true 'false)))
-
-(defun rng-xsd-convert-decimal (string)
-  "Convert a string representing a decimal to an object representing
-its values.  A decimal value is represented by a vector [SIGN
-INTEGER-DIGITS FRACTION-DIGITS] where SIGN is 1 or -1, INTEGER-DIGITS
-is a string containing zero or more digits, with no leading zero, and
-FRACTION-DIGITS is a string containing zero or more digits with no
-trailing digits.  For example, -0021.0430 would be represented by [-1
-\"21\" \"043\"]."
-  (and (string-match "\\`[ \t\n\r]*\\([-+]\\)?\\(0*\\([1-9][0-9]*\\)?\\(\\.\\([0-9]*[1-9]\\)?0*\\)?\\)[ \t\n\r]*\\'" string)
-       (let ((digits (match-string 2 string)))
-	 (and (not (string= digits "."))
-	      (not (string= digits ""))))
-       (let ((integer-digits (match-string 3 string)))
-	 (vector (if (and (equal (match-string 1 string) "-")
-			  ;; Normalize -0 to 0
-			  integer-digits)
-		     -1
-		   1)
-		 (or integer-digits "")
-		 (or (match-string 5 string) "")))))
-
-(defun rng-xsd-convert-integer (string)
-  (and (string-match "\\`[ \t\n\r]*\\([-+]\\)?\\(?:0*\\([1-9][0-9]*\\)\\|0+\\)[ \t\n\r]*\\'" string)
-       (let ((integer-digits (match-string 2 string)))
-	 (vector (if (and (equal (match-string 1 string) "-")
-			  ;; Normalize -0 to 0
-			  integer-digits)
-		     -1
-		   1)
-		 (or integer-digits "")
-		 ""))))
-
-(defun rng-xsd-decimal< (n1 n2)
-  (< (rng-xsd-compare-decimal n1 n2) 0))
-
-(defun rng-xsd-compare-decimal (n1 n2)
-  "Return a < 0, 0, > 0 according as n1 < n2, n1 = n2 or n1 > n2."
-  (let* ((sign1 (aref n1 0))
-	 (sign2 (aref n2 0))
-	 (sign (- sign1 sign2)))
-    (if (= sign 0)
-	(* sign1
-	   (let* ((int1 (aref n1 1))
-		  (int2 (aref n2 1))
-		  (len1 (length int1))
-		  (len2 (length int2))
-		  (lencmp (- len1 len2)))
-	     (if (eq lencmp 0)
-		 (if (string= int1 int2)
-		     (rng-xsd-strcmp (aref n1 2) (aref n2 2))
-		   (rng-xsd-strcmp int1 int2))
-	       lencmp)))
-      sign)))
-
-(defconst rng-xsd-float-regexp
-  (concat "\\`[ \r\n\t]*\\(?:"
-	  "\\("
-	  "[-+]?\\(?:[0-9]+\\(?:\\.[0-9]*\\)?\\|\\.[0-9]+\\)"
-	  "\\(?:[eE][-+]?[0-9]+\\)?"
-	  "\\)"
-	  "\\|\\(INF\\)"
-	  "\\|\\(-INF\\)"
-	  "\\|\\(NaN\\)"
-	  "\\)[ \r\n\t]*\\'"))
-
-(defun rng-xsd-convert-float (string)
-  (cond ((not (string-match rng-xsd-float-regexp string)) nil)
-	((match-beginning 1)
-	 (float (string-to-number (match-string 1 string))))
-	((match-beginning 2) 1.0e+INF)
-	((match-beginning 3) -1.0e+INF)
-	;; Don't use a NaN float because we want NaN to be equal to NaN
-	((match-beginning 4) 'NaN)))
-	 
-(defun rng-xsd-float< (f1 f2)
-  (and (not (eq f1 'NaN))
-       (not (eq f2 'NaN))
-       (< f1 f2)))
-  
-(defun rng-xsd-convert-token (string regexp)
-  (and (string-match regexp string)
-       (match-string 1 string)))
-
-(defun rng-xsd-convert-hex-binary (string)
-  (and (string-match "\\`[ \r\n\t]*\\(\\(?:[0-9A-Fa-f][0-9A-Fa-f]\\)*\\)[ \r\n\t]*\\'"
-		     string)
-       (downcase (match-string 1 string))))
-
-(defun rng-xsd-hex-binary-length (obj)
-  (/ (length obj) 2))
-
-(defconst rng-xsd-base64-binary-regexp
-  (let ((S "[ \t\r\n]*")
-	(B04 "[AQgw]")
-	(B16 "[AEIMQUYcgkosw048]")
-	(B64 "[A-Za-z0-9+/]"))
-    (concat "\\`" S "\\(?:\\(?:" B64 S "\\)\\{4\\}\\)*"
-	    "\\(?:" B64 S B64 S B16 S "=" S 
-	    "\\|" B64 S B04 S "=" S "=" S "\\)?\\'")))
-
-(defun rng-xsd-convert-base64-binary (string)
-  (and (string-match rng-xsd-base64-binary-regexp string)
-       (replace-regexp-in-string "[ \t\r\n]+" "" string t t)))
-
-(defun rng-xsd-base64-binary-length (obj)
-  (let ((n (* (/ (length obj) 4) 3)))
-    (if (and (> n 0)
-	     (string= (substring obj -1) "="))
-	(- n (if (string= (substring obj -2) "==")
-		 2
-	       1))
-      n)))
-
-(defun rng-xsd-convert-any-uri (string)
-  (and (string-match "\\`\\(?:[^%]\\|%[0-9a-fA-F][0-9a-fA-F]\\)?*\\'" string)
-       (string-match "\\`[^#]*\\(?:#[^#]*\\)?\\'" string)
-       (string-match "\\`\\(?:[a-zA-Z][-+.A-Za-z0-9]*:.+\\|[^:]*\\(?:[#/?].*\\)?\\)\\'" string)
-       string))
-
-(defun rng-xsd-make-date-time-regexp (template)
-  "Returns a regular expression matching a ISO 8601 date/time. The
-template is a string with Y standing for years field, M standing for
-months, D standing for day of month, T standing for a literal T, t
-standing for time and - standing for a literal hyphen.  A time zone is
-always allowed at the end. Regardless of the fields appearing in the
-template, the regular expression will have twelve groups matching the
-year sign, year, month, day of month, hours, minutes, integer seconds,
-fractional seconds (including leading period), time zone, time zone
-sign, time zone hours, time zone minutes."
-  (let ((i 0)
-	(len (length template))
-	(parts nil)
-	first last c)
-    (while (< i len)
-      (setq c (aref template i))
-      (setq parts
-	    (cons (cond ((eq c ?Y)
-			 (setq first 0)
-			 (setq last 1)
-			 "\\(-\\)?\\(\\(?:[1-9][0-9]*\\)?[0-9]\\{4\\}\\)")
-			((eq c ?M)
-			 (or first
-			     (setq first 2))
-			 (setq last 2)
-			 "\\([0-9][0-9]\\)")
-			((eq c ?D)
-			 (or first
-			     (setq first 3))
-			 (setq last 3)
-			 "\\([0-9][0-9]\\)")
-			((eq c ?t)
-			 (or first
-			     (setq first 4))
-			 (setq last 7)
-			 "\\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\)\\(\\.[0-9]*\\)?")
-			(t (string c)))
-		  parts))
-      (setq i (1+ i)))
-    (while (< last 7)
-      (setq last (1+ last))
-      ;; Add dummy fields that can never much but keep the group
-      ;; numbers uniform.
-      (setq parts (cons "\\(\\'X\\)?" parts)))
-    (setq parts (cons "\\(Z\\|\\([-+]\\)\\([0-9][0-9]\\):\\([0-5][0-9]\\)\\)?[ \t\n\r]*\\'"
-		      parts))
-    (setq parts (cons "\\`[ \t\n\r]*" (nreverse parts)))
-    (while (> first 0)
-      (setq first (1- first))
-      (setq parts (cons "\\(X\\)?" parts)))
-    (apply 'concat parts)))
-
-(defconst rng-xsd-seconds-per-day (* 24 60 60))
-(defconst rng-xsd-days-in-month [31 28 31 30 31 30 31 31 30 31 30 31])
-
-(defun rng-xsd-days-in-month (year month)
-  (if (and (= month 2) (rng-xsd-leap-year-p year))
-      29
-    (aref rng-xsd-days-in-month (1- month))))
-
-(defconst rng-xsd-months-to-days
-  (let ((v (make-vector 12 nil))
-	(total 0)
-	(i 0))
-    (while (< i 12)
-      (setq total (+ total (aref rng-xsd-days-in-month i)))
-      (aset v i total)
-      (setq i (1+ i)))
-    v))
-	   
-(defun rng-xsd-convert-date-time (string regexp)
-  "Converts an XML Schema date/time to a list.  Returns nil if
-invalid.  REGEXP is a regexp for parsing the date time as returned by
-`rng-xsd-make-date-time-regexp'. The list has 4 members (HAS-TIME-ZONE
-DAY SECOND SECOND-FRACTION), where HAS-TIME-ZONE is t or nil depending
-on whether a time zone was specified, DAY is an integer giving a day
-number (with Jan 1 1AD being day 1), SECOND is the second within that
-day, and SECOND-FRACTION is a float giving the fractional part of the
-second."
-  (and (string-match regexp string)
-       (let ((year-sign (match-string 1 string))
-	     (year (match-string 2 string))
-	     (month (match-string 3 string))
-	     (day (match-string 4 string))
-	     (hour (match-string 5 string))
-	     (minute (match-string 6 string))
-	     (second (match-string 7 string))
-	     (second-fraction (match-string 8 string))
-	     (has-time-zone (match-string 9 string))
-	     (time-zone-sign (match-string 10 string))
-	     (time-zone-hour (match-string 11 string))
-	     (time-zone-minute (match-string 12 string)))
-	 (setq year-sign (if year-sign -1 1))
-	 (setq year
-	       (if year
-		   (* year-sign
-		      (string-to-number year))
-		 2000))
-	 (setq month
-	       (if month (string-to-number month) 1))
-	 (setq day
-	       (if day (string-to-number day) 1))
-	 (setq hour
-	       (if hour (string-to-number hour) 0))
-	 (setq minute
-	       (if minute (string-to-number minute) 0))
-	 (setq second
-	       (if second (string-to-number second) 0))
-	 (setq second-fraction
-	       (if second-fraction
-		   (float (string-to-number second-fraction))
-		 0.0))
-	 (setq has-time-zone (and has-time-zone t))
-	 (setq time-zone-sign
-	       (if (equal time-zone-sign "-") -1 1))
-	 (setq time-zone-hour
-	       (if time-zone-hour (string-to-number time-zone-hour) 0))
-	 (setq time-zone-minute
-	       (if time-zone-minute (string-to-number time-zone-minute) 0))
-	 (and (>= month 1)
-	      (<= month 12)
-	      (>= day 1)
-	      (<= day (rng-xsd-days-in-month year month))
-	      (<= hour 23)
-	      (<= minute 59)
-	      (<= second 60)		; leap second
-	      (<= time-zone-hour 23)
-	      (<= time-zone-minute 59)
-	      (cons has-time-zone
-		    (rng-xsd-add-seconds
-		     (list (rng-xsd-date-to-days year month day)
-			   (rng-xsd-time-to-seconds hour minute second)
-			   second-fraction)
-		     (* (rng-xsd-time-to-seconds time-zone-hour
-						 time-zone-minute
-						 0)
-			(- time-zone-sign))))))))
-
-(defun rng-xsd-leap-year-p (year)
-  (and (= (% year 4) 0)
-       (or (/= (% year 100) 0)
-	   (= (% year 400) 0))))
-
-(defun rng-xsd-time-to-seconds (hour minute second)
-  (+ (* (+ (* hour 60)
-	   minute)
-	60)
-     second))
-
-(defconst rng-xsd-max-tz (rng-xsd-time-to-seconds 14 0 0))
-
-(defun rng-xsd-date-time< (dt1 dt2)
-  (cond ((eq (car dt1) (car dt2))
-	 (rng-xsd-number-list< (cdr dt1) (cdr dt2)))
-	((car dt1)
-	 (rng-xsd-number-list< (cdr dt1)
-			       (rng-xsd-add-seconds (cdr dt2)
-						    (- rng-xsd-max-tz))))
-	(t
-	 (rng-xsd-number-list< (rng-xsd-add-seconds (cdr dt1)
-						    rng-xsd-max-tz)
-			       (cdr dt2)))))
-
-(defun rng-xsd-add-seconds (date offset)
-  (let ((day (nth 0 date))
-	(second (+ (nth 1 date) offset))
-	(fraction (nth 2 date)))
-    (cond ((< second 0)
-	   (list (1- day)
-		 (+ second rng-xsd-seconds-per-day)
-		 fraction))
-	  ((>= second rng-xsd-seconds-per-day)
-	   (list (1+ day)
-		 (- second rng-xsd-seconds-per-day)
-		 fraction))
-	  (t (list day second fraction)))))
-
-(defun rng-xsd-number-list< (numbers1 numbers2)
-  (while (and numbers1 (= (car numbers1) (car numbers2)))
-    (setq numbers1 (cdr numbers1))
-    (setq numbers2 (cdr numbers2)))
-  (and numbers1
-       (< (car numbers1) (car numbers2))))
-	
-(defun rng-xsd-date-to-days (year month day)
-  "Return a unique day number where Jan 1 1 AD is day 1"
-  (if (> year 0)			; AD
-      (+ (rng-xsd-days-in-years (- year 1))
-	 (rng-xsd-day-number-in-year year month day))
-    (- (+ (- (rng-xsd-days-in-years (- 3 year))
-	     (rng-xsd-days-in-years 3))
-	  (- (if (rng-xsd-leap-year-p year) 366 365)
-	     (rng-xsd-day-number-in-year year month day))))))
-
-(defun rng-xsd-days-in-years (years)
-  "The number of days in YEARS years where the first year is 1AD."
-  (+ (* 365 years)
-     (/ years 4)
-     (- (/ years 100))
-     (/ years 400)))
-
-(defun rng-xsd-day-number-in-year (year month day)
-  (+ (if (= month 1)
-	 0
-	 (aref rng-xsd-months-to-days (- month 2)))
-     day
-     (if (and (> month 2)
-	      (rng-xsd-leap-year-p year))
-	 1
-       0)))
-
-(defconst rng-xsd-duration-regexp
-    "\\`[ \t\r\n]*\\(-\\)?P\
-\\([0-9]+Y\\)?\\([0-9]+M\\)?\\([0-9]+D\\)?\
-\\(?:T\\([0-9]+H\\)?\\([0-9]+M\\)?\
-\\(\\([0-9]+\\(?:\\.[0-9]*\\)?\\|\\.[0-9]+\\)S\\)?\\)?\
-[ \t\r\n]*\\'")
-
-
-(defun rng-xsd-convert-duration (string)
-  (and (string-match rng-xsd-duration-regexp string)
-       (let ((last (substring string -1)))
-	 (not (or (string= last "P")
-		  (string= last "T"))))
-       ;; years months days hours minutes seconds
-       (let ((v (make-vector 6 0))
-	     (sign (if (match-beginning 1) -1 1))
-	     (i 0))
-	 (while (< i 6)
-	   (let ((start (match-beginning (+ i 2))))
-	     (when start
-	       (aset v i (* sign
-			    (string-to-number 
-			     (substring string
-					start
-					(1- (match-end (+ i 2)))))))))
-	   (setq i (1+ i)))
-	 ;; Force seconds to be float so that equal works properly.
-	 (aset v 5 (float (aref v 5)))
-	 v)))
-	 
-(defconst rng-xsd-min-seconds-per-month (* 28 rng-xsd-seconds-per-day))
-
-(defun rng-xsd-duration< (d1 d2)
-  (let* ((months1 (rng-xsd-duration-months d1))
-	 (months2 (rng-xsd-duration-months d2))
-	 (seconds1 (rng-xsd-duration-seconds d1))
-	 (seconds2 (rng-xsd-duration-seconds d2)))
-    (cond ((< months1 months2)
-	   (if (< (- seconds1 seconds2) rng-xsd-min-seconds-per-month)
-	       t
-	     (rng-xsd-months-seconds< months1 seconds1 months2 seconds2)))
-	  ((> months1 months2)
-	   (if (< (- seconds2 seconds1) rng-xsd-min-seconds-per-month)
-	       nil
-	     (rng-xsd-months-seconds< months1 seconds1 months2 seconds2)))
-	  (t (< seconds1 seconds2)))))
-
-(defconst xsd-duration-reference-dates
-  '((1696 . 9) (1697 . 2) (1903 . 3) (1903 . 7)))
-
-(defun rng-xsd-months-seconds< (months1 seconds1 months2 seconds2)
-  (let ((ret t)
-	(ref-dates xsd-duration-reference-dates))
-    (while (let* ((ref-date (car ref-dates))
-		  (ref-year (car ref-date))
-		  (ref-month (cdr ref-date)))
-	     (unless (< (+ (rng-xsd-month-seconds months1
-						  ref-year
-						  ref-month)
-			   seconds1)
-			(+ (rng-xsd-month-seconds months2
-						  ref-year
-						  ref-month)
-			   seconds2))
-		 (setq ret nil))
-	     (and ret
-		  (setq ref-dates (cdr ref-dates)))))
-    ret))
-
-
-(defun rng-xsd-month-seconds (months ref-year ref-month)
-  "Return the seconds in a number of months starting on a reference date.
-Returns a floating point number."
-  (* (rng-xsd-month-days (abs months) ref-year ref-month)
-     (float rng-xsd-seconds-per-day)
-     (if (< months 0) -1.0 1.0)))
-
-(defconst rng-xsd-years-per-gregorian-cycle 400)
-(defconst rng-xsd-months-per-gregorian-cycle
-  (* rng-xsd-years-per-gregorian-cycle 12))
-(defconst rng-xsd-leap-years-per-gregorian-cycle (- 100 (- 4 1)))
-(defconst rng-xsd-days-per-gregorian-cycle
-  (+ (* 365 rng-xsd-years-per-gregorian-cycle)
-     rng-xsd-leap-years-per-gregorian-cycle))
-
-(defun rng-xsd-month-days (months ref-year ref-month)
-  "Return the days in a number of months starting on a reference date.
-MONTHS must be an integer >= 0."
-  (let ((days 0))
-    (setq months (mod months rng-xsd-months-per-gregorian-cycle))
-    ;; This may be rather slow, but it is highly unlikely
-    ;; ever to be used in real life.
-    (while (> months 0)
-      (setq days
-	    (+ (rng-xsd-days-in-month ref-year ref-month)
-	       days))
-      (setq ref-month
-	    (if (eq ref-month 12)
-		(progn
-		  (setq ref-year (1+ ref-year))
-		  1)
-	      (1+ ref-month)))
-      (setq months (1- months)))
-    (+ (* (/ months rng-xsd-months-per-gregorian-cycle)
-	  rng-xsd-days-per-gregorian-cycle)
-       days)))
-    
-(defun rng-xsd-duration-months (d)
-  (+ (* (aref d 0) 12)
-     (aref d 1)))
-
-(defun rng-xsd-duration-seconds (d)
-  (+ (* (+ (* (+ (* (aref d 2)
-		    24.0)
-		 (aref d 3))
-	      60.0)
-	   (aref d 4))
-	60.0)
-     (aref d 5)))
-	
-(defun rng-xsd-convert-qname (string)
-  (and (string-match "\\`[ \r\n\t]*\\([_[:alpha:]][-._[:alnum:]]*\\(:[_[:alpha:]][-._[:alnum:]]*\\)?\\)[ \r\n\t]*\\'" string)
-       (let ((colon (match-beginning 2))
-	     (context (apply (car rng-dt-namespace-context-getter)
-			     (cdr rng-dt-namespace-context-getter))))
-	 (if colon
-	     (let* ((prefix (substring string
-				       (match-beginning 1)
-				       colon))
-		    (binding (assoc prefix (cdr context))))
-	       (and binding
-		    (cons (cdr binding)
-			  (substring string
-				     (1+ colon)
-				     (match-end 1)))))
-	   (cons (car context)
-		 (match-string 1 string))))))
-		     
-(defun rng-xsd-convert-list (string convert &rest args)
-  (let* ((tokens (split-string string "[ \t\n\r]+"))
-	 (tem tokens))
-    (while tem
-      (let ((obj (apply convert
-			(cons (car tem) args))))
-	(cond (obj
-	       (setcar tem obj)
-	       (setq tem (cdr tem)))
-	      (t
-	       (setq tokens nil)
-	       (setq tem nil)))))
-    ;; Fortuitously this returns nil if the list is empty
-    ;; which is what we want since the list types
-    ;; have to have one or more members.
-    tokens))
-
-(defun rng-xsd-strcmp (s1 s2)
-  (cond ((string= s1 s2) 0)
-	((string< s1 s2) -1)
-	(t 1)))
-
-(put 'string 'rng-xsd-convert '(identity))
-(put 'string 'rng-xsd-length 'length)
-(put 'string 'rng-xsd-matches-anything t)
-
-(put 'normalizedString 'rng-xsd-convert '(identity))
-(put 'normalizedString 'rng-xsd-length 'length)
-(put 'normalizedString 'rng-xsd-matches-anything t)
-
-(put 'token 'rng-xsd-convert '(identity))
-(put 'token 'rng-xsd-length 'length)
-(put 'token 'rng-xsd-matches-anything t)
-
-(put 'hexBinary 'rng-xsd-convert '(rng-xsd-convert-hex-binary))
-(put 'hexBinary 'rng-xsd-length 'rng-xsd-hex-binary-length)
-
-(put 'base64Binary 'rng-xsd-convert '(rng-xsd-convert-base64-binary))
-(put 'base64Binary 'rng-xsd-length 'rng-xsd-base64-binary-length)
-
-(put 'boolean 'rng-xsd-convert '(rng-xsd-convert-boolean))
-
-(put 'float 'rng-xsd-convert '(rng-xsd-convert-float))
-(put 'float 'rng-xsd-less-than 'rng-xsd-float<)
-
-(put 'double 'rng-xsd-convert '(rng-xsd-convert-float))
-(put 'double 'rng-xsd-less-than 'rng-xsd-float<)
-
-(put 'decimal 'rng-xsd-convert '(rng-xsd-convert-decimal))
-(put 'decimal 'rng-xsd-less-than 'rng-xsd-decimal<)
-
-(put 'integer 'rng-xsd-convert '(rng-xsd-convert-integer))
-(put 'integer 'rng-xsd-less-than 'rng-xsd-decimal<)
-
-(defun rng-xsd-def-integer-type (name min max)
-  (put name 'rng-xsd-less-than 'rng-xsd-decimal<)
-  (put name
-       'rng-xsd-convert 
-       (cdr (rng-xsd-compile 'integer
-			     (append (and min `((minInclusive . ,min)))
-				     (and max `((maxInclusive . ,max))))))))
-
-(defun rng-xsd-def-token-type (name regexp)
-  (put name 'rng-xsd-convert (list 'rng-xsd-convert-token
-				   (concat "\\`[\r\n\t ]*\\("
-					   regexp
-					   "\\)[\r\n\t ]*\\'")))
-  (put name 'rng-xsd-length 'length))
-
-(rng-xsd-def-token-type 'NMTOKEN "[-.:_[:alnum:]]+")
-(rng-xsd-def-token-type 'Name "[:_[:alpha:]][-.:_[:alnum:]]*")
-(rng-xsd-def-token-type 'NCName "[_[:alpha:]][-._[:alnum:]]*")
-(rng-xsd-def-token-type 'language
-			"[a-zA-Z]\\{1,8\\}\\(?:-[a-zA-Z0-9]\\{1,8\\}\\)*")
-
-(put 'ENTITY 'rng-xsd-convert (get 'NCName 'rng-xsd-convert))
-(put 'ENTITY 'rng-xsd-length 'length)
-(put 'ID 'rng-xsd-convert (get 'NCName 'rng-xsd-convert))
-(put 'ID 'rng-xsd-length 'length)
-(put 'IDREF 'rng-xsd-convert (get 'NCName 'rng-xsd-convert))
-(put 'IDREF 'rng-xsd-length 'length)
-
-(defun rng-xsd-def-list-type (name member-name)
-  (put name 'rng-xsd-convert (cons 'rng-xsd-convert-list
-				   (get member-name 'rng-xsd-convert)))
-  (put name 'rng-xsd-length 'length))
-
-(rng-xsd-def-list-type 'NMTOKENS 'NMTOKEN)
-(rng-xsd-def-list-type 'IDREFS 'IDREF)
-(rng-xsd-def-list-type 'ENTITIES 'ENTITY)
-
-(put 'anyURI 'rng-xsd-convert '(rng-xsd-convert-any-uri))
-(put 'anyURI 'rng-xsd-length 'length)
-
-(put 'QName 'rng-xsd-convert '(rng-xsd-convert-qname))
-(put 'NOTATION 'rng-xsd-convert '(rng-xsd-convert-qname))
-
-(defconst rng-xsd-long-max "9223372036854775807")
-(defconst rng-xsd-long-min "-9223372036854775808")
-(defconst rng-xsd-int-max "2147483647")
-(defconst rng-xsd-int-min "-2147483648")
-(defconst rng-xsd-short-max "32767")
-(defconst rng-xsd-short-min "-32768")
-(defconst rng-xsd-byte-max "127")
-(defconst rng-xsd-byte-min "-128")
-(defconst rng-xsd-unsigned-long-max "18446744073709551615")
-(defconst rng-xsd-unsigned-int-max "4294967295")
-(defconst rng-xsd-unsigned-short-max "65535")
-(defconst rng-xsd-unsigned-byte-max "255")
-
-(rng-xsd-def-integer-type 'nonNegativeInteger "0" nil)
-(rng-xsd-def-integer-type 'positiveInteger "1" nil)
-(rng-xsd-def-integer-type 'nonPositiveInteger nil "0")
-(rng-xsd-def-integer-type 'negativeInteger nil "-1")
-(rng-xsd-def-integer-type 'long rng-xsd-long-min rng-xsd-long-max)
-(rng-xsd-def-integer-type 'int rng-xsd-int-min rng-xsd-int-max)
-(rng-xsd-def-integer-type 'short rng-xsd-short-min rng-xsd-short-max)
-(rng-xsd-def-integer-type 'byte rng-xsd-byte-min rng-xsd-byte-max)
-(rng-xsd-def-integer-type 'unsignedLong "0" rng-xsd-unsigned-long-max)
-(rng-xsd-def-integer-type 'unsignedInt "0" rng-xsd-unsigned-int-max)
-(rng-xsd-def-integer-type 'unsignedShort "0" rng-xsd-unsigned-short-max)
-(rng-xsd-def-integer-type 'unsignedByte "0" rng-xsd-unsigned-byte-max)
-
-(defun rng-xsd-def-date-time-type (name template)
-  (put name 'rng-xsd-convert (list 'rng-xsd-convert-date-time
-				   (rng-xsd-make-date-time-regexp template)))
-  (put name 'rng-xsd-less-than 'rng-xsd-date-time<))
-
-(rng-xsd-def-date-time-type 'dateTime "Y-M-DTt")
-(rng-xsd-def-date-time-type 'time "t")
-(rng-xsd-def-date-time-type 'date "Y-M-D")
-(rng-xsd-def-date-time-type 'gYearMonth "Y-M")
-(rng-xsd-def-date-time-type 'gYear "Y")
-(rng-xsd-def-date-time-type 'gMonthDay "--M-D")
-(rng-xsd-def-date-time-type 'gDay "---D")
-(rng-xsd-def-date-time-type 'gMonth "--M")
-
-(put 'duration 'rng-xsd-convert '(rng-xsd-convert-duration))
-(put 'duration 'rng-xsd-less-than 'rng-xsd-duration<)
-
-(provide 'rng-xsd)
-
-;;; rng-xsd.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/calstbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/calstbl.rnc
deleted file mode 100644
index 5d334e8ebd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/calstbl.rnc
+++ /dev/null
@@ -1,184 +0,0 @@
-# This file was generated automatically by Trang, and then manually
-# edited to add back definitions for overridden parameter entities and
-# undefined elements, specifically: bodyatt, secur, paracon,
-# tbl.table.mdl, tbl.entry.mdl, caution, graphic, legend, note, para,
-# title, warning.  This makes the semantics of this module as close as
-# possible to the original DTD and also allows this schema to be used
-# independently of DocBook.
-
-# ......................................................................
-
-# DocBook CALS Table Model V4.2 ........................................
-
-# File calstblx.mod ....................................................
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# This DTD is based on the CALS Table Model
-# PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
-# 
-# $Id: calstbl.rnc,v 1.2 2003/08/30 06:04:02 jjc Exp $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the CALS Table Model
-# converted to XML.
-
-# These definitions are not directly related to the table model, but are
-# used in the default CALS table model and are usually defined elsewhere
-# (and prior to the inclusion of this table module) in a CALS DTD.
-
-bodyatt = empty
-secur = empty
-
-# no if zero(s),
-# yes if any other digits value
-
-yesorno = string
-titles = title?
-# default for use in entry content
-paracon = text
-
-# The parameter entities as defined below provide the CALS table model
-# as published (as part of the Example DTD) in MIL-HDBK-28001.
-# 
-# These following declarations provide the CALS-compliant default definitions
-# for these entities.  However, these entities can and should be redefined
-# (by giving the appropriate parameter entity declaration(s) prior to the
-# reference to this Table Model declaration set entity) to fit the needs
-# of the current application.
-tbl.table-titles.mdl = titles
-tbl.table-main.mdl = tgroup+ | graphic+
-tbl.table.mdl = tbl.table-titles.mdl | tbl.table-main.mdl
-tbl.table.att =
-  attribute tabstyle { text }?,
-  attribute tocentry { yesorno }?,
-  attribute shortentry { yesorno }?,
-  attribute orient { "port" | "land" }?,
-  attribute pgwide { yesorno }?
-tbl.tgroup.mdl = colspec*, spanspec*, thead?, tfoot?, tbody
-tbl.tgroup.att = attribute tgroupstyle { text }?
-tbl.hdft.mdl = colspec*, row+
-tbl.row.mdl = (entry | entrytbl)+
-tbl.entrytbl.mdl = colspec*, spanspec*, thead?, tbody
-tbl.entry.mdl = paracon | para | warning | caution | note | legend
-# =====  Element and attribute declarations follow. =====
-start = table
-table = element table { table.attlist, tbl.table.mdl }
-table.attlist &=
-  attribute frame {
-    "top" | "bottom" | "topbot" | "all" | "sides" | "none"
-  }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  tbl.table.att,
-  bodyatt,
-  secur
-tgroup = element tgroup { tgroup.attlist, tbl.tgroup.mdl }
-tgroup.attlist &=
-  attribute cols { text },
-  tbl.tgroup.att,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  secur
-colspec = element colspec { colspec.attlist, empty }
-colspec.attlist &=
-  attribute colnum { text }?,
-  attribute colname { text }?,
-  attribute colwidth { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?
-spanspec = element spanspec { spanspec.attlist, empty }
-spanspec.attlist &=
-  attribute namest { text },
-  attribute nameend { text },
-  attribute spanname { text },
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?
-thead = element thead { thead.attlist, tbl.hdft.mdl }
-thead.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-tfoot = element tfoot { tfoot.attlist, tbl.hdft.mdl }
-tfoot.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-tbody = element tbody { tbody.attlist, row+ }
-tbody.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-row = element row { row.attlist, tbl.row.mdl }
-row.attlist &=
-  attribute rowsep { yesorno }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-entrytbl = element entrytbl { entrytbl.attlist, tbl.entrytbl.mdl }
-entrytbl.attlist &=
-  attribute cols { text },
-  tbl.tgroup.att,
-  attribute colname { text }?,
-  attribute spanname { text }?,
-  attribute namest { text }?,
-  attribute nameend { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  secur
-entry = element entry { entry.attlist, tbl.entry.mdl* }
-entry.attlist &=
-  attribute colname { text }?,
-  attribute namest { text }?,
-  attribute nameend { text }?,
-  attribute spanname { text }?,
-  attribute morerows { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  attribute rotate { yesorno }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-caution |= notAllowed
-graphic |= notAllowed
-legend |= notAllowed
-note |= notAllowed
-para |= notAllowed
-title |= notAllowed
-warning |= notAllowed
-
-# End of DocBook CALS Table Model V4.2 .................................
-
-# ......................................................................
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbcalstbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbcalstbl.rnc
deleted file mode 100644
index 9841df2d73..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbcalstbl.rnc
+++ /dev/null
@@ -1,25 +0,0 @@
-# Definitions specific to the CALS Table Model.
-
-# Reference CALS Table Model
-include "calstbl.rnc" {
-  # Override definition of start
-  start |= notAllowed
-  # Add label and role attributes to table and informaltable
-  bodyatt = label.attrib
-  # Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
-  # EntryTbl, and Entry (and InformalTable element).
-  secur = common.attrib, tables.role.attrib
-  # Content model for Table.
-  tbl.table.mdl =
-    blockinfo?,
-    formalobject.title.content,
-    ndxterm.class*,
-    textobject*,
-    (graphic+ | mediaobject+ | tgroup+)
-  # Allow either objects or inlines; beware of REs between elements.
-  tbl.entry.mdl = para.char.mix | tabentry.mix
-}
-
-common.table.attribs = bodyatt, secur
-
-# end of table.module
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbdyntbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbdyntbl.rnc
deleted file mode 100644
index 8e859145fd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbdyntbl.rnc
+++ /dev/null
@@ -1,116 +0,0 @@
-# This is an alternative to dbsoextbl.rnc and dbcalstbl.rnc that
-# allows the table model to be selected dynamically based on the
-# definitions of cals.table.module and exchange.table.module.
-#
-# To use this copy, docbook.rnc to docbook-dyntbl.rnc replacing
-# "dbcalstbl.rnc" by "dbdyntbl.rnc".  Then, you can override the
-# choice of table model by doing
-#
-# include "docbook-dyntbl.rnc" {
-#   cals.table.model = IGNORE
-#   exchange.table.model = INCLUDE
-# }
-
-INCLUDE = empty
-IGNORE = notAllowed
-cals.table.module = INCLUDE
-exchange.table.module = IGNORE
-
-# Add common attributes and the Label attribute to Table and
-# InformalTable.
-bodyatt = common.attrib, label.attrib, tables.role.attrib
-
-# Content model for Table.
-tbl.table.mdl =
-  blockinfo?,
-  formalobject.title.content,
-  ndxterm.class*,
-  textobject*,
-  (graphic+ | mediaobject+ | tgroup+)
-
-table = cals.table | exchange.table
-
-cals.table =
-  cals.table.module,
-  grammar {
-    # Reference CALS Table Model
-    include "calstbl.rnc" {
-      # Add label and role attributes to table and informaltable
-      bodyatt = parent label.attrib
-      # Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
-      # EntryTbl, and Entry (and InformalTable element).
-      secur = parent common.attrib, parent tables.role.attrib
-      tbl.table.mdl = parent tbl.table.mdl
-    }
-  }
-
-exchange.table =
-  exchange.table.module,
-  grammar {
-    # Reference OASIS Exchange Table Model
-    include "soextbl.rnc" {
-      # Add common attributes and the Label attribute to Table and
-      # InformalTable.
-      bodyatt = parent bodyatt
-      tbl.table.mdl = parent tbl.table.mdl
-    }
-  }
-
-tgroup = cals.tgroup | exchange.tgroup
-
-cals.tgroup =
-  cals.table.module,
-  grammar {
-    # Reference CALS Table Model
-    include "calstbl.rnc" {
-      start = tgroup
-      # Add label and role attributes to table and informaltable
-      bodyatt = parent label.attrib
-      # Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
-      # EntryTbl, and Entry (and InformalTable element).
-      secur = parent common.attrib, parent tables.role.attrib
-      # Allow either objects or inlines; beware of REs between elements.
-      tbl.entry.mdl = parent para.char.mix | parent tabentry.mix
-    }
-  }
-
-exchange.tgroup =
-  exchange.table.module,
-  grammar {
-    # Reference OASIS Exchange Table Model
-    include "soextbl.rnc" {
-      start = tgroup
-      bodyatt = parent bodyatt
-      # Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry
-      tbl.tgroup.att = parent common.attrib
-      tbl.colspec.att = parent common.attrib
-      tbl.tbody.att = parent common.attrib
-      tbl.thead.att = parent common.attrib
-      tbl.row.att = parent common.attrib
-      tbl.entry.att = parent common.attrib
-      # Allow either objects or inlines; beware of REs between elements.
-      tbl.entry.mdl = (parent para.char.mix | parent tabentry.mix)*
-    }
-  }
-
-tbl.table.att = cals.tbl.table.att | exchange.tbl.table.att
-
-cals.tbl.table.att =
-  cals.table.module,
-  grammar {
-    include "calstbl.rnc" {
-      start = tbl.table.att
-    }
-  }
-
-exchange.tbl.table.att =
-  exchange.table.module,
-  grammar {
-    include "soextbl.rnc" {
-      start = tbl.table.att
-    }
-  }
-
-common.table.attribs = bodyatt
-
-# end of table.module
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbhier.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbhier.rnc
deleted file mode 100644
index 1671b01fbc..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbhier.rnc
+++ /dev/null
@@ -1,1467 +0,0 @@
-# ......................................................................
-
-# DocBook document hierarchy module V4.2 ...............................
-
-# File dbhierx.mod .....................................................
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbhier.rnc,v 1.1 2003/08/30 04:19:27 jjc Exp $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the overall document
-# hierarchies of DocBook documents.  It covers computer documentation
-# manuals and manual fragments, as well as reference entries (such as
-# man pages) and technical journals or anthologies containing
-# articles.
-# 
-# This module depends on the DocBook information pool module.  All
-# elements and entities referenced but not defined here are assumed
-# to be defined in the information pool module.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbhier PUBLIC
-# "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
-# "dbhierx.mod">
-# %dbhier;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ......................................................................
-
-# Entities for module inclusions .......................................
-
-# ......................................................................
-
-# Entities for element classes .........................................
-
-local.appendix.class = notAllowed
-appendix.class = appendix | local.appendix.class
-local.article.class = notAllowed
-article.class = article | local.article.class
-local.book.class = notAllowed
-book.class = book | local.book.class
-local.chapter.class = notAllowed
-chapter.class = chapter | local.chapter.class
-local.index.class = notAllowed
-index.class = index | setindex | local.index.class
-local.refentry.class = notAllowed
-refentry.class = refentry | local.refentry.class
-local.section.class = notAllowed
-section.class = section | local.section.class
-local.nav.class = notAllowed
-nav.class =
-  toc | lot | index | glossary | bibliography | local.nav.class
-# Redeclaration placeholder ............................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# ......................................................................
-
-# Entities for element mixtures ........................................
-
-# The DocBook TC may produce an official forms module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-forms.hook = notAllowed
-local.divcomponent.mix = notAllowed
-divcomponent.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.divcomponent.mix
-local.refcomponent.mix = notAllowed
-refcomponent.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | local.refcomponent.mix
-local.indexdivcomponent.mix = notAllowed
-indexdivcomponent.mix =
-  itemizedlist
-  | orderedlist
-  | variablelist
-  | simplelist
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | anchor
-  | remark
-  | link.char.class
-  | beginpage
-  | local.indexdivcomponent.mix
-local.refname.char.mix = notAllowed
-refname.char.mix = text | tech.char.class | local.refname.char.mix
-local.partcontent.mix = notAllowed
-partcontent.mix =
-  appendix.class
-  | chapter.class
-  | nav.class
-  | article.class
-  | preface
-  | refentry.class
-  | reference
-  | local.partcontent.mix
-local.refinline.char.mix = notAllowed
-refinline.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | ndxterm.class
-  | beginpage
-  | local.refinline.char.mix
-local.refclass.char.mix = notAllowed
-refclass.char.mix = text | application | local.refclass.char.mix
-# Redeclaration placeholder 2 ..........................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# ......................................................................
-
-# Entities for content models ..........................................
-div.title.content = title, subtitle?, titleabbrev?
-bookcomponent.title.content = title, subtitle?, titleabbrev?
-sect.title.content = title, subtitle?, titleabbrev?
-refsect.title.content = title, subtitle?, titleabbrev?
-bookcomponent.content =
-  (divcomponent.mix+,
-   (sect1* | refentry.class* | simplesect* | section.class*))
-  | (sect1+ | refentry.class+ | simplesect+ | section.class+)
-# ......................................................................
-
-# Set and SetInfo ......................................................
-local.set.attrib = empty
-set.role.attrib = role.attrib
-set =
-  element set {
-    set.attlist,
-    div.title.content?,
-    setinfo?,
-    toc?,
-    book.class+,
-    setindex?
-  }
-# end of set.element
-
-# FPI: SGML formal public identifier
-set.attlist &=
-  attribute fpi { text }?,
-  status.attrib,
-  common.attrib,
-  set.role.attrib,
-  local.set.attrib
-# end of set.attlist
-
-# end of set.module
-local.setinfo.attrib = empty
-setinfo.role.attrib = role.attrib
-setinfo = element setinfo { setinfo.attlist, info.class+ }
-# end of setinfo.element
-
-# Contents: IDs of the ToC, Books, and SetIndex that comprise
-# the set, in the order of their appearance
-setinfo.attlist &=
-  attribute contents { xsd:IDREFS }?,
-  common.attrib,
-  setinfo.role.attrib,
-  local.setinfo.attrib
-# end of setinfo.attlist
-
-# end of setinfo.module
-
-# end of set.content.module
-
-# ......................................................................
-
-# Book and BookInfo ....................................................
-local.book.attrib = empty
-book.role.attrib = role.attrib
-book =
-  element book {
-    book.attlist,
-    div.title.content?,
-    bookinfo?,
-    (dedication
-     | toc
-     | lot
-     | glossary
-     | bibliography
-     | preface
-     | chapter.class
-     | reference
-     | part
-     | article.class
-     | appendix.class
-     | index.class
-     | colophon)*
-  }
-# end of book.element
-
-# FPI: SGML formal public identifier
-book.attlist &=
-  attribute fpi { text }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  book.role.attrib,
-  local.book.attrib
-# end of book.attlist
-
-# end of book.module
-local.bookinfo.attrib = empty
-bookinfo.role.attrib = role.attrib
-bookinfo = element bookinfo { bookinfo.attlist, info.class+ }
-# end of bookinfo.element
-
-# Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
-# Appendixes, References, GLossary, Bibliography, and indexes
-# comprising the Book, in the order of their appearance
-bookinfo.attlist &=
-  attribute contents { xsd:IDREFS }?,
-  common.attrib,
-  bookinfo.role.attrib,
-  local.bookinfo.attrib
-# end of bookinfo.attlist
-
-# end of bookinfo.module
-
-# end of book.content.module
-
-# ......................................................................
-
-# Dedication, ToC, and LoT .............................................
-local.dedication.attrib = empty
-dedication.role.attrib = role.attrib
-dedication =
-  element dedication {
-    dedication.attlist, sect.title.content?, legalnotice.mix+
-  }
-# end of dedication.element
-dedication.attlist &=
-  status.attrib,
-  common.attrib,
-  dedication.role.attrib,
-  local.dedication.attrib
-# end of dedication.attlist
-
-# end of dedication.module
-local.colophon.attrib = empty
-colophon.role.attrib = role.attrib
-colophon =
-  element colophon {
-    colophon.attlist, sect.title.content?, textobject.mix+
-  }
-# end of colophon.element
-colophon.attlist &=
-  status.attrib,
-  common.attrib,
-  colophon.role.attrib,
-  local.colophon.attrib
-# end of colophon.attlist
-
-# end of colophon.module
-local.toc.attrib = empty
-toc.role.attrib = role.attrib
-toc =
-  element toc {
-    toc.attlist,
-    beginpage?,
-    bookcomponent.title.content?,
-    tocfront*,
-    (tocpart | tocchap)*,
-    tocback*
-  }
-# end of toc.element
-toc.attlist &=
-  pagenum.attrib, common.attrib, toc.role.attrib, local.toc.attrib
-# end of toc.attlist
-
-# end of toc.module
-local.tocfront.attrib = empty
-tocfront.role.attrib = role.attrib
-tocfront = element tocfront { tocfront.attlist, para.char.mix* }
-# end of tocfront.element
-
-# to element that this entry represents
-tocfront.attlist &=
-  label.attrib,
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocfront.role.attrib,
-  local.tocfront.attrib
-# end of tocfront.attlist
-
-# end of tocfront.module
-local.tocentry.attrib = empty
-tocentry.role.attrib = role.attrib
-tocentry = element tocentry { tocentry.attlist, para.char.mix* }
-# end of tocentry.element
-
-# to element that this entry represents
-tocentry.attlist &=
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocentry.role.attrib,
-  local.tocentry.attrib
-# end of tocentry.attlist
-
-# end of tocentry.module
-local.tocpart.attrib = empty
-tocpart.role.attrib = role.attrib
-tocpart = element tocpart { tocpart.attlist, tocentry+, tocchap* }
-# end of tocpart.element
-tocpart.attlist &=
-  common.attrib, tocpart.role.attrib, local.tocpart.attrib
-# end of tocpart.attlist
-
-# end of tocpart.module
-local.tocchap.attrib = empty
-tocchap.role.attrib = role.attrib
-tocchap = element tocchap { tocchap.attlist, tocentry+, toclevel1* }
-# end of tocchap.element
-tocchap.attlist &=
-  label.attrib, common.attrib, tocchap.role.attrib, local.tocchap.attrib
-# end of tocchap.attlist
-
-# end of tocchap.module
-local.toclevel1.attrib = empty
-toclevel1.role.attrib = role.attrib
-toclevel1 =
-  element toclevel1 { toclevel1.attlist, tocentry+, toclevel2* }
-# end of toclevel1.element
-toclevel1.attlist &=
-  common.attrib, toclevel1.role.attrib, local.toclevel1.attrib
-# end of toclevel1.attlist
-
-# end of toclevel1.module
-local.toclevel2.attrib = empty
-toclevel2.role.attrib = role.attrib
-toclevel2 =
-  element toclevel2 { toclevel2.attlist, tocentry+, toclevel3* }
-# end of toclevel2.element
-toclevel2.attlist &=
-  common.attrib, toclevel2.role.attrib, local.toclevel2.attrib
-# end of toclevel2.attlist
-
-# end of toclevel2.module
-local.toclevel3.attrib = empty
-toclevel3.role.attrib = role.attrib
-toclevel3 =
-  element toclevel3 { toclevel3.attlist, tocentry+, toclevel4* }
-# end of toclevel3.element
-toclevel3.attlist &=
-  common.attrib, toclevel3.role.attrib, local.toclevel3.attrib
-# end of toclevel3.attlist
-
-# end of toclevel3.module
-local.toclevel4.attrib = empty
-toclevel4.role.attrib = role.attrib
-toclevel4 =
-  element toclevel4 { toclevel4.attlist, tocentry+, toclevel5* }
-# end of toclevel4.element
-toclevel4.attlist &=
-  common.attrib, toclevel4.role.attrib, local.toclevel4.attrib
-# end of toclevel4.attlist
-
-# end of toclevel4.module
-local.toclevel5.attrib = empty
-toclevel5.role.attrib = role.attrib
-toclevel5 = element toclevel5 { toclevel5.attlist, tocentry+ }
-# end of toclevel5.element
-toclevel5.attlist &=
-  common.attrib, toclevel5.role.attrib, local.toclevel5.attrib
-# end of toclevel5.attlist
-
-# end of toclevel5.module
-local.tocback.attrib = empty
-tocback.role.attrib = role.attrib
-tocback = element tocback { tocback.attlist, para.char.mix* }
-# end of tocback.element
-
-# to element that this entry represents
-tocback.attlist &=
-  label.attrib,
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocback.role.attrib,
-  local.tocback.attrib
-# end of tocback.attlist
-
-# end of tocback.module
-
-# end of toc.content.module
-local.lot.attrib = empty
-lot.role.attrib = role.attrib
-lot =
-  element lot {
-    lot.attlist, beginpage?, bookcomponent.title.content?, lotentry*
-  }
-# end of lot.element
-lot.attlist &=
-  label.attrib, common.attrib, lot.role.attrib, local.lot.attrib
-# end of lot.attlist
-
-# end of lot.module
-local.lotentry.attrib = empty
-lotentry.role.attrib = role.attrib
-lotentry = element lotentry { lotentry.attlist, para.char.mix* }
-# end of lotentry.element
-
-# SrcCredit: Information about the source of the entry,
-# as for a list of illustrations
-
-#  linkend: to element that this entry represents
-lotentry.attlist &=
-  linkend.attrib,
-  pagenum.attrib,
-  attribute srccredit { text }?,
-  common.attrib,
-  lotentry.role.attrib,
-  local.lotentry.attrib
-# end of lotentry.attlist
-
-# end of lotentry.module
-
-# end of lot.content.module
-
-# ......................................................................
-
-# Appendix, Chapter, Part, Preface, Reference, PartIntro ...............
-local.appendix.attrib = empty
-appendix.role.attrib = role.attrib
-appendix =
-  element appendix {
-    appendix.attlist,
-    beginpage?,
-    appendixinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of appendix.element
-appendix.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  appendix.role.attrib,
-  local.appendix.attrib
-# end of appendix.attlist
-
-# end of appendix.module
-local.chapter.attrib = empty
-chapter.role.attrib = role.attrib
-chapter =
-  element chapter {
-    chapter.attlist,
-    beginpage?,
-    chapterinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of chapter.element
-chapter.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  chapter.role.attrib,
-  local.chapter.attrib
-# end of chapter.attlist
-
-# end of chapter.module
-
-# Note that Part was to have its content model reduced in V4.2.  This
-# change will not be made after all.
-local.part.attrib = empty
-part.role.attrib = role.attrib
-part =
-  element part {
-    part.attlist,
-    beginpage?,
-    partinfo?,
-    bookcomponent.title.content,
-    partintro?,
-    partcontent.mix+
-  }
-# end of part.element
-part.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  part.role.attrib,
-  local.part.attrib
-# end of part.attlist
-
-# ELEMENT PartIntro (defined below)
-
-# end of part.module
-local.preface.attrib = empty
-preface.role.attrib = role.attrib
-preface =
-  element preface {
-    preface.attlist,
-    beginpage?,
-    prefaceinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of preface.element
-preface.attlist &=
-  status.attrib,
-  common.attrib,
-  preface.role.attrib,
-  local.preface.attrib
-# end of preface.attlist
-
-# end of preface.module
-local.reference.attrib = empty
-reference.role.attrib = role.attrib
-reference =
-  element reference {
-    reference.attlist,
-    beginpage?,
-    referenceinfo?,
-    bookcomponent.title.content,
-    partintro?,
-    refentry.class+
-  }
-# end of reference.element
-reference.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  reference.role.attrib,
-  local.reference.attrib
-# end of reference.attlist
-
-# ELEMENT PartIntro (defined below)
-
-# end of reference.module
-local.partintro.attrib = empty
-partintro.role.attrib = role.attrib
-partintro =
-  element partintro {
-    partintro.attlist, div.title.content?, bookcomponent.content
-  }
-# end of partintro.element
-partintro.attlist &=
-  label.attrib,
-  common.attrib,
-  partintro.role.attrib,
-  local.partintro.attrib
-# end of partintro.attlist
-
-# end of partintro.module
-
-# ......................................................................
-
-# Other Info elements ..................................................
-local.appendixinfo.attrib = empty
-appendixinfo.role.attrib = role.attrib
-appendixinfo =
-  element appendixinfo { appendixinfo.attlist, info.class+ }
-# end of appendixinfo.element
-appendixinfo.attlist &=
-  common.attrib, appendixinfo.role.attrib, local.appendixinfo.attrib
-# end of appendixinfo.attlist
-
-# end of appendixinfo.module
-local.bibliographyinfo.attrib = empty
-bibliographyinfo.role.attrib = role.attrib
-bibliographyinfo =
-  element bibliographyinfo { bibliographyinfo.attlist, info.class+ }
-# end of bibliographyinfo.element
-bibliographyinfo.attlist &=
-  common.attrib,
-  bibliographyinfo.role.attrib,
-  local.bibliographyinfo.attrib
-# end of bibliographyinfo.attlist
-
-# end of bibliographyinfo.module
-local.chapterinfo.attrib = empty
-chapterinfo.role.attrib = role.attrib
-chapterinfo = element chapterinfo { chapterinfo.attlist, info.class+ }
-# end of chapterinfo.element
-chapterinfo.attlist &=
-  common.attrib, chapterinfo.role.attrib, local.chapterinfo.attrib
-# end of chapterinfo.attlist
-
-# end of chapterinfo.module
-local.glossaryinfo.attrib = empty
-glossaryinfo.role.attrib = role.attrib
-glossaryinfo =
-  element glossaryinfo { glossaryinfo.attlist, info.class+ }
-# end of glossaryinfo.element
-glossaryinfo.attlist &=
-  common.attrib, glossaryinfo.role.attrib, local.glossaryinfo.attrib
-# end of glossaryinfo.attlist
-
-# end of glossaryinfo.module
-local.indexinfo.attrib = empty
-indexinfo.role.attrib = role.attrib
-indexinfo = element indexinfo { indexinfo.attlist, info.class+ }
-# end of indexinfo.element
-indexinfo.attlist &=
-  common.attrib, indexinfo.role.attrib, local.indexinfo.attrib
-# end of indexinfo.attlist
-
-# end of indexinfo.module
-local.setindexinfo.attrib = empty
-setindexinfo.role.attrib = role.attrib
-setindexinfo =
-  element setindexinfo { setindexinfo.attlist, info.class+ }
-# end of setindexinfo.element
-setindexinfo.attlist &=
-  common.attrib, setindexinfo.role.attrib, local.setindexinfo.attrib
-# end of setindexinfo.attlist
-
-# end of setindexinfo.module
-local.partinfo.attrib = empty
-partinfo.role.attrib = role.attrib
-partinfo = element partinfo { partinfo.attlist, info.class+ }
-# end of partinfo.element
-partinfo.attlist &=
-  common.attrib, partinfo.role.attrib, local.partinfo.attrib
-# end of partinfo.attlist
-
-# end of partinfo.module
-local.prefaceinfo.attrib = empty
-prefaceinfo.role.attrib = role.attrib
-prefaceinfo = element prefaceinfo { prefaceinfo.attlist, info.class+ }
-# end of prefaceinfo.element
-prefaceinfo.attlist &=
-  common.attrib, prefaceinfo.role.attrib, local.prefaceinfo.attrib
-# end of prefaceinfo.attlist
-
-# end of prefaceinfo.module
-local.refentryinfo.attrib = empty
-refentryinfo.role.attrib = role.attrib
-refentryinfo =
-  element refentryinfo { refentryinfo.attlist, info.class+ }
-# end of refentryinfo.element
-refentryinfo.attlist &=
-  common.attrib, refentryinfo.role.attrib, local.refentryinfo.attrib
-# end of refentryinfo.attlist
-
-# end of refentryinfo.module
-local.refsectioninfo.attrib = empty
-refsectioninfo.role.attrib = role.attrib
-refsectioninfo =
-  element refsectioninfo { refsectioninfo.attlist, info.class+ }
-# end of refsectioninfo.element
-refsectioninfo.attlist &=
-  common.attrib, refsectioninfo.role.attrib, local.refsectioninfo.attrib
-# end of refsectioninfo.attlist
-
-# end of refsectioninfo.module
-local.refsect1info.attrib = empty
-refsect1info.role.attrib = role.attrib
-refsect1info =
-  element refsect1info { refsect1info.attlist, info.class+ }
-# end of refsect1info.element
-refsect1info.attlist &=
-  common.attrib, refsect1info.role.attrib, local.refsect1info.attrib
-# end of refsect1info.attlist
-
-# end of refsect1info.module
-local.refsect2info.attrib = empty
-refsect2info.role.attrib = role.attrib
-refsect2info =
-  element refsect2info { refsect2info.attlist, info.class+ }
-# end of refsect2info.element
-refsect2info.attlist &=
-  common.attrib, refsect2info.role.attrib, local.refsect2info.attrib
-# end of refsect2info.attlist
-
-# end of refsect2info.module
-local.refsect3info.attrib = empty
-refsect3info.role.attrib = role.attrib
-refsect3info =
-  element refsect3info { refsect3info.attlist, info.class+ }
-# end of refsect3info.element
-refsect3info.attlist &=
-  common.attrib, refsect3info.role.attrib, local.refsect3info.attrib
-# end of refsect3info.attlist
-
-# end of refsect3info.module
-local.refsynopsisdivinfo.attrib = empty
-refsynopsisdivinfo.role.attrib = role.attrib
-refsynopsisdivinfo =
-  element refsynopsisdivinfo { refsynopsisdivinfo.attlist, info.class+ }
-# end of refsynopsisdivinfo.element
-refsynopsisdivinfo.attlist &=
-  common.attrib,
-  refsynopsisdivinfo.role.attrib,
-  local.refsynopsisdivinfo.attrib
-# end of refsynopsisdivinfo.attlist
-
-# end of refsynopsisdivinfo.module
-local.referenceinfo.attrib = empty
-referenceinfo.role.attrib = role.attrib
-referenceinfo =
-  element referenceinfo { referenceinfo.attlist, info.class+ }
-# end of referenceinfo.element
-referenceinfo.attlist &=
-  common.attrib, referenceinfo.role.attrib, local.referenceinfo.attrib
-# end of referenceinfo.attlist
-
-# end of referenceinfo.module
-local.sect1info.attrib = empty
-sect1info.role.attrib = role.attrib
-sect1info = element sect1info { sect1info.attlist, info.class+ }
-# end of sect1info.element
-sect1info.attlist &=
-  common.attrib, sect1info.role.attrib, local.sect1info.attrib
-# end of sect1info.attlist
-local.sect2info.attrib = empty
-sect2info.role.attrib = role.attrib
-sect2info = element sect2info { sect2info.attlist, info.class+ }
-# end of sect2info.element
-sect2info.attlist &=
-  common.attrib, sect2info.role.attrib, local.sect2info.attrib
-# end of sect2info.attlist
-local.sect3info.attrib = empty
-sect3info.role.attrib = role.attrib
-sect3info = element sect3info { sect3info.attlist, info.class+ }
-# end of sect3info.element
-sect3info.attlist &=
-  common.attrib, sect3info.role.attrib, local.sect3info.attrib
-# end of sect3info.attlist
-local.sect4info.attrib = empty
-sect4info.role.attrib = role.attrib
-sect4info = element sect4info { sect4info.attlist, info.class+ }
-# end of sect4info.element
-sect4info.attlist &=
-  common.attrib, sect4info.role.attrib, local.sect4info.attrib
-# end of sect4info.attlist
-local.sect5info.attrib = empty
-sect5info.role.attrib = role.attrib
-sect5info = element sect5info { sect5info.attlist, info.class+ }
-# end of sect5info.element
-sect5info.attlist &=
-  common.attrib, sect5info.role.attrib, local.sect5info.attrib
-# end of sect5info.attlist
-
-# ......................................................................
-
-# Section (parallel to Sect*) .........................................
-local.section.attrib = empty
-section.role.attrib = role.attrib
-section =
-  element section {
-    section.attlist,
-    sectioninfo?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+,
-      (refentry.class* | section.class* | simplesect*))
-     | refentry.class+
-     | section.class+
-     | simplesect+),
-    nav.class*
-  }
-# end of section.element
-section.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  section.role.attrib,
-  local.section.attrib
-# end of section.attlist
-
-# end of section.module
-sectioninfo.role.attrib = role.attrib
-local.sectioninfo.attrib = empty
-sectioninfo = element sectioninfo { sectioninfo.attlist, info.class+ }
-# end of sectioninfo.element
-sectioninfo.attlist &=
-  common.attrib, sectioninfo.role.attrib, local.sectioninfo.attrib
-# end of sectioninfo.attlist
-
-# end of sectioninfo.module
-
-# end of section.content.module
-
-# ......................................................................
-
-# Sect1, Sect2, Sect3, Sect4, Sect5 ....................................
-local.sect1.attrib = empty
-sect1.role.attrib = role.attrib
-sect1 =
-  element sect1 {
-    sect1.attlist,
-    sect1info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect2* | simplesect*))
-     | refentry.class+
-     | sect2+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect1.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect1.attlist &=
-  attribute renderas { "sect2" | "sect3" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect1.role.attrib,
-  local.sect1.attrib
-# end of sect1.attlist
-
-# end of sect1.module
-local.sect2.attrib = empty
-sect2.role.attrib = role.attrib
-sect2 =
-  element sect2 {
-    sect2.attlist,
-    sect2info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect3* | simplesect*))
-     | refentry.class+
-     | sect3+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect2.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect2.attlist &=
-  attribute renderas { "sect1" | "sect3" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect2.role.attrib,
-  local.sect2.attrib
-# end of sect2.attlist
-
-# end of sect2.module
-local.sect3.attrib = empty
-sect3.role.attrib = role.attrib
-sect3 =
-  element sect3 {
-    sect3.attlist,
-    sect3info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect4* | simplesect*))
-     | refentry.class+
-     | sect4+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect3.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect3.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect3.role.attrib,
-  local.sect3.attrib
-# end of sect3.attlist
-
-# end of sect3.module
-local.sect4.attrib = empty
-sect4.role.attrib = role.attrib
-sect4 =
-  element sect4 {
-    sect4.attlist,
-    sect4info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect5* | simplesect*))
-     | refentry.class+
-     | sect5+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect4.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect4.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect3" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect4.role.attrib,
-  local.sect4.attrib
-# end of sect4.attlist
-
-# end of sect4.module
-local.sect5.attrib = empty
-sect5.role.attrib = role.attrib
-sect5 =
-  element sect5 {
-    sect5.attlist,
-    sect5info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | simplesect*))
-     | refentry.class+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect5.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect5.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect3" | "sect4" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect5.role.attrib,
-  local.sect5.attrib
-# end of sect5.attlist
-
-# end of sect5.module
-local.simplesect.attrib = empty
-simplesect.role.attrib = role.attrib
-simplesect =
-  element simplesect {
-    simplesect.attlist, sect.title.content, divcomponent.mix+
-  }
-# end of simplesect.element
-simplesect.attlist &=
-  common.attrib, simplesect.role.attrib, local.simplesect.attrib
-# end of simplesect.attlist
-
-# end of simplesect.module
-
-# ......................................................................
-
-# Bibliography .........................................................
-local.bibliography.attrib = empty
-bibliography.role.attrib = role.attrib
-bibliography =
-  element bibliography {
-    bibliography.attlist,
-    bibliographyinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (bibliodiv+ | (biblioentry | bibliomixed)+)
-  }
-# end of bibliography.element
-bibliography.attlist &=
-  status.attrib,
-  common.attrib,
-  bibliography.role.attrib,
-  local.bibliography.attrib
-# end of bibliography.attlist
-
-# end of bibliography.module
-local.bibliodiv.attrib = empty
-bibliodiv.role.attrib = role.attrib
-bibliodiv =
-  element bibliodiv {
-    bibliodiv.attlist,
-    sect.title.content?,
-    component.mix*,
-    (biblioentry | bibliomixed)+
-  }
-# end of bibliodiv.element
-bibliodiv.attlist &=
-  status.attrib,
-  common.attrib,
-  bibliodiv.role.attrib,
-  local.bibliodiv.attrib
-# end of bibliodiv.attlist
-
-# end of bibliodiv.module
-
-# end of bibliography.content.module
-
-# ......................................................................
-
-# Glossary .............................................................
-local.glossary.attrib = empty
-glossary.role.attrib = role.attrib
-glossary =
-  element glossary {
-    glossary.attlist,
-    glossaryinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (glossdiv+ | glossentry+),
-    bibliography?
-  }
-# end of glossary.element
-glossary.attlist &=
-  status.attrib,
-  common.attrib,
-  glossary.role.attrib,
-  local.glossary.attrib
-# end of glossary.attlist
-
-# end of glossary.module
-local.glossdiv.attrib = empty
-glossdiv.role.attrib = role.attrib
-glossdiv =
-  element glossdiv {
-    glossdiv.attlist, sect.title.content, component.mix*, glossentry+
-  }
-# end of glossdiv.element
-glossdiv.attlist &=
-  status.attrib,
-  common.attrib,
-  glossdiv.role.attrib,
-  local.glossdiv.attrib
-# end of glossdiv.attlist
-
-# end of glossdiv.module
-
-# end of glossary.content.module
-
-# ......................................................................
-
-# Index and SetIndex ...................................................
-local.indexes.attrib = empty
-indexes.role.attrib = role.attrib
-index =
-  element index {
-    index.attlist,
-    indexinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (indexdiv* | indexentry*)
-  }
-# end of index.element
-index.attlist &=
-  common.attrib, indexes.role.attrib, local.indexes.attrib
-# end of index.attlist
-setindex =
-  element setindex {
-    setindex.attlist,
-    setindexinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (indexdiv* | indexentry*)
-  }
-# end of setindex.element
-setindex.attlist &=
-  common.attrib, indexes.role.attrib, local.indexes.attrib
-# end of setindex.attlist
-
-# end of indexes.module
-
-# SegmentedList in this content is useful for marking up permuted
-# indices.
-local.indexdiv.attrib = empty
-indexdiv.role.attrib = role.attrib
-indexdiv =
-  element indexdiv {
-    indexdiv.attlist,
-    sect.title.content?,
-    (indexdivcomponent.mix*, (indexentry+ | segmentedlist))
-  }
-# end of indexdiv.element
-indexdiv.attlist &=
-  common.attrib, indexdiv.role.attrib, local.indexdiv.attrib
-# end of indexdiv.attlist
-
-# end of indexdiv.module
-
-# Index entries appear in the index, not the text.
-local.indexentry.attrib = empty
-indexentry.role.attrib = role.attrib
-indexentry =
-  element indexentry {
-    indexentry.attlist,
-    primaryie,
-    (seeie | seealsoie)*,
-    (secondaryie, (seeie | seealsoie | tertiaryie)*)*
-  }
-# end of indexentry.element
-indexentry.attlist &=
-  common.attrib, indexentry.role.attrib, local.indexentry.attrib
-# end of indexentry.attlist
-
-# end of indexentry.module
-local.primsecterie.attrib = empty
-primsecterie.role.attrib = role.attrib
-primaryie = element primaryie { primaryie.attlist, ndxterm.char.mix* }
-# end of primaryie.element
-
-# to IndexTerms that these entries represent
-primaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of primaryie.attlist
-secondaryie =
-  element secondaryie { secondaryie.attlist, ndxterm.char.mix* }
-# end of secondaryie.element
-
-# to IndexTerms that these entries represent
-secondaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of secondaryie.attlist
-tertiaryie =
-  element tertiaryie { tertiaryie.attlist, ndxterm.char.mix* }
-# end of tertiaryie.element
-
-# to IndexTerms that these entries represent
-tertiaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of tertiaryie.attlist
-
-# end of primsecterie.module
-local.seeie.attrib = empty
-seeie.role.attrib = role.attrib
-seeie = element seeie { seeie.attlist, ndxterm.char.mix* }
-# end of seeie.element
-
-# to IndexEntry to look up
-seeie.attlist &=
-  linkend.attrib, common.attrib, seeie.role.attrib, local.seeie.attrib
-# end of seeie.attlist
-
-# end of seeie.module
-local.seealsoie.attrib = empty
-seealsoie.role.attrib = role.attrib
-seealsoie = element seealsoie { seealsoie.attlist, ndxterm.char.mix* }
-# end of seealsoie.element
-
-# to related IndexEntries
-seealsoie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  seealsoie.role.attrib,
-  local.seealsoie.attrib
-# end of seealsoie.attlist
-
-# end of seealsoie.module
-
-# end of index.content.module
-
-# ......................................................................
-
-# RefEntry .............................................................
-local.refentry.attrib = empty
-refentry.role.attrib = role.attrib
-refentry =
-  element refentry {
-    refentry.attlist,
-    beginpage?,
-    ndxterm.class*,
-    refentryinfo?,
-    refmeta?,
-    (remark | link.char.class)*,
-    refnamediv,
-    refsynopsisdiv?,
-    (refsect1+ | refsection+)
-  }
-# end of refentry.element
-refentry.attlist &=
-  status.attrib,
-  common.attrib,
-  refentry.role.attrib,
-  local.refentry.attrib
-# end of refentry.attlist
-
-# end of refentry.module
-local.refmeta.attrib = empty
-refmeta.role.attrib = role.attrib
-refmeta =
-  element refmeta {
-    refmeta.attlist,
-    ndxterm.class*,
-    refentrytitle,
-    manvolnum?,
-    refmiscinfo*,
-    ndxterm.class*
-  }
-# end of refmeta.element
-refmeta.attlist &=
-  common.attrib, refmeta.role.attrib, local.refmeta.attrib
-# end of refmeta.attlist
-
-# end of refmeta.module
-local.refmiscinfo.attrib = empty
-refmiscinfo.role.attrib = role.attrib
-refmiscinfo =
-  element refmiscinfo { refmiscinfo.attlist, docinfo.char.mix* }
-# end of refmiscinfo.element
-
-# Class: Freely assignable parameter; no default
-refmiscinfo.attlist &=
-  attribute class { text }?,
-  common.attrib,
-  refmiscinfo.role.attrib,
-  local.refmiscinfo.attrib
-# end of refmiscinfo.attlist
-
-# end of refmiscinfo.module
-local.refnamediv.attrib = empty
-refnamediv.role.attrib = role.attrib
-refnamediv =
-  element refnamediv {
-    refnamediv.attlist,
-    refdescriptor?,
-    refname+,
-    refpurpose,
-    refclass*,
-    (remark | link.char.class)*
-  }
-# end of refnamediv.element
-refnamediv.attlist &=
-  common.attrib, refnamediv.role.attrib, local.refnamediv.attrib
-# end of refnamediv.attlist
-
-# end of refnamediv.module
-local.refdescriptor.attrib = empty
-refdescriptor.role.attrib = role.attrib
-refdescriptor =
-  element refdescriptor { refdescriptor.attlist, refname.char.mix* }
-# end of refdescriptor.element
-refdescriptor.attlist &=
-  common.attrib, refdescriptor.role.attrib, local.refdescriptor.attrib
-# end of refdescriptor.attlist
-
-# end of refdescriptor.module
-local.refname.attrib = empty
-refname.role.attrib = role.attrib
-refname = element refname { refname.attlist, refname.char.mix* }
-# end of refname.element
-refname.attlist &=
-  common.attrib, refname.role.attrib, local.refname.attrib
-# end of refname.attlist
-
-# end of refname.module
-local.refpurpose.attrib = empty
-refpurpose.role.attrib = role.attrib
-refpurpose =
-  element refpurpose { refpurpose.attlist, refinline.char.mix* }
-# end of refpurpose.element
-refpurpose.attlist &=
-  common.attrib, refpurpose.role.attrib, local.refpurpose.attrib
-# end of refpurpose.attlist
-
-# end of refpurpose.module
-local.refclass.attrib = empty
-refclass.role.attrib = role.attrib
-refclass = element refclass { refclass.attlist, refclass.char.mix* }
-# end of refclass.element
-refclass.attlist &=
-  common.attrib, refclass.role.attrib, local.refclass.attrib
-# end of refclass.attlist
-
-# end of refclass.module
-local.refsynopsisdiv.attrib = empty
-refsynopsisdiv.role.attrib = role.attrib
-refsynopsisdiv =
-  element refsynopsisdiv {
-    refsynopsisdiv.attlist,
-    refsynopsisdivinfo?,
-    refsect.title.content?,
-    ((refcomponent.mix+, refsect2*) | refsect2+)
-  }
-# end of refsynopsisdiv.element
-refsynopsisdiv.attlist &=
-  common.attrib, refsynopsisdiv.role.attrib, local.refsynopsisdiv.attrib
-# end of refsynopsisdiv.attlist
-
-# end of refsynopsisdiv.module
-local.refsection.attrib = empty
-refsection.role.attrib = role.attrib
-refsection =
-  element refsection {
-    refsection.attlist,
-    refsectioninfo?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsection*) | refsection+)
-  }
-# end of refsection.element
-refsection.attlist &=
-  status.attrib,
-  common.attrib,
-  refsection.role.attrib,
-  local.refsection.attrib
-# end of refsection.attlist
-
-# end of refsection.module
-local.refsect1.attrib = empty
-refsect1.role.attrib = role.attrib
-refsect1 =
-  element refsect1 {
-    refsect1.attlist,
-    refsect1info?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsect2*) | refsect2+)
-  }
-# end of refsect1.element
-refsect1.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect1.role.attrib,
-  local.refsect1.attrib
-# end of refsect1.attlist
-
-# end of refsect1.module
-local.refsect2.attrib = empty
-refsect2.role.attrib = role.attrib
-refsect2 =
-  element refsect2 {
-    refsect2.attlist,
-    refsect2info?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsect3*) | refsect3+)
-  }
-# end of refsect2.element
-refsect2.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect2.role.attrib,
-  local.refsect2.attrib
-# end of refsect2.attlist
-
-# end of refsect2.module
-local.refsect3.attrib = empty
-refsect3.role.attrib = role.attrib
-refsect3 =
-  element refsect3 {
-    refsect3.attlist,
-    refsect3info?,
-    refsect.title.content,
-    refcomponent.mix+
-  }
-# end of refsect3.element
-refsect3.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect3.role.attrib,
-  local.refsect3.attrib
-# end of refsect3.attlist
-
-# end of refsect3.module
-
-# end of refentry.content.module
-
-# ......................................................................
-
-# Article ..............................................................
-
-# An Article is a chapter-level, stand-alone document that is often,
-# but need not be, collected into a Book.
-local.article.attrib = empty
-article.role.attrib = role.attrib
-article =
-  element article {
-    article.attlist,
-    div.title.content?,
-    articleinfo?,
-    tocchap?,
-    lot*,
-    bookcomponent.content,
-    (nav.class | appendix.class | ackno)*
-  }
-# end of article.element
-
-# Class: Indicates the type of a particular article;
-# all articles have the same structure and general purpose.
-# No default.
-
-# ParentBook: ID of the enclosing Book
-article.attlist &=
-  attribute class {
-    "journalarticle"
-    | "productsheet"
-    | "whitepaper"
-    | "techreport"
-    | "specification"
-    | "faq"
-  }?,
-  attribute parentbook { xsd:IDREF }?,
-  status.attrib,
-  common.attrib,
-  article.role.attrib,
-  local.article.attrib
-# end of article.attlist
-
-# end of article.module
-
-# End of DocBook document hierarchy module V4.2 ........................
-
-# ......................................................................
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbnotn.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbnotn.rnc
deleted file mode 100644
index 2a6185f27f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbnotn.rnc
+++ /dev/null
@@ -1,84 +0,0 @@
-# ......................................................................
-
-# DocBook notations module V4.2 ........................................
-
-# File dbnotnx.mod .....................................................
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbnotn.rnc,v 1.1 2003/08/30 04:19:27 jjc Exp $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the entity declarations for the standard ISO
-# entity sets used by DocBook.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbnotn PUBLIC
-# "-//OASIS//ENTITIES DocBook Notations V4.2//EN"
-# "dbnotnx.mod">
-# %dbnotn;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-local.notation.class = notAllowed
-notation.class =
-  "BMP"
-  | "CGM-CHAR"
-  | "CGM-BINARY"
-  | "CGM-CLEAR"
-  | "DITROFF"
-  | "DVI"
-  | "EPS"
-  | "EQN"
-  | "FAX"
-  | "GIF"
-  | "GIF87a"
-  | "GIF89a"
-  | "JPG"
-  | "JPEG"
-  | "IGES"
-  | "PCX"
-  | "PIC"
-  | "PNG"
-  | "PS"
-  | "SGML"
-  | "TBL"
-  | "TEX"
-  | "TIFF"
-  | "WMF"
-  | "WPG"
-  | "SVG"
-  | "linespecific"
-  | local.notation.class
-# WordPerfect Graphic format
-
-# End of DocBook notations module V4.2 .................................
-
-# ......................................................................
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbpool.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbpool.rnc
deleted file mode 100644
index 46236eb7b7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbpool.rnc
+++ /dev/null
@@ -1,5083 +0,0 @@
-# This file was generated automatically by Trang.  The table model
-# dependent definitions have been moved into separate files.
-
-# ......................................................................
-
-# DocBook XML information pool module V4.2 .............................
-
-# File dbpoolx.mod .....................................................
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbpool.rnc,v 1.4 2003/08/30 07:48:31 jjc Exp $
-# 
-# Permission to use, copy, modify and distribute the DocBook XML DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook XML DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the objects, inline
-# elements, and so on that are available to be used as the main
-# content of DocBook documents.  Some elements are useful for general
-# publishing, and others are useful specifically for computer
-# documentation.
-# 
-# This module has the following dependencies on other modules:
-# 
-# o It assumes that a %notation.class; entity is defined by the
-#   driver file or other high-level module.  This entity is
-#   referenced in the NOTATION attributes for the graphic-related and
-#   ModeSpec elements.
-# 
-# o It assumes that an appropriately parameterized table module is
-#   available for use with the table-related elements.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbpool PUBLIC
-# "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
-# "dbpoolx.mod">
-# %dbpool;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ......................................................................
-
-# General-purpose semantics entities ...................................
-
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-yesorno.attvals = string
-# ......................................................................
-
-# Entities for module inclusions .......................................
-
-# ......................................................................
-
-# Entities for element classes and mixtures ............................
-
-# "Ubiquitous" classes: ndxterm.class and beginpage
-local.ndxterm.class = notAllowed
-ndxterm.class = indexterm | local.ndxterm.class
-# Object-level classes .................................................
-local.list.class = notAllowed
-list.class =
-  calloutlist
-  | glosslist
-  | itemizedlist
-  | orderedlist
-  | segmentedlist
-  | simplelist
-  | variablelist
-  | local.list.class
-local.admon.class = notAllowed
-admon.class =
-  caution | important | note | tip | warning | local.admon.class
-local.linespecific.class = notAllowed
-linespecific.class =
-  literallayout
-  | programlisting
-  | programlistingco
-  | screen
-  | screenco
-  | screenshot
-  | local.linespecific.class
-local.method.synop.class = notAllowed
-method.synop.class =
-  constructorsynopsis
-  | destructorsynopsis
-  | methodsynopsis
-  | local.method.synop.class
-local.synop.class = notAllowed
-synop.class =
-  synopsis
-  | cmdsynopsis
-  | funcsynopsis
-  | classsynopsis
-  | fieldsynopsis
-  | method.synop.class
-  | local.synop.class
-local.para.class = notAllowed
-para.class = formalpara | para | simpara | local.para.class
-local.informal.class = notAllowed
-informal.class =
-  address
-  | blockquote
-  | graphic
-  | graphicco
-  | mediaobject
-  | mediaobjectco
-  | informalequation
-  | informalexample
-  | informalfigure
-  | informaltable
-  | local.informal.class
-local.formal.class = notAllowed
-formal.class = equation | example | figure | table | local.formal.class
-# The DocBook TC may produce an official EBNF module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-ebnf.block.hook = notAllowed
-local.compound.class = notAllowed
-compound.class =
-  msgset
-  | procedure
-  | sidebar
-  | qandaset
-  | ebnf.block.hook
-  | local.compound.class
-local.genobj.class = notAllowed
-genobj.class =
-  anchor | bridgehead | remark | highlights | local.genobj.class
-local.descobj.class = notAllowed
-descobj.class = abstract | authorblurb | epigraph | local.descobj.class
-# Character-level classes ..............................................
-local.xref.char.class = notAllowed
-xref.char.class = footnoteref | xref | local.xref.char.class
-local.gen.char.class = notAllowed
-gen.char.class =
-  abbrev
-  | acronym
-  | citation
-  | citerefentry
-  | citetitle
-  | emphasis
-  | firstterm
-  | foreignphrase
-  | glossterm
-  | footnote
-  | phrase
-  | quote
-  | trademark
-  | wordasword
-  | personname
-  | local.gen.char.class
-local.link.char.class = notAllowed
-link.char.class = link | olink | ulink | local.link.char.class
-# The DocBook TC may produce an official EBNF module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-ebnf.inline.hook = notAllowed
-local.tech.char.class = notAllowed
-tech.char.class =
-  action
-  | application
-  | classname
-  | methodname
-  | interfacename
-  | exceptionname
-  | ooclass
-  | oointerface
-  | ooexception
-  | command
-  | computeroutput
-  | database
-  | email
-  | envar
-  | errorcode
-  | errorname
-  | errortype
-  | errortext
-  | filename
-  | function
-  | guibutton
-  | guiicon
-  | guilabel
-  | guimenu
-  | guimenuitem
-  | guisubmenu
-  | hardware
-  | interface
-  | keycap
-  | keycode
-  | keycombo
-  | keysym
-  | literal
-  | constant
-  | markup
-  | medialabel
-  | menuchoice
-  | mousebutton
-  | option
-  | optional
-  | parameter
-  | prompt
-  | property
-  | replaceable
-  | returnvalue
-  | sgmltag
-  | structfield
-  | structname
-  | symbol
-  | systemitem
-  | \token
-  | type
-  | userinput
-  | varname
-  | ebnf.inline.hook
-  | local.tech.char.class
-local.base.char.class = notAllowed
-base.char.class = anchor | local.base.char.class
-local.docinfo.char.class = notAllowed
-docinfo.char.class =
-  author
-  | authorinitials
-  | corpauthor
-  | modespec
-  | othercredit
-  | productname
-  | productnumber
-  | revhistory
-  | local.docinfo.char.class
-local.other.char.class = notAllowed
-other.char.class =
-  remark | subscript | superscript | local.other.char.class
-local.inlineobj.char.class = notAllowed
-inlineobj.char.class =
-  inlinegraphic
-  | inlinemediaobject
-  | inlineequation
-  | local.inlineobj.char.class
-# ......................................................................
-
-# Entities for content models ..........................................
-formalobject.title.content = title, titleabbrev?
-# Redeclaration placeholder ............................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# Object-level mixtures ................................................
-
-#                       list admn line synp para infm form cmpd gen  desc
-# Component mixture       X    X    X    X    X    X    X    X    X    X
-# Sidebar mixture         X    X    X    X    X    X    X    a    X
-# Footnote mixture        X         X    X    X    X
-# Example mixture         X         X    X    X    X
-# Highlights mixture      X    X              X
-# Paragraph mixture       X         X    X         X
-# Admonition mixture      X         X    X    X    X    X    b    c
-# Figure mixture                    X    X         X
-# Table entry mixture     X    X    X         X    d
-# Glossary def mixture    X         X    X    X    X         e
-# Legal notice mixture    X    X    X         X    f
-# 
-# a. Just Procedure; not Sidebar itself or MsgSet.
-# b. No MsgSet.
-# c. No Highlights.
-# d. Just Graphic; no other informal objects.
-# e. No Anchor, BridgeHead, or Highlights.
-# f. Just BlockQuote; no other informal objects.
-local.component.mix = notAllowed
-component.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | local.component.mix
-local.sidebar.mix = notAllowed
-sidebar.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | beginpage
-  | local.sidebar.mix
-local.qandaset.mix = notAllowed
-qandaset.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | local.qandaset.mix
-local.revdescription.mix = notAllowed
-revdescription.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | local.revdescription.mix
-local.footnote.mix = notAllowed
-footnote.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | local.footnote.mix
-local.example.mix = notAllowed
-example.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | ndxterm.class
-  | beginpage
-  | local.example.mix
-local.highlights.mix = notAllowed
-highlights.mix =
-  list.class
-  | admon.class
-  | para.class
-  | ndxterm.class
-  | local.highlights.mix
-# %formal.class; is explicitly excluded from many contexts in which
-# paragraphs are used
-local.para.mix = notAllowed
-para.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | informal.class
-  | formal.class
-  | local.para.mix
-local.admon.mix = notAllowed
-admon.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | sidebar
-  | anchor
-  | bridgehead
-  | remark
-  | ndxterm.class
-  | beginpage
-  | local.admon.mix
-local.figure.mix = notAllowed
-figure.mix =
-  linespecific.class
-  | synop.class
-  | informal.class
-  | ndxterm.class
-  | beginpage
-  | local.figure.mix
-local.tabentry.mix = notAllowed
-tabentry.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | graphic
-  | mediaobject
-  | local.tabentry.mix
-local.glossdef.mix = notAllowed
-glossdef.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | remark
-  | ndxterm.class
-  | beginpage
-  | local.glossdef.mix
-local.legalnotice.mix = notAllowed
-legalnotice.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | blockquote
-  | ndxterm.class
-  | beginpage
-  | local.legalnotice.mix
-local.textobject.mix = notAllowed
-textobject.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | blockquote
-  | local.textobject.mix
-local.mediaobject.mix = notAllowed
-mediaobject.mix =
-  videoobject
-  | audioobject
-  | imageobject
-  | textobject
-  | local.mediaobject.mix
-local.listpreamble.mix = notAllowed
-listpreamble.mix =
-  admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | local.listpreamble.mix
-# Character-level mixtures .............................................
-
-# sgml.features
-
-# not [sgml.features[
-
-# ]] not sgml.features
-
-#                     #PCD xref word link cptr base dnfo othr inob (synop)
-# para.char.mix         X    X    X    X    X    X    X    X    X
-# title.char.mix        X    X    X    X    X    X    X    X    X
-# ndxterm.char.mix      X    X    X    X    X    X    X    X    a
-# cptr.char.mix         X              X    X    X         X    a
-# smallcptr.char.mix    X                   b                   a
-# word.char.mix         X         c    X         X         X    a
-# docinfo.char.mix      X         d    X    b              X    a
-# 
-# a. Just InlineGraphic; no InlineEquation.
-# b. Just Replaceable; no other computer terms.
-# c. Just Emphasis and Trademark; no other word elements.
-# d. Just Acronym, Emphasis, and Trademark; no other word elements.
-
-# The DocBook TC may produce an official forms module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-forminlines.hook = notAllowed
-local.para.char.mix = notAllowed
-para.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlineobj.char.class
-  | synop.class
-  | ndxterm.class
-  | beginpage
-  | forminlines.hook
-  | local.para.char.mix
-local.title.char.mix = notAllowed
-title.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlineobj.char.class
-  | ndxterm.class
-  | local.title.char.mix
-local.ndxterm.char.mix = notAllowed
-ndxterm.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | local.ndxterm.char.mix
-local.cptr.char.mix = notAllowed
-cptr.char.mix =
-  text
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.cptr.char.mix
-local.smallcptr.char.mix = notAllowed
-smallcptr.char.mix =
-  text
-  | replaceable
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.smallcptr.char.mix
-local.word.char.mix = notAllowed
-word.char.mix =
-  text
-  | acronym
-  | emphasis
-  | trademark
-  | link.char.class
-  | base.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.word.char.mix
-local.docinfo.char.mix = notAllowed
-docinfo.char.mix =
-  text
-  | link.char.class
-  | emphasis
-  | trademark
-  | replaceable
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | local.docinfo.char.mix
-# ENTITY % bibliocomponent.mix (see Bibliographic section, below)
-
-# ENTITY % person.ident.mix (see Bibliographic section, below)
-
-# ......................................................................
-
-# Entities for attributes and attribute components .....................
-
-# Effectivity attributes ...............................................
-
-# Arch: Computer or chip architecture to which element applies; no
-# default
-arch.attrib = attribute arch { text }?
-# Condition: General-purpose effectivity attribute
-condition.attrib = attribute condition { text }?
-# Conformance: Standards conformance characteristics
-conformance.attrib = attribute conformance { xsd:NMTOKENS }?
-# OS: Operating system to which element applies; no default
-os.attrib = attribute os { text }?
-# Revision: Editorial revision to which element belongs; no default
-revision.attrib = attribute revision { text }?
-# Security: Security classification; no default
-security.attrib = attribute security { text }?
-# UserLevel: Level of user experience to which element applies; no
-# default
-userlevel.attrib = attribute userlevel { text }?
-# Vendor: Computer vendor to which element applies; no default
-vendor.attrib = attribute vendor { text }?
-local.effectivity.attrib = empty
-effectivity.attrib =
-  arch.attrib,
-  condition.attrib,
-  conformance.attrib,
-  os.attrib,
-  revision.attrib,
-  security.attrib,
-  userlevel.attrib,
-  vendor.attrib,
-  local.effectivity.attrib
-# Common attributes ....................................................
-
-# Id: Unique identifier of element; no default
-id.attrib = attribute id { xsd:ID }?
-# Id: Unique identifier of element; a value must be supplied; no
-# default
-idreq.attrib = attribute id { xsd:ID }
-# Lang: Indicator of language in which element is written, for
-# translation, character set management, etc.; no default
-lang.attrib = attribute lang { text }?
-# Remap: Previous role of element before conversion; no default
-remap.attrib = attribute remap { text }?
-# Role: New role of element in local environment; no default
-role.attrib = attribute role { text }?
-# XRefLabel: Alternate labeling string for XRef text generation;
-# default is usually title or other appropriate label text already
-# contained in element
-xreflabel.attrib = attribute xreflabel { text }?
-# RevisionFlag: Revision status of element; default is that element
-# wasn't revised
-revisionflag.attrib =
-  attribute revisionflag { "changed" | "added" | "deleted" | "off" }?
-local.common.attrib = empty
-# Role is included explicitly on each element
-common.attrib =
-  id.attrib,
-  lang.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  local.common.attrib
-# Role is included explicitly on each element
-idreq.common.attrib =
-  idreq.attrib,
-  lang.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  local.common.attrib
-# Semi-common attributes and other attribute entities ..................
-local.graphics.attrib = empty
-# EntityRef: Name of an external entity containing the content
-# of the graphic
-
-# FileRef: Filename, qualified by a pathname if desired,
-# designating the file containing the content of the graphic
-
-# Format: Notation of the element content, if any
-
-# SrcCredit: Information about the source of the Graphic
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-graphics.attrib =
-  attribute entityref { xsd:ENTITY }?,
-  attribute fileref { text }?,
-  attribute format { notation.class }?,
-  attribute srccredit { text }?,
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  local.graphics.attrib
-local.keyaction.attrib = empty
-# Action: Key combination type; default is unspecified if one
-# child element, Simul if there is more than one; if value is
-# Other, the OtherAction attribute must have a nonempty value
-
-# OtherAction: User-defined key combination type
-keyaction.attrib =
-  attribute action {
-    "click" | "double-click" | "press" | "seq" | "simul" | "other"
-  }?,
-  attribute otheraction { text }?,
-  local.keyaction.attrib
-# Label: Identifying number or string; default is usually the
-# appropriate number or string autogenerated by a formatter
-label.attrib = attribute label { text }?
-# Format: whether element is assumed to contain significant white
-# space
-linespecific.attrib =
-  [ a:defaultValue = "linespecific" ]
-  attribute format { "linespecific" }?,
-  attribute linenumbering { "numbered" | "unnumbered" }?
-# Linkend: link to related information; no default
-linkend.attrib = attribute linkend { xsd:IDREF }?
-# Linkend: required link to related information
-linkendreq.attrib = attribute linkend { xsd:IDREF }
-# Linkends: link to one or more sets of related information; no
-# default
-linkends.attrib = attribute linkends { xsd:IDREFS }?
-local.mark.attrib = empty
-mark.attrib =
-  attribute mark { text }?,
-  local.mark.attrib
-# MoreInfo: whether element's content has an associated RefEntry
-moreinfo.attrib =
-  [ a:defaultValue = "none" ]
-  attribute moreinfo { "refentry" | "none" }?
-# Pagenum: number of page on which element appears; no default
-pagenum.attrib = attribute pagenum { text }?
-local.status.attrib = empty
-# Status: Editorial or publication status of the element
-# it applies to, such as "in review" or "approved for distribution"
-status.attrib =
-  attribute status { text }?,
-  local.status.attrib
-# Width: width of the longest line in the element to which it
-# pertains, in number of characters
-width.attrib = attribute width { text }?
-# ......................................................................
-
-# Title elements .......................................................
-local.title.attrib = empty
-title.role.attrib = role.attrib
-title = element title { title.attlist, title.char.mix* }
-# end of title.element
-title.attlist &=
-  pagenum.attrib, common.attrib, title.role.attrib, local.title.attrib
-# end of title.attlist
-
-# end of title.module
-local.titleabbrev.attrib = empty
-titleabbrev.role.attrib = role.attrib
-titleabbrev =
-  element titleabbrev { titleabbrev.attlist, title.char.mix* }
-# end of titleabbrev.element
-titleabbrev.attlist &=
-  common.attrib, titleabbrev.role.attrib, local.titleabbrev.attrib
-# end of titleabbrev.attlist
-
-# end of titleabbrev.module
-local.subtitle.attrib = empty
-subtitle.role.attrib = role.attrib
-subtitle = element subtitle { subtitle.attlist, title.char.mix* }
-# end of subtitle.element
-subtitle.attlist &=
-  common.attrib, subtitle.role.attrib, local.subtitle.attrib
-# end of subtitle.attlist
-
-# end of subtitle.module
-
-# ......................................................................
-
-# Bibliographic entities and elements ..................................
-
-# The bibliographic elements are typically used in the document
-# hierarchy. They do not appear in content models of information
-# pool elements.  See also the document information elements,
-# below.
-local.person.ident.mix = notAllowed
-person.ident.mix =
-  honorific
-  | firstname
-  | surname
-  | lineage
-  | othername
-  | affiliation
-  | authorblurb
-  | contrib
-  | local.person.ident.mix
-local.bibliocomponent.mix = notAllowed
-bibliocomponent.mix =
-  abbrev
-  | abstract
-  | address
-  | artpagenums
-  | author
-  | authorgroup
-  | authorinitials
-  | bibliomisc
-  | biblioset
-  | collab
-  | confgroup
-  | contractnum
-  | contractsponsor
-  | copyright
-  | corpauthor
-  | corpname
-  | date
-  | edition
-  | editor
-  | invpartnumber
-  | isbn
-  | issn
-  | issuenum
-  | orgname
-  | biblioid
-  | citebiblioid
-  | bibliosource
-  | bibliorelation
-  | bibliocoverage
-  | othercredit
-  | pagenums
-  | printhistory
-  | productname
-  | productnumber
-  | pubdate
-  | publisher
-  | publishername
-  | pubsnumber
-  | releaseinfo
-  | revhistory
-  | seriesvolnums
-  | subtitle
-  | title
-  | titleabbrev
-  | volumenum
-  | citetitle
-  | personname
-  | person.ident.mix
-  | ndxterm.class
-  | local.bibliocomponent.mix
-# I don't think this is well placed, but it needs to be here because of
-
-# the reference to bibliocomponent.mix
-local.info.class = notAllowed
-info.class =
-  graphic
-  | mediaobject
-  | legalnotice
-  | modespec
-  | subjectset
-  | keywordset
-  | itermset
-  | bibliocomponent.mix
-  | local.info.class
-local.biblioentry.attrib = empty
-biblioentry.role.attrib = role.attrib
-biblioentry =
-  element biblioentry {
-    biblioentry.attlist, (articleinfo | bibliocomponent.mix)+
-  }
-# end of biblioentry.element
-biblioentry.attlist &=
-  common.attrib, biblioentry.role.attrib, local.biblioentry.attrib
-# end of biblioentry.attlist
-
-# end of biblioentry.module
-local.bibliomixed.attrib = empty
-bibliomixed.role.attrib = role.attrib
-bibliomixed =
-  element bibliomixed {
-    bibliomixed.attlist, (text | bibliocomponent.mix | bibliomset)*
-  }
-# end of bibliomixed.element
-bibliomixed.attlist &=
-  common.attrib, bibliomixed.role.attrib, local.bibliomixed.attrib
-# end of bibliomixed.attlist
-
-# end of bibliomixed.module
-local.articleinfo.attrib = empty
-articleinfo.role.attrib = role.attrib
-articleinfo = element articleinfo { articleinfo.attlist, info.class+ }
-# end of articleinfo.element
-articleinfo.attlist &=
-  common.attrib, articleinfo.role.attrib, local.articleinfo.attrib
-# end of articleinfo.attlist
-
-# end of articleinfo.module
-local.biblioset.attrib = empty
-biblioset.role.attrib = role.attrib
-biblioset =
-  element biblioset { biblioset.attlist, bibliocomponent.mix+ }
-# end of biblioset.element
-
-# Relation: Relationship of elements contained within BiblioSet
-biblioset.attlist &=
-  attribute relation { text }?,
-  common.attrib,
-  biblioset.role.attrib,
-  local.biblioset.attrib
-# end of biblioset.attlist
-
-# end of biblioset.module
-bibliomset.role.attrib = role.attrib
-local.bibliomset.attrib = empty
-bibliomset =
-  element bibliomset {
-    bibliomset.attlist, (text | bibliocomponent.mix | bibliomset)*
-  }
-# end of bibliomset.element
-
-# Relation: Relationship of elements contained within BiblioMSet
-bibliomset.attlist &=
-  attribute relation { text }?,
-  common.attrib,
-  bibliomset.role.attrib,
-  local.bibliomset.attrib
-# end of bibliomset.attlist
-
-# end of bibliomset.module
-local.bibliomisc.attrib = empty
-bibliomisc.role.attrib = role.attrib
-bibliomisc = element bibliomisc { bibliomisc.attlist, para.char.mix* }
-# end of bibliomisc.element
-bibliomisc.attlist &=
-  common.attrib, bibliomisc.role.attrib, local.bibliomisc.attrib
-# end of bibliomisc.attlist
-
-# end of bibliomisc.module
-
-# ......................................................................
-
-# Subject, Keyword, and ITermSet elements ..............................
-local.subjectset.attrib = empty
-subjectset.role.attrib = role.attrib
-subjectset = element subjectset { subjectset.attlist, subject+ }
-# end of subjectset.element
-
-# Scheme: Controlled vocabulary employed in SubjectTerms
-subjectset.attlist &=
-  attribute scheme { xsd:NMTOKEN }?,
-  common.attrib,
-  subjectset.role.attrib,
-  local.subjectset.attrib
-# end of subjectset.attlist
-
-# end of subjectset.module
-local.subject.attrib = empty
-subject.role.attrib = role.attrib
-subject = element subject { subject.attlist, subjectterm+ }
-# end of subject.element
-
-# Weight: Ranking of this group of SubjectTerms relative
-# to others, 0 is low, no highest value specified
-subject.attlist &=
-  attribute weight { text }?,
-  common.attrib,
-  subject.role.attrib,
-  local.subject.attrib
-# end of subject.attlist
-
-# end of subject.module
-local.subjectterm.attrib = empty
-subjectterm.role.attrib = role.attrib
-subjectterm = element subjectterm { subjectterm.attlist, text }
-# end of subjectterm.element
-subjectterm.attlist &=
-  common.attrib, subjectterm.role.attrib, local.subjectterm.attrib
-# end of subjectterm.attlist
-
-# end of subjectterm.module
-
-# end of subjectset.content.module
-local.keywordset.attrib = empty
-keywordset.role.attrib = role.attrib
-keywordset = element keywordset { keywordset.attlist, keyword+ }
-# end of keywordset.element
-keywordset.attlist &=
-  common.attrib, keywordset.role.attrib, local.keywordset.attrib
-# end of keywordset.attlist
-
-# end of keywordset.module
-local.keyword.attrib = empty
-keyword.role.attrib = role.attrib
-keyword = element keyword { keyword.attlist, text }
-# end of keyword.element
-keyword.attlist &=
-  common.attrib, keyword.role.attrib, local.keyword.attrib
-# end of keyword.attlist
-
-# end of keyword.module
-
-# end of keywordset.content.module
-local.itermset.attrib = empty
-itermset.role.attrib = role.attrib
-itermset = element itermset { itermset.attlist, indexterm+ }
-# end of itermset.element
-itermset.attlist &=
-  common.attrib, itermset.role.attrib, local.itermset.attrib
-# end of itermset.attlist
-
-# end of itermset.module
-
-# Bibliographic info for "blocks"
-local.blockinfo.attrib = empty
-blockinfo.role.attrib = role.attrib
-blockinfo = element blockinfo { blockinfo.attlist, info.class+ }
-# end of blockinfo.element
-blockinfo.attlist &=
-  common.attrib, blockinfo.role.attrib, local.blockinfo.attrib
-# end of blockinfo.attlist
-
-# end of blockinfo.module
-
-# ......................................................................
-
-# Compound (section-ish) elements ......................................
-
-# Message set ......................
-local.msgset.attrib = empty
-msgset.role.attrib = role.attrib
-msgset =
-  element msgset {
-    msgset.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    (msgentry+ | simplemsgentry+)
-  }
-# end of msgset.element
-msgset.attlist &= common.attrib, msgset.role.attrib, local.msgset.attrib
-# end of msgset.attlist
-
-# end of msgset.module
-local.msgentry.attrib = empty
-msgentry.role.attrib = role.attrib
-msgentry =
-  element msgentry { msgentry.attlist, msg+, msginfo?, msgexplan* }
-# end of msgentry.element
-msgentry.attlist &=
-  common.attrib, msgentry.role.attrib, local.msgentry.attrib
-# end of msgentry.attlist
-
-# end of msgentry.module
-local.simplemsgentry.attrib = empty
-simplemsgentry.role.attrib = role.attrib
-simplemsgentry =
-  element simplemsgentry { simplemsgentry.attlist, msgtext, msgexplan+ }
-# end of simplemsgentry.element
-simplemsgentry.attlist &=
-  attribute audience { text }?,
-  attribute level { text }?,
-  attribute origin { text }?,
-  common.attrib,
-  simplemsgentry.role.attrib,
-  local.simplemsgentry.attrib
-# end of simplemsgentry.attlist
-
-# end of simplemsgentry.module
-local.msg.attrib = empty
-msg.role.attrib = role.attrib
-msg = element msg { msg.attlist, title?, msgmain, (msgsub | msgrel)* }
-# end of msg.element
-msg.attlist &= common.attrib, msg.role.attrib, local.msg.attrib
-# end of msg.attlist
-
-# end of msg.module
-local.msgmain.attrib = empty
-msgmain.role.attrib = role.attrib
-msgmain = element msgmain { msgmain.attlist, title?, msgtext }
-# end of msgmain.element
-msgmain.attlist &=
-  common.attrib, msgmain.role.attrib, local.msgmain.attrib
-# end of msgmain.attlist
-
-# end of msgmain.module
-local.msgsub.attrib = empty
-msgsub.role.attrib = role.attrib
-msgsub = element msgsub { msgsub.attlist, title?, msgtext }
-# end of msgsub.element
-msgsub.attlist &= common.attrib, msgsub.role.attrib, local.msgsub.attrib
-# end of msgsub.attlist
-
-# end of msgsub.module
-local.msgrel.attrib = empty
-msgrel.role.attrib = role.attrib
-msgrel = element msgrel { msgrel.attlist, title?, msgtext }
-# end of msgrel.element
-msgrel.attlist &= common.attrib, msgrel.role.attrib, local.msgrel.attrib
-# end of msgrel.attlist
-
-# end of msgrel.module
-
-#  MsgText (defined in the Inlines section, below)
-local.msginfo.attrib = empty
-msginfo.role.attrib = role.attrib
-msginfo =
-  element msginfo { msginfo.attlist, (msglevel | msgorig | msgaud)* }
-# end of msginfo.element
-msginfo.attlist &=
-  common.attrib, msginfo.role.attrib, local.msginfo.attrib
-# end of msginfo.attlist
-
-# end of msginfo.module
-local.msglevel.attrib = empty
-msglevel.role.attrib = role.attrib
-msglevel = element msglevel { msglevel.attlist, smallcptr.char.mix* }
-# end of msglevel.element
-msglevel.attlist &=
-  common.attrib, msglevel.role.attrib, local.msglevel.attrib
-# end of msglevel.attlist
-
-# end of msglevel.module
-local.msgorig.attrib = empty
-msgorig.role.attrib = role.attrib
-msgorig = element msgorig { msgorig.attlist, smallcptr.char.mix* }
-# end of msgorig.element
-msgorig.attlist &=
-  common.attrib, msgorig.role.attrib, local.msgorig.attrib
-# end of msgorig.attlist
-
-# end of msgorig.module
-local.msgaud.attrib = empty
-msgaud.role.attrib = role.attrib
-msgaud = element msgaud { msgaud.attlist, para.char.mix* }
-# end of msgaud.element
-msgaud.attlist &= common.attrib, msgaud.role.attrib, local.msgaud.attrib
-# end of msgaud.attlist
-
-# end of msgaud.module
-local.msgexplan.attrib = empty
-msgexplan.role.attrib = role.attrib
-msgexplan =
-  element msgexplan { msgexplan.attlist, title?, component.mix+ }
-# end of msgexplan.element
-msgexplan.attlist &=
-  common.attrib, msgexplan.role.attrib, local.msgexplan.attrib
-# end of msgexplan.attlist
-
-# end of msgexplan.module
-
-# end of msgset.content.module
-
-# QandASet ........................
-local.qandaset.attrib = empty
-qandaset.role.attrib = role.attrib
-qandaset =
-  element qandaset {
-    qandaset.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    qandaset.mix*,
-    (qandadiv+ | qandaentry+)
-  }
-# end of qandaset.element
-qandaset.attlist &=
-  attribute defaultlabel { "qanda" | "number" | "none" }?,
-  common.attrib,
-  qandaset.role.attrib,
-  local.qandaset.attrib
-# end of qandaset.attlist
-
-# end of qandaset.module
-local.qandadiv.attrib = empty
-qandadiv.role.attrib = role.attrib
-qandadiv =
-  element qandadiv {
-    qandadiv.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    qandaset.mix*,
-    (qandadiv+ | qandaentry+)
-  }
-# end of qandadiv.element
-qandadiv.attlist &=
-  common.attrib, qandadiv.role.attrib, local.qandadiv.attrib
-# end of qandadiv.attlist
-
-# end of qandadiv.module
-local.qandaentry.attrib = empty
-qandaentry.role.attrib = role.attrib
-qandaentry =
-  element qandaentry {
-    qandaentry.attlist, blockinfo?, revhistory?, question, answer*
-  }
-# end of qandaentry.element
-qandaentry.attlist &=
-  common.attrib, qandaentry.role.attrib, local.qandaentry.attrib
-# end of qandaentry.attlist
-
-# end of qandaentry.module
-local.question.attrib = empty
-question.role.attrib = role.attrib
-question = element question { question.attlist, label?, qandaset.mix+ }
-# end of question.element
-question.attlist &=
-  common.attrib, question.role.attrib, local.question.attrib
-# end of question.attlist
-
-# end of question.module
-local.answer.attrib = empty
-answer.role.attrib = role.attrib
-answer =
-  element answer { answer.attlist, label?, qandaset.mix*, qandaentry* }
-# end of answer.element
-answer.attlist &= common.attrib, answer.role.attrib, local.answer.attrib
-# end of answer.attlist
-
-# end of answer.module
-local.label.attrib = empty
-label.role.attrib = role.attrib
-label = element label { label.attlist, word.char.mix* }
-# end of label.element
-label.attlist &= common.attrib, label.role.attrib, local.label.attrib
-# end of label.attlist
-
-# end of label.module
-
-# end of qandaset.content.module
-
-# Procedure ........................
-local.procedure.attrib = empty
-procedure.role.attrib = role.attrib
-procedure =
-  element procedure {
-    procedure.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    component.mix*,
-    step+
-  }
-# end of procedure.element
-procedure.attlist &=
-  common.attrib, procedure.role.attrib, local.procedure.attrib
-# end of procedure.attlist
-
-# end of procedure.module
-local.step.attrib = empty
-step.role.attrib = role.attrib
-step =
-  element step {
-    step.attlist,
-    title?,
-    ((component.mix+, (substeps, component.mix*)?)
-     | (substeps, component.mix*))
-  }
-# end of step.element
-
-# Performance: Whether the Step must be performed
-
-# not #REQUIRED!
-step.attlist &=
-  [ a:defaultValue = "required" ]
-  attribute performance { "optional" | "required" }?,
-  common.attrib,
-  step.role.attrib,
-  local.step.attrib
-# end of step.attlist
-
-# end of step.module
-local.substeps.attrib = empty
-substeps.role.attrib = role.attrib
-substeps = element substeps { substeps.attlist, step+ }
-# end of substeps.element
-
-# Performance: whether entire set of substeps must be performed
-
-# not #REQUIRED!
-substeps.attlist &=
-  [ a:defaultValue = "required" ]
-  attribute performance { "optional" | "required" }?,
-  common.attrib,
-  substeps.role.attrib,
-  local.substeps.attrib
-# end of substeps.attlist
-
-# end of substeps.module
-
-# end of procedure.content.module
-
-# Sidebar ..........................
-local.sidebarinfo.attrib = empty
-sidebarinfo.role.attrib = role.attrib
-sidebarinfo = element sidebarinfo { sidebarinfo.attlist, info.class+ }
-# end of sidebarinfo.element
-sidebarinfo.attlist &=
-  common.attrib, sidebarinfo.role.attrib, local.sidebarinfo.attrib
-# end of sidebarinfo.attlist
-
-# end of sidebarinfo.module
-local.sidebar.attrib = empty
-sidebar.role.attrib = role.attrib
-sidebar =
-  element sidebar {
-    sidebar.attlist,
-    sidebarinfo?,
-    formalobject.title.content?,
-    sidebar.mix+
-  }
-# end of sidebar.element
-sidebar.attlist &=
-  common.attrib, sidebar.role.attrib, local.sidebar.attrib
-# end of sidebar.attlist
-
-# end of sidebar.module
-
-# end of sidebar.content.model
-
-# ......................................................................
-
-# Paragraph-related elements ...........................................
-local.abstract.attrib = empty
-abstract.role.attrib = role.attrib
-abstract = element abstract { abstract.attlist, title?, para.class+ }
-# end of abstract.element
-abstract.attlist &=
-  common.attrib, abstract.role.attrib, local.abstract.attrib
-# end of abstract.attlist
-
-# end of abstract.module
-local.authorblurb.attrib = empty
-authorblurb.role.attrib = role.attrib
-authorblurb =
-  element authorblurb { authorblurb.attlist, title?, para.class+ }
-# end of authorblurb.element
-authorblurb.attlist &=
-  common.attrib, authorblurb.role.attrib, local.authorblurb.attrib
-# end of authorblurb.attlist
-
-# end of authorblurb.module
-local.personblurb.attrib = empty
-personblurb.role.attrib = role.attrib
-personblurb =
-  element personblurb { personblurb.attlist, title?, para.class+ }
-# end of personblurb.element
-personblurb.attlist &=
-  common.attrib, personblurb.role.attrib, local.personblurb.attrib
-# end of personblurb.attlist
-
-# end of personblurb.module
-local.blockquote.attrib = empty
-blockquote.role.attrib = role.attrib
-blockquote =
-  element blockquote {
-    blockquote.attlist, title?, attribution?, component.mix+
-  }
-# end of blockquote.element
-blockquote.attlist &=
-  common.attrib, blockquote.role.attrib, local.blockquote.attrib
-# end of blockquote.attlist
-
-# end of blockquote.module
-local.attribution.attrib = empty
-attribution.role.attrib = role.attrib
-attribution =
-  element attribution { attribution.attlist, para.char.mix* }
-# end of attribution.element
-attribution.attlist &=
-  common.attrib, attribution.role.attrib, local.attribution.attrib
-# end of attribution.attlist
-
-# end of attribution.module
-local.bridgehead.attrib = empty
-bridgehead.role.attrib = role.attrib
-bridgehead = element bridgehead { bridgehead.attlist, title.char.mix* }
-# end of bridgehead.element
-
-# Renderas: Indicates the format in which the BridgeHead
-# should appear
-bridgehead.attlist &=
-  attribute renderas {
-    "other" | "sect1" | "sect2" | "sect3" | "sect4" | "sect5"
-  }?,
-  common.attrib,
-  bridgehead.role.attrib,
-  local.bridgehead.attrib
-# end of bridgehead.attlist
-
-# end of bridgehead.module
-local.remark.attrib = empty
-remark.role.attrib = role.attrib
-remark = element remark { remark.attlist, para.char.mix* }
-# end of remark.element
-remark.attlist &= common.attrib, remark.role.attrib, local.remark.attrib
-# end of remark.attlist
-
-# end of remark.module
-local.epigraph.attrib = empty
-epigraph.role.attrib = role.attrib
-epigraph =
-  element epigraph {
-    epigraph.attlist, attribution?, (para.class | literallayout)+
-  }
-# end of epigraph.element
-epigraph.attlist &=
-  common.attrib, epigraph.role.attrib, local.epigraph.attrib
-# end of epigraph.attlist
-
-#  Attribution (defined above)
-
-# end of epigraph.module
-local.footnote.attrib = empty
-footnote.role.attrib = role.attrib
-footnote = element footnote { footnote.attlist, footnote.mix+ }
-# end of footnote.element
-footnote.attlist &=
-  label.attrib,
-  common.attrib,
-  footnote.role.attrib,
-  local.footnote.attrib
-# end of footnote.attlist
-
-# end of footnote.module
-local.highlights.attrib = empty
-highlights.role.attrib = role.attrib
-highlights = element highlights { highlights.attlist, highlights.mix+ }
-# end of highlights.element
-highlights.attlist &=
-  common.attrib, highlights.role.attrib, local.highlights.attrib
-# end of highlights.attlist
-
-# end of highlights.module
-local.formalpara.attrib = empty
-formalpara.role.attrib = role.attrib
-formalpara =
-  element formalpara { formalpara.attlist, title, ndxterm.class*, para }
-# end of formalpara.element
-formalpara.attlist &=
-  common.attrib, formalpara.role.attrib, local.formalpara.attrib
-# end of formalpara.attlist
-
-# end of formalpara.module
-local.para.attrib = empty
-para.role.attrib = role.attrib
-para = element para { para.attlist, (para.char.mix | para.mix)* }
-# end of para.element
-para.attlist &= common.attrib, para.role.attrib, local.para.attrib
-# end of para.attlist
-
-# end of para.module
-local.simpara.attrib = empty
-simpara.role.attrib = role.attrib
-simpara = element simpara { simpara.attlist, para.char.mix* }
-# end of simpara.element
-simpara.attlist &=
-  common.attrib, simpara.role.attrib, local.simpara.attrib
-# end of simpara.attlist
-
-# end of simpara.module
-local.admon.attrib = empty
-admon.role.attrib = role.attrib
-caution = element caution { caution.attlist, title?, admon.mix+ }
-# end of caution.element
-caution.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of caution.attlist
-important = element important { important.attlist, title?, admon.mix+ }
-# end of important.element
-important.attlist &=
-  common.attrib, admon.role.attrib, local.admon.attrib
-# end of important.attlist
-note = element note { note.attlist, title?, admon.mix+ }
-# end of note.element
-note.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of note.attlist
-tip = element tip { tip.attlist, title?, admon.mix+ }
-# end of tip.element
-tip.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of tip.attlist
-warning = element warning { warning.attlist, title?, admon.mix+ }
-# end of warning.element
-warning.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of warning.attlist
-
-# end of admon.module
-
-# ......................................................................
-
-# Lists ................................................................
-
-# GlossList ........................
-local.glosslist.attrib = empty
-glosslist.role.attrib = role.attrib
-glosslist = element glosslist { glosslist.attlist, glossentry+ }
-# end of glosslist.element
-glosslist.attlist &=
-  common.attrib, glosslist.role.attrib, local.glosslist.attrib
-# end of glosslist.attlist
-
-# end of glosslist.module
-local.glossentry.attrib = empty
-glossentry.role.attrib = role.attrib
-glossentry =
-  element glossentry {
-    glossentry.attlist,
-    glossterm,
-    acronym?,
-    abbrev?,
-    ndxterm.class*,
-    revhistory?,
-    (glosssee | glossdef+)
-  }
-# end of glossentry.element
-
-# SortAs: String by which the GlossEntry is to be sorted
-# (alphabetized) in lieu of its proper content
-glossentry.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  glossentry.role.attrib,
-  local.glossentry.attrib
-# end of glossentry.attlist
-
-# end of glossentry.module
-
-#  GlossTerm (defined in the Inlines section, below)
-local.glossdef.attrib = empty
-glossdef.role.attrib = role.attrib
-glossdef =
-  element glossdef { glossdef.attlist, glossdef.mix+, glossseealso* }
-# end of glossdef.element
-
-# Subject: List of subjects; keywords for the definition
-glossdef.attlist &=
-  attribute subject { text }?,
-  common.attrib,
-  glossdef.role.attrib,
-  local.glossdef.attrib
-# end of glossdef.attlist
-
-# end of glossdef.module
-local.glosssee.attrib = empty
-glosssee.role.attrib = role.attrib
-glosssee = element glosssee { glosssee.attlist, para.char.mix* }
-# end of glosssee.element
-
-# OtherTerm: Reference to the GlossEntry whose GlossTerm
-# should be displayed at the point of the GlossSee
-glosssee.attlist &=
-  attribute otherterm { xsd:IDREF }?,
-  common.attrib,
-  glosssee.role.attrib,
-  local.glosssee.attrib
-# end of glosssee.attlist
-
-# end of glosssee.module
-local.glossseealso.attrib = empty
-glossseealso.role.attrib = role.attrib
-glossseealso =
-  element glossseealso { glossseealso.attlist, para.char.mix* }
-# end of glossseealso.element
-
-# OtherTerm: Reference to the GlossEntry whose GlossTerm
-# should be displayed at the point of the GlossSeeAlso
-glossseealso.attlist &=
-  attribute otherterm { xsd:IDREF }?,
-  common.attrib,
-  glossseealso.role.attrib,
-  local.glossseealso.attrib
-# end of glossseealso.attlist
-
-# end of glossseealso.module
-
-# end of glossentry.content.module
-
-# ItemizedList and OrderedList .....
-local.itemizedlist.attrib = empty
-itemizedlist.role.attrib = role.attrib
-itemizedlist =
-  element itemizedlist {
-    itemizedlist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    listitem+
-  }
-# end of itemizedlist.element
-
-# Spacing: Whether the vertical space in the list should be
-# compressed
-
-# Mark: Keyword, e.g., bullet, dash, checkbox, none;
-# list of keywords and defaults are implementation specific
-itemizedlist.attlist &=
-  attribute spacing { "normal" | "compact" }?,
-  mark.attrib,
-  common.attrib,
-  itemizedlist.role.attrib,
-  local.itemizedlist.attrib
-# end of itemizedlist.attlist
-
-# end of itemizedlist.module
-local.orderedlist.attrib = empty
-orderedlist.role.attrib = role.attrib
-orderedlist =
-  element orderedlist {
-    orderedlist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    listitem+
-  }
-# end of orderedlist.element
-
-# Numeration: Style of ListItem numbered; default is expected
-# to be Arabic
-
-# InheritNum: Specifies for a nested list that the numbering
-# of ListItems should include the number of the item
-# within which they are nested (e.g., 1a and 1b within 1,
-# rather than a and b)
-
-# Continuation: Where list numbering begins afresh (Restarts,
-# the default) or continues that of the immediately preceding
-# list (Continues)
-
-# Spacing: Whether the vertical space in the list should be
-# compressed
-orderedlist.attlist &=
-  attribute numeration {
-    "arabic" | "upperalpha" | "loweralpha" | "upperroman" | "lowerroman"
-  }?,
-  [ a:defaultValue = "ignore" ]
-  attribute inheritnum { "inherit" | "ignore" }?,
-  [ a:defaultValue = "restarts" ]
-  attribute continuation { "continues" | "restarts" }?,
-  attribute spacing { "normal" | "compact" }?,
-  common.attrib,
-  orderedlist.role.attrib,
-  local.orderedlist.attrib
-# end of orderedlist.attlist
-
-# end of orderedlist.module
-local.listitem.attrib = empty
-listitem.role.attrib = role.attrib
-listitem = element listitem { listitem.attlist, component.mix+ }
-# end of listitem.element
-
-# Override: Indicates the mark to be used for this ListItem
-# instead of the default mark or the mark specified by
-# the Mark attribute on the enclosing ItemizedList
-listitem.attlist &=
-  attribute override { text }?,
-  common.attrib,
-  listitem.role.attrib,
-  local.listitem.attrib
-# end of listitem.attlist
-
-# end of listitem.module
-
-# SegmentedList ....................
-local.segmentedlist.attrib = empty
-segmentedlist.role.attrib = role.attrib
-segmentedlist =
-  element segmentedlist {
-    segmentedlist.attlist,
-    formalobject.title.content?,
-    segtitle+,
-    seglistitem+
-  }
-# end of segmentedlist.element
-segmentedlist.attlist &=
-  common.attrib, segmentedlist.role.attrib, local.segmentedlist.attrib
-# end of segmentedlist.attlist
-
-# end of segmentedlist.module
-local.segtitle.attrib = empty
-segtitle.role.attrib = role.attrib
-segtitle = element segtitle { segtitle.attlist, title.char.mix* }
-# end of segtitle.element
-segtitle.attlist &=
-  common.attrib, segtitle.role.attrib, local.segtitle.attrib
-# end of segtitle.attlist
-
-# end of segtitle.module
-local.seglistitem.attrib = empty
-seglistitem.role.attrib = role.attrib
-seglistitem = element seglistitem { seglistitem.attlist, seg+ }
-# end of seglistitem.element
-seglistitem.attlist &=
-  common.attrib, seglistitem.role.attrib, local.seglistitem.attrib
-# end of seglistitem.attlist
-
-# end of seglistitem.module
-local.seg.attrib = empty
-seg.role.attrib = role.attrib
-seg = element seg { seg.attlist, para.char.mix* }
-# end of seg.element
-seg.attlist &= common.attrib, seg.role.attrib, local.seg.attrib
-# end of seg.attlist
-
-# end of seg.module
-
-# end of segmentedlist.content.module
-
-# SimpleList .......................
-local.simplelist.attrib = empty
-simplelist.role.attrib = role.attrib
-simplelist = element simplelist { simplelist.attlist, member+ }
-# end of simplelist.element
-
-# Columns: The number of columns the array should contain
-
-# Type: How the Members of the SimpleList should be
-# formatted: Inline (members separated with commas etc.
-# inline), Vert (top to bottom in n Columns), or Horiz (in
-# the direction of text flow) in n Columns.  If Column
-# is 1 or implied, Type=Vert and Type=Horiz give the same
-# results.
-simplelist.attlist &=
-  attribute columns { text }?,
-  [ a:defaultValue = "vert" ]
-  attribute type { "inline" | "vert" | "horiz" }?,
-  common.attrib,
-  simplelist.role.attrib,
-  local.simplelist.attrib
-# end of simplelist.attlist
-
-# end of simplelist.module
-local.member.attrib = empty
-member.role.attrib = role.attrib
-member = element member { member.attlist, para.char.mix* }
-# end of member.element
-member.attlist &= common.attrib, member.role.attrib, local.member.attrib
-# end of member.attlist
-
-# end of member.module
-
-# end of simplelist.content.module
-
-# VariableList .....................
-local.variablelist.attrib = empty
-variablelist.role.attrib = role.attrib
-variablelist =
-  element variablelist {
-    variablelist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    varlistentry+
-  }
-# end of variablelist.element
-
-# TermLength: Length beyond which the presentation engine
-# may consider the Term too long and select an alternate
-# presentation of the Term and, or, its associated ListItem.
-variablelist.attlist &=
-  attribute termlength { text }?,
-  common.attrib,
-  variablelist.role.attrib,
-  local.variablelist.attrib
-# end of variablelist.attlist
-
-# end of variablelist.module
-local.varlistentry.attrib = empty
-varlistentry.role.attrib = role.attrib
-varlistentry =
-  element varlistentry { varlistentry.attlist, term+, listitem }
-# end of varlistentry.element
-varlistentry.attlist &=
-  common.attrib, varlistentry.role.attrib, local.varlistentry.attrib
-# end of varlistentry.attlist
-
-# end of varlistentry.module
-local.term.attrib = empty
-term.role.attrib = role.attrib
-term = element term { term.attlist, para.char.mix* }
-# end of term.element
-term.attlist &= common.attrib, term.role.attrib, local.term.attrib
-# end of term.attlist
-
-# end of term.module
-
-#  ListItem (defined above)
-
-# end of variablelist.content.module
-
-# CalloutList ......................
-local.calloutlist.attrib = empty
-calloutlist.role.attrib = role.attrib
-calloutlist =
-  element calloutlist {
-    calloutlist.attlist, formalobject.title.content?, callout+
-  }
-# end of calloutlist.element
-calloutlist.attlist &=
-  common.attrib, calloutlist.role.attrib, local.calloutlist.attrib
-# end of calloutlist.attlist
-
-# end of calloutlist.module
-local.callout.attrib = empty
-callout.role.attrib = role.attrib
-callout = element callout { callout.attlist, component.mix+ }
-# end of callout.element
-
-# AreaRefs: IDs of one or more Areas or AreaSets described
-# by this Callout
-callout.attlist &=
-  attribute arearefs { xsd:IDREFS },
-  common.attrib,
-  callout.role.attrib,
-  local.callout.attrib
-# end of callout.attlist
-
-# end of callout.module
-
-# end of calloutlist.content.module
-
-# ......................................................................
-
-# Objects ..............................................................
-
-# Examples etc. ....................
-local.example.attrib = empty
-example.role.attrib = role.attrib
-example =
-  element example {
-    example.attlist,
-    blockinfo?,
-    formalobject.title.content,
-    example.mix+
-  }
-# end of example.element
-example.attlist &=
-  label.attrib,
-  width.attrib,
-  common.attrib,
-  example.role.attrib,
-  local.example.attrib
-# end of example.attlist
-
-# end of example.module
-local.informalexample.attrib = empty
-informalexample.role.attrib = role.attrib
-informalexample =
-  element informalexample {
-    informalexample.attlist, blockinfo?, example.mix+
-  }
-# end of informalexample.element
-informalexample.attlist &=
-  width.attrib,
-  common.attrib,
-  informalexample.role.attrib,
-  local.informalexample.attrib
-# end of informalexample.attlist
-
-# end of informalexample.module
-local.programlistingco.attrib = empty
-programlistingco.role.attrib = role.attrib
-programlistingco =
-  element programlistingco {
-    programlistingco.attlist, areaspec, programlisting, calloutlist*
-  }
-# end of programlistingco.element
-programlistingco.attlist &=
-  common.attrib,
-  programlistingco.role.attrib,
-  local.programlistingco.attrib
-# end of programlistingco.attlist
-
-#  CalloutList (defined above in Lists)
-
-# end of informalexample.module
-local.areaspec.attrib = empty
-areaspec.role.attrib = role.attrib
-areaspec = element areaspec { areaspec.attlist, (area | areaset)+ }
-# end of areaspec.element
-
-# Units: global unit of measure in which coordinates in
-# this spec are expressed:
-# 
-# - CALSPair "x1,y1 x2,y2": lower-left and upper-right
-# coordinates in a rectangle describing repro area in which
-# graphic is placed, where X and Y dimensions are each some
-# number 0..10000 (taken from CALS graphic attributes)
-# 
-# - LineColumn "line column": line number and column number
-# at which to start callout text in "linespecific" content
-# 
-# - LineRange "startline endline": whole lines from startline
-# to endline in "linespecific" content
-# 
-# - LineColumnPair "line1 col1 line2 col2": starting and ending
-# points of area in "linespecific" content that starts at
-# first position and ends at second position (including the
-# beginnings of any intervening lines)
-# 
-# - Other: directive to look at value of OtherUnits attribute
-# to get implementation-specific keyword
-# 
-# The default is implementation-specific; usually dependent on
-# the parent element (GraphicCO gets CALSPair, ProgramListingCO
-# and ScreenCO get LineColumn)
-
-# OtherUnits: User-defined units
-areaspec.attlist &=
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  common.attrib,
-  areaspec.role.attrib,
-  local.areaspec.attrib
-# end of areaspec.attlist
-
-# end of areaspec.module
-local.area.attrib = empty
-area.role.attrib = role.attrib
-area = element area { area.attlist, empty }
-# end of area.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-
-# Units: unit of measure in which coordinates in this
-# area are expressed; inherits from AreaSet and AreaSpec
-
-# OtherUnits: User-defined units
-area.attlist &=
-  label.attrib,
-  linkends.attrib,
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  attribute coords { text },
-  idreq.common.attrib,
-  area.role.attrib,
-  local.area.attrib
-# end of area.attlist
-
-# end of area.module
-local.areaset.attrib = empty
-areaset.role.attrib = role.attrib
-areaset = element areaset { areaset.attlist, area+ }
-# end of areaset.element
-
-# bug number/symbol override or initialization
-
-# Units: unit of measure in which coordinates in this
-# area are expressed; inherits from AreaSpec
-areaset.attlist &=
-  label.attrib,
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  attribute coords { text },
-  idreq.common.attrib,
-  areaset.role.attrib,
-  local.areaset.attrib
-# end of areaset.attlist
-
-# end of areaset.module
-
-# end of areaspec.content.module
-local.programlisting.attrib = empty
-programlisting.role.attrib = role.attrib
-programlisting =
-  element programlisting {
-    programlisting.attlist,
-    (para.char.mix | co | coref | lineannotation | textobject)*
-  }
-# end of programlisting.element
-programlisting.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  common.attrib,
-  programlisting.role.attrib,
-  local.programlisting.attrib
-# end of programlisting.attlist
-
-# end of programlisting.module
-local.literallayout.attrib = empty
-literallayout.role.attrib = role.attrib
-literallayout =
-  element literallayout {
-    literallayout.attlist,
-    (para.char.mix | co | coref | textobject | lineannotation)*
-  }
-# end of literallayout.element
-literallayout.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  [ a:defaultValue = "normal" ]
-  attribute class { "monospaced" | "normal" }?,
-  common.attrib,
-  literallayout.role.attrib,
-  local.literallayout.attrib
-# end of literallayout.attlist
-
-#  LineAnnotation (defined in the Inlines section, below)
-
-# end of literallayout.module
-local.screenco.attrib = empty
-screenco.role.attrib = role.attrib
-screenco =
-  element screenco { screenco.attlist, areaspec, screen, calloutlist* }
-# end of screenco.element
-screenco.attlist &=
-  common.attrib, screenco.role.attrib, local.screenco.attrib
-# end of screenco.attlist
-
-#  AreaSpec (defined above)
-
-#  CalloutList (defined above in Lists)
-
-# end of screenco.module
-local.screen.attrib = empty
-screen.role.attrib = role.attrib
-screen =
-  element screen {
-    screen.attlist,
-    (para.char.mix | co | coref | textobject | lineannotation)*
-  }
-# end of screen.element
-screen.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  common.attrib,
-  screen.role.attrib,
-  local.screen.attrib
-# end of screen.attlist
-
-# end of screen.module
-local.screenshot.attrib = empty
-screenshot.role.attrib = role.attrib
-screenshot =
-  element screenshot {
-    screenshot.attlist,
-    screeninfo?,
-    (graphic | graphicco | mediaobject | mediaobjectco)
-  }
-# end of screenshot.element
-screenshot.attlist &=
-  common.attrib, screenshot.role.attrib, local.screenshot.attrib
-# end of screenshot.attlist
-
-# end of screenshot.module
-local.screeninfo.attrib = empty
-screeninfo.role.attrib = role.attrib
-screeninfo = element screeninfo { screeninfo.attlist, para.char.mix* }
-# end of screeninfo.element
-screeninfo.attlist &=
-  common.attrib, screeninfo.role.attrib, local.screeninfo.attrib
-# end of screeninfo.attlist
-
-# end of screeninfo.module
-
-# end of screenshot.content.module
-
-# Figures etc. .....................
-local.figure.attrib = empty
-figure.role.attrib = role.attrib
-figure =
-  element figure {
-    figure.attlist,
-    blockinfo?,
-    formalobject.title.content,
-    (figure.mix | link.char.class)+
-  }
-# end of figure.element
-
-# Float: Whether the Figure is supposed to be rendered
-# where convenient (yes (1) value) or at the place it occurs
-# in the text (no (0) value, the default)
-figure.attlist &=
-  [ a:defaultValue = "0" ] attribute float { yesorno.attvals }?,
-  attribute pgwide { yesorno.attvals }?,
-  label.attrib,
-  common.attrib,
-  figure.role.attrib,
-  local.figure.attrib
-# end of figure.attlist
-
-# end of figure.module
-local.informalfigure.attrib = empty
-informalfigure.role.attrib = role.attrib
-informalfigure =
-  element informalfigure {
-    informalfigure.attlist, blockinfo?, (figure.mix | link.char.class)+
-  }
-# end of informalfigure.element
-
-# Float: Whether the Figure is supposed to be rendered
-# where convenient (yes (1) value) or at the place it occurs
-# in the text (no (0) value, the default)
-informalfigure.attlist &=
-  [ a:defaultValue = "0" ] attribute float { yesorno.attvals }?,
-  attribute pgwide { yesorno.attvals }?,
-  label.attrib,
-  common.attrib,
-  informalfigure.role.attrib,
-  local.informalfigure.attrib
-# end of informalfigure.attlist
-
-# end of informalfigure.module
-local.graphicco.attrib = empty
-graphicco.role.attrib = role.attrib
-graphicco =
-  element graphicco {
-    graphicco.attlist, areaspec, graphic, calloutlist*
-  }
-# end of graphicco.element
-graphicco.attlist &=
-  common.attrib, graphicco.role.attrib, local.graphicco.attrib
-# end of graphicco.attlist
-
-#  AreaSpec (defined above in Examples)
-
-#  CalloutList (defined above in Lists)
-
-# end of graphicco.module
-
-# Graphical data can be the content of Graphic, or you can reference
-# an external file either as an entity (Entitref) or a filename
-# (Fileref).
-local.graphic.attrib = empty
-graphic.role.attrib = role.attrib
-graphic = element graphic { graphic.attlist, empty }
-# end of graphic.element
-graphic.attlist &=
-  graphics.attrib,
-  common.attrib,
-  graphic.role.attrib,
-  local.graphic.attrib
-# end of graphic.attlist
-
-# end of graphic.module
-local.inlinegraphic.attrib = empty
-inlinegraphic.role.attrib = role.attrib
-inlinegraphic = element inlinegraphic { inlinegraphic.attlist, empty }
-# end of inlinegraphic.element
-inlinegraphic.attlist &=
-  graphics.attrib,
-  common.attrib,
-  inlinegraphic.role.attrib,
-  local.inlinegraphic.attrib
-# end of inlinegraphic.attlist
-
-# end of inlinegraphic.module
-local.mediaobject.attrib = empty
-mediaobject.role.attrib = role.attrib
-mediaobject =
-  element mediaobject {
-    mediaobject.attlist, objectinfo?, mediaobject.mix+, caption?
-  }
-# end of mediaobject.element
-mediaobject.attlist &=
-  common.attrib, mediaobject.role.attrib, local.mediaobject.attrib
-# end of mediaobject.attlist
-
-# end of mediaobject.module
-local.inlinemediaobject.attrib = empty
-inlinemediaobject.role.attrib = role.attrib
-inlinemediaobject =
-  element inlinemediaobject {
-    inlinemediaobject.attlist, objectinfo?, mediaobject.mix+
-  }
-# end of inlinemediaobject.element
-inlinemediaobject.attlist &=
-  common.attrib,
-  inlinemediaobject.role.attrib,
-  local.inlinemediaobject.attrib
-# end of inlinemediaobject.attlist
-
-# end of inlinemediaobject.module
-local.videoobject.attrib = empty
-videoobject.role.attrib = role.attrib
-videoobject =
-  element videoobject { videoobject.attlist, objectinfo?, videodata }
-# end of videoobject.element
-videoobject.attlist &=
-  common.attrib, videoobject.role.attrib, local.videoobject.attrib
-# end of videoobject.attlist
-
-# end of videoobject.module
-local.audioobject.attrib = empty
-audioobject.role.attrib = role.attrib
-audioobject =
-  element audioobject { audioobject.attlist, objectinfo?, audiodata }
-# end of audioobject.element
-audioobject.attlist &=
-  common.attrib, audioobject.role.attrib, local.audioobject.attrib
-# end of audioobject.attlist
-
-# end of audioobject.module
-local.imageobject.attrib = empty
-imageobject.role.attrib = role.attrib
-imageobject =
-  element imageobject { imageobject.attlist, objectinfo?, imagedata }
-# end of imageobject.element
-imageobject.attlist &=
-  common.attrib, imageobject.role.attrib, local.imageobject.attrib
-# end of imageobject.attlist
-
-# end of imageobject.module
-local.textobject.attrib = empty
-textobject.role.attrib = role.attrib
-textobject =
-  element textobject {
-    textobject.attlist,
-    objectinfo?,
-    (phrase | textdata | textobject.mix+)
-  }
-# end of textobject.element
-textobject.attlist &=
-  common.attrib, textobject.role.attrib, local.textobject.attrib
-# end of textobject.attlist
-
-# end of textobject.module
-local.objectinfo.attrib = empty
-objectinfo.role.attrib = role.attrib
-objectinfo = element objectinfo { objectinfo.attlist, info.class+ }
-# end of objectinfo.element
-objectinfo.attlist &=
-  common.attrib, objectinfo.role.attrib, local.objectinfo.attrib
-# end of objectinfo.attlist
-
-# end of objectinfo.module
-
-# EntityRef: Name of an external entity containing the content
-# of the object data
-
-# FileRef: Filename, qualified by a pathname if desired,
-# designating the file containing the content of the object data
-
-# Format: Notation of the element content, if any
-
-# SrcCredit: Information about the source of the image
-local.objectdata.attrib = empty
-objectdata.attrib =
-  attribute entityref { xsd:ENTITY }?,
-  attribute fileref { text }?,
-  attribute format { notation.class }?,
-  attribute srccredit { text }?,
-  local.objectdata.attrib
-local.videodata.attrib = empty
-videodata.role.attrib = role.attrib
-videodata = element videodata { videodata.attlist, empty }
-# end of videodata.element
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-videodata.attlist &=
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  objectdata.attrib,
-  common.attrib,
-  videodata.role.attrib,
-  local.videodata.attrib
-# end of videodata.attlist
-
-# end of videodata.module
-local.audiodata.attrib = empty
-audiodata.role.attrib = role.attrib
-audiodata = element audiodata { audiodata.attlist, empty }
-# end of audiodata.element
-audiodata.attlist &=
-  objectdata.attrib,
-  common.attrib,
-  audiodata.role.attrib,
-  local.audiodata.attrib
-# end of audiodata.attlist
-
-# end of audiodata.module
-local.imagedata.attrib = empty
-imagedata.role.attrib = role.attrib
-imagedata = element imagedata { imagedata.attlist, empty }
-# end of imagedata.element
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-imagedata.attlist &=
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  objectdata.attrib,
-  common.attrib,
-  imagedata.role.attrib,
-  local.imagedata.attrib
-# end of imagedata.attlist
-
-# end of imagedata.module
-local.textdata.attrib = empty
-textdata.role.attrib = role.attrib
-textdata = element textdata { textdata.attlist, empty }
-# end of textdata.element
-textdata.attlist &=
-  attribute encoding { text }?,
-  objectdata.attrib,
-  common.attrib,
-  textdata.role.attrib,
-  local.textdata.attrib
-# end of textdata.attlist
-
-# end of textdata.module
-local.caption.attrib = empty
-caption.role.attrib = role.attrib
-caption = element caption { caption.attlist, textobject.mix* }
-# end of caption.element
-caption.attlist &=
-  common.attrib, caption.role.attrib, local.caption.attrib
-# end of caption.attlist
-
-# end of caption.module
-local.mediaobjectco.attrib = empty
-mediaobjectco.role.attrib = role.attrib
-mediaobjectco =
-  element mediaobjectco {
-    mediaobjectco.attlist,
-    objectinfo?,
-    imageobjectco,
-    (imageobjectco | textobject)*
-  }
-# end of mediaobjectco.element
-mediaobjectco.attlist &=
-  common.attrib, mediaobjectco.role.attrib, local.mediaobjectco.attrib
-# end of mediaobjectco.attlist
-
-# end of mediaobjectco.module
-local.imageobjectco.attrib = empty
-imageobjectco.role.attrib = role.attrib
-imageobjectco =
-  element imageobjectco {
-    imageobjectco.attlist, areaspec, imageobject, calloutlist*
-  }
-# end of imageobjectco.element
-imageobjectco.attlist &=
-  common.attrib, imageobjectco.role.attrib, local.imageobjectco.attrib
-# end of imageobjectco.attlist
-
-# end of imageobjectco.module
-
-# end of mediaobject.content.module
-
-# Equations ........................
-
-# This PE provides a mechanism for replacing equation content,
-
-# perhaps adding a new or different model (e.g., MathML)
-equation.content = alt?, (graphic+ | mediaobject+)
-inlineequation.content = alt?, (graphic+ | inlinemediaobject+)
-local.equation.attrib = empty
-equation.role.attrib = role.attrib
-equation =
-  element equation {
-    equation.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    (informalequation | equation.content)
-  }
-# end of equation.element
-equation.attlist &=
-  label.attrib,
-  common.attrib,
-  equation.role.attrib,
-  local.equation.attrib
-# end of equation.attlist
-
-# end of equation.module
-local.informalequation.attrib = empty
-informalequation.role.attrib = role.attrib
-informalequation =
-  element informalequation {
-    informalequation.attlist, blockinfo?, equation.content
-  }
-# end of informalequation.element
-informalequation.attlist &=
-  common.attrib,
-  informalequation.role.attrib,
-  local.informalequation.attrib
-# end of informalequation.attlist
-
-# end of informalequation.module
-local.inlineequation.attrib = empty
-inlineequation.role.attrib = role.attrib
-inlineequation =
-  element inlineequation {
-    inlineequation.attlist, inlineequation.content
-  }
-# end of inlineequation.element
-inlineequation.attlist &=
-  common.attrib, inlineequation.role.attrib, local.inlineequation.attrib
-# end of inlineequation.attlist
-
-# end of inlineequation.module
-local.alt.attrib = empty
-alt.role.attrib = role.attrib
-alt = element alt { alt.attlist, text }
-# end of alt.element
-alt.attlist &= common.attrib, alt.role.attrib, local.alt.attrib
-# end of alt.attlist
-
-# end of alt.module
-
-# Tables ...........................
-
-tables.role.attrib = role.attrib
-
-# Note that InformalTable is dependent on some of the entity
-# declarations that customize Table.
-local.informaltable.attrib = empty
-informaltable =
-  element informaltable {
-    informaltable.attlist,
-    blockinfo?,
-    textobject*,
-    (graphic+ | mediaobject+ | tgroup+)
-  }
-# end of informaltable.element
-
-# Frame, Colsep, and Rowsep must be repeated because
-# they are not in entities in the table module.
-
-# includes TabStyle, ToCentry, ShortEntry,
-# Orient, PgWide
-
-# includes Label
-
-# includes common attributes
-informaltable.attlist &=
-  attribute frame {
-    "top" | "bottom" | "topbot" | "all" | "sides" | "none"
-  }?,
-  attribute colsep { yesorno.attvals }?,
-  attribute rowsep { yesorno.attvals }?,
-  common.table.attribs,
-  tbl.table.att,
-  local.informaltable.attrib
-# end of informaltable.attlist
-
-# end of informaltable.module
-
-# ......................................................................
-
-# Synopses .............................................................
-
-# Synopsis .........................
-local.synopsis.attrib = empty
-synopsis.role.attrib = role.attrib
-synopsis =
-  element synopsis {
-    synopsis.attlist,
-    (para.char.mix
-     | graphic
-     | mediaobject
-     | co
-     | coref
-     | textobject
-     | lineannotation)*
-  }
-# end of synopsis.element
-synopsis.attlist &=
-  label.attrib,
-  linespecific.attrib,
-  common.attrib,
-  synopsis.role.attrib,
-  local.synopsis.attrib
-# end of synopsis.attlist
-
-#  LineAnnotation (defined in the Inlines section, below)
-
-# end of synopsis.module
-
-# CmdSynopsis ......................
-local.cmdsynopsis.attrib = empty
-cmdsynopsis.role.attrib = role.attrib
-cmdsynopsis =
-  element cmdsynopsis {
-    cmdsynopsis.attlist, (command | arg | group | sbr)+, synopfragment*
-  }
-# end of cmdsynopsis.element
-
-# Sepchar: Character that should separate command and all
-# top-level arguments; alternate value might be e.g., &Delta;
-cmdsynopsis.attlist &=
-  label.attrib,
-  [ a:defaultValue = " " ] attribute sepchar { text }?,
-  attribute cmdlength { text }?,
-  common.attrib,
-  cmdsynopsis.role.attrib,
-  local.cmdsynopsis.attrib
-# end of cmdsynopsis.attlist
-
-# end of cmdsynopsis.module
-local.arg.attrib = empty
-arg.role.attrib = role.attrib
-arg =
-  element arg {
-    arg.attlist,
-    (text
-     | arg
-     | group
-     | option
-     | synopfragmentref
-     | replaceable
-     | sbr)*
-  }
-# end of arg.element
-
-# Choice: Whether Arg must be supplied: Opt (optional to
-# supply, e.g. [arg]; the default), Req (required to supply,
-# e.g. {arg}), or Plain (required to supply, e.g. arg)
-
-# Rep: whether Arg is repeatable: Norepeat (e.g. arg without
-# ellipsis; the default), or Repeat (e.g. arg...)
-arg.attlist &=
-  [ a:defaultValue = "opt" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  arg.role.attrib,
-  local.arg.attrib
-# end of arg.attlist
-
-# end of arg.module
-local.group.attrib = empty
-group.role.attrib = role.attrib
-group =
-  element group {
-    group.attlist,
-    (arg | group | option | synopfragmentref | replaceable | sbr)+
-  }
-# end of group.element
-
-# Choice: Whether Group must be supplied: Opt (optional to
-# supply, e.g.  [g1|g2|g3]; the default), Req (required to
-# supply, e.g.  {g1|g2|g3}), Plain (required to supply,
-# e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
-# [[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
-# {{g1|g2|g3}})
-
-# Rep: whether Group is repeatable: Norepeat (e.g. group
-# without ellipsis; the default), or Repeat (e.g. group...)
-group.attlist &=
-  [ a:defaultValue = "opt" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  group.role.attrib,
-  local.group.attrib
-# end of group.attlist
-
-# end of group.module
-local.sbr.attrib = empty
-# Synopsis break
-sbr.role.attrib = role.attrib
-sbr = element sbr { sbr.attlist, empty }
-# end of sbr.element
-sbr.attlist &= common.attrib, sbr.role.attrib, local.sbr.attrib
-# end of sbr.attlist
-
-# end of sbr.module
-local.synopfragmentref.attrib = empty
-synopfragmentref.role.attrib = role.attrib
-synopfragmentref =
-  element synopfragmentref { synopfragmentref.attlist, text }
-# end of synopfragmentref.element
-
-# to SynopFragment of complex synopsis
-# material for separate referencing
-synopfragmentref.attlist &=
-  linkendreq.attrib,
-  common.attrib,
-  synopfragmentref.role.attrib,
-  local.synopfragmentref.attrib
-# end of synopfragmentref.attlist
-
-# end of synopfragmentref.module
-local.synopfragment.attrib = empty
-synopfragment.role.attrib = role.attrib
-synopfragment =
-  element synopfragment { synopfragment.attlist, (arg | group)+ }
-# end of synopfragment.element
-synopfragment.attlist &=
-  idreq.common.attrib,
-  synopfragment.role.attrib,
-  local.synopfragment.attrib
-# end of synopfragment.attlist
-
-# end of synopfragment.module
-
-#  Command (defined in the Inlines section, below)
-
-#  Option (defined in the Inlines section, below)
-
-#  Replaceable (defined in the Inlines section, below)
-
-# end of cmdsynopsis.content.module
-
-# FuncSynopsis .....................
-local.funcsynopsis.attrib = empty
-funcsynopsis.role.attrib = role.attrib
-funcsynopsis =
-  element funcsynopsis {
-    funcsynopsis.attlist, (funcsynopsisinfo | funcprototype)+
-  }
-# end of funcsynopsis.element
-funcsynopsis.attlist &=
-  label.attrib,
-  common.attrib,
-  funcsynopsis.role.attrib,
-  local.funcsynopsis.attrib
-# end of funcsynopsis.attlist
-
-# end of funcsynopsis.module
-local.funcsynopsisinfo.attrib = empty
-funcsynopsisinfo.role.attrib = role.attrib
-funcsynopsisinfo =
-  element funcsynopsisinfo {
-    funcsynopsisinfo.attlist,
-    (cptr.char.mix | textobject | lineannotation)*
-  }
-# end of funcsynopsisinfo.element
-funcsynopsisinfo.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  funcsynopsisinfo.role.attrib,
-  local.funcsynopsisinfo.attrib
-# end of funcsynopsisinfo.attlist
-
-# end of funcsynopsisinfo.module
-local.funcprototype.attrib = empty
-funcprototype.role.attrib = role.attrib
-funcprototype =
-  element funcprototype {
-    funcprototype.attlist, funcdef, (void | varargs | paramdef+)
-  }
-# end of funcprototype.element
-funcprototype.attlist &=
-  common.attrib, funcprototype.role.attrib, local.funcprototype.attrib
-# end of funcprototype.attlist
-
-# end of funcprototype.module
-local.funcdef.attrib = empty
-funcdef.role.attrib = role.attrib
-funcdef =
-  element funcdef {
-    funcdef.attlist, (text | type | replaceable | function)*
-  }
-# end of funcdef.element
-funcdef.attlist &=
-  common.attrib, funcdef.role.attrib, local.funcdef.attrib
-# end of funcdef.attlist
-
-# end of funcdef.module
-local.void.attrib = empty
-void.role.attrib = role.attrib
-void = element void { void.attlist, empty }
-# end of void.element
-void.attlist &= common.attrib, void.role.attrib, local.void.attrib
-# end of void.attlist
-
-# end of void.module
-local.varargs.attrib = empty
-varargs.role.attrib = role.attrib
-varargs = element varargs { varargs.attlist, empty }
-# end of varargs.element
-varargs.attlist &=
-  common.attrib, varargs.role.attrib, local.varargs.attrib
-# end of varargs.attlist
-
-# end of varargs.module
-
-# Processing assumes that only one Parameter will appear in a
-# ParamDef, and that FuncParams will be used at most once, for
-# providing information on the "inner parameters" for parameters that
-# are pointers to functions.
-local.paramdef.attrib = empty
-paramdef.role.attrib = role.attrib
-paramdef =
-  element paramdef {
-    paramdef.attlist,
-    (text | type | replaceable | parameter | funcparams)*
-  }
-# end of paramdef.element
-paramdef.attlist &=
-  common.attrib, paramdef.role.attrib, local.paramdef.attrib
-# end of paramdef.attlist
-
-# end of paramdef.module
-local.funcparams.attrib = empty
-funcparams.role.attrib = role.attrib
-funcparams = element funcparams { funcparams.attlist, cptr.char.mix* }
-# end of funcparams.element
-funcparams.attlist &=
-  common.attrib, funcparams.role.attrib, local.funcparams.attrib
-# end of funcparams.attlist
-
-# end of funcparams.module
-
-#  LineAnnotation (defined in the Inlines section, below)
-
-#  Replaceable (defined in the Inlines section, below)
-
-#  Function (defined in the Inlines section, below)
-
-#  Parameter (defined in the Inlines section, below)
-
-# end of funcsynopsis.content.module
-
-# ClassSynopsis .....................
-local.classsynopsis.attrib = empty
-classsynopsis.role.attrib = role.attrib
-classsynopsis =
-  element classsynopsis {
-    classsynopsis.attlist,
-    (ooclass | oointerface | ooexception)+,
-    (classsynopsisinfo | fieldsynopsis | method.synop.class)*
-  }
-# end of classsynopsis.element
-classsynopsis.attlist &=
-  attribute language { text }?,
-  [ a:defaultValue = "class" ]
-  attribute class { "class" | "interface" }?,
-  common.attrib,
-  classsynopsis.role.attrib,
-  local.classsynopsis.attrib
-# end of classsynopsis.attlist
-
-# end of classsynopsis.module
-local.classsynopsisinfo.attrib = empty
-classsynopsisinfo.role.attrib = role.attrib
-classsynopsisinfo =
-  element classsynopsisinfo {
-    classsynopsisinfo.attlist,
-    (cptr.char.mix | textobject | lineannotation)*
-  }
-# end of classsynopsisinfo.element
-classsynopsisinfo.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  classsynopsisinfo.role.attrib,
-  local.classsynopsisinfo.attrib
-# end of classsynopsisinfo.attlist
-
-# end of classsynopsisinfo.module
-local.ooclass.attrib = empty
-ooclass.role.attrib = role.attrib
-ooclass = element ooclass { ooclass.attlist, modifier*, classname }
-# end of ooclass.element
-ooclass.attlist &=
-  common.attrib, ooclass.role.attrib, local.ooclass.attrib
-# end of ooclass.attlist
-
-# end of ooclass.module
-local.oointerface.attrib = empty
-oointerface.role.attrib = role.attrib
-oointerface =
-  element oointerface { oointerface.attlist, modifier*, interfacename }
-# end of oointerface.element
-oointerface.attlist &=
-  common.attrib, oointerface.role.attrib, local.oointerface.attrib
-# end of oointerface.attlist
-
-# end of oointerface.module
-local.ooexception.attrib = empty
-ooexception.role.attrib = role.attrib
-ooexception =
-  element ooexception { ooexception.attlist, modifier*, exceptionname }
-# end of ooexception.element
-ooexception.attlist &=
-  common.attrib, ooexception.role.attrib, local.ooexception.attrib
-# end of ooexception.attlist
-
-# end of ooexception.module
-local.modifier.attrib = empty
-modifier.role.attrib = role.attrib
-modifier = element modifier { modifier.attlist, smallcptr.char.mix* }
-# end of modifier.element
-modifier.attlist &=
-  common.attrib, modifier.role.attrib, local.modifier.attrib
-# end of modifier.attlist
-
-# end of modifier.module
-local.interfacename.attrib = empty
-interfacename.role.attrib = role.attrib
-interfacename =
-  element interfacename { interfacename.attlist, cptr.char.mix* }
-# end of interfacename.element
-interfacename.attlist &=
-  common.attrib, interfacename.role.attrib, local.interfacename.attrib
-# end of interfacename.attlist
-
-# end of interfacename.module
-local.exceptionname.attrib = empty
-exceptionname.role.attrib = role.attrib
-exceptionname =
-  element exceptionname { exceptionname.attlist, smallcptr.char.mix* }
-# end of exceptionname.element
-exceptionname.attlist &=
-  common.attrib, exceptionname.role.attrib, local.exceptionname.attrib
-# end of exceptionname.attlist
-
-# end of exceptionname.module
-local.fieldsynopsis.attrib = empty
-fieldsynopsis.role.attrib = role.attrib
-fieldsynopsis =
-  element fieldsynopsis {
-    fieldsynopsis.attlist, modifier*, type?, varname, initializer?
-  }
-# end of fieldsynopsis.element
-fieldsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  fieldsynopsis.role.attrib,
-  local.fieldsynopsis.attrib
-# end of fieldsynopsis.attlist
-
-# end of fieldsynopsis.module
-local.initializer.attrib = empty
-initializer.role.attrib = role.attrib
-initializer =
-  element initializer { initializer.attlist, smallcptr.char.mix* }
-# end of initializer.element
-initializer.attlist &=
-  common.attrib, initializer.role.attrib, local.initializer.attrib
-# end of initializer.attlist
-
-# end of initializer.module
-local.constructorsynopsis.attrib = empty
-constructorsynopsis.role.attrib = role.attrib
-constructorsynopsis =
-  element constructorsynopsis {
-    constructorsynopsis.attlist,
-    modifier*,
-    methodname?,
-    (methodparam+ | void),
-    exceptionname*
-  }
-# end of constructorsynopsis.element
-constructorsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  constructorsynopsis.role.attrib,
-  local.constructorsynopsis.attrib
-# end of constructorsynopsis.attlist
-
-# end of constructorsynopsis.module
-local.destructorsynopsis.attrib = empty
-destructorsynopsis.role.attrib = role.attrib
-destructorsynopsis =
-  element destructorsynopsis {
-    destructorsynopsis.attlist,
-    modifier*,
-    methodname?,
-    (methodparam+ | void),
-    exceptionname*
-  }
-# end of destructorsynopsis.element
-destructorsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  destructorsynopsis.role.attrib,
-  local.destructorsynopsis.attrib
-# end of destructorsynopsis.attlist
-
-# end of destructorsynopsis.module
-local.methodsynopsis.attrib = empty
-methodsynopsis.role.attrib = role.attrib
-methodsynopsis =
-  element methodsynopsis {
-    methodsynopsis.attlist,
-    modifier*,
-    (type | void)?,
-    methodname,
-    (methodparam+ | void),
-    exceptionname*,
-    modifier*
-  }
-# end of methodsynopsis.element
-methodsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  methodsynopsis.role.attrib,
-  local.methodsynopsis.attrib
-# end of methodsynopsis.attlist
-
-# end of methodsynopsis.module
-local.methodname.attrib = empty
-methodname.role.attrib = role.attrib
-methodname =
-  element methodname { methodname.attlist, smallcptr.char.mix* }
-# end of methodname.element
-methodname.attlist &=
-  common.attrib, methodname.role.attrib, local.methodname.attrib
-# end of methodname.attlist
-
-# end of methodname.module
-local.methodparam.attrib = empty
-methodparam.role.attrib = role.attrib
-methodparam =
-  element methodparam {
-    methodparam.attlist,
-    modifier*,
-    type?,
-    ((parameter, initializer?) | funcparams),
-    modifier*
-  }
-# end of methodparam.element
-methodparam.attlist &=
-  [ a:defaultValue = "req" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  methodparam.role.attrib,
-  local.methodparam.attrib
-# end of methodparam.attlist
-
-# end of methodparam.module
-
-# end of classsynopsis.content.module
-
-# ......................................................................
-
-# Document information entities and elements ...........................
-
-# The document information elements include some elements that are
-# currently used only in the document hierarchy module. They are
-# defined here so that they will be available for use in customized
-# document hierarchies.
-
-# ..................................
-
-# Ackno ............................
-local.ackno.attrib = empty
-ackno.role.attrib = role.attrib
-ackno = element ackno { ackno.attlist, docinfo.char.mix* }
-# end of ackno.element
-ackno.attlist &= common.attrib, ackno.role.attrib, local.ackno.attrib
-# end of ackno.attlist
-
-# end of ackno.module
-
-# Address ..........................
-local.address.attrib = empty
-address.role.attrib = role.attrib
-address =
-  element address {
-    address.attlist,
-    (text
-     | personname
-     | person.ident.mix
-     | street
-     | pob
-     | postcode
-     | city
-     | state
-     | country
-     | phone
-     | fax
-     | email
-     | otheraddr)*
-  }
-# end of address.element
-address.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  address.role.attrib,
-  local.address.attrib
-# end of address.attlist
-
-# end of address.module
-local.street.attrib = empty
-street.role.attrib = role.attrib
-street = element street { street.attlist, docinfo.char.mix* }
-# end of street.element
-street.attlist &= common.attrib, street.role.attrib, local.street.attrib
-# end of street.attlist
-
-# end of street.module
-local.pob.attrib = empty
-pob.role.attrib = role.attrib
-pob = element pob { pob.attlist, docinfo.char.mix* }
-# end of pob.element
-pob.attlist &= common.attrib, pob.role.attrib, local.pob.attrib
-# end of pob.attlist
-
-# end of pob.module
-local.postcode.attrib = empty
-postcode.role.attrib = role.attrib
-postcode = element postcode { postcode.attlist, docinfo.char.mix* }
-# end of postcode.element
-postcode.attlist &=
-  common.attrib, postcode.role.attrib, local.postcode.attrib
-# end of postcode.attlist
-
-# end of postcode.module
-local.city.attrib = empty
-city.role.attrib = role.attrib
-city = element city { city.attlist, docinfo.char.mix* }
-# end of city.element
-city.attlist &= common.attrib, city.role.attrib, local.city.attrib
-# end of city.attlist
-
-# end of city.module
-local.state.attrib = empty
-state.role.attrib = role.attrib
-state = element state { state.attlist, docinfo.char.mix* }
-# end of state.element
-state.attlist &= common.attrib, state.role.attrib, local.state.attrib
-# end of state.attlist
-
-# end of state.module
-local.country.attrib = empty
-country.role.attrib = role.attrib
-country = element country { country.attlist, docinfo.char.mix* }
-# end of country.element
-country.attlist &=
-  common.attrib, country.role.attrib, local.country.attrib
-# end of country.attlist
-
-# end of country.module
-local.phone.attrib = empty
-phone.role.attrib = role.attrib
-phone = element phone { phone.attlist, docinfo.char.mix* }
-# end of phone.element
-phone.attlist &= common.attrib, phone.role.attrib, local.phone.attrib
-# end of phone.attlist
-
-# end of phone.module
-local.fax.attrib = empty
-fax.role.attrib = role.attrib
-fax = element fax { fax.attlist, docinfo.char.mix* }
-# end of fax.element
-fax.attlist &= common.attrib, fax.role.attrib, local.fax.attrib
-# end of fax.attlist
-
-# end of fax.module
-
-#  Email (defined in the Inlines section, below)
-local.otheraddr.attrib = empty
-otheraddr.role.attrib = role.attrib
-otheraddr = element otheraddr { otheraddr.attlist, docinfo.char.mix* }
-# end of otheraddr.element
-otheraddr.attlist &=
-  common.attrib, otheraddr.role.attrib, local.otheraddr.attrib
-# end of otheraddr.attlist
-
-# end of otheraddr.module
-
-# end of address.content.module
-
-# Affiliation ......................
-local.affiliation.attrib = empty
-affiliation.role.attrib = role.attrib
-affiliation =
-  element affiliation {
-    affiliation.attlist,
-    shortaffil?,
-    jobtitle*,
-    orgname?,
-    orgdiv*,
-    address*
-  }
-# end of affiliation.element
-affiliation.attlist &=
-  common.attrib, affiliation.role.attrib, local.affiliation.attrib
-# end of affiliation.attlist
-
-# end of affiliation.module
-local.shortaffil.attrib = empty
-shortaffil.role.attrib = role.attrib
-shortaffil =
-  element shortaffil { shortaffil.attlist, docinfo.char.mix* }
-# end of shortaffil.element
-shortaffil.attlist &=
-  common.attrib, shortaffil.role.attrib, local.shortaffil.attrib
-# end of shortaffil.attlist
-
-# end of shortaffil.module
-local.jobtitle.attrib = empty
-jobtitle.role.attrib = role.attrib
-jobtitle = element jobtitle { jobtitle.attlist, docinfo.char.mix* }
-# end of jobtitle.element
-jobtitle.attlist &=
-  common.attrib, jobtitle.role.attrib, local.jobtitle.attrib
-# end of jobtitle.attlist
-
-# end of jobtitle.module
-
-#  OrgName (defined elsewhere in this section)
-local.orgdiv.attrib = empty
-orgdiv.role.attrib = role.attrib
-orgdiv = element orgdiv { orgdiv.attlist, docinfo.char.mix* }
-# end of orgdiv.element
-orgdiv.attlist &= common.attrib, orgdiv.role.attrib, local.orgdiv.attrib
-# end of orgdiv.attlist
-
-# end of orgdiv.module
-
-#  Address (defined elsewhere in this section)
-
-# end of affiliation.content.module
-
-# ArtPageNums ......................
-local.artpagenums.attrib = empty
-artpagenums.role.attrib = role.attrib
-artpagenums =
-  element artpagenums { artpagenums.attlist, docinfo.char.mix* }
-# end of artpagenums.element
-artpagenums.attlist &=
-  common.attrib, artpagenums.role.attrib, local.artpagenums.attrib
-# end of artpagenums.attlist
-
-# end of artpagenums.module
-
-# PersonName
-local.personname.attrib = empty
-personname.role.attrib = role.attrib
-personname =
-  element personname {
-    personname.attlist,
-    (honorific | firstname | surname | lineage | othername)+
-  }
-# end of personname.element
-personname.attlist &=
-  common.attrib, personname.role.attrib, local.personname.attrib
-# end of personname.attlist
-
-# end of personname.module
-
-# Author ...........................
-local.author.attrib = empty
-author.role.attrib = role.attrib
-author =
-  element author {
-    author.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of author.element
-author.attlist &= common.attrib, author.role.attrib, local.author.attrib
-# end of author.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of author.module
-
-# AuthorGroup ......................
-local.authorgroup.attrib = empty
-authorgroup.role.attrib = role.attrib
-authorgroup =
-  element authorgroup {
-    authorgroup.attlist,
-    (author | editor | collab | corpauthor | othercredit)+
-  }
-# end of authorgroup.element
-authorgroup.attlist &=
-  common.attrib, authorgroup.role.attrib, local.authorgroup.attrib
-# end of authorgroup.attlist
-
-# end of authorgroup.module
-
-#  Author (defined elsewhere in this section)
-
-#  Editor (defined elsewhere in this section)
-local.collab.attrib = empty
-collab.role.attrib = role.attrib
-collab = element collab { collab.attlist, collabname, affiliation* }
-# end of collab.element
-collab.attlist &= common.attrib, collab.role.attrib, local.collab.attrib
-# end of collab.attlist
-
-# end of collab.module
-local.collabname.attrib = empty
-collabname.role.attrib = role.attrib
-collabname =
-  element collabname { collabname.attlist, docinfo.char.mix* }
-# end of collabname.element
-collabname.attlist &=
-  common.attrib, collabname.role.attrib, local.collabname.attrib
-# end of collabname.attlist
-
-# end of collabname.module
-
-#  Affiliation (defined elsewhere in this section)
-
-# end of collab.content.module
-
-#  CorpAuthor (defined elsewhere in this section)
-
-#  OtherCredit (defined elsewhere in this section)
-
-# end of authorgroup.content.module
-
-# AuthorInitials ...................
-local.authorinitials.attrib = empty
-authorinitials.role.attrib = role.attrib
-authorinitials =
-  element authorinitials { authorinitials.attlist, docinfo.char.mix* }
-# end of authorinitials.element
-authorinitials.attlist &=
-  common.attrib, authorinitials.role.attrib, local.authorinitials.attrib
-# end of authorinitials.attlist
-
-# end of authorinitials.module
-
-# ConfGroup ........................
-local.confgroup.attrib = empty
-confgroup.role.attrib = role.attrib
-confgroup =
-  element confgroup {
-    confgroup.attlist,
-    (confdates | conftitle | confnum | address | confsponsor)*
-  }
-# end of confgroup.element
-confgroup.attlist &=
-  common.attrib, confgroup.role.attrib, local.confgroup.attrib
-# end of confgroup.attlist
-
-# end of confgroup.module
-local.confdates.attrib = empty
-confdates.role.attrib = role.attrib
-confdates = element confdates { confdates.attlist, docinfo.char.mix* }
-# end of confdates.element
-confdates.attlist &=
-  common.attrib, confdates.role.attrib, local.confdates.attrib
-# end of confdates.attlist
-
-# end of confdates.module
-local.conftitle.attrib = empty
-conftitle.role.attrib = role.attrib
-conftitle = element conftitle { conftitle.attlist, docinfo.char.mix* }
-# end of conftitle.element
-conftitle.attlist &=
-  common.attrib, conftitle.role.attrib, local.conftitle.attrib
-# end of conftitle.attlist
-
-# end of conftitle.module
-local.confnum.attrib = empty
-confnum.role.attrib = role.attrib
-confnum = element confnum { confnum.attlist, docinfo.char.mix* }
-# end of confnum.element
-confnum.attlist &=
-  common.attrib, confnum.role.attrib, local.confnum.attrib
-# end of confnum.attlist
-
-# end of confnum.module
-
-#  Address (defined elsewhere in this section)
-local.confsponsor.attrib = empty
-confsponsor.role.attrib = role.attrib
-confsponsor =
-  element confsponsor { confsponsor.attlist, docinfo.char.mix* }
-# end of confsponsor.element
-confsponsor.attlist &=
-  common.attrib, confsponsor.role.attrib, local.confsponsor.attrib
-# end of confsponsor.attlist
-
-# end of confsponsor.module
-
-# end of confgroup.content.module
-
-# ContractNum ......................
-local.contractnum.attrib = empty
-contractnum.role.attrib = role.attrib
-contractnum =
-  element contractnum { contractnum.attlist, docinfo.char.mix* }
-# end of contractnum.element
-contractnum.attlist &=
-  common.attrib, contractnum.role.attrib, local.contractnum.attrib
-# end of contractnum.attlist
-
-# end of contractnum.module
-
-# ContractSponsor ..................
-local.contractsponsor.attrib = empty
-contractsponsor.role.attrib = role.attrib
-contractsponsor =
-  element contractsponsor { contractsponsor.attlist, docinfo.char.mix* }
-# end of contractsponsor.element
-contractsponsor.attlist &=
-  common.attrib,
-  contractsponsor.role.attrib,
-  local.contractsponsor.attrib
-# end of contractsponsor.attlist
-
-# end of contractsponsor.module
-
-# Copyright ........................
-local.copyright.attrib = empty
-copyright.role.attrib = role.attrib
-copyright = element copyright { copyright.attlist, year+, holder* }
-# end of copyright.element
-copyright.attlist &=
-  common.attrib, copyright.role.attrib, local.copyright.attrib
-# end of copyright.attlist
-
-# end of copyright.module
-local.year.attrib = empty
-year.role.attrib = role.attrib
-year = element year { year.attlist, docinfo.char.mix* }
-# end of year.element
-year.attlist &= common.attrib, year.role.attrib, local.year.attrib
-# end of year.attlist
-
-# end of year.module
-local.holder.attrib = empty
-holder.role.attrib = role.attrib
-holder = element holder { holder.attlist, docinfo.char.mix* }
-# end of holder.element
-holder.attlist &= common.attrib, holder.role.attrib, local.holder.attrib
-# end of holder.attlist
-
-# end of holder.module
-
-# end of copyright.content.module
-
-# CorpAuthor .......................
-local.corpauthor.attrib = empty
-corpauthor.role.attrib = role.attrib
-corpauthor =
-  element corpauthor { corpauthor.attlist, docinfo.char.mix* }
-# end of corpauthor.element
-corpauthor.attlist &=
-  common.attrib, corpauthor.role.attrib, local.corpauthor.attrib
-# end of corpauthor.attlist
-
-# end of corpauthor.module
-
-# CorpName .........................
-local.corpname.attrib = empty
-corpname = element corpname { corpname.attlist, docinfo.char.mix* }
-# end of corpname.element
-corpname.role.attrib = role.attrib
-corpname.attlist &=
-  common.attrib, corpname.role.attrib, local.corpname.attrib
-# end of corpname.attlist
-
-# end of corpname.module
-
-# Date .............................
-local.date.attrib = empty
-date.role.attrib = role.attrib
-date = element date { date.attlist, docinfo.char.mix* }
-# end of date.element
-date.attlist &= common.attrib, date.role.attrib, local.date.attrib
-# end of date.attlist
-
-# end of date.module
-
-# Edition ..........................
-local.edition.attrib = empty
-edition.role.attrib = role.attrib
-edition = element edition { edition.attlist, docinfo.char.mix* }
-# end of edition.element
-edition.attlist &=
-  common.attrib, edition.role.attrib, local.edition.attrib
-# end of edition.attlist
-
-# end of edition.module
-
-# Editor ...........................
-local.editor.attrib = empty
-editor.role.attrib = role.attrib
-editor =
-  element editor {
-    editor.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of editor.element
-editor.attlist &= common.attrib, editor.role.attrib, local.editor.attrib
-# end of editor.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of editor.module
-
-# ISBN .............................
-local.isbn.attrib = empty
-isbn.role.attrib = role.attrib
-isbn = element isbn { isbn.attlist, docinfo.char.mix* }
-# end of isbn.element
-isbn.attlist &= common.attrib, isbn.role.attrib, local.isbn.attrib
-# end of isbn.attlist
-
-# end of isbn.module
-
-# ISSN .............................
-local.issn.attrib = empty
-issn.role.attrib = role.attrib
-issn = element issn { issn.attlist, docinfo.char.mix* }
-# end of issn.element
-issn.attlist &= common.attrib, issn.role.attrib, local.issn.attrib
-# end of issn.attlist
-
-# end of issn.module
-
-# BiblioId .................
-biblio.class.attrib =
-  attribute class {
-    "uri"
-    | "doi"
-    | "isbn"
-    | "issn"
-    | "libraryofcongress"
-    | "pubnumber"
-    | "other"
-  }?,
-  attribute otherclass { text }?
-local.biblioid.attrib = empty
-biblioid.role.attrib = role.attrib
-biblioid = element biblioid { biblioid.attlist, docinfo.char.mix* }
-# end of biblioid.element
-biblioid.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  biblioid.role.attrib,
-  local.biblioid.attrib
-# end of biblioid.attlist
-
-# end of biblioid.module
-
-# CiteBiblioId .................
-local.citebiblioid.attrib = empty
-citebiblioid.role.attrib = role.attrib
-citebiblioid =
-  element citebiblioid { citebiblioid.attlist, docinfo.char.mix* }
-# end of citebiblioid.element
-citebiblioid.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  citebiblioid.role.attrib,
-  local.citebiblioid.attrib
-# end of citebiblioid.attlist
-
-# end of citebiblioid.module
-
-# BiblioSource .................
-local.bibliosource.attrib = empty
-bibliosource.role.attrib = role.attrib
-bibliosource =
-  element bibliosource { bibliosource.attlist, docinfo.char.mix* }
-# end of bibliosource.element
-bibliosource.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  bibliosource.role.attrib,
-  local.bibliosource.attrib
-# end of bibliosource.attlist
-
-# end of bibliosource.module
-
-# BiblioRelation .................
-local.bibliorelation.attrib = empty
-local.bibliorelation.types = notAllowed
-bibliorelation.type.attrib =
-  attribute type {
-    "isversionof"
-    | "hasversion"
-    | "isreplacedby"
-    | "replaces"
-    | "isrequiredby"
-    | "requires"
-    | "ispartof"
-    | "haspart"
-    | "isreferencedby"
-    | "references"
-    | "isformatof"
-    | "hasformat"
-    | "othertype"
-    | local.bibliorelation.types
-  }?,
-  attribute othertype { text }?
-bibliorelation.role.attrib = role.attrib
-bibliorelation =
-  element bibliorelation { bibliorelation.attlist, docinfo.char.mix* }
-# end of bibliorelation.element
-bibliorelation.attlist &=
-  biblio.class.attrib,
-  bibliorelation.type.attrib,
-  common.attrib,
-  bibliorelation.role.attrib,
-  local.bibliorelation.attrib
-# end of bibliorelation.attlist
-
-# end of bibliorelation.module
-
-# BiblioCoverage .................
-local.bibliocoverage.attrib = empty
-bibliocoverage.role.attrib = role.attrib
-bibliocoverage =
-  element bibliocoverage { bibliocoverage.attlist, docinfo.char.mix* }
-# end of bibliocoverage.element
-bibliocoverage.attlist &=
-  attribute spatial {
-    "dcmipoint" | "iso3166" | "dcmibox" | "tgn" | "otherspatial"
-  }?,
-  attribute otherspatial { text }?,
-  attribute temporal { "dcmiperiod" | "w3c-dtf" | "othertemporal" }?,
-  attribute othertemporal { text }?,
-  common.attrib,
-  bibliocoverage.role.attrib,
-  local.bibliocoverage.attrib
-# end of bibliocoverage.attlist
-
-# end of bibliocoverage.module
-
-# InvPartNumber ....................
-local.invpartnumber.attrib = empty
-invpartnumber.role.attrib = role.attrib
-invpartnumber =
-  element invpartnumber { invpartnumber.attlist, docinfo.char.mix* }
-# end of invpartnumber.element
-invpartnumber.attlist &=
-  common.attrib, invpartnumber.role.attrib, local.invpartnumber.attrib
-# end of invpartnumber.attlist
-
-# end of invpartnumber.module
-
-# IssueNum .........................
-local.issuenum.attrib = empty
-issuenum.role.attrib = role.attrib
-issuenum = element issuenum { issuenum.attlist, docinfo.char.mix* }
-# end of issuenum.element
-issuenum.attlist &=
-  common.attrib, issuenum.role.attrib, local.issuenum.attrib
-# end of issuenum.attlist
-
-# end of issuenum.module
-
-# LegalNotice ......................
-local.legalnotice.attrib = empty
-legalnotice.role.attrib = role.attrib
-legalnotice =
-  element legalnotice {
-    legalnotice.attlist, blockinfo?, title?, legalnotice.mix+
-  }
-# end of legalnotice.element
-legalnotice.attlist &=
-  common.attrib, legalnotice.role.attrib, local.legalnotice.attrib
-# end of legalnotice.attlist
-
-# end of legalnotice.module
-
-# ModeSpec .........................
-local.modespec.attrib = empty
-modespec.role.attrib = role.attrib
-modespec = element modespec { modespec.attlist, docinfo.char.mix* }
-# end of modespec.element
-
-# Application: Type of action required for completion
-# of the links to which the ModeSpec is relevant (e.g.,
-# retrieval query)
-modespec.attlist &=
-  attribute application { notation.class }?,
-  common.attrib,
-  modespec.role.attrib,
-  local.modespec.attrib
-# end of modespec.attlist
-
-# end of modespec.module
-
-# OrgName ..........................
-local.orgname.attrib = empty
-orgname.role.attrib = role.attrib
-orgname = element orgname { orgname.attlist, docinfo.char.mix* }
-# end of orgname.element
-orgname.attlist &=
-  common.attrib,
-  attribute class {
-    "corporation" | "nonprofit" | "consortium" | "informal" | "other"
-  }?,
-  attribute otherclass { text }?,
-  orgname.role.attrib,
-  local.orgname.attrib
-# end of orgname.attlist
-
-# end of orgname.module
-
-# OtherCredit ......................
-local.othercredit.attrib = empty
-othercredit.role.attrib = role.attrib
-othercredit =
-  element othercredit {
-    othercredit.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of othercredit.element
-othercredit.attlist &=
-  common.attrib, othercredit.role.attrib, local.othercredit.attrib
-# end of othercredit.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of othercredit.module
-
-# PageNums .........................
-local.pagenums.attrib = empty
-pagenums.role.attrib = role.attrib
-pagenums = element pagenums { pagenums.attlist, docinfo.char.mix* }
-# end of pagenums.element
-pagenums.attlist &=
-  common.attrib, pagenums.role.attrib, local.pagenums.attrib
-# end of pagenums.attlist
-
-# end of pagenums.module
-
-# Personal identity elements .......
-
-# These elements are used only within Author, Editor, and
-# OtherCredit.
-local.contrib.attrib = empty
-contrib.role.attrib = role.attrib
-contrib = element contrib { contrib.attlist, docinfo.char.mix* }
-# end of contrib.element
-contrib.attlist &=
-  common.attrib, contrib.role.attrib, local.contrib.attrib
-# end of contrib.attlist
-
-# end of contrib.module
-local.firstname.attrib = empty
-firstname.role.attrib = role.attrib
-firstname = element firstname { firstname.attlist, docinfo.char.mix* }
-# end of firstname.element
-firstname.attlist &=
-  common.attrib, firstname.role.attrib, local.firstname.attrib
-# end of firstname.attlist
-
-# end of firstname.module
-local.honorific.attrib = empty
-honorific.role.attrib = role.attrib
-honorific = element honorific { honorific.attlist, docinfo.char.mix* }
-# end of honorific.element
-honorific.attlist &=
-  common.attrib, honorific.role.attrib, local.honorific.attrib
-# end of honorific.attlist
-
-# end of honorific.module
-local.lineage.attrib = empty
-lineage.role.attrib = role.attrib
-lineage = element lineage { lineage.attlist, docinfo.char.mix* }
-# end of lineage.element
-lineage.attlist &=
-  common.attrib, lineage.role.attrib, local.lineage.attrib
-# end of lineage.attlist
-
-# end of lineage.module
-local.othername.attrib = empty
-othername.role.attrib = role.attrib
-othername = element othername { othername.attlist, docinfo.char.mix* }
-# end of othername.element
-othername.attlist &=
-  common.attrib, othername.role.attrib, local.othername.attrib
-# end of othername.attlist
-
-# end of othername.module
-local.surname.attrib = empty
-surname.role.attrib = role.attrib
-surname = element surname { surname.attlist, docinfo.char.mix* }
-# end of surname.element
-surname.attlist &=
-  common.attrib, surname.role.attrib, local.surname.attrib
-# end of surname.attlist
-
-# end of surname.module
-
-# end of person.ident.module
-
-# PrintHistory .....................
-local.printhistory.attrib = empty
-printhistory.role.attrib = role.attrib
-printhistory =
-  element printhistory { printhistory.attlist, para.class+ }
-# end of printhistory.element
-printhistory.attlist &=
-  common.attrib, printhistory.role.attrib, local.printhistory.attrib
-# end of printhistory.attlist
-
-# end of printhistory.module
-
-# ProductName ......................
-local.productname.attrib = empty
-productname.role.attrib = role.attrib
-productname =
-  element productname { productname.attlist, para.char.mix* }
-# end of productname.element
-
-# Class: More precisely identifies the item the element names
-productname.attlist &=
-  [ a:defaultValue = "trade" ]
-  attribute class { "service" | "trade" | "registered" | "copyright" }?,
-  common.attrib,
-  productname.role.attrib,
-  local.productname.attrib
-# end of productname.attlist
-
-# end of productname.module
-
-# ProductNumber ....................
-local.productnumber.attrib = empty
-productnumber.role.attrib = role.attrib
-productnumber =
-  element productnumber { productnumber.attlist, docinfo.char.mix* }
-# end of productnumber.element
-productnumber.attlist &=
-  common.attrib, productnumber.role.attrib, local.productnumber.attrib
-# end of productnumber.attlist
-
-# end of productnumber.module
-
-# PubDate ..........................
-local.pubdate.attrib = empty
-pubdate.role.attrib = role.attrib
-pubdate = element pubdate { pubdate.attlist, docinfo.char.mix* }
-# end of pubdate.element
-pubdate.attlist &=
-  common.attrib, pubdate.role.attrib, local.pubdate.attrib
-# end of pubdate.attlist
-
-# end of pubdate.module
-
-# Publisher ........................
-local.publisher.attrib = empty
-publisher.role.attrib = role.attrib
-publisher =
-  element publisher { publisher.attlist, publishername, address* }
-# end of publisher.element
-publisher.attlist &=
-  common.attrib, publisher.role.attrib, local.publisher.attrib
-# end of publisher.attlist
-
-# end of publisher.module
-local.publishername.attrib = empty
-publishername.role.attrib = role.attrib
-publishername =
-  element publishername { publishername.attlist, docinfo.char.mix* }
-# end of publishername.element
-publishername.attlist &=
-  common.attrib, publishername.role.attrib, local.publishername.attrib
-# end of publishername.attlist
-
-# end of publishername.module
-
-#  Address (defined elsewhere in this section)
-
-# end of publisher.content.module
-
-# PubsNumber .......................
-local.pubsnumber.attrib = empty
-pubsnumber.role.attrib = role.attrib
-pubsnumber =
-  element pubsnumber { pubsnumber.attlist, docinfo.char.mix* }
-# end of pubsnumber.element
-pubsnumber.attlist &=
-  common.attrib, pubsnumber.role.attrib, local.pubsnumber.attrib
-# end of pubsnumber.attlist
-
-# end of pubsnumber.module
-
-# ReleaseInfo ......................
-local.releaseinfo.attrib = empty
-releaseinfo.role.attrib = role.attrib
-releaseinfo =
-  element releaseinfo { releaseinfo.attlist, docinfo.char.mix* }
-# end of releaseinfo.element
-releaseinfo.attlist &=
-  common.attrib, releaseinfo.role.attrib, local.releaseinfo.attrib
-# end of releaseinfo.attlist
-
-# end of releaseinfo.module
-
-# RevHistory .......................
-local.revhistory.attrib = empty
-revhistory.role.attrib = role.attrib
-revhistory = element revhistory { revhistory.attlist, revision+ }
-# end of revhistory.element
-revhistory.attlist &=
-  common.attrib, revhistory.role.attrib, local.revhistory.attrib
-# end of revhistory.attlist
-
-# end of revhistory.module
-local.revision.attrib = empty
-revision.role.attrib = role.attrib
-revision =
-  element revision {
-    revision.attlist,
-    revnumber,
-    date,
-    authorinitials*,
-    (revremark | revdescription)?
-  }
-# end of revision.element
-revision.attlist &=
-  common.attrib, revision.role.attrib, local.revision.attrib
-# end of revision.attlist
-
-# end of revision.module
-local.revnumber.attrib = empty
-revnumber.role.attrib = role.attrib
-revnumber = element revnumber { revnumber.attlist, docinfo.char.mix* }
-# end of revnumber.element
-revnumber.attlist &=
-  common.attrib, revnumber.role.attrib, local.revnumber.attrib
-# end of revnumber.attlist
-
-# end of revnumber.module
-
-#  Date (defined elsewhere in this section)
-
-#  AuthorInitials (defined elsewhere in this section)
-local.revremark.attrib = empty
-revremark.role.attrib = role.attrib
-revremark = element revremark { revremark.attlist, docinfo.char.mix* }
-# end of revremark.element
-revremark.attlist &=
-  common.attrib, revremark.role.attrib, local.revremark.attrib
-# end of revremark.attlist
-
-# end of revremark.module
-local.revdescription.attrib = empty
-revdescription.role.attrib = role.attrib
-revdescription =
-  element revdescription { revdescription.attlist, revdescription.mix+ }
-# end of revdescription.element
-revdescription.attlist &=
-  common.attrib, revdescription.role.attrib, local.revdescription.attrib
-# end of revdescription.attlist
-
-# end of revdescription.module
-
-# end of revhistory.content.module
-
-# SeriesVolNums ....................
-local.seriesvolnums.attrib = empty
-seriesvolnums.role.attrib = role.attrib
-seriesvolnums =
-  element seriesvolnums { seriesvolnums.attlist, docinfo.char.mix* }
-# end of seriesvolnums.element
-seriesvolnums.attlist &=
-  common.attrib, seriesvolnums.role.attrib, local.seriesvolnums.attrib
-# end of seriesvolnums.attlist
-
-# end of seriesvolnums.module
-
-# VolumeNum ........................
-local.volumenum.attrib = empty
-volumenum.role.attrib = role.attrib
-volumenum = element volumenum { volumenum.attlist, docinfo.char.mix* }
-# end of volumenum.element
-volumenum.attlist &=
-  common.attrib, volumenum.role.attrib, local.volumenum.attrib
-# end of volumenum.attlist
-
-# end of volumenum.module
-
-# ..................................
-
-# end of docinfo.content.module
-
-# ......................................................................
-
-# Inline, link, and ubiquitous elements ................................
-
-# Technical and computer terms .........................................
-local.accel.attrib = empty
-accel.role.attrib = role.attrib
-accel = element accel { accel.attlist, smallcptr.char.mix* }
-# end of accel.element
-accel.attlist &= common.attrib, accel.role.attrib, local.accel.attrib
-# end of accel.attlist
-
-# end of accel.module
-local.action.attrib = empty
-action.role.attrib = role.attrib
-action = element action { action.attlist, cptr.char.mix* }
-# end of action.element
-action.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  action.role.attrib,
-  local.action.attrib
-# end of action.attlist
-
-# end of action.module
-local.application.attrib = empty
-application.role.attrib = role.attrib
-application =
-  element application { application.attlist, para.char.mix* }
-# end of application.element
-application.attlist &=
-  attribute class { "hardware" | "software" }?,
-  moreinfo.attrib,
-  common.attrib,
-  application.role.attrib,
-  local.application.attrib
-# end of application.attlist
-
-# end of application.module
-local.classname.attrib = empty
-classname.role.attrib = role.attrib
-classname = element classname { classname.attlist, smallcptr.char.mix* }
-# end of classname.element
-classname.attlist &=
-  common.attrib, classname.role.attrib, local.classname.attrib
-# end of classname.attlist
-
-# end of classname.module
-local.co.attrib = empty
-# CO is a callout area of the LineColumn unit type (a single character
-# position); the position is directly indicated by the location of CO.
-co.role.attrib = role.attrib
-co = element co { co.attlist, empty }
-# end of co.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-co.attlist &=
-  label.attrib,
-  linkends.attrib,
-  idreq.common.attrib,
-  co.role.attrib,
-  local.co.attrib
-# end of co.attlist
-
-# end of co.module
-local.coref.attrib = empty
-# COREF is a reference to a CO
-coref.role.attrib = role.attrib
-coref = element coref { coref.attlist, empty }
-# end of coref.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-coref.attlist &=
-  label.attrib,
-  linkendreq.attrib,
-  common.attrib,
-  coref.role.attrib,
-  local.coref.attrib
-# end of coref.attlist
-
-# end of coref.module
-local.command.attrib = empty
-command.role.attrib = role.attrib
-command = element command { command.attlist, cptr.char.mix* }
-# end of command.element
-command.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  command.role.attrib,
-  local.command.attrib
-# end of command.attlist
-
-# end of command.module
-local.computeroutput.attrib = empty
-computeroutput.role.attrib = role.attrib
-computeroutput =
-  element computeroutput {
-    computeroutput.attlist, (cptr.char.mix | co)*
-  }
-# end of computeroutput.element
-computeroutput.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  computeroutput.role.attrib,
-  local.computeroutput.attrib
-# end of computeroutput.attlist
-
-# end of computeroutput.module
-local.database.attrib = empty
-database.role.attrib = role.attrib
-database = element database { database.attlist, cptr.char.mix* }
-# end of database.element
-
-# Class: Type of database the element names; no default
-database.attlist &=
-  attribute class {
-    "name" | "table" | "field" | "key1" | "key2" | "record"
-  }?,
-  moreinfo.attrib,
-  common.attrib,
-  database.role.attrib,
-  local.database.attrib
-# end of database.attlist
-
-# end of database.module
-local.email.attrib = empty
-email.role.attrib = role.attrib
-email = element email { email.attlist, docinfo.char.mix* }
-# end of email.element
-email.attlist &= common.attrib, email.role.attrib, local.email.attrib
-# end of email.attlist
-
-# end of email.module
-local.envar.attrib = empty
-envar.role.attrib = role.attrib
-envar = element envar { envar.attlist, smallcptr.char.mix* }
-# end of envar.element
-envar.attlist &= common.attrib, envar.role.attrib, local.envar.attrib
-# end of envar.attlist
-
-# end of envar.module
-local.errorcode.attrib = empty
-errorcode.role.attrib = role.attrib
-errorcode = element errorcode { errorcode.attlist, smallcptr.char.mix* }
-# end of errorcode.element
-errorcode.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  errorcode.role.attrib,
-  local.errorcode.attrib
-# end of errorcode.attlist
-
-# end of errorcode.module
-local.errorname.attrib = empty
-errorname.role.attrib = role.attrib
-errorname = element errorname { errorname.attlist, smallcptr.char.mix* }
-# end of errorname.element
-errorname.attlist &=
-  common.attrib, errorname.role.attrib, local.errorname.attrib
-# end of errorname.attlist
-
-# end of errorname.module
-local.errortext.attrib = empty
-errortext.role.attrib = role.attrib
-errortext = element errortext { errortext.attlist, smallcptr.char.mix* }
-# end of errortext.element
-errortext.attlist &=
-  common.attrib, errortext.role.attrib, local.errortext.attrib
-# end of errortext.attlist
-
-# end of errortext.module
-local.errortype.attrib = empty
-errortype.role.attrib = role.attrib
-errortype = element errortype { errortype.attlist, smallcptr.char.mix* }
-# end of errortype.element
-errortype.attlist &=
-  common.attrib, errortype.role.attrib, local.errortype.attrib
-# end of errortype.attlist
-
-# end of errortype.module
-local.filename.attrib = empty
-filename.role.attrib = role.attrib
-filename = element filename { filename.attlist, cptr.char.mix* }
-# end of filename.element
-
-# Class: Type of filename the element names; no default
-
-# Path: Search path (possibly system-specific) in which
-# file can be found
-filename.attlist &=
-  attribute class {
-    "headerfile"
-    | "partition"
-    | "devicefile"
-    | "libraryfile"
-    | "directory"
-    | "extension"
-    | "symlink"
-  }?,
-  attribute path { text }?,
-  moreinfo.attrib,
-  common.attrib,
-  filename.role.attrib,
-  local.filename.attrib
-# end of filename.attlist
-
-# end of filename.module
-local.function.attrib = empty
-function.role.attrib = role.attrib
-function = element function { function.attlist, cptr.char.mix* }
-# end of function.element
-function.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  function.role.attrib,
-  local.function.attrib
-# end of function.attlist
-
-# end of function.module
-local.guibutton.attrib = empty
-guibutton.role.attrib = role.attrib
-guibutton =
-  element guibutton { guibutton.attlist, (smallcptr.char.mix | accel)* }
-# end of guibutton.element
-guibutton.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guibutton.role.attrib,
-  local.guibutton.attrib
-# end of guibutton.attlist
-
-# end of guibutton.module
-local.guiicon.attrib = empty
-guiicon.role.attrib = role.attrib
-guiicon =
-  element guiicon { guiicon.attlist, (smallcptr.char.mix | accel)* }
-# end of guiicon.element
-guiicon.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guiicon.role.attrib,
-  local.guiicon.attrib
-# end of guiicon.attlist
-
-# end of guiicon.module
-local.guilabel.attrib = empty
-guilabel.role.attrib = role.attrib
-guilabel =
-  element guilabel { guilabel.attlist, (smallcptr.char.mix | accel)* }
-# end of guilabel.element
-guilabel.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guilabel.role.attrib,
-  local.guilabel.attrib
-# end of guilabel.attlist
-
-# end of guilabel.module
-local.guimenu.attrib = empty
-guimenu.role.attrib = role.attrib
-guimenu =
-  element guimenu { guimenu.attlist, (smallcptr.char.mix | accel)* }
-# end of guimenu.element
-guimenu.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guimenu.role.attrib,
-  local.guimenu.attrib
-# end of guimenu.attlist
-
-# end of guimenu.module
-local.guimenuitem.attrib = empty
-guimenuitem.role.attrib = role.attrib
-guimenuitem =
-  element guimenuitem {
-    guimenuitem.attlist, (smallcptr.char.mix | accel)*
-  }
-# end of guimenuitem.element
-guimenuitem.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guimenuitem.role.attrib,
-  local.guimenuitem.attrib
-# end of guimenuitem.attlist
-
-# end of guimenuitem.module
-local.guisubmenu.attrib = empty
-guisubmenu.role.attrib = role.attrib
-guisubmenu =
-  element guisubmenu {
-    guisubmenu.attlist, (smallcptr.char.mix | accel)*
-  }
-# end of guisubmenu.element
-guisubmenu.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guisubmenu.role.attrib,
-  local.guisubmenu.attrib
-# end of guisubmenu.attlist
-
-# end of guisubmenu.module
-local.hardware.attrib = empty
-hardware.role.attrib = role.attrib
-hardware = element hardware { hardware.attlist, cptr.char.mix* }
-# end of hardware.element
-hardware.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  hardware.role.attrib,
-  local.hardware.attrib
-# end of hardware.attlist
-
-# end of hardware.module
-local.interface.attrib = empty
-interface.role.attrib = role.attrib
-interface =
-  element interface { interface.attlist, (smallcptr.char.mix | accel)* }
-# end of interface.element
-
-# Class: Type of the Interface item; no default
-interface.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  interface.role.attrib,
-  local.interface.attrib
-# end of interface.attlist
-
-# end of interface.module
-local.keycap.attrib = empty
-keycap.role.attrib = role.attrib
-keycap = element keycap { keycap.attlist, cptr.char.mix* }
-# end of keycap.element
-keycap.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  keycap.role.attrib,
-  local.keycap.attrib
-# end of keycap.attlist
-
-# end of keycap.module
-local.keycode.attrib = empty
-keycode.role.attrib = role.attrib
-keycode = element keycode { keycode.attlist, smallcptr.char.mix* }
-# end of keycode.element
-keycode.attlist &=
-  common.attrib, keycode.role.attrib, local.keycode.attrib
-# end of keycode.attlist
-
-# end of keycode.module
-local.keycombo.attrib = empty
-keycombo.role.attrib = role.attrib
-keycombo =
-  element keycombo {
-    keycombo.attlist, (keycap | keycombo | keysym | mousebutton)+
-  }
-# end of keycombo.element
-keycombo.attlist &=
-  keyaction.attrib,
-  moreinfo.attrib,
-  common.attrib,
-  keycombo.role.attrib,
-  local.keycombo.attrib
-# end of keycombo.attlist
-
-# end of keycombo.module
-local.keysym.attrib = empty
-keysysm.role.attrib = role.attrib
-keysym = element keysym { keysym.attlist, smallcptr.char.mix* }
-# end of keysym.element
-keysym.attlist &=
-  common.attrib, keysysm.role.attrib, local.keysym.attrib
-# end of keysym.attlist
-
-# end of keysym.module
-local.lineannotation.attrib = empty
-lineannotation.role.attrib = role.attrib
-lineannotation =
-  element lineannotation { lineannotation.attlist, para.char.mix* }
-# end of lineannotation.element
-lineannotation.attlist &=
-  common.attrib, lineannotation.role.attrib, local.lineannotation.attrib
-# end of lineannotation.attlist
-
-# end of lineannotation.module
-local.literal.attrib = empty
-literal.role.attrib = role.attrib
-literal = element literal { literal.attlist, cptr.char.mix* }
-# end of literal.element
-literal.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  literal.role.attrib,
-  local.literal.attrib
-# end of literal.attlist
-
-# end of literal.module
-local.constant.attrib = empty
-constant.role.attrib = role.attrib
-constant = element constant { constant.attlist, smallcptr.char.mix* }
-# end of constant.element
-constant.attlist &=
-  attribute class { "limit" }?,
-  common.attrib,
-  constant.role.attrib,
-  local.constant.attrib
-# end of constant.attlist
-
-# end of constant.module
-local.varname.attrib = empty
-varname.role.attrib = role.attrib
-varname = element varname { varname.attlist, smallcptr.char.mix* }
-# end of varname.element
-varname.attlist &=
-  common.attrib, varname.role.attrib, local.varname.attrib
-# end of varname.attlist
-
-# end of varname.module
-local.markup.attrib = empty
-markup.role.attrib = role.attrib
-markup = element markup { markup.attlist, smallcptr.char.mix* }
-# end of markup.element
-markup.attlist &= common.attrib, markup.role.attrib, local.markup.attrib
-# end of markup.attlist
-
-# end of markup.module
-local.medialabel.attrib = empty
-medialabel.role.attrib = role.attrib
-medialabel =
-  element medialabel { medialabel.attlist, smallcptr.char.mix* }
-# end of medialabel.element
-
-# Class: Type of medium named by the element; no default
-medialabel.attlist &=
-  attribute class { "cartridge" | "cdrom" | "disk" | "tape" }?,
-  common.attrib,
-  medialabel.role.attrib,
-  local.medialabel.attrib
-# end of medialabel.attlist
-
-# end of medialabel.module
-local.menuchoice.attrib = empty
-menuchoice.role.attrib = role.attrib
-menuchoice =
-  element menuchoice {
-    menuchoice.attlist,
-    shortcut?,
-    (guibutton
-     | guiicon
-     | guilabel
-     | guimenu
-     | guimenuitem
-     | guisubmenu
-     | interface)+
-  }
-# end of menuchoice.element
-menuchoice.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  menuchoice.role.attrib,
-  local.menuchoice.attrib
-# end of menuchoice.attlist
-
-# end of menuchoice.module
-
-# See also KeyCombo
-local.shortcut.attrib = empty
-shortcut.role.attrib = role.attrib
-shortcut =
-  element shortcut {
-    shortcut.attlist, (keycap | keycombo | keysym | mousebutton)+
-  }
-# end of shortcut.element
-shortcut.attlist &=
-  keyaction.attrib,
-  moreinfo.attrib,
-  common.attrib,
-  shortcut.role.attrib,
-  local.shortcut.attrib
-# end of shortcut.attlist
-
-# end of shortcut.module
-
-# end of menuchoice.content.module
-local.mousebutton.attrib = empty
-mousebutton.role.attrib = role.attrib
-mousebutton =
-  element mousebutton { mousebutton.attlist, smallcptr.char.mix* }
-# end of mousebutton.element
-mousebutton.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  mousebutton.role.attrib,
-  local.mousebutton.attrib
-# end of mousebutton.attlist
-
-# end of mousebutton.module
-local.msgtext.attrib = empty
-msgtext.role.attrib = role.attrib
-msgtext = element msgtext { msgtext.attlist, component.mix+ }
-# end of msgtext.element
-msgtext.attlist &=
-  common.attrib, msgtext.role.attrib, local.msgtext.attrib
-# end of msgtext.attlist
-
-# end of msgtext.module
-local.option.attrib = empty
-option.role.attrib = role.attrib
-option = element option { option.attlist, cptr.char.mix* }
-# end of option.element
-option.attlist &= common.attrib, option.role.attrib, local.option.attrib
-# end of option.attlist
-
-# end of option.module
-local.optional.attrib = empty
-optional.role.attrib = role.attrib
-optional = element optional { optional.attlist, cptr.char.mix* }
-# end of optional.element
-optional.attlist &=
-  common.attrib, optional.role.attrib, local.optional.attrib
-# end of optional.attlist
-
-# end of optional.module
-local.parameter.attrib = empty
-parameter.role.attrib = role.attrib
-parameter = element parameter { parameter.attlist, cptr.char.mix* }
-# end of parameter.element
-
-# Class: Type of the Parameter; no default
-parameter.attlist &=
-  attribute class { "command" | "function" | "option" }?,
-  moreinfo.attrib,
-  common.attrib,
-  parameter.role.attrib,
-  local.parameter.attrib
-# end of parameter.attlist
-
-# end of parameter.module
-local.prompt.attrib = empty
-prompt.role.attrib = role.attrib
-prompt = element prompt { prompt.attlist, (smallcptr.char.mix | co)* }
-# end of prompt.element
-prompt.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  prompt.role.attrib,
-  local.prompt.attrib
-# end of prompt.attlist
-
-# end of prompt.module
-local.property.attrib = empty
-property.role.attrib = role.attrib
-property = element property { property.attlist, cptr.char.mix* }
-# end of property.element
-property.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  property.role.attrib,
-  local.property.attrib
-# end of property.attlist
-
-# end of property.module
-local.replaceable.attrib = empty
-replaceable.role.attrib = role.attrib
-replaceable =
-  element replaceable {
-    replaceable.attlist,
-    (text
-     | link.char.class
-     | optional
-     | base.char.class
-     | other.char.class
-     | inlinegraphic
-     | inlinemediaobject
-     | co)*
-  }
-# end of replaceable.element
-
-# Class: Type of information the element represents; no
-# default
-replaceable.attlist &=
-  attribute class { "command" | "function" | "option" | "parameter" }?,
-  common.attrib,
-  replaceable.role.attrib,
-  local.replaceable.attrib
-# end of replaceable.attlist
-
-# end of replaceable.module
-local.returnvalue.attrib = empty
-returnvalue.role.attrib = role.attrib
-returnvalue =
-  element returnvalue { returnvalue.attlist, smallcptr.char.mix* }
-# end of returnvalue.element
-returnvalue.attlist &=
-  common.attrib, returnvalue.role.attrib, local.returnvalue.attrib
-# end of returnvalue.attlist
-
-# end of returnvalue.module
-local.sgmltag.attrib = empty
-sgmltag.role.attrib = role.attrib
-sgmltag = element sgmltag { sgmltag.attlist, smallcptr.char.mix* }
-# end of sgmltag.element
-
-# Class: Type of SGML construct the element names; no default
-sgmltag.attlist &=
-  attribute class {
-    "attribute"
-    | "attvalue"
-    | "element"
-    | "endtag"
-    | "emptytag"
-    | "genentity"
-    | "numcharref"
-    | "paramentity"
-    | "pi"
-    | "xmlpi"
-    | "starttag"
-    | "sgmlcomment"
-  }?,
-  common.attrib,
-  sgmltag.role.attrib,
-  local.sgmltag.attrib
-# end of sgmltag.attlist
-
-# end of sgmltag.module
-local.structfield.attrib = empty
-structfield.role.attrib = role.attrib
-structfield =
-  element structfield { structfield.attlist, smallcptr.char.mix* }
-# end of structfield.element
-structfield.attlist &=
-  common.attrib, structfield.role.attrib, local.structfield.attrib
-# end of structfield.attlist
-
-# end of structfield.module
-local.structname.attrib = empty
-structname.role.attrib = role.attrib
-structname =
-  element structname { structname.attlist, smallcptr.char.mix* }
-# end of structname.element
-structname.attlist &=
-  common.attrib, structname.role.attrib, local.structname.attrib
-# end of structname.attlist
-
-# end of structname.module
-local.symbol.attrib = empty
-symbol.role.attrib = role.attrib
-symbol = element symbol { symbol.attlist, smallcptr.char.mix* }
-# end of symbol.element
-
-# Class: Type of symbol; no default
-symbol.attlist &=
-  attribute class { "limit" }?,
-  common.attrib,
-  symbol.role.attrib,
-  local.symbol.attrib
-# end of symbol.attlist
-
-# end of symbol.module
-local.systemitem.attrib = empty
-systemitem.role.attrib = role.attrib
-systemitem =
-  element systemitem {
-    systemitem.attlist, (cptr.char.mix | acronym | co)*
-  }
-# end of systemitem.element
-
-# Class: Type of system item the element names; no default
-systemitem.attlist &=
-  attribute class {
-    "constant"
-    | "event"
-    | "eventhandler"
-    | "domainname"
-    | "fqdomainname"
-    | "ipaddress"
-    | "netmask"
-    | "etheraddress"
-    | "groupname"
-    | "library"
-    | "macro"
-    | "osname"
-    | "filesystem"
-    | "resource"
-    | "systemname"
-    | "username"
-    | "newsgroup"
-  }?,
-  moreinfo.attrib,
-  common.attrib,
-  systemitem.role.attrib,
-  local.systemitem.attrib
-# end of systemitem.attlist
-
-# end of systemitem.module
-local.token.attrib = empty
-token.role.attrib = role.attrib
-\token = element token { token.attlist, smallcptr.char.mix* }
-# end of token.element
-token.attlist &= common.attrib, token.role.attrib, local.token.attrib
-# end of token.attlist
-
-# end of token.module
-local.type.attrib = empty
-type.role.attrib = role.attrib
-type = element type { type.attlist, smallcptr.char.mix* }
-# end of type.element
-type.attlist &= common.attrib, type.role.attrib, local.type.attrib
-# end of type.attlist
-
-# end of type.module
-local.userinput.attrib = empty
-userinput.role.attrib = role.attrib
-userinput =
-  element userinput { userinput.attlist, (cptr.char.mix | co)* }
-# end of userinput.element
-userinput.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  userinput.role.attrib,
-  local.userinput.attrib
-# end of userinput.attlist
-
-# end of userinput.module
-
-# General words and phrases ............................................
-local.abbrev.attrib = empty
-abbrev.role.attrib = role.attrib
-abbrev = element abbrev { abbrev.attlist, word.char.mix* }
-# end of abbrev.element
-abbrev.attlist &= common.attrib, abbrev.role.attrib, local.abbrev.attrib
-# end of abbrev.attlist
-
-# end of abbrev.module
-local.acronym.attrib = empty
-acronym.role.attrib = role.attrib
-acronym = element acronym { acronym.attlist, word.char.mix* }
-# end of acronym.element
-acronym.attlist &=
-  common.attrib, acronym.role.attrib, local.acronym.attrib
-# end of acronym.attlist
-
-# end of acronym.module
-local.citation.attrib = empty
-citation.role.attrib = role.attrib
-citation = element citation { citation.attlist, para.char.mix* }
-# end of citation.element
-citation.attlist &=
-  common.attrib, citation.role.attrib, local.citation.attrib
-# end of citation.attlist
-
-# end of citation.module
-local.citerefentry.attrib = empty
-citerefentry.role.attrib = role.attrib
-citerefentry =
-  element citerefentry {
-    citerefentry.attlist, refentrytitle, manvolnum?
-  }
-# end of citerefentry.element
-citerefentry.attlist &=
-  common.attrib, citerefentry.role.attrib, local.citerefentry.attrib
-# end of citerefentry.attlist
-
-# end of citerefentry.module
-local.refentrytitle.attrib = empty
-refentrytitle.role.attrib = role.attrib
-refentrytitle =
-  element refentrytitle { refentrytitle.attlist, para.char.mix* }
-# end of refentrytitle.element
-refentrytitle.attlist &=
-  common.attrib, refentrytitle.role.attrib, local.refentrytitle.attrib
-# end of refentrytitle.attlist
-
-# end of refentrytitle.module
-local.manvolnum.attrib = empty
-namvolnum.role.attrib = role.attrib
-manvolnum = element manvolnum { manvolnum.attlist, word.char.mix* }
-# end of manvolnum.element
-manvolnum.attlist &=
-  common.attrib, namvolnum.role.attrib, local.manvolnum.attrib
-# end of manvolnum.attlist
-
-# end of manvolnum.module
-local.citetitle.attrib = empty
-citetitle.role.attrib = role.attrib
-citetitle = element citetitle { citetitle.attlist, para.char.mix* }
-# end of citetitle.element
-
-# Pubwork: Genre of published work cited; no default
-citetitle.attlist &=
-  attribute pubwork {
-    "article"
-    | "book"
-    | "chapter"
-    | "part"
-    | "refentry"
-    | "section"
-    | "journal"
-    | "series"
-    | "set"
-    | "manuscript"
-  }?,
-  common.attrib,
-  citetitle.role.attrib,
-  local.citetitle.attrib
-# end of citetitle.attlist
-
-# end of citetitle.module
-local.emphasis.attrib = empty
-emphasis.role.attrib = role.attrib
-emphasis = element emphasis { emphasis.attlist, para.char.mix* }
-# end of emphasis.element
-emphasis.attlist &=
-  common.attrib, emphasis.role.attrib, local.emphasis.attrib
-# end of emphasis.attlist
-
-# end of emphasis.module
-local.firstterm.attrib = empty
-firstterm.role.attrib = role.attrib
-firstterm = element firstterm { firstterm.attlist, word.char.mix* }
-# end of firstterm.element
-
-# to GlossEntry or other explanation
-firstterm.attlist &=
-  linkend.attrib,
-  common.attrib,
-  firstterm.role.attrib,
-  local.firstterm.attrib
-# end of firstterm.attlist
-
-# end of firstterm.module
-local.foreignphrase.attrib = empty
-foreignphrase.role.attrib = role.attrib
-foreignphrase =
-  element foreignphrase { foreignphrase.attlist, para.char.mix* }
-# end of foreignphrase.element
-foreignphrase.attlist &=
-  common.attrib, foreignphrase.role.attrib, local.foreignphrase.attrib
-# end of foreignphrase.attlist
-
-# end of foreignphrase.module
-local.glossterm.attrib = empty
-glossterm.role.attrib = role.attrib
-glossterm = element glossterm { glossterm.attlist, para.char.mix* }
-# end of glossterm.element
-
-# to GlossEntry if Glossterm used in text
-
-# BaseForm: Provides the form of GlossTerm to be used
-# for indexing
-glossterm.attlist &=
-  linkend.attrib,
-  attribute baseform { text }?,
-  common.attrib,
-  glossterm.role.attrib,
-  local.glossterm.attrib
-# end of glossterm.attlist
-
-# end of glossterm.module
-local.phrase.attrib = empty
-phrase.role.attrib = role.attrib
-phrase = element phrase { phrase.attlist, para.char.mix* }
-# end of phrase.element
-phrase.attlist &= common.attrib, phrase.role.attrib, local.phrase.attrib
-# end of phrase.attlist
-
-# end of phrase.module
-local.quote.attrib = empty
-quote.role.attrib = role.attrib
-quote = element quote { quote.attlist, para.char.mix* }
-# end of quote.element
-quote.attlist &= common.attrib, quote.role.attrib, local.quote.attrib
-# end of quote.attlist
-
-# end of quote.module
-local.ssscript.attrib = empty
-ssscript.role.attrib = role.attrib
-subscript =
-  element subscript {
-    subscript.attlist,
-    (text
-     | link.char.class
-     | emphasis
-     | replaceable
-     | symbol
-     | inlinegraphic
-     | inlinemediaobject
-     | base.char.class
-     | other.char.class)*
-  }
-# end of subscript.element
-subscript.attlist &=
-  common.attrib, ssscript.role.attrib, local.ssscript.attrib
-# end of subscript.attlist
-superscript =
-  element superscript {
-    superscript.attlist,
-    (text
-     | link.char.class
-     | emphasis
-     | replaceable
-     | symbol
-     | inlinegraphic
-     | inlinemediaobject
-     | base.char.class
-     | other.char.class)*
-  }
-# end of superscript.element
-superscript.attlist &=
-  common.attrib, ssscript.role.attrib, local.ssscript.attrib
-# end of superscript.attlist
-
-# end of ssscript.module
-local.trademark.attrib = empty
-trademark.role.attrib = role.attrib
-trademark =
-  element trademark {
-    trademark.attlist,
-    (text
-     | link.char.class
-     | tech.char.class
-     | base.char.class
-     | other.char.class
-     | inlinegraphic
-     | inlinemediaobject
-     | emphasis)*
-  }
-# end of trademark.element
-
-# Class: More precisely identifies the item the element names
-trademark.attlist &=
-  [ a:defaultValue = "trade" ]
-  attribute class { "service" | "trade" | "registered" | "copyright" }?,
-  common.attrib,
-  trademark.role.attrib,
-  local.trademark.attrib
-# end of trademark.attlist
-
-# end of trademark.module
-local.wordasword.attrib = empty
-wordasword.role.attrib = role.attrib
-wordasword = element wordasword { wordasword.attlist, word.char.mix* }
-# end of wordasword.element
-wordasword.attlist &=
-  common.attrib, wordasword.role.attrib, local.wordasword.attrib
-# end of wordasword.attlist
-
-# end of wordasword.module
-
-# Links and cross-references ...........................................
-local.link.attrib = empty
-link.role.attrib = role.attrib
-link = element link { link.attlist, para.char.mix* }
-# end of link.element
-
-# Endterm: ID of element containing text that is to be
-# fetched from elsewhere in the document to appear as
-# the content of this element
-
-# to linked-to object
-
-# Type: Freely assignable parameter
-link.attlist &=
-  attribute endterm { xsd:IDREF }?,
-  linkendreq.attrib,
-  attribute type { text }?,
-  common.attrib,
-  link.role.attrib,
-  local.link.attrib
-# end of link.attlist
-
-# end of link.module
-local.olink.attrib = empty
-olink.role.attrib = role.attrib
-olink = element olink { olink.attlist, para.char.mix* }
-# end of olink.element
-
-# TargetDocEnt: Name of an entity to be the target of the link
-
-# LinkMode: ID of a ModeSpec containing instructions for
-# operating on the entity named by TargetDocEnt
-
-# LocalInfo: Information that may be passed to ModeSpec
-
-# Type: Freely assignable parameter
-olink.attlist &=
-  attribute targetdocent { xsd:ENTITY }?,
-  attribute linkmode { xsd:IDREF }?,
-  attribute localinfo { text }?,
-  attribute type { text }?,
-  attribute targetdoc { text }?,
-  attribute targetptr { text }?,
-  common.attrib,
-  olink.role.attrib,
-  local.olink.attrib
-# end of olink.attlist
-
-# end of olink.module
-local.ulink.attrib = empty
-ulink.role.attrib = role.attrib
-ulink = element ulink { ulink.attlist, para.char.mix* }
-# end of ulink.element
-
-# URL: uniform resource locator; the target of the ULink
-
-# Type: Freely assignable parameter
-ulink.attlist &=
-  attribute url { text },
-  attribute type { text }?,
-  common.attrib,
-  ulink.role.attrib,
-  local.ulink.attrib
-# end of ulink.attlist
-
-# end of ulink.module
-local.footnoteref.attrib = empty
-footnoteref.role.attrib = role.attrib
-footnoteref = element footnoteref { footnoteref.attlist, empty }
-# end of footnoteref.element
-
-# to footnote content supplied elsewhere
-footnoteref.attlist &=
-  linkendreq.attrib,
-  label.attrib,
-  common.attrib,
-  footnoteref.role.attrib,
-  local.footnoteref.attrib
-# end of footnoteref.attlist
-
-# end of footnoteref.module
-local.xref.attrib = empty
-xref.role.attrib = role.attrib
-xref = element xref { xref.attlist, empty }
-# end of xref.element
-
-# Endterm: ID of element containing text that is to be
-# fetched from elsewhere in the document to appear as
-# the content of this element
-
-# to linked-to object
-xref.attlist &=
-  attribute endterm { xsd:IDREF }?,
-  linkendreq.attrib,
-  common.attrib,
-  xref.role.attrib,
-  local.xref.attrib
-# end of xref.attlist
-
-# end of xref.module
-
-# Ubiquitous elements ..................................................
-local.anchor.attrib = empty
-anchor.role.attrib = role.attrib
-anchor = element anchor { anchor.attlist, empty }
-# end of anchor.element
-
-# required
-
-# replaces Lang
-anchor.attlist &=
-  idreq.attrib,
-  pagenum.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  anchor.role.attrib,
-  local.anchor.attrib
-# end of anchor.attlist
-
-# end of anchor.module
-local.beginpage.attrib = empty
-beginpage.role.attrib = role.attrib
-beginpage = element beginpage { beginpage.attlist, empty }
-# end of beginpage.element
-
-# PageNum: Number of page that begins at this point
-beginpage.attlist &=
-  pagenum.attrib,
-  common.attrib,
-  beginpage.role.attrib,
-  local.beginpage.attrib
-# end of beginpage.attlist
-
-# end of beginpage.module
-
-# IndexTerms appear in the text flow for generating or linking an
-# index.
-local.indexterm.attrib = empty
-indexterm.role.attrib = role.attrib
-indexterm =
-  element indexterm {
-    indexterm.attlist,
-    primary?,
-    ((secondary,
-      ((tertiary, (see | seealso+)?)
-       | see
-       | seealso+)?)
-     | see
-     | seealso+)?
-  }
-# end of indexterm.element
-
-# Scope: Indicates which generated indices the IndexTerm
-# should appear in: Global (whole document set), Local (this
-# document only), or All (both)
-
-# Significance: Whether this IndexTerm is the most pertinent
-# of its series (Preferred) or not (Normal, the default)
-
-# Class: Indicates type of IndexTerm; default is Singular,
-# or EndOfRange if StartRef is supplied; StartOfRange value
-# must be supplied explicitly on starts of ranges
-
-# StartRef: ID of the IndexTerm that starts the indexing
-# range ended by this IndexTerm
-
-# Zone: IDs of the elements to which the IndexTerm applies,
-# and indicates that the IndexTerm applies to those entire
-# elements rather than the point at which the IndexTerm
-# occurs
-indexterm.attlist &=
-  pagenum.attrib,
-  attribute scope { "all" | "global" | "local" }?,
-  [ a:defaultValue = "normal" ]
-  attribute significance { "preferred" | "normal" }?,
-  attribute class { "singular" | "startofrange" | "endofrange" }?,
-  attribute startref { xsd:IDREF }?,
-  attribute zone { xsd:IDREFS }?,
-  common.attrib,
-  indexterm.role.attrib,
-  local.indexterm.attrib
-# end of indexterm.attlist
-
-# end of indexterm.module
-local.primsecter.attrib = empty
-primsecter.role.attrib = role.attrib
-primary = element primary { primary.attlist, ndxterm.char.mix* }
-# end of primary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-primary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of primary.attlist
-secondary = element secondary { secondary.attlist, ndxterm.char.mix* }
-# end of secondary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-secondary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of secondary.attlist
-tertiary = element tertiary { tertiary.attlist, ndxterm.char.mix* }
-# end of tertiary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-tertiary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of tertiary.attlist
-
-# end of primsecter.module
-local.seeseealso.attrib = empty
-seeseealso.role.attrib = role.attrib
-see = element see { see.attlist, ndxterm.char.mix* }
-# end of see.element
-see.attlist &=
-  common.attrib, seeseealso.role.attrib, local.seeseealso.attrib
-# end of see.attlist
-seealso = element seealso { seealso.attlist, ndxterm.char.mix* }
-# end of seealso.element
-seealso.attlist &=
-  common.attrib, seeseealso.role.attrib, local.seeseealso.attrib
-# end of seealso.attlist
-
-# end of seeseealso.module
-
-# end of indexterm.content.module
-
-# End of DocBook XML information pool module V4.2 ......................
-
-# ......................................................................
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbsoextbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbsoextbl.rnc
deleted file mode 100644
index a547586ca1..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbsoextbl.rnc
+++ /dev/null
@@ -1,30 +0,0 @@
-# Definitions specific to the OASIS XML Exchange Table Model.
-
-# Reference OASIS Exchange Table Model
-include "soextbl.rnc" {
-  # Override definition of start
-  start |= notAllowed
-  # Add common attributes and the Label attribute to Table and
-  # InformalTable.
-  bodyatt = common.attrib, label.attrib, tables.role.attrib
-  # Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry
-  tbl.tgroup.att = common.attrib
-  tbl.colspec.att = common.attrib
-  tbl.tbody.att = common.attrib
-  tbl.thead.att = common.attrib
-  tbl.row.att = common.attrib
-  tbl.entry.att = common.attrib
-  # Content model for Table.
-  tbl.table.mdl =
-    blockinfo?,
-    formalobject.title.content,
-    ndxterm.class*,
-    textobject*,
-    (graphic+ | mediaobject+ | tgroup+)
-  # Allow either objects or inlines; beware of REs between elements.
-  tbl.entry.mdl = (para.char.mix | tabentry.mix)*
-}
-
-common.table.attribs = bodyatt
-
-# end of table.module
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbstart.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbstart.rnc
deleted file mode 100644
index 284f9b5b5a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/dbstart.rnc
+++ /dev/null
@@ -1,23 +0,0 @@
-# This choice of root elements comes from the 1.0b1 RNG schema at
-# http://www.oasis-open.org/docbook/relaxng/1.0b1/index.shtml
-
-start = 
-  set
-  | setindex
-  | book
-  | part
-  | reference
-  | preface
-  | chapter
-  | appendix
-  | article
-  | bibliography
-  | glossary
-  | index
-  | refentry
-  | sect1
-  | sect2
-  | sect3
-  | sect4
-  | sect5
-  | section
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-dyntbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-dyntbl.rnc
deleted file mode 100644
index 9bb997ff73..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-dyntbl.rnc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Variant of docbook.rnc that allows the table model to be selected
-# dynamically based on the definitions of cals.table.module and
-# exchange.table.module.  See dbdyntbl.rnc.
-
-# Document (root) elements
-include "dbstart.rnc"
-
-# Notation declarations
-include "dbnotn.rnc"
-
-# Information pool
-include "dbpool.rnc"
-
-# Dynamic Table Model
-include "dbdyntbl.rnc"
-
-# Document hierarchy
-include "dbhier.rnc"
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-soextbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-soextbl.rnc
deleted file mode 100644
index 945a6219db..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook-soextbl.rnc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Variant of docbook.rnc that uses the OASIS XML Exchange Table Model
-# rather than the CALS Table Model.
-
-# Document (root) elements
-include "dbstart.rnc"
-
-# Notation declarations
-include "dbnotn.rnc"
-
-# Information pool
-include "dbpool.rnc"
-
-# OASIS XML Exchange Table Model
-include "dbsoextbl.rnc"
-
-# Document hierarchy
-include "dbhier.rnc"
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook.rnc
deleted file mode 100644
index d10f614b28..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/docbook.rnc
+++ /dev/null
@@ -1,48 +0,0 @@
-# Unofficial DocBook RELAX NG Compact Syntax schema
-
-# This file was generated automatically by Trang
-# (http://www.thaiopensource.com/relaxng/trang.html) from the DocBook
-# XML DTD V4.2 (http://www.oasis-open.org/docbook/xml/4.2/), then
-# changing the definition of start, changing the filenames,
-# editing the comments and adding includes of dbstart.rnc
-# and dbcalstbl.rnc.
-
-# The following copyright applies to the DocBook XML DTD V4.2.
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# Permission to use, copy, modify and distribute the DocBook XML DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# Document (root) elements
-include "dbstart.rnc"
-
-# Notation declarations
-include "dbnotn.rnc"
-
-# Information pool
-include "dbpool.rnc"
-
-# CALS Table Model
-include "dbcalstbl.rnc"
-
-# Document hierarchy
-include "dbhier.rnc"
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/locate.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/locate.rnc
deleted file mode 100644
index 89230adf9c..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/locate.rnc
+++ /dev/null
@@ -1,200 +0,0 @@
-default namespace this = "http://thaiopensource.com/ns/locating-rules/1.0"
-namespace local = ""
-
-start = locatingRules
-
-locatingRules =  element locatingRules { common, rule* }
-
-rule =
-  \include
-  # | group
-  | applyFollowingRules
-  | documentElement
-  # | doctypePublicId
-  | \namespace
-  | uri
-  | transformURI
-  # | typeIdProcessingInstruction
-  | \default
-  | typeId
-  # | typeIdBase
-  | extensionRule
- 
-## Group of rules. Useful with xml:base.
-group = element group { common, rule* }
-
-\include =
-  element include {
-    common,
-    attribute rules { xsd:anyURI }
-  }
-
-applyFollowingRules =
-  element applyFollowingRules {
-    common,
-    attribute ruleType {
-      "documentElement"
-      | "doctypePublicId"
-      | "namespace"
-      | "uri"
-      | "transformURI"
-      | "typeIdProcessingInstruction"
-      | "default"
-    }
-  }
-
-documentElement =
-  ## Matches if the prefix and/or local name of document element
-  ## match the values of the prefix and localName attributes.
-  element documentElement {
-    common,
-    nameAtts,
-    targetAtt
-  }
-
-## If there's no prefix attribute, then only the local name must match.
-## If there's no local name attribute, then only the prefix must match.
-nameAtts = (prefixAtt, localNameAtt?) | localNameAtt
-
-## prefix="" matches if the document element has no prefix.
-prefixAtt = attribute prefix { (xsd:NCName - "xmlns") | "" }
-localNameAtt = attribute localName { xsd:NCName - "xmlns" }
-
-doctypePublicId =
-  ## Matches if the document has a DOCTYPE declaration with a public
-  ## identifier that, after normalization, matches the value of the
-  ## publicId attribute.
-  element doctypePublicId {
-    common,
-    attribute publicId { publicIdValue },
-    targetAtt
-  }
-
-publicIdValue =
-  xsd:token {
-    ## Newline and tab are excluded, because pattern applies to
-    ## the post-normalization value.
-    pattern = "[\-'()+,./:=?;!*#@$_%a-zA-Z0-9 ]*"
-  }
-
-# This is separate from documentElement so it can be distinguished
-# by applyFollowingRules.
-\namespace =
-  ## Matches if the document element has a namespace URI equal to the value
-  ## of the ns attribute.  A document element with no namespace matches if
-  ## the value of the ns attribute is the empty string.
-  element namespace {
-    common,
-    attribute ns { xsd:string },
-    targetAtt
-  }
-
-uri =
-  ## Matches based on the URI of the document.
-  element uri {
-    common,
-    (resourceAtt | patternAtt),
-    targetAtt
-  }
-
-## Matches if it can be determined that the document resource is
-## the same resource as that identified by the value of the resource
-## attribute.  In determining this, the implementation should apply
-## the semantics of the URI scheme used by the URI.
-resourceAtt = attribute resource { xsd:anyURI }
-
-## Matches if the document's URI matches the pattern specified
-## by the pattern attribute.  A * in the path component matches
-## zero or more characters other than / (after resolving escapes).
-## If the pattern is a relative URI, it means that there must
-## be some URI such that when the pattern is resolved relative
-## to that URI, it matches the document's URI. Thus an empty
-## pattern will always match.
-patternAtt = attribute pattern { uriPattern }
-
-## A pattern for a URI. Same syntax as a URI, except that a * in
-## the path component has a special meaning.
-uriPattern = xsd:anyURI
-
-transformURI =
-  ## Generates a URI for the related resource by transforming
-  ## the URI of the document. Matches if the transformation
-  ## yields a valid URI that identifies an existing resource.
-  element transformURI {
-    common,
-    ## Semantics are the same as the pattern attribute of the uri element.
-    attribute fromPattern { uriPattern },
-    ## The result of the transformation is produced from the toPattern
-    ## by replacing each * by the string that matched the corresponding
-    ## * in the toPattern.  The toPattern is appended to the initial
-    ## part of the document's URI that was not explicitly matched
-    ## by fromPattern.
-    attribute toPattern { uriPattern }
-  }
-
-\default =
-  ## Always matches.
-  element default {
-    common,
-    targetAtt
-  }
-
-## A document can be mapped onto a URI either indirectly via a typeId
-## or directly.
-targetAtt = uriAtt | typeIdAtt
-
-## Specifies the URI of the related resource.
-## xml:base is used if it's relative.
-uriAtt = attribute uri { xsd:anyURI }
-
-## Specifies an identifier of the type of document. typeId and
-## typeIdBase rules will be used to map this to a URI.
-typeIdAtt = attribute typeId { typeIdValue }
-
-## A type identifier can be anything convenient (e.g. a public identifier,
-## a URL or just a string with no formal structure).  Whitespace is
-## normalized like a public identifier before comparing type identifiers
-## for equality.
-typeIdValue = xsd:token
-
-typeIdProcessingInstruction =
-  ## Matches if there's a processing instruction in the prolog
-  ## before any DOCTYPE declaration whose target is the value of
-  ## the target attribute.  The value of the processing instruction
-  ## is interpreted as a typeId, which will be mapped to a
-  ## URI as normal.
-  element typeIdProcessingInstruction {
-    common,
-    attribute target { xsd:NCName }
-  }
-
-typeId =
-  ## Maps a typeId onto a URI.
-  element typeId {
-    common,
-    attribute id { typeIdValue },
-    targetAtt
-  }
-
-typeIdBase =
-  ## Used to map a typeId onto a URI. First, any URI reserved characters
-  ## are URI encoded. If the append attribute is specified, it is appended.
-  ## This is then treated as a URI. If relative, it is resolved using
-  ## the applicable base URI as usual.  If the resulting URI identifies
-  ## an existing resource, then the typeId is mapped to this resource.
-  ## This is intended to be useful with file URIs.
-  element typeIdBase {
-    common,
-    attribute append { xsd:string }?
-  }
-
-extensionRule =
-  element * - this:* {
-    attribute * { text }*, (text|anyElement)*
-  }
-
-anyElement = element * { attribute * { text }*, (text|anyElement)* }
-
-common = 
-  # attribute xml:base { xsd:anyURI }?,
-  attribute * - (xml:base|this:*|local:*) { text }*
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/rdfxml.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/rdfxml.rnc
deleted file mode 100644
index 9730322cfd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/rdfxml.rnc
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# RELAX NG Compact Schema for RDF/XML Syntax
-#
-# This schema is for information only and NON-NORMATIVE
-#
-# It is based on one originally written by James Clark in
-# http://lists.w3.org/Archives/Public/www-rdf-comments/2001JulSep/0248.html
-# and updated with later changes.
-#
-
-namespace local = ""
-namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
-
-
-start = doc
-
-
-# I cannot seem to do this in RNGC so they are expanded in-line
-
-# coreSyntaxTerms = rdf:RDF | rdf:ID | rdf:about | rdf:parseType | rdf:resource | rdf:nodeID | rdf:datatype
-# syntaxTerms = coreSyntaxTerms | rdf:Description | rdf:li
-# oldTerms    = rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID
-# nodeElementURIs       = * - ( coreSyntaxTerms | rdf:li | oldTerms )
-# propertyElementURIs   = * - ( coreSyntaxTerms | rdf:Description | oldTerms )
-# propertyAttributeURIs = * - ( coreSyntaxTerms | rdf:Description | rdf:li | oldTerms )
-
-# Also needed to allow rdf:li on all property element productions
-# since we can't capture the rdf:li rewriting to rdf_<n> in relaxng
-
-# Need to add these explicitly
-xmllang = attribute xml:lang { text }
-xmlbase = attribute xml:base { text }
-# and to forbid every other xml:* attribute, element
-
-doc = 
-  RDF
-
-RDF =
-  element rdf:RDF { 
-     xmllang?, xmlbase?, nodeElementList
-}
-
-nodeElementList = 
-  nodeElement*
-
-  # Should be something like:
-  #  ws* , (  nodeElement , ws* )*
-  # but RELAXNG does this by default, ignoring whitespace separating tags.
-
-nodeElement =
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype | rdf:li |
-                rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID ) {
-      (idAttr | nodeIdAttr | aboutAttr )?, xmllang?, xmlbase?, propertyAttr*, propertyEltList
-  }
-
-  # It is not possible to say "and not things
-  # beginning with _ in the rdf: namespace" in RELAX NG.
-
-ws = 
-  " "
-
-  # Not used in this RELAX NG schema; but should be any legal XML
-  # whitespace defined by http://www.w3.org/TR/2000/REC-xml-20001006#NT-S
-
-
-propertyEltList = 
-  propertyElt*
-
-  # Should be something like:
-  #  ws* , ( propertyElt , ws* )*
-  # but RELAXNG does this by default, ignoring whitespace separating tags.
-
-propertyElt = 
-  resourcePropertyElt | 
-  literalPropertyElt | 
-  parseTypeLiteralPropertyElt |
-  parseTypeResourcePropertyElt |
-  parseTypeCollectionPropertyElt |
-  parseTypeOtherPropertyElt |
-  emptyPropertyElt
-
-resourcePropertyElt = 
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      idAttr?, xmllang?, xmlbase?, nodeElement
-  }
-
-literalPropertyElt =
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      (idAttr | datatypeAttr )?, xmllang?, xmlbase?, text 
-  }
-
-parseTypeLiteralPropertyElt = 
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      idAttr?, parseLiteral, xmllang?, xmlbase?, literal 
-  }
-
-parseTypeResourcePropertyElt = 
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      idAttr?, parseResource, xmllang?, xmlbase?, propertyEltList
-  }
-
-parseTypeCollectionPropertyElt = 
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      idAttr?, xmllang?, xmlbase?, parseCollection, nodeElementList
-  }
-
-parseTypeOtherPropertyElt = 
-  element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                rdf:resource | rdf:nodeID | rdf:datatype |
-                rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                xml:* ) {
-      idAttr?, xmllang?, xmlbase?, parseOther, any
-  }
-
-emptyPropertyElt =
-   element * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                 rdf:resource | rdf:nodeID | rdf:datatype |
-                 rdf:Description | rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID |
-                 xml:* ) {
-       idAttr?, (resourceAttr | nodeIdAttr)?, xmllang?, xmlbase?, propertyAttr*
-   }
-
-idAttr = 
-  attribute rdf:ID { 
-      IDsymbol 
-  }
-
-nodeIdAttr = 
-  attribute rdf:nodeID { 
-      IDsymbol 
-  }
-
-aboutAttr = 
-  attribute rdf:about { 
-      URI-reference 
-  }
-
-propertyAttr = 
-  attribute * - ( local:* | rdf:RDF | rdf:ID | rdf:about | rdf:parseType |
-                  rdf:resource | rdf:nodeID | rdf:datatype | rdf:li |
-                  rdf:Description | rdf:aboutEach |
-		  rdf:aboutEachPrefix | rdf:bagID |
-                  xml:* ) {
-      string
-  }
-
-resourceAttr = 
-  attribute rdf:resource {
-      URI-reference 
-  }
-
-datatypeAttr = 
-  attribute rdf:datatype {
-      URI-reference 
-  }
-
-parseLiteral = 
-  attribute rdf:parseType {
-      "Literal" 
-  }
-
-parseResource = 
-  attribute rdf:parseType {
-      "Resource"
-  }
-
-parseCollection = 
-  attribute rdf:parseType {
-      "Collection"
-  }
-
-parseOther = 
-  attribute rdf:parseType {
-      text
-  }
-
-URI-reference = 
-  string
-
-literal =
-  any
-
-IDsymbol = 
-  xsd:NMTOKEN
-
-any =
-  mixed { element * { attribute * { text }*, any }* }
-
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/relaxng.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/relaxng.rnc
deleted file mode 100644
index 08686ac559..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/relaxng.rnc
+++ /dev/null
@@ -1,63 +0,0 @@
-# RELAX NG XML syntax expressed in RELAX NG Compact syntax.
-
-default namespace rng = "http://relaxng.org/ns/structure/1.0"
-namespace local = ""
-datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
-
-start = pattern
-
-pattern =
-  element element { (nameQName | nameClass), (common & pattern+) }
-  | element attribute { (nameQName | nameClass), (common & pattern?) }
-  | element group|interleave|choice|optional
-            |zeroOrMore|oneOrMore|list|mixed { common & pattern+ }
-  | element ref|parentRef { nameNCName, common }
-  | element empty|notAllowed|text { common }
-  | element data { type, param*, (common & exceptPattern?) }
-  | element value { commonAttributes, type?, xsd:string }
-  | element externalRef { href, common }
-  | element grammar { common & grammarContent* }
-
-param = element param { commonAttributes, nameNCName, xsd:string }
-
-exceptPattern = element except { common & pattern+ }
-
-grammarContent = 
-  definition
-  | element div { common & grammarContent* }
-  | element include { href, (common & includeContent*) }
-
-includeContent =
-  definition
-  | element div { common & includeContent* }
-
-definition =
-  element start { combine?, (common & pattern+) }
-  | element define { nameNCName, combine?, (common & pattern+) }
-
-combine = attribute combine { "choice" | "interleave" }
-
-nameClass = 
-  element name { commonAttributes, xsd:QName }
-  | element anyName { common & exceptNameClass? }
-  | element nsName { common & exceptNameClass? }
-  | element choice { common & nameClass+ }
-
-exceptNameClass = element except { common & nameClass+ }
-
-nameQName = attribute name { xsd:QName }
-nameNCName = attribute name { xsd:NCName }
-href = attribute href { xsd:anyURI }
-type = attribute type { xsd:NCName }
-
-common = commonAttributes, foreignElement*
-
-commonAttributes = 
-  attribute ns { xsd:string }?,
-  attribute datatypeLibrary { xsd:anyURI }?,
-  foreignAttribute*
-
-foreignElement = element * - rng:* { (anyAttribute | text | anyElement)* }
-foreignAttribute = attribute * - (rng:*|local:*) { text }
-anyElement = element * { (anyAttribute | text | anyElement)* }
-anyAttribute = attribute * { text }
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/schemas.xml b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/schemas.xml
deleted file mode 100644
index e17b063f6f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/schemas.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
-
-  <uri pattern="*.xsl" typeId="XSLT"/>
-  <uri pattern="*.html" typeId="XHTML"/>
-  <uri pattern="*.rng" typeId="RELAX NG"/>
-  <uri pattern="*.rdf" typeId="RDF"/>
-  
-  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
-  <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
-  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
-  <namespace ns="http://relaxng.org/ns/structure/1.0" typeId="RELAX NG"/>
-  <namespace ns="http://thaiopensource.com/ns/locating-rules/1.0"
-	     uri="locate.rnc"/>
-
-  <documentElement localName="stylesheet" typeId="XSLT"/>
-  <documentElement prefix="xsl" localName="transform" typeId="XSLT"/>
-
-  <documentElement localName="html" typeId="XHTML"/>
-
-  <documentElement localName="grammar" typeId="RELAX NG"/>
-
-  <documentElement prefix="" localName="article" typeId="DocBook"/>
-  <documentElement prefix="" localName="book" typeId="DocBook"/>
-
-  <documentElement localName="RDF" typeId="RDF"/>
-  <documentElement prefix="rdf" typeId="RDF"/>
-  
-  <documentElement localName="locatingRules" uri="locate.rnc"/>
-
-  <typeId id="XSLT" uri="xslt.rnc"/>
-  <typeId id="RELAX NG" uri="relaxng.rnc"/>
-  <typeId id="XHTML" uri="xhtml.rnc"/>
-  <typeId id="DocBook" uri="docbook.rnc"/>
-  <typeId id="RDF" uri="rdfxml.rnc"/>
-</locatingRules>
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/soextbl.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/soextbl.rnc
deleted file mode 100644
index 2e69127b4a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/soextbl.rnc
+++ /dev/null
@@ -1,260 +0,0 @@
-# XML EXCHANGE TABLE MODEL DECLARATION MODULE
-
-# This set of declarations defines the XML version of the Exchange
-# Table Model as of the date shown in the Formal Public Identifier
-# (FPI) for this entity.
-# 
-# This set of declarations may be referred to using a public external
-# entity declaration and reference as shown in the following three
-# lines:
-# 
-# <!ENTITY % calstblx
-#   PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN">
-#   %calstblx;
-# 
-# If various parameter entities used within this set of declarations
-# are to be given non-default values, the appropriate declarations
-# should be given before calling in this package (i.e., before the
-# "%calstblx;" reference).
-
-# The motivation for this XML version of the Exchange Table Model
-# is simply to create an XML version of the SGML Exchange Table
-# Model. By design, no effort has been made to "improve" the model.
-# 
-# This XML version incorporates the logical bare minimum changes
-# necessary to make the Exchange Table Model a valid XML DTD.
-
-# The XML version of the Exchange Table Model differs from
-# the SGML version in the following ways:
-# 
-# The following parameter entities have been removed:
-# 
-#   - tbl.table.excep, tbl.hdft.excep, tbl.row.excep, tbl.entry.excep
-#     There are no exceptions in XML. The following normative statement
-#     is made in lieu of exceptions: the exchange table model explicitly
-#     forbids a table from occurring within another table. If the
-#     content model of an entry includes a table element, then this
-#     cannot be enforced by the DTD, but it is a deviation from the
-#     exchange table model to include a table within a table.
-# 
-#   - tbl.hdft.name, tbl.hdft.mdl, tbl.hdft.excep, tbl.hdft.att
-#     The motivation for these elements was to change the table
-#     header/footer elements. Since XML does not allow element declarations
-#     to contain name groups, and the exchange table model does not
-#     allow a table to contain footers, the continued presence of these
-#     attributes seems unnecessary.
-# 
-# The following parameter entity has been added:
-# 
-#   - tbl.thead.att
-#     This entity parameterizes the attributes on thead. It replaces
-#     the tbl.hdft.att parameter entity.
-# 
-# Other miscellaneous changes:
-# 
-#   - Tag ommission indicators have been removed
-#   - Comments have been removed from declarations
-#   - NUMBER attributes have been changed to NMTOKEN
-#   - NUTOKEN attributes have been to changed to NMTOKEN
-#   - Removed the grouping characters around the content model
-#     parameter entry for the 'entry' element. This is necessary
-#     so that an entry can contain #PCDATA and be defined as an
-#     optional, repeatable OR group beginning with #PCDATA.
-
-# This entity includes a set of element and attribute declarations
-# that partially defines the Exchange table model.  However, the model
-# is not well-defined without the accompanying natural language
-# description of the semantics (meanings) of these various elements,
-# attributes, and attribute values.  The semantic writeup, also available
-# from SGML Open, should be used in conjunction with this entity.
-
-# In order to use the Exchange table model, various parameter entity
-# declarations are required.  A brief description is as follows:
-# 
-# ENTITY NAME      WHERE USED              WHAT IT IS
-# 
-# %yesorno         In ATTLIST of:          An attribute declared value
-#                  almost all elements     for a "boolean" attribute
-# 
-# %paracon         In content model of:    The "text" (logical content)
-#                  <entry>                 of the model group for <entry>
-# 
-# %titles          In content model of:    The "title" part of the model
-#                  table element           group for the table element
-# 
-# %tbl.table.name  In declaration of:      The name of the "table"
-#                  table element           element
-# 
-# %tbl.table-titles.mdl In content model of: The model group for the title
-#                  table elements          part of the content model for
-#                                          table element
-# 
-# %tbl.table.mdl   In content model of:    The model group for the content
-#                  table elements          model for table element,
-#                                          often (and by default) defined
-#                                          in terms of %tbl.table-titles.mdl
-#                                          and tgroup
-# 
-# %tbl.table.att   In ATTLIST of:          Additional attributes on the
-#                  table element           table element
-# 
-# %bodyatt         In ATTLIST of:          Additional attributes on the
-#                  table element           table element (for backward
-#                                          compatibility with the SGML
-#                                          model)
-# 
-# %tbl.tgroup.mdl  In content model of:    The model group for the content
-#                  <tgroup>                model for <tgroup>
-# 
-# %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
-#                  <tgroup>                <tgroup> element
-# 
-# %tbl.thead.att   In ATTLIST of:          Additional attributes on the
-#                  <thead>                 <thead> element
-# 
-# %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
-#                  <tbody>                 <tbody> element
-# 
-# %tbl.colspec.att In ATTLIST of:          Additional attributes on the
-#                  <colspec>               <colspec> element
-# 
-# %tbl.row.mdl     In content model of:    The model group for the content
-#                  <row>                   model for <row>
-# 
-# %tbl.row.att     In ATTLIST of:          Additional attributes on the
-#                  <row>                   <row> element
-# 
-# %tbl.entry.mdl   In content model of:    The model group for the content
-#                  <entry>                 model for <entry>
-# 
-# %tbl.entry.att   In ATTLIST of:          Additional attributes on the
-#                  <entry>                 <entry> element
-# 
-# This set of declarations will use the default definitions shown below
-# for any of these parameter entities that are not declared before this
-# set of declarations is referenced.
-
-# These definitions are not directly related to the table model, but are
-# used in the default CALS table model and may be defined elsewhere (and
-# prior to the inclusion of this table module) in the referencing DTD.
-
-yesorno = xsd:NMTOKEN
-# no if zero(s), yes if any other value
-pcd = text
-paracon = pcd
-# default for use in entry content
-
-# The parameter entities as defined below change and simplify the CALS table
-# model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
-# resulting simplified DTD has support from the SGML Open vendors and is
-# therefore more interoperable among different systems.
-# 
-# These following declarations provide the Exchange default definitions
-# for these entities.  However, these entities can be redefined (by giving
-# the appropriate parameter entity declaration(s) prior to the reference
-# to this Table Model declaration set entity) to fit the needs of the
-# current application.
-# 
-# Note, however, that changes may have significant effect on the ability to
-# interchange table information.  These changes may manifest themselves
-# in useability, presentation, and possible structure information degradation.
-tbl.table-titles.mdl = title
-tbl.table-main.mdl = tgroup+
-tbl.table.mdl = tbl.table-titles.mdl | tbl.table-main.mdl
-tbl.table.att = attribute pgwide { yesorno }?
-bodyatt = empty
-tbl.tgroup.mdl = colspec*, thead?, tbody
-tbl.tgroup.att = empty
-tbl.thead.att = empty
-tbl.tbody.att = empty
-tbl.colspec.att = empty
-tbl.row.mdl = entry+
-tbl.row.att = empty
-tbl.entry.mdl = paracon*
-tbl.entry.att = empty
-# =====  Element and attribute declarations follow. =====
-
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.table.name       "table"
-# ENTITY % tbl.table-titles.mdl "%titles;,"
-# ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
-# ENTITY % tbl.table.att        "
-#                    pgwide          %yesorno;       #IMPLIED "
-table = element table { table.attlist, tbl.table.mdl }
-table.attlist &=
-  attribute frame {
-    "top" | "bottom" | "topbot" | "all" | "sides" | "none"
-  }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  tbl.table.att,
-  bodyatt
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
-# ENTITY % tbl.tgroup.att    ""
-tgroup = element tgroup { tgroup.attlist, tbl.tgroup.mdl }
-tgroup.attlist &=
-  attribute cols { xsd:NMTOKEN },
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  tbl.tgroup.att
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.colspec.att   ""
-colspec = element colspec { colspec.attlist, empty }
-colspec.attlist &=
-  attribute colnum { xsd:NMTOKEN }?,
-  attribute colname { xsd:NMTOKEN }?,
-  attribute colwidth { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { xsd:NMTOKEN }?,
-  tbl.colspec.att
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.thead.att      ""
-thead = element thead { thead.attlist, row+ }
-thead.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  tbl.thead.att
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.tbody.att     ""
-tbody = element tbody { tbody.attlist, row+ }
-tbody.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  tbl.tbody.att
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % tbl.row.mdl       "entry+"
-# ENTITY % tbl.row.att       ""
-row = element row { row.attlist, tbl.row.mdl }
-row.attlist &=
-  attribute rowsep { yesorno }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  tbl.row.att
-# Default declarations previously defined in this entity and
-# referenced below include:
-# ENTITY % paracon           "#PCDATA"
-# ENTITY % tbl.entry.mdl     "(%paracon;)*"
-# ENTITY % tbl.entry.att     ""
-entry = element entry { entry.attlist, tbl.entry.mdl }
-entry.attlist &=
-  attribute colname { xsd:NMTOKEN }?,
-  attribute namest { xsd:NMTOKEN }?,
-  attribute nameend { xsd:NMTOKEN }?,
-  attribute morerows { xsd:NMTOKEN }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { xsd:NMTOKEN }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  tbl.entry.att
-title |= notAllowed
-start = table
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-applet.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-applet.rnc
deleted file mode 100644
index 115f1cbda7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-applet.rnc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Applet Module
-
-applet =
-  element applet {
-    applet.attlist,
-    # No restrictions on mixed content in TREX.
-    param*,
-    Flow.model
-  }
-applet.attlist =
-  Core.attrib,
-  attribute alt { Text.datatype },
-  attribute archive { text }?,
-  attribute code { text }?,
-  attribute codebase { URI.datatype }?,
-  attribute object { text }?,
-  attribute height { Length.datatype },
-  attribute width { Length.datatype }
-Inline.class |= applet
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-attribs.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-attribs.rnc
deleted file mode 100644
index ef653c70db..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-attribs.rnc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Common Attributes Module
-
-id.attrib = attribute id { ID.datatype }?
-class.attrib = attribute class { NMTOKENS.datatype }?
-title.attrib = attribute title { Text.datatype }?
-Core.attrib = id.attrib, class.attrib, title.attrib
-lang.attrib = attribute xml:lang { LanguageCode.datatype }?
-I18n.attrib = lang.attrib
-Common.attrib = Core.attrib, I18n.attrib
-CommonIdRequired.attrib =
-  attribute id { ID.datatype },
-  class.attrib,
-  title.attrib,
-  I18n.attrib
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-base.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-base.rnc
deleted file mode 100644
index 154dfce1c5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-base.rnc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Base Module
-
-base = element base { base.attlist }
-base.attlist = attribute href { URI.datatype }
-head.content &= base?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-form.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-form.rnc
deleted file mode 100644
index 71440bc24d..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-form.rnc
+++ /dev/null
@@ -1,64 +0,0 @@
-# Simplified Forms Module
-
-form =
-  element form {
-    form.attlist,
-    # Don't use Block.model, because this gets redefined by the
-    # legacy module.
-    Block.class+
-  }
-form.attlist =
-  Common.attrib,
-  attribute action { URI.datatype },
-  attribute method { "get" | "post" }?,
-  attribute enctype { ContentType.datatype }?
-label = element label { label.attlist, Inline.model }
-label.attlist =
-  Common.attrib,
-  attribute for { IDREF.datatype }?,
-  attribute accesskey { Character.datatype }?
-input = element input { input.attlist }
-input.attlist =
-  Common.attrib,
-  attribute type { InputType.class }?,
-  attribute name { text }?,
-  attribute value { text }?,
-  attribute checked { "checked" }?,
-  attribute size { text }?,
-  attribute maxlength { Number.datatype }?,
-  attribute src { URI.datatype }?,
-  attribute accesskey { Character.datatype }?
-InputType.class =
-  "text"
-  | "password"
-  | "checkbox"
-  | "radio"
-  | "submit"
-  | "reset"
-  | "hidden"
-  | "file"
-select = element select { select.attlist, option+ }
-select.attlist =
-  Common.attrib,
-  attribute name { text }?,
-  attribute size { Number.datatype }?,
-  attribute multiple { "multiple" }?
-option =
-  element option {
-    Common.attrib,
-    attribute selected { "selected" }?,
-    attribute value { text }?,
-    text
-  }
-textarea = element textarea { textarea.attlist }
-textarea.attlist =
-  Common.attrib,
-  attribute name { text }?,
-  attribute rows { Number.datatype },
-  attribute cols { Number.datatype },
-  attribute accesskey { Character.datatype }?,
-  text
-Form.class = form
-Formctrl.class = input | label | select | textarea
-Block.class |= Form.class
-Inline.class |= Formctrl.class
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-table.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-table.rnc
deleted file mode 100644
index 97e10a5674..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-basic-table.rnc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Basic Tables Module
-
-table = element table { table.attlist, caption?, tr+ }
-table.attlist =
-  Common.attrib,
-  attribute summary { Text.datatype }?
-caption = element caption { caption.attlist, Inline.model }
-caption.attlist = Common.attrib
-tr = element tr { tr.attlist, (th | td)+ }
-tr.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib
-th = element th { th.attlist, Flow.model }
-th.attlist = Cell.attrib
-td = element td { td.attlist, Flow.model }
-td.attlist = Cell.attrib
-Cell.attrib =
-  Common.attrib,
-  attribute abbr { Text.datatype }?,
-  attribute axis { text }?,
-  attribute headers { IDREFS.datatype }?,
-  scope.attrib,
-  attribute rowspan { Number.datatype }?,
-  attribute colspan { Number.datatype }?,
-  CellHAlign.attrib,
-  CellVAlign.attrib
-CellHAlign.attrib = attribute align { "left" | "center" | "right" }?
-CellVAlign.attrib = attribute valign { "top" | "middle" | "bottom" }?
-scope.attrib = attribute scope { "row" | "col" }?
-Block.class |= table
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-bdo.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-bdo.rnc
deleted file mode 100644
index 5658be36ec..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-bdo.rnc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Bi-directional Module
-
-bdo = element bdo { bdo.attlist, Inline.model }
-bdo.attlist = Core.attrib, lang.attrib, dir.attrib
-dir.attrib = attribute dir { "ltr" | "rtl" }
-I18n.attrib &= dir.attrib?
-Inline.class |= bdo
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-csismap.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-csismap.rnc
deleted file mode 100644
index abd51f1a44..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-csismap.rnc
+++ /dev/null
@@ -1,29 +0,0 @@
-# Client-side Image Map Module
-
-area = element area { area.attlist }
-area.attlist =
-  Common.attrib,
-  attribute href { URI.datatype }?,
-  shape.attrib,
-  coords.attrib,
-  attribute nohref { "nohref" }?,
-  attribute alt { Text.datatype },
-  attribute tabindex { Number.datatype }?,
-  attribute accesskey { Character.datatype }?
-map =
-  element map {
-    map.attlist,
-    (# This does not use Block.mix
-     # because loose.dtd doesn't use %Flow;
-     Block.class
-     | area)+
-  }
-map.attlist = CommonIdRequired.attrib
-a.attlist &= shape.attrib, coords.attrib
-img.attlist &= usemap.attlist
-object.attlist &= usemap.attlist
-usemap.attlist = attribute usemap { IDREF.datatype }?
-shape.attrib =
-  attribute shape { "rect" | "circle" | "poly" | "default" }?
-coords.attrib = attribute coords { text }?
-Inline.class |= map
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-datatypes.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-datatypes.rnc
deleted file mode 100644
index 596598039d..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-datatypes.rnc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Datatypes Module
-
-# Length defined for cellpadding/cellspacing
-
-# nn for pixels or nn% for percentage length
-Length.datatype = text
-# space-separated list of link types
-LinkTypes.datatype = NMTOKENS.datatype
-# single or comma-separated list of media descriptors
-MediaDesc.datatype = text
-# pixel, percentage, or relative
-MultiLength.datatype = text
-# one or more digits (NUMBER)
-Number.datatype = text
-# integer representing length in pixels
-Pixels.datatype = text
-# script expression
-Script.datatype = text
-# textual content
-Text.datatype = text
-# Imported Datatypes ................................
-
-# a single character from [ISO10646]
-Character.datatype = text
-# a character encoding, as per [RFC2045]
-Charset.datatype = text
-# a space separated list of character encodings, as per [RFC2045]
-Charsets.datatype = text
-# media type, as per [RFC2045]
-ContentType.datatype = text
-# comma-separated list of media types, as per [RFC2045]
-ContentTypes.datatype = text
-# date and time information. ISO date format
-Datetime.datatype = text
-# formal public identifier, as per [ISO8879]
-FPI.datatype = text
-# a language code, as per [RFC1766]
-LanguageCode.datatype = xsd:language
-# a Uniform Resource Identifier, see [URI]
-URI.datatype = xsd:anyURI
-# a space-separated list of Uniform Resource Identifiers, see [URI]
-URIs.datatype = text
-NMTOKEN.datatype = xsd:NMTOKEN
-NMTOKENS.datatype = xsd:NMTOKENS
-ID.datatype = xsd:ID
-IDREF.datatype = xsd:IDREF
-IDREFS.datatype = xsd:IDREFS
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-edit.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-edit.rnc
deleted file mode 100644
index 4301fc27f7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-edit.rnc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Edit Module
-
-del = element del { del.attlist, Inline.model }
-del.attlist = Edit.attrib
-ins = element ins { ins.attlist, Inline.model }
-ins.attlist = Edit.attrib
-Edit.attrib =
-  attribute cite { URI.datatype }?,
-  attribute datetime { Datetime.datatype }?
-Edit.class = del | ins
-Inline.class |= Edit.class
-Block.class |= Edit.class
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-events.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-events.rnc
deleted file mode 100644
index 536874201e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-events.rnc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Events Module
-
-a.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onfocus { Script.datatype }?
-area.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onfocus { Script.datatype }?
-form.attlist &=
-  attribute onreset { Script.datatype }?,
-  attribute onsubmit { Script.datatype }?
-body.attlist &=
-  attribute onload { Script.datatype }?,
-  attribute onunload { Script.datatype }?
-label.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onfocus { Script.datatype }?
-input.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onchange { Script.datatype }?,
-  attribute onfocus { Script.datatype }?,
-  attribute onselect { Script.datatype }?
-select.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onchange { Script.datatype }?,
-  attribute onfocus { Script.datatype }?
-textarea.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onchange { Script.datatype }?,
-  attribute onfocus { Script.datatype }?,
-  attribute onselect { Script.datatype }?
-button.attlist &=
-  attribute onblur { Script.datatype }?,
-  attribute onfocus { Script.datatype }?
-Events.attrib =
-  attribute onclick { Script.datatype }?,
-  attribute ondblclick { Script.datatype }?,
-  attribute onmousedown { Script.datatype }?,
-  attribute onmouseup { Script.datatype }?,
-  attribute onmouseover { Script.datatype }?,
-  attribute onmousemove { Script.datatype }?,
-  attribute onmouseout { Script.datatype }?,
-  attribute onkeypress { Script.datatype }?,
-  attribute onkeydown { Script.datatype }?,
-  attribute onkeyup { Script.datatype }?
-Common.attrib &= Events.attrib
-CommonIdRequired.attrib &= Events.attrib
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-form.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-form.rnc
deleted file mode 100644
index f5544190b0..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-form.rnc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Forms Module
-
-# Unlike the DTD implementation, this builds on the basic-form module
-
-include "xhtml-basic-form.rnc" {
-  select = element select { select.attlist, (option | optgroup)+ }
-}
-form.attlist &=
-  attribute accept-charset { Charsets.datatype }?,
-  attribute accept { ContentTypes.datatype }?
-input.attlist &=
-  attribute disabled { "disabled" }?,
-  attribute readonly { "readonly" }?,
-  attribute alt { text }?,
-  attribute tabindex { Number.datatype }?,
-  attribute accept { ContentTypes.datatype }?
-InputType.class |= "image" | "button"
-select.attlist &=
-  attribute disabled { "disabled" }?,
-  attribute tabindex { Number.datatype }?
-option.attlist &=
-  attribute disabled { "disabled" }?,
-  attribute label { Text.datatype }?
-optgroup = element optgroup { optgroup.attlist, option+ }
-optgroup.attlist =
-  Common.attrib,
-  attribute disabled { "disabled" }?,
-  attribute label { Text.datatype }
-textarea.attlist &=
-  attribute disabled { "disabled" }?,
-  attribute readonly { "readonly" }?,
-  attribute tabindex { Number.datatype }?
-fieldset = element fieldset { fieldset.attlist, legend, Flow.model }
-fieldset.attlist = Common.attrib
-button = element button { button.attlist, Flow.model }
-button.attlist =
-  Common.attrib,
-  attribute name { text }?,
-  attribute value { text }?,
-  attribute type { "button" | "submit" | "reset" }?,
-  attribute disabled { "disabled" }?,
-  attribute tabindex { Number.datatype }?,
-  attribute accesskey { Character.datatype }?
-legend = element legend { legend.attlist, Inline.model }
-legend.attlist =
-  Common.attrib,
-  attribute accesskey { Character.datatype }?
-Form.class |= fieldset
-Formctrl.class |= button
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-frames.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-frames.rnc
deleted file mode 100644
index 9b9f9ba146..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-frames.rnc
+++ /dev/null
@@ -1,26 +0,0 @@
-# Frames Module
-
-include "xhtml-struct.rnc" {
-  html = element html { html.attlist, head, frameset }
-}
-frameset =
-  element frameset {
-    frameset.attlist,
-    ((frameset | frame)+ & noframes?)
-  }
-frameset.attlist =
-  Core.attrib,
-  attribute cols { MultiLength.datatype }?,
-  attribute rows { MultiLength.datatype }?
-frame = element frame { frame.attlist }
-frame.attlist =
-  Core.attrib,
-  attribute longdesc { URI.datatype }?,
-  attribute src { URI.datatype }?,
-  attribute frameborder { "1" | "0" }?,
-  attribute marginwidth { Pixels.datatype }?,
-  attribute marginheight { Pixels.datatype }?,
-  attribute noresize { "noresize" }?,
-  attribute scrolling { "yes" | "no" | "auto" }?
-noframes = element noframes { noframes.attlist, body }
-noframes.attlist = Common.attrib
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-hypertext.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-hypertext.rnc
deleted file mode 100644
index 82e7686d64..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-hypertext.rnc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Hypertext Module
-
-# Depends on text module.
-
-a = element a { a.attlist, Inline.model }
-a.attlist =
-  Common.attrib,
-  attribute href { URI.datatype }?,
-  attribute charset { Charset.datatype }?,
-  attribute type { ContentType.datatype }?,
-  attribute hreflang { LanguageCode.datatype }?,
-  attribute rel { LinkTypes.datatype }?,
-  attribute rev { LinkTypes.datatype }?,
-  attribute accesskey { Character.datatype }?,
-  attribute tabindex { Number.datatype }?
-Inline.class |= a
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-iframe.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-iframe.rnc
deleted file mode 100644
index bbcdd441bb..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-iframe.rnc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Iframe Module
-
-iframe = element iframe { iframe.attlist, Flow.model }
-iframe.attlist =
-  Core.attrib,
-  attribute longdesc { URI.datatype }?,
-  attribute src { URI.datatype }?,
-  attribute frameborder { "1" | "0" }?,
-  attribute width { Length.datatype }?,
-  attribute height { Length.datatype }?,
-  attribute marginwidth { Pixels.datatype }?,
-  attribute marginheight { Pixels.datatype }?,
-  attribute scrolling { "yes" | "no" | "auto" }?
-Inline.class |= iframe
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-image.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-image.rnc
deleted file mode 100644
index e1d6e5662f..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-image.rnc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Image Module
-
-img = element img { img.attlist }
-img.attlist =
-  Common.attrib,
-  attribute src { URI.datatype },
-  attribute alt { Text.datatype },
-  attribute longdesc { URI.datatype }?,
-  attribute height { Length.datatype }?,
-  attribute width { Length.datatype }?
-Inline.class |= img
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-inlstyle.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-inlstyle.rnc
deleted file mode 100644
index aa69b75ab6..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-inlstyle.rnc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Inline Style Module
-
-Core.attrib &= attribute style { text }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-legacy.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-legacy.rnc
deleted file mode 100644
index b15061f6d9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-legacy.rnc
+++ /dev/null
@@ -1,100 +0,0 @@
-# Legacy Module
-
-lang.attrib &= attribute lang { LanguageCode.datatype }?
-basefont = element basefont { basefont.attlist }
-basefont.attlist = id.attrib, Font.attrib
-center = element center { center.attlist, Flow.model }
-center.attlist = Common.attrib
-font = element font { font.attlist, Inline.model }
-font.attlist = Core.attrib, I18n.attrib, Font.attrib
-Font.attrib =
-  attribute size { text }?,
-  attribute color { Color.datatype }?,
-  attribute face { text }?
-s = element s { s.attlist, Inline.model }
-s.attlist = Common.attrib
-strike = element strike { strike.attlist, Inline.model }
-strike.attlist = Common.attrib
-u = element u { u.attlist, Inline.model }
-u.attlist = Common.attrib
-dir = element dir { dir.attlist, li.noblock+ }
-dir.attlist =
-  Common.attrib,
-  attribute compact { "compact" }?
-menu = element menu { menu.attlist, li.noblock+ }
-menu.attlist =
-  Common.attrib,
-  attribute compact { "compact" }?
-li.noblock = element li { li.attlist, Inline.model }
-isindex = element isindex { isindex.attlist }
-isindex.attlist =
-  Core.attrib,
-  I18n.attrib,
-  attribute prompt { Text.datatype }?
-applet.attlist &=
-  attribute align { "top" | "middle" | "bottom" | "left" | "right" }?,
-  attribute hspace { Pixels.datatype }?,
-  attribute vspace { Pixels.datatype }?
-body.attlist &=
-  attribute background { URI.datatype }?,
-  attribute bgcolor { Color.datatype }?,
-  attribute text { Color.datatype }?,
-  attribute link { Color.datatype }?,
-  attribute vlink { Color.datatype }?,
-  attribute alink { Color.datatype }?
-br.attlist &= attribute clear { "left" | "all" | "right" | "none" }?
-caption.attlist &= align.attrib
-div.attlist &= align.attrib
-# Not in the CR, but surely an error.
-dl.attlist &= attribute compact { "compact" }?
-Heading.attrib &= align.attrib
-hr.attlist &=
-  attribute align { "left" | "center" | "right" }?,
-  attribute noshade { "noshade" }?,
-  attribute size { Pixels.datatype }?,
-  attribute width { Pixels.datatype }?
-img.attlist &=
-  attribute align { "top" | "middle" | "bottom" | "left" | "right" }?,
-  attribute border { Pixels.datatype }?,
-  attribute hspace { Pixels.datatype }?,
-  attribute vspace { Pixels.datatype }?
-input.attlist &= align.attrib
-legend.attlist &=
-  attribute align { "top" | "bottom" | "left" | "right" }?
-li.attlist &=
-  attribute type { text }?,
-  attribute value { text }?
-object.attlist &=
-  attribute align { "top" | "middle" | "bottom" | "left" | "right" }?,
-  attribute border { Pixels.datatype }?,
-  attribute hspace { Pixels.datatype }?,
-  attribute vspace { Pixels.datatype }?
-ol.attlist &=
-  attribute type { text }?,
-  attribute compact { "compact" }?,
-  attribute start { text }?
-p.attlist &= align.attrib
-pre.attlist &= attribute width { Length.datatype }?
-script.attlist &= attribute language { ContentType.datatype }?
-table.attlist &=
-  align.attrib,
-  attribute bgcolor { Color.datatype }?
-tr.attlist &= attribute bgcolor { Color.datatype }?
-Cell.attrib &=
-  attribute nowrap { "nowrap" }?,
-  attribute bgcolor { Color.datatype }?,
-  attribute width { Pixels.datatype }?,
-  attribute height { Pixels.datatype }?
-ul.attlist &=
-  attribute type { text }?,
-  attribute compact { "compact" }?
-align.attrib = attribute align { "left" | "all" | "right" | "none" }?
-Color.datatype = text
-Inline.class |= font | basefont | s | strike | u
-Block.class |= center | isindex
-List.class |= dir | menu
-head.content &= isindex?
-Block.mix |= text | Inline.class
-# With the legacy module and the frames modules, the html
-# element can contain either body or frameset.
-frameset |= body
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-link.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-link.rnc
deleted file mode 100644
index 9d0d6f1cc7..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-link.rnc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Link Module
-
-link = element link { link.attlist }
-link.attlist =
-  Common.attrib,
-  attribute charset { Charset.datatype }?,
-  attribute href { URI.datatype }?,
-  attribute hreflang { LanguageCode.datatype }?,
-  attribute type { ContentType.datatype }?,
-  attribute rel { LinkTypes.datatype }?,
-  attribute rev { LinkTypes.datatype }?,
-  attribute media { MediaDesc.datatype }?
-head.content &= link*
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-list.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-list.rnc
deleted file mode 100644
index 8b994041ea..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-list.rnc
+++ /dev/null
@@ -1,16 +0,0 @@
-# List Module
-
-dl = element dl { dl.attlist, (dt | dd)+ }
-dl.attlist = Common.attrib
-dt = element dt { dt.attlist, Inline.model }
-dt.attlist = Common.attrib
-dd = element dd { dd.attlist, Flow.model }
-dd.attlist = Common.attrib
-ol = element ol { ol.attlist, li+ }
-ol.attlist = Common.attrib
-ul = element ul { ul.attlist, li+ }
-ul.attlist = Common.attrib
-li = element li { li.attlist, Flow.model }
-li.attlist = Common.attrib
-List.class = ul | ol | dl
-Block.class |= List.class
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-meta.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-meta.rnc
deleted file mode 100644
index ab0b5eb318..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-meta.rnc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Meta Module
-
-meta = element meta { meta.attlist }
-meta.attlist =
-  I18n.attrib,
-  attribute http-equiv { NMTOKEN.datatype }?,
-  attribute name { NMTOKEN.datatype }?,
-  attribute content { text }?,
-  attribute scheme { text }?
-head.content &= meta*
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-nameident.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-nameident.rnc
deleted file mode 100644
index ef4ad7065e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-nameident.rnc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Name Identification Module
-
-a.attlist &= name.attlist
-applet.attlist &= name.attlist
-form.attlist &= name.attlist
-frame.attrib &= name.attlist
-iframe.attlist &= name.attlist
-img.attlist &= name.attlist
-map.attlist &= name.attlist
-name.attlist = attribute name { text }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-object.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-object.rnc
deleted file mode 100644
index ac65238db9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-object.rnc
+++ /dev/null
@@ -1,24 +0,0 @@
-# Object Module
-
-object =
-  element object {
-    object.attlist,
-    # No restrictions on mixed content in TREX.
-    param*,
-    Flow.model
-  }
-object.attlist =
-  Common.attrib,
-  attribute declare { "declare" }?,
-  attribute classid { URI.datatype }?,
-  attribute codebase { URI.datatype }?,
-  attribute data { URI.datatype }?,
-  attribute type { ContentType.datatype }?,
-  attribute codetype { ContentType.datatype }?,
-  attribute archive { URIs.datatype }?,
-  attribute standby { Text.datatype }?,
-  attribute height { Length.datatype }?,
-  attribute width { Length.datatype }?,
-  attribute name { text }?,
-  attribute tabindex { Number.datatype }?
-Inline.class |= object
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-param.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-param.rnc
deleted file mode 100644
index 8a921ca9b3..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-param.rnc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Param Module
-
-param = element param { param.attlist }
-param.attlist =
-  id.attrib,
-  attribute name { text },
-  attribute value { text }?,
-  attribute valuetype { "data" | "ref" | "object" }?,
-  attribute type { ContentType.datatype }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-pres.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-pres.rnc
deleted file mode 100644
index 677372b2dd..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-pres.rnc
+++ /dev/null
@@ -1,18 +0,0 @@
-hr = element hr { hr.attlist }
-hr.attlist = Common.attrib
-Block.class |= hr
-b = element b { b.attlist, Inline.model }
-b.attlist = Common.attrib
-big = element big { big.attlist, Inline.model }
-big.attlist = Common.attrib
-i = element i { i.attlist, Inline.model }
-i.attlist = Common.attrib
-small = element small { small.attlist, Inline.model }
-small.attlist = Common.attrib
-sub = element sub { sub.attlist, Inline.model }
-sub.attlist = Common.attrib
-sup = element sup { sup.attlist, Inline.model }
-sup.attlist = Common.attrib
-tt = element tt { tt.attlist, Inline.model }
-tt.attlist = Common.attrib
-Inline.class |= b | big | i | small | sub | sup | tt
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ruby.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ruby.rnc
deleted file mode 100644
index e55614dfb9..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ruby.rnc
+++ /dev/null
@@ -1,21 +0,0 @@
-ruby =
-  element ruby {
-    ruby.attlist,
-    ((rb,
-      (rt | (rp, rt, rp)))
-     | (rbc, rtc, rtc?))
-  }
-ruby.attlist = Common.attrib
-rbc = element rbc { rbc.attlist, rb+ }
-rbc.attlist = Common.attrib
-rtc = element rtc { rtc.attlist, rt+ }
-rtc.attlist = Common.attrib
-rb = element rb { rb.attlist, Inline.model }
-rb.attlist = Common.attrib
-rt = element rt { rt.attlist, Inline.model }
-rt.attlist =
-  Common.attrib,
-  attribute rt { Number.datatype }?
-rp = element rp { rp.attlist, text }
-rp.attlist = Common.attrib
-Inline.class |= ruby
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-script.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-script.rnc
deleted file mode 100644
index fcf35b0271..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-script.rnc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Script Module
-
-script = element script { script.attlist, text }
-script.attlist =
-  attribute charset { Charset.datatype }?,
-  attribute type { ContentType.datatype },
-  attribute src { URI.datatype }?,
-  attribute defer { "defer" }?,
-  attribute xml:space { "preserve" }?
-noscript = element noscript { noscript.attlist, Block.model }
-noscript.attlist = Common.attrib
-head.content &= script*
-Script.class = noscript | script
-Inline.class |= Script.class
-Block.class |= Script.class
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ssismap.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ssismap.rnc
deleted file mode 100644
index 21a7496d30..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-ssismap.rnc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Server-side Image Map Module
-
-# Depends on image module.
-
-img.attlist &= attribute ismap { "ismap" }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-struct.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-struct.rnc
deleted file mode 100644
index 4c919c2371..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-struct.rnc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Structure Module
-
-start = html
-title = element title { title.attlist, text }
-title.attlist = I18n.attrib
-head = element head { head.attlist, head.content }
-head.attlist = I18n.attrib, profile.attlist
-head.content = title
-profile.attlist = attribute profile { URI.datatype }?
-body = element body { body.attlist, Block.model }
-body.attlist = Common.attrib
-html = element html { html.attlist, head, body }
-html.attlist = XHTML.version.attrib, I18n.attrib
-XHTML.version.attrib = attribute version { FPI.datatype }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-style.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-style.rnc
deleted file mode 100644
index 93a52d5e2a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-style.rnc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Style Module
-
-style = element style { style.attlist, text }
-style.attlist =
-  title.attrib,
-  I18n.attrib,
-  attribute type { ContentType.datatype },
-  attribute media { MediaDesc.datatype }?,
-  attribute xml:space { "preserve" }?
-head.content &= style*
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-table.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-table.rnc
deleted file mode 100644
index 70055b1598..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-table.rnc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Tables Module
-
-# This builds on the basic tables module, unlike with the DTD
-# implementation.
-
-include "xhtml-basic-table.rnc" {
-  table =
-    element table {
-      table.attlist,
-      caption?,
-      (col* | colgroup*),
-      ((thead?, tfoot?, tbody+) | tr+)
-    }
-  th = element th { th.attlist, Flow.model }
-  td = element td { td.attlist, Flow.model }
-  CellHAlign.attrib =
-    attribute align {
-      "left" | "center" | "right" | "justify" | "char"
-    }?,
-    attribute char { Character.datatype }?,
-    attribute charoff { Length.datatype }?
-  CellVAlign.attrib =
-    attribute valign { "top" | "middle" | "bottom" | "baseline" }?
-  scope.attrib =
-    attribute scope { "row" | "col" | "rowgroup" | "colgroup" }?
-}
-table.attlist &=
-  attribute width { Length.datatype }?,
-  attribute border { Pixels.datatype }?,
-  frame.attrib,
-  rules.attrib,
-  attribute cellspacing { Length.datatype }?,
-  attribute cellpadding { Length.datatype }?
-col = element col { col.attlist }
-col.attlist =
-  Common.attrib,
-  attribute span { Number.datatype }?,
-  attribute width { MultiLength.datatype }?,
-  CellHAlign.attrib,
-  CellVAlign.attrib
-colgroup = element colgroup { colgroup.attlist, col* }
-colgroup.attlist =
-  Common.attrib,
-  attribute span { Number.datatype }?,
-  attribute width { MultiLength.datatype }?,
-  CellHAlign.attrib,
-  CellVAlign.attrib
-tbody = element tbody { tbody.attlist, tr+ }
-tbody.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib
-thead = element thead { thead.attlist, tr+ }
-thead.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib
-tfoot = element tfoot { tfoot.attlist, tr+ }
-tfoot.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib
-frame.attrib =
-  attribute frame {
-    "void"
-    | "above"
-    | "below"
-    | "hsides"
-    | "lhs"
-    | "rhs"
-    | "vsides"
-    | "box"
-    | "border"
-  }?
-rules.attrib =
-  attribute rules { "none" | "groups" | "rows" | "cols" | "all" }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-target.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-target.rnc
deleted file mode 100644
index 505b37963a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-target.rnc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Target Module
-
-a.attlist &= target.attrib
-area.attlist &= target.attrib
-base.attlist &= target.attrib
-link.attrib &= target.attrib
-form.attlist &= target.attrib
-target.attrib = attribute target { text }?
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-text.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-text.rnc
deleted file mode 100644
index c4283d4417..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml-text.rnc
+++ /dev/null
@@ -1,73 +0,0 @@
-# Text Module
-
-br = element br { br.attlist, empty }
-br.attlist = Core.attrib
-span = element span { span.attlist, Inline.model }
-span.attlist = Common.attrib
-abbr = element abbr { abbr.attlist, Inline.model }
-abbr.attlist = Common.attrib
-acronym = element acronym { acronym.attlist, Inline.model }
-acronym.attlist = Common.attrib
-cite = element cite { cite.attlist, Inline.model }
-cite.attlist = Common.attrib
-code = element code { code.attlist, Inline.model }
-code.attlist = Common.attrib
-dfn = element dfn { dfn.attlist, Inline.model }
-dfn.attlist = Common.attrib
-em = element em { em.attlist, Inline.model }
-em.attlist = Common.attrib
-kbd = element kbd { kbd.attlist, Inline.model }
-kbd.attlist = Common.attrib
-q = element q { q.attlist, Inline.model }
-q.attlist =
-  Common.attrib,
-  attribute cite { URI.datatype }?
-samp = element samp { samp.attlist, Inline.model }
-samp.attlist = Common.attrib
-strong = element strong { strong.attlist, Inline.model }
-strong.attlist = Common.attrib
-var = element var { var.attlist, Inline.model }
-var.attlist = Common.attrib
-\div = element div { div.attlist, Flow.model }
-div.attlist = Common.attrib
-p = element p { p.attlist, Inline.model }
-p.attlist = Common.attrib
-address = element address { address.attlist, Inline.model }
-address.attlist = Common.attrib
-blockquote = element blockquote { blockquote.attlist, Block.model }
-blockquote.attlist =
-  Common.attrib,
-  attribute cite { URI.datatype }?
-pre = element pre { pre.attlist, Inline.model }
-pre.attlist =
-  Common.attrib,
-  attribute xml:space { "preserve" }?
-h1 = element h1 { Heading.attrib, Heading.content }
-h2 = element h2 { Heading.attrib, Heading.content }
-h3 = element h3 { Heading.attrib, Heading.content }
-h4 = element h4 { Heading.attrib, Heading.content }
-h5 = element h5 { Heading.attrib, Heading.content }
-h6 = element h6 { Heading.attrib, Heading.content }
-Heading.attrib = Common.attrib
-Heading.content = Inline.model
-Heading.class = h1 | h2 | h3 | h4 | h5 | h6
-Block.class = address | blockquote | \div | p | pre | Heading.class
-Inline.class =
-  abbr
-  | acronym
-  | br
-  | cite
-  | code
-  | dfn
-  | em
-  | kbd
-  | q
-  | samp
-  | span
-  | strong
-  | var
-Inline.model = (text | Inline.class)*
-# This is redefined by the legacy module to include inlines.
-Block.mix = Block.class
-Block.model = Block.mix+
-Flow.model = (text | Inline.class | Block.class)*
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml.rnc
deleted file mode 100644
index 3218cd71e5..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xhtml.rnc
+++ /dev/null
@@ -1,37 +0,0 @@
-# XHTML
-
-# This corresponds to the union of transitional and frameset.
-
-default namespace = "http://www.w3.org/1999/xhtml"
-
-include "xhtml-datatypes.rnc"
-include "xhtml-attribs.rnc"
-# include "xhtml-struct.rnc"
-include "xhtml-frames.rnc"
-include "xhtml-text.rnc"
-include "xhtml-hypertext.rnc"
-include "xhtml-list.rnc"
-include "xhtml-image.rnc"
-include "xhtml-ssismap.rnc"
-include "xhtml-base.rnc"
-include "xhtml-link.rnc"
-include "xhtml-meta.rnc"
-include "xhtml-param.rnc"
-include "xhtml-object.rnc"
-include "xhtml-bdo.rnc"
-include "xhtml-pres.rnc"
-include "xhtml-edit.rnc"
-include "xhtml-applet.rnc"
-# include "xhtml-basic-form.rnc"
-include "xhtml-form.rnc"
-include "xhtml-style.rnc"
-include "xhtml-script.rnc"
-# include "xhtml-basic-table.rnc"
-include "xhtml-table.rnc"
-include "xhtml-csismap.rnc"
-include "xhtml-events.rnc"
-include "xhtml-inlstyle.rnc"
-include "xhtml-target.rnc"
-include "xhtml-iframe.rnc"
-include "xhtml-nameident.rnc"
-include "xhtml-legacy.rnc"
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xslt.rnc b/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xslt.rnc
deleted file mode 100644
index eaa332f86b..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/schema/xslt.rnc
+++ /dev/null
@@ -1,356 +0,0 @@
-# $Id: xslt.rnc,v 1.2 2003/08/30 08:09:03 jjc Exp $
-
-# This was mostly generated from the syntax summary in the XSLT
-# Recommendation (using XSLT of course).
-
-# Issues: this validates extension elements as literal result
-# elements, which is overly restrictive.
-
-namespace local = ""
-default namespace xsl = "http://www.w3.org/1999/XSL/Transform"
-
-start =
-  stylesheet.element
-  | transform.element
-  | literal-result-element-as-stylesheet
-version = "1.0"
-top-level-elements.model =
-  (top-level-element.category | top-level-extension)*
-top-level-extension =
-  element * - (xsl:* | local:*) {
-    grammar {
-      start = any
-      any =
-        (attribute * { text }
-         | text
-         | element * { any })*
-    }
-  }
-template.model = (instruction.category | literal-result-element | text)*
-literal-result-element-as-stylesheet =
-  element * - xsl:* {
-    attribute xsl:version { version },
-    literal-result-element-no-version.atts,
-    template.model
-  }
-literal-result-element =
-  element * - xsl:* { literal-result-element.atts, template.model }
-literal-result-element.atts =
-  literal-result-element-no-version.atts,
-  attribute xsl:version { version }?
-literal-result-element-no-version.atts =
-  (attribute * - xsl:* { avt.datatype }
-   | attribute xsl:extension-element-prefixes { prefixes.datatype }
-   | attribute xsl:exclude-result-prefixes { prefixes.datatype }
-   | attribute xsl:use-attribute-sets { qnames.datatype })*
-top-level-element.category =
-  include.element
-  | strip-space.element
-  | preserve-space.element
-  | template.element
-  | namespace-alias.element
-  | attribute-set.element
-  | variable.element
-  | param.element
-  | key.element
-  | decimal-format.element
-  | output.element
-instruction.category =
-  apply-templates.element
-  | apply-imports.element
-  | call-template.element
-  | element.element
-  | attribute.element
-  | text.element
-  | processing-instruction.element
-  | comment.element
-  | copy.element
-  | value-of.element
-  | number.element
-  | for-each.element
-  | if.element
-  | choose.element
-  | variable.element
-  | copy-of.element
-  | message.element
-  | fallback.element
-extension.atts = attribute * - (xsl:* | local:*) { text }*
-stylesheet.element = element stylesheet { stylesheet.model }
-transform.element = element transform { stylesheet.model }
-stylesheet.model =
-  extension.atts,
-  attribute id { xsd:NCName }?,
-  attribute extension-element-prefixes { prefixes.datatype }?,
-  attribute exclude-result-prefixes { prefixes.datatype }?,
-  attribute version { version },
-  (import.element*, top-level-elements.model)
-include.element =
-  element include {
-    extension.atts,
-    attribute href { xsd:anyURI }
-  }
-import.element =
-  element import {
-    extension.atts,
-    attribute href { xsd:anyURI }
-  }
-strip-space.element =
-  element strip-space {
-    extension.atts,
-    attribute elements { wildcards.datatype }
-  }
-preserve-space.element =
-  element preserve-space {
-    extension.atts,
-    attribute elements { wildcards.datatype }
-  }
-template.element =
-  element template {
-    extension.atts,
-    attribute match { pattern.datatype }?,
-    attribute name { qname.datatype }?,
-    attribute priority { number.datatype }?,
-    attribute mode { qname.datatype }?,
-    (param.element*, template.model)
-  }
-apply-templates.element =
-  element apply-templates {
-    extension.atts,
-    attribute select { expression.datatype }?,
-    attribute mode { qname.datatype }?,
-    (sort.element | with-param.element)*
-  }
-apply-imports.element = element apply-imports { extension.atts }
-call-template.element =
-  element call-template {
-    extension.atts,
-    attribute name { qname.datatype },
-    with-param.element*
-  }
-namespace-alias.element =
-  element namespace-alias {
-    extension.atts,
-    attribute stylesheet-prefix { prefix.datatype },
-    attribute result-prefix { prefix.datatype }
-  }
-element.element =
-  element element {
-    extension.atts,
-    attribute name { qname.datatype | expr-avt.datatype },
-    attribute namespace { xsd:anyURI | brace-avt.datatype }?,
-    attribute use-attribute-sets { qnames.datatype }?,
-    template.model
-  }
-attribute.element =
-  element attribute {
-    extension.atts,
-    attribute name { qname.datatype | expr-avt.datatype },
-    attribute namespace { xsd:anyURI | brace-avt.datatype }?,
-    template.model
-  }
-attribute-set.element =
-  element attribute-set {
-    extension.atts,
-    attribute name { qname.datatype },
-    attribute use-attribute-sets { qnames.datatype }?,
-    attribute.element*
-  }
-text.element =
-  element text {
-    extension.atts,
-    attribute disable-output-escaping {
-      xsd:string "yes" | xsd:string "no"
-    }?,
-    text
-  }
-processing-instruction.element =
-  element processing-instruction {
-    extension.atts,
-    attribute name { xsd:NCName | expr-avt.datatype },
-    template.model
-  }
-comment.element = element comment { extension.atts, template.model }
-copy.element =
-  element copy {
-    extension.atts,
-    attribute use-attribute-sets { qnames.datatype }?,
-    template.model
-  }
-value-of.element =
-  element value-of {
-    extension.atts,
-    attribute select { expression.datatype },
-    attribute disable-output-escaping {
-      xsd:string "yes" | xsd:string "no"
-    }?
-  }
-number.element =
-  element number {
-    extension.atts,
-    attribute level {
-      xsd:string "single" | xsd:string "multiple" | xsd:string "any"
-    }?,
-    attribute count { pattern.datatype }?,
-    attribute from { pattern.datatype }?,
-    attribute value { expression.datatype }?,
-    attribute format { avt.datatype }?,
-    attribute lang { xsd:NMTOKEN | expr-avt.datatype }?,
-    attribute letter-value {
-      xsd:string "alphabetic"
-      | xsd:string "traditional"
-      | expr-avt.datatype
-    }?,
-    attribute grouping-separator { char.datatype | expr-avt.datatype }?,
-    attribute grouping-size { number.datatype | expr-avt.datatype }?
-  }
-for-each.element =
-  element for-each {
-    extension.atts,
-    attribute select { expression.datatype },
-    (sort.element*, template.model)
-  }
-if.element =
-  element if {
-    extension.atts,
-    attribute test { expression.datatype },
-    template.model
-  }
-choose.element =
-  element choose { extension.atts, (when.element+, otherwise.element?) }
-when.element =
-  element when {
-    extension.atts,
-    attribute test { expression.datatype },
-    template.model
-  }
-otherwise.element = element otherwise { extension.atts, template.model }
-sort.element =
-  element sort {
-    extension.atts,
-    attribute select { expression.datatype }?,
-    attribute lang { xsd:NMTOKEN | expr-avt.datatype }?,
-    attribute data-type {
-      xsd:string "text"
-      | xsd:string "number"
-      | qname-but-not-ncname.datatype
-      | expr-avt.datatype
-    }?,
-    attribute order {
-      xsd:string "ascending"
-      | xsd:string "descending"
-      | expr-avt.datatype
-    }?,
-    attribute case-order {
-      xsd:string "upper-first"
-      | xsd:string "lower-first"
-      | expr-avt.datatype
-    }?
-  }
-variable.element =
-  element variable {
-    extension.atts,
-    attribute name { qname.datatype },
-    (attribute select { expression.datatype }
-     | template.model)
-  }
-param.element =
-  element param {
-    extension.atts,
-    attribute name { qname.datatype },
-    (attribute select { expression.datatype }
-     | template.model)
-  }
-copy-of.element =
-  element copy-of {
-    extension.atts,
-    attribute select { expression.datatype }
-  }
-with-param.element =
-  element with-param {
-    extension.atts,
-    attribute name { qname.datatype },
-    (attribute select { expression.datatype }
-     | template.model)
-  }
-key.element =
-  element key {
-    extension.atts,
-    attribute name { qname.datatype },
-    attribute match { pattern.datatype },
-    attribute use { expression.datatype }
-  }
-decimal-format.element =
-  element decimal-format {
-    extension.atts,
-    attribute name { qname.datatype }?,
-    attribute decimal-separator { char.datatype }?,
-    attribute grouping-separator { char.datatype }?,
-    attribute infinity { text }?,
-    attribute minus-sign { char.datatype }?,
-    attribute NaN { text }?,
-    attribute percent { char.datatype }?,
-    attribute per-mille { char.datatype }?,
-    attribute zero-digit { char.datatype }?,
-    attribute digit { char.datatype }?,
-    attribute pattern-separator { char.datatype }?
-  }
-message.element =
-  element message {
-    extension.atts,
-    attribute terminate { xsd:string "yes" | xsd:string "no" }?,
-    template.model
-  }
-fallback.element = element fallback { extension.atts, template.model }
-output.element =
-  element output {
-    extension.atts,
-    attribute method {
-      xsd:string "xml"
-      | xsd:string "html"
-      | xsd:string "text"
-      | qname-but-not-ncname.datatype
-    }?,
-    attribute version { xsd:NMTOKEN }?,
-    attribute encoding { text }?,
-    attribute omit-xml-declaration {
-      xsd:string "yes" | xsd:string "no"
-    }?,
-    attribute standalone { xsd:string "yes" | xsd:string "no" }?,
-    attribute doctype-public { text }?,
-    attribute doctype-system { text }?,
-    attribute cdata-section-elements { qnames.datatype }?,
-    attribute indent { xsd:string "yes" | xsd:string "no" }?,
-    attribute media-type { text }?
-  }
-prefixes.datatype = list { (xsd:NCName | "#default")* }
-prefix.datatype = xsd:NCName | "#default"
-wildcards.datatype =
-  list {
-    (xsd:QName
-     | xsd:token { pattern = "\*|\i\c*:\*" })*
-  }
-qname.datatype = xsd:QName
-qnames.datatype = list { xsd:QName* }
-char.datatype = xsd:string { length = "1" }
-number.datatype = xsd:decimal
-expression.datatype = text
-pattern.datatype = text
-qname-but-not-ncname.datatype = xsd:QName { pattern = ".*:.*" }
-# An AVT containing at least one expression.
-expr-avt.datatype =
-  xsd:string {
-    pattern =
-      """([^\{\}]|\{\{|\}\})*\{([^"'\{\}]|"[^"]*"|'[^']*')+\}([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*"""
-  }
-# An AVT containing at least one brace; ie where instantiated AVT
-# is not the same as the literal AVT.
-brace-avt.datatype =
-  xsd:string {
-    pattern =
-      """[^\{\}]*(\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*"""
-  }
-avt.datatype =
-  xsd:string {
-    pattern =
-      """([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*"""
-  }
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/stamp-byte-compile b/elpa-to-submit/nxhtml/nxml-mode-20041004/stamp-byte-compile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/test-noval.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/test-noval.el
deleted file mode 100644
index 23a4a43879..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/test-noval.el
+++ /dev/null
@@ -1,4 +0,0 @@
-
-(add-hook 'nxml-mode-hook
-          (lambda () (rng-validate-mode 0) )
-          t)
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/test.invalid.xml b/elpa-to-submit/nxhtml/nxml-mode-20041004/test.invalid.xml
deleted file mode 100644
index bdf6a2cb7e..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/test.invalid.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>An invalid document</title>
-  </head>
-  <body>
-    <p>This XHTML document is <span class="#foo">invalid</span>.</p>
-  </body>
-</html>
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/test.valid.xml b/elpa-to-submit/nxhtml/nxml-mode-20041004/test.valid.xml
deleted file mode 100644
index 56a12800fa..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/test.valid.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>A valid document</title>
-  </head>
-  <body>
-    <p>This is a valid, albeit boring, XHTML document.</p>
-  </body>
-</html>
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/xmltok.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/xmltok.el
deleted file mode 100644
index ed381cd4cc..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/xmltok.el
+++ /dev/null
@@ -1,1925 +0,0 @@
-;;; xmltok.el --- XML tokenization
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This implements an XML 1.0 parser. It also implements the XML
-;; Namespaces Recommendation.  It is designed to be conforming, but it
-;; works a bit differently from a normal XML parser. An XML document
-;; consists of the prolog and an instance.  The prolog is parsed as a
-;; single unit using `xmltok-forward-prolog'.  The instance is
-;; considered as a sequence of tokens, where a token is something like
-;; a start-tag, a comment, a chunk of data or a CDATA section. The
-;; tokenization of the instance is stateless: the tokenization of one
-;; part of the instance does not depend on tokenization of the
-;; preceding part of the instance.  This allows the instance to be
-;; parsed incrementally.  The main entry point is `xmltok-forward':
-;; this can be called at any point in the instance provided it is
-;; between tokens.  The other entry point is `xmltok-forward-special'
-;; which skips over tokens other comments, processing instructions or
-;; CDATA sections (i.e. the constructs in an instance that can contain
-;; less than signs that don't start a token).
-;;
-;; This is a non-validating XML 1.0 processor.  It does not resolve
-;; parameter entities (including the external DTD subset) and it does
-;; not resolve external general entities.
-;;
-;; It is non-conformant by design in the following respects.
-;;
-;; 1. It expects the client to detect aspects of well-formedness that
-;; are not internal to a single token, specifically checking that
-;; end-tags match start-tags and that the instance contains exactly
-;; one element.
-;;
-;; 2. It expects the client to detect duplicate attributes.  Detection
-;; of duplicate attributes after expansion of namespace prefixes
-;; requires the namespace processing state.  Detection of duplicate
-;; attributes before expansion of namespace prefixes does not, but is
-;; redundant given that the client will do detection of duplicate
-;; attributes after expansion of namespace prefixes.
-;;
-;; 3. It allows the client to recover from well-formedness errors.
-;; This is essential for use in applications where the document is
-;; being parsed during the editing process.
-;;
-;; 4. It does not support documents that do not conform to the lexical
-;; requirements of the XML Namespaces Recommendation (e.g. a document
-;; with a colon in an entity name).
-;;
-;; There are also a number of things that have not yet been
-;; implemented that make it non-conformant.
-;;
-;; 1. It does not implement default attributes.  ATTLIST declarations
-;; are parsed, but no checking is done on the content of attribute
-;; value literals specifying default attribute values, and default
-;; attribute values are not reported to the client.
-;;
-;; 2. It does not implement internal entities containing elements. If
-;; an internal entity is referenced and parsing its replacement text
-;; yields one or more tags, then it will skip the reference and
-;; report this to the client.
-;;
-;; 3. It does not check the syntax of public identifiers in the DTD.
-;;
-;; 4. It allows some non-ASCII characters in certain situations where
-;; it should not.  For example, it only enforces XML 1.0's
-;; restrictions on name characters strictly for ASCII characters.  The
-;; problem here is XML's character model is based squarely on Unicode,
-;; whereas Emacs's is not (as of version 21).  It is not clear what
-;; the right thing to do is.
-
-;;; Code:
-
-(defvar xmltok-type nil)
-(defvar xmltok-start nil)
-(defvar xmltok-name-colon nil)
-(defvar xmltok-name-end nil)
-(defvar xmltok-replacement nil
-  "String containing replacement for a character or entity reference.")
-
-(defvar xmltok-attributes nil
-  "List containing attributes of last scanned element.
-Each member of the list is a vector representing an attribute, which
-can be accessed using the functions `xmltok-attribute-name-start',
-`xmltok-attribute-name-colon', `xmltok-attribute-name-end',
-`xmltok-attribute-value-start', `xmltok-attribute-value-end',
-`xmltok-attribute-raw-normalized-value', `xmltok-attribute-refs'.")
-
-(defvar xmltok-namespace-attributes nil
-  "List containing namespace declarations of last scanned element.
-List has same format as `xmltok-attributes'.")
-
-(defvar xmltok-dtd nil
-  "Information about the DTD used by `xmltok-forward'.
-`xmltok-forward-prolog' sets this up.
-
-It consists of an alist of general entity names vs definitions.  The
-first member of the alist is t if references to entities not in the
-alist are well-formed \(e.g. because there's an external subset that
-wasn't parsed).
-
-Each general entity name is a string. The definition is either nil, a
-symbol, a string, a cons cell.  If the definition is nil, then it
-means that it's an internal entity but the result of parsing it is
-unknown.  If it is a symbol, then the symbol is either `unparsed',
-meaning the entity is an unparsed entity, `external', meaning the
-entity is or references an external entity, `element', meaning the
-entity includes one or more elements, or `not-well-formed', meaning
-the replacement text is not well-formed.  If the definition is a
-string, then the replacement text of the entity is that string; this
-happens only during the parsing of the prolog. If the definition is a
-cons cell \(ER . AR), then ER specifies the string that results from
-referencing the entity in element content and AR is either nil,
-meaning the replacement text included a <, or a string which is the
-normalized attribute value.")
-
-(defvar xmltok-dependent-regions nil
-  "List of descriptors of regions that a parsed token depends on.
-
-A token depends on a region if the region occurs after the token and a
-change in the region may require the token to be reparsed.  This only
-happens with markup that is not well-formed.  For example, if a <?
-occurs without a matching ?>, then the <? is returned as a
-not-well-formed token.  However, this token is dependent on region
-from the end of the token to the end of the buffer: if this ever
-contains ?> then the buffer must be reparsed from the <?.
-
-A region descriptor is a list (FUN START END ARG ...), where FUN is a
-function to be called when the region changes, START and END are
-integers giving the start and end of the region, and ARG... are
-additional arguments to be passed to FUN.  FUN will be called with 5
-arguments followed by the additional arguments if any: the position of
-the start of the changed area in the region, the position of the end
-of the changed area in the region, the length of the changed area
-before the change, the position of the start of the region, the
-position of the end of the region. FUN must return non-nil if the
-region needs reparsing.  FUN will be called in a save-excursion with
-match-data saved.
-
-`xmltok-forward', `xmltok-forward-special' and `xmltok-forward-prolog'
-may add entries to the beginning of this list, but will not clear it.
-`xmltok-forward' and `xmltok-forward-special' will only add entries
-when returning tokens of type not-well-formed.")
-
-(defvar xmltok-errors nil
-  "List of errors detected by `xmltok-forward' and `xmltok-forward-prolog'.
-When `xmltok-forward' and `xmltok-forward-prolog' detect a
-well-formedness error, they will add an entry to the beginning of this
-list.  Each entry is a vector [MESSAGE START END], where MESSAGE is a
-string giving the error message and START and END are integers
-indicating the position of the error.")
-
-(defmacro xmltok-save (&rest body)
-  `(let (xmltok-type
-	 xmltok-start
-	 xmltok-name-colon
-	 xmltok-name-end
-	 xmltok-replacement
-	 xmltok-attributes
-	 xmltok-namespace-attributes
-	 xmltok-dependent-regions
-	 xmltok-errors)
-     ,@body))
-
-(put 'xmltok-save 'lisp-indent-function 0)
-(def-edebug-spec xmltok-save t)
-
-(defsubst xmltok-attribute-name-start (att)
-  (aref att 0))
-
-(defsubst xmltok-attribute-name-colon (att)
-  (aref att 1))
-
-(defsubst xmltok-attribute-name-end (att)
-  (aref att 2))
-
-(defsubst xmltok-attribute-value-start (att)
-  (aref att 3))
-
-(defsubst xmltok-attribute-value-end (att)
-  (aref att 4))
-
-(defsubst xmltok-attribute-raw-normalized-value (att)
-  "Return an object representing the normalized value of ATT.
-This can t indicating that the normalized value is the same as the
-buffer substring from the start to the end of the value or nil
-indicating that the value is not well-formed or a string."
-  (aref att 5))
-
-(defsubst xmltok-attribute-refs (att)
-  "Return a list of the entity and character references in ATT.
-Each member is a vector [TYPE START END] where TYPE is either char-ref
-or entity-ref and START and END are integers giving the start and end
-of the reference. Nested entity references are not included in the list."
-  (aref att 6))
-
-(defun xmltok-attribute-prefix (att)
-  (let ((colon (xmltok-attribute-name-colon att)))
-    (and colon
-	 (buffer-substring-no-properties (xmltok-attribute-name-start att)
-					 colon))))
-
-(defun xmltok-attribute-local-name (att)
-  (let ((colon (xmltok-attribute-name-colon att)))
-    (buffer-substring-no-properties (if colon
-					(1+ colon)
-				      (xmltok-attribute-name-start att))
-				    (xmltok-attribute-name-end att))))
-
-(defun xmltok-attribute-value (att)
-  (let ((rnv (xmltok-attribute-raw-normalized-value att)))
-    (and rnv
-	 (if (stringp rnv)
-	     rnv
-	   (buffer-substring-no-properties (xmltok-attribute-value-start att)
-					   (xmltok-attribute-value-end att))))))
-
-(defun xmltok-start-tag-prefix ()
-  (and xmltok-name-colon
-       (buffer-substring-no-properties (1+ xmltok-start)
-				       xmltok-name-colon)))
-
-(defun xmltok-start-tag-local-name ()
-  (buffer-substring-no-properties (1+ (or xmltok-name-colon
-					  xmltok-start))
-				  xmltok-name-end))
-
-(defun xmltok-end-tag-prefix ()
-  (and xmltok-name-colon
-       (buffer-substring-no-properties (+ 2 xmltok-start)
-				       xmltok-name-colon)))
-
-(defun xmltok-end-tag-local-name ()
-  (buffer-substring-no-properties (if xmltok-name-colon
-				      (1+ xmltok-name-colon)
-				    (+ 2 xmltok-start))
-				  xmltok-name-end))
-
-(defun xmltok-start-tag-qname ()
-  (buffer-substring-no-properties (+ xmltok-start 1) xmltok-name-end))
-
-(defun xmltok-end-tag-qname ()
-  (buffer-substring-no-properties (+ xmltok-start 2) xmltok-name-end))
-
-(defsubst xmltok-make-attribute (name-begin
-				 name-colon
-				 name-end
-				 &optional
-				 value-begin
-				 value-end
-				 raw-normalized-value)
-  "Make an attribute.  RAW-NORMALIZED-VALUE is nil if the value is
-not well-formed, t if the normalized value is the string between
-VALUE-BEGIN and VALUE-END, otherwise a STRING giving the value."
-  (vector name-begin
-	  name-colon
-	  name-end
-	  value-begin
-	  value-end
-	  raw-normalized-value
-	  nil))
-
-(defsubst xmltok-error-message (err)
-  (aref err 0))
-
-(defsubst xmltok-error-start (err)
-  (aref err 1))
-
-(defsubst xmltok-error-end (err)
-  (aref err 2))
-
-(defsubst xmltok-make-error (message start end)
-  (vector message start end))
-
-(defun xmltok-add-error (message &optional start end)
-  (setq xmltok-errors
-	(cons (xmltok-make-error message
-				 (or start xmltok-start)
-				 (or end (point)))
-	      xmltok-errors)))
-
-(defun xmltok-add-dependent (fun &optional start end &rest args)
-  (setq xmltok-dependent-regions
-	(cons (cons fun
-		    (cons (or start xmltok-start)
-			  (cons (or end (point-max))
-				args)))
-	      xmltok-dependent-regions)))
-
-(defun xmltok-forward ()
-  (setq xmltok-start (point))
-  (let* ((case-fold-search nil)
-	 (space-count (skip-chars-forward " \t\r\n"))
-	 (ch (char-after)))
-    (cond ((eq ch ?\<)
-	   (cond ((> space-count 0)
-		  (setq xmltok-type 'space))
-		 (t
-		  (goto-char (1+ (point)))
-		  (xmltok-scan-after-lt))))
-	  ((eq ch ?\&)
-	   (cond ((> space-count 0)
-		  (setq xmltok-type 'space))
-		 (t
-		  (goto-char (1+ (point)))
-		  (xmltok-scan-after-amp
-		   (lambda (start end)
-		     (xmltok-handle-entity start end))))))
-	  ((re-search-forward "[<&]\\|\\(]]>\\)" nil t)
-	   (cond ((not (match-beginning 1))
-		  (goto-char (match-beginning 0))
-		  ;; must have got a non-space char
-		  (setq xmltok-type 'data))
-		 ((= (match-beginning 1) xmltok-start)
-		  (xmltok-add-error "Found `]]>' not closing a CDATA section")
-		  (setq xmltok-type 'not-well-formed))
-		 (t
-		  (goto-char (match-beginning 0))
-		  (setq xmltok-type
-			(if (= (point) (+ xmltok-start space-count))
-			    'space
-			  'data)))))
-	  ((eq ch nil)
-	   (setq xmltok-type
-		 (if (> space-count 0)
-		     'space
-		   nil)))
-	  (t
-	   (goto-char (point-max))
-	   (setq xmltok-type 'data)))))
-
-(defun xmltok-forward-special (bound)
-  "Scan forward past the first special token starting at or after point.
-Return nil if there is no special token that starts before BOUND.
-CDATA sections, processing instructions and comments (and indeed
-anything starting with < following by ? or !) count
-as special.  Return the type of the token."
-  (when (re-search-forward "<[?!]" (1+ bound) t)
-    (setq xmltok-start (match-beginning 0))
-    (goto-char (1+ xmltok-start))
-    (let ((case-fold-search nil))
-      (xmltok-scan-after-lt))))
-
-(eval-when-compile
-
-  ;; A symbolic regexp is represented by a list whose CAR is the string
-  ;; containing the regexp and whose cdr is a list of symbolic names
-  ;; for the groups in the string.
-
-  ;; Construct a symbolic regexp from a regexp.
-  (defun xmltok-r (str)
-    (cons str nil))
-
-  ;; Concatenate zero of more regexps and symbolic regexps.
-  (defun xmltok+ (&rest args)
-    (let (strs names)
-      (while args
-	(let ((arg (car args)))
-	  (if (stringp arg)
-	      (setq strs (cons arg strs))
-	    (setq strs (cons (car arg) strs))
-	    (setq names (cons (cdr arg) names)))
-	  (setq args (cdr args))))
-      (cons (apply 'concat (nreverse strs))
-	    (apply 'append (nreverse names))))))
-
-(eval-when-compile
-  ;; Make a symbolic group named NAME from the regexp R.
-  ;; R may be a symbolic regexp or an ordinary regexp.
-  (defmacro xmltok-g (name &rest r)
-    (let ((sym (make-symbol "r")))
-      `(let ((,sym (xmltok+ ,@r)))
-	 (if (stringp ,sym)
-	     (cons (concat "\\(" ,sym "\\)") (cons ',name nil))
-	   (cons (concat "\\(" (car ,sym) "\\)") (cons ',name (cdr ,sym)))))))
-
-  (defun xmltok-p (&rest r) (xmltok+ "\\(?:" 
-				     (apply 'xmltok+ r)
-				     "\\)"))
-
-  ;; Get the group index of ELEM in a LIST of symbols.
-  (defun xmltok-get-index (elem list)
-    (or elem
-	(error "Missing group name"))
-    (let ((found nil)
-	  (i 1))
-      (while list
-	(cond ((eq elem (car list))
-	       (setq found i)
-	       (setq list nil))
-	      (t
-	       (setq i (1+ i))
-	       (setq list (cdr list)))))
-      (or found
-	  (error "Bad group name %s" elem))))
-
-  ;; Define a macro SYM using a symbolic regexp R.
-  ;; SYM can be called in three ways:
-  ;; (SYM regexp)
-  ;;   expands to the regexp in R
-  ;; (SYM start G)
-  ;;   expands to
-  ;;   (match-beginning N)
-  ;;   where N is the group index of G in R.
-  ;; (SYM end G)
-  ;;   expands to
-  ;;   (match-end N)
-  ;;   where N is the group index of G in R.
-  (defmacro xmltok-defregexp (sym r)
-    `(defalias ',sym
-       (let ((r ,r))
-	 `(macro lambda (action &optional group-name)
-		 (cond ((eq action 'regexp)
-			,(car r))
-		       ((or (eq action 'start) (eq action 'beginning))
-			(list 'match-beginning (xmltok-get-index group-name
-								 ',(cdr r))))
-		       ((eq action 'end)
-			(list 'match-end (xmltok-get-index group-name
-							   ',(cdr r))))
-		       ((eq action 'string)
-			(list 'match-string
-			      (xmltok-get-index group-name ',(cdr r))))
-		       ((eq action 'string-no-properties)
-			(list 'match-string-no-properties
-			      (xmltok-get-index group-name ',(cdr r))))
-		       (t (error "Invalid action: %s" action))))))))
-  
-
-(eval-when-compile
-  (let* ((or "\\|")
-	 (open "\\(?:")
-	 (gopen "\\(")
-	 (close "\\)")
-	 (name-start-char "[_[:alpha:]]")
-	 (name-continue-not-start-char "[-.[:digit:]]")
-	 (name-continue-char "[-._[:alnum:]]")
-	 (* "*")
-	 (+ "+")
-	 (opt "?")
-	 (question "\\?")
-	 (s "[ \r\t\n]")
-	 (s+ (concat s +))
-	 (s* (concat s *))
-	 (ncname (concat name-start-char name-continue-char *))
-	 (entity-ref
-	  (xmltok+ (xmltok-g entity-name ncname)
-		   (xmltok-g entity-ref-close ";") opt))
-	 (decimal-ref
-	  (xmltok+ (xmltok-g decimal "[0-9]" +)
-		   (xmltok-g decimal-ref-close ";") opt))
-	 (hex-ref
-	  (xmltok+ "x" open
-		   (xmltok-g hex "[0-9a-fA-F]" +)
-		   (xmltok-g hex-ref-close ";") opt
-		   close opt))
-	 (char-ref
-	  (xmltok+ (xmltok-g number-sign "#")
-		   open decimal-ref or hex-ref close opt))
-	 (start-tag-close
-	  (xmltok+ open (xmltok-g start-tag-close s* ">")
-		   or open (xmltok-g empty-tag-slash s* "/")
-		   (xmltok-g empty-tag-close ">") opt close
-		   or (xmltok-g start-tag-s s+)
-		   close))
-	 (start-tag
-	  (xmltok+ (xmltok-g start-tag-name
-			     ncname (xmltok-g start-tag-colon ":" ncname) opt)
-		   start-tag-close opt))
-	 (end-tag
-	  (xmltok+ (xmltok-g end-tag-slash "/")
-		   open (xmltok-g end-tag-name
-				  ncname
-				  (xmltok-g end-tag-colon ":" ncname) opt)
-		   (xmltok-g end-tag-close s* ">") opt
-		   close opt))
-	 (comment
-	  (xmltok+ (xmltok-g markup-declaration "!")
-		   (xmltok-g comment-first-dash "-"
-			     (xmltok-g comment-open "-") opt) opt))
-	 (cdata-section
-	  (xmltok+ "!"
-		  (xmltok-g marked-section-open "\\[")
-		  open "C"
-		  open "D"
-		  open "A"
-		  open "T"
-		  open "A"
-		  (xmltok-g cdata-section-open "\\[" ) opt
-		  close opt		; A
-		  close opt		; T
-		  close opt		; A
-		  close opt		; D
-		  close opt))		; C
-	 (processing-instruction
-	  (xmltok-g processing-instruction-question question)))
-
-    (xmltok-defregexp xmltok-ncname  (xmltok+ open ncname close))
-
-    (xmltok-defregexp xmltok-after-amp
-		      (xmltok+ entity-ref or char-ref))
-    (xmltok-defregexp xmltok-after-lt
-		      (xmltok+ start-tag
-			       or end-tag
-			       ;; cdata-section must come before comment
-			       ;; because we treat <! as a comment
-			       ;; and Emacs doesn't do fully greedy matching
-			       ;; by default
-			       or cdata-section
-			       or comment
-			       or processing-instruction))
-    (xmltok-defregexp
-     xmltok-attribute
-     (let* ((lit1
-	     (xmltok+ "'"
-		      "[^<'&\r\n\t]*"
-		      (xmltok-g complex1 "[&\r\n\t][^<']*") opt
-		      "'"))
-	    (lit2 (cons (replace-regexp-in-string "'" "\"" (car lit1))
-			'(complex2)))
-	    (literal (xmltok-g literal lit1 or lit2))
-	    (name (xmltok+ open (xmltok-g xmlns "xmlns") or ncname close
-			   (xmltok-g colon ":" ncname) opt)))
-	(xmltok+ (xmltok-g name name)
-		 s* "="
-		 ;; If the literal isn't followed by what it should be,
-		 ;; then the closing delimiter is probably really the
-		 ;; opening delimiter of another literal, so don't
-		 ;; absorb the literal in this case.
-		 open s* literal start-tag-close close opt)))
-    (xmltok-defregexp
-     xmltok-xml-declaration
-     (let* ((literal-content "[-._:a-zA-Z0-9]+")
-	    (literal
-	     (concat open "\"" literal-content "\""
-		     or "'" literal-content "'" close))
-	    (version-att
-	     (xmltok+ open
-		      s+ (xmltok-g version-name "version")
-		      s* "="
-		      s* (xmltok-g version-value literal)
-		      close opt))
-	    (encoding-att
-	     (xmltok+ open
-		      s+ (xmltok-g encoding-name "encoding")
-		      s* "="
-		      s* (xmltok-g encoding-value literal)
-		      close opt))
-	   (yes-no
-	    (concat open "yes" or "no" close))
-	   (standalone-att
-	    (xmltok+ open
-		     s+ (xmltok-g standalone-name "standalone")
-		     s* "="
-		     s* (xmltok-g standalone-value
-				  "\"" yes-no "\"" or "'" yes-no "'")
-		     close opt)))
-       (xmltok+ "<" question "xml"
-		version-att
-		encoding-att
-		standalone-att
-		s* question ">")))
-    (xmltok-defregexp
-     xmltok-prolog
-     (let* ((single-char (xmltok-g single-char "[[|,(\"'>]"))
-	    (internal-subset-close (xmltok-g internal-subset-close
-					     "][ \t\r\n]*>"))
-	    (starts-with-close-paren
-	     (xmltok-g close-paren
-		       ")"
-		       (xmltok-p
-			(xmltok-g close-paren-occur "[+?]")
-			or
-			(xmltok-g close-paren-star "\\*"))
-		       opt))
-	    (starts-with-percent
-	     (xmltok-g percent
-		       "%" (xmltok-g param-entity-ref
-				     ncname
-				     (xmltok-g param-entity-ref-close
-					       ";") opt) opt))
-	    (starts-with-nmtoken-not-name
-	     (xmltok-g nmtoken
-		       (xmltok-p name-continue-not-start-char or ":")
-		       (xmltok-p name-continue-char or ":") *))
-	    (nmtoken-after-colon
-	     (xmltok+
-	      (xmltok-p name-continue-not-start-char or ":")
-	      (xmltok-p name-continue-char or ":") *
-	      or
-	      name-start-char
-	      name-continue-char *
-	      ":"
-	      (xmltok-p name-continue-char or ":") *))
-	    (after-ncname
-	     (xmltok+ (xmltok-g ncname-nmtoken
-				":" (xmltok-p nmtoken-after-colon))
-		      or (xmltok-p (xmltok-g colon ":" ncname)
-				   (xmltok-g colon-name-occur "[?+*]") opt)
-		      or (xmltok-g ncname-occur "[?+*]")
-		      or (xmltok-g ncname-colon ":")))
-	    (starts-with-name
-	     (xmltok-g name ncname (xmltok-p after-ncname) opt))
-	    (starts-with-hash
-	     (xmltok-g pound
-		       "#" (xmltok-g hash-name ncname)))
-	    (markup-declaration
-	     (xmltok-g markup-declaration
-		       "!" (xmltok-p (xmltok-g comment-first-dash "-"
-					       (xmltok-g comment-open "-") opt)
-				     or (xmltok-g named-markup-declaration
-						 ncname)) opt))
-	    (after-lt
-	     (xmltok+ markup-declaration
-		      or (xmltok-g processing-instruction-question
-				   question)
-		      or (xmltok-g instance-start
-				   ncname)))
-	    (starts-with-lt (xmltok-g less-than "<" (xmltok-p after-lt) opt)))
-       (xmltok+ starts-with-lt
-		or single-char
-		or starts-with-close-paren
-		or starts-with-percent
-		or starts-with-name
-		or starts-with-nmtoken-not-name
-		or starts-with-hash
-		or internal-subset-close)))))
-
-(defconst xmltok-ncname-regexp (xmltok-ncname regexp))
-
-(defun xmltok-scan-after-lt ()
-  (cond ((not (looking-at (xmltok-after-lt regexp)))
-	 (xmltok-add-error "`<' that is not markup must be entered as `&lt;'")
-	 (setq xmltok-type 'not-well-formed))
-	(t
-	 (goto-char (match-end 0))
-	 (cond ((xmltok-after-lt start start-tag-close)
-		(setq xmltok-name-end
-		      (xmltok-after-lt end start-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start start-tag-colon))
-		(setq xmltok-attributes nil)
-		(setq xmltok-namespace-attributes nil)
-		(setq xmltok-type 'start-tag))
-	       ((xmltok-after-lt start end-tag-close)
-		(setq xmltok-name-end
-		      (xmltok-after-lt end end-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start end-tag-colon))
-		(setq xmltok-type 'end-tag))
-	       ((xmltok-after-lt start start-tag-s)
-		(setq xmltok-name-end
-		      (xmltok-after-lt end start-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start start-tag-colon))
-		(setq xmltok-namespace-attributes nil)
-		(setq xmltok-attributes nil)
-		(xmltok-scan-attributes)
-		xmltok-type)
-	       ((xmltok-after-lt start empty-tag-close)
-		(setq xmltok-name-end
-		      (xmltok-after-lt end start-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start start-tag-colon))
-		(setq xmltok-attributes nil)
-		(setq xmltok-namespace-attributes nil)
-		(setq xmltok-type 'empty-element))
-	       ((xmltok-after-lt start cdata-section-open)
-		(setq xmltok-type
-		      (if (search-forward "]]>" nil t)
-			  'cdata-section
-			(xmltok-add-error "No closing ]]>")
-			(xmltok-add-dependent 'xmltok-unclosed-reparse-p
-					      nil
-					      nil
-					      "]]>")
-			'not-well-formed)))
-	       ((xmltok-after-lt start processing-instruction-question)
-		(xmltok-scan-after-processing-instruction-open))
-	       ((xmltok-after-lt start comment-open)
-		(xmltok-scan-after-comment-open))
-	       ((xmltok-after-lt start empty-tag-slash)
-		(setq xmltok-name-end
-		      (xmltok-after-lt end start-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start start-tag-colon))
-		(setq xmltok-attributes nil)
-		(setq xmltok-namespace-attributes nil)
-		(xmltok-add-error "Expected `/>'" (1- (point)))
-		(setq xmltok-type 'partial-empty-element))
-	       ((xmltok-after-lt start start-tag-name)
-		(xmltok-add-error "Missing `>'"
-				  nil
-				  (1+ xmltok-start))
-		(setq xmltok-name-end
-		      (xmltok-after-lt end start-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start start-tag-colon))
-		(setq xmltok-namespace-attributes nil)
-		(setq xmltok-attributes nil)
-		(setq xmltok-type 'partial-start-tag))
-	       ((xmltok-after-lt start end-tag-name)
-		(setq xmltok-name-end (xmltok-after-lt end end-tag-name))
-		(setq xmltok-name-colon
-		      (xmltok-after-lt start end-tag-colon))
-		(cond ((and (not xmltok-name-colon)
-			    (eq (char-after) ?:))
-		       (goto-char (1+ (point)))
-		       (xmltok-add-error "Expected name following `:'"
-					 (1- (point))))
-		      (t
-		       (xmltok-add-error "Missing `>'"
-					 nil
-					 (1+ xmltok-start))))
-		(setq xmltok-type 'partial-end-tag))
-	       ((xmltok-after-lt start end-tag-slash)
-		(xmltok-add-error "Expected name following `</'")
-		(setq xmltok-name-end nil)
-		(setq xmltok-name-colon nil)
-		(setq xmltok-type 'partial-end-tag))
-	       ((xmltok-after-lt start marked-section-open)
-		(xmltok-add-error "Expected `CDATA[' after `<!['"
-				  xmltok-start
-				  (+ 3 xmltok-start))
-		(setq xmltok-type 'not-well-formed))
-	       ((xmltok-after-lt start comment-first-dash)
-		(xmltok-add-error "Expected `-' after `<!-'"
-				  xmltok-start
-				  (+ 3 xmltok-start))
-		(setq xmltok-type 'not-well-formed))
-	       ((xmltok-after-lt start markup-declaration)
-		(xmltok-add-error "Expected `[CDATA[' or `--' after `<!'"
-				  xmltok-start
-				  (+ 2 xmltok-start))
-		(setq xmltok-type 'not-well-formed))
-	       (t
-		(xmltok-add-error "Not well-formed")
-		(setq xmltok-type 'not-well-formed))))))
-
-;; XXX This should be unified with
-;; xmltok-scan-prolog-after-processing-instruction-open
-;; XXX maybe should include rest of line (up to any <,>) in unclosed PI
-(defun xmltok-scan-after-processing-instruction-open ()
-  (cond ((not (search-forward "?>" nil t))
-	 (xmltok-add-error "No closing ?>"
-			   xmltok-start
-			   (+ xmltok-start 2))
-	 (xmltok-add-dependent 'xmltok-unclosed-reparse-p
-			       nil
-			       nil
-			       "?>")
-	 (setq xmltok-type 'not-well-formed))
-	(t
-	 (cond ((not (save-excursion
-		       (goto-char (+ 2 xmltok-start))
-		       (and (looking-at (xmltok-ncname regexp))
-			    (setq xmltok-name-end (match-end 0)))))
-		(setq xmltok-name-end (+ xmltok-start 2))
-		(xmltok-add-error "<? not followed by name"
-				  (+ xmltok-start 2)
-				  (+ xmltok-start 3)))
-	       ((not (or (memq (char-after xmltok-name-end)
-			       '(?\n ?\t ?\r ? ))
-			 (= xmltok-name-end (- (point) 2))))
-		(xmltok-add-error "Target not followed by whitespace"
-				  xmltok-name-end
-				  (1+ xmltok-name-end)))
-	       ((and (= xmltok-name-end (+ xmltok-start 5))
-		     (save-excursion
-		       (goto-char (+ xmltok-start 2))
-		       (let ((case-fold-search t))
-			 (looking-at "xml"))))
-		(xmltok-add-error "Processing instruction target is xml"
-				  (+ xmltok-start 2)
-				  (+ xmltok-start 5))))
-	 (setq xmltok-type 'processing-instruction))))
-		
-(defun xmltok-scan-after-comment-open ()
-  (setq xmltok-type
-	(cond ((not (search-forward "--" nil t))
-	       (xmltok-add-error "No closing -->")
-	       (xmltok-add-dependent 'xmltok-unclosed-reparse-p
-				     nil
-				     nil
-				     ;; not --> because
-				     ;; -- is not allowed
-				     ;; in comments in XML
-				     "--")
-	       'not-well-formed)
-	      ((eq (char-after) ?>)
-	       (goto-char (1+ (point)))
-	       'comment)
-	      (t
-	       (xmltok-add-dependent
-		'xmltok-semi-closed-reparse-p
-		nil
-		(point)
-		"--"
-		2)
-	       ;; just include the <!-- in the token
-	       (goto-char (+ xmltok-start 4))
-	       ;; Need do this after the goto-char because
-	       ;; marked error should just apply to <!--
-	       (xmltok-add-error "First following `--' not followed by `>'")
-	       'not-well-formed))))
-
-(defun xmltok-scan-attributes ()
-  (let ((recovering nil)
-	(atts-needing-normalization nil))
-    (while (cond ((or (looking-at (xmltok-attribute regexp))
-		      ;; use non-greedy group
-		      (when (looking-at (concat "[^<>\n]+?"
-						(xmltok-attribute regexp)))
-			(unless recovering
-			  (xmltok-add-error "Malformed attribute"
-					    (point)
-					    (save-excursion
-					      (goto-char (xmltok-attribute start
-									   name))
-					      (skip-chars-backward "\r\n\t ")
-					      (point))))
-			t))
-		  (setq recovering nil)
-		  (goto-char (match-end 0))
-		  (let ((att (xmltok-add-attribute)))
-		    (when att
-		      (setq atts-needing-normalization
-			    (cons att atts-needing-normalization))))
-		  (cond ((xmltok-attribute start start-tag-s) t)
-			((xmltok-attribute start start-tag-close)
-			 (setq xmltok-type 'start-tag)
-			 nil)
-			((xmltok-attribute start empty-tag-close)
-			 (setq xmltok-type 'empty-element)
-			 nil)
-			((xmltok-attribute start empty-tag-slash)
-			 (setq xmltok-type 'partial-empty-element)
-			 (xmltok-add-error "Expected `/>'"
-					   (1- (point)))
-			 nil)
-			((looking-at "[ \t\r\n]*[\"']")
-			 (goto-char (match-end 0))
-			 (xmltok-add-error "Missing closing delimiter"
-					   (1- (point)))
-			 (setq recovering t)
-			 t)
-			((looking-at "[ \t]*\\([^ \t\r\n\"'=<>/]+\\)[ \t\r\n/>]")
-			 (goto-char (match-end 1))
-			 (xmltok-add-error "Attribute value not quoted"
-					   (match-beginning 1))
-			 (setq recovering t)
-			 t)
-			(t
-			 (xmltok-add-error "Missing attribute value"
-					   (1- (point)))
-			 (setq recovering t)
-			 t)))
-		 ((looking-at "[^<>\n]*/>")
-		  (let ((start (point)))
-		    (goto-char (match-end 0))
-		    (unless recovering
-		      (xmltok-add-error "Malformed empty-element"
-					start
-					(- (point) 2))))
-		  (setq xmltok-type 'empty-element)
-		  nil)
-		 ((looking-at "[^<>\n]*>")
-		  (let ((start (point)))
-		    (goto-char (match-end 0))
-		    (unless recovering
-		      (xmltok-add-error "Malformed start-tag"
-					start
-					(1- (point)))))
-		  (setq xmltok-type 'start-tag)
-		  nil)
-		 (t
-		  (when recovering
-		    (skip-chars-forward "^<>\n"))
-		  (xmltok-add-error "Missing `>'"
-				    xmltok-start
-				    (1+ xmltok-start))
-		  (setq xmltok-type 'partial-start-tag)
-		  nil)))
-    (while atts-needing-normalization
-      (xmltok-normalize-attribute (car atts-needing-normalization))
-      (setq atts-needing-normalization (cdr atts-needing-normalization))))
-  (setq xmltok-attributes
-	(nreverse xmltok-attributes))
-  (setq xmltok-namespace-attributes
-	(nreverse xmltok-namespace-attributes)))
-
-(defun xmltok-add-attribute ()
-  "Return the attribute if it needs normalizing, otherwise nil."
-  (let* ((needs-normalizing nil)
-	 (att
-	  (if (xmltok-attribute start literal)
-	      (progn
-		(setq needs-normalizing
-		      (or (xmltok-attribute start complex1)
-			  (xmltok-attribute start complex2)))
-		(xmltok-make-attribute (xmltok-attribute start name)
-				       (xmltok-attribute start colon)
-				       (xmltok-attribute end name)
-				       (1+ (xmltok-attribute start literal))
-				       (1- (xmltok-attribute end literal))
-				       (not needs-normalizing)))
-	   (xmltok-make-attribute (xmltok-attribute start name)
-				  (xmltok-attribute start colon)
-				  (xmltok-attribute end name)))))
-    (if (xmltok-attribute start xmlns)
-	(setq xmltok-namespace-attributes
-	      (cons att xmltok-namespace-attributes))
-      (setq xmltok-attributes
-	    (cons att xmltok-attributes)))
-    (and needs-normalizing
-	 att)))
-	 
-(defun xmltok-normalize-attribute (att)
-  (let ((end (xmltok-attribute-value-end att))
-	(well-formed t)
-	(value-parts nil)
-	(refs nil))
-    (save-excursion
-      (goto-char (xmltok-attribute-value-start att))
-      (while (progn
-	       (let ((n (skip-chars-forward "^\r\t\n&" end)))
-		 (when (> n 0)
-		   (setq value-parts
-			 (cons (buffer-substring-no-properties (- (point) n)
-							       (point))
-			       value-parts))))
-	       (when (< (point) end)
-		 (goto-char (1+ (point)))
-		 (cond ((eq (char-before) ?\&)
-			(let ((xmltok-start (1- (point)))
-			       xmltok-type xmltok-replacement)
-			  (xmltok-scan-after-amp
-			   (lambda (start end)
-			     (xmltok-handle-entity start end t)))
-			  (cond ((or (eq xmltok-type 'char-ref)
-				     (eq xmltok-type 'entity-ref))
-				 (setq refs
-				       (cons (vector xmltok-type
-						     xmltok-start
-						     (point))
-					     refs))
-				 (if xmltok-replacement
-				     (setq value-parts
-					   (cons xmltok-replacement
-						 value-parts))
-				   (setq well-formed nil)))
-				(t (setq well-formed nil)))))
-		       (t (setq value-parts
-				(cons " " value-parts)))))
-	       (< (point) end))))
-    (when well-formed
-      (aset att 5 (apply 'concat (nreverse value-parts))))
-    (aset att 6 (nreverse refs))))
-
-(defun xmltok-scan-after-amp (entity-handler)
-  (cond ((not (looking-at (xmltok-after-amp regexp)))
-	 (xmltok-add-error "`&' that is not markup must be entered as `&amp;'")
-	 (setq xmltok-type 'not-well-formed))
-	(t
-	 (goto-char (match-end 0))
-	 (cond ((xmltok-after-amp start entity-ref-close)
-		(funcall entity-handler
-			 (xmltok-after-amp start entity-name)
-			 (xmltok-after-amp end entity-name))
-		(setq xmltok-type 'entity-ref))
-	       ((xmltok-after-amp start decimal-ref-close)
-		(xmltok-scan-char-ref (xmltok-after-amp start decimal)
-				      (xmltok-after-amp end decimal)
-				      10))
-	       ((xmltok-after-amp start hex-ref-close)
-		(xmltok-scan-char-ref (xmltok-after-amp start hex)
-				      (xmltok-after-amp end hex)
-				      16))
-	       ((xmltok-after-amp start number-sign)
-		(xmltok-add-error "Missing character number")
-		(setq xmltok-type 'not-well-formed))
-	       (t
-		(xmltok-add-error "Missing closing `;'")
-		(setq xmltok-type 'not-well-formed))))))
-
-(defconst xmltok-entity-error-messages
-  '((unparsed . "Referenced entity is unparsed")
-    (not-well-formed . "Referenced entity is not well-formed")
-    (external nil . "Referenced entity is external")
-    (element nil . "Referenced entity contains <")))
-
-(defun xmltok-handle-entity (start end &optional attributep)
-  (let* ((name (buffer-substring-no-properties start end))
-	 (name-def (assoc name xmltok-dtd))
-	 (def (cdr name-def)))
-    (cond ((setq xmltok-replacement (and (consp def)
-					 (if attributep
-					     (cdr def)
-					   (car def)))))
-	  ((null name-def)
-	   (unless (eq (car xmltok-dtd) t)
-	     (xmltok-add-error "Referenced entity has not been defined"
-			       start
-			       end)))
-	  ((and attributep (consp def))
-	   (xmltok-add-error "Referenced entity contains <"
-			     start
-			     end))
-	  (t
-	   (let ((err (cdr (assq def xmltok-entity-error-messages))))
-	     (when (consp err)
-	       (setq err (if attributep (cdr err) (car err))))
-	     (when err
-	       (xmltok-add-error err start end)))))))
-
-(defun xmltok-scan-char-ref (start end base)
-  (setq xmltok-replacement
-	(let ((n (string-to-int (buffer-substring-no-properties start end)
-				base)))
-	  (cond ((and (integerp n) (xmltok-valid-char-p n))
-		 (setq n (xmltok-unicode-to-char n))
-		 (and n (string n)))
-		(t
-		 (xmltok-add-error "Invalid character code" start end)
-		 nil))))
-  (setq xmltok-type 'char-ref))
-
-(defun xmltok-char-number (start end)
-  (let* ((base (if (eq (char-after (+ start 2)) ?x)
-		   16
-		 10))
-	 (n (string-to-int
-	     (buffer-substring-no-properties (+ start (if (= base 16) 3 2))
-					     (1- end))
-	     base)))
-    (and (integerp n)
-	 (xmltok-valid-char-p n)
-	 n)))
-
-(defun xmltok-unclosed-reparse-p (change-start
-				  change-end
-				  pre-change-length
-				  start
-				  end
-				  delimiter)
-  (let ((len-1 (1- (length delimiter))))
-    (goto-char (max start (- change-start len-1)))
-    (search-forward delimiter (min end (+ change-end len-1)) t)))
-
-;; Handles a <!-- with the next -- not followed by >
-
-(defun xmltok-semi-closed-reparse-p (change-start
-				     change-end
-				     pre-change-length
-				     start
-				     end
-				     delimiter
-				     delimiter-length)
-  (or (<= (- end delimiter-length) change-end)
-      (xmltok-unclosed-reparse-p change-start
-				 change-end
-				 pre-change-length
-				 start
-				 end
-				 delimiter)))
-
-(defun xmltok-valid-char-p (n)
-  "Return non-nil if n is the Unicode code of a valid XML character."
-  (cond ((< n #x20) (memq n '(#xA #xD #x9)))
-	((< n #xD800) t)
-	((< n #xE000) nil)
-	((< n #xFFFE) t)
-	(t (and (> n #xFFFF)
-		(< n #x110000)))))
-
-(defun xmltok-unicode-to-char (n)
-  "Return the character corresponding to Unicode scalar value N.
-Return nil if unsupported in Emacs."
-  (decode-char 'ucs n))
-
-;;; Prolog parsing
-
-(defvar xmltok-contains-doctype nil)
-(defvar xmltok-doctype-external-subset-flag nil)
-(defvar xmltok-internal-subset-start nil)
-(defvar xmltok-had-param-entity-ref nil)
-(defvar xmltok-prolog-regions nil)
-(defvar xmltok-standalone nil
-  "Non-nil if there was an XML declaration specifying standalone=\"yes\",")
-(defvar xmltok-markup-declaration-doctype-flag nil)
-
-(defconst xmltok-predefined-entity-alist
-  '(("lt" "<" . "<")
-    ("gt" ">" . ">")
-    ("amp" "&" . "&")
-    ("apos" "'" . "'")
-    ("quot" "\"" . "\"")))
-
-(defun xmltok-forward-prolog ()
-  "Move forward to the end of the XML prolog.
-
-Returns a list of vectors [TYPE START END] where TYPE is a symbol and
-START and END are integers giving the start and end of the region of
-that type.  TYPE can be one of xml-declaration,
-xml-declaration-attribute-name, xml-declaration-attribute-value,
-comment, processing-instruction-left, processing-instruction-right,
-markup-declaration-open.  markup-declaration-close,
-internal-subset-open, internal-subset-close, hash-name, keyword,
-literal, encoding-name.
-Adds to `xmltok-errors' and `xmltok-dependent-regions' as appropriate."
-  (let ((case-fold-search nil)
-	xmltok-start
-	xmltok-type
-	xmltok-prolog-regions
-	xmltok-contains-doctype
-	xmltok-internal-subset-start
-	xmltok-had-param-entity-ref
-	xmltok-standalone
-	xmltok-doctype-external-subset-flag
-	xmltok-markup-declaration-doctype-flag)
-    (setq xmltok-dtd xmltok-predefined-entity-alist)
-    (xmltok-scan-xml-declaration)
-    (xmltok-next-prolog-token)
-    (while (condition-case err
-	       (when (xmltok-parse-prolog-item)
-		 (xmltok-next-prolog-token))
-	     (xmltok-markup-declaration-parse-error
-	      (xmltok-skip-markup-declaration))))
-    (when xmltok-internal-subset-start
-      (xmltok-add-error "No closing ]"
-			(1- xmltok-internal-subset-start)
-			xmltok-internal-subset-start))
-    (xmltok-parse-entities)
-    ;; XXX prune dependent-regions for those entirely in prolog
-    (nreverse xmltok-prolog-regions)))
-
-(defconst xmltok-bad-xml-decl-regexp
-  "[ \t\r\n]*<\\?xml\\(?:[ \t\r\n]\\|\\?>\\)")
-
-;;;###autoload
-(defun xmltok-get-declared-encoding-position (&optional limit)
-  "Return the position of the encoding in the XML declaration at point.
-If there is a well-formed XML declaration starting at point and it
-contains an encoding declaration, then return (START . END)
-where START and END are the positions of the start and the end
-of the encoding name; if there is no encoding declaration return
-the position where and encoding declaration could be inserted.
-If there is XML that is not well-formed that looks like an XML declaration,
-return nil.  Otherwise, return t.
-If LIMIT is non-nil, then do not consider characters beyond LIMIT."
-  (cond ((let ((case-fold-search nil))
-	   (and (looking-at (xmltok-xml-declaration regexp))
-		(or (not limit) (<= (match-end 0) limit))))
-	 (let ((end (xmltok-xml-declaration end encoding-value)))
-	   (if end
-	       (cons (1+ (xmltok-xml-declaration start encoding-value))
-		     (1- end))
-	     (or (xmltok-xml-declaration end version-value)
-		 (+ (point) 5)))))
-	((not (let ((case-fold-search t))
-		(looking-at xmltok-bad-xml-decl-regexp))))))
-		
-(defun xmltok-scan-xml-declaration ()
-  (when (looking-at (xmltok-xml-declaration regexp))
-    (xmltok-add-prolog-region 'xml-declaration (point) (match-end 0))
-    (goto-char (match-end 0))
-    (when (xmltok-xml-declaration start version-name)
-      (xmltok-add-prolog-region 'xml-declaration-attribute-name
-				(xmltok-xml-declaration start version-name)
-				(xmltok-xml-declaration end version-name))
-      (let ((start (xmltok-xml-declaration start version-value))
-	    (end (xmltok-xml-declaration end version-value)))
-	(xmltok-add-prolog-region 'xml-declaration-attribute-value
-				  start
-				  end)))
-    ;; XXX need to check encoding name
-    ;; Should start with letter, not contain colon
-    (when (xmltok-xml-declaration start encoding-name)
-      (xmltok-add-prolog-region 'xml-declaration-attribute-name
-				(xmltok-xml-declaration start encoding-name)
-				(xmltok-xml-declaration end encoding-name))
-      (let ((start (xmltok-xml-declaration start encoding-value))
-	    (end (xmltok-xml-declaration end encoding-value)))
-	(xmltok-add-prolog-region 'encoding-name
-				  (1+ start)
-				  (1- end))
-	(xmltok-add-prolog-region 'xml-declaration-attribute-value
-				  start
-				  end)))
-    (when (xmltok-xml-declaration start standalone-name)
-      (xmltok-add-prolog-region 'xml-declaration-attribute-name
-				(xmltok-xml-declaration start standalone-name)
-				(xmltok-xml-declaration end standalone-name))
-      (let ((start (xmltok-xml-declaration start standalone-value))
-	    (end (xmltok-xml-declaration end standalone-value)))
-	(xmltok-add-prolog-region 'xml-declaration-attribute-value
-				  start
-				  end)
-	(setq xmltok-standalone
-	      (string= (buffer-substring-no-properties (1+ start) (1- end))
-		       "yes"))))
-    t))
-
-(defconst xmltok-markup-declaration-alist
-  '(("ELEMENT" . xmltok-parse-element-declaration)
-    ("ATTLIST" . xmltok-parse-attlist-declaration)
-    ("ENTITY" . xmltok-parse-entity-declaration)
-    ("NOTATION" . xmltok-parse-notation-declaration)))
-
-(defun xmltok-parse-prolog-item ()
-  (cond ((eq xmltok-type 'comment)
-	 (xmltok-add-prolog-region 'comment
-				   xmltok-start
-				   (point))
-	 t)
-	((eq xmltok-type 'processing-instruction))
-	((eq xmltok-type 'named-markup-declaration)
-	 (setq xmltok-markup-declaration-doctype-flag nil)
-	 (xmltok-add-prolog-region 'markup-declaration-open
-				   xmltok-start
-				   (point))
-	 (let* ((name (buffer-substring-no-properties
-		       (+ xmltok-start 2)
-		       (point)))
-		(fun (cdr (assoc name xmltok-markup-declaration-alist))))
-	   (cond (fun
-		  (unless xmltok-internal-subset-start
-		    (xmltok-add-error
-		     "Declaration allowed only in internal subset"))
-		  (funcall fun))
-		 ((string= name "DOCTYPE")
-		  (xmltok-parse-doctype))
-		 (t
-		  (xmltok-add-error "Unknown markup declaration"
-				    (+ xmltok-start 2))
-		  (xmltok-next-prolog-token)
-		  (xmltok-markup-declaration-parse-error))))
-	 t)
-	((or (eq xmltok-type 'end-prolog)
-	     (not xmltok-type))
-	 nil)
-	((eq xmltok-type 'internal-subset-close)
-	 (xmltok-add-prolog-region 'internal-subset-close
-				   xmltok-start
-				   (1+ xmltok-start))
-	 (xmltok-add-prolog-region 'markup-declaration-close
-				   (1- (point))
-				   (point))
-	 (if xmltok-internal-subset-start
-	     (setq xmltok-internal-subset-start nil)
-	   (xmltok-add-error "]> outside internal subset"))
-	 t)
-	((eq xmltok-type 'param-entity-ref)
-	 (if xmltok-internal-subset-start
-	     (setq xmltok-had-param-entity-ref t)
-	   (xmltok-add-error "Parameter entity reference outside document type declaration"))
-	 t)
-	;; If we don't do this, we can get thousands of errors when
-	;; a plain text file is parsed.
-	((not xmltok-internal-subset-start)
-	 (when (let ((err (car xmltok-errors)))
-		 (or (not err)
-		     (<= (xmltok-error-end err) xmltok-start)))
-	   (goto-char xmltok-start))
-	 nil)
-	((eq xmltok-type 'not-well-formed) t)
-	(t
-	 (xmltok-add-error "Token allowed only inside markup declaration")
-	 t)))
-
-(defun xmltok-parse-doctype ()
-  (setq xmltok-markup-declaration-doctype-flag t)
-  (xmltok-next-prolog-token)
-  (when xmltok-internal-subset-start
-    (xmltok-add-error "DOCTYPE declaration not allowed in internal subset")
-    (xmltok-markup-declaration-parse-error))
-  (when xmltok-contains-doctype
-    (xmltok-add-error "Duplicate DOCTYPE declaration")
-    (xmltok-markup-declaration-parse-error))
-  (setq xmltok-contains-doctype t)
-  (xmltok-require-token 'name 'prefixed-name)
-  (xmltok-require-next-token "SYSTEM" "PUBLIC" ?\[ ?>)
-  (cond ((eq xmltok-type ?\[)
-	 (setq xmltok-internal-subset-start (point)))
-	((eq xmltok-type ?>))
-	(t
-	 (setq xmltok-doctype-external-subset-flag t)
-	 (xmltok-parse-external-id)
-	 (xmltok-require-token ?\[ ?>)
-	 (when (eq xmltok-type ?\[)
-	   (setq xmltok-internal-subset-start (point))))))
-
-(defun xmltok-parse-attlist-declaration ()
-  (xmltok-require-next-token 'prefixed-name 'name)
-  (while (progn
-	   (xmltok-require-next-token ?> 'name 'prefixed-name)
-	   (if (eq xmltok-type ?>)
-	       nil
-	     (xmltok-require-next-token ?\(
-					"CDATA"
-					"ID"
-					"IDREF"
-					"IDREFS"
-					"ENTITY"
-					"ENTITIES"
-					"NMTOKEN"
-					"NMTOKENS"
-					"NOTATION")
-	     (cond ((eq xmltok-type ?\()
-		    (xmltok-parse-nmtoken-group))
-		   ((string= (xmltok-current-token-string)
-			     "NOTATION")
-		    (xmltok-require-next-token ?\()
-		    (xmltok-parse-nmtoken-group)))
-	     (xmltok-require-next-token "#IMPLIED"
-					"#REQUIRED"
-					"#FIXED"
-					'literal)
-	     (when (string= (xmltok-current-token-string) "#FIXED")
-	       (xmltok-require-next-token 'literal))
-	     t))))
-		   
-(defun xmltok-parse-nmtoken-group ()
-  (while (progn
-	   (xmltok-require-next-token 'nmtoken 'prefixed-name 'name)
-	   (xmltok-require-next-token ?| ?\))
-	   (eq xmltok-type ?|))))
-
-(defun xmltok-parse-element-declaration ()
-  (xmltok-require-next-token 'name 'prefixed-name)
-  (xmltok-require-next-token "EMPTY" "ANY" ?\()
-  (when (eq xmltok-type ?\()
-    (xmltok-require-next-token "#PCDATA"
-			       'name
-			       'prefixed-name
-			       'name-occur
-			       ?\()
-    (cond ((eq xmltok-type 'hash-name)
-	   (xmltok-require-next-token ?| ?\) 'close-paren-star)
-	   (while (eq xmltok-type ?|)
-	     (xmltok-require-next-token 'name 'prefixed-name)
-	     (xmltok-require-next-token 'close-paren-star ?|)))
-	  (t (xmltok-parse-model-group))))
-  (xmltok-require-next-token ?>))
-
-(defun xmltok-parse-model-group ()
-  (xmltok-parse-model-group-member)
-  (xmltok-require-next-token ?|
-			     ?,
-			     ?\)
-			     'close-paren-star
-			     'close-paren-occur)
-  (when (memq xmltok-type '(?, ?|))
-    (let ((connector xmltok-type))
-      (while (progn
-	       (xmltok-next-prolog-token)
-	       (xmltok-parse-model-group-member)
-	       (xmltok-require-next-token connector
-					  ?\)
-					  'close-paren-star
-					  'close-paren-occur)
-	       (eq xmltok-type connector))))))
-					  
-(defun xmltok-parse-model-group-member ()
-  (xmltok-require-token 'name
-			'prefixed-name
-			'name-occur
-			?\()
-  (when (eq xmltok-type ?\()
-    (xmltok-next-prolog-token)
-    (xmltok-parse-model-group)))
-    
-(defun xmltok-parse-entity-declaration ()
-  (let (paramp name)
-    (xmltok-require-next-token 'name ?%)
-    (when (eq xmltok-type ?%)
-      (setq paramp t)
-      (xmltok-require-next-token 'name))
-    (setq name (xmltok-current-token-string))
-    (xmltok-require-next-token 'literal "SYSTEM" "PUBLIC")
-    (cond ((eq xmltok-type 'literal)
-	   (let ((replacement (xmltok-parse-entity-value)))
-	     (unless paramp
-	       (xmltok-define-entity name replacement)))
-	   (xmltok-require-next-token ?>))
-	  (t
-	   (xmltok-parse-external-id)
-	   (if paramp
-	       (xmltok-require-token ?>)
-	     (xmltok-require-token ?> "NDATA")
-	     (if (eq xmltok-type ?>)
-		 (xmltok-define-entity name 'external)
-	       (xmltok-require-next-token 'name)
-	       (xmltok-require-next-token ?>)
-	       (xmltok-define-entity name 'unparsed)))))))
-
-(defun xmltok-define-entity (name value)
-  (when (and (or (not xmltok-had-param-entity-ref)
-		 xmltok-standalone)
-	     (not (assoc name xmltok-dtd)))
-    (setq xmltok-dtd
-	  (cons (cons name value) xmltok-dtd))))
-  
-(defun xmltok-parse-entity-value ()
-  (let ((lim (1- (point)))
-	(well-formed t)
-	value-parts
-	start)
-    (save-excursion
-      (goto-char (1+ xmltok-start))
-      (setq start (point))
-      (while (progn
-	       (skip-chars-forward "^%&" lim)
-	       (when (< (point) lim)
-		 (goto-char (1+ (point)))
-		 (cond ((eq (char-before) ?%)
-			(xmltok-add-error "Parameter entity references are not allowed in the internal subset"
-					  (1- (point))
-					  (point))
-			(setq well-formed  nil))
-		       (t
-			(let ((xmltok-start (1- (point)))
-			       xmltok-type xmltok-replacement)
-			  (xmltok-scan-after-amp (lambda (start end)))
-			  (cond ((eq xmltok-type 'char-ref)
-				 (setq value-parts
-				       (cons (buffer-substring-no-properties
-					      start
-					      xmltok-start)
-					     value-parts))
-				 (setq value-parts
-				       (cons xmltok-replacement
-					     value-parts))
-				 (setq start (point)))
-				((eq xmltok-type 'not-well-formed)
-				 (setq well-formed nil))))))
-		 t))))
-    (if (not well-formed)
-	nil
-      (apply 'concat
-	     (nreverse (cons (buffer-substring-no-properties start lim)
-			     value-parts))))))
-		     
-(defun xmltok-parse-notation-declaration ()
-  (xmltok-require-next-token 'name)
-  (xmltok-require-next-token "SYSTEM" "PUBLIC")
-  (let ((publicp (string= (xmltok-current-token-string) "PUBLIC")))
-    (xmltok-require-next-token 'literal)
-    (cond (publicp
-	   (xmltok-require-next-token 'literal ?>)
-	   (unless (eq xmltok-type ?>)
-	     (xmltok-require-next-token ?>)))
-	  (t (xmltok-require-next-token ?>)))))
-
-(defun xmltok-parse-external-id ()
-  (xmltok-require-token "SYSTEM" "PUBLIC")
-  (let ((publicp (string= (xmltok-current-token-string) "PUBLIC")))
-    (xmltok-require-next-token 'literal)
-    (when publicp
-      (xmltok-require-next-token 'literal)))
-  (xmltok-next-prolog-token))
-
-(defun xmltok-require-next-token (&rest types)
-  (xmltok-next-prolog-token)
-  (apply 'xmltok-require-token types))
-
-(defun xmltok-require-token (&rest types)
-  ;; XXX Generate a more helpful error message
-  (while (and (not (let ((type (car types)))
-		     (if (stringp (car types))
-			 (string= (xmltok-current-token-string) type)
-		       (eq type xmltok-type))))
-	      (setq types (cdr types))))
-  (unless types
-    (when (and xmltok-type
-	       (not (eq xmltok-type 'not-well-formed)))
-      (xmltok-add-error "Unexpected token"))
-    (xmltok-markup-declaration-parse-error))
-  (let ((region-type (xmltok-prolog-region-type (car types))))
-    (when region-type
-      (xmltok-add-prolog-region region-type
-				xmltok-start
-				(point)))))
-
-(defun xmltok-current-token-string ()
-  (buffer-substring-no-properties xmltok-start (point)))
-
-(put 'xmltok-markup-declaration-parse-error
-     'error-conditions
-     '(error xmltok-markup-declaration-parse-error))
-
-(put 'xmltok-markup-declaration-parse-error
-     'error-message
-     "Syntax error in markup declaration")
-
-(defun xmltok-markup-declaration-parse-error ()
-  (signal 'xmltok-markup-declaration-parse-error nil))
-
-(defun xmltok-skip-markup-declaration ()
-  (while (cond ((eq xmltok-type ?>)
-		(xmltok-next-prolog-token)
-		nil)
-	       ((and xmltok-markup-declaration-doctype-flag
-		     (eq xmltok-type ?\[))
-		(setq xmltok-internal-subset-start (point))
-		(xmltok-next-prolog-token)
-		nil)
-	       ((memq xmltok-type '(nil
-				    end-prolog
-				    named-markup-declaration
-				    comment
-				    processing-instruction))
-		nil)
-	       ((and xmltok-internal-subset-start
-		     (eq xmltok-type 'internal-subset-close))
-		nil)
-	       (t (xmltok-next-prolog-token) t)))
-  xmltok-type)
-
-(defun xmltok-prolog-region-type (required)
-  (cond ((cdr (assq xmltok-type
-		    '((literal . literal)
-		      (?> . markup-declaration-close)
-		      (?\[ . internal-subset-open)
-		      (hash-name . hash-name)))))
-	((and (stringp required) (eq xmltok-type 'name))
-	 'keyword)))
-	 
-;; Return new token type.
-				    
-(defun xmltok-next-prolog-token ()
-  (skip-chars-forward " \t\r\n")
-  (setq xmltok-start (point))
-  (cond ((not (and (looking-at (xmltok-prolog regexp))
-		   (goto-char (match-end 0))))
-	 (let ((ch (char-after)))
-	   (cond (ch
-		  (goto-char (1+ (point)))
-		  (xmltok-add-error "Illegal char in prolog")
-		  (setq xmltok-type 'not-well-formed))
-		 (t (setq xmltok-type nil)))))
-	((or (xmltok-prolog start ncname-occur)
-	     (xmltok-prolog start colon-name-occur))
-	 (setq xmltok-name-end (1- (point)))
-	 (setq xmltok-name-colon (xmltok-prolog start colon))
-	 (setq xmltok-type 'name-occur))
-	((xmltok-prolog start colon)
-	 (setq xmltok-name-end (point))
-	 (setq xmltok-name-colon (xmltok-prolog start colon))
-	 (unless (looking-at "[ \t\r\n>),|[%]")
-	   (xmltok-add-error "Missing space after name"))
-	 (setq xmltok-type 'prefixed-name))
-	((or (xmltok-prolog start ncname-nmtoken)
-	     (xmltok-prolog start ncname-colon))
-	 (unless (looking-at "[ \t\r\n>),|[%]")
-	   (xmltok-add-error "Missing space after name token"))
-	 (setq xmltok-type 'nmtoken))
-	((xmltok-prolog start name)	
-	 (setq xmltok-name-end (point))
-	 (setq xmltok-name-colon nil)
-	 (unless (looking-at "[ \t\r\n>),|[%]")
-	   (xmltok-add-error "Missing space after name"))
-	 (setq xmltok-type 'name))
-	((xmltok-prolog start hash-name)	
-	 (setq xmltok-name-end (point))
-	 (unless (looking-at "[ \t\r\n>)|%]")
-	   (xmltok-add-error "Missing space after name"))
-	 (setq xmltok-type 'hash-name))
-	((xmltok-prolog start processing-instruction-question)
-	 (xmltok-scan-prolog-after-processing-instruction-open))
-	((xmltok-prolog start comment-open)
-	 ;; XXX if not-well-formed, ignore some stuff
-	 (xmltok-scan-after-comment-open))
-	((xmltok-prolog start named-markup-declaration)
-	 (setq xmltok-type 'named-markup-declaration))
-	((xmltok-prolog start instance-start)
-	 (goto-char xmltok-start)
-	 (setq xmltok-type 'end-prolog))
-	((xmltok-prolog start close-paren-star)
-	 (setq xmltok-type 'close-paren-star))
-	((xmltok-prolog start close-paren-occur)
-	 (setq xmltok-type 'close-paren-occur))
-	((xmltok-prolog start close-paren)
-	 (unless (looking-at "[ \t\r\n>,|)]")
-	   (xmltok-add-error "Missing space after )"))
-	 (setq xmltok-type ?\)))
-	((xmltok-prolog start single-char)
-	 (let ((ch (char-before)))
-	   (cond ((memq ch '(?\" ?\'))
-		  (xmltok-scan-prolog-literal))
-		 (t (setq xmltok-type ch)))))
-	((xmltok-prolog start percent)
-	 (cond ((xmltok-prolog start param-entity-ref-close)
-		(setq xmltok-name-end (1- (point)))
-		(setq xmltok-type 'param-entity-ref))
-	       ((xmltok-prolog start param-entity-ref)
-		(xmltok-add-error "Missing ;")
-		(setq xmltok-name-end (point))
-		(setq xmltok-type 'param-entity-ref))
-	       ((looking-at "[ \t\r\n%]")
-		(setq xmltok-type ?%))
-	       (t
-		(xmltok-add-error "Expected name after %")
-		(setq xmltok-type 'not-well-formed))))
-	((xmltok-prolog start nmtoken)
-	 (unless (looking-at "[ \t\r\n>),|[%]")
-	   (xmltok-add-error "Missing space after name token"))
-	 (setq xmltok-type 'nmtoken))
-	((xmltok-prolog start internal-subset-close)
-	 (setq xmltok-type 'internal-subset-close))
-	((xmltok-prolog start pound)
-	 (xmltok-add-error "Expected name after #")
-	 (setq xmltok-type 'not-well-formed))
-	((xmltok-prolog start markup-declaration)
-	 (xmltok-add-error "Expected name or -- after <!")
-	 (setq xmltok-type 'not-well-formed))
-	((xmltok-prolog start comment-first-dash)
-	 (xmltok-add-error "Expected <!--")
-	 (setq xmltok-type 'not-well-formed))
-	((xmltok-prolog start less-than)
-	 (xmltok-add-error "Incomplete markup")
-	 (setq xmltok-type 'not-well-formed))
-	(t (error "Unhandled token in prolog %s"
-		  (match-string-no-properties 0)))))
-
-(defun xmltok-scan-prolog-literal ()
-  (let* ((delim (string (char-before)))
-	 (safe-end (save-excursion
-		     (skip-chars-forward (concat "^<>[]" delim))
-		     (point)))
-	 (end (save-excursion
-		(goto-char safe-end)
-		(search-forward delim nil t))))
-    (or (cond ((not end)
-	       (xmltok-add-dependent 'xmltok-unclosed-reparse-p
-				     nil
-				     nil
-				     delim)
-	       nil)
-	      ((save-excursion
-		 (goto-char end)
-		 (looking-at "[ \t\r\n>%[]"))
-	       (goto-char end)
-	       (setq xmltok-type 'literal))
-	      ((eq (1+ safe-end) end)
-	       (goto-char end)
-	       (xmltok-add-error (format "Missing space after %s" delim)
-				 safe-end)
-	       (setq xmltok-type 'literal))
-	      (t
-	       (xmltok-add-dependent 'xmltok-semi-closed-reparse-p
-				     xmltok-start
-				     (1+ end)
-				     delim
-				     1)
-	       nil))
-	(progn
-	  (xmltok-add-error (format "Missing closing %s" delim))
-	  (goto-char safe-end)
-	  (skip-chars-backward " \t\r\n")
-	  (setq xmltok-type 'not-well-formed)))))
-
-(defun xmltok-scan-prolog-after-processing-instruction-open ()
-  (cond ((not (search-forward "?>" nil t))
-	 (xmltok-add-error "No closing ?>"
-			   xmltok-start
-			   (+ xmltok-start 2))
-	 (xmltok-add-dependent 'xmltok-unclosed-reparse-p
-			       nil
-			       nil
-			       "?>")
-	 (setq xmltok-type 'not-well-formed))
-	(t
-	 (let* ((end (point))
-		(target
-		 (save-excursion
-		   (goto-char (+ xmltok-start 2))
-		   (and (looking-at (xmltok-ncname regexp))
-			(or (memq (char-after (match-end 0))
-				  '(?\n ?\t ?\r ? ))
-			    (= (match-end 0) (- end 2)))
-			(match-string-no-properties 0)))))
-	   (cond ((not target)
-		  (xmltok-add-error "\
-Processing instruction does not start with a name"
-				    (+ xmltok-start 2)
-				    (+ xmltok-start 3)))
-		 ((not (and (= (length target) 3)
-			    (let ((case-fold-search t))
-			      (string-match "xml" target)))))
-		 ((= xmltok-start 1)
-		  (xmltok-add-error "Invalid XML declaration"
-				    xmltok-start
-				    (point)))
-		 ((save-excursion
-		    (goto-char xmltok-start)
-		    (looking-at (xmltok-xml-declaration regexp)))
-		  (xmltok-add-error "XML declaration not at beginning of file"
-				    xmltok-start
-				    (point)))
-		 (t
-		  (xmltok-add-error "Processing instruction has target of xml"
-				    (+ xmltok-start 2)
-				    (+ xmltok-start 5))))
-	   (xmltok-add-prolog-region 'processing-instruction-left
-				     xmltok-start
-				     (+ xmltok-start
-					2
-					(if target
-					    (length target)
-					  0)))
-	   (xmltok-add-prolog-region 'processing-instruction-right
-				     (if target
-					 (save-excursion
-					   (goto-char (+ xmltok-start
-							 (length target)
-							 2))
-					   (skip-chars-forward " \t\r\n")
-					   (point))
-				       (+ xmltok-start 2))
-				     (point)))
-	 (setq xmltok-type 'processing-instruction))))
-
-(defun xmltok-parse-entities ()
-  (let ((todo xmltok-dtd))
-    (when (and (or xmltok-had-param-entity-ref
-		   xmltok-doctype-external-subset-flag)
-	       (not xmltok-standalone))
-      (setq xmltok-dtd (cons t xmltok-dtd)))
-    (while todo
-      (xmltok-parse-entity (car todo))
-      (setq todo (cdr todo)))))
-  
-(defun xmltok-parse-entity (name-def)
-  (let ((def (cdr name-def))
-	;; in case its value is buffer local 
-	(xmltok-dtd xmltok-dtd)
-	buf)
-    (when (stringp def)
-      (if (string-match "\\`[^&<\t\r\n]*\\'" def)
-	  (setcdr name-def (cons def def))
-	(setcdr name-def 'not-well-formed) ; avoid infinite expansion loops
-	(setq buf (get-buffer-create
-		   (format " *Entity %s*" (car name-def))))
-	(save-excursion
-	  (set-buffer buf)
-	  (erase-buffer)
-	  (insert def)
-	  (goto-char (point-min))
-	  (setcdr name-def
-		  (xmltok-parse-entity-replacement)))
-	(kill-buffer buf)))))
-
-(defun xmltok-parse-entity-replacement ()
-  (let ((def (cons "" "")))
-    (while (let* ((start (point))
-		  (found (re-search-forward "[<&\t\r\n]\\|]]>" nil t))
-		  (ch (and found (char-before)))
-		  (str (buffer-substring-no-properties
-			start
-			(if found
-			    (match-beginning 0)
-			  (point-max)))))
-	     (setq def
-		   (xmltok-append-entity-def def
-					     (cons str str)))
-	     (cond ((not found) nil)
-		   ((eq ch ?>)
-		    (setq def 'not-well-formed)
-		    nil)
-		   ((eq ch ?<)
-		    (xmltok-save
-		      (setq xmltok-start (1- (point)))
-		      (xmltok-scan-after-lt)
-		      (setq def
-			    (xmltok-append-entity-def
-			     def
-			     (cond ((memq xmltok-type
-					  '(start-tag
-					    end-tag
-					    empty-element))
-				    'element)
-				   ((memq xmltok-type
-					  '(comment
-					    processing-instruction))
-				    (cons "" nil))
-				   ((eq xmltok-type
-					'cdata-section)
-				    (cons (buffer-substring-no-properties
-					   (+ xmltok-start 9)
-					   (- (point) 3))
-					  nil))
-				   (t 'not-well-formed)))))
-		    t)
-		   ((eq ch ?&)
-		    (let ((xmltok-start (1- (point)))
-			  xmltok-type
-			  xmltok-replacement
-			  xmltok-errors)
-		      (xmltok-scan-after-amp 'xmltok-handle-nested-entity)
-		      (cond ((eq xmltok-type 'entity-ref)
-			     (setq def
-				   (xmltok-append-entity-def
-				    def
-				    xmltok-replacement)))
-			    ((eq xmltok-type 'char-ref)
-			     (setq def
-				   (xmltok-append-entity-def
-				    def
-				    (if xmltok-replacement
-					 (cons xmltok-replacement
-					       xmltok-replacement)
-				      (and xmltok-errors 'not-well-formed)))))
-			    (t
-			     (setq def 'not-well-formed))))
-		    t)
-		   (t
-		    (setq def
-			  (xmltok-append-entity-def
-			   def
-			   (cons (match-string-no-properties 0)
-				 " ")))
-		    t))))
-    def))
-
-(defun xmltok-handle-nested-entity (start end)
-  (let* ((name-def (assoc (buffer-substring-no-properties start end)
-			  xmltok-dtd))
-	 (def (cdr name-def)))
-    (when (stringp def)
-      (xmltok-parse-entity name-def)
-      (setq def (cdr name-def)))
-    (setq xmltok-replacement
-	  (cond ((null name-def)
-		 (if (eq (car xmltok-dtd) t)
-		     nil
-		   'not-well-formed))
-		((eq def 'unparsed) 'not-well-formed)
-		(t def)))))
-    
-(defun xmltok-append-entity-def (d1 d2)
-  (cond ((consp d1)
-	 (if (consp d2)
-	     (cons (concat (car d1) (car d2))
-		   (and (cdr d1)
-			(cdr d2)
-			(concat (cdr d1) (cdr d2))))
-	   d2))
-	((consp d2) d1)
-	(t
-	 (let ((defs '(not-well-formed external element)))
-	   (while (not (or (eq (car defs) d1)
-			   (eq (car defs) d2)))
-	     (setq defs (cdr defs)))
-	   (car defs)))))
-
-(defun xmltok-add-prolog-region (type start end)
-  (setq xmltok-prolog-regions
-	(cons (vector type start end)
-	      xmltok-prolog-regions)))
-
-(defun xmltok-merge-attributes ()
-  "Return a list merging `xmltok-attributes' and 'xmltok-namespace-attributes'.
-The members of the merged list are in order of occurrence in the
-document.  The list may share list structure with `xmltok-attributes'
-and `xmltok-namespace-attributes'."
-  (cond ((not xmltok-namespace-attributes)
-	 xmltok-attributes)
-	((not xmltok-attributes)
-	 xmltok-namespace-attributes)
-	(t
-	 (let ((atts1 xmltok-attributes)
-	       (atts2 xmltok-namespace-attributes)
-	       merged)
-	   (while (and atts1 atts2)
-	     (cond ((< (xmltok-attribute-name-start (car atts1))
-		       (xmltok-attribute-name-start (car atts2)))
-		    (setq merged (cons (car atts1) merged))
-		    (setq atts1 (cdr atts1)))
-		   (t
-		    (setq merged (cons (car atts2) merged))
-		    (setq atts2 (cdr atts2)))))
-	   (setq merged (nreverse merged))
-	   (cond (atts1 (setq merged (nconc merged atts1)))
-		 (atts2 (setq merged (nconc merged atts2))))
-	   merged))))
-
-;;; Testing
-
-(defun xmltok-forward-test ()
-  (interactive)
-  (if (xmltok-forward)
-      (message "Scanned %s" xmltok-type)
-    (message "Scanned nothing")))
-
-(defun xmltok-next-prolog-token-test ()
-  (interactive)
-  (if (xmltok-next-prolog-token)
-      (message "Scanned %s"
-	       (if (integerp xmltok-type)
-		   (string xmltok-type)
-		 xmltok-type))
-    (message "Scanned end of file")))
-
-(provide 'xmltok)
-
-;;; xmltok.el ends here
diff --git a/elpa-to-submit/nxhtml/nxml-mode-20041004/xsd-regexp.el b/elpa-to-submit/nxhtml/nxml-mode-20041004/xsd-regexp.el
deleted file mode 100644
index 3f12c5576a..0000000000
--- a/elpa-to-submit/nxhtml/nxml-mode-20041004/xsd-regexp.el
+++ /dev/null
@@ -1,2121 +0,0 @@
-;;; xsd-regexp.el --- translate W3C XML Schema regexps to Emacs regexps
-
-;; Copyright (C) 2003 Free Software Foundation, Inc.
-
-;; Author: James Clark
-;; Keywords: XML, regexp
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This handles the regular expressions in the syntax defined by:
-;; W3C XML Schema Part 2: Datatypes
-;; <http://www.w3.org/TR/xmlschema-2/#regexs>
-;;
-;; The main entry point is `xsdre-translate'.
-;;
-;; The features of XSD regexps that make this non-trivial are:
-;;
-;; - \p{PROP} escape for matching characters that have various
-;;   Unicode-defined properties
-;; - character class subtraction:, e.g. [\p{L}-[abc]] matches
-;;   any character in the L category other than a, b and c.
-;;
-;; We compute the set of Unicode characters denoted by each XSD
-;; char-class as a list of ranges.  The regexp generated for a
-;; single escape can be large (several thousand characters).
-;;
-;; XSD has non-traditional rules about when characters must be
-;; and can be quoted with \.  These are quite different from
-;; the Emacs rules.
-;;
-;; The semantics of XSD regexps are defined in terms of Unicode.
-;; Non-Unicode characters are not allowed in regular expressions and
-;; will not match against the generated regular expressions.  A
-;; Unicode character means a character in one of the Mule charsets
-;; ascii, latin-iso8859-1, mule-unicode-0100-24ff,
-;; mule-unicode-2500-33ff, mule-unicode-e000-ffff, eight-bit-control
-;; or a character translateable to such a character (i.e a character
-;; for which `encode-char' will return non-nil).
-;;
-;; Using unify-8859-on-decoding-mode is probably a good idea here
-;; (and generally with XML and other Unicode-oriented formats).
-;;
-;; Unfortunately, this means that this package is currently useless
-;; for CJK characters, since there's no mule-unicode charset for the
-;; CJK ranges of Unicode.  We should devise a workaround for this
-;; until the fabled Unicode version of Emacs makes an appearance.
-
-;;; Code:
-
-(defun xsdre-translate (regexp)
-  "Translate a W3C XML Schema Datatypes regexp to an Emacs regexp.
-Returns a string.  REGEXP is a string. If REGEXP is not a valid XSD
-regexp, signal an `xsdre-invalid-regexp' condition."
-  (xsdre-from-symbolic
-   (xsdre-to-symbolic regexp)))
-
-(defvar xsdre-test-history nil)
-
-(defun xsdre-test-regexp ()
-  (interactive)
-  (while
-      (let* ((str (read-from-minibuffer "Regexp: "
-					nil
-					nil
-					nil
-					'xsdre-test-history))
-	     (symbolic
-	      (xsdre-to-symbolic str)))
-	(with-output-to-temp-buffer "*XSD Regexp Test*"
-	  (princ "XSD regexp: ")
-	  (princ str)
-	  (princ "\n")
-	  (princ "Symbolic: ")
-	  (princ "\n")
-	  (pp symbolic)
-	  (princ "\n")
-	  (princ "Emacs regexp: ")
-	  (princ (xsdre-from-symbolic symbolic)))
-	t)))
-
-;;; Range lists
-
-(defsubst xsdre-make-range (first last)
-  "Return a representation of a range of integers.
-If the range contains a single integer, it is represented by that integer.
-Otherwise, it is represented by a (FIRST . LAST) pair."
-  (if (= first last)
-      first
-    (cons first last)))
-
-(defsubst xsdre-range-first (r)
-  "Return the first integer in a range."
-  (if (consp r) (car r) r))
-
-(defsubst xsdre-range-last (r)
-  "Return the last integer in a range."
-  (if (consp r) (cdr r) r))
-
-(defun xsdre-make-range-list (list)
-  "Make a range-list from a list of ranges.
-A range-list represents a set of integers by a list of ranges in a
-canonical form, in which ranges are in increasing order, and adjacent
-ranges are merged wherever possible."
-  (when list
-    (setq list 
-	  (sort list 'xsdre-range-less-than))
-    (let* ((next (cdr list))
-	   (tail list)
-	   (head (car list))
-	   (first (xsdre-range-first head))
-	   (last (xsdre-range-last head)))
-      (while next
-	(setq head (car next))
-	(when (> (xsdre-range-last head) last)
-	  (if (<= (xsdre-range-first head) (1+ last))
-	      (setq last (xsdre-range-last head))
-	    (setcar tail (xsdre-make-range first last))
-	    (setcdr tail next)
-	    (setq tail next)
-	    (setq first (xsdre-range-first head))
-	    (setq last (xsdre-range-last head))))
-	(setq next (cdr next)))
-      (setcar tail (xsdre-make-range first last))
-      (setcdr tail nil)
-      list)))
-    
-
-(defun xsdre-range-list-union (range-lists)
-  "Return a range-list the union of a list of range-lists."
-  (xsdre-make-range-list (apply 'append range-lists)))
-
-(defun xsdre-range-list-difference (orig subtract)
-  "Return a range-list for the difference of two range-lists."
-  (when orig
-    (let (new head next first last)
-      (while orig
-	(setq head (car orig))
-	(setq first (xsdre-range-first head))
-	(setq last (xsdre-range-last head))
-	(while (and subtract
-		    (< (xsdre-range-last (car subtract)) first))
-	  (setq subtract (cdr subtract)))
-	(while (and subtract
-		    (<= first last)
-		    (<= (xsdre-range-first (car subtract)) last))
-	  (when (< first (xsdre-range-first (car subtract)))
-	    (setq new
-		  (cons (xsdre-make-range 
-			 first
-			 (1- (xsdre-range-first (car subtract))))
-			new)))
-	  (if (< (xsdre-range-last (car subtract)) last)
-	      (progn
-		(setq first (1+ (xsdre-range-last (car subtract))))
-		(setq subtract (cdr subtract)))
-	    (setq first (1+ last))))
-	(when (<= first last)
-	  (setq new (cons (xsdre-make-range first last) new)))
-	(setq orig (cdr orig)))
-      (nreverse new))))
-
-(defun xsdre-range-less-than (r1 r2)
-  "Return non-nil if range R1 is less than range R2."
-  (or (< (xsdre-range-first r1) (xsdre-range-first r2))
-      (and (= (xsdre-range-first r1) (xsdre-range-first r2))
-	   (< (xsdre-range-last r1) (xsdre-range-last r2)))))
-
-(defun xsdre-check-range-list (range-list)
-  "Check that range-list is a range-list.
-Signal an error if it is not."
-  (let ((last nil))
-    (while range-list
-      (unless (consp range-list)
-	(error "Range list not a list"))
-      (let ((head (car range-list)))
-	(unless (or (integerp head)
-		    (and (consp head)
-			 (integerp (car head))
-			 (integerp (cdr head))))
-	  (error "Bad range %s" head))
-	(when (and last
-		   (not (< (1+ last) (xsdre-range-first head))))
-	  (error "Ranges not strictly increasing"))
-	(setq last (xsdre-range-last head)))
-      (setq range-list (cdr range-list))))
-  t)
-	
-;;; Compiling symbolic regexps to Emacs regexps
-
-(defun xsdre-from-symbolic (re)
-  "Return an Emacs regexp for the symbolic regexp RE."
-  (apply 'concat
-	 (nreverse (xsdre-compile-regexp re nil))))
-
-(defun xsdre-compile-regexp (re accum)
-  "Return a Emacs regular expression for the symbolic regexp RE.
-Returns a list of strings whose head is the regexp for RE
-and whose tail is ACCUM."
-  (cond ((not (consp re))
-	 (xsdre-compile-char-class re accum))
-	((eq (car re) 'choice)
-	 (setq accum (cons "\\(?:" accum))
-	 (let ((choices (cdr re)))
-	   (while choices
-	     (setq accum
-		   (xsdre-compile-regexp (car choices)
-					 accum))
-	     (setq choices (cdr choices))
-	     (when choices
-	       (setq accum
-		     (cons "\\|" accum)))))
-	 (cons "\\)" accum))
-	((eq (car re) 'sequence)
-	 (let ((members (cdr re)))
-	   (while members
-	     (setq accum (xsdre-compile-regexp (car members)
-					       accum))
-	     (setq members (cdr members))))
-	 accum)
-	((eq (car re) 'repeat)
-	 (let* ((sub (nth 1 re))
-		(lower (nth 2 re))
-		(upper (nth 3 re))
-		(need-paren (and (consp sub)
-				 (eq (car sub) 'sequence))))
-	   (when need-paren
-	     (setq accum (cons "\\(?:" accum)))
-	   (setq accum
-		 (xsdre-compile-regexp sub accum))
-	   (when need-paren
-	     (setq accum (cons "\\)" accum)))
-	   (cond ((not upper)
-		  (cond ((eq lower 0)
-			 (cons "*" accum))
-			((eq lower 1)
-			 (cons "+" accum))
-			(t
-			 (cons (concat "\\{"
-				       (number-to-string lower)
-				       ",\\}")
-			       accum))))
-		 ((eq lower upper)
-		  (cons (concat "\\{"
-				(number-to-string lower)
-				"\\}")
-			accum))
-		 ((and (eq lower 0) (eq upper 1))
-		  (cons "?" accum))
-		 (t
-		  (cons (concat "\\{"
-				(number-to-string lower)
-				","
-				(number-to-string upper)
-				"\\}")
-			accum)))))
-	(t (xsdre-compile-char-class re accum))))
-
-(defun xsdre-compile-char-class (cc accum)
-  "Return a Emacs regular expression for the symbolic character class CC.
-Returns a list of strings whose head is the regexp for CC
-and whose tail is ACCUM."
-  (cons (if (integerp cc)
-	    (xsdre-compile-single-char cc)
-	  (let ((ranges (xsdre-range-list-mule-intersection
-			 (xsdre-char-class-to-range-list cc))))
-	    (cond ((null ranges) "\001-\000")
-		  ((and (null (cdr ranges))
-			(= (xsdre-range-first (car ranges))
-			   (xsdre-range-last (car ranges))))
-		   (xsdre-compile-single-char
-		    (xsdre-range-first (car ranges))))
-		  (t (xsdre-range-list-to-char-alternative ranges)))))
-	accum))
-	      
-(defun xsdre-compile-single-char (ch)
-  (if (memq ch '(?. ?* ?+ ?? ?\[ ?\] ?^ ?$ ?\\))
-      (string ?\\ ch)
-    (string (decode-char 'ucs ch))))
-  
-(defun xsdre-char-class-to-range-list (cc)
-  "Return a range-list for a symbolic char-class."
-  (cond ((integerp cc) (list cc))
-	((symbolp cc)
-	 (or (get cc 'xsdre-ranges)
-	     (xsdre-char-class-to-range-list (get cc 'xsdre-char-class))))
-	((integerp (car cc))
-	 (if (= (car cc) (cdr cc))
-	     (car cc)
-	   cc))
-	((eq (car cc) 'union)
-	 (xsdre-range-list-union (mapcar 'xsdre-char-class-to-range-list
-					 (cdr cc))))
-	((eq (car cc) 'difference)
-	 (xsdre-range-list-difference
-	  (xsdre-char-class-to-range-list (nth 1 cc))
-	  (xsdre-char-class-to-range-list (nth 2 cc))))
-	((eq (car cc) 'range)
-	 (list (xsdre-make-range (nth 1 cc) (nth 2 cc))))
-	(t (error "Internal error in XSD regexp compilation: \
-unknown char-class %s" cc))))
-
-(defconst xsdre-mule-char-set-ranges
-  '((0 . 127)
-    (128 . 159)
-    (160 . 255)
-    (#x0100 . #x24ff)
-    (#x2500 . #x33ff)
-    (#xe000 . #xffff))
-  "List of ranges for the Mule character sets containing Unicode characters.")
-
-(defun xsdre-range-list-mule-intersection (range-list)
-  "Return the intersection of RANGE-LIST with the mule-supported ranges.
-Also split ranges so that no range spans more that one mule charset."
-  (when range-list
-    (let* ((char-set-ranges (cdr xsdre-mule-char-set-ranges))
-	   (mule-ranges nil)
-	   (char-set-first (caar xsdre-mule-char-set-ranges))
-	   (char-set-last (cdar xsdre-mule-char-set-ranges))
-	   (range (car range-list))
-	   (first (xsdre-range-first range))
-	   (last (xsdre-range-last range)))
-      (setq range-list (cdr range-list))
-      (while (progn
-	       (cond ((> first last)
-		      (if (null range-list)
-			  nil
-			(setq range (car range-list))
-			(setq first (xsdre-range-first range))
-			(setq last (xsdre-range-last range))
-			(setq range-list (cdr range-list))
-			t))
-		     ((< char-set-last first)
-		      (if (null char-set-ranges)
-			  nil
-			(setq char-set-first (caar char-set-ranges))
-			(setq char-set-last (cdar char-set-ranges))
-			(setq char-set-ranges (cdr char-set-ranges))
-			t))
-		     ((< first char-set-first)
-		      (setq first char-set-first))
-		     ;; Now we know that
-		     ;; first <= last
-		     ;; first <= char-set-last
-		     ;; first >= char-set-first
-		     ((<= last char-set-last)
-		      (setq mule-ranges
-			    (cons (xsdre-make-range first last)
-				  mule-ranges))
-		      (setq first (1+ last))
-		      t)
-		     (t
-		      (setq mule-ranges
-			    (cons (xsdre-make-range first char-set-last)
-				  mule-ranges))
-		      (setq first (1+ char-set-last))
-		      t))))
-      (nreverse mule-ranges))))
-
-(defun xsdre-range-list-to-char-alternative (range-list)
-  "Return a char alternative for a range-list.
-RANGE-LIST must contain more than integer.
-The char alternative is a string containing an Emacs regexp
-consisting of a single char alternative delimited with []."
-  (let (range caret close-bracket hyphen chars first last)
-    (while range-list
-      (setq range (car range-list))
-      (setq first (xsdre-range-first range))
-      (setq last (xsdre-range-last range))
-      (while (and (cond ((eq first ?^)
-			 (setq caret t)
-			 (setq first (1+ first)))
-			((eq first ?-)
-			 (setq hyphen t)
-			 (setq first (1+ first)))
-			((eq first ?\])
-			 (setq close-bracket t)
-			 (setq first (1+ first))))
-		  (<= first last)))
-      (when (<= first last)
-	(setq chars
-	      (cons first chars))
-	(when (< first last)
-	  (setq chars
-		(if (and (eq last (1+ first))
-			 (not (eq last ?-)))
-		    (cons last chars)
-		  (cons last (cons ?- chars))))))
-      (setq range-list (cdr range-list)))
-    (setq chars
-	  (mapcar (lambda (c)
-		    (decode-char 'ucs c))
-		  chars))
-    (when caret
-      (setq chars (cons ?^ chars)))
-    (when hyphen
-      (setq chars (cons ?- chars)))
-    (setq chars (cons ?\] chars))
-    (setq chars (nreverse chars))
-    (when close-bracket
-      (setq chars (cons ?\] chars)))
-    (when (equal chars '(?^ ?- ?\]))
-      (setq chars '(?- ?^ ?\])))
-    (setq chars (cons ?\[ chars))
-    (apply 'string chars)))
-      
-;;; Parsing
-
-(defvar xsdre-current-regexp nil
-  "List of characters remaining to be parsed. Dynamically bound.")
-
-(defun xsdre-to-symbolic (str)
-  "Convert a W3C XML Schema datatypes regexp to a symbolic form.
-
-The symbolic form has the following structure:
-
-REGEXP ::=
-  (sequence REGEXP ...)
-  | (choice REGEXP ...)
-  | (repeat REGEXP MIN MAX)
-  | CHAR-CLASS
-
-CHAR-CLASS ::=
-  CHAR
-  | SYMBOLIC-CHAR-CLASS
-  | RANGE
-  | (union CHAR-CLASS ...)
-  | (difference CHAR-CLASS CHAR-CLASS)
-
-RANGE ::= (range LOWER UPPER)
-
-MIN ::= INTEGER
-MAX ::= INTEGER | nil
-CHAR ::= UNICODE
-LOWER ::= UNICODE
-UPPER ::= UNICODE
-SYMBOLIC-CHAR-CLASS ::= SYMBOL
-
-where UNICODE is a integer specifying a Unicode code-point and
-SYMBOLIC-CHAR-CLASS is a symbol which has either a `xsdre-char-class'
-property whose value is a CHAR-CLASS, or a `xsdre-ranges' property
-whose value is a range-list."
-  (let ((xsdre-current-regexp (string-to-list str)))
-    (condition-case err
-	(let ((symbolic (xsdre-parse-regexp)))
-	  (if xsdre-current-regexp
-	      (xsdre-parse-error "Unexpected %c" (car xsdre-current-regexp))
-	    symbolic))
-      (xsdre-parse-error
-       (signal 'xsdre-invalid-regexp
-	       (list (apply 'format (cdr err))
-		     (- (length str)
-			(length xsdre-current-regexp))))))))
-
-(put 'xsdre-invalid-regexp
-     'error-conditions
-     '(error xsdre-invalid-regexp))
-
-(put 'xsdre-invalid-regexp
-     'error-message
-     "Invalid W3C XML Schema Datatypes regular expression")
-
-(defun xsdre-parse-regexp ()
-  (let ((branches nil))
-    (while (progn
-	     (setq branches (cons (xsdre-parse-branch) branches))
-	     (when (eq (car xsdre-current-regexp) ?|)
-	       (xsdre-advance)
-	       t)))
-    (if (null (cdr branches))
-	(car branches)
-      (cons 'choice (nreverse branches)))))
-
-(defun xsdre-parse-branch ()
-  (let (items)
-    (while (let ((item (xsdre-try-parse-atom)))
-	     (when item
-	       (let ((quantifier (xsdre-try-parse-quantifier)))
-		 (when quantifier
-		   (setq item
-			 (list 'repeat
-			       item
-			       (car quantifier)
-			       (cdr quantifier)))))
-	       (setq items (cons item items)))))
-    (cond ((null items) '(sequence))
-	  ((null (cdr items)) (car items))
-	  (t (cons 'sequence (nreverse items))))))
-
-(defun xsdre-try-parse-quantifier ()
-  (let ((ch (car xsdre-current-regexp)))
-    (cond ((eq ch ?*) (xsdre-advance) '(0 . nil))
-	  ((eq ch ?+) (xsdre-advance) '(1 . nil))
-	  ((eq ch ??) (xsdre-advance) '(0 . 1))
-	  ((eq ch ?{)
-	   (xsdre-advance)
-	   (let ((lower (xsdre-parse-bound)))
-	     (setq ch (car xsdre-current-regexp))
-	     (cond ((eq ch ?})
-		    (xsdre-advance)
-		    (cons lower lower))
-		   ((eq ch ?,)
-		    (xsdre-advance)
-		    (cond ((eq (car xsdre-current-regexp) ?})
-			   (xsdre-advance)
-			   (cons lower nil))
-			  (t
-			   (let ((upper (xsdre-parse-bound)))
-			     (xsdre-expect ?})
-			     (cons lower upper)))))
-		   (t (xsdre-parse-error "Expected , or }")))))
-	  (t nil))))
-			
-(defun xsdre-parse-bound ()
-  (let ((n 0))
-    (while (progn
-	     (let* ((ch (car xsdre-current-regexp))
-		    (digit (memq ch '(?9 ?8 ?7 ?6 ?5 ?4 ?3 ?2 ?1 ?0))))
-	       (unless digit
-		 (xsdre-parse-error "Expected a digit"))
-	       (setq n (+ (* n 10)
-			  (length (cdr digit)))))
-	     (xsdre-advance)
-	     (not (memq (car xsdre-current-regexp) '(?} ?,)))))
-    n))
-	
-
-(defun xsdre-try-parse-atom ()
-  (let ((ch (car xsdre-current-regexp)))
-    (cond  ((memq ch '(nil ?? ?* ?+ ?\) ?\{ ?\} ?| ?\])) nil)
-	   ((eq ch ?\\)
-	    (xsdre-advance)
-	    (xsdre-parse-escape))
-	   ((eq ch ?\()
-	    (xsdre-advance)
-	    (let ((ret (xsdre-parse-regexp)))
-	      (xsdre-expect ?\))
-	      ret))
-	   ((eq ch ?\[)
-	    (xsdre-parse-char-class))
-	   ((eq ch ?.)
-	    (xsdre-advance)
-	    'dot)
-	   (t
-	    (let ((uc (encode-char ch 'ucs)))
-	      (unless uc
-		(xsdre-parse-error "%c is not a Unicode character" ch))
-	      (xsdre-advance) uc)))))
-
-(defun xsdre-parse-char-class ()
-  (xsdre-advance)
-  (let (compl members ret)
-    (when (eq (car xsdre-current-regexp) ?^)
-      (setq compl t)
-      (xsdre-advance))
-    (while (let ((member (xsdre-parse-char-class-member))
-		 uc1 uc2)
-	     (cond ((eq (car xsdre-current-regexp) ?\-)
-		    (xsdre-advance)
-		    (cond ((eq (car xsdre-current-regexp) ?\[)
-			   (setq members (cons member members))
-			   nil)
-			  ((not (integerp member))
-			   (xsdre-parse-error "Lower bound is not a single character"))
-			  ((not (setq uc1
-				      (encode-char member 'ucs)))
-			   (xsdre-parse-error "Lower bound %c is not a Unicode character"
-				  member))
-			  (t
-			   (let ((upper (xsdre-parse-char-class-member)))
-			     (unless (integerp upper)
-			       (xsdre-parse-error "Upper bound is not a single character"))
-			     (unless (setq uc2
-					   (encode-char upper 'ucs))
-			       (xsdre-parse-error "Upper bound %c is not a Unicode character" upper))
-			     (setq members
-				   (cons (list 'range uc1 uc2)
-					 members)))
-			   (not (eq (car xsdre-current-regexp) ?\])))))
-		   (t (setq members (cons member members))
-		      (not (eq (car xsdre-current-regexp) ?\]))))))
-    (setq members (nreverse members))
-    (if (null (cdr members))
-	(setq ret (car members))
-      (setq ret (cons 'union members)))
-    (when compl
-      (setq ret (list 'difference 'any ret)))
-    (when (eq (car xsdre-current-regexp) ?\[)
-      (setq ret
-	    (list 'difference ret (xsdre-parse-char-class))))
-    (xsdre-expect ?\])
-    ret))
-
-(defun xsdre-parse-char-class-member ()
-  (let ((ch (car xsdre-current-regexp)))
-    (cond ((null ch)
-	   (xsdre-parse-error "Expected ]"))
-	  ((eq ch ?\\)
-	   (xsdre-advance)
-	   (xsdre-parse-escape))
-	  ((memq ch '(?\[ ?\] ?-))
-	   (xsdre-parse-error "%c must be quoted in a character class" ch))
-	  (t (xsdre-advance) ch))))
-
-(defconst xsdre-single-escape
-  '((?s . space)
-    (?i . name-initial)
-    (?c . name-continue)
-    (?d . digit)
-    (?w . word)))
-
-(defun xsdre-parse-escape ()
-  (let ((ch (car xsdre-current-regexp)))
-    (xsdre-advance)
-    (cond ((memq ch '(?\\ ?| ?. ?- ?^ ?* ?+ ?( ?) ?{ ?} ?[ ?])) ch)
-	  ((eq ch ?r) ?\r)
-	  ((eq ch ?n) ?\n)
-	  ((eq ch ?t) ?\t)
-	  ((cdr (assq ch xsdre-single-escape)))
-	  ((let ((positive
-		  (cdr (assq (downcase ch) xsdre-single-escape))))
-	     (and positive
-		  (list 'difference 'any positive))))
-	  ((eq ch ?p) (xsdre-parse-prop))
-	  ((eq ch ?P) (list 'difference 'any (xsdre-parse-prop)))
-	  (t (if ch
-		 (xsdre-parse-error "Missing char after \\")
-	       (xsdre-parse-error "Bad escape %c" ch))))))
-	
-(defun xsdre-parse-prop ()
-  (xsdre-expect ?{)
-  (let ((name nil))
-    (while (not (eq (car xsdre-current-regexp) ?\}))
-      (unless xsdre-current-regexp
-	(xsdre-parse-error "Expected ?"))
-      (setq name (cons (car xsdre-current-regexp)
-		       name))
-      (xsdre-advance))
-    (xsdre-advance)
-    (setq name (nreverse name))
-    (cond ((null name) (xsdre-parse-error "Empty property name"))
-	  ((null (cdr name))
-	   (let ((category (intern (string (car name)))))
-	     (unless (get category 'xsdre-unicode-category)
-	       (xsdre-parse-error "%s is not a category" category))
-	     category))
-	  ((null (cddr name))
-	   (let ((category (intern (string (car name) (cadr name)))))
-	     (unless (get category 'xsdre-unicode-category)
-	       (xsdre-parse-error "%s is not a category" category))
-	     category))
-	  ((not (and (eq (car name) ?I)
-		     (eq (cadr name) ?s)))
-	   (xsdre-parse-error "Block name does not start with Is"))
-	  (t
-	   (let ((block (intern (apply 'string (cddr name)))))
-	     (unless (get block 'xsdre-unicode-block)
-	       (xsdre-parse-error "%s is not a block name" block))
-	     block)))))
-
-(defun xsdre-expect (ch)
-  (if (eq (car xsdre-current-regexp) ch)
-      (xsdre-advance)
-    (xsdre-parse-error "Expected %c" ch)))
-    
-(defun xsdre-advance ()
-  (setq xsdre-current-regexp
-	(cdr xsdre-current-regexp)))
-
-(defun xsdre-parse-error (&rest args)
-  (signal 'xsdre-parse-error args))
-
-;; This error condition is used only internally.
-
-(put 'xsdre-parse-error
-     'error-conditions
-     '(error xsdre-parse-error))
-
-(put 'xsdre-parse-error
-     'error-message
-     "Internal error in parsing XSD regexp")
-     
-;;; Character class data
-
-(put 'dot 'xsdre-char-class '(difference any (union #xA #xD)))
-(put 'digit 'xsdre-char-class 'Nd)
-(put 'word 'xsdre-char-class '(difference any (union P Z C)))
-(put 'space 'xsdre-char-class '(union #x9 #xA #xD #x20))
-(put 'any 'xsdre-ranges '((#x0 . #x10FFFF)))
-
-(defconst xsdre-gen-categories
-  '(Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd
-       Ps Pe Pi Pf Po Zs Zl Zp Sm Sc Sk So Cc Cf Co))
-
-(defun xsdre-gen-categories (file)
-  "Use a UnicodeData file to generate code to initialize Unicode categories.
-Code is inserted into the current buffer."
-  (interactive "fUnicodeData file: ")
-  (save-excursion
-    (set-buffer (find-file-noselect file))
-    (goto-char (point-min))
-    (mapcar (lambda (x) (put x 'xsdre-ranges nil)) xsdre-gen-categories)
-    (while (re-search-forward "^\\([0-9A-Fa-f]*\\);[^;]*;\\([A-Z][a-z]\\);"
-			      nil
-			      t)
-      (let* ((sym (intern (match-string-no-properties 2)))
-	     (code (string-to-number (match-string-no-properties 1)
-				     16))
-	     (ranges (get sym 'xsdre-ranges))
-	     (last-range (car ranges))
-	     (forced-range (string= (buffer-substring-no-properties
-				     (- (match-beginning 2) 6)
-				     (1- (match-beginning 2)))
-				    "Last>")))
-	(cond ((and (integerp last-range)
-		    (or forced-range
-			(eq code (1+ last-range))))
-	       (put sym
-		    'xsdre-ranges
-		    (cons (cons last-range code)
-			  (cdr ranges))))
-	      ((and (consp last-range)
-		    (or forced-range
-			(eq code (1+ (cdr last-range)))))
-	       (put sym
-		    'xsdre-ranges
-		    (cons (cons (car last-range) code)
-			  (cdr ranges))))
-	      (t
-	       (put sym 'xsdre-ranges (cons code ranges))))))
-    (mapcar (lambda (x)
-	      (put x
-		   'xsdre-ranges
-		   (nreverse (get x 'xsdre-ranges)))
-	      nil)
-	    xsdre-gen-categories))
-  (mapcar (lambda (x)
-	    (let ((start (point)))
-	      (pp (list 'xsdre-def-primitive-category
-			(list 'quote x)
-			(list 'quote (get x 'xsdre-ranges)))
-		  (current-buffer))
-	      (save-excursion
-		(goto-char start)
-		(down-list 2)
-		(while (condition-case err
-			   (progn 
-			     (forward-sexp)
-			     t)
-			 (error nil))
-		  (when (and (< 70 (current-column))
-			     (not (looking-at ")")))
-		    (insert "\n")
-		    (lisp-indent-line))))))
-	  xsdre-gen-categories))
-
-(defun xsdre-def-primitive-category (sym ranges)
-  (put sym 'xsdre-ranges ranges)
-  (put sym 'xsdre-unicode-category t))
-
-;;; Blocks
-
-(defun xsdre-def-block (sym ranges)
-  (put sym 'xsdre-ranges ranges)
-  (put sym 'xsdre-unicode-block t))
-
-(xsdre-def-block 'BasicLatin '((#x0000 . #x007F)))
-(xsdre-def-block 'Latin-1Supplement '((#x0080 . #x00FF)))
-(xsdre-def-block 'LatinExtended-A '((#x0100 . #x017F)))
-(xsdre-def-block 'LatinExtended-B '((#x0180 . #x024F)))
-(xsdre-def-block 'IPAExtensions '((#x0250 . #x02AF)))
-(xsdre-def-block 'SpacingModifierLetters '((#x02B0 . #x02FF)))
-(xsdre-def-block 'CombiningDiacriticalMarks '((#x0300 . #x036F)))
-(xsdre-def-block 'Greek '((#x0370 . #x03FF)))
-(xsdre-def-block 'Cyrillic '((#x0400 . #x04FF)))
-(xsdre-def-block 'Armenian '((#x0530 . #x058F)))
-(xsdre-def-block 'Hebrew '((#x0590 . #x05FF)))
-(xsdre-def-block 'Arabic '((#x0600 . #x06FF)))
-(xsdre-def-block 'Syriac '((#x0700 . #x074F)))
-(xsdre-def-block 'Thaana '((#x0780 . #x07BF)))
-(xsdre-def-block 'Devanagari '((#x0900 . #x097F)))
-(xsdre-def-block 'Bengali '((#x0980 . #x09FF)))
-(xsdre-def-block 'Gurmukhi '((#x0A00 . #x0A7F)))
-(xsdre-def-block 'Gujarati '((#x0A80 . #x0AFF)))
-(xsdre-def-block 'Oriya '((#x0B00 . #x0B7F)))
-(xsdre-def-block 'Tamil '((#x0B80 . #x0BFF)))
-(xsdre-def-block 'Telugu '((#x0C00 . #x0C7F)))
-(xsdre-def-block 'Kannada '((#x0C80 . #x0CFF)))
-(xsdre-def-block 'Malayalam '((#x0D00 . #x0D7F)))
-(xsdre-def-block 'Sinhala '((#x0D80 . #x0DFF)))
-(xsdre-def-block 'Thai '((#x0E00 . #x0E7F)))
-(xsdre-def-block 'Lao '((#x0E80 . #x0EFF)))
-(xsdre-def-block 'Tibetan '((#x0F00 . #x0FFF)))
-(xsdre-def-block 'Myanmar '((#x1000 . #x109F)))
-(xsdre-def-block 'Georgian '((#x10A0 . #x10FF)))
-(xsdre-def-block 'HangulJamo '((#x1100 . #x11FF)))
-(xsdre-def-block 'Ethiopic '((#x1200 . #x137F)))
-(xsdre-def-block 'Cherokee '((#x13A0 . #x13FF)))
-(xsdre-def-block 'UnifiedCanadianAboriginalSyllabics '((#x1400 . #x167F)))
-(xsdre-def-block 'Ogham '((#x1680 . #x169F)))
-(xsdre-def-block 'Runic '((#x16A0 . #x16FF)))
-(xsdre-def-block 'Khmer '((#x1780 . #x17FF)))
-(xsdre-def-block 'Mongolian '((#x1800 . #x18AF)))
-(xsdre-def-block 'LatinExtendedAdditional '((#x1E00 . #x1EFF)))
-(xsdre-def-block 'GreekExtended '((#x1F00 . #x1FFF)))
-(xsdre-def-block 'GeneralPunctuation '((#x2000 . #x206F)))
-(xsdre-def-block 'SuperscriptsandSubscripts '((#x2070 . #x209F)))
-(xsdre-def-block 'CurrencySymbols '((#x20A0 . #x20CF)))
-(xsdre-def-block 'CombiningMarksforSymbols '((#x20D0 . #x20FF)))
-(xsdre-def-block 'LetterlikeSymbols '((#x2100 . #x214F)))
-(xsdre-def-block 'NumberForms '((#x2150 . #x218F)))
-(xsdre-def-block 'Arrows '((#x2190 . #x21FF)))
-(xsdre-def-block 'MathematicalOperators '((#x2200 . #x22FF)))
-(xsdre-def-block 'MiscellaneousTechnical '((#x2300 . #x23FF)))
-(xsdre-def-block 'ControlPictures '((#x2400 . #x243F)))
-(xsdre-def-block 'OpticalCharacterRecognition '((#x2440 . #x245F)))
-(xsdre-def-block 'EnclosedAlphanumerics '((#x2460 . #x24FF)))
-(xsdre-def-block 'BoxDrawing '((#x2500 . #x257F)))
-(xsdre-def-block 'BlockElements '((#x2580 . #x259F)))
-(xsdre-def-block 'GeometricShapes '((#x25A0 . #x25FF)))
-(xsdre-def-block 'MiscellaneousSymbols '((#x2600 . #x26FF)))
-(xsdre-def-block 'Dingbats '((#x2700 . #x27BF)))
-(xsdre-def-block 'BraillePatterns '((#x2800 . #x28FF)))
-(xsdre-def-block 'CJKRadicalsSupplement '((#x2E80 . #x2EFF)))
-(xsdre-def-block 'KangxiRadicals '((#x2F00 . #x2FDF)))
-(xsdre-def-block 'IdeographicDescriptionCharacters '((#x2FF0 . #x2FFF)))
-(xsdre-def-block 'CJKSymbolsandPunctuation '((#x3000 . #x303F)))
-(xsdre-def-block 'Hiragana '((#x3040 . #x309F)))
-(xsdre-def-block 'Katakana '((#x30A0 . #x30FF)))
-(xsdre-def-block 'Bopomofo '((#x3100 . #x312F)))
-(xsdre-def-block 'HangulCompatibilityJamo '((#x3130 . #x318F)))
-(xsdre-def-block 'Kanbun '((#x3190 . #x319F)))
-(xsdre-def-block 'BopomofoExtended '((#x31A0 . #x31BF)))
-(xsdre-def-block 'EnclosedCJKLettersandMonths '((#x3200 . #x32FF)))
-(xsdre-def-block 'CJKCompatibility '((#x3300 . #x33FF)))
-(xsdre-def-block 'CJKUnifiedIdeographsExtensionA '((#x3400 . #x4DB5)))
-(xsdre-def-block 'CJKUnifiedIdeographs '((#x4E00 . #x9FFF)))
-(xsdre-def-block 'YiSyllables '((#xA000 . #xA48F)))
-(xsdre-def-block 'YiRadicals '((#xA490 . #xA4CF)))
-(xsdre-def-block 'HangulSyllables '((#xAC00 . #xD7A3)))
-;;(xsdre-def-block 'HighSurrogates '((#xD800 . #xDB7F)))
-;;(xsdre-def-block 'HighPrivateUseSurrogates '((#xDB80 . #xDBFF)))
-;;(xsdre-def-block 'LowSurrogates '((#xDC00 . #xDFFF)))
-(xsdre-def-block 'CJKCompatibilityIdeographs '((#xF900 . #xFAFF)))
-(xsdre-def-block 'AlphabeticPresentationForms '((#xFB00 . #xFB4F)))
-(xsdre-def-block 'ArabicPresentationForms-A '((#xFB50 . #xFDFF)))
-(xsdre-def-block 'CombiningHalfMarks '((#xFE20 . #xFE2F)))
-(xsdre-def-block 'CJKCompatibilityForms '((#xFE30 . #xFE4F)))
-(xsdre-def-block 'SmallFormVariants '((#xFE50 . #xFE6F)))
-(xsdre-def-block 'ArabicPresentationForms-B '((#xFE70 . #xFEFE)))
-(xsdre-def-block 'Specials '((#xFEFF . #xFEFF)))
-(xsdre-def-block 'HalfwidthandFullwidthForms '((#xFF00 . #xFFEF)))
-(xsdre-def-block 'Specials '((#xFFF0 . #xFFFD)))
-(xsdre-def-block 'OldItalic '((#x10300 . #x1032F)))
-(xsdre-def-block 'Gothic '((#x10330 . #x1034F)))
-(xsdre-def-block 'Deseret '((#x10400 . #x1044F)))
-(xsdre-def-block 'ByzantineMusicalSymbols '((#x1D000 . #x1D0FF)))
-(xsdre-def-block 'MusicalSymbols '((#x1D100 . #x1D1FF)))
-(xsdre-def-block 'MathematicalAlphanumericSymbols '((#x1D400 . #x1D7FF)))
-(xsdre-def-block 'CJKUnifiedIdeographsExtensionB '((#x20000 . #x2A6D6)))
-(xsdre-def-block 'CJKCompatibilityIdeographsSupplement '((#x2F800 . #x2FA1F)))
-(xsdre-def-block 'Tags '((#xE0000 . #xE007F)))
-(xsdre-def-block 'PrivateUse '((#xE000 . #xF8FF)
-			       (#xF0000 . #xFFFFD)
-			       (#x100000 . #x10FFFD)))
-
-;;; Categories
-
-;;; Derived categories
-
-(defun xsdre-def-derived-category (sym char-class)
-  (put sym 'xsdre-char-class char-class)
-  (put sym 'xsdre-unicode-category t))
-
-(xsdre-def-derived-category 'L '(union Lu Ll Lt Lm Lo))
-(xsdre-def-derived-category 'M '(union Mn Mc Me))
-(xsdre-def-derived-category 'N '(union Nd Nl No))
-(xsdre-def-derived-category 'P '(union Pc Pd Ps Pe Pi Pf Po))
-(xsdre-def-derived-category 'Z '(union Zs Zl Zp))
-(xsdre-def-derived-category 'S '(union Sm Sc Sk So))
-(xsdre-def-derived-category 'C '(union Cc Cf Co Cn))
-(xsdre-def-derived-category 'Cn '(difference any
-					     (union L M N P Z S Cc Cf Co)))
-
-(xsdre-def-primitive-category
- 'name-initial
- '(#x003a
-   (#x0041 . #x005a)
-   #x005f
-   (#x0061 . #x007a)
-   (#x00c0 . #x00d6)
-   (#x00d8 . #x00f6)
-   (#x00f8 . #x0131)
-   (#x0134 . #x013e)
-   (#x0141 . #x0148)
-   (#x014a . #x017e)
-   (#x0180 . #x01c3)
-   (#x01cd . #x01f0)
-   (#x01f4 . #x01f5)
-   (#x01fa . #x0217)
-   (#x0250 . #x02a8)
-   (#x02bb . #x02c1)
-   #x0386
-   (#x0388 . #x038a)
-   #x038c
-   (#x038e . #x03a1)
-   (#x03a3 . #x03ce)
-   (#x03d0 . #x03d6)
-   #x03da
-   #x03dc
-   #x03de
-   #x03e0
-   (#x03e2 . #x03f3)
-   (#x0401 . #x040c)
-   (#x040e . #x044f)
-   (#x0451 . #x045c)
-   (#x045e . #x0481)
-   (#x0490 . #x04c4)
-   (#x04c7 . #x04c8)
-   (#x04cb . #x04cc)
-   (#x04d0 . #x04eb)
-   (#x04ee . #x04f5)
-   (#x04f8 . #x04f9)
-   (#x0531 . #x0556)
-   #x0559
-   (#x0561 . #x0586)
-   (#x05d0 . #x05ea)
-   (#x05f0 . #x05f2)
-   (#x0621 . #x063a)
-   (#x0641 . #x064a)
-   (#x0671 . #x06b7)
-   (#x06ba . #x06be)
-   (#x06c0 . #x06ce)
-   (#x06d0 . #x06d3)
-   #x06d5
-   (#x06e5 . #x06e6)
-   (#x0905 . #x0939)
-   #x093d
-   (#x0958 . #x0961)
-   (#x0985 . #x098c)
-   (#x098f . #x0990)
-   (#x0993 . #x09a8)
-   (#x09aa . #x09b0)
-   #x09b2
-   (#x09b6 . #x09b9)
-   (#x09dc . #x09dd)
-   (#x09df . #x09e1)
-   (#x09f0 . #x09f1)
-   (#x0a05 . #x0a0a)
-   (#x0a0f . #x0a10)
-   (#x0a13 . #x0a28)
-   (#x0a2a . #x0a30)
-   (#x0a32 . #x0a33)
-   (#x0a35 . #x0a36)
-   (#x0a38 . #x0a39)
-   (#x0a59 . #x0a5c)
-   #x0a5e
-   (#x0a72 . #x0a74)
-   (#x0a85 . #x0a8b)
-   #x0a8d
-   (#x0a8f . #x0a91)
-   (#x0a93 . #x0aa8)
-   (#x0aaa . #x0ab0)
-   (#x0ab2 . #x0ab3)
-   (#x0ab5 . #x0ab9)
-   #x0abd
-   #x0ae0
-   (#x0b05 . #x0b0c)
-   (#x0b0f . #x0b10)
-   (#x0b13 . #x0b28)
-   (#x0b2a . #x0b30)
-   (#x0b32 . #x0b33)
-   (#x0b36 . #x0b39)
-   #x0b3d
-   (#x0b5c . #x0b5d)
-   (#x0b5f . #x0b61)
-   (#x0b85 . #x0b8a)
-   (#x0b8e . #x0b90)
-   (#x0b92 . #x0b95)
-   (#x0b99 . #x0b9a)
-   #x0b9c
-   (#x0b9e . #x0b9f)
-   (#x0ba3 . #x0ba4)
-   (#x0ba8 . #x0baa)
-   (#x0bae . #x0bb5)
-   (#x0bb7 . #x0bb9)
-   (#x0c05 . #x0c0c)
-   (#x0c0e . #x0c10)
-   (#x0c12 . #x0c28)
-   (#x0c2a . #x0c33)
-   (#x0c35 . #x0c39)
-   (#x0c60 . #x0c61)
-   (#x0c85 . #x0c8c)
-   (#x0c8e . #x0c90)
-   (#x0c92 . #x0ca8)
-   (#x0caa . #x0cb3)
-   (#x0cb5 . #x0cb9)
-   #x0cde
-   (#x0ce0 . #x0ce1)
-   (#x0d05 . #x0d0c)
-   (#x0d0e . #x0d10)
-   (#x0d12 . #x0d28)
-   (#x0d2a . #x0d39)
-   (#x0d60 . #x0d61)
-   (#x0e01 . #x0e2e)
-   #x0e30
-   (#x0e32 . #x0e33)
-   (#x0e40 . #x0e45)
-   (#x0e81 . #x0e82)
-   #x0e84
-   (#x0e87 . #x0e88)
-   #x0e8a
-   #x0e8d
-   (#x0e94 . #x0e97)
-   (#x0e99 . #x0e9f)
-   (#x0ea1 . #x0ea3)
-   #x0ea5
-   #x0ea7
-   (#x0eaa . #x0eab)
-   (#x0ead . #x0eae)
-   #x0eb0
-   (#x0eb2 . #x0eb3)
-   #x0ebd
-   (#x0ec0 . #x0ec4)
-   (#x0f40 . #x0f47)
-   (#x0f49 . #x0f69)
-   (#x10a0 . #x10c5)
-   (#x10d0 . #x10f6)
-   #x1100
-   (#x1102 . #x1103)
-   (#x1105 . #x1107)
-   #x1109
-   (#x110b . #x110c)
-   (#x110e . #x1112)
-   #x113c
-   #x113e
-   #x1140
-   #x114c
-   #x114e
-   #x1150
-   (#x1154 . #x1155)
-   #x1159
-   (#x115f . #x1161)
-   #x1163
-   #x1165
-   #x1167
-   #x1169
-   (#x116d . #x116e)
-   (#x1172 . #x1173)
-   #x1175
-   #x119e
-   #x11a8
-   #x11ab
-   (#x11ae . #x11af)
-   (#x11b7 . #x11b8)
-   #x11ba
-   (#x11bc . #x11c2)
-   #x11eb
-   #x11f0
-   #x11f9
-   (#x1e00 . #x1e9b)
-   (#x1ea0 . #x1ef9)
-   (#x1f00 . #x1f15)
-   (#x1f18 . #x1f1d)
-   (#x1f20 . #x1f45)
-   (#x1f48 . #x1f4d)
-   (#x1f50 . #x1f57)
-   #x1f59
-   #x1f5b
-   #x1f5d
-   (#x1f5f . #x1f7d)
-   (#x1f80 . #x1fb4)
-   (#x1fb6 . #x1fbc)
-   #x1fbe
-   (#x1fc2 . #x1fc4)
-   (#x1fc6 . #x1fcc)
-   (#x1fd0 . #x1fd3)
-   (#x1fd6 . #x1fdb)
-   (#x1fe0 . #x1fec)
-   (#x1ff2 . #x1ff4)
-   (#x1ff6 . #x1ffc)
-   #x2126
-   (#x212a . #x212b)
-   #x212e
-   (#x2180 . #x2182)
-   #x3007
-   (#x3021 . #x3029)
-   (#x3041 . #x3094)
-   (#x30a1 . #x30fa)
-   (#x3105 . #x312c)
-   (#x4e00 . #x9fa5)
-   (#xac00 . #xd7a3)))
-
-(xsdre-def-derived-category 'name-continue '(union name-initial
-						   name-continue-not-initial))
-			  
-(xsdre-def-primitive-category 
- 'name-continue-not-initial
- '((#x002d . #x002e)
-   (#x0030 . #x0039)
-   #x00b7
-   (#x02d0 . #x02d1)
-   (#x0300 . #x0345)
-   (#x0360 . #x0361)
-   #x0387
-   (#x0483 . #x0486)
-   (#x0591 . #x05a1)
-   (#x05a3 . #x05b9)
-   (#x05bb . #x05bd)
-   #x05bf
-   (#x05c1 . #x05c2)
-   #x05c4
-   #x0640
-   (#x064b . #x0652)
-   (#x0660 . #x0669)
-   #x0670
-   (#x06d6 . #x06dc)
-   (#x06dd . #x06df)
-   (#x06e0 . #x06e4)
-   (#x06e7 . #x06e8)
-   (#x06ea . #x06ed)
-   (#x06f0 . #x06f9)
-   (#x0901 . #x0903)
-   #x093c
-   (#x093e . #x094c)
-   #x094d
-   (#x0951 . #x0954)
-   (#x0962 . #x0963)
-   (#x0966 . #x096f)
-   (#x0981 . #x0983)
-   #x09bc
-   (#x09be . #x09bf)
-   (#x09c0 . #x09c4)
-   (#x09c7 . #x09c8)
-   (#x09cb . #x09cd)
-   #x09d7
-   (#x09e2 . #x09e3)
-   (#x09e6 . #x09ef)
-   #x0a02
-   #x0a3c
-   (#x0a3e . #x0a42)
-   (#x0a47 . #x0a48)
-   (#x0a4b . #x0a4d)
-   (#x0a66 . #x0a6f)
-   (#x0a70 . #x0a71)
-   (#x0a81 . #x0a83)
-   #x0abc
-   (#x0abe . #x0ac5)
-   (#x0ac7 . #x0ac9)
-   (#x0acb . #x0acd)
-   (#x0ae6 . #x0aef)
-   (#x0b01 . #x0b03)
-   #x0b3c
-   (#x0b3e . #x0b43)
-   (#x0b47 . #x0b48)
-   (#x0b4b . #x0b4d)
-   (#x0b56 . #x0b57)
-   (#x0b66 . #x0b6f)
-   (#x0b82 . #x0b83)
-   (#x0bbe . #x0bc2)
-   (#x0bc6 . #x0bc8)
-   (#x0bca . #x0bcd)
-   #x0bd7
-   (#x0be7 . #x0bef)
-   (#x0c01 . #x0c03)
-   (#x0c3e . #x0c44)
-   (#x0c46 . #x0c48)
-   (#x0c4a . #x0c4d)
-   (#x0c55 . #x0c56)
-   (#x0c66 . #x0c6f)
-   (#x0c82 . #x0c83)
-   (#x0cbe . #x0cc4)
-   (#x0cc6 . #x0cc8)
-   (#x0cca . #x0ccd)
-   (#x0cd5 . #x0cd6)
-   (#x0ce6 . #x0cef)
-   (#x0d02 . #x0d03)
-   (#x0d3e . #x0d43)
-   (#x0d46 . #x0d48)
-   (#x0d4a . #x0d4d)
-   #x0d57
-   (#x0d66 . #x0d6f)
-   #x0e31
-   (#x0e34 . #x0e3a)
-   (#x0e46 . #x0e4e)
-   (#x0e50 . #x0e59)
-   #x0eb1
-   (#x0eb4 . #x0eb9)
-   (#x0ebb . #x0ebc)
-   #x0ec6
-   (#x0ec8 . #x0ecd)
-   (#x0ed0 . #x0ed9)
-   (#x0f18 . #x0f19)
-   (#x0f20 . #x0f29)
-   #x0f35
-   #x0f37
-   #x0f39
-   (#x0f3e . #x0f3f)
-   (#x0f71 . #x0f84)
-   (#x0f86 . #x0f8b)
-   (#x0f90 . #x0f95)
-   #x0f97
-   (#x0f99 . #x0fad)
-   (#x0fb1 . #x0fb7)
-   #x0fb9
-   (#x20d0 . #x20dc)
-   #x20e1
-   #x3005
-   (#x302a . #x302f)
-   (#x3031 . #x3035)
-   #x3099
-   #x309a
-   (#x309d . #x309e)
-   (#x30fc . #x30fe)))
-
-;;; Auto-generated section.
-
-;; The rest of the file was auto-generated by doing M-x xsdre-gen-categories
-;; on UnicodeData-3.1.0.txt available from
-;; http://www.unicode.org/Public/3.1-Update/UnicodeData-3.1.0.txt
-
-(xsdre-def-primitive-category 'Lu
-			      '((65 . 90)
-				(192 . 214)
-				(216 . 222)
-				256 258 260 262 264 266 268 270 272 274 276
-				278 280 282 284 286 288 290 292 294 296 298
-				300 302 304 306 308 310 313 315 317 319 321
-				323 325 327 330 332 334 336 338 340 342 344
-				346 348 350 352 354 356 358 360 362 364 366
-				368 370 372 374
-				(376 . 377)
-				379 381
-				(385 . 386)
-				388
-				(390 . 391)
-				(393 . 395)
-				(398 . 401)
-				(403 . 404)
-				(406 . 408)
-				(412 . 413)
-				(415 . 416)
-				418 420
-				(422 . 423)
-				425 428
-				(430 . 431)
-				(433 . 435)
-				437
-				(439 . 440)
-				444 452 455 458 461 463 465 467 469 471 473
-				475 478 480 482 484 486 488 490 492 494 497
-				500
-				(502 . 504)
-				506 508 510 512 514 516 518 520 522 524 526
-				528 530 532 534 536 538 540 542 546 548 550
-				552 554 556 558 560 562 902
-				(904 . 906)
-				908
-				(910 . 911)
-				(913 . 929)
-				(931 . 939)
-				(978 . 980)
-				986 988 990 992 994 996 998 1000 1002 1004
-				1006 1012
-				(1024 . 1071)
-				1120 1122 1124 1126 1128 1130 1132 1134 1136
-				1138 1140 1142 1144 1146 1148 1150 1152 1164
-				1166 1168 1170 1172 1174 1176 1178 1180 1182
-				1184 1186 1188 1190 1192 1194 1196 1198 1200
-				1202 1204 1206 1208 1210 1212 1214
-				(1216 . 1217)
-				1219 1223 1227 1232 1234 1236 1238 1240 1242
-				1244 1246 1248 1250 1252 1254 1256 1258 1260
-				1262 1264 1266 1268 1272
-				(1329 . 1366)
-				(4256 . 4293)
-				7680 7682 7684 7686 7688 7690 7692 7694 7696
-				7698 7700 7702 7704 7706 7708 7710 7712 7714
-				7716 7718 7720 7722 7724 7726 7728 7730 7732
-				7734 7736 7738 7740 7742 7744 7746 7748 7750
-				7752 7754 7756 7758 7760 7762 7764 7766 7768
-				7770 7772 7774 7776 7778 7780 7782 7784 7786
-				7788 7790 7792 7794 7796 7798 7800 7802 7804
-				7806 7808 7810 7812 7814 7816 7818 7820 7822
-				7824 7826 7828 7840 7842 7844 7846 7848 7850
-				7852 7854 7856 7858 7860 7862 7864 7866 7868
-				7870 7872 7874 7876 7878 7880 7882 7884 7886
-				7888 7890 7892 7894 7896 7898 7900 7902 7904
-				7906 7908 7910 7912 7914 7916 7918 7920 7922
-				7924 7926 7928
-				(7944 . 7951)
-				(7960 . 7965)
-				(7976 . 7983)
-				(7992 . 7999)
-				(8008 . 8013)
-				8025 8027 8029 8031
-				(8040 . 8047)
-				(8120 . 8123)
-				(8136 . 8139)
-				(8152 . 8155)
-				(8168 . 8172)
-				(8184 . 8187)
-				8450 8455
-				(8459 . 8461)
-				(8464 . 8466)
-				8469
-				(8473 . 8477)
-				8484 8486 8488
-				(8490 . 8493)
-				(8496 . 8497)
-				8499
-				(65313 . 65338)
-				(66560 . 66597)
-				(119808 . 119833)
-				(119860 . 119885)
-				(119912 . 119937)
-				119964
-				(119966 . 119967)
-				119970
-				(119973 . 119974)
-				(119977 . 119980)
-				(119982 . 119989)
-				(120016 . 120041)
-				(120068 . 120069)
-				(120071 . 120074)
-				(120077 . 120084)
-				(120086 . 120092)
-				(120120 . 120121)
-				(120123 . 120126)
-				(120128 . 120132)
-				120134
-				(120138 . 120144)
-				(120172 . 120197)
-				(120224 . 120249)
-				(120276 . 120301)
-				(120328 . 120353)
-				(120380 . 120405)
-				(120432 . 120457)
-				(120488 . 120512)
-				(120546 . 120570)
-				(120604 . 120628)
-				(120662 . 120686)
-				(120720 . 120744)))
-(xsdre-def-primitive-category 'Ll
-			      '((97 . 122)
-				170 181 186
-				(223 . 246)
-				(248 . 255)
-				257 259 261 263 265 267 269 271 273 275 277
-				279 281 283 285 287 289 291 293 295 297 299
-				301 303 305 307 309
-				(311 . 312)
-				314 316 318 320 322 324 326
-				(328 . 329)
-				331 333 335 337 339 341 343 345 347 349 351
-				353 355 357 359 361 363 365 367 369 371 373
-				375 378 380
-				(382 . 384)
-				387 389 392
-				(396 . 397)
-				402 405
-				(409 . 411)
-				414 417 419 421 424
-				(426 . 427)
-				429 432 436 438
-				(441 . 442)
-				(445 . 447)
-				454 457 460 462 464 466 468 470 472 474
-				(476 . 477)
-				479 481 483 485 487 489 491 493
-				(495 . 496)
-				499 501 505 507 509 511 513 515 517 519 521
-				523 525 527 529 531 533 535 537 539 541 543
-				547 549 551 553 555 557 559 561 563
-				(592 . 685)
-				912
-				(940 . 974)
-				(976 . 977)
-				(981 . 983)
-				987 989 991 993 995 997 999 1001 1003 1005
-			      
-				(1007 . 1011)
-				1013
-				(1072 . 1119)
-				1121 1123 1125 1127 1129 1131 1133 1135 1137
-				1139 1141 1143 1145 1147 1149 1151 1153 1165
-				1167 1169 1171 1173 1175 1177 1179 1181 1183
-				1185 1187 1189 1191 1193 1195 1197 1199 1201
-				1203 1205 1207 1209 1211 1213 1215 1218 1220
-				1224 1228 1233 1235 1237 1239 1241 1243 1245
-				1247 1249 1251 1253 1255 1257 1259 1261 1263
-				1265 1267 1269 1273
-				(1377 . 1415)
-				7681 7683 7685 7687 7689 7691 7693 7695 7697
-				7699 7701 7703 7705 7707 7709 7711 7713 7715
-				7717 7719 7721 7723 7725 7727 7729 7731 7733
-				7735 7737 7739 7741 7743 7745 7747 7749 7751
-				7753 7755 7757 7759 7761 7763 7765 7767 7769
-				7771 7773 7775 7777 7779 7781 7783 7785 7787
-				7789 7791 7793 7795 7797 7799 7801 7803 7805
-				7807 7809 7811 7813 7815 7817 7819 7821 7823
-				7825 7827
-				(7829 . 7835)
-				7841 7843 7845 7847 7849 7851 7853 7855 7857
-				7859 7861 7863 7865 7867 7869 7871 7873 7875
-				7877 7879 7881 7883 7885 7887 7889 7891 7893
-				7895 7897 7899 7901 7903 7905 7907 7909 7911
-				7913 7915 7917 7919 7921 7923 7925 7927 7929
-			      
-				(7936 . 7943)
-				(7952 . 7957)
-				(7968 . 7975)
-				(7984 . 7991)
-				(8000 . 8005)
-				(8016 . 8023)
-				(8032 . 8039)
-				(8048 . 8061)
-				(8064 . 8071)
-				(8080 . 8087)
-				(8096 . 8103)
-				(8112 . 8116)
-				(8118 . 8119)
-				8126
-				(8130 . 8132)
-				(8134 . 8135)
-				(8144 . 8147)
-				(8150 . 8151)
-				(8160 . 8167)
-				(8178 . 8180)
-				(8182 . 8183)
-				8319 8458
-				(8462 . 8463)
-				8467 8495 8500 8505
-				(64256 . 64262)
-				(64275 . 64279)
-				(65345 . 65370)
-				(66600 . 66637)
-				(119834 . 119859)
-				(119886 . 119892)
-				(119894 . 119911)
-				(119938 . 119963)
-				(119990 . 119993)
-				119995
-				(119997 . 120000)
-				(120002 . 120003)
-				(120005 . 120015)
-				(120042 . 120067)
-				(120094 . 120119)
-				(120146 . 120171)
-				(120198 . 120223)
-				(120250 . 120275)
-				(120302 . 120327)
-				(120354 . 120379)
-				(120406 . 120431)
-				(120458 . 120483)
-				(120514 . 120538)
-				(120540 . 120545)
-				(120572 . 120596)
-				(120598 . 120603)
-				(120630 . 120654)
-				(120656 . 120661)
-				(120688 . 120712)
-				(120714 . 120719)
-				(120746 . 120770)
-				(120772 . 120777)))
-(xsdre-def-primitive-category 'Lt
-			      '(453 456 459 498
-				    (8072 . 8079)
-				    (8088 . 8095)
-				    (8104 . 8111)
-				    8124 8140 8188))
-(xsdre-def-primitive-category 'Lm
-			      '((688 . 696)
-				(699 . 705)
-				(720 . 721)
-				(736 . 740)
-				750 890 1369 1600
-				(1765 . 1766)
-				3654 3782 6211 12293
-				(12337 . 12341)
-				(12445 . 12446)
-				(12540 . 12542)
-				65392
-				(65438 . 65439)))
-(xsdre-def-primitive-category 'Lo
-			      '(443
-				(448 . 451)
-				(1488 . 1514)
-				(1520 . 1522)
-				(1569 . 1594)
-				(1601 . 1610)
-				(1649 . 1747)
-				1749
-				(1786 . 1788)
-				1808
-				(1810 . 1836)
-				(1920 . 1957)
-				(2309 . 2361)
-				2365 2384
-				(2392 . 2401)
-				(2437 . 2444)
-				(2447 . 2448)
-				(2451 . 2472)
-				(2474 . 2480)
-				2482
-				(2486 . 2489)
-				(2524 . 2525)
-				(2527 . 2529)
-				(2544 . 2545)
-				(2565 . 2570)
-				(2575 . 2576)
-				(2579 . 2600)
-				(2602 . 2608)
-				(2610 . 2611)
-				(2613 . 2614)
-				(2616 . 2617)
-				(2649 . 2652)
-				2654
-				(2674 . 2676)
-				(2693 . 2699)
-				2701
-				(2703 . 2705)
-				(2707 . 2728)
-				(2730 . 2736)
-				(2738 . 2739)
-				(2741 . 2745)
-				2749 2768 2784
-				(2821 . 2828)
-				(2831 . 2832)
-				(2835 . 2856)
-				(2858 . 2864)
-				(2866 . 2867)
-				(2870 . 2873)
-				2877
-				(2908 . 2909)
-				(2911 . 2913)
-				(2949 . 2954)
-				(2958 . 2960)
-				(2962 . 2965)
-				(2969 . 2970)
-				2972
-				(2974 . 2975)
-				(2979 . 2980)
-				(2984 . 2986)
-				(2990 . 2997)
-				(2999 . 3001)
-				(3077 . 3084)
-				(3086 . 3088)
-				(3090 . 3112)
-				(3114 . 3123)
-				(3125 . 3129)
-				(3168 . 3169)
-				(3205 . 3212)
-				(3214 . 3216)
-				(3218 . 3240)
-				(3242 . 3251)
-				(3253 . 3257)
-				3294
-				(3296 . 3297)
-				(3333 . 3340)
-				(3342 . 3344)
-				(3346 . 3368)
-				(3370 . 3385)
-				(3424 . 3425)
-				(3461 . 3478)
-				(3482 . 3505)
-				(3507 . 3515)
-				3517
-				(3520 . 3526)
-				(3585 . 3632)
-				(3634 . 3635)
-				(3648 . 3653)
-				(3713 . 3714)
-				3716
-				(3719 . 3720)
-				3722 3725
-				(3732 . 3735)
-				(3737 . 3743)
-				(3745 . 3747)
-				3749 3751
-				(3754 . 3755)
-				(3757 . 3760)
-				(3762 . 3763)
-				3773
-				(3776 . 3780)
-				(3804 . 3805)
-				3840
-				(3904 . 3911)
-				(3913 . 3946)
-				(3976 . 3979)
-				(4096 . 4129)
-				(4131 . 4135)
-				(4137 . 4138)
-				(4176 . 4181)
-				(4304 . 4342)
-				(4352 . 4441)
-				(4447 . 4514)
-				(4520 . 4601)
-				(4608 . 4614)
-				(4616 . 4678)
-				4680
-				(4682 . 4685)
-				(4688 . 4694)
-				4696
-				(4698 . 4701)
-				(4704 . 4742)
-				4744
-				(4746 . 4749)
-				(4752 . 4782)
-				4784
-				(4786 . 4789)
-				(4792 . 4798)
-				4800
-				(4802 . 4805)
-				(4808 . 4814)
-				(4816 . 4822)
-				(4824 . 4846)
-				(4848 . 4878)
-				4880
-				(4882 . 4885)
-				(4888 . 4894)
-				(4896 . 4934)
-				(4936 . 4954)
-				(5024 . 5108)
-				(5121 . 5740)
-				(5743 . 5750)
-				(5761 . 5786)
-				(5792 . 5866)
-				(6016 . 6067)
-				(6176 . 6210)
-				(6212 . 6263)
-				(6272 . 6312)
-				(8501 . 8504)
-				12294
-				(12353 . 12436)
-				(12449 . 12538)
-				(12549 . 12588)
-				(12593 . 12686)
-				(12704 . 12727)
-				(13312 . 19893)
-				(19968 . 40869)
-				(40960 . 42124)
-				(44032 . 55203)
-				(63744 . 64045)
-				64285
-				(64287 . 64296)
-				(64298 . 64310)
-				(64312 . 64316)
-				64318
-				(64320 . 64321)
-				(64323 . 64324)
-				(64326 . 64433)
-				(64467 . 64829)
-				(64848 . 64911)
-				(64914 . 64967)
-				(65008 . 65019)
-				(65136 . 65138)
-				65140
-				(65142 . 65276)
-				(65382 . 65391)
-				(65393 . 65437)
-				(65440 . 65470)
-				(65474 . 65479)
-				(65482 . 65487)
-				(65490 . 65495)
-				(65498 . 65500)
-				(66304 . 66334)
-				(66352 . 66377)
-				(131072 . 173782)
-				(194560 . 195101)))
-(xsdre-def-primitive-category 'Mn
-			      '((768 . 846)
-				(864 . 866)
-				(1155 . 1158)
-				(1425 . 1441)
-				(1443 . 1465)
-				(1467 . 1469)
-				1471
-				(1473 . 1474)
-				1476
-				(1611 . 1621)
-				1648
-				(1750 . 1756)
-				(1759 . 1764)
-				(1767 . 1768)
-				(1770 . 1773)
-				1809
-				(1840 . 1866)
-				(1958 . 1968)
-				(2305 . 2306)
-				2364
-				(2369 . 2376)
-				2381
-				(2385 . 2388)
-				(2402 . 2403)
-				2433 2492
-				(2497 . 2500)
-				2509
-				(2530 . 2531)
-				2562 2620
-				(2625 . 2626)
-				(2631 . 2632)
-				(2635 . 2637)
-				(2672 . 2673)
-				(2689 . 2690)
-				2748
-				(2753 . 2757)
-				(2759 . 2760)
-				2765 2817 2876 2879
-				(2881 . 2883)
-				2893 2902 2946 3008 3021
-				(3134 . 3136)
-				(3142 . 3144)
-				(3146 . 3149)
-				(3157 . 3158)
-				3263 3270
-				(3276 . 3277)
-				(3393 . 3395)
-				3405 3530
-				(3538 . 3540)
-				3542 3633
-				(3636 . 3642)
-				(3655 . 3662)
-				3761
-				(3764 . 3769)
-				(3771 . 3772)
-				(3784 . 3789)
-				(3864 . 3865)
-				3893 3895 3897
-				(3953 . 3966)
-				(3968 . 3972)
-				(3974 . 3975)
-				(3984 . 3991)
-				(3993 . 4028)
-				4038
-				(4141 . 4144)
-				4146
-				(4150 . 4151)
-				4153
-				(4184 . 4185)
-				(6071 . 6077)
-				6086
-				(6089 . 6099)
-				6313
-				(8400 . 8412)
-				8417
-				(12330 . 12335)
-				(12441 . 12442)
-				64286
-				(65056 . 65059)
-				(119143 . 119145)
-				(119163 . 119170)
-				(119173 . 119179)
-				(119210 . 119213)))
-(xsdre-def-primitive-category 'Mc
-			      '(2307
-				(2366 . 2368)
-				(2377 . 2380)
-				(2434 . 2435)
-				(2494 . 2496)
-				(2503 . 2504)
-				(2507 . 2508)
-				2519
-				(2622 . 2624)
-				2691
-				(2750 . 2752)
-				2761
-				(2763 . 2764)
-				(2818 . 2819)
-				2878 2880
-				(2887 . 2888)
-				(2891 . 2892)
-				2903 2947
-				(3006 . 3007)
-				(3009 . 3010)
-				(3014 . 3016)
-				(3018 . 3020)
-				3031
-				(3073 . 3075)
-				(3137 . 3140)
-				(3202 . 3203)
-				3262
-				(3264 . 3268)
-				(3271 . 3272)
-				(3274 . 3275)
-				(3285 . 3286)
-				(3330 . 3331)
-				(3390 . 3392)
-				(3398 . 3400)
-				(3402 . 3404)
-				3415
-				(3458 . 3459)
-				(3535 . 3537)
-				(3544 . 3551)
-				(3570 . 3571)
-				(3902 . 3903)
-				3967 4140 4145 4152
-				(4182 . 4183)
-				(6068 . 6070)
-				(6078 . 6085)
-				(6087 . 6088)
-				(119141 . 119142)
-				(119149 . 119154)))
-(xsdre-def-primitive-category 'Me
-			      '((1160 . 1161)
-				(1757 . 1758)
-				(8413 . 8416)
-				(8418 . 8419)))
-(xsdre-def-primitive-category 'Nd
-			      '((48 . 57)
-				(1632 . 1641)
-				(1776 . 1785)
-				(2406 . 2415)
-				(2534 . 2543)
-				(2662 . 2671)
-				(2790 . 2799)
-				(2918 . 2927)
-				(3047 . 3055)
-				(3174 . 3183)
-				(3302 . 3311)
-				(3430 . 3439)
-				(3664 . 3673)
-				(3792 . 3801)
-				(3872 . 3881)
-				(4160 . 4169)
-				(4969 . 4977)
-				(6112 . 6121)
-				(6160 . 6169)
-				(65296 . 65305)
-				(120782 . 120831)))
-(xsdre-def-primitive-category 'Nl
-			      '((5870 . 5872)
-				(8544 . 8579)
-				12295
-				(12321 . 12329)
-				(12344 . 12346)
-				66378))
-(xsdre-def-primitive-category 'No
-			      '((178 . 179)
-				185
-				(188 . 190)
-				(2548 . 2553)
-				(3056 . 3058)
-				(3882 . 3891)
-				(4978 . 4988)
-				8304
-				(8308 . 8313)
-				(8320 . 8329)
-				(8531 . 8543)
-				(9312 . 9371)
-				9450
-				(10102 . 10131)
-				(12690 . 12693)
-				(12832 . 12841)
-				(12928 . 12937)
-				(66336 . 66339)))
-(xsdre-def-primitive-category 'Pc
-			      '(95
-				(8255 . 8256)
-				12539
-				(65075 . 65076)
-				(65101 . 65103)
-				65343 65381))
-(xsdre-def-primitive-category 'Pd
-			      '(45 173 1418 6150
-				   (8208 . 8213)
-				   12316 12336
-				   (65073 . 65074)
-				   65112 65123 65293))
-(xsdre-def-primitive-category 'Ps
-			      '(40 91 123 3898 3900 5787 8218 8222 8261 8317
-				   8333 9001 12296 12298 12300 12302 12304
-				   12308 12310 12312 12314 12317 64830 65077
-				   65079 65081 65083 65085 65087 65089 65091
-				   65113 65115 65117 65288 65339 65371 65378))
-(xsdre-def-primitive-category 'Pe
-			      '(41 93 125 3899 3901 5788 8262 8318 8334 9002
-				   12297 12299 12301 12303 12305 12309 12311
-				   12313 12315
-				   (12318 . 12319)
-				   64831 65078 65080 65082 65084 65086 65088
-				   65090 65092 65114 65116 65118 65289 65341
-				   65373 65379))
-(xsdre-def-primitive-category 'Pi
-			      '(171 8216
-				    (8219 . 8220)
-				    8223 8249))
-(xsdre-def-primitive-category 'Pf
-			      '(187 8217 8221 8250))
-(xsdre-def-primitive-category 'Po
-			      '((33 . 35)
-				(37 . 39)
-				42 44
-				(46 . 47)
-				(58 . 59)
-				(63 . 64)
-				92 161 183 191 894 903
-				(1370 . 1375)
-				1417 1470 1472 1475
-				(1523 . 1524)
-				1548 1563 1567
-				(1642 . 1645)
-				1748
-				(1792 . 1805)
-				(2404 . 2405)
-				2416 3572 3663
-				(3674 . 3675)
-				(3844 . 3858)
-				3973
-				(4170 . 4175)
-				4347
-				(4961 . 4968)
-				(5741 . 5742)
-				(5867 . 5869)
-				(6100 . 6106)
-				6108
-				(6144 . 6149)
-				(6151 . 6154)
-				(8214 . 8215)
-				(8224 . 8231)
-				(8240 . 8248)
-				(8251 . 8254)
-				(8257 . 8259)
-				(8264 . 8269)
-				(12289 . 12291)
-				65072
-				(65097 . 65100)
-				(65104 . 65106)
-				(65108 . 65111)
-				(65119 . 65121)
-				65128
-				(65130 . 65131)
-				(65281 . 65283)
-				(65285 . 65287)
-				65290 65292
-				(65294 . 65295)
-				(65306 . 65307)
-				(65311 . 65312)
-				65340 65377 65380))
-(xsdre-def-primitive-category 'Zs
-			      '(32 160 5760
-				   (8192 . 8203)
-				   8239 12288))
-(xsdre-def-primitive-category 'Zl
-			      '(8232))
-(xsdre-def-primitive-category 'Zp
-			      '(8233))
-(xsdre-def-primitive-category 'Sm
-			      '(43
-				(60 . 62)
-				124 126 172 177 215 247 8260
-				(8314 . 8316)
-				(8330 . 8332)
-				(8592 . 8596)
-				(8602 . 8603)
-				8608 8611 8614 8622
-				(8654 . 8655)
-				8658 8660
-				(8704 . 8945)
-				(8968 . 8971)
-				(8992 . 8993)
-				9655 9665 9839 64297 65122
-				(65124 . 65126)
-				65291
-				(65308 . 65310)
-				65372 65374 65506
-				(65513 . 65516)
-				120513 120539 120571 120597 120629 120655
-				120687 120713 120745 120771))
-(xsdre-def-primitive-category 'Sc
-			      '(36
-				(162 . 165)
-				(2546 . 2547)
-				3647 6107
-				(8352 . 8367)
-				65129 65284
-				(65504 . 65505)
-				(65509 . 65510)))
-(xsdre-def-primitive-category 'Sk
-			      '(94 96 168 175 180 184
-				   (697 . 698)
-				   (706 . 719)
-				   (722 . 735)
-				   (741 . 749)
-				   (884 . 885)
-				   (900 . 901)
-				   8125
-				   (8127 . 8129)
-				   (8141 . 8143)
-				   (8157 . 8159)
-				   (8173 . 8175)
-				   (8189 . 8190)
-				   (12443 . 12444)
-				   65342 65344 65507))
-(xsdre-def-primitive-category 'So
-			      '((166 . 167)
-				169 174 176 182 1154 1769
-				(1789 . 1790)
-				2554 2928
-				(3841 . 3843)
-				(3859 . 3863)
-				(3866 . 3871)
-				3892 3894 3896
-				(4030 . 4037)
-				(4039 . 4044)
-				4047
-				(8448 . 8449)
-				(8451 . 8454)
-				(8456 . 8457)
-				8468
-				(8470 . 8472)
-				(8478 . 8483)
-				8485 8487 8489 8494 8498 8506
-				(8597 . 8601)
-				(8604 . 8607)
-				(8609 . 8610)
-				(8612 . 8613)
-				(8615 . 8621)
-				(8623 . 8653)
-				(8656 . 8657)
-				8659
-				(8661 . 8691)
-				(8960 . 8967)
-				(8972 . 8991)
-				(8994 . 9000)
-				(9003 . 9083)
-				(9085 . 9114)
-				(9216 . 9254)
-				(9280 . 9290)
-				(9372 . 9449)
-				(9472 . 9621)
-				(9632 . 9654)
-				(9656 . 9664)
-				(9666 . 9719)
-				(9728 . 9747)
-				(9753 . 9838)
-				(9840 . 9841)
-				(9985 . 9988)
-				(9990 . 9993)
-				(9996 . 10023)
-				(10025 . 10059)
-				10061
-				(10063 . 10066)
-				10070
-				(10072 . 10078)
-				(10081 . 10087)
-				10132
-				(10136 . 10159)
-				(10161 . 10174)
-				(10240 . 10495)
-				(11904 . 11929)
-				(11931 . 12019)
-				(12032 . 12245)
-				(12272 . 12283)
-				12292
-				(12306 . 12307)
-				12320
-				(12342 . 12343)
-				(12350 . 12351)
-				(12688 . 12689)
-				(12694 . 12703)
-				(12800 . 12828)
-				(12842 . 12867)
-				(12896 . 12923)
-				12927
-				(12938 . 12976)
-				(12992 . 13003)
-				(13008 . 13054)
-				(13056 . 13174)
-				(13179 . 13277)
-				(13280 . 13310)
-				(42128 . 42145)
-				(42148 . 42163)
-				(42165 . 42176)
-				(42178 . 42180)
-				42182 65508 65512
-				(65517 . 65518)
-				(65532 . 65533)
-				(118784 . 119029)
-				(119040 . 119078)
-				(119082 . 119140)
-				(119146 . 119148)
-				(119171 . 119172)
-				(119180 . 119209)
-				(119214 . 119261)))
-(xsdre-def-primitive-category 'Cc
-			      '((0 . 31)
-				(127 . 159)))
-(xsdre-def-primitive-category 'Cf
-			      '(1807
-				(6155 . 6158)
-				(8204 . 8207)
-				(8234 . 8238)
-				(8298 . 8303)
-				65279
-				(65529 . 65531)
-				(119155 . 119162)
-				917505
-				(917536 . 917631)))
-(xsdre-def-primitive-category 'Co
-			      '((57344 . 63743)
-				(983040 . 1048573)
-				(1048576 . 1114109)))
-
-(provide 'xsd-regexp)
-
-;;; xsd-regexp.el ends here
diff --git a/elpa-to-submit/nxhtml/readme.txt b/elpa-to-submit/nxhtml/readme.txt
index 5b5084b86b..ad7a40c255 100644
--- a/elpa-to-submit/nxhtml/readme.txt
+++ b/elpa-to-submit/nxhtml/readme.txt
@@ -5,5 +5,8 @@ To install nXhtml put this in your .emacs:
 where autostart.el is the file in the same directory as this
 readme.txt file.
 
-Note: If you are using Emacs+EmacsW32 then nXhtml is already
+Note 1: If you are using Emacs+EmacsW32 then nXhtml is already
 installed.
+
+Note 2: If you are using Emacs 22 then you need to install nXml
+separately. (It is included in Emacs 23.)
diff --git a/elpa-to-submit/nxhtml/related/cgi+.el b/elpa-to-submit/nxhtml/related/cgi+.el
deleted file mode 100644
index 5d3f134693..0000000000
--- a/elpa-to-submit/nxhtml/related/cgi+.el
+++ /dev/null
@@ -1,296 +0,0 @@
-;;; cgi+.el --- Run CGI inside emacs
-
-;; Copyright (C) 2007 Free Software Foundation, Inc.
-;;
-;; Author: Ye Wenbin <wenbinye@gmail.com>
-;; Maintainer: Ye Wenbin <wenbinye@gmail.com>
-;; Created: 15 Dec 2007
-;; Version: 0.01
-;; Keywords: 
-
-;; This program 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.
-;;
-;; This program 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 this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;;; Commentary:
-;; Just a toy. Maybe it can help you write html in lisp.
-
-;; Put this file into your load-path and the following into your ~/.emacs:
-;;   (require 'cgi+)
-;;   (cgi-init)
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-(require 'httpd)
-(require 'cgi)
-
-(defvar cgi-bin-dir "cgi-bin"
-  "*Directory name for the cgi-bin")
-(defvar cgi-request-handler nil
-  "*Handler for cgi request.
-Use `cgi-add-handler' to add new handler.")
-
-(defvar cgi-path nil)
-(defvar cgi-params nil)
-(defvar cgi-content nil)
-
-(defun cgi-handler (path cont)
-  (let (res head-length)
-    (setq cgi-path path
-          cgi-content cont
-          cgi-params (if (string-match "?" path)
-                         (cgi-decode (substring path (match-end 0)))))
-    (setq res
-          (catch 'result
-            (dolist (handler cgi-request-handler)
-              (when (string-match (car handler) path)
-                (throw 'result
-                       (funcall (cdr handler)))))))
-    (unless res
-      (setq res (concat
-                 "Content-type: text/html\n\n"
-                 "<html><head><title>Unknown cgi request</title></head>\r\n"
-                 "<body> <h1>Unknown cgi request</h1>\r\n"
-                 "<pre>\r\n"
-                 path "\n" cont
-                 "\r\n</pre></body></html>\r\n")))
-    (if (string-match "^Content-type: [^\n]+\n\n" res)
-        (setq head-length (match-end 0))
-      (setq head-length 25
-            res (concat
-                 "Content-type: text/html\n\n"
-                 "<html><head><title>Bad cgi request</title></head>\r\n"
-                 "<body> <h1>Bad cgi request</h1>\r\n"
-                 "<pre>\r\n"
-                 "path=" path "\r\n"
-                 "cont=" cont
-                 "\r\n</pre></body></html>\r\n")))
-    (httpd-send 200 "OK"
-                "Server: Emacs/httpd.el" httpd-endl
-                "Connection: close" httpd-endl
-                "MIME-Version: 1.0" httpd-endl
-                "Content-Length: " (number-to-string (- (length res) head-length))
-                httpd-endl)
-    (httpd-send-data res)
-    (setq cgi-path nil
-          cgi-content nil
-          cgi-params nil)
-    t))
-
-(defun cgi-add-handler (regexp handler &optional append)
-  (add-to-list 'cgi-request-handler (cons regexp handler) append))
-
-(defun cgi-param (key)
-  (cdr (assoc key cgi-params)))
-
- 
-;; html generator
-(defvar cgi-indent-level 2
-  "*Indent level for output html")
-(defvar cgi-valid-tags
-  '(a base dir font form h1 h2 h3 h4 h5 h6 hr img input link menu ol
-      p select table td textarea th ul abbrev acronym address array au
-      b big blink blockquote body box br caption center cite code dd
-      del dfn div dl dt em head html i ins isindex kbd lang li math meta
-      nobr option over person pre q rev s samp small span strong sub
-      sup title tr tt u var wbr)
-  "*Valid html tags")
-
-(defvar cgi-tag-default-attributes
-  '((a :no-endl t)
-    (pre :no-indent t))
-  "*Default html tag attributes.
-:no-endl and :no-indent are special attributes used for pretty output.
-:no-endl means the open tag and close tag should apear in same line.
-:no-indent means no extra newline and indentation will insert in the
-tag(Affect the child tag also).
-")
-
-(defvar cgi-write-handler
-  '((header . cgi-write-header)
-    (start-html . cgi-write-start-html)
-    (end-html . cgi-write-end-html)
-    (noindent . cgi-write-noindent)
-    (reindent . cgi-write-reindent)
-    (endl . cgi-write-endl))
-  "*Handler for tag in `cgi-write'")
-
-(defvar cgi-indent-depth nil
-  "Internal variable")
-(defvar cgi-no-indent nil)
-
-(defmacro cgi-write (&rest body)
-  (declare (debug t))
-  (let (handler)
-    `(let ((cgi-indent-depth 0)
-           cgi-no-indent)
-       ,@(mapcar
-          (lambda (tag)
-            `(progn
-               (cgi-write-tag ',tag)
-               (cgi-write-endl)))
-          body))))
-
-(defun cgi-dispatch-args (args)
-  (let (attr)
-    (while (keywordp (car args))
-      (push (car args) attr)
-      (push (cadr args) attr)
-      (setq args (cddr args)))
-    (cons (nreverse attr) args)))
-
-;; pretty indent
-(defun cgi-make-endl (&optional inc)
-  (if inc (setq cgi-indent-depth (+ cgi-indent-depth inc)))
-  (or (> cgi-indent-depth 0) (setq cgi-indent-depth 0))
-  (concat "\n" (make-string (* cgi-indent-level cgi-indent-depth) #x20)))
-
-(defsubst cgi-write-noindent ()
-  "Remove current indentation."
-  (if (looking-back "^\\s-+")
-      (delete-region (line-end-position 0) (point))))
-
-(defsubst cgi-write-reindent (&optional inc)
-  "Reinsert indentation according to adjusted depth."
-  (cgi-write-noindent)
-  (cgi-write-endl inc))
-
-(defsubst cgi-write-endl (&optional inc)
-  (insert (cgi-make-endl (if (listp inc) (car inc) inc))))
-
-;; handlers
-(defun cgi-write-header (&optional args)
-  (insert "Content-Type: "
-          (or (plist-get args :type)
-              "text/html")
-          "\n\n"))
-
-(defun cgi-write-start-html (&optional args)
-  (let (attr arg)
-    (setq args (cgi-dispatch-args args)
-          attr (car args)
-          args (cdr args))
-    (insert "<html>" (cgi-make-endl 1)
-            "<head>" (cgi-make-endl 1))
-    (when (setq arg (plist-get attr :charset))
-      (cgi-write-tag `(meta :http-equiv "Content-Type"
-                            :content ,(format "text/html; charset=%s" arg)))
-      (cgi-write-endl))
-    (when (setq arg (plist-get attr :author))
-      (cgi-write-tag `(meta :name "author"
-                            :content ,arg))
-      (cgi-write-endl))
-    (when args
-      (cgi-write-tag `(title ,(car args))))
-    (cgi-write-reindent -1)
-    (insert "</head>" (cgi-make-endl)
-            "<body>")
-    (setq cgi-indent-depth (1+ cgi-indent-depth))))
-
-(defun cgi-write-end-html ()
-  (cgi-write-reindent -1)
-  (insert "</body>" (cgi-make-endl -1)
-          "</html>"))
-
-(defun cgi-write-tag (tag)
-  "Generate html for TAG.
-
-The TAG can be one of the type:
- - string: the string will output directly
- - CAR in `cgi-write-handler': call the function in the CDR of the
-   associate list with rest arguments
- - CAR in `cgi-valid-tags': recursively output the tag. The tag can
-   have syntax like:
-     (TAG-NAME :ATTR-NAME1 ATTR1
-               ....
-               :ATTR-NAMEn ATTRn
-               SUBTAGS)
- - any valid form which return a string to output
-"
-  (cond
-   ;; string
-   ((stringp tag) (insert tag))
-   ;; handler
-   ((assoc (car tag) cgi-write-handler)
-    (let ((handler (assoc (car tag) cgi-write-handler)))
-      (if (cdr tag)
-          (funcall (cdr handler) (cdr tag))
-        (funcall (cdr handler)))))
-   ;; html tag in `cgi-valid-tags'
-   ((memq (car tag) cgi-valid-tags)
-    (let ((name (car tag))
-          (cgi-no-indent cgi-no-indent)
-          attr subtags no-endl no-indent)
-      (setq tag (cgi-dispatch-args (cdr tag))
-            attr (nconc (car tag)
-                        (cdr (assoc name cgi-tag-default-attributes)))
-            no-endl (plist-get attr :no-endl)
-            cgi-no-indent (or cgi-no-indent (plist-get attr :no-indent))
-            subtags (cdr tag))
-      (if cgi-no-indent (setq no-endl t))
-      (if attr
-          (let ((str ""))
-            (while attr
-              ;; :no-endl reserved for tag insert
-              (unless (memq (car attr) (list :no-endl :no-indent))
-                (setq str (concat str " " (substring (format "%s=\"%s\"" (car attr) (cadr attr)) 1))))
-              (setq attr (cddr attr)))
-            (setq attr str))
-        (setq attr ""))
-      (if (null subtags)
-          (insert (format "<%S%s />" name attr))
-        (insert (format "<%S%s>" name attr))
-        (unless no-endl (insert (cgi-make-endl 1)))
-        (while subtags
-          (cgi-write-tag (car subtags))
-          (setq subtags (cdr subtags)))
-        (unless no-endl (insert (cgi-make-endl -1)))
-        (insert (format "</%S>" name)))))
-   ;; emacs lisp form
-   (t (insert (eval tag)))))
-
- 
-;; An example
-(defun cgi-cal ()
-  (require 'calendar)
-  (with-temp-buffer
-    (cgi-write
-     (header)
-     (start-html "Emacs calendar")
-     (h1 :no-endl t "Emacs calendar")
-     (pre
-      "\n"
-      (let ((now (calendar-current-date)) month year)
-        (setq month (cgi-param "month")
-              year (cgi-param "year"))
-        (and month (setq month (string-to-number month)))
-        (and year (setq year (string-to-number year)))
-        (or (and month (> month 0) (< month 13))
-            (setq month (extract-calendar-month now)))
-        (or year (setq year (extract-calendar-year now)))
-        (with-temp-buffer
-          (generate-calendar month year)
-          (buffer-string)))
-      (endl))
-     (end-html))
-    (buffer-string)))
-
-(defun cgi-init ()
-  (unless httpd-process (httpd-start))
-  (httpd-add-handler (concat "^" cgi-bin-dir "/") 'cgi-handler)
-  (cgi-add-handler "^cgi-bin/calendar" 'cgi-cal))
-
-(provide 'cgi+)
-;;; cgi+.el ends here
diff --git a/elpa-to-submit/nxhtml/related/css-mode.el b/elpa-to-submit/nxhtml/related/css-mode.el
deleted file mode 100644
index 106148979c..0000000000
--- a/elpa-to-submit/nxhtml/related/css-mode.el
+++ /dev/null
@@ -1,473 +0,0 @@
-;;; css-mode.el --- Major mode to edit CSS files
-
-;; Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-
-;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: hypermedia
-
-;; This file 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 3, or (at your option)
-;; any later version.
-
-;; This file 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Yet another CSS mode.
-
-;;; Todo:
-
-;; - electric ; and }
-;; - filling code with auto-fill-mode
-;; - completion
-;; - fix font-lock errors with multi-line selectors
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-(defun css-extract-keyword-list (res)
-  (with-temp-buffer
-    (url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt")
-    (goto-char (point-max))
-    (search-backward "Appendix H. Index")
-    (forward-line)
-    (delete-region (point-min) (point))
-    (let ((result nil)
-          keys)
-      (dolist (re res)
-        (goto-char (point-min))
-        (setq keys nil)
-        (while (re-search-forward (cdr re) nil t)
-          (push (match-string 1) keys))
-        (push (cons (car re) (sort keys 'string-lessp)) result))
-      (nreverse result))))
-
-(defun css-extract-parse-val-grammar (string env)
-  (let ((start 0)
-        (elems ())
-        name)
-    (while (string-match
-            (concat "\\(?:"
-                    (concat "<a [^>]+><span [^>]+>\\(?:"
-                            "&lt;\\([^&]+\\)&gt;\\|'\\([^']+\\)'"
-                            "\\)</span></a>")
-                    "\\|" "\\(\\[\\)"
-                    "\\|" "\\(]\\)"
-                    "\\|" "\\(||\\)"
-                    "\\|" "\\(|\\)"
-                    "\\|" "\\([*+?]\\)"
-                    "\\|" "\\({[^}]+}\\)"
-                    "\\|" "\\(\\w+\\(?:-\\w+\\)*\\)"
-                    "\\)[ \t\n]*")
-            string start)
-      ;; (assert (eq start (match-beginning 0)))
-      (setq start (match-end 0))
-      (cond
-       ;; Reference to a type of value.
-       ((setq name (match-string-no-properties 1 string))
-        (push (intern name) elems))
-       ;; Reference to another property's values.
-       ((setq name (match-string-no-properties 2 string))
-        (setq elems (delete-dups (append (cdr (assoc name env)) elems))))
-       ;; A literal
-       ((setq name (match-string-no-properties 9 string))
-        (push name elems))
-       ;; We just ignore the rest.  I.e. we ignore the structure because
-       ;; it's too difficult to exploit anyway (it would allow us to only
-       ;; complete top/center/bottom after one of left/center/right and
-       ;; vice-versa).
-       (t nil)))
-    elems))
-        
-
-(defun css-extract-props-and-vals ()
-  (with-temp-buffer
-    (url-insert-file-contents "http://www.w3.org/TR/CSS21/propidx.html")
-    (goto-char (point-min))
-    (let ((props ()))
-      (while (re-search-forward "#propdef-\\([^\"]+\\)\"><span class=\"propinst-\\1 xref\">'\\1'</span></a>" nil t)
-        (let ((prop (match-string-no-properties 1)))
-          (save-excursion
-            (goto-char (match-end 0))
-            (search-forward "<td>")
-            (let ((vals-string (buffer-substring (point)
-                                                 (progn
-                                                   (re-search-forward "[ \t\n]+|[ \t\n]+<a href=\"cascade.html#value-def-inherit\" class=\"noxref\"><span class=\"value-inst-inherit\">inherit</span></a>")
-                                                   (match-beginning 0)))))
-              ;; 
-              (push (cons prop (css-extract-parse-val-grammar vals-string props))
-                    props)))))
-      props)))
-
-;; Extraction was done with:
-;; (css-extract-keyword-list
-;;  '((pseudo . "^ +\\* :\\([^ \n,]+\\)")
-;;    (at . "^ +\\* @\\([^ \n,]+\\)")
-;;    (descriptor . "^ +\\* '\\([^ '\n]+\\)' (descriptor)")
-;;    (media . "^ +\\* '\\([^ '\n]+\\)' media group")
-;;    (property . "^ +\\* '\\([^ '\n]+\\)',")))
-
-(defconst css-pseudo-ids
-  '("active" "after" "before" "first" "first-child" "first-letter" "first-line"
-    "focus" "hover" "lang" "left" "link" "right" "visited")
-  "Identifiers for pseudo-elements and pseudo-classes.")
-
-(defconst css-at-ids
-  '("charset" "font-face" "import" "media" "page")
-  "Identifiers that appear in the form @foo.")
-
-(defconst css-descriptor-ids
-  '("ascent" "baseline" "bbox" "cap-height" "centerline" "definition-src"
-    "descent" "font-family" "font-size" "font-stretch" "font-style"
-    "font-variant" "font-weight" "mathline" "panose-1" "slope" "src" "stemh"
-    "stemv" "topline" "unicode-range" "units-per-em" "widths" "x-height")
-  "Identifiers for font descriptors.")
-
-(defconst css-media-ids
-  '("all" "aural" "bitmap" "continuous" "grid" "paged" "static" "tactile"
-    "visual")
-  "Identifiers for types of media.")
-
-(defconst css-property-ids
-  '("azimuth" "background" "background-attachment" "background-color"
-    "background-image" "background-position" "background-repeat" "block"
-    "border" "border-bottom" "border-bottom-color" "border-bottom-style"
-    "border-bottom-width" "border-collapse" "border-color" "border-left"
-    "border-left-color" "border-left-style" "border-left-width" "border-right"
-    "border-right-color" "border-right-style" "border-right-width"
-    "border-spacing" "border-style" "border-top" "border-top-color"
-    "border-top-style" "border-top-width" "border-width" "bottom"
-    "caption-side" "clear" "clip" "color" "compact" "content"
-    "counter-increment" "counter-reset" "cue" "cue-after" "cue-before"
-    "cursor" "dashed" "direction" "display" "dotted" "double" "elevation"
-    "empty-cells" "float" "font" "font-family" "font-size" "font-size-adjust"
-    "font-stretch" "font-style" "font-variant" "font-weight" "groove" "height"
-    "hidden" "inline" "inline-table" "inset" "left" "letter-spacing"
-    "line-height" "list-item" "list-style" "list-style-image"
-    "list-style-position" "list-style-type" "margin" "margin-bottom"
-    "margin-left" "margin-right" "margin-top" "marker-offset" "marks"
-    "max-height" "max-width" "min-height" "min-width" "orphans" "outline"
-    "outline-color" "outline-style" "outline-width" "outset" "overflow"
-    "padding" "padding-bottom" "padding-left" "padding-right" "padding-top"
-    "page" "page-break-after" "page-break-before" "page-break-inside" "pause"
-    "pause-after" "pause-before" "pitch" "pitch-range" "play-during" "position"
-    "quotes" "richness" "ridge" "right" "run-in" "size" "solid" "speak"
-    "speak-header" "speak-numeral" "speak-punctuation" "speech-rate" "stress"
-    "table" "table-caption" "table-cell" "table-column" "table-column-group"
-    "table-footer-group" "table-header-group" "table-layout" "table-row"
-    "table-row-group" "text-align" "text-decoration" "text-indent"
-    "text-shadow" "text-transform" "top" "unicode-bidi" "vertical-align"
-    "visibility" "voice-family" "volume" "white-space" "widows" "width"
-    "word-spacing" "z-index")
-  "Identifiers for properties.")
-
-(defcustom css-electric-keys '(?\} ?\;) ;; '()
-  "Self inserting keys which should trigger re-indentation."
-  :type '(repeat character)
-  :options '((?\} ?\;)))
-
-(defvar css-mode-syntax-table
-  (let ((st (make-syntax-table)))
-    ;; C-style comments.
-    (modify-syntax-entry ?/ ". 14" st)
-    (modify-syntax-entry ?* ". 23" st)
-    ;; Strings.
-    (modify-syntax-entry ?\" "\"" st)
-    (modify-syntax-entry ?\' "\"" st)
-    ;; Blocks.
-    (modify-syntax-entry ?\{ "(}" st)
-    (modify-syntax-entry ?\} "){" st)
-    ;; Args in url(...) thingies and other "function calls".
-    (modify-syntax-entry ?\( "()" st)
-    (modify-syntax-entry ?\) ")(" st)
-    ;; To match attributes in selectors.
-    (modify-syntax-entry ?\[ "(]" st)
-    (modify-syntax-entry ?\] ")[" st)
-    ;; Special chars that sometimes come at the beginning of words.
-    (modify-syntax-entry ?@ "'" st)
-    ;; (modify-syntax-entry ?: "'" st)
-    (modify-syntax-entry ?# "'" st)
-    ;; Distinction between words and symbols.
-    (modify-syntax-entry ?- "_" st)
-    st))
-
-(defconst css-escapes-re
-  "\\\\\\(?:[^\000-\037\177]\\|[0-9a-fA-F]+[ \n\t\r\f]?\\)")
-(defconst css-nmchar-re (concat "\\(?:[-[:alnum:]]\\|" css-escapes-re "\\)"))
-(defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
-(defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*"))
-(defconst css-name-re (concat css-nmchar-re "+"))
-
-(defface css-selector '((t :inherit font-lock-function-name-face))
-  "Face to use for selectors.")
-(defface css-property '((t :inherit font-lock-variable-name-face))
-  "Face to use for properties.")
-
-(defvar css-font-lock-keywords
-  `(("!\\s-*important" . font-lock-builtin-face)
-    ;; Atrules keywords.  IDs not in css-at-ids are valid (ignored).
-    ;; In fact the regexp should probably be
-    ;; (,(concat "\\(@" css-ident-re "\\)\\([ \t\n][^;{]*\\)[;{]")
-    ;;  (1 font-lock-builtin-face))
-    ;; Since "An at-rule consists of everything up to and including the next
-    ;; semicolon (;) or the next block, whichever comes first."
-    (,(concat "@" css-ident-re) . font-lock-builtin-face)
-    ;; Selectors.
-    ;; FIXME: attribute selectors don't work well because they may contain
-    ;; strings which have already been highlighted as f-l-string-face and
-    ;; thus prevent this highlighting from being applied (actually now that
-    ;; I use `append' this should work better).  But really the part of hte
-    ;; selector between [...] should simply not be highlighted.
-    (,(concat "^\\([ \t]*[^@:{\n][^:{\n]+\\(?::" (regexp-opt css-pseudo-ids t)
-              "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{")
-     (1 'css-selector append))
-    ;; In the above rule, we allow the open-brace to be on some subsequent
-    ;; line.  This will only work if we properly mark the intervening text
-    ;; as being part of a multiline element (and even then, this only
-    ;; ensures proper refontification, but not proper discovery).
-    ("^[ \t]*{" (0 (save-excursion
-                     (goto-char (match-beginning 0))
-                     (skip-chars-backward " \n\t")
-                     (put-text-property (point) (match-end 0)
-                                        'font-lock-multiline t)
-                     ;; No face.
-                     nil)))
-    ;; Properties.  Again, we don't limit ourselves to css-property-ids.
-    (,(concat "\\(?:[{;]\\|^\\)[ \t]*\\(" css-ident-re "\\)\\s-*:")
-     (1 'css-property))))
-
-(defvar css-font-lock-defaults
-  '(css-font-lock-keywords nil t))
-
-(unless (fboundp 'prog-mode) (defalias 'prog-mode 'fundamental-mode))
-
-;;;###autoload (add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
-;;;###autoload
-(define-derived-mode css-mode prog-mode "CSS"
-  "Major mode to edit Cascading Style Sheets."
-  (set (make-local-variable 'font-lock-defaults) css-font-lock-defaults)
-  (set (make-local-variable 'comment-start) "/*")
-  (set (make-local-variable 'comment-start-skip) "/\\*+[ \t]*")
-  (set (make-local-variable 'comment-end) "*/")
-  (set (make-local-variable 'comment-end-skip) "[ \t]*\\*+/")
-  (set (make-local-variable 'forward-sexp-function) 'css-forward-sexp)
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-  (set (make-local-variable 'indent-line-function) 'css-indent-line)
-  (set (make-local-variable 'fill-paragraph-function)
-       'css-fill-paragraph)
-  (when css-electric-keys
-    (let ((fc (make-char-table 'auto-fill-chars)))
-      (set-char-table-parent fc auto-fill-chars)
-      (dolist (c css-electric-keys)
-        (aset fc c 'indent-according-to-mode))
-      (set (make-local-variable 'auto-fill-chars) fc))))
-
-(defvar comment-continue)
-
-(defun css-fill-paragraph (&optional justify)
-  (save-excursion
-    (let ((ppss (syntax-ppss))
-          (eol (line-end-position)))
-      (cond
-       ((and (nth 4 ppss)
-             (save-excursion
-               (goto-char (nth 8 ppss))
-               (forward-comment 1)
-               (prog1 (not (bolp))
-                 (setq eol (point)))))
-        ;; Filling inside a comment whose comment-end marker is not \n.
-        ;; This code is meant to be generic, so that it works not only for
-        ;; css-mode but for all modes.
-        (save-restriction
-          (narrow-to-region (nth 8 ppss) eol)
-          (comment-normalize-vars)      ;Will define comment-continue.
-          (let ((fill-paragraph-function nil)
-                (paragraph-separate
-                 (if (and comment-continue
-                          (string-match "[^ \t]" comment-continue))
-                     (concat "\\(?:[ \t]*" (regexp-quote comment-continue)
-                             "\\)?\\(?:" paragraph-separate "\\)")
-                   paragraph-separate))
-                (paragraph-start
-                 (if (and comment-continue
-                          (string-match "[^ \t]" comment-continue))
-                     (concat "\\(?:[ \t]*" (regexp-quote comment-continue)
-                             "\\)?\\(?:" paragraph-start "\\)")
-                   paragraph-start)))
-            (fill-paragraph justify)
-            ;; Don't try filling again.
-            t)))
-        
-       ((and (null (nth 8 ppss))
-             (or (nth 1 ppss)
-                 (and (ignore-errors
-                        (down-list 1)
-                        (when (<= (point) eol)
-                          (setq ppss (syntax-ppss)))))))
-        (goto-char (nth 1 ppss))
-        (let ((end (save-excursion
-                     (ignore-errors (forward-sexp 1) (copy-marker (point) t)))))
-          (when end
-            (while (re-search-forward "[{;}]" end t)
-              (cond
-               ;; This is a false positive inside a string or comment.
-               ((nth 8 (syntax-ppss)) nil)
-               ((eq (char-before) ?\})
-                (save-excursion
-                  (forward-char -1)
-                  (skip-chars-backward " \t")
-                  (unless (bolp) (newline))))
-               (t
-                (while
-                    (progn
-                      (setq eol (line-end-position))
-                      (and (forward-comment 1)
-                           (> (point) eol)
-                           ;; A multi-line comment should be on its own line.
-                           (save-excursion (forward-comment -1)
-                                           (when (< (point) eol)
-                                             (newline)
-                                             t)))))
-                (if (< (point) eol) (newline)))))
-            (goto-char (nth 1 ppss))
-            (indent-region (line-beginning-position 2) end)
-            ;; Don't use the default filling code.
-            t)))))))
-
-;;; Navigation and indentation.
-
-(defconst css-navigation-syntax-table
-  (let ((st (make-syntax-table css-mode-syntax-table)))
-    (map-char-table (lambda (c v)
-                      ;; Turn punctuation (code = 1) into symbol (code = 1).
-                      (if (eq (car-safe v) 1)
-                          (aset st c (cons 3 (cdr v)))))
-                    st)
-    st))
-
-(defun css-backward-sexp (n)
-  (let ((forward-sexp-function nil))
-    (if (< n 0) (css-forward-sexp (- n))
-      (while (> n 0)
-        (setq n (1- n))
-        (forward-comment (- (point-max)))
-        (if (not (eq (char-before) ?\;))
-            (backward-sexp 1)
-          (while (progn (backward-sexp 1)
-                        (save-excursion
-                          (forward-comment (- (point-max)))
-                          ;; FIXME: We should also skip punctuation.
-                          (not (memq (char-before) '(?\; ?\{)))))))))))
-
-(defun css-forward-sexp (n)
-  (let ((forward-sexp-function nil))
-    (if (< n 0) (css-backward-sexp (- n))
-      (while (> n 0)
-        (setq n (1- n))
-        (forward-comment (point-max))
-        (if (not (eq (char-after) ?\;))
-            (forward-sexp 1)
-          (while (progn (forward-sexp 1)
-                        (save-excursion
-                          (forward-comment (point-max))
-                          ;; FIXME: We should also skip punctuation.
-                          (not (memq (char-after) '(?\; ?\})))))))))))
-
-(defun css-indent-calculate-virtual ()
-  (if (or (save-excursion (skip-chars-backward " \t") (bolp))
-          (if (looking-at "\\s(")
-              (save-excursion
-                (forward-char 1) (skip-chars-forward " \t")
-                (not (or (eolp) (looking-at comment-start-skip))))))
-      (current-column)
-    (css-indent-calculate)))
-
-(defcustom css-indent-offset 4
-  "Basic size of one indentation step."
-  :type 'integer)
-
-(defun css-indent-calculate ()
-  (let ((ppss (syntax-ppss))
-        pos)
-    (with-syntax-table css-navigation-syntax-table
-      (save-excursion
-        (cond
-         ;; Inside a string.
-         ((nth 3 ppss) 'noindent)
-         ;; Inside a comment.
-         ((nth 4 ppss)
-          (setq pos (point))
-          (forward-line -1)
-          (skip-chars-forward " \t")
-          (if (>= (nth 8 ppss) (point))
-              (progn
-                (goto-char (nth 8 ppss))
-                (if (eq (char-after pos) ?*)
-                    (forward-char 1)
-                  (if (not (looking-at comment-start-skip))
-                      (error "Internal css-mode error")
-                    (goto-char (match-end 0))))
-                (current-column))
-            (if (and (eq (char-after pos) ?*) (eq (char-after) ?*))
-                (current-column)
-              ;; 'noindent
-              (current-column)
-              )))
-         ;; In normal code.
-         (t
-          (or
-           (when (looking-at "\\s)")
-             (forward-char 1)
-             (backward-sexp 1)
-             (css-indent-calculate-virtual))
-           (when (looking-at comment-start-skip)
-             (forward-comment (point-max))
-             (css-indent-calculate))
-           (when (save-excursion (forward-comment (- (point-max)))
-                                 (setq pos (point))
-                                 (eq (char-syntax (preceding-char)) ?\())
-             (goto-char (1- pos))
-             (if (not (looking-at "\\s([ \t]*"))
-                 (error "Internal css-mode error")
-               (if (or (memq (char-after (match-end 0)) '(?\n nil))
-                       (save-excursion (goto-char (match-end 0))
-                                       (looking-at comment-start-skip)))
-                   (+ (css-indent-calculate-virtual) css-indent-offset)
-                 (progn (goto-char (match-end 0)) (current-column)))))
-           (progn
-             (css-backward-sexp 1)
-             (if (looking-at "\\s(")
-                 (css-indent-calculate)
-               (css-indent-calculate-virtual))))))))))
-     
-
-(defun css-indent-line ()
-  "Indent current line according to CSS indentation rules."
-  (interactive)
-  (let* ((savep (point))
-         (forward-sexp-function nil)
-	 (indent (condition-case nil
-		     (save-excursion
-		       (forward-line 0)
-		       (skip-chars-forward " \t")
-		       (if (>= (point) savep) (setq savep nil))
-		       (css-indent-calculate))
-		   (error nil))))
-    (if (not (numberp indent)) 'noindent
-      (if savep
-          (save-excursion (indent-line-to indent))
-        (indent-line-to indent)))))
-
-(provide 'css-mode)
-;; arch-tag: b4d8b8e2-b130-4e74-b3aa-cd8f1ab659d0
-;;; css-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/related/espresso.el b/elpa-to-submit/nxhtml/related/espresso.el
new file mode 100644
index 0000000000..54a0c65540
--- /dev/null
+++ b/elpa-to-submit/nxhtml/related/espresso.el
@@ -0,0 +1,3396 @@
+;;; espresso.el --- Major mode for editing JavaScript source text
+;; Copyright (C) 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2009 Daniel Colascione <dan.colascione@gmail.com>
+;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
+;; Author: Daniel Colascione <dan.colascione@gmail.com>
+;; Maintainer: Daniel Colascione <dan.colascione@gmail.com>
+;; Version: 8
+;;; Modified for nXhtml, removed call to font-lock-fontify-buffer from espresso-mode.
+;; Date: 2009-05-22
+;; Keywords: languages, oop, javascript
+
+;; This file 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 3, or (at your option)
+;; any later version.
+
+;; This file 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
+
+;; This is based on Karl Landstrom's barebones javascript-mode. This
+;; is much more robust and works with cc-mode's comment filling
+;; (mostly).
+;;
+;; The main features of this JavaScript mode are syntactic
+;; highlighting (enabled with `font-lock-mode' or
+;; `global-font-lock-mode'), automatic indentation and filling of
+;; comments, C preprocessor fontification, and MozRepl integration.
+;;
+;; This package has (only) been tested with GNU Emacs 22 (the latest
+;; stable release).
+;;
+;; Installation:
+;;
+;; Put this file in a directory where Emacs can find it (`C-h v
+;; load-path' for more info). Then add the following lines to your
+;; Emacs initialization file:
+;;
+;;    (add-to-list 'auto-mode-alist '("\\.js\\'" . espresso-mode))
+;;    (autoload 'espresso-mode "espresso" nil t)
+;;
+;; After that, type M-x byte-compile-file and have Emacs byte-compile
+;; this file. Performance is vastly better when this file is
+;; byte-compiled.
+;;
+;; General Remarks:
+;;
+;; XXX: This mode assumes that block comments are not nested inside block
+;; XXX: comments
+;;
+;; Exported names start with "espresso-"; private names start with
+;; "espresso--".
+;;
+;; Code:
+
+;;; Code
+
+(eval-and-compile
+  (require 'cc-mode)
+  (require 'font-lock)
+  (require 'newcomment)
+  (require 'imenu)
+  (require 'etags)
+  (require 'thingatpt)
+  (require 'easymenu)
+  (require 'moz nil t)
+  (require 'json nil t))
+
+(eval-when-compile
+  (require 'cl)
+  (require 'comint)
+  (require 'ido)
+  (proclaim '(optimize (speed 0) (safety 3))))
+
+;;; Constants
+
+(defconst espresso--name-start-re "[a-zA-Z_$]"
+  "Matches the first character of a Espresso identifier. No grouping")
+
+(defconst espresso--stmt-delim-chars "^;{}?:")
+
+(defconst espresso--name-re (concat espresso--name-start-re
+                                    "\\(?:\\s_\\|\\sw\\)*")
+  "Matches a Javascript identifier. No grouping.")
+
+(defconst espresso--objfield-re (concat espresso--name-re ":")
+  "Matches a Javascript object field start")
+
+(defconst espresso--dotted-name-re
+  (concat espresso--name-re "\\(?:\\." espresso--name-re "\\)*")
+  "Matches a dot-separated sequence of Javascript names")
+
+(defconst espresso--cpp-name-re espresso--name-re
+  "Matches a C preprocessor name")
+
+(defconst espresso--opt-cpp-start "^\\s-*#\\s-*\\([[:alnum:]]+\\)"
+  "Regexp matching the prefix of a cpp directive including the directive
+name, or nil in languages without preprocessor support.  The first
+submatch surrounds the directive name.")
+
+(defconst espresso--plain-method-re
+  (concat "^\\s-*?\\(" espresso--dotted-name-re "\\)\\.prototype"
+          "\\.\\(" espresso--name-re "\\)\\s-*?=\\s-*?\\(function\\)\\_>")
+  "Regexp matching an old-fashioned explicit prototype \"method\"
+  declaration. Group 1 is a (possibly-dotted) class name, group 2
+  is a method name, and group 3 is the 'function' keyword." )
+
+(defconst espresso--plain-class-re
+  (concat "^\\s-*\\(" espresso--dotted-name-re "\\)\\.prototype"
+          "\\s-*=\\s-*{")
+  "Regexp matching an old-fashioned explicit prototype \"class\"
+  declaration, as in Class.prototype = { method1: ...} ")
+
+(defconst espresso--mp-class-decl-re
+  (concat "^\\s-*var\\s-+"
+          "\\(" espresso--name-re "\\)"
+          "\\s-*=\\s-*"
+          "\\(" espresso--dotted-name-re
+          "\\)\\.extend\\(?:Final\\)?\\s-*(\\s-*{?\\s-*$")
+  "var NewClass = BaseClass.extend(")
+
+(defconst espresso--prototype-obsolete-class-decl-re
+  (concat "^\\s-*\\(?:var\\s-+\\)?"
+          "\\(" espresso--dotted-name-re "\\)"
+          "\\s-*=\\s-*Class\\.create()")
+  "var NewClass = Class.create()")
+
+(defconst espresso--prototype-objextend-class-decl-re-1
+  (concat "^\\s-*Object\\.extend\\s-*("
+          "\\(" espresso--dotted-name-re "\\)"
+          "\\s-*,\\s-*{"))
+
+(defconst espresso--prototype-objextend-class-decl-re-2
+  (concat "^\\s-*\\(?:var\\s-+\\)?"
+          "\\(" espresso--dotted-name-re "\\)"
+          "\\s-*=\\s-*Object\\.extend\\s-*\("))
+
+(defconst espresso--prototype-class-decl-re
+  (concat "^\\s-*\\(?:var\\s-+\\)?"
+          "\\(" espresso--name-re "\\)"
+          "\\s-*=\\s-*Class\\.create\\s-*(\\s-*"
+          "\\(?:\\(" espresso--dotted-name-re "\\)\\s-*,\\s-*\\)?{?")
+  "var NewClass = Class.create({")
+
+;; Parent class name(s) (yes, multiple inheritance in Javascript) are
+;; matched with dedicated font-lock matchers
+(defconst espresso--dojo-class-decl-re
+  (concat "^\\s-*dojo\\.declare\\s-*(\"\\(" espresso--dotted-name-re "\\)"))
+
+(defconst espresso--extjs-class-decl-re-1
+  (concat "^\\s-*Ext\\.extend\\s-*("
+          "\\s-*\\(" espresso--dotted-name-re "\\)"
+          "\\s-*,\\s-*\\(" espresso--dotted-name-re "\\)")
+  "ExtJS class declaration (style 1)")
+
+(defconst espresso--extjs-class-decl-re-2
+  (concat "^\\s-*\\(?:var\\s-+\\)?"
+          "\\(" espresso--name-re "\\)"
+          "\\s-*=\\s-*Ext\\.extend\\s-*(\\s-*"
+          "\\(" espresso--dotted-name-re "\\)")
+  "ExtJS class declaration (style 2)")
+
+(defconst espresso--mochikit-class-re
+  (concat "^\\s-*MochiKit\\.Base\\.update\\s-*(\\s-*"
+          "\\(" espresso--dotted-name-re "\\)")
+  "MochiKit class declaration?")
+
+(defconst espresso--dummy-class-style
+  '(:name "[Automatically Generated Class]"))
+
+(defconst espresso--class-styles
+  `((:name            "Plain"
+     :class-decl      ,espresso--plain-class-re
+     :prototype       t
+     :contexts        (toplevel)
+     :framework       javascript)
+
+    (:name            "MochiKit"
+     :class-decl      ,espresso--mochikit-class-re
+     :prototype       t
+     :contexts        (toplevel)
+     :framework       mochikit)
+
+    (:name            "Prototype (Obsolete)"
+     :class-decl      ,espresso--prototype-obsolete-class-decl-re
+     :contexts        (toplevel)
+     :framework       prototype)
+
+    (:name            "Prototype (Modern)"
+     :class-decl      ,espresso--prototype-class-decl-re
+     :contexts        (toplevel)
+     :framework       prototype)
+
+    (:name            "Prototype (Object.extend)"
+     :class-decl      ,espresso--prototype-objextend-class-decl-re-1
+     :prototype       t
+     :contexts        (toplevel)
+     :framework       prototype)
+
+    (:name            "Prototype (Object.extend) 2"
+     :class-decl      ,espresso--prototype-objextend-class-decl-re-2
+     :prototype       t
+     :contexts        (toplevel)
+     :framework       prototype)
+
+    (:name            "Dojo"
+     :class-decl      ,espresso--dojo-class-decl-re
+     :contexts        (toplevel)
+     :framework       dojo)
+
+    (:name            "ExtJS (style 1)"
+     :class-decl      ,espresso--extjs-class-decl-re-1
+     :prototype       t
+     :contexts        (toplevel)
+     :framework       extjs)
+
+    (:name            "ExtJS (style 2)"
+     :class-decl      ,espresso--extjs-class-decl-re-2
+     :contexts        (toplevel)
+     :framework       extjs)
+
+    (:name            "Merrill Press"
+     :class-decl      ,espresso--mp-class-decl-re
+     :contexts        (toplevel)
+     :framework       merrillpress))
+
+  "A list of class definition styles.
+
+A class definition style is a plist with the following keys:
+
+:name is a human-readable name of the class type
+
+:class-decl is a regular expression giving the start of the
+class. Its first group must match the name of its class. If there
+is a parent class, the second group should match, and it should
+be the name of the class.
+
+If :prototype is present and non-nil, the parser will merge
+declarations for this constructs with others at the same lexical
+level that have the same name. Otherwise, multiple definitions
+will create multiple top-level entries. Don't use :prototype
+unnecessarily: it has an associated cost in performance.
+
+If :strip-prototype is present and non-nil, then if the class
+name as matched contains
+")
+
+(defconst espresso--available-frameworks
+  (loop with available-frameworks
+        for style in espresso--class-styles
+        for framework = (plist-get style :framework)
+        unless (memq framework available-frameworks)
+        collect framework into available-frameworks
+        finally return available-frameworks)
+
+  "List of available frameworks symbols")
+
+(defconst espresso--function-heading-1-re
+  (concat
+   "^\\s-*function\\s-+\\(" espresso--name-re "\\)")
+  "Regular expression matching the start of a function header. Match group 1
+is the name of the function.")
+
+(defconst espresso--function-heading-2-re
+  (concat
+   "^\\s-*\\(" espresso--name-re "\\)\\s-*:\\s-*function\\_>")
+  "Regular expression matching the start of a function entry in
+  an associative array. Match group 1 is the name of the function.")
+
+(defconst espresso--function-heading-3-re
+  (concat
+   "^\\s-*\\(?:var\\s-+\\)?\\(" espresso--dotted-name-re "\\)"
+   "\\s-*=\\s-*function\\_>")
+  "Matches a line in the form var MUMBLE = function. Match group
+  1 is MUMBLE.")
+
+(defconst espresso--macro-decl-re
+  (concat "^\\s-*#\\s-*define\\s-+\\(" espresso--cpp-name-re "\\)\\s-*(")
+  "Regular expression matching a CPP macro definition up to the opening
+parenthesis. Match group 1 is the name of the function.")
+
+(defun espresso--regexp-opt-symbol (list)
+  "Like regexp-opt, but surround the optimized regular expression
+with `\\\\_<' and `\\\\_>'."
+  (concat "\\_<" (regexp-opt list t) "\\_>"))
+
+(defconst espresso--keyword-re
+  (espresso--regexp-opt-symbol
+   '("abstract" "break" "case" "catch" "class" "const"
+     "continue" "debugger" "default" "delete" "do" "else"
+     "enum" "export" "extends" "final" "finally" "for"
+     "function" "goto" "if" "implements" "import" "in"
+     "instanceof" "interface" "native" "new" "package"
+     "private" "protected" "public" "return" "static"
+     "super" "switch" "synchronized" "throw"
+     "throws" "transient" "try" "typeof" "var" "void" "let"
+     "yield" "volatile" "while" "with"))
+  "Regular expression matching any JavaScript keyword.")
+
+(defconst espresso--basic-type-re
+  (espresso--regexp-opt-symbol
+   '("boolean" "byte" "char" "double" "float" "int" "long"
+     "short" "void"))
+  "Regular expression matching any predefined type in JavaScript.")
+
+(defconst espresso--constant-re
+  (espresso--regexp-opt-symbol '("false" "null" "undefined"
+                                 "Infinity" "NaN"
+                                 "true" "arguments" "this"))
+  "Regular expression matching any future reserved words in JavaScript.")
+
+
+(defconst espresso--font-lock-keywords-1
+  (list
+   "\\_<import\\_>"
+   (list espresso--function-heading-1-re 1 font-lock-function-name-face)
+   (list espresso--function-heading-2-re 1 font-lock-function-name-face))
+  "Level one font lock.")
+
+(defconst espresso--font-lock-keywords-2
+  (append espresso--font-lock-keywords-1
+          (list (list espresso--keyword-re 1 font-lock-keyword-face)
+                (list "\\_<for\\_>"
+                      "\\s-+\\(each\\)\\_>" nil nil
+                      (list 1 'font-lock-keyword-face))
+                (cons espresso--basic-type-re font-lock-type-face)
+                (cons espresso--constant-re font-lock-constant-face)))
+  "Level two font lock.")
+
+;; espresso--pitem is the basic building block of the lexical
+;; database. When one refesr to a real part of the buffer, the region
+;; of text to which it refers is split into a conceptual header and
+;; body. Consider the (very short) block described by a hypothetical
+;; espresso--pitem:
+;;
+;;   function foo(a,b,c) { return 42; }
+;;   ^                    ^            ^
+;;   |                    |            |
+;;   +- h-begin           +- h-end     +- b-end
+;;
+;; (Remember that these are buffer positions, and therefore point
+;; between characters, not at them. An arrow drawn to a character
+;; indicates the corresponding position is between that character and
+;; the one immediately preceding it.)
+;;
+;; The header is the region of text [h-begin, h-end], and is
+;; the text needed to unambiguously recognize the start of the
+;; construct. If the entire header is not present, the construct is
+;; not recognized at all. No other pitems may be nested inside the
+;; header.
+;;
+;; The body is the region [h-end, b-end]. It may contain nested
+;; espresso--pitem instances. The body of a pitem may be empty: in
+;; that case, b-end is equal to header-end.
+;;
+;; The three points obey the following relationship:
+;;
+;;   h-begin < h-end <= b-end
+;;
+;; We put a text property in the buffer on the character *before*
+;; h-end, and if we see it, on the character *before* b-end.
+;;
+;; The text property for h-end, espresso--pstate, is actually a list
+;; of all espresso--pitem instances open after the marked character.
+;;
+;; The text property for b-end, espresso--pend, is simply the
+;; espresso--pitem that ends after the marked character. (Because
+;; pitems always end when the paren-depth drops below a critical
+;; value, and because we can only drop one level per character, only
+;; one pitem may end at a given character.)
+;;
+;; In the structure below, we only store h-begin and (sometimes)
+;; b-end. We can trivially and quickly find h-end by going to h-begin
+;; and searching for an espresso--pstate text property. Since no other
+;; espresso--pitem instances can be nested inside the header of a
+;; pitem, the location after the character with this text property
+;; must be h-end.
+;;
+;; espresso--pitem instances, are never modified (with the exception
+;; of the b-end field), and instead copied and changed in the process.
+;; (The exception and its caveats for b-end is described below.)
+;;
+
+(defstruct (espresso--pitem (:type list))
+  ;; IMPORTANT: Do not alter the offsets of fields within the list.
+  ;; Various bits of code depend on their positions, particularly
+  ;; anything that manipulates the children list.
+
+  ;; List of children inside this pitem's body
+  (children nil :read-only t)
+
+  ;; When we reach this paren depth after h-end, the pitem ends
+  (paren-depth nil :read-only t)
+
+  ;; Symbol or class-style plist if this is a class
+  (type nil :read-only t)
+
+  ;; See above
+  (h-begin nil :read-only t)
+
+  ;; List of strings giving the parts of the name of this pitem (e.g.,
+  ;; '("MyClass" "myMethod"), or t if this pitem is anonymous
+  (name nil :read-only t)
+
+  ;; THIS FIELD IS MUTATED, and its value is shared by all copies of
+  ;; this pitem: when we copy-and-modify pitem instances, we share
+  ;; their tail structures, so all the copies actually have the same
+  ;; terminating cons cell, which we modify directly.
+  ;;
+  ;; The field value is either a number (buffer location) or nil if
+  ;; unknown.
+  ;;
+  ;; If the field's value is greater than `espresso--cache-end', the
+  ;; value is stale and must be treated as if it were nil. Conversely,
+  ;; if this field is nil, it is guaranteed that this pitem is open up
+  ;; to at least `espresso--cache-end'. (This property is handy when
+  ;; computing whether we're inside a given pitem.)
+  ;;
+  (b-end nil))
+
+(defconst espresso--initial-pitem
+  (make-espresso--pitem
+   :paren-depth most-negative-fixnum
+   :type 'toplevel)
+
+  "The pitem we start parsing with")
+
+;;; User Customization
+
+(defgroup espresso nil
+  "Customization variables for `espresso-mode'."
+  :tag "JavaScript - Espresso-Mode"
+  :group 'languages)
+
+(defcustom espresso-indent-level 4
+  "Number of spaces for each indentation step."
+  :type 'integer
+  :group 'espresso)
+
+(defcustom espresso-expr-indent-offset 0
+  "Number of additional spaces used for indentation of continued
+expressions. The value must be no less than minus
+`espresso-indent-level'."
+  :type 'integer
+  :group 'espresso)
+
+(defcustom espresso-auto-indent-flag t
+  "Automatic indentation with punctuation characters. If non-nil, the
+current line is indented when certain punctuations are inserted."
+  :type 'boolean
+  :group 'espresso)
+
+(defcustom espresso-flat-functions nil
+  "Treat nested functions as if they were top-level functions for
+function movement, marking, and so on."
+  :type 'boolean
+  :group 'espresso)
+
+(defcustom espresso-comment-lineup-func #'c-lineup-C-comments
+  "cc-mode-style lineup function for C comments"
+  :type 'function
+  :group 'espresso)
+
+(defcustom espresso-enabled-frameworks espresso--available-frameworks
+  "Select which frameworks espresso-mode will recognize.
+
+Turn off some frameworks you seldom use to improve performance.
+The set of recognized frameworks can also be overriden on a
+per-buffer basis."
+  :type (cons 'set (mapcar (lambda (x)
+                             (list 'const x))
+                           espresso--available-frameworks))
+  :group 'espresso)
+
+(defcustom espresso-js-switch-tabs
+  (and (memq system-type '(darwin)) t)
+  "Non-nil if Emacs should display tabs while selecting them.
+  Useful only if the windowing system has a good mechanism for
+  preventing Firefox from stealing the keyboard focus."
+  :type 'boolean
+  :group 'espresso)
+
+(defcustom espresso-js-tmpdir
+  "~/.emacs.d/espresso/js"
+  "Temporary directory used for communicating with Mozilla. It
+  must be readable and writable by both Mozilla and Emacs."
+  :type 'directory
+  :group 'espresso)
+
+(defcustom espresso-js-timeout 5
+  "Wait this many seconds for a reply from Mozilla when executing
+commands. Increase this value if you are getting timeout
+messages."
+  :type 'integer
+  :group 'espresso)
+
+;;; KeyMap
+
+(defvar espresso-mode-map
+  (let ((keymap (make-sparse-keymap)))
+    (mapc (lambda (key)
+            (define-key keymap key #'espresso-insert-and-indent))
+          '("+" "-" "/" "*" "{" "}" "(" ")" ":" ";" ","))
+    (define-key keymap [(control ?c) (meta ?:)] #'espresso-js-eval)
+    (define-key keymap [(control ?c) (control ?j)] #'espresso-set-js-context)
+    (define-key keymap [(control meta ?x)] #'espresso-eval-defun)
+    (define-key keymap [(meta ?.)] #'espresso-find-symbol)
+
+    (easy-menu-define nil keymap "Espresso Menu"
+      '("Javascript"
+        ["Select new Mozilla context…" espresso-set-js-context
+         (fboundp #'inferior-moz-process)]
+        ["Evaluate expression in Mozilla context…" espresso-js-eval
+         (fboundp #'inferior-moz-process)]
+        ["Send current function to Mozilla…" espresso-eval-defun
+         (fboundp #'inferior-moz-process)]
+        )
+      )
+
+    keymap)
+  "Keymap for espresso-mode")
+
+(defun espresso-insert-and-indent (key)
+  "Runs the command bound to KEY in the global keymap, and if
+we're not in a string or comment, indents the current line."
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (let ((syntax (save-restriction (widen) (syntax-ppss))))
+    (when (or (and (not (nth 8 syntax))
+                   espresso-auto-indent-flag)
+              (and (nth 4 syntax)
+                   (eq (current-column)
+                       (1+ (current-indentation)))))
+
+         (indent-according-to-mode))))
+
+;;; Syntax table and parsing
+
+(defvar espresso-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (c-populate-syntax-table table)
+    (modify-syntax-entry ?$ "_" table)
+    table)
+  "Syntax table used in Espresso mode.")
+
+(defvar espresso--quick-match-re nil
+  "Autogenerated regular expression to match buffer constructs")
+
+(defvar espresso--quick-match-re-func nil
+  "Autogenerated regular expression to match buffer constructs
+and functions")
+
+(make-variable-buffer-local 'espresso--quick-match-re)
+(make-variable-buffer-local 'espresso--quick-match-re-func)
+
+(defvar espresso--cache-end 1
+  "Last place in the buffer the function cache is valid")
+(make-variable-buffer-local 'espresso--cache-end)
+
+(defvar espresso--last-parse-pos nil
+  "Last place we parsed up to in espresso--ensure-cache")
+(make-variable-buffer-local 'espresso--last-parse-pos)
+
+(defvar espresso--state-at-last-parse-pos nil
+  "pstate at espresso--last-parse-pos")
+(make-variable-buffer-local 'espresso--state-at-last-parse-pos)
+
+(defun espresso--flatten-list (list)
+  (loop for item in list
+        nconc (cond ((consp item)
+                     (espresso--flatten-list item))
+
+                    (item (list item)))))
+
+(defun espresso--maybe-join (prefix separator suffix &rest list)
+  "If LIST contains any element that is not nil, return its
+non-nil elements, separated by SEPARATOR, prefixed by PREFIX, and
+ended with SUFFIX as with `concat'. Otherwise, if LIST is empty,
+return nil. If any element in LIST is itself a list, flatten that
+element."
+  (setq list (espresso--flatten-list list))
+  (when list
+    (concat prefix (mapconcat #'identity list separator) suffix)))
+
+(defun espresso--update-quick-match-re ()
+  "Update espresso--quick-match-re based on the current set of
+enabled frameworks"
+  (setq espresso--quick-match-re
+        (espresso--maybe-join
+         "^[ \t]*\\(?:" "\\|" "\\)"
+
+         ;; #define mumble
+         "#define[ \t]+[a-zA-Z_]"
+
+         (when (memq 'extjs espresso-enabled-frameworks)
+           "Ext\\.extend")
+
+         (when (memq 'prototype espresso-enabled-frameworks)
+           "Object\\.extend")
+
+          ;; var mumble = THING (
+         (espresso--maybe-join
+          "\\(?:var[ \t]+\\)?[a-zA-Z_$0-9.]+[ \t]*=[ \t]*\\(?:"
+          "\\|"
+          "\\)[ \t]*\("
+
+          (when (memq 'prototype espresso-enabled-frameworks)
+                    "Class\\.create")
+
+          (when (memq 'extjs espresso-enabled-frameworks)
+            "Ext\\.extend")
+
+          (when (memq 'merrillpress espresso-enabled-frameworks)
+            "[a-zA-Z_$0-9]+\\.extend\\(?:Final\\)?"))
+
+         (when (memq 'dojo espresso-enabled-frameworks)
+           "dojo\\.declare[ \t]*\(")
+
+         (when (memq 'mochikit espresso-enabled-frameworks)
+           "MochiKit\\.Base\\.update[ \t]*\(")
+
+         ;; mumble.prototypeTHING
+         (espresso--maybe-join
+          "[a-zA-Z_$0-9.]+\\.prototype\\(?:" "\\|" "\\)"
+
+          (when (memq 'javascript espresso-enabled-frameworks)
+            '( ;; foo.prototype.bar = function(
+              "\\.[a-zA-Z_$0-9]+[ \t]*=[ \t]*function[ \t]*\("
+
+              ;; mumble.prototype = {
+              "[ \t]*=[ \t]*{")))))
+
+  (setq espresso--quick-match-re-func
+        (concat "function\\|" espresso--quick-match-re)))
+
+(defun espresso--forward-text-property (propname)
+  "Move over the next value of PROPNAME in the buffer. If found,
+return that value and leave point after the character having that
+value, otherwise return nil and leave point at EOB."
+  (let ((next-value (get-text-property (point) propname)))
+    (if next-value
+        (forward-char)
+
+      (goto-char (next-single-property-change
+                  (point) propname nil (point-max)))
+      (unless (eobp)
+        (setq next-value (get-text-property (point) propname))
+        (forward-char)))
+
+    next-value))
+
+(defun espresso--backward-text-property (propname)
+    "Move over the previous value of PROPNAME in the buffer. If found,
+return that value and leave point just before the character that
+has that value, otherwise return nil and leave point at BOB."
+    (unless (bobp)
+      (let ((prev-value (get-text-property (1- (point)) propname)))
+        (if prev-value
+            (backward-char)
+
+          (goto-char (previous-single-property-change
+                      (point) propname nil (point-min)))
+
+          (unless (bobp)
+            (backward-char)
+            (setq prev-value (get-text-property (point) propname))))
+
+        prev-value)))
+
+(defsubst espresso--forward-pstate ()
+  (espresso--forward-text-property 'espresso--pstate))
+
+(defsubst espresso--backward-pstate ()
+  (espresso--backward-text-property 'espresso--pstate))
+
+(defun espresso--pitem-goto-h-end (pitem)
+  (goto-char (espresso--pitem-h-begin pitem))
+  (espresso--forward-pstate))
+
+(defun espresso--re-search-forward-inner (regexp &optional bound count)
+  "Auxiliary function for `espresso--re-search-forward'."
+  (let ((parse)
+        str-terminator
+        (orig-macro-end (save-excursion
+                          (when (espresso--beginning-of-macro)
+                            (c-end-of-macro)
+                            (point)))))
+    (while (> count 0)
+      (re-search-forward regexp bound)
+      (setq parse (syntax-ppss))
+      (cond ((setq str-terminator (nth 3 parse))
+             (when (eq str-terminator t)
+               (setq str-terminator ?/))
+             (re-search-forward
+              (concat "\\([^\\]\\|^\\)" (string str-terminator))
+              (save-excursion (end-of-line) (point)) t))
+            ((nth 7 parse)
+             (forward-line))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
+             (re-search-forward "\\*/"))
+            ((and (not (and orig-macro-end
+                            (<= (point) orig-macro-end)))
+                  (espresso--beginning-of-macro))
+             (c-end-of-macro))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+
+(defun espresso--re-search-forward (regexp &optional bound noerror count)
+  "Search forward but ignore strings, cpp macros, and comments.
+Invokes `re-search-forward' but treats the buffer as if strings,
+cpp macros, and comments have been removed.
+
+If invoked while inside a macro, treat the contents of the macro
+as normal text.
+
+"
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(espresso--re-search-forward-inner regexp bound 1))
+               ((< count 0)
+                '(espresso--re-search-backward-inner regexp bound (- count)))
+               ((> count 0)
+                '(espresso--re-search-forward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun espresso--re-search-backward-inner (regexp &optional bound count)
+  "Auxiliary function for `espresso--re-search-backward'."
+  (let ((parse)
+        str-terminator
+        (orig-macro-start
+         (save-excursion
+           (and (espresso--beginning-of-macro)
+                (point)))))
+    (while (> count 0)
+      (re-search-backward regexp bound)
+      (when (and (> (point) (point-min))
+                 (save-excursion (backward-char) (looking-at "/[/*]")))
+        (forward-char))
+      (setq parse (syntax-ppss))
+      (cond ((setq str-terminator (nth 3 parse))
+             (when (eq str-terminator t)
+               (setq str-terminator ?/))
+             (re-search-backward
+              (concat "\\([^\\]\\|^\\)" (string str-terminator))
+              (save-excursion (beginning-of-line) (point)) t))
+            ((nth 7 parse)
+             (goto-char (nth 8 parse)))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
+             (re-search-backward "/\\*"))
+            ((and (not (and orig-macro-start
+                            (>= (point) orig-macro-start)))
+                  (espresso--beginning-of-macro)))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+
+(defun espresso--re-search-backward (regexp &optional bound noerror count)
+  "Search backward but ignore strings, preprocessor macros, and
+comments. Invokes `re-search-backward' but treats the buffer as
+if strings, preprocessor macros, and comments have been removed.
+
+If inside a macro when called, treat the macro as normal text.
+"
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(espresso--re-search-backward-inner regexp bound 1))
+               ((< count 0)
+                '(espresso--re-search-forward-inner regexp bound (- count)))
+               ((> count 0)
+                '(espresso--re-search-backward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+(defun espresso--forward-expression ()
+  "Move forward over a whole expression. Doesn't move over
+expressions continued across lines, but we don't actually care"
+  (loop
+   ;; non-continued case; simplistic, but good enough?
+   do (loop until (or (eolp)
+                      (progn
+                        (forward-comment most-positive-fixnum)
+                        (memq (char-after) '(?\, ?\; ?\] ?\) ?\}))))
+            do (forward-sexp))
+
+   while (and (eq (char-after) ?\n)
+              (save-excursion
+                (forward-char)
+                (espresso--continued-expression-p)))))
+
+(defun espresso--forward-function-decl ()
+  "Move forward over a function declaration with point at the
+'function' keyword. Return no-nil if this is a
+syntactically-correct non-expression function, nil otherwise.
+Specifically, return the name of the function, or t if the name
+could not be determined."
+  (assert (looking-at "\\_<function\\_>"))
+  (let ((name t))
+    (forward-word)
+    (forward-comment most-positive-fixnum)
+    (when (looking-at espresso--name-re)
+      (setq name (match-string-no-properties 0))
+      (goto-char (match-end 0)))
+    (forward-comment most-positive-fixnum)
+    (and (eq (char-after) ?\( )
+         (ignore-errors (forward-list) t)
+         (progn (forward-comment most-positive-fixnum)
+                (and (eq (char-after) ?{)
+                     name)))))
+
+(defun espresso--function-prologue-beginning (&optional pos)
+  "Return the start of the function prologue that contains POS,
+or nil if we're not in a function prologue. A function prologue
+is everything from start of the definition up to and including
+the opening brace. POS defaults to point."
+
+  (let (prologue-begin)
+    (save-excursion
+      (if pos
+          (goto-char pos)
+        (setq pos (point)))
+
+      (when (save-excursion
+              (forward-line 0)
+              (or (looking-at espresso--function-heading-2-re)
+                  (looking-at espresso--function-heading-3-re)))
+
+        (setq prologue-begin (match-beginning 1))
+        (when (<= prologue-begin pos)
+          (goto-char (match-end 0))))
+
+      (skip-syntax-backward "w_")
+      (and (or (looking-at "\\_<function\\_>")
+               (espresso--re-search-backward "\\_<function\\_>" nil t))
+
+           (save-match-data (goto-char (match-beginning 0))
+                            (espresso--forward-function-decl))
+
+           (<= pos (point))
+           (or prologue-begin (match-beginning 0))))))
+
+(defun espresso--beginning-of-defun-raw ()
+  "Internal helper for espresso--beginning-of-defun. Go to
+previous defun-beginning and return the parse state for it, or
+nil if we went all the way back to bob and don't find anything."
+  (espresso--ensure-cache)
+  (let (pstate)
+    (while (and (setq pstate (espresso--backward-pstate))
+                (not (eq 'function (espresso--pitem-type (car pstate))))))
+    (and (not (bobp)) pstate)))
+
+(defun espresso--pstate-is-toplevel-defun (pstate)
+  "If PSTATE represents a non-empty top-level defun, return the
+top-most pitem. Otherwise, return nil."
+  (loop for pitem in pstate
+        with func-depth = 0
+        with func-pitem
+        if (eq 'function (espresso--pitem-type pitem))
+        do (incf func-depth)
+        and do (setq func-pitem pitem)
+        finally return (if (eq func-depth 1) func-pitem)))
+
+(defun espresso--beginning-of-defun-nested ()
+  "Internal helper for espresso--beginning-of-defun. Returns the
+pitem of the function we went to the beginning of."
+
+  (or
+   ;; Look for the smallest function that encloses point...
+   (loop for pitem in (espresso--parse-state-at-point)
+         if (and (eq 'function (espresso--pitem-type pitem))
+                 (espresso--inside-pitem-p pitem))
+         do (goto-char (espresso--pitem-h-begin pitem))
+         and return pitem)
+
+   ;; ...and if that isn't found, look for the previous top-level
+   ;; defun
+   (loop for pstate = (espresso--backward-pstate)
+         while pstate
+         if (espresso--pstate-is-toplevel-defun pstate)
+         do (goto-char (espresso--pitem-h-begin it))
+         and return it)))
+
+(defun espresso--beginning-of-defun-flat ()
+  "Internal helper for espresso--beginning-of-defun"
+
+  (let ((pstate (espresso--beginning-of-defun-raw)))
+    (when pstate
+      (goto-char (espresso--pitem-h-begin (car pstate))))))
+
+(defun espresso--beginning-of-defun ()
+  "Used as beginning-of-defun-function"
+
+  ;; If we're just past the end of a function, the user probably wants
+  ;; to go to the beginning of *that* function
+  (when (eq (char-before) ?})
+    (backward-char))
+
+  (let ((prologue-begin (espresso--function-prologue-beginning)))
+    (cond ((and prologue-begin (< prologue-begin (point)))
+           (goto-char prologue-begin))
+
+          (espresso-flat-functions
+           (espresso--beginning-of-defun-flat))
+          (t
+           (espresso--beginning-of-defun-nested)))))
+
+(defun espresso--flush-caches (&optional beg ignored)
+  "Flush syntax cache info after position BEG. BEG defaults to
+point-min, flushing the entire cache."
+  (interactive)
+  (setq beg (or beg (save-restriction (widen) (point-min))))
+  (setq espresso--cache-end (min espresso--cache-end beg)))
+
+(defmacro espresso--debug (&rest arguments)
+  ;; `(message ,@arguments)
+  )
+
+(defun espresso--ensure-cache--pop-if-ended (open-items paren-depth)
+  (let ((top-item (car open-items)))
+    (when (<= paren-depth (espresso--pitem-paren-depth top-item))
+      (assert (not (get-text-property (1- (point)) 'espresso-pend)))
+      (put-text-property (1- (point)) (point) 'espresso--pend top-item)
+      (setf (espresso--pitem-b-end top-item) (point))
+      (setq open-items
+            ;; open-items must contain at least two items for this to
+            ;; work, but because we push a dummy item to start with,
+            ;; that assumption holds.
+            (cons (espresso--pitem-add-child (second open-items) top-item)
+                  (cddr open-items)))))
+
+  open-items)
+
+(defmacro espresso--ensure-cache--update-parse ()
+  "Helper for use inside espresso--ensure-cache. Updates parsing
+information up to point. Refers to parse, prev-parse-point,
+goal-point, and open-items bound lexically in the body of
+`espresso--ensure-cache'."
+  `(progn
+     (setq goal-point (point))
+     (goto-char prev-parse-point)
+     (while (progn
+              (setq open-items (espresso--ensure-cache--pop-if-ended
+                                open-items (car parse)))
+              ;; Make sure parse-partial-sexp doesn't stop because we *entered*
+              ;; the given depth -- i.e., make sure we're deeper than the target
+              ;; depth.
+              (assert (> (nth 0 parse)
+                         (espresso--pitem-paren-depth (car open-items))))
+              (setq parse (parse-partial-sexp
+                           prev-parse-point goal-point
+                           (espresso--pitem-paren-depth (car open-items))
+                           nil parse))
+
+;;              (let ((overlay (make-overlay prev-parse-point (point))))
+;;                (overlay-put overlay 'face '(:background "red"))
+;;                (unwind-protect
+;;                     (progn
+;;                       (espresso--debug "parsed: %S" parse)
+;;                       (sit-for 1))
+;;                  (delete-overlay overlay)))
+
+              (setq prev-parse-point (point))
+              (< (point) goal-point)))
+
+     (setq open-items (espresso--ensure-cache--pop-if-ended
+                       open-items (car parse)))))
+
+(defun espresso--show-cache-at-point ()
+  (interactive)
+  (require 'pp)
+  (let ((prop (get-text-property (point) 'espresso--pstate)))
+    (with-output-to-temp-buffer "*Help*"
+      (pp prop))))
+
+(defun espresso--split-name (string)
+  "Splits a name into its dot-separated parts. Also removes any
+prototype parts from the split name (unless the name is just
+\"prototype\" to start with, that is)."
+  (let ((name (save-match-data
+                (split-string string "\\." t))))
+    (unless (and (= (length name) 1)
+                 (equal (car name) "prototype"))
+
+      (setq name (remove "prototype" name)))))
+
+(defvar espresso--guess-function-name-start nil
+  "Secondary out-variable for espresso--guess-function-name")
+
+(defun espresso--guess-function-name (position)
+  "Guess the name of the function at POSITION, which should be
+the just after the end of the word 'function'. Return the name of
+the function or nil if the name could not be guessed. Clobbers
+match data. If in guessing the function name we find the preamble
+begins earlier than expected, set `espresso--guess-function-name-start'
+to that position, otherwise set that variable to nil."
+
+  (setq espresso--guess-function-name-start nil)
+  (save-excursion
+    (goto-char position)
+    (forward-line 0)
+    (cond
+     ((looking-at espresso--function-heading-3-re)
+      (and (eq (match-end 0) position)
+           (setq espresso--guess-function-name-start (match-beginning 1))
+           (match-string-no-properties 1)))
+
+     ((looking-at espresso--function-heading-2-re)
+      (and (eq (match-end 0) position)
+           (setq espresso--guess-function-name-start (match-beginning 1))
+           (match-string-no-properties 1))))))
+
+(defun espresso--clear-stale-cache ()
+  ;; Clear any endings that occur after point
+  (let (end-prop)
+    (save-excursion
+      (while (setq end-prop (espresso--forward-text-property
+                             'espreso--pend))
+        (setf (espresso--pitem-b-end end-prop) nil))))
+
+  ;; Remove any cache properties after this point
+  (remove-text-properties (point) (point-max)
+                          '(espresso--pstate t espresso--pend t)))
+
+(defun espresso--ensure-cache (&optional limit stop-on-end)
+  "Ensures brace cache is valid up to the character before LIMIT.
+LIMIT defaults to point. If STOP-ON-END is non-nil, it must be a
+pitem instance, and espresso--ensure-cache will return when the
+given item ends instead of parsing all the way to LIMIT."
+  (setq limit (or limit (point)))
+  (when (< espresso--cache-end limit)
+
+    (c-save-buffer-state
+        (open-items
+         orig-match-start
+         orig-match-end
+         orig-depth
+         parse
+         prev-parse-point
+         name
+         case-fold-search
+         filtered-class-styles
+         new-item
+         goal-point
+         end-prop)
+
+      ;; Figure out which class styles we need to look for
+      (setq filtered-class-styles
+            (loop for style in espresso--class-styles
+                  if (memq (plist-get style :framework)
+                           espresso-enabled-frameworks)
+                  collect style))
+
+      (save-excursion
+        (save-restriction
+          (widen)
+
+          ;; Find last known good position
+          (goto-char espresso--cache-end)
+          (unless (bobp)
+            (setq open-items (get-text-property
+                              (1- (point)) 'espresso--pstate))
+
+            (unless open-items
+              (goto-char (previous-single-property-change
+                          (point) 'espresso--pstate nil (point-min)))
+
+              (unless (bobp)
+                (setq open-items (get-text-property (1- (point))
+                                                    'espresso--pstate))
+                (assert open-items))))
+
+          (unless open-items
+            ;; Make a placeholder for the top-level definition
+            (setq open-items (list espresso--initial-pitem)))
+
+          (setq parse (syntax-ppss))
+          (setq prev-parse-point (point))
+
+          (espresso--clear-stale-cache)
+
+          (narrow-to-region (point-min) limit)
+
+          (loop while (re-search-forward espresso--quick-match-re-func nil t)
+                for orig-match-start = (goto-char (match-beginning 0))
+                for orig-match-end = (match-end 0)
+                do (espresso--ensure-cache--update-parse)
+                for orig-depth = (nth 0 parse)
+
+                ;; Each of these conditions should return non-nil if
+                ;; we should add a new item and leave point at the end
+                ;; of the new item's header (h-end in the
+                ;; espresso--pitem diagram). This point is the one
+                ;; after the last character nweed to unambiguously
+                ;; detect this construct. If one of these evaluates to
+                ;; nil, the location of the point is ignored.
+                if (cond
+                    ;; In comment or string
+                    ((nth 8 parse) nil)
+
+                    ;; Regular function declaration
+                    ((and (looking-at "\\_<function\\_>")
+                          (setq name (espresso--forward-function-decl)))
+
+                     (when (eq name t)
+                       (setq name (espresso--guess-function-name orig-match-end))
+                       (if name
+                           (when espresso--guess-function-name-start
+                             (setq orig-match-start
+                                   espresso--guess-function-name-start))
+
+                         (setq name t)))
+
+                     (assert (eq (char-after) ?{))
+                     (forward-char)
+                     (make-espresso--pitem
+                      :paren-depth orig-depth
+                      :h-begin orig-match-start
+                      :type 'function
+                      :name (if (eq name t)
+                                name
+                              (espresso--split-name name))))
+
+                    ;; Macro
+                    ((looking-at espresso--macro-decl-re)
+
+                     ;; Macros often contain unbalanced parentheses.
+                     ;; Make sure that h-end is at the textual end of
+                     ;; the macro no matter what the parenthesis say.
+                     (c-end-of-macro)
+                     (espresso--ensure-cache--update-parse)
+
+                     (make-espresso--pitem
+                      :paren-depth (nth 0 parse)
+                      :h-begin orig-match-start
+                      :type 'macro
+                      :name (list (match-string-no-properties 1))))
+
+                    ;; "Prototype function" declaration
+                    ((looking-at espresso--plain-method-re)
+                     (goto-char (match-beginning 3))
+                     (when (save-match-data
+                             (espresso--forward-function-decl))
+                       (forward-char)
+                       (make-espresso--pitem
+                        :paren-depth orig-depth
+                        :h-begin orig-match-start
+                        :type 'function
+                        :name (nconc (espresso--split-name
+                                      (match-string-no-properties 1))
+                                     (list (match-string-no-properties 2))))))
+
+                    ;; Class definition
+                    ((loop with syntactic-context =
+                           (espresso--syntactic-context-from-pstate open-items)
+                           for class-style in filtered-class-styles
+                           if (and (memq syntactic-context
+                                         (plist-get class-style :contexts))
+                                   (looking-at (plist-get class-style
+                                                          :class-decl)))
+                           do (goto-char (match-end 0))
+                           and return
+                           (make-espresso--pitem
+                            :paren-depth orig-depth
+                            :h-begin orig-match-start
+                            :type class-style
+                            :name (espresso--split-name
+                                   (match-string-no-properties 1))))))
+
+                do (espresso--ensure-cache--update-parse)
+                and do (push it open-items)
+                and do (put-text-property
+                        (1- (point)) (point) 'espresso--pstate open-items)
+                else do (goto-char orig-match-end))
+
+          (goto-char limit)
+          (espresso--ensure-cache--update-parse)
+          (setq espresso--cache-end limit)
+          (setq espresso--last-parse-pos limit)
+          (setq espresso--state-at-last-parse-pos open-items)
+          )))))
+
+(defun espresso--end-of-defun-flat ()
+  "Internal helper for espresso--end-of-defun"
+  (loop while (espresso--re-search-forward "}" nil t)
+        do (espresso--ensure-cache)
+        if (get-text-property (1- (point)) 'espresso--pend)
+        if (eq 'function (espresso--pitem-type it))
+        return t
+        finally do (goto-char (point-max))))
+
+(defun espresso--end-of-defun-nested ()
+  "Internal helper for espresso--end-of-defun"
+  (let* (pitem
+         (this-end (save-excursion
+                     (and (setq pitem (espresso--beginning-of-defun-nested))
+                          (espresso--pitem-goto-h-end pitem)
+                          (progn (backward-char)
+                                 (forward-list)
+                                 (point)))))
+         found)
+
+    (if (and this-end (< (point) this-end))
+        ;; We're already inside a function; just go to its end.
+        (goto-char this-end)
+
+      ;; Otherwise, go to the end of the next function...
+      (while (and (espresso--re-search-forward "\\_<function\\_>" nil t)
+                  (not (setq found (progn
+                                     (goto-char (match-beginning 0))
+                                     (espresso--forward-function-decl))))))
+
+      (if found (forward-list)
+        ;; ... or eob.
+        (goto-char (point-max))))))
+
+(defun espresso--end-of-defun ()
+  "Used as end-of-defun-function"
+  ;; look for function backward. if we're inside it, go to that
+  ;; function's end. otherwise, search for the next function's end and
+  ;; go there
+  (if espresso-flat-functions
+      (espresso--end-of-defun-flat)
+
+    ;; if we're doing nested functions, see whether we're in the
+    ;; prologue. If we are, go to the end of the function; otherwise,
+    ;; call espresso--end-of-defun-nested to do the real work
+    (let ((prologue-begin (espresso--function-prologue-beginning)))
+      (cond ((and prologue-begin (<= prologue-begin (point)))
+             (goto-char prologue-begin)
+             (re-search-forward "\\_<function")
+             (goto-char (match-beginning 0))
+             (espresso--forward-function-decl)
+             (forward-list))
+
+            (t (espresso--end-of-defun-nested))))))
+
+(defun espresso--beginning-of-macro (&optional lim)
+  (let ((here (point)))
+    (save-restriction
+      (if lim (narrow-to-region lim (point-max)))
+      (beginning-of-line)
+      (while (eq (char-before (1- (point))) ?\\)
+        (forward-line -1))
+      (back-to-indentation)
+      (if (and (<= (point) here)
+               (looking-at espresso--opt-cpp-start))
+          t
+        (goto-char here)
+        nil))))
+
+(defun espresso--backward-syntactic-ws (&optional lim)
+  "Simple implementation of c-backward-syntactic-ws"
+  (save-restriction
+    (when lim (narrow-to-region lim (point-max)))
+
+    (let ((in-macro (save-excursion (espresso--beginning-of-macro)))
+          (pos (point)))
+
+      (while (progn (unless in-macro (espresso--beginning-of-macro))
+                    (forward-comment most-negative-fixnum)
+                    (/= (point)
+                        (prog1
+                            pos
+                          (setq pos (point)))))))))
+
+(defun espresso--forward-syntactic-ws (&optional lim)
+  "Simple implementation of c-forward-syntactic-ws"
+  (save-restriction
+    (when lim (narrow-to-region (point-min) lim))
+    (let ((pos (point)))
+      (while (progn
+               (forward-comment most-positive-fixnum)
+               (when (eq (char-after) ?#)
+                 (c-end-of-macro))
+               (/= (point)
+                   (prog1
+                       pos
+                     (setq pos (point)))))))))
+
+(defun espresso--up-nearby-list ()
+  "Like (up-list -1), but only considers lists that end nearby"
+  (save-restriction
+    ;; Look at a very small region so our compuation time doesn't
+    ;; explode in pathological cases.
+    (narrow-to-region (max (point-min) (- (point) 500)) (point))
+    (up-list -1)))
+
+(defun espresso--inside-param-list-p ()
+  "Return non-nil iff point is inside a function parameter list."
+  (ignore-errors
+    (save-excursion
+      (espresso--up-nearby-list)
+      (and (looking-at "(")
+           (progn (forward-symbol -1)
+                  (or (looking-at "function")
+                      (progn (forward-symbol -1)
+                             (looking-at "function"))))))))
+
+(defun espresso--inside-dojo-class-list-p ()
+  "Return non-nil iff point is inside a Dojo multiple-inheritance
+class block."
+  (ignore-errors
+    (save-excursion
+      (espresso--up-nearby-list)
+      (let ((list-begin (point)))
+        (forward-line 0)
+        (and (looking-at espresso--dojo-class-decl-re)
+             (goto-char (match-end 0))
+             (looking-at "\"\\s-*,\\s-*\\[")
+             (eq (match-end 0) (1+ list-begin)))))))
+
+(defun espresso--syntax-begin-function ()
+  (when (< espresso--cache-end (point))
+    (goto-char (max (point-min) espresso--cache-end)))
+
+  (let ((pitem))
+    (while (and (setq pitem (car (espresso--backward-pstate)))
+                (not (eq 0 (espresso--pitem-paren-depth pitem)))))
+
+    (when pitem
+      (goto-char (espresso--pitem-h-begin pitem )))))
+
+;;; Font Lock
+(defun espresso--make-framework-matcher (framework &rest regexps)
+  "Create a byte-compiled function that only matches the given
+regular expressions (that concatenation of REGEXPS) if FRAMEWORK
+is in espresso-enabled-frameworks"
+
+  (setq regexps (apply #'concat regexps))
+  (byte-compile
+   `(lambda (limit)
+      (when (memq (quote ,framework) espresso-enabled-frameworks)
+        (re-search-forward ,regexps limit t)))))
+
+(defvar espresso--tmp-location nil)
+(make-variable-buffer-local 'espresso--tmp-location)
+
+(defun espresso--forward-destructuring-spec (&optional func)
+  "Move forward over a destructuring spec. If FUNC is supplied,
+call it with no arguments before every variable name in the spec.
+Return true iff this was actually a spec. FUNC must preserve the
+match data."
+
+  (case (char-after)
+    (?\[
+     (forward-char)
+     (while
+         (progn
+           (forward-comment most-positive-fixnum)
+           (cond ((memq (char-after) '(?\[ ?\{))
+                  (espresso--forward-destructuring-spec func))
+
+                 ((eq (char-after) ?,)
+                  (forward-char)
+                  t)
+
+                 ((looking-at espresso--name-re)
+                  (and func (funcall func))
+                  (goto-char (match-end 0))
+                  t))))
+     (when (eq (char-after) ?\])
+       (forward-char)
+       t))
+
+    (?\{
+     (forward-char)
+     (forward-comment most-positive-fixnum)
+     (while
+         (when (looking-at espresso--objfield-re)
+           (goto-char (match-end 0))
+           (forward-comment most-positive-fixnum)
+           (and (cond ((memq (char-after) '(?\[ ?\{))
+                       (espresso--forward-destructuring-spec func))
+                      ((looking-at espresso--name-re)
+                       (and func (funcall func))
+                       (goto-char (match-end 0))
+                       t))
+                (progn (forward-comment most-positive-fixnum)
+                       (when (eq (char-after) ?\,)
+                         (forward-char)
+                         (forward-comment most-positive-fixnum)
+                         t)))))
+     (when (eq (char-after) ?\})
+       (forward-char)
+       t))))
+
+(defun espresso--variable-decl-matcher (limit)
+  "Font-lock matcher for variable names in a variable
+declaration. This is a cc-mode-style matcher that *always* fails,
+from the point of view of font-lock. It applies highlighting
+directly with `font-lock-apply-higlight'."
+
+  (condition-case nil
+      (save-restriction
+        (narrow-to-region (point-min) limit)
+
+        (let ((first t))
+          (forward-comment most-positive-fixnum)
+          (while
+              (and (or first
+                       (when (eq (char-after) ?,)
+                         (forward-char)
+                         (forward-comment most-positive-fixnum)
+                         t))
+                   (cond ((looking-at espresso--name-re)
+                          (font-lock-apply-highlight
+                           '(0 font-lock-variable-name-face))
+                          (goto-char (match-end 0)))
+
+                         ((save-excursion
+                            (espresso--forward-destructuring-spec))
+
+                          (espresso--forward-destructuring-spec
+                           (lambda ()
+                             (font-lock-apply-highlight
+                              '(0 font-lock-variable-name-face)))))))
+
+            (forward-comment most-positive-fixnum)
+            (when (eq (char-after) ?=)
+              (forward-char)
+              (espresso--forward-expression)
+              (forward-comment most-positive-fixnum))
+
+            (setq first nil))))
+
+    ;; Conditions to handle
+    (scan-error nil)
+    (end-of-buffer nil))
+
+  ;; Matcher always "fails"
+  nil)
+
+(defconst espresso--font-lock-keywords-3
+  `(
+    ;; This goes before keywords-2 so it gets used preferentially
+    ;; instead of the keywords in keywords-2. Don't use override
+    ;; because that will override syntactic fontification too, which
+    ;; will fontify commented-out directives as if they weren't
+    ;; commented out.
+    ,@cpp-font-lock-keywords ; from font-lock.el
+
+    ,@espresso--font-lock-keywords-2
+
+    ("\\.\\(prototype\\)\\_>"
+     (1 font-lock-constant-face))
+
+    ;; Highlights class being declared, in parts
+    (espresso--class-decl-matcher
+     ,(concat "\\(" espresso--name-re "\\)\\(?:\\.\\|.*$\\)")
+     (goto-char (match-beginning 1))
+     nil
+     (1 font-lock-type-face))
+
+    ;; Highlights parent class, in parts, if available
+    (espresso--class-decl-matcher
+     ,(concat "\\(" espresso--name-re "\\)\\(?:\\.\\|.*$\\)")
+     (if (match-beginning 2)
+         (progn
+           (setq espresso--tmp-location (match-end 2))
+           (goto-char espresso--tmp-location)
+           (insert "=")
+           (goto-char (match-beginning 2)))
+       (setq espresso--tmp-location nil)
+       (goto-char (point-at-eol)))
+     (when espresso--tmp-location
+       (save-excursion
+         (goto-char espresso--tmp-location)
+         (delete-char 1)))
+     (1 font-lock-type-face))
+
+    ;; Highlights parent class
+    (espresso--class-decl-matcher
+     (2 font-lock-type-face nil t))
+
+    ;; Dojo needs its own matcher to override the string highlighting
+    (,(espresso--make-framework-matcher
+       'dojo
+       "^\\s-*dojo\\.declare\\s-*(\""
+       "\\(" espresso--dotted-name-re "\\)"
+       "\\(?:\"\\s-*,\\s-*\\(" espresso--dotted-name-re "\\)\\)?")
+     (1 font-lock-type-face t)
+     (2 font-lock-type-face nil t))
+
+    ;; Match Dojo base classes. Of course Mojo has to be different
+    ;; from everything else under the sun...
+    (,(espresso--make-framework-matcher
+       'dojo
+       "^\\s-*dojo\\.declare\\s-*(\""
+       "\\(" espresso--dotted-name-re "\\)\"\\s-*,\\s-*\\[")
+     ,(concat "[[,]\\s-*\\(" espresso--dotted-name-re "\\)\\s-*"
+              "\\(?:\\].*$\\)?")
+     (backward-char)
+     (end-of-line)
+     (1 font-lock-type-face))
+
+    ;; continued Dojo base-class list
+    (,(espresso--make-framework-matcher
+       'dojo
+       "^\\s-*" espresso--dotted-name-re "\\s-*[],]")
+     ,(concat "\\(" espresso--dotted-name-re "\\)"
+              "\\s-*\\(?:\\].*$\\)?")
+     (if (save-excursion (backward-char)
+                         (espresso--inside-dojo-class-list-p))
+         (forward-symbol -1)
+       (end-of-line))
+     (end-of-line)
+     (1 font-lock-type-face))
+
+    ;; variable declarations
+    ,(list
+      (concat "\\_<\\(const\\|var\\|let\\)\\_>\\|" espresso--basic-type-re)
+      (list #'espresso--variable-decl-matcher nil nil nil))
+
+    ;; class instantiation
+    ,(list
+      (concat "\\_<new\\_>\\s-+\\(" espresso--dotted-name-re "\\)")
+      (list 1 'font-lock-type-face))
+
+    ;; instanceof
+    ,(list
+      (concat "\\_<instanceof\\_>\\s-+\\(" espresso--dotted-name-re "\\)")
+      (list 1 'font-lock-type-face))
+
+    ;; formal parameters
+    ,(list
+      (concat
+       "\\_<function\\_>\\(\\s-+" espresso--name-re "\\)?\\s-*(\\s-*"
+       espresso--name-start-re)
+      (list (concat "\\(" espresso--name-re "\\)\\(\\s-*).*\\)?")
+            '(backward-char)
+            '(end-of-line)
+            '(1 font-lock-variable-name-face)))
+
+    ;; continued formal parameter list
+    ,(list
+      (concat
+       "^\\s-*" espresso--name-re "\\s-*[,)]")
+      (list espresso--name-re
+            '(if (save-excursion (backward-char)
+                                 (espresso--inside-param-list-p))
+                 (forward-symbol -1)
+               (end-of-line))
+            '(end-of-line)
+            '(0 font-lock-variable-name-face))))
+
+  "Level three font lock.")
+
+(defun espresso--inside-pitem-p (pitem)
+  "Return whether point is inside the given pitem's header or body"
+  (espresso--ensure-cache)
+  (assert (espresso--pitem-h-begin pitem))
+  (assert (espresso--pitem-paren-depth pitem))
+
+  (and (> (point) (espresso--pitem-h-begin pitem))
+       (or (null (espresso--pitem-b-end pitem))
+           (> (espresso--pitem-b-end pitem) (point)))))
+
+(defun espresso--parse-state-at-point ()
+  "Get a list of espresso--pitem instances that apply to point,
+most specific first. In the worst case, the current toplevel
+instance will be returned."
+
+  (save-excursion
+    (save-restriction
+      (widen)
+      (espresso--ensure-cache)
+      (let* ((bound (if (eobp) (point) (1+ (point))))
+             (pstate (or (save-excursion
+                           (espresso--backward-pstate))
+                         (list espresso--initial-pitem))))
+
+        ;; Loop until we either hit a pitem at BOB or pitem ends after
+        ;; point (or at point if we're at eob)
+        (loop for pitem = (car pstate)
+              until (or (eq (espresso--pitem-type pitem)
+                            'toplevel)
+                        (espresso--inside-pitem-p pitem))
+              do (pop pstate))
+
+        pstate))))
+
+(defun espresso--syntactic-context-from-pstate (pstate)
+  "Return the syntactic context corresponding to PSTATE"
+  (let ((type (espresso--pitem-type (car pstate))))
+    (cond ((memq type '(function macro))
+           type)
+
+          ((consp type)
+           'class)
+
+          (t 'toplevel))))
+
+(defun espresso-syntactic-context ()
+  "Get the current syntactic context of point. When called
+interatively, also display a message with that context."
+  (interactive)
+  (let* ((syntactic-context (espresso--syntactic-context-from-pstate
+                             (espresso--parse-state-at-point))))
+
+    (when (interactive-p)
+      (message "Syntactic context: %s" syntactic-context))
+
+    syntactic-context))
+
+(defun espresso--class-decl-matcher (limit)
+  "Fontifies according to espresso--class-styles"
+  (loop initially (espresso--ensure-cache limit)
+        while (re-search-forward espresso--quick-match-re limit t)
+        for orig-end = (match-end 0)
+        do (goto-char (match-beginning 0))
+        if (loop for style in espresso--class-styles
+                 for decl-re = (plist-get style :class-decl)
+                 if (and (memq (plist-get style :framework)
+                               espresso-enabled-frameworks)
+                         (memq (espresso-syntactic-context)
+                               (plist-get style :contexts))
+                         decl-re
+                         (looking-at decl-re))
+                 do (goto-char (match-end 0))
+                 and return t)
+        return t
+        else do (goto-char orig-end)))
+
+(defconst espresso--font-lock-keywords
+  '(espresso--font-lock-keywords-3 espresso--font-lock-keywords-1
+                                   espresso--font-lock-keywords-2
+                                   espresso--font-lock-keywords-3)
+  "See `font-lock-keywords'.")
+
+;; XXX: Javascript can continue a regexp literal across lines so long
+;; as the newline is escaped with \. Account for that in the regexp
+;; below.
+(defconst espresso--regexp-literal
+  "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)[^/*]\\(?:.*?[^\\]\\)?\\(/\\)"
+  "Match a regular expression literal. Match groups 1 and 2 are
+the characters forming the beginning and end of the literal")
+
+;; we want to match regular expressions only at the beginning of
+;; expressions
+(defconst espresso--font-lock-syntactic-keywords
+  `((,espresso--regexp-literal (1 "|") (2 "|")))
+  "Highlighting of regular expressions. See also the variable
+  `font-lock-keywords'.")
+
+;;; Indentation
+
+(defconst espresso--possibly-braceless-keyword-re
+  (espresso--regexp-opt-symbol
+   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with"
+     "each"))
+  "Regular expression matching keywords that are optionally
+  followed by an opening brace.")
+
+(defconst espresso--indent-operator-re
+  (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
+          (espresso--regexp-opt-symbol '("in" "instanceof")))
+  "Regular expression matching operators that affect indentation
+  of continued expressions.")
+
+
+(defun espresso--looking-at-operator-p ()
+  "Return non-nil if text after point is an operator (that is not
+a comma)."
+  (save-match-data
+    (and (looking-at espresso--indent-operator-re)
+         (or (not (looking-at ":"))
+             (save-excursion
+               (and (espresso--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
+                    (looking-at "?")))))))
+
+
+(defun espresso--continued-expression-p ()
+  "Returns non-nil if the current line continues an expression."
+  (save-excursion
+    (back-to-indentation)
+    (or (espresso--looking-at-operator-p)
+        (and (espresso--re-search-backward "\n" nil t)
+	     (progn
+	       (skip-chars-backward " \t")
+	       (or (bobp) (backward-char))
+	       (and (> (point) (point-min))
+                    (save-excursion (backward-char) (not (looking-at "[/*]/")))
+                    (espresso--looking-at-operator-p)
+		    (and (progn (backward-char)
+				(not (looking-at "++\\|--\\|/[/*]"))))))))))
+
+
+(defun espresso--end-of-do-while-loop-p ()
+  "Returns non-nil if word after point is `while' of a do-while
+statement, else returns nil. A braceless do-while statement
+spanning several lines requires that the start of the loop is
+indented to the same column as the current line."
+  (interactive)
+  (save-excursion
+    (save-match-data
+      (when (looking-at "\\s-*\\_<while\\_>")
+	(if (save-excursion
+	      (skip-chars-backward "[ \t\n]*}")
+	      (looking-at "[ \t\n]*}"))
+	    (save-excursion
+	      (backward-list) (forward-symbol -1) (looking-at "\\_<do\\_>"))
+	  (espresso--re-search-backward "\\_<do\\_>" (point-at-bol) t)
+	  (or (looking-at "\\_<do\\_>")
+	      (let ((saved-indent (current-indentation)))
+		(while (and (espresso--re-search-backward "^\\s-*\\_<" nil t)
+			    (/= (current-indentation) saved-indent)))
+		(and (looking-at "\\s-*\\_<do\\_>")
+		     (not (espresso--re-search-forward
+			   "\\_<while\\_>" (point-at-eol) t))
+		     (= (current-indentation) saved-indent)))))))))
+
+
+(defun espresso--ctrl-statement-indentation ()
+  "Returns the proper indentation of the current line if it
+starts the body of a control statement without braces, else
+returns nil."
+  (save-excursion
+    (back-to-indentation)
+    (when (save-excursion
+            (and (not (eq (point-at-bol) (point-min)))
+                 (not (looking-at "[{]"))
+                 (progn
+                   (espresso--re-search-backward "[[:graph:]]" nil t)
+                   (or (eobp) (forward-char))
+                   (when (= (char-before) ?\)) (backward-list))
+                   (skip-syntax-backward " ")
+                   (skip-syntax-backward "w_")
+                   (looking-at espresso--possibly-braceless-keyword-re))
+                 (not (espresso--end-of-do-while-loop-p))))
+      (save-excursion
+        (goto-char (match-beginning 0))
+        (+ (current-indentation) espresso-indent-level)))))
+
+(defun espresso--get-c-offset (symbol anchor)
+  (let ((c-offsets-alist
+         (list (cons 'c espresso-comment-lineup-func))))
+    (c-get-syntactic-indentation (list (cons symbol anchor)))))
+
+(defun espresso--proper-indentation (parse-status)
+  "Return the proper indentation for the current line."
+  (save-excursion
+    (back-to-indentation)
+    (cond ((nth 4 parse-status)
+           (espresso--get-c-offset 'c (nth 8 parse-status)))
+          ((nth 8 parse-status) 0) ; inside string
+          ((espresso--ctrl-statement-indentation))
+          ((eq (char-after) ?#) 0)
+          ((save-excursion (espresso--beginning-of-macro)) 4)
+          ((nth 1 parse-status)
+           (let ((same-indent-p (looking-at
+                                 "[]})]\\|\\_<case\\_>\\|\\_<default\\_>"))
+                 (continued-expr-p (espresso--continued-expression-p)))
+             (goto-char (nth 1 parse-status))
+             (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)")
+                 (progn
+                   (skip-syntax-backward " ")
+                   (when (= (char-before) ?\)) (backward-list))
+                   (back-to-indentation)
+                   (cond (same-indent-p
+                          (current-column))
+                         (continued-expr-p
+                          (+ (current-column) (* 2 espresso-indent-level)
+                             espresso-expr-indent-offset))
+                         (t
+                          (+ (current-column) espresso-indent-level))))
+               (unless same-indent-p
+                 (forward-char)
+                 (skip-chars-forward " \t"))
+               (current-column))))
+
+          ((espresso--continued-expression-p)
+           (+ espresso-indent-level espresso-expr-indent-offset))
+          (t 0))))
+
+(defun espresso-indent-line ()
+  "Indent the current line as JavaScript source text."
+  (interactive)
+  (save-restriction
+    (widen)
+    (let* ((parse-status
+            (save-excursion (syntax-ppss (point-at-bol))))
+           (offset (- (current-column) (current-indentation))))
+
+      (indent-line-to (espresso--proper-indentation parse-status))
+      (when (> offset 0) (forward-char offset)))))
+
+;;; Filling
+
+(defun espresso-c-fill-paragraph (&optional justify)
+  "Fill the paragraph with c-fill-paragraph"
+  (interactive "*P")
+
+  ;; FIXME: filling a single-line C-style comment into multiple lines
+  ;; does something horrible to the undo list
+
+  (flet ((c-forward-sws
+          (&optional limit)
+          (espresso--forward-syntactic-ws limit))
+
+         (c-backward-sws
+          (&optional limit)
+          (espresso--backward-syntactic-ws limit))
+
+         (c-beginning-of-macro
+          (&optional limit)
+          (espresso--beginning-of-macro limit)))
+
+    (let ((fill-paragraph-function 'c-fill-paragraph))
+      (c-fill-paragraph justify))))
+
+;;; Type database and Imenu
+
+;; We maintain a cache of semantic information, i.e., the classes and
+;; functions we've encountered so far. In order to avoid having to
+;; re-parse the buffer on every change, we cache the parse state at
+;; each interesting point in the buffer. Each parse state is a
+;; modified copy of the previous one, or in the case of the first
+;; parse state, the empty state.
+;;
+;; The parse state itself is just a stack of espresso--pitem
+;; instances. It starts off containing one element that is never
+;; closed, that is initially espresso--initial-pitem.
+;;
+
+
+(defun espresso--pitem-format (pitem)
+  (let ((name (espresso--pitem-name pitem))
+        (type (espresso--pitem-type pitem)))
+
+    (format "name:%S type:%S"
+            name
+            (if (atom type)
+                type
+              (plist-get type :name)))))
+
+(defun espresso--make-merged-item (item child name-parts)
+  "Internal helper for espresso--splice-into-items. Return a new
+item that is the result of merging CHILD into ITEM. NAME-PARTS is
+a list of parts of the name of CHILD that we haven't consumed
+yet."
+
+  (espresso--debug "espresso--make-merged-item: {%s} into {%s}"
+                   (espresso--pitem-format child)
+                   (espresso--pitem-format item))
+
+  ;; If the item we're merging into isn't a class, make it into one
+  (unless (consp (espresso--pitem-type item))
+    (espresso--debug "espresso--make-merged-item: changing dest into class")
+    (setq item (make-espresso--pitem
+                :children (list item)
+
+                ;; Use the child's class-style if it's available
+                :type (if (atom (espresso--pitem-type child))
+                          espresso--dummy-class-style
+                  (espresso--pitem-type child))
+
+                :name (espresso--pitem-strname item))))
+
+  ;; Now we can merge either a function or a class into a class
+  (cons (cond
+         ((cdr name-parts)
+          (espresso--debug "espresso--make-merged-item: recursing")
+          ;; if we have more name-parts to go before we get to the
+          ;; bottom of the class hierarchy, call the merger
+          ;; recursively
+          (espresso--splice-into-items (car item) child
+                                       (cdr name-parts)))
+
+         ((atom (espresso--pitem-type child))
+          (espresso--debug "espresso--make-merged-item: straight merge")
+          ;; Not merging a class, but something else, so just prepend
+          ;; it
+          (cons child (car item)))
+
+         (t
+          ;; Otherwise, merge the new child's items into those
+          ;; of the new class
+          (espresso--debug "espresso--make-merged-item: merging class contents")
+          (append (car child) (car item))))
+        (cdr item)))
+
+(defun espresso--pitem-strname (pitem)
+  "Last part of the name of PITEM as a string or symbol"
+  (let ((name (espresso--pitem-name pitem)))
+    (if (consp name)
+        (car (last name))
+      name)))
+
+(defun espresso--splice-into-items (items child name-parts)
+  "Non-destructively inserts CHILD into the item list ITEMS in
+the proper place as given by NAME-PARTS. If a class doesn't
+exist in the tree, create it. Return the new items list.
+NAME-PARTS is a list of strings given the broken-down class
+name of the item to insert."
+
+  (let ((top-name (car name-parts))
+        (item-ptr items)
+        new-items last-new-item new-cons item)
+
+    (espresso--debug "espresso--splice-into-items: name-parts: %S items:%S"
+             name-parts
+             (mapcar #'espresso--pitem-name items))
+
+    (assert (stringp top-name))
+    (assert (> (length top-name) 0))
+
+    ;; If top-name isn't found in items, then we build a copy of items
+    ;; and throw it away. But that's okay, since most of the time, we
+    ;; *will* find an instance.
+
+    (while (and item-ptr
+                (cond ((equal (espresso--pitem-strname (car item-ptr)) top-name)
+                       ;; Okay, we found an entry with the right name. Splice
+                       ;; the merged item into the list...
+                       (setq new-cons (cons (espresso--make-merged-item
+                                             (car item-ptr) child
+                                             name-parts)
+                                            (cdr item-ptr)))
+
+                       (if last-new-item
+                           (setcdr last-new-item new-cons)
+                         (setq new-items new-cons))
+
+                       ;; ...and terminate the loop
+                       nil)
+
+                      (t
+                       ;; Otherwise, copy the current cons and move onto the
+                       ;; text. This is tricky; we keep track of the tail of
+                       ;; the list that begins with new-items in
+                       ;; last-new-item.
+                       (setq new-cons (cons (car item-ptr) nil))
+                       (if last-new-item
+                           (setcdr last-new-item new-cons)
+                         (setq new-items new-cons))
+                       (setq last-new-item new-cons)
+
+                       ;; Go to the next cell in items
+                       (setq item-ptr (cdr item-ptr))))))
+
+    (if item-ptr
+        ;; Yay! We stopped because we found something, not because
+        ;; we ran out of items to search. Just return the new
+        ;; list.
+        (progn
+          (espresso--debug "search succeeded: %S" name-parts)
+          new-items)
+
+      ;; We didn't find anything. If the child is a class and we don't
+      ;; have any classes to drill down into, just push that class;
+      ;; otherwise, make a fake class and carry on.
+      (espresso--debug "search failed: %S" name-parts)
+      (cons (if (cdr name-parts)
+                ;; We have name-parts left to process. Make a fake
+                ;; class for this particular part...
+                (make-espresso--pitem
+                 ;; ...and recursively digest the rest of the name
+                 :children (espresso--splice-into-items
+                            nil child (cdr name-parts))
+                 :type espresso--dummy-class-style
+                 :name top-name)
+
+              ;; Otherwise, this is the only name we have, so stick
+              ;; the item on the front of the list
+              child)
+            items))))
+
+(defun espresso--pitem-add-child (pitem child)
+  "Copy espresso--pitem PITEM and while copying, push CHILD onto
+its list of children."
+
+  (assert (integerp (espresso--pitem-h-begin child)))
+  (assert (if (consp (espresso--pitem-name child))
+              (loop for part in (espresso--pitem-name child)
+                    always (stringp part))
+            t))
+
+  ;; This trick works because we know (based on our defstructs) that
+  ;; the child list is always the first element, and so the second
+  ;; element and beyond can be shared when we make our "copy".
+  (cons
+
+   (let ((name (espresso--pitem-name child))
+         (type (espresso--pitem-type child)))
+
+     (cond ((cdr-safe name) ; true if a list of at least two elements
+            ;; Use slow path because we need class lookup
+            (espresso--splice-into-items (car pitem) child name))
+
+           ((and (consp type)
+                 (plist-get type :prototype))
+
+            ;; Use slow path because we need class merging. We know
+            ;; name is a list here because down in
+            ;; `espresso--ensure-cache', we made sure to only add
+            ;; class entries with lists for :name
+            (assert (consp name))
+            (espresso--splice-into-items (car pitem) child name))
+
+           (t
+            ;; Fast path
+            (cons child (car pitem)))))
+
+   (cdr pitem)))
+
+(defun espresso--maybe-make-marker (location)
+  "Make LOCATION into a marker if imenu-use-markers"
+  (if imenu-use-markers
+      (set-marker (make-marker) location)
+    location))
+
+(defun espresso--pitems-to-imenu (pitems unknown-ctr)
+  "Convert list of pitems PITEMS to imenu format"
+
+  (let (imenu-items pitem pitem-type pitem-name subitems)
+
+    (while (setq pitem (pop pitems))
+      (setq pitem-type (espresso--pitem-type pitem))
+      (setq pitem-name (espresso--pitem-strname pitem))
+      (when (eq pitem-name t)
+        (setq pitem-name (format "[unknown %s]"
+                                 (incf (car unknown-ctr)))))
+
+      (cond
+       ((memq pitem-type '(function macro))
+        (assert (integerp (espresso--pitem-h-begin pitem)))
+        (push (cons pitem-name
+                    (espresso--maybe-make-marker
+                     (espresso--pitem-h-begin pitem)))
+              imenu-items))
+
+       ((consp pitem-type) ; class definition
+        (setq subitems (espresso--pitems-to-imenu
+                        (espresso--pitem-children pitem)
+                        unknown-ctr))
+        (cond (subitems
+               (push (cons pitem-name subitems)
+                     imenu-items))
+
+              ((espresso--pitem-h-begin pitem)
+               (assert (integerp (espresso--pitem-h-begin pitem)))
+               (setq subitems (list
+                               (cons "[empty]"
+                                     (espresso--maybe-make-marker
+                                      (espresso--pitem-h-begin pitem)))))
+               (push (cons pitem-name subitems)
+                     imenu-items))))
+
+       (t (error "Unknown item type: %S" pitem-type))))
+
+    imenu-items))
+
+(defun espresso--imenu-create-index ()
+  "Creates an imenu index for the current buffer"
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (point-max))
+      (espresso--ensure-cache)
+      (assert (or (= (point-min) (point-max))
+                  (eq espresso--last-parse-pos (point))))
+      (when espresso--last-parse-pos
+        (let ((state espresso--state-at-last-parse-pos)
+              (unknown-ctr (cons -1 nil)))
+
+          ;; Make sure everything is closed
+          (while (cdr state)
+            (setq state
+                  (cons (espresso--pitem-add-child (second state) (car state))
+                        (cddr state))))
+
+          (assert (= (length state) 1))
+
+          ;; Convert the new-finalized state into what imenu expects
+          (espresso--pitems-to-imenu
+           (car (espresso--pitem-children state))
+           unknown-ctr))))))
+
+(defun espresso--which-func-joiner (parts)
+  (mapconcat #'identity parts "."))
+
+(defun espresso--imenu-to-flat (items prefix symbols)
+  (loop for item in items
+        if (imenu--subalist-p item)
+        do (espresso--imenu-to-flat
+            (cdr item) (concat prefix (car item) ".")
+            symbols)
+        else
+        do (let* ((name (concat prefix (car item)))
+                  (name2 name)
+                  (ctr 0))
+
+             (while (gethash name2 symbols)
+               (setq name2 (format "%s<%d>" name (incf ctr))))
+
+             (puthash name2 (cdr item) symbols))))
+
+(defun espresso--get-all-known-symbols ()
+  "Get a hash table of all relevant Javascript symbols across all
+espresso-mode buffers. Each key is the name of a symbol (possibly
+disambiguated with <N>, where N > 1), and each value is a marker
+giving the location of that symbol."
+  (loop with symbols = (make-hash-table :test 'equal)
+        with imenu-use-markers = t
+        for buffer being the buffers
+        for imenu-index = (with-current-buffer buffer
+                            (when (eq major-mode 'espresso-mode)
+                              (espresso--imenu-create-index)))
+        do (espresso--imenu-to-flat imenu-index "" symbols)
+        finally return symbols))
+
+(defvar espresso--symbol-history nil
+  "History of entered Javascript symbols")
+
+(defun espresso--read-symbol (symbols-table prompt &optional initial-input)
+  "Read a symbol from SYMBOLS-TABLE, which is a hash table like
+the one from `espresso--get-all-known-symbols'. Return value is a
+cons of (SYMBOL-NAME . LOCATION), where SYMBOL-NAME is a string
+and LOCATION is a marker.
+
+Prompt is PROMPT.
+
+If INITIAL-INPUT is not nil, use it as the initial input"
+
+  (unless ido-mode
+    (ido-mode t)
+    (ido-mode nil))
+
+  (let ((choice (ido-completing-read
+                 prompt
+                 (loop for key being the hash-keys of symbols-table
+                       collect key)
+                 nil t initial-input 'espresso--symbol-history)))
+    (cons choice (gethash choice symbols-table))))
+
+(defun espresso--guess-symbol-at-point ()
+  (let ((bounds (bounds-of-thing-at-point 'symbol)))
+    (when bounds
+      (save-excursion
+        (goto-char (car bounds))
+        (when (eq (char-before) ?.)
+          (backward-char)
+          (setf (car bounds) (point))))
+      (buffer-substring (car bounds) (cdr bounds)))))
+
+(defun espresso-find-symbol (&optional arg)
+  "Jump to a Javascript symbol we read in from the user. With
+prefix argument, restrict symbols to those from the current
+buffer. Pushes a mark onto the tag ring just like `find-tag'."
+
+  (interactive "P")
+  (let (symbols marker)
+    (if (not arg)
+        (setq symbols (espresso--get-all-known-symbols))
+      (setq symbols (make-hash-table :test 'equal))
+      (espresso--imenu-to-flat (espresso--imenu-create-index)
+                               "" symbols))
+
+    (setq marker (cdr (espresso--read-symbol
+                       symbols "Jump to: "
+                       (espresso--guess-symbol-at-point))))
+
+    (ring-insert find-tag-marker-ring (point-marker))
+    (switch-to-buffer (marker-buffer marker))
+    (push-mark)
+    (goto-char marker)))
+
+;;; MozRepl integration
+
+(put 'espresso-moz-bad-rpc 'error-conditions '(error timeout))
+(put 'espresso-moz-bad-rpc 'error-message "Mozilla RPC Error")
+
+(put 'espresso-js-error 'error-conditions '(error js-error))
+(put 'espresso-js-error 'error-message "Javascript Error")
+
+(defun espresso--wait-for-matching-output
+  (process regexp timeout &optional start)
+  "Wait TIMEOUT seconds for PROCESS to output something that
+matches REGEXP. On timeout, return nil. On success, return t with
+match data set. If START is non-nil, look for output starting
+from START. Otherwise, use the current value of `process-mark'."
+  (with-current-buffer (process-buffer process)
+    (loop with start-pos = (or start
+                               (marker-position (process-mark process)))
+          with end-time = (+ (float-time) timeout)
+          for time-left = (- end-time (float-time))
+          do (goto-char (point-max))
+          if (looking-back regexp start-pos) return t
+          while (> time-left 0)
+          do (accept-process-output process time-left nil t)
+          do (goto-char (process-mark process))
+          finally do (signal
+                      'espresso-moz-bad-rpc
+                      (list (format "Timed out waiting for output matching %S" regexp))))))
+
+(defstruct espresso--js-handle
+  ;; Integer, mirrors the value we see in JS
+  (id nil :read-only t)
+
+  ;; Process to which this thing belongs
+  (process nil :read-only t))
+
+(defun espresso--js-handle-expired-p (x)
+  (not (eq (espresso--js-handle-process x)
+           (inferior-moz-process))))
+
+(defvar espresso--js-references nil
+  "Maps Elisp Javascript proxy objects to their Javascript IDs.")
+
+(defvar espresso--js-process nil
+  "The last MozRepl process object we saw")
+
+(defvar espresso--js-gc-idle-timer nil
+  "Idle timer for cleaning up JS object references")
+
+(defvar espresso--js-last-gcs-done nil
+  "Last number of gcs we GCed with")
+
+(defconst espresso--moz-interactor
+  (replace-regexp-in-string
+   "[ \n]+" " "
+   ; */" Make Emacs happy
+"(function(repl) {
+  repl.defineInteractor('espresso', {
+    onStart: function onStart(repl) {
+      if(!repl._espressoObjects) {
+        repl._espressoObjects = {};
+        repl._espressoLastID = 0;
+        repl._espressoGC = this._espressoGC;
+      }
+      this._input = '';
+    },
+
+    _espressoGC: function _espressoGC(ids_in_use) {
+      var objects = this._espressoObjects;
+      var keys = [];
+      var num_freed = 0;
+
+      for(var pn in objects) {
+        keys.push(Number(pn));
+      }
+
+      keys.sort(function(x, y) x - y);
+      ids_in_use.sort(function(x, y) x - y);
+      var i = 0;
+      var j = 0;
+
+      while(i < ids_in_use.length && j < keys.length) {
+        var id = ids_in_use[i++];
+        while(j < keys.length && keys[j] !== id) {
+          var k_id = keys[j++];
+          delete objects[k_id];
+          ++num_freed;
+        }
+        ++j;
+      }
+
+      while(j < keys.length) {
+        var k_id = keys[j++];
+        delete objects[k_id];
+        ++num_freed;
+      }
+
+      return num_freed;
+    },
+
+    _mkArray: function _mkArray() {
+      var result = [];
+      for(var i = 0; i < arguments.length; ++i) {
+        result.push(arguments[i]);
+      }
+      return result;
+    },
+
+    _parsePropDescriptor: function _parsePropDescriptor(parts) {
+      if(typeof parts === 'string') {
+        parts = [ parts ];
+      }
+
+      var obj = parts[0];
+      var start = 1;
+
+      if(typeof obj === 'string') {
+        obj = window;
+        start = 0;
+      } else if(parts.length < 2) {
+        throw new Error('expected at least 2 arguments');
+      }
+
+      for(var i = start; i < parts.length - 1; ++i) {
+        obj = obj[parts[i]];
+      }
+
+      return [obj, parts[parts.length - 1]];
+    },
+
+    _getProp: function _getProp(/*...*/) {
+      if(arguments.length === 0) {
+        throw new Error('no arguments supplied to getprop');
+      }
+
+      if(arguments.length === 1 &&
+         (typeof arguments[0]) !== 'string')
+      {
+        return arguments[0];
+      }
+
+      var [obj, propname] = this._parsePropDescriptor(arguments);
+      return obj[propname];
+    },
+
+    _putProp: function _putProp(properties, value) {
+      var [obj, propname] = this._parsePropDescriptor(properties);
+      obj[propname] = value;
+    },
+
+    _delProp: function _delProp(propname) {
+      var [obj, propname] = this._parsePropDescriptor(arguments);
+      delete obj[propname];
+    },
+
+    _typeOf: function _typeOf(thing) {
+      return typeof thing;
+    },
+
+    _callNew: function(constructor) {
+      if(typeof constructor === 'string')
+      {
+        constructor = window[constructor];
+      } else if(constructor.length === 1 &&
+                typeof constructor[0] !== 'string')
+      {
+        constructor = constructor[0];
+      } else {
+        var [obj,propname] = this._parsePropDescriptor(constructor);
+        constructor = obj[propname];
+      }
+
+      /* Hacky, but should be robust */
+      var s = 'new constructor(';
+      for(var i = 1; i < arguments.length; ++i) {
+        if(i != 1) {
+          s += ',';
+        }
+
+        s += 'arguments[' + i + ']';
+      }
+
+      s += ')';
+      return eval(s);
+    },
+
+    _callEval: function(thisobj, js) {
+      return eval.call(thisobj, js);
+    },
+
+    getPrompt: function getPrompt(repl) {
+      return 'EVAL>'
+    },
+
+    _lookupObject: function _lookupObject(repl, id) {
+      if(typeof id === 'string') {
+        switch(id) {
+        case 'global':
+          return window;
+        case 'nil':
+          return null;
+        case 't':
+          return true;
+        case 'false':
+          return false;
+        case 'undefined':
+          return undefined;
+        case 'repl':
+          return repl;
+        case 'interactor':
+          return this;
+        case 'NaN':
+          return NaN;
+        case 'Infinity':
+          return Infinity;
+        case '-Infinity':
+          return -Infinity;
+        default:
+          throw new Error('No object with special id:' + id);
+        }
+      }
+
+      var ret = repl._espressoObjects[id];
+      if(ret === undefined) {
+        throw new Error('No object with id:' + id + '(' + typeof id + ')');
+      }
+      return ret;
+    },
+
+    _findOrAllocateObject: function _findOrAllocateObject(repl, value) {
+      if(typeof value !== 'object'  && typeof value !== 'function') {
+        throw new Error('_findOrAllocateObject called on non-object('
+                        + typeof(value) + '): '
+                        + value)
+      }
+
+      for(var id in repl._espressoObjects) {
+        id = Number(id);
+        var obj = repl._espressoObjects[id];
+        if(obj === value) {
+          return id;
+        }
+      }
+
+      var id = ++repl._espressoLastID;
+      repl._espressoObjects[id] = value;
+      return id;
+    },
+
+    _fixupList: function _fixupList(repl, list) {
+      for(var i = 0; i < list.length; ++i) {
+        if(list[i] instanceof Array) {
+          this._fixupList(repl, list[i]);
+        } else if(typeof list[i] === 'object') {
+          var obj = list[i];
+          if(obj.funcall) {
+            var parts = obj.funcall;
+            this._fixupList(repl, parts);
+            var [thisobj, func] = this._parseFunc(parts[0]);
+            list[i] = func.apply(thisobj, parts.slice(1));
+          } else if(obj.objid) {
+            list[i] = this._lookupObject(repl, obj.objid);
+          } else {
+            throw new Error('Unknown object type: ' + obj.toSource());
+          }
+        }
+      }
+    },
+
+    _parseFunc: function(func) {
+      var thisobj = null;
+
+      if(typeof func === 'string') {
+        func = window[func];
+      } else if(func instanceof Array) {
+        if(func.length === 1 && typeof func[0] !== 'string') {
+          func = func[0];
+        } else {
+          [thisobj, func] = this._parsePropDescriptor(func);
+          func = thisobj[func];
+        }
+      }
+
+      return [thisobj,func];
+    },
+
+    _encodeReturn: function(value, array_as_mv) {
+      var ret;
+
+      if(value === null) {
+        ret = ['special', 'null'];
+      } else if(value === true) {
+        ret = ['special', 'true'];
+      } else if(value === false) {
+        ret = ['special', 'false'];
+      } else if(value === undefined) {
+        ret = ['special', 'undefined'];
+      } else if(typeof value === 'number') {
+        if(isNaN(value)) {
+          ret = ['special', 'NaN'];
+        } else if(value === Infinity) {
+          ret = ['special', 'Infinity'];
+        } else if(value === -Infinity) {
+          ret = ['special', '-Infinity'];
+        } else {
+          ret = ['atom', value];
+        }
+      } else if(typeof value === 'string') {
+        ret = ['atom', value];
+      } else if(array_as_mv && value instanceof Array) {
+        ret = ['array', value.map(this._encodeReturn, this)];
+      } else {
+        ret = ['objid', this._findOrAllocateObject(repl, value)];
+      }
+
+      return ret;
+    },
+
+    _handleInputLine: function _handleInputLine(repl, line) {
+      var ret;
+      var array_as_mv = false;
+
+      try {
+        if(line[0] === '*') {
+          array_as_mv = true;
+          line = line.substring(1);
+        }
+        var parts = eval(line);
+        this._fixupList(repl, parts);
+        var [thisobj, func] = this._parseFunc(parts[0]);
+        ret = this._encodeReturn(
+          func.apply(thisobj, parts.slice(1)),
+          array_as_mv);
+      } catch(x) {
+        ret = ['error', x.toString() ];
+      }
+
+      var JSON = Components.classes['@mozilla.org/dom/json;1'].createInstance(Components.interfaces.nsIJSON);
+      repl.print(JSON.encode(ret));
+      repl._prompt();
+    },
+
+    handleInput: function handleInput(repl, chunk) {
+      this._input += chunk;
+      var match, line;
+      while(match = this._input.match(/.*\\n/)) {
+        line = match[0];
+
+        if(line === 'EXIT\\n') {
+          repl.popInteractor();
+          repl._prompt();
+          return;
+        }
+
+        this._input = this._input.substring(line.length);
+        this._handleInputLine(repl, line);
+      }
+    }
+  });
+})
+")
+
+  "String to set MozRepl up into a simple-minded evaluation mode")
+
+(defun espresso--js-encode-value (x)
+  "Marshall the given value for JS. Strings and numbers get
+JSON-encoded. Lists (including nil) are made into Javascript
+array literals and their contents encoded with
+espresso--js-encode-value."
+
+  (cond ((stringp x) (json-encode-string x))
+        ((numberp x) (json-encode-number x))
+        ((symbolp x) (format "{objid:%S}" (symbol-name x)))
+        ((espresso--js-handle-p x)
+
+         (when (espresso--js-handle-expired-p x)
+           (error "Stale JS handle"))
+
+         (format "{objid:%s}" (espresso--js-handle-id x)))
+
+        ((sequencep x)
+         (if (eq (car-safe x) 'espresso--funcall)
+             (format "{funcall:[%s]}"
+                     (mapconcat #'espresso--js-encode-value (cdr x) ","))
+           (concat
+            "[" (mapconcat #'espresso--js-encode-value x ",") "]")))
+        (t
+         (error "Unrecognized item: %S" x))))
+
+(defconst espresso--js-prompt-regexp "\\(repl[0-9]*\\)> $")
+(defconst espresso--js-repl-prompt-regexp "^EVAL>$")
+(defvar espresso--js-repl-depth 0)
+
+(defun espresso--js-wait-for-eval-prompt ()
+  (espresso--wait-for-matching-output
+   (inferior-moz-process)
+   espresso--js-repl-prompt-regexp espresso-js-timeout
+
+   ;; start matching against the beginning of the line in
+   ;; order to catch a prompt that's only partially arrived
+   (save-excursion (forward-line 0) (point))))
+
+(defun espresso--js-enter-repl ()
+  (inferior-moz-process) ; called for side-effect
+  (with-current-buffer inferior-moz-buffer
+    (goto-char (point-max))
+
+    ;; Do some initialization the first time we see a process
+    (unless (eq (inferior-moz-process) espresso--js-process)
+      (setq espresso--js-process (inferior-moz-process))
+      (setq espresso--js-references (make-hash-table :test 'eq :weakness t))
+      (setq espresso--js-repl-depth 0)
+
+      ;; Send interactor definition
+      (comint-send-string espresso--js-process espresso--moz-interactor)
+      (comint-send-string espresso--js-process
+                          (concat "(" moz-repl-name ")\n"))
+      (espresso--wait-for-matching-output
+       (inferior-moz-process) espresso--js-prompt-regexp
+       espresso-js-timeout))
+
+    ;; Sanity check
+    (when (looking-back espresso--js-prompt-regexp
+                        (save-excursion (forward-line 0) (point)))
+      (setq espresso--js-repl-depth 0))
+
+    (if (> espresso--js-repl-depth 0)
+        ;; If espresso--js-repl-depth > 0, we *should* be seeing an
+        ;; EVAL> prompt. If we don't, give Mozilla a chance to catch
+        ;; up with us.
+        (espresso--js-wait-for-eval-prompt)
+
+      ;; Otherwise, tell Mozilla to enter the interactor mode
+      (insert (match-string-no-properties 1)
+              ".pushInteractor('espresso')")
+      (comint-send-input nil t)
+      (espresso--wait-for-matching-output
+       (inferior-moz-process) espresso--js-repl-prompt-regexp
+       espresso-js-timeout))
+
+    (incf espresso--js-repl-depth)))
+
+(defun espresso--js-leave-repl ()
+  (assert (> espresso--js-repl-depth 0))
+  (when (= 0 (decf espresso--js-repl-depth))
+    (with-current-buffer inferior-moz-buffer
+      (goto-char (point-max))
+      (espresso--js-wait-for-eval-prompt)
+      (insert "EXIT")
+      (comint-send-input nil t)
+      (espresso--wait-for-matching-output
+       (inferior-moz-process) espresso--js-prompt-regexp
+       espresso-js-timeout))))
+
+(defsubst espresso--js-not (value)
+  (memq value '(nil false undefined)))
+
+(defsubst espresso--js-true (value)
+  (not (espresso--js-not value)))
+
+(eval-and-compile
+  (defun espresso--optimize-arglist (arglist)
+    "Convert immediate js< and js! references to deferred ones"
+    (loop for item in arglist
+          if (eq (car-safe item) 'js<)
+          collect (append (list 'list ''espresso--funcall
+                                '(list 'interactor "_getProp"))
+                          (espresso--optimize-arglist (cdr item)))
+          else if (eq (car-safe item) 'js>)
+          collect (append (list 'list ''espresso--funcall
+                                '(list 'interactor "_putProp"))
+
+                          (if (atom (cadr item))
+                              (list (cadr item))
+                            (list
+                             (append
+                              (list 'list ''espresso--funcall
+                                    '(list 'interactor "_mkArray"))
+                              (espresso--optimize-arglist (cadr item)))))
+                          (espresso--optimize-arglist (cddr item)))
+          else if (eq (car-safe item) 'js!)
+          collect (destructuring-bind (ignored function &rest body) item
+                    (append (list 'list ''espresso--funcall
+                                  (if (consp function)
+                                      (cons 'list
+                                            (espresso--optimize-arglist function))
+                                    function))
+                            (espresso--optimize-arglist body)))
+          else
+          collect item)))
+
+(defmacro espresso--js-get-service (class-name interface-name)
+    `(js! ("Components" "classes" ,class-name "getService")
+        (js< "Components" "interfaces" ,interface-name)))
+
+(defmacro espresso--js-create-instance (class-name interface-name)
+  `(js! ("Components" "classes" ,class-name "createInstance")
+        (js< "Components" "interfaces" ,interface-name)))
+
+(defmacro espresso--js-qi (object interface-name)
+  `(js! (,object "QueryInterface")
+        (js< "Components" "interfaces" ,interface-name)))
+
+(defmacro with-espresso-js (&rest forms)
+  "Runs FORMS with the Mozilla repl set up for espresso commands.
+Inside the lexical scope of `with-espresso-js', `js?', `js!',
+`js-new', `js-eval', `js-list', `js<', `js>', `js-get-service',
+`js-create-instance', and `js-qi' are defined."
+
+  `(progn
+     (espresso--js-enter-repl)
+     (unwind-protect
+         (macrolet ((js? (&rest body) `(espresso--js-true ,@body))
+                    (js! (function &rest body)
+                         `(espresso--js-funcall
+                           ,(if (consp function)
+                                (cons 'list
+                                      (espresso--optimize-arglist function))
+                              function)
+                           ,@(espresso--optimize-arglist body)))
+
+                    (js-new (function &rest body)
+                            `(espresso--js-new
+                              ,(if (consp function)
+                                   (cons 'list
+                                         (espresso--optimize-arglist function))
+                                 function)
+                              ,@body))
+
+                    (js-eval (thisobj js)
+                            `(espresso--js-eval
+                              ,@(espresso--optimize-arglist
+                                 (list thisobj js))))
+
+                    (js-list (&rest args)
+                             `(espresso--js-list
+                               ,@(espresso--optimize-arglist args)))
+
+                    (js-get-service (&rest args)
+                                    `(espresso--js-get-service
+                                      ,@(espresso--optimize-arglist args)))
+
+                    (js-create-instance (&rest args)
+                                        `(espresso--js-create-instance
+                                          ,@(espresso--optimize-arglist args)))
+
+                    (js-qi (&rest args)
+                           `(espresso--js-qi
+                             ,@(espresso--optimize-arglist args)))
+
+                    (js< (&rest body) `(espresso--js-get
+                                        ,@(espresso--optimize-arglist body)))
+                    (js> (props value)
+                         `(espresso--js-funcall
+                           '(interactor "_putProp")
+                           ,(if (consp props)
+                                (cons 'list
+                                      (espresso--optimize-arglist props))
+                              props)
+                           ,@(espresso--optimize-arglist (list value))
+                           ))
+                    (js-handle? (arg) `(espresso--js-handle-p ,arg)))
+           ,@forms)
+       (espresso--js-leave-repl))))
+
+(defvar espresso--js-array-as-list nil
+"If bound to t and a function returns an Array, return the
+elements of that Array as a list instead of returning the whole
+Array as a JS symbol" )
+
+(defun espresso--js-decode-retval (result)
+  (ecase (intern (first result))
+         (atom (second result))
+         (special (intern (second result)))
+         (array
+          (mapcar #'espresso--js-decode-retval (second result)))
+         (objid
+          (or (gethash (second result)
+                       espresso--js-references)
+              (puthash (second result)
+                       (make-espresso--js-handle
+                        :id (second result)
+                        :process (inferior-moz-process))
+                       espresso--js-references)))
+
+         (error (signal 'espresso-js-error (list (second result))))))
+
+(defun espresso--js-funcall (function &rest arguments)
+  "Call the Mozilla function FUNCTION with arguments ARGUMENTS.
+If function is a string, look it up as a property on the global
+object and use the global object for `this'; if FUNCTION is a
+list with one element, use that element as the function with the
+global object for `this', except that if that single element is a
+string, look it up on the global object. If FUNCTION is a list
+with more than one argument, use the list up to the last value as
+a property descriptor and the last argument as a function."
+
+  (with-espresso-js
+   (let ((argstr (espresso--js-encode-value
+                  (cons function arguments))))
+
+     (with-current-buffer inferior-moz-buffer
+       ;; Actual funcall
+       (when espresso--js-array-as-list
+         (insert "*"))
+       (insert argstr)
+       (comint-send-input nil t)
+       (espresso--wait-for-matching-output
+        (inferior-moz-process) "EVAL>"
+        espresso-js-timeout)
+       (goto-char comint-last-input-end)
+
+       ;; Read the result
+       (let* ((json-array-type 'list)
+              (result (prog1 (json-read)
+                        (goto-char (point-max)))))
+         (espresso--js-decode-retval result))))))
+
+(defun espresso--js-new (constructor &rest arguments)
+  "Call CONSTRUCTOR as a constructor (as with new), with the
+given arguments ARGUMENTS. CONSTRUCTOR is a JS handle, a string,
+or a list of these things."
+
+  (apply #'espresso--js-funcall
+         '(interactor "_callNew")
+         constructor arguments))
+
+(defun espresso--js-eval (thisobj js)
+  (espresso--js-funcall '(interactor "_callEval") thisobj js))
+
+(defun espresso--js-list (&rest arguments)
+  "Return a Lisp array that is the result of evaluating each of
+  the elements of ARGUMENTS"
+
+  (let ((espresso--js-array-as-list t))
+    (apply #'espresso--js-funcall '(interactor "_mkArray")
+           arguments)))
+
+(defun espresso--js-get (&rest props)
+  (apply #'espresso--js-funcall '(interactor "_getProp") props))
+
+(defun espresso--js-put (props value)
+  (espresso--js-funcall '(interactor "_putProp") props value))
+
+(defun espresso-js-gc (&optional force)
+  "Tell the repl about any objects we don't reference anymore.
+With argument, run even if no intervening GC has happened."
+  (interactive)
+
+  (when force
+    (setq espresso--js-last-gcs-done nil))
+
+  (let ((this-gcs-done gcs-done) keys num)
+    (when (and espresso--js-references
+               (boundp 'inferior-moz-buffer)
+               (buffer-live-p inferior-moz-buffer)
+
+               ;; Don't bother running unless we've had an intervening
+               ;; garbage collection; without a gc, nothing is deleted
+               ;; from the weak hash table, so it's pointless telling
+               ;; MozRepl about that references we still hold
+               (not (eq espresso--js-last-gcs-done this-gcs-done))
+
+               ;; Are we looking at a normal prompt? Make sure not to
+               ;; interrupt the user if he's doing something
+               (with-current-buffer inferior-moz-buffer
+                 (save-excursion
+                   (goto-char (point-max))
+                   (looking-back espresso--js-prompt-regexp
+                                 (save-excursion (forward-line 0) (point))))))
+
+      (setq keys (loop for x being the hash-keys
+                       of espresso--js-references
+                       collect x))
+      (setq num (espresso--js-funcall '(repl "_espressoGC") (or keys [])))
+
+      (setq espresso--js-last-gcs-done this-gcs-done)
+      (when (interactive-p)
+        (message "Cleaned %s entries" num))
+
+      num)))
+
+(run-with-idle-timer 30 t #'espresso-js-gc)
+
+(defun espresso-js-eval (js)
+  "Evaluate the Javascript contained in JS and return the
+JSON-decoded result. eval must be called using this function
+because it is special to the Javascript interpreter."
+  (interactive "MJavascript to evaluate: ")
+  (save-match-data ;; runs in timer
+    (with-espresso-js
+     (let* ((content-window (espresso--js-content-window
+                             (espresso--get-js-context)))
+            (result (js-eval content-window js)))
+
+       (when (interactive-p)
+         (message "%s" (js! "String" result)))
+       result))))
+
+(defun espresso--get-tabs ()
+  "Enumerate all the contexts available. Each one is a list:
+
+   The list is (TITLE URL BROWSER TAB TABBROWSER) for content documents
+   The list is (TITLE URL WINDOW) for windows
+
+   All tabs of a given window are grouped together. The most
+   recent window is first. Within each window, the tabs are
+   returned left-to-right.
+"
+  (with-espresso-js
+   (let (windows)
+
+     (loop with window-mediator = (js! ("Components" "classes"
+                                        "@mozilla.org/appshell/window-mediator;1"
+                                        "getService")
+                                       (js< "Components" "interfaces"
+                                            "nsIWindowMediator"))
+           with enumerator = (js! (window-mediator "getEnumerator") nil)
+
+           while (js? (js! (enumerator "hasMoreElements")))
+           for window = (js! (enumerator "getNext"))
+           for window-info = (js-list window
+                                      (js< window "document" "title")
+                                      (js! (window "location" "toString"))
+                                      (js< window "closed")
+                                      (js< window "windowState"))
+
+           unless (or (js? (fourth window-info))
+                      (eq (fifth window-info) 2))
+           do (push window-info windows))
+
+     (loop for window-info in windows
+           for window = (first window-info)
+           collect (list (second window-info)
+                         (third window-info)
+                         window)
+
+           for gbrowser = (js< window "gBrowser")
+           if (js-handle? gbrowser)
+           nconc (loop
+                  for x below (js< gbrowser "browsers" "length")
+                  collect (js-list (js< gbrowser
+                                        "browsers"
+                                        x
+                                        "contentDocument"
+                                        "title")
+
+                                   (js! (gbrowser
+                                         "browsers"
+                                         x
+                                         "contentWindow"
+                                         "location"
+                                         "toString"))
+                                   (js< gbrowser
+                                        "browsers"
+                                        x)
+
+                                   (js! (gbrowser
+                                         "tabContainer"
+                                         "childNodes"
+                                         "item")
+                                        x)
+
+                                   gbrowser))))))
+
+(defvar espresso-read-tab-history nil)
+
+(defun espresso--read-tab (prompt)
+  "Read a Mozilla tab with prompt PROMPT. Return a cons of (TYPE . OBJECT).
+TYPE is either 'window or 'tab, and OBJECT is a Javascript handle
+to a ChromeWindow or a browser, respectively."
+
+  ;; Prime IDO
+  (unless ido-mode
+    (ido-mode t)
+    (ido-mode nil))
+
+  (with-espresso-js
+   (lexical-let ((tabs (espresso--get-tabs)) selected-tab-cname
+                 selected-tab prev-hitab)
+
+     ;; Disambiguate names
+     (setq tabs (loop with tab-names = (make-hash-table :test 'equal)
+                      for tab in tabs
+                      for cname = (format "%s (%s)" (second tab) (first tab))
+                      for num = (incf (gethash cname tab-names -1))
+                      if (> num 0)
+                      do (setq cname (format "%s <%d>" cname num))
+                      collect (cons cname tab)))
+
+     (labels ((find-tab-by-cname
+               (cname)
+               (loop for tab in tabs
+                     if (equal (car tab) cname)
+                     return (cdr tab)))
+
+              (mogrify-highlighting
+               (hitab unhitab)
+
+               ;; Hack to reduce the number of
+               ;; round-trips to mozilla
+               (let (cmds)
+                 (cond
+                  ;; Highlighting tab
+                  ((fourth hitab)
+                   (push '(js! ((fourth hitab) "setAttribute")
+                               "style"
+                               "color: red; font-weight: bold")
+                         cmds)
+
+                   ;; Highlight window proper
+                   (push '(js! ((third hitab)
+                                "setAttribute")
+                               "style"
+                               "border: 8px solid red")
+                         cmds)
+
+                   ;; Select tab, when appropriate
+                   (when espresso-js-switch-tabs
+                     (push
+                      '(js> ((fifth hitab) "selectedTab") (fourth hitab))
+                      cmds)))
+
+                  ;; Hilighting whole window
+                  ((third hitab)
+                   (push '(js! ((third hitab) "document"
+                                "documentElement" "setAttribute")
+                               "style"
+                               (concat "-moz-appearance: none;"
+                                       "border: 8px solid red;"))
+                         cmds)))
+
+                 (cond
+                  ;; Unhighlighting tab
+                  ((fourth unhitab)
+                   (push '(js! ((fourth unhitab) "setAttribute") "style" "")
+                         cmds)
+                   (push '(js! ((third unhitab) "setAttribute") "style" "")
+                         cmds))
+
+                  ;; Unhighlighting window
+                  ((third unhitab)
+                   (push '(js! ((third unhitab) "document"
+                                "documentElement" "setAttribute")
+                               "style" "")
+                         cmds)))
+
+                 (eval (list 'with-espresso-js
+                             (cons 'js-list (nreverse cmds))))))
+
+              (command-hook
+               ()
+               (let* ((tab (find-tab-by-cname (car ido-matches))))
+                 (mogrify-highlighting tab prev-hitab)
+                 (setq prev-hitab tab)))
+
+              (setup-hook
+               ()
+               ;; Fiddle with the match list a bit: if our first match
+               ;; is a tabbrowser window, rotate the match list until
+               ;; the active tab comes up
+               (let ((matched-tab (find-tab-by-cname (car ido-matches))))
+                 (when (and matched-tab
+                            (null (fourth matched-tab))
+                            (equal "navigator:browser"
+                                   (js! ((third matched-tab)
+                                         "document"
+                                         "documentElement"
+                                         "getAttribute")
+                                        "windowtype")))
+
+                   (loop with tab-to-match = (js< (third matched-tab)
+                                                  "gBrowser"
+                                                  "selectedTab")
+
+                         with index = 0
+                         for match in ido-matches
+                         for candidate-tab = (find-tab-by-cname match)
+                         if (eq (fourth candidate-tab) tab-to-match)
+                         do (setq ido-cur-list (ido-chop ido-cur-list match))
+                         and return t)))
+
+               (add-hook 'post-command-hook #'command-hook t t)))
+
+
+       (unwind-protect
+           (setq selected-tab-cname
+                 (let ((ido-minibuffer-setup-hook
+                        (cons #'setup-hook ido-minibuffer-setup-hook)))
+                   (ido-completing-read
+                    prompt
+                    (mapcar #'car tabs)
+                    nil t nil
+                    'espresso-read-tab-history)))
+
+         (when prev-hitab
+           (mogrify-highlighting nil prev-hitab)
+           (setq prev-hitab nil)))
+
+       (add-to-history 'espresso-read-tab-history selected-tab-cname)
+
+       (setq selected-tab (loop for tab in tabs
+                                if (equal (car tab) selected-tab-cname)
+                                return (cdr tab)))
+
+       (if (fourth selected-tab)
+           (cons 'browser (third selected-tab))
+         (cons 'window (third selected-tab)))))))
+
+(defun espresso--guess-eval-defun-info (pstate)
+  "Internal helper for `espresso-eval-defun'. Returns a list (NAME . CLASSPARTS),
+where CLASSPARTS is a list of strings making up the class name
+and NAME is the name of the function part."
+  (cond ((and (= (length pstate) 3)
+              (eq (espresso--pitem-type (first pstate)) 'function)
+              (= (length (espresso--pitem-name (first pstate))) 1)
+              (consp (espresso--pitem-type (second pstate))))
+
+         (append (espresso--pitem-name (second pstate))
+                 (list (first (espresso--pitem-name (first pstate))))))
+
+        ((and (= (length pstate) 2)
+              (eq (espresso--pitem-type (first pstate)) 'function))
+
+         (append
+          (butlast (espresso--pitem-name (first pstate)))
+          (list (car (last (espresso--pitem-name (first pstate)))))))
+
+        (t (error "Function not a toplevel defun or class member"))))
+
+(defvar espresso--js-context nil
+  "The current JS context. This is a cons like the one returned
+from `espresso--read-tab'. Change with
+`espresso-set-js-context'.")
+
+(defconst espresso--js-inserter
+  "(function(func_info,func) {
+    func_info.unshift('window');
+    var obj = window;
+    for(var i = 1; i < func_info.length - 1; ++i) {
+      var next = obj[func_info[i]];
+      if(typeof next !== 'object' && typeof next !== 'function') {
+        next = obj.prototype && obj.prototype[func_info[i]];
+        if(typeof next !== 'object' && typeof next !== 'function') {
+          alert('Could not find ' + func_info.slice(0, i+1).join('.') +
+                ' or ' + func_info.slice(0, i+1).join('.') + '.prototype');
+          return;
+        }
+
+        func_info.splice(i+1, 0, 'prototype');
+        ++i;
+      }
+    }
+
+    obj[func_info[i]] = func;
+    alert('Successfully updated '+func_info.join('.'));
+  })")
+
+(defun espresso-set-js-context (context)
+  "Set the Javascript context to CONTEXT, reading from the user
+if interactive"
+  (interactive (list (espresso--read-tab "Javascript Context: ")))
+  (setq espresso--js-context context))
+
+(defun espresso--get-js-context ()
+  "Return a valid JS context. If one hasn't been set, or if it's
+stale, ask the user for a new one."
+
+  (with-espresso-js
+   (when (or (null espresso--js-context)
+             (espresso--js-handle-expired-p (cdr espresso--js-context))
+             (ecase (car espresso--js-context)
+               (window (js? (js< (cdr espresso--js-context) "closed")))
+               (browser (not (js? (js< (cdr espresso--js-context)
+                                       "contentDocument"))))))
+     (setq espresso--js-context (espresso--read-tab "Javascript Context: ")))
+
+   espresso--js-context))
+
+(defun espresso--js-content-window (context)
+  (with-espresso-js
+   (ecase (car context)
+     (window (cdr context))
+     (browser (js< (cdr context)
+                   "contentWindow" "wrappedJSObject")))))
+
+(defun espresso--make-nsilocalfile (path)
+  (with-espresso-js
+   (let ((file (js-create-instance "@mozilla.org/file/local;1"
+                                   "nsILocalFile")))
+     (js! (file "initWithPath") path)
+     file)))
+
+(defun espresso--js-add-resource-alias (alias path)
+  (with-espresso-js
+   (let* ((io-service (js-get-service "@mozilla.org/network/io-service;1"
+                                                "nsIIOService"))
+          (res-prot (js! (io-service "getProtocolHandler") "resource"))
+          (res-prot (js-qi res-prot "nsIResProtocolHandler"))
+          (path-file (espresso--make-nsilocalfile path))
+          (path-uri (js! (io-service "newFileURI") path-file)))
+     (js! (res-prot "setSubstitution") alias path-uri))))
+
+(defun* espresso-eval-defun ()
+  "Update some Mozilla tab with defun containing point or after
+point"
+  (interactive)
+
+  ;; This function works by generating a temporary file that contains
+  ;; the function we'd like to insert. We then use the elisp-js bridge
+  ;; to command mozilla to load this file by inserting a script tag
+  ;; into the document we set. This way, debuggers and such will have
+  ;; a way to find the source of the just-inserted function.
+  ;;
+  ;; We delete the temporary file if there's an error, but otherwise
+  ;; we add an unload event listener on the Mozilla side to delete the
+  ;; file.
+
+  (save-excursion
+    (let (begin end pstate defun-info temp-name defun-body)
+      (espresso--end-of-defun)
+      (setq end (point))
+      (espresso--ensure-cache)
+      (espresso--beginning-of-defun)
+      (re-search-forward "\\_<function\\_>")
+      (setq begin (match-beginning 0))
+      (setq pstate (espresso--forward-pstate))
+
+      (when (or (null pstate)
+                (> (point) end))
+        (error "Could not locate function definition"))
+
+      (setq defun-info (espresso--guess-eval-defun-info pstate))
+
+      (let ((overlay (make-overlay begin end)))
+        (overlay-put overlay 'face 'highlight)
+        (unwind-protect
+            (unless (y-or-n-p (format "Send %s to Mozilla? "
+                                      (mapconcat #'identity defun-info ".")))
+              (message "") ; question message lingers until next command
+              (return-from espresso-eval-defun))
+          (delete-overlay overlay)))
+
+      (setq defun-body (buffer-substring-no-properties begin end))
+
+      (make-directory espresso-js-tmpdir t)
+
+      ;; (Re)register a Mozilla resource URL to point to the
+      ;; temporary directory
+      (espresso--js-add-resource-alias "espresso" espresso-js-tmpdir)
+
+      (setq temp-name (make-temp-file (concat espresso-js-tmpdir
+                                             "/espresso-")
+                                      nil ".js"))
+      (unwind-protect
+          (with-espresso-js
+            (with-temp-buffer
+              (insert espresso--js-inserter)
+              (insert "(")
+              (insert (json-encode-list defun-info))
+              (insert ",\n")
+              (insert defun-body)
+              (insert "\n)")
+              (write-region (point-min) (point-max) temp-name
+                            nil 1))
+
+            ;; Give Mozilla responsibility for deleting this file
+            (let* ((content-window (espresso--js-content-window
+                                    (espresso--get-js-context)))
+                   (content-document (js< content-window "document"))
+                   (head (if (js? (js< content-document "body"))
+                             ;; Regular content
+                             (js< (js! (content-document "getElementsByTagName")
+                                       "head")
+                                  0)
+                           ;; Chrome
+                           (js< content-document "documentElement")))
+                   (elem (js! (content-document "createElementNS")
+                              "http://www.w3.org/1999/xhtml" "script")))
+
+              (js! (elem "setAttribute") "type" "text/javascript")
+              (js! (elem "setAttribute") "src"
+                   (format "resource://espresso/%s"
+                           (file-name-nondirectory temp-name)))
+
+              (js! (head "appendChild") elem)
+
+              (js! (content-window "addEventListener") "unload"
+                   (js! ((js-new
+                          "Function" "file"
+                          "return function() { file.remove(false) }"))
+                        (espresso--make-nsilocalfile temp-name))
+                   'false)
+              (setq temp-name nil)
+
+
+
+              ))
+
+        ;; temp-name is set to nil on success
+        (when temp-name
+          (delete-file temp-name))))))
+
+;;; Main Function
+
+;;;###autoload
+(defun espresso-mode ()
+  "Major mode for editing JavaScript source text.
+
+Key bindings:
+
+\\{espresso-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+
+  (use-local-map espresso-mode-map)
+  (set-syntax-table espresso-mode-syntax-table)
+
+  (set (make-local-variable 'indent-line-function) 'espresso-indent-line)
+  (set (make-local-variable 'beginning-of-defun-function)
+       'espresso--beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'espresso--end-of-defun)
+
+  (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)
+  (set (make-local-variable 'font-lock-defaults)
+       (list espresso--font-lock-keywords
+	     nil nil nil nil
+	     '(font-lock-syntactic-keywords
+               . espresso--font-lock-syntactic-keywords)))
+
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  (set (make-local-variable 'parse-sexp-lookup-properties) t)
+  (set (make-local-variable 'which-func-imenu-joiner-function)
+       #'espresso--which-func-joiner)
+
+  ;; Comments
+  (setq comment-start "// ")
+  (setq comment-end "")
+  (set (make-local-variable 'fill-paragraph-function)
+       'espresso-c-fill-paragraph)
+
+  ;; Parse cache
+  (add-hook 'before-change-functions #'espresso--flush-caches t t)
+
+  ;; Frameworks
+  (espresso--update-quick-match-re)
+
+  ;; Imenu
+  (setq imenu-case-fold-search nil)
+  (set (make-local-variable 'imenu-create-index-function)
+       #'espresso--imenu-create-index)
+
+  (setq major-mode 'espresso-mode)
+  (setq mode-name "Espresso")
+
+  ;; for filling, pretend we're cc-mode
+  (setq c-comment-prefix-regexp "//+\\|\\**"
+        c-paragraph-start "$"
+        c-paragraph-separate "$"
+        c-block-comment-prefix "* "
+        c-line-comment-starter "//"
+        c-comment-start-regexp "/[*/]\\|\\s!"
+        comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
+
+  (let ((c-buffer-is-cc-mode t))
+    (c-setup-paragraph-variables))
+
+  (set (make-local-variable 'syntax-begin-function)
+       #'espresso--syntax-begin-function)
+
+  ;; Important to fontify the whole buffer syntactically! If we don't,
+  ;; then we might have regular expression literals that aren't marked
+  ;; as strings, which will screw up parse-partial-sexp, scan-lists,
+  ;; etc. and and produce maddening "unbalanced parenthesis" errors.
+  ;; When we attempt to find the error and scroll to the portion of
+  ;; the buffer containing the problem, JIT-lock will apply the
+  ;; correct syntax to the regular expresion literal and the problem
+  ;; will mysteriously disappear.
+  (font-lock-set-defaults)
+
+  ;; (let (font-lock-keywords) ; leaves syntactic keywords intact
+  ;;   (font-lock-fontify-buffer))
+
+  (run-mode-hooks 'espresso-mode-hook))
+
+
+(eval-after-load 'hideshow
+  '(add-to-list 'hs-special-modes-alist
+                '(espresso-mode "{" "}" "/[*/]"
+                                nil hs-c-like-adjust-block-beginning)))
+
+(eval-after-load 'folding
+  '(when (fboundp 'folding-add-to-marks-list)
+     (folding-add-to-marks-list 'espresso-mode "// {{{" "// }}}" )))
+
+(eval-after-load 'speedbar
+  '(speedbar-add-supported-extension ".js"))
+
+
+;;; Emacs
+(provide 'espresso)
+;; Local Variables:
+;; outline-regexp: ";;; "
+;; End:
+;; espresso.el ends here
diff --git a/elpa-to-submit/nxhtml/related/find-recursive-orig.el b/elpa-to-submit/nxhtml/related/find-recursive-orig.el
deleted file mode 100644
index aeb97f705d..0000000000
--- a/elpa-to-submit/nxhtml/related/find-recursive-orig.el
+++ /dev/null
@@ -1,137 +0,0 @@
-;; find-recursive.el -- Find files recursively into a directory
-;;
-;; Copyright (C) 2001 Ovidiu Predescu
-;;
-;; Author: Ovidiu Predescu <ovidiu@cup.hp.com>
-;; Date: March 26, 2001
-;;
-;; This program 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
-;; of the License, or (at your option) any later version.
-;;
-;; This program 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 this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;;
-;; Setup: put this file in your Lisp path and add the following line in
-;; your .emacs:
-;;
-;; (require 'find-recursive)
-;;
-
-(require 'cl)
-
-(defcustom find-recursive-exclude-files '(".*.class$" ".*~$" ".*.elc$")
-  "List of regular expressions of files to be excluded when recursively searching for files."
-  :type '(repeat (string :tag "File regexp")))
-
-(defun find-file-recursively (file-regexp directory)
-  (interactive "sFile name to search for recursively: \nDIn directory: ")
-  (let ((directory (if (equal (substring directory -1) "/")
-                       directory
-                     (concat directory "/")))
-        (matches
-         (find-recursive-filter-out
-          find-recursive-exclude-files
-          (find-recursive-directory-relative-files directory "" file-regexp))))
-    (cond ((eq (length matches) 0) (message "No file(s) found!"))
-           ((eq (length matches) 1)
-            (find-file (concat directory (car matches))))
-           (t
-            (run-with-timer 0.001 nil
-                            (lambda ()
-                              (dispatch-event
-                               (make-event 'key-press '(key tab)))))
-            (let ((file (completing-read "Choose file: "
-                                           (mapcar 'list matches)
-                                           nil t)))
-                (if (or (eq file nil) (equal file ""))
-                    (message "No file selected.")
-                  (find-file (concat directory file))))))))
-
-(defun find-recursive-directory-relative-files (directory
-                                          relative-directory
-                                          file-regexp)
-  (let* ((full-dir (concat directory "/" relative-directory))
-         (matches
-          (mapcar
-           (function (lambda (x)
-                       (concat relative-directory x)))
-           (find-recursive-filter-out '(nil)
-                                (directory-files full-dir nil
-                                                 file-regexp nil t))))
-         (inner
-          (mapcar
-           (function
-            (lambda (dir)
-              (find-recursive-directory-relative-files directory
-                                                 (concat relative-directory
-                                                         dir "/")
-                                                 file-regexp)))
-           (find-recursive-filter-out '(nil "\\." "\\.\\.")
-                                (directory-files full-dir nil ".*"
-                                                 nil 'directories)))))
-    (mapcar (function (lambda (dir) (setq matches (append matches dir))))
-            inner)
-    matches))
-
-(defun find-recursive-filter-out (remove-list list)
-  "Remove all the elements in *remove-list* from *list*"
-  (if (eq list nil)
-      nil
-    (let ((elem (car list))
-          (rest (cdr list)))
-      (if (some
-           (lambda (regexp)
-             (if (or (eq elem nil) (eq regexp nil))
-                 nil
-               (not (eq (string-match regexp elem) nil))))
-           remove-list)
-          (find-recursive-filter-out remove-list rest)
-        (cons elem (find-recursive-filter-out remove-list rest))))))
-
-(defvar find-recursive-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
-
-(if find-recursive-running-xemacs
-    nil
-  (defadvice directory-files (after
-                              directory-files-xemacs
-                              (dirname &optional full match nosort files-only)
-                              activate)
-    "Add an additional argument, FILES-ONLY to the list of arguments
-for GNU Emacs. If the symbol is t, then only the files in the
-directory will be returned. If FILES-ONLY is nil, then both files and
-directories are selected. If FILES-ONLY is not nil and not t, then
-only sundirectories are returned."
-    (setq ad-return-value
-          (cond ((null files-only) ad-return-value)
-                ((eq files-only t)
-                 (find-recursive-remove-if (lambda (f)
-                                             (file-directory-p
-                                              (concat dirname "/" f)))
-                                           ad-return-value))
-                (t
-                 (find-recursive-remove-if (lambda (f)
-                                             (not (file-directory-p
-                                                   (concat dirname "/" f))))
-                                           ad-return-value)))))
-
-  (defun find-recursive-remove-if (func list)
-    "Removes all elements satisfying FUNC from LIST."
-    (let ((result nil))
-      (while list
-        (if (not (funcall func (car list)))
-            (setq result (cons (car list) result)))
-        (setq list (cdr list)))
-      (nreverse result))))
-
-(global-set-key [(control x) (meta f)] 'find-file-recursively)
-
-(provide 'find-recursive)
diff --git a/elpa-to-submit/nxhtml/related/find-recursive.el b/elpa-to-submit/nxhtml/related/find-recursive.el
deleted file mode 100644
index 3314faf6b5..0000000000
--- a/elpa-to-submit/nxhtml/related/find-recursive.el
+++ /dev/null
@@ -1,152 +0,0 @@
-;; find-recursive.el -- Find files recursively into a directory
-;;
-;; Copyright (C) 2001 Ovidiu Predescu
-;;
-;; Author: Ovidiu Predescu <ovidiu@cup.hp.com>
-;; Date: March 26, 2001
-;;
-;; This program 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
-;; of the License, or (at your option) any later version.
-;;
-;; This program 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 this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;;
-;; Setup: put this file in your Lisp path and add the following line in
-;; your .emacs:
-;;
-;; (require 'find-recursive)
-;;
-;;; Change log:
-;;
-;; 2007-12-04 (Lennart Borgman)
-;; - Removed advice
-;; - Removed global key binding
-;; - Made file name handling platform independent.
-;; 2008-03-14 (Lennart Borgman)
-;; - Tried to fix bugs I introduced when trying to make code platform
-;;   independent.
-
-(error "this is broken, use find-files-in-project.el instead")
-(eval-when-compile (require 'cl))
-
-(defcustom find-recursive-exclude-files '(".*.class$" ".*~$" ".*.elc$")
-  "List of regular expressions of files to be excluded when recursively searching for files."
-  :type '(repeat (string :tag "File regexp")))
-
-(defun find-file-recursively (file-regexp directory)
-  (interactive "sFile name regexp to search for recursively: \nDIn directory: ")
-  (let ((directory (file-name-as-directory directory))
-        (matches
-         (find-recursive-filter-out
-          find-recursive-exclude-files
-          (find-recursive-directory-relative-files directory directory file-regexp))))
-    (cond ((eq (length matches) 0) (message "No file(s) found!"))
-          ((eq (length matches) 1)
-           (find-file (expand-file-name (car matches) directory)))
-          (t
-           (isearch-unread 'tab) (isearch-unread 'tab)
-           (let ((file (completing-read "Choose file: "
-                                        (mapcar 'list matches)
-                                        nil t)))
-             (if (or (eq file nil) (equal file ""))
-                 (message "No file selected.")
-               (find-file (expand-file-name file directory))))))))
-
-(defun find-recursive-directory-relative-files (directory
-                                                relative-directory
-                                                file-regexp)
-  (let* ((directory (file-name-as-directory directory))
-         (relative-directory (file-name-as-directory relative-directory))
-         (full-dir (concat directory relative-directory))
-         (matches
-          (mapcar
-           (function (lambda (x)
-                       ;;(concat relative-directory x)
-                       (file-relative-name
-                        (expand-file-name x directory)
-                        relative-directory)))
-           (find-recursive-filter-out '(nil)
-                                      (find-recursive-directory-files full-dir nil
-                                                                      file-regexp nil t))))
-         (inner
-          (mapcar
-           (function
-            (lambda (dir)
-              (find-recursive-directory-relative-files directory
-                                                       ;;(concat relative-directory (file-name-as-directory dir))
-                                                       (file-relative-name
-                                                        (expand-file-name dir directory)
-                                                        relative-directory)
-                                                       file-regexp)))
-           (find-recursive-filter-out '(nil "\\." "\\.\\.")
-                                      (find-recursive-directory-files full-dir nil ".*"
-                                                                      nil 'directories)))))
-    (mapcar (function (lambda (dir) (setq matches (append matches dir))))
-            inner)
-    matches))
-
-(defun find-recursive-filter-out (remove-list list)
-  "Remove all the elements in *remove-list* from *list*"
-  (if (eq list nil)
-      nil
-    (let ((elem (car list))
-          (rest (cdr list)))
-      (if (some
-           (lambda (regexp)
-             (if (or (eq elem nil) (eq regexp nil))
-                 nil
-               (not (eq (string-match regexp elem) nil))))
-           remove-list)
-          (find-recursive-filter-out remove-list rest)
-        (cons elem (find-recursive-filter-out remove-list rest))))))
-
-(defvar find-recursive-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
-
-(defun find-recursive-directory-files (dirname &optional full match nosort files-only)
-  "Same as `directory-files' with additional arg FILES-ONLY.
-When FILES-ONLY is t return only files, not directories.  If it
-is nil return both files and directories. Finally, if it is
-neither nil nor t, then return only subdirectories."
-  (setq dirname (file-name-as-directory dirname))
-  (if find-recursive-running-xemacs
-      (directory-files dirname full match nosort files-only)
-    (setq dirname (file-name-as-directory dirname))
-    (let ((default-directory dirname))
-      (cond ((null files-only)
-             (directory-files dirname full match nosort))
-            ((eq files-only t)
-             (remq nil
-                   (mapcar (lambda (f)
-                             (if (file-directory-p f)
-                                 nil
-                               f))
-                           (directory-files dirname full match nosort))))
-            (t
-             (remq nil
-                   (mapcar (lambda (f)
-                             (if (not (file-directory-p f))
-                                 nil
-                               f))
-                           (directory-files dirname full match nosort))))))))
-
-(defvar find-cached-filenames nil)
-(length find-cached-filenames)
-
-;;(find-cache-filenames "c:/emacsW32/nxhtml/tests/")
-(defun find-cache-filenames (root)
-  (let ((files
-         ;;(find-recursive-directory-files root nil)
-         (find-recursive-directory-relative-files root "" nil)
-         ))
-    (setq find-cached-filenames files)))
-
-(provide 'find-recursive)
diff --git a/elpa-to-submit/nxhtml/related/flymake-keys.el b/elpa-to-submit/nxhtml/related/flymake-keys.el
index 92e5f32fac..1c0f739a30 100644
--- a/elpa-to-submit/nxhtml/related/flymake-keys.el
+++ b/elpa-to-submit/nxhtml/related/flymake-keys.el
@@ -47,6 +47,7 @@
 (require 'flymake)
 
 ;; (unless (boundp 'flymake-mode-map) (defvar flymake-mode-map (make-sparse-keymap)))
+(defvar flymake-mode-map) ;; silence compiler
 
 (define-key flymake-mode-map [(control ?c) ?! ?e] 'flymake-display-err-menu-for-current-line)
 (define-key flymake-mode-map [(control ?c) ?! ?n] 'flymake-goto-next-error)
diff --git a/elpa-to-submit/nxhtml/related/flymu.el b/elpa-to-submit/nxhtml/related/flymu.el
index d679aed92a..029e0a0703 100644
--- a/elpa-to-submit/nxhtml/related/flymu.el
+++ b/elpa-to-submit/nxhtml/related/flymu.el
@@ -134,7 +134,7 @@ from flymakes dito list for file names."
       (let ((major (overlay-get ovl 'mumamo-major-mode))
             (rec (assq major flymu-allowed-major-modes)))
         (when rec
-          (cdr rec)))
+          (setq ad-return-value (cdr rec))))
     ad-do-it))
 (ad-activate 'flymake-get-file-name-mode-and-masks)
 
diff --git a/elpa-to-submit/nxhtml/related/javascript-old.el b/elpa-to-submit/nxhtml/related/javascript-old.el
new file mode 100644
index 0000000000..9f935ce5ac
--- /dev/null
+++ b/elpa-to-submit/nxhtml/related/javascript-old.el
@@ -0,0 +1,713 @@
+;;; javascript.el --- Major mode for editing JavaScript source text
+
+;; Copyright (C) 2006 Karl Landström
+
+;; Author: Karl Landström <kland@comhem.se>
+;; Maintainer: Karl Landström <kland@comhem.se>
+;; Version: 2.0 Beta 9
+;; Date: 2006-12-26
+;; Keywords: languages, oop
+
+;; This file 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.
+
+;; This file 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:
+;;
+;; The main features of this JavaScript mode are syntactic
+;; highlighting (enabled with `font-lock-mode' or
+;; `global-font-lock-mode'), automatic indentation and filling of
+;; comments.
+;;
+;; This package has (only) been tested with GNU Emacs 21.4 (the latest
+;; stable release).
+;;
+;; Installation:
+;;
+;; Put this file in a directory where Emacs can find it (`C-h v
+;; load-path' for more info). Then add the following lines to your
+;; Emacs initialization file:
+;;
+;;    (add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
+;;    (autoload 'javascript-mode "javascript" nil t)
+;;
+;; General Remarks:
+;;
+;; This mode assumes that block comments are not nested inside block
+;; comments and that strings do not contain line breaks.
+;;
+;; Exported names start with "javascript-" whereas private names start
+;; with "js-".
+;;
+;;;; Changes:
+;;
+;; See javascript.el.changelog.
+;;
+;; 2008-03-29
+;; - js-proper-indentation: use lines above as fallback, mostly for
+;;   mumamo. (Lennart Borgman)
+
+;;; Code:
+
+(require 'cc-mode)
+(require 'font-lock)
+(require 'newcomment)
+
+(defgroup javascript nil
+  "Customization variables for `javascript-mode'."
+  :tag "JavaScript"
+  :group 'languages)
+
+(defcustom javascript-indent-level 4
+  "Number of spaces for each indentation step."
+  :type 'integer
+  :group 'javascript)
+(make-variable-buffer-local 'javascript-indent-level)
+
+(defcustom javascript-auto-indent-flag t
+  "Automatic indentation with punctuation characters. If non-nil, the
+current line is indented when certain punctuations are inserted."
+  :type 'boolean
+  :group 'javascript)
+
+
+;; --- Keymap ---
+
+(defvar javascript-mode-map nil
+  "Keymap used in JavaScript mode.")
+
+(unless javascript-mode-map
+  (setq javascript-mode-map (make-sparse-keymap)))
+
+(when javascript-auto-indent-flag
+  (mapc (lambda (key)
+          (define-key javascript-mode-map key 'javascript-insert-and-indent))
+        '("{" "}" "(" ")" ":" ";" ",")))
+
+(defun javascript-insert-and-indent (key)
+  "Run command bound to key and indent current line. Runs the command
+bound to KEY in the global keymap and indents the current line."
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (indent-according-to-mode))
+
+
+;; --- Syntax Table And Parsing ---
+
+(defvar javascript-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (c-populate-syntax-table table)
+
+    ;; The syntax class of underscore should really be `symbol' ("_")
+    ;; but that makes matching of tokens much more complex as e.g.
+    ;; "\\<xyz\\>" matches part of e.g. "_xyz" and "xyz_abc". Defines
+    ;; it as word constituent for now.
+    (modify-syntax-entry ?_ "w" table)
+    table)
+  "Syntax table used in JavaScript mode.")
+
+
+(defun js-re-search-forward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-forward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-forward regexp bound)
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-forward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
+              (save-excursion (end-of-line) (point)) t))
+            ((nth 7 parse)
+             (forward-line))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
+             (re-search-forward "\\*/"))
+            (t
+             (setq count (1- count))))
+      (setq saved-point (point))))
+  (point))
+
+
+(defun js-re-search-forward (regexp &optional bound noerror count)
+  "Search forward but ignore strings and comments. Invokes
+`re-search-forward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(js-re-search-forward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-backward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-forward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun js-re-search-backward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-backward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-backward regexp bound)
+      (when (and (> (point) (point-min))
+                 (save-excursion (backward-char) (looking-at "/[/*]")))
+        (backward-char))
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-backward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
+              (save-excursion (beginning-of-line) (point)) t))
+            ((nth 7 parse)
+             (goto-char (nth 8 parse)))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
+             (re-search-backward "/\\*"))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+
+(defun js-re-search-backward (regexp &optional bound noerror count)
+  "Search backward but ignore strings and comments. Invokes
+`re-search-backward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(js-re-search-backward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-forward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-backward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun js-continued-var-decl-list-p ()
+  "Return non-nil if point is inside a continued variable declaration
+list."
+  (interactive)
+  (let ((start (save-excursion (js-re-search-backward "\\<var\\>" nil t))))
+    (and start
+         (save-excursion (re-search-backward "\n" start t))
+         (not (save-excursion
+                (js-re-search-backward
+                 ";\\|[^, \t][ \t]*\\(/[/*]\\|$\\)" start t))))))
+
+
+;; --- Font Lock ---
+
+(defun js-inside-param-list-p ()
+  "Return non-nil if point is inside a function parameter list."
+  (condition-case err
+      (save-excursion
+        (up-list -1)
+        (and (looking-at "(")
+             (progn (backward-word 1)
+                    (or (looking-at "function")
+                        (progn (backward-word 1) (looking-at "function"))))))
+    (error nil)))
+
+
+(defconst js-function-heading-1-re
+  "^[ \t]*function[ \t]+\\(\\w+\\)"
+  "Regular expression matching the start of a function header.")
+
+(defconst js-function-heading-2-re
+  "^[ \t]*\\(\\w+\\)[ \t]*:[ \t]*function\\>"
+  "Regular expression matching the start of a function entry in
+  an associative array.")
+
+(defconst js-keyword-re
+  (regexp-opt '("abstract" "break" "case" "catch" "class" "const"
+                "continue" "debugger" "default" "delete" "do" "else"
+                "enum" "export" "extends" "final" "finally" "for"
+                "function" "goto" "if" "implements" "import" "in"
+                "instanceof" "interface" "native" "new" "package"
+                "private" "protected" "public" "return" "static"
+                "super" "switch" "synchronized" "this" "throw"
+                "throws" "transient" "try" "typeof" "var" "void"
+                "volatile" "while" "with") 'words)
+  "Regular expression matching any JavaScript keyword.")
+
+(defconst js-basic-type-re
+  (regexp-opt '("boolean" "byte" "char" "double" "float" "int" "long"
+                "short" "void") 'words)
+  "Regular expression matching any predefined type in JavaScript.")
+
+(defconst js-constant-re
+  (regexp-opt '("false" "null" "true") 'words)
+  "Regular expression matching any future reserved words in JavaScript.")
+
+
+(defconst js-font-lock-keywords-1
+  (list
+   "\\<import\\>"
+   (list js-function-heading-1-re 1 font-lock-function-name-face)
+   (list js-function-heading-2-re 1 font-lock-function-name-face)
+   (list "[=(][ \t]*\\(/.*?[^\\]/\\w*\\)" 1 font-lock-string-face))
+  "Level one font lock.")
+
+(defconst js-font-lock-keywords-2
+  (append js-font-lock-keywords-1
+          (list (list js-keyword-re 1 font-lock-keyword-face)
+                (cons js-basic-type-re font-lock-type-face)
+                (cons js-constant-re font-lock-constant-face)))
+  "Level two font lock.")
+
+
+;; Limitations with variable declarations: There seems to be no
+;; sensible way to highlight variables occuring after an initialized
+;; variable in a variable list. For instance, in
+;;
+;;    var x, y = f(a, b), z
+;;
+;; z will not be highlighted.
+
+(defconst js-font-lock-keywords-3
+  (append
+   js-font-lock-keywords-2
+   (list
+
+    ;; variable declarations
+    (list
+     (concat "\\<\\(const\\|var\\)\\>\\|" js-basic-type-re)
+     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
+           nil
+           nil
+           '(1 font-lock-variable-name-face)))
+
+    ;; continued variable declaration list
+    (list
+     (concat "^[ \t]*\\w+[ \t]*\\([,;=]\\|/[/*]\\|$\\)")
+     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
+           '(if (save-excursion (backward-char) (js-continued-var-decl-list-p))
+                (backward-word 1)
+              (end-of-line))
+           '(end-of-line)
+           '(1 font-lock-variable-name-face)))
+
+    ;; formal parameters
+    (list
+     (concat "\\<function\\>\\([ \t]+\\w+\\)?[ \t]*([ \t]*\\w")
+     (list "\\(\\w+\\)\\([ \t]*).*\\)?"
+           '(backward-char)
+           '(end-of-line)
+           '(1 font-lock-variable-name-face)))
+
+    ;; continued formal parameter list
+    (list
+     (concat "^[ \t]*\\w+[ \t]*[,)]")
+     (list "\\w+"
+           '(if (save-excursion (backward-char) (js-inside-param-list-p))
+                (backward-word 1)
+              (end-of-line))
+           '(end-of-line)
+           '(0 font-lock-variable-name-face)))))
+  "Level three font lock.")
+
+(defconst js-font-lock-keywords
+  '(js-font-lock-keywords-3 js-font-lock-keywords-1 js-font-lock-keywords-2
+                            js-font-lock-keywords-3)
+  "See `font-lock-keywords'.")
+
+
+;; --- Indentation ---
+
+(defconst js-possibly-braceless-keyword-re
+  (regexp-opt
+   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with")
+   'words)
+  "Regular expression matching keywords that are optionally
+  followed by an opening brace.")
+
+(defconst js-indent-operator-re
+  (concat "[-+*/%<>=&^|?:]\\([^-+*/]\\|$\\)\\|"
+          (regexp-opt '("in" "instanceof") 'words))
+  "Regular expression matching operators that affect indentation
+  of continued expressions.")
+
+
+(defun js-looking-at-operator-p ()
+  "Return non-nil if text after point is an operator (that is not
+a comma)."
+  (save-match-data
+    (and (looking-at js-indent-operator-re)
+         (or (not (looking-at ":"))
+             (save-excursion
+               (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
+                    (looking-at "?")))))))
+
+
+(defun js-continued-expression-p ()
+  "Returns non-nil if the current line continues an expression."
+  (save-excursion
+    (back-to-indentation)
+    (or (js-looking-at-operator-p)
+        (and (js-re-search-backward "\n" nil t)
+             (progn
+               (skip-chars-backward " \t")
+               (unless (bobp)
+                 (backward-char)
+                 (and (> (point) (point-min))
+                      (save-excursion (backward-char) (not (looking-at "[/*]/")))
+                      (js-looking-at-operator-p)
+                      (and (progn (backward-char)
+                                  (not (looking-at "++\\|--\\|/[/*]")))))))))))
+
+
+(defun js-end-of-do-while-loop-p ()
+  "Returns non-nil if word after point is `while' of a do-while
+statement, else returns nil. A braceless do-while statement
+spanning several lines requires that the start of the loop is
+indented to the same column as the current line."
+  (interactive)
+  (save-excursion
+    (save-match-data
+      (when (looking-at "\\s-*\\<while\\>")
+        (if (save-excursion
+              (skip-chars-backward "[ \t\n]*}")
+              (looking-at "[ \t\n]*}"))
+            (save-excursion
+              (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
+          (js-re-search-backward "\\<do\\>" (point-at-bol) t)
+          (or (looking-at "\\<do\\>")
+              (let ((saved-indent (current-indentation)))
+                (while (and (js-re-search-backward "^[ \t]*\\<" nil t)
+                            (/= (current-indentation) saved-indent)))
+                (and (looking-at "[ \t]*\\<do\\>")
+                     (not (js-re-search-forward
+                           "\\<while\\>" (point-at-eol) t))
+                     (= (current-indentation) saved-indent)))))))))
+
+
+(defun js-ctrl-statement-indentation ()
+  "Returns the proper indentation of the current line if it
+starts the body of a control statement without braces, else
+returns nil."
+  (save-excursion
+    (back-to-indentation)
+    (when (save-excursion
+            (and (not (looking-at "[{]"))
+                 (progn
+                   (js-re-search-backward "[[:graph:]]" nil t)
+                   (forward-char)
+                   (when (= (char-before) ?\)) (backward-list))
+                   (skip-syntax-backward " ")
+                   (skip-syntax-backward "w")
+                   (looking-at js-possibly-braceless-keyword-re))
+                 (not (js-end-of-do-while-loop-p))))
+      (save-excursion
+        (goto-char (match-beginning 0))
+        (+ (current-indentation) javascript-indent-level)))))
+
+
+(defun js-proper-indentation (parse-status)
+  "Return the proper indentation for the current line."
+  (save-excursion
+    (back-to-indentation)
+    (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
+          (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
+          (continued-expr-p (js-continued-expression-p)))
+      (cond (ctrl-stmt-indent)
+            ((js-continued-var-decl-list-p)
+             (js-re-search-backward "\\<var\\>" nil t)
+             (+ (current-indentation) javascript-indent-level))
+            ((nth 1 parse-status)
+             (goto-char (nth 1 parse-status))
+             (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
+                 (progn
+                   (skip-syntax-backward " ")
+                   (when (= (char-before) ?\)) (backward-list))
+                   (back-to-indentation)
+                   (cond (same-indent-p
+                          (current-column))
+                         (continued-expr-p
+                          (+ (current-column) (* 2 javascript-indent-level)))
+                         (t
+                          (+ (current-column) javascript-indent-level))))
+               (unless same-indent-p
+                 (forward-char)
+                 (skip-chars-forward " \t"))
+               (current-column)))
+            (continued-expr-p javascript-indent-level)
+            ;;(t 0)
+            (t
+            ;; Try the line above. If nothing useful fall back to 0.
+             (let ((ind 0))
+               (while (and (= ind 0)
+                           (/= (point-min) (line-beginning-position)))
+                 (forward-line -1)
+                 (back-to-indentation)
+                 (setq ind (current-column)))
+               ind))))))
+
+
+(defun javascript-indent-line ()
+  "Indent the current line as JavaScript source text."
+  (interactive)
+  (let ((parse-status
+         (save-excursion (parse-partial-sexp (point-min) (point-at-bol))))
+        (offset (- (current-column) (current-indentation))))
+    (when (not (nth 8 parse-status))
+      (indent-line-to (js-proper-indentation parse-status))
+      (when (> offset 0) (forward-char offset)))))
+
+
+;; --- Filling ---
+
+;; FIXME: It should be possible to use the more sofisticated function
+;; `c-fill-paragraph' in `cc-cmds.el' instead. However, just setting
+;; `fill-paragraph-function' to `c-fill-paragraph' does not work;
+;; inside `c-fill-paragraph', `fill-paragraph-function' evaluates to
+;; nil!?
+
+(defun js-backward-paragraph ()
+  "Move backward to start of paragraph. Postcondition: Point is at
+beginning of buffer or the previous line contains only whitespace."
+  (forward-line -1)
+  (while (not (or (bobp) (looking-at "^[ \t]*$")))
+    (forward-line -1))
+  (when (not (bobp)) (forward-line 1)))
+
+
+(defun js-forward-paragraph ()
+  "Move forward to end of paragraph. Postcondition: Point is at
+end of buffer or the next line contains only whitespace."
+  (forward-line 1)
+  (while (not (or (eobp) (looking-at "^[ \t]*$")))
+    (forward-line 1))
+  (when (not (eobp)) (backward-char 1)))
+
+
+(defun js-fill-block-comment-paragraph (parse-status justify)
+  "Fill current paragraph as a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point. JUSTIFY has the same meaning as in `fill-paragraph'."
+  (let ((offset (save-excursion
+                  (goto-char (nth 8 parse-status)) (current-indentation))))
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (save-excursion
+                            (goto-char (nth 8 parse-status)) (point-at-bol))
+                          (save-excursion
+                            (goto-char (nth 8 parse-status))
+                            (re-search-forward "*/")))
+        (narrow-to-region (save-excursion
+                            (js-backward-paragraph)
+                            (when (looking-at "^[ \t]*$") (forward-line 1))
+                            (point))
+                          (save-excursion
+                            (js-forward-paragraph)
+                            (when (looking-at "^[ \t]*$") (backward-char))
+                            (point)))
+        (goto-char (point-min))
+        (while (not (eobp))
+          (delete-horizontal-space)
+          (forward-line 1))
+        (let ((fill-column (- fill-column offset))
+              (fill-paragraph-function nil))
+          (fill-paragraph justify))
+
+        ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+        ;; `fill-paragraph' seems toadd a newline at the end of the
+        ;; paragraph. Remove it!
+        (goto-char (point-max))
+        (when (looking-at "^$") (backward-delete-char 1))
+
+        (goto-char (point-min))
+        (while (not (eobp))
+          (indent-to offset)
+          (forward-line 1))))))
+
+
+(defun js-sline-comment-par-start ()
+  "Return point at the beginning of the line where the current
+single-line comment paragraph starts."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (bobp))
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line -1))
+    (unless (bobp) (forward-line 1))
+    (point)))
+
+
+(defun js-sline-comment-par-end ()
+  "Return point at end of current single-line comment paragraph."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (eobp))
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line 1))
+    (unless (bobp) (backward-char))
+    (point)))
+
+
+(defun js-sline-comment-offset (line)
+  "Return the column at the start of the current single-line
+comment paragraph."
+  (save-excursion
+    (goto-line line)
+    (re-search-forward "//" (point-at-eol))
+    (goto-char (match-beginning 0))
+    (current-column)))
+
+
+(defun js-sline-comment-text-offset (line)
+  "Return the column at the start of the text of the current
+single-line comment paragraph."
+  (save-excursion
+    (goto-line line)
+    (re-search-forward "//[ \t]*" (point-at-eol))
+    (current-column)))
+
+
+(defun js-at-empty-sline-comment-p ()
+  "Return non-nil if inside an empty single-line comment."
+  (and (save-excursion
+         (beginning-of-line)
+         (not (looking-at "^.*//.*[[:graph:]]")))
+       (save-excursion
+         (re-search-backward "//" (point-at-bol) t))))
+
+
+(defun js-fill-sline-comments (parse-status justify)
+  "Fill current paragraph as a sequence of single-line comments.
+PARSE-STATUS is the result of `parse-partial-regexp' from
+beginning of buffer to point. JUSTIFY has the same meaning as in
+`fill-paragraph'."
+  (when (not (js-at-empty-sline-comment-p))
+    (let* ((start (js-sline-comment-par-start))
+           (start-line (1+ (count-lines (point-min) start)))
+           (end (js-sline-comment-par-end))
+           (offset (js-sline-comment-offset start-line))
+           (text-offset (js-sline-comment-text-offset start-line)))
+      (save-excursion
+        (save-restriction
+          (narrow-to-region start end)
+          (goto-char (point-min))
+          (while (re-search-forward "^[ \t]*//[ \t]*" nil t)
+            (replace-match "")
+            (forward-line 1))
+          (let ((fill-paragraph-function nil)
+                (fill-column (- fill-column text-offset)))
+            (fill-paragraph justify))
+
+          ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+          ;; `fill-paragraph' seems to add a newline at the end of the
+          ;; paragraph. Remove it!
+          (goto-char (point-max))
+          (when (looking-at "^$") (backward-delete-char 1))
+
+          (goto-char (point-min))
+          (while (not (eobp))
+            (indent-to offset)
+            (insert "//")
+            (indent-to text-offset)
+            (forward-line 1)))))))
+
+
+(defun js-trailing-comment-p (parse-status)
+  "Return non-nil if inside a trailing comment. PARSE-STATUS is
+the result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion
+    (when (nth 4 parse-status)
+      (goto-char (nth 8 parse-status))
+      (skip-chars-backward " \t")
+      (not (bolp)))))
+
+
+(defun js-block-comment-p (parse-status)
+  "Return non-nil if inside a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion
+    (save-match-data
+      (when (nth 4 parse-status)
+        (goto-char (nth 8 parse-status))
+        (looking-at "/\\*")))))
+
+
+(defun javascript-fill-paragraph (&optional justify)
+  "If inside a comment, fill the current comment paragraph.
+Trailing comments are ignored."
+  (interactive)
+  (let ((parse-status (parse-partial-sexp (point-min) (point))))
+    (when (and (nth 4 parse-status)
+               (not (js-trailing-comment-p parse-status)))
+      (if (js-block-comment-p parse-status)
+          (js-fill-block-comment-paragraph parse-status justify)
+        (js-fill-sline-comments parse-status justify))))
+  t)
+
+
+;; --- Imenu ---
+
+(defconst js-imenu-generic-expression
+  (list
+   (list
+    nil
+    "function\\s-+\\(\\w+\\)\\s-*("
+    1))
+  "Regular expression matching top level procedures. Used by imenu.")
+
+
+;; --- Main Function ---
+
+(defun javascript-mode ()
+  "Major mode for editing JavaScript source text.
+
+Key bindings:
+
+\\{javascript-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+
+  (use-local-map javascript-mode-map)
+  (set-syntax-table javascript-mode-syntax-table)
+  (set (make-local-variable 'indent-line-function) 'javascript-indent-line)
+  (set (make-local-variable 'font-lock-defaults) (list js-font-lock-keywords))
+
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+
+  ;; Comments
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'fill-paragraph-function)
+       'javascript-fill-paragraph)
+
+  ;; Imenu
+  (setq imenu-case-fold-search nil)
+  (set (make-local-variable 'imenu-generic-expression)
+       js-imenu-generic-expression)
+
+  (setq major-mode 'javascript-mode)
+  (setq mode-name "JavaScript")
+  (run-hooks 'javascript-mode-hook))
+
+
+(provide 'javascript-mode)
+;;; javascript.el ends here
diff --git a/elpa-to-submit/nxhtml/related/javascript.el b/elpa-to-submit/nxhtml/related/javascript.el
index 59512fa079..7c0792bf7b 100644
--- a/elpa-to-submit/nxhtml/related/javascript.el
+++ b/elpa-to-submit/nxhtml/related/javascript.el
@@ -1,716 +1,745 @@
-;;; javascript.el --- Major mode for editing JavaScript source text
-
-;; Copyright (C) 2006 Karl Landström
-
-;; Author: Karl Landström <kland@comhem.se>
-;; Maintainer: Karl Landström <kland@comhem.se>
-;; Version: 2.0 Beta 9
-;; Date: 2006-12-26
-;; Keywords: languages, oop
-
-;; This file 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.
-
-;; This file 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:
-;;
-;; The main features of this JavaScript mode are syntactic
-;; highlighting (enabled with `font-lock-mode' or
-;; `global-font-lock-mode'), automatic indentation and filling of
-;; comments.
-;;
-;; This package has (only) been tested with GNU Emacs 21.4 (the latest
-;; stable release).
-;;
-;; Installation:
-;;
-;; Put this file in a directory where Emacs can find it (`C-h v
-;; load-path' for more info). Then add the following lines to your
-;; Emacs initialization file:
-;;
-;;    (add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
-;;    (autoload 'javascript-mode "javascript" nil t)
-;;
-;; General Remarks:
-;;
-;; This mode assumes that block comments are not nested inside block
-;; comments and that strings do not contain line breaks.
-;;
-;; Exported names start with "javascript-" whereas private names start
-;; with "js-".
-;;
-;;;; Changes:
-;;
-;; See javascript.el.changelog.
-;;
-;; 2008-03-29
-;; - js-proper-indentation: use lines above as fallback, mostly for
-;;   mumamo. (Lennart Borgman)
-
-;;; Code:
-
-(require 'cc-mode)
-(require 'font-lock)
-(require 'newcomment)
-
-(defgroup javascript nil
-  "Customization variables for `javascript-mode'."
-  :tag "JavaScript"
-  :group 'languages)
-
-(defcustom javascript-indent-level 4
-  "Number of spaces for each indentation step."
-  :type 'integer
-  :group 'javascript)
-(make-variable-buffer-local 'javascript-indent-level)
-
-(defcustom javascript-auto-indent-flag t
-  "Automatic indentation with punctuation characters. If non-nil, the
-current line is indented when certain punctuations are inserted."
-  :type 'boolean
-  :group 'javascript)
-
-
-;; --- Keymap ---
-
-(defvar javascript-mode-map nil
-  "Keymap used in JavaScript mode.")
-
-(unless javascript-mode-map
-  (setq javascript-mode-map (make-sparse-keymap)))
-
-(when javascript-auto-indent-flag
-  (mapc (lambda (key)
-          (define-key javascript-mode-map key 'javascript-insert-and-indent))
-        '("{" "}" "(" ")" ":" ";" ",")))
-
-(defun javascript-insert-and-indent (key)
-  "Run command bound to key and indent current line. Runs the command
-bound to KEY in the global keymap and indents the current line."
-  (interactive (list (this-command-keys)))
-  (call-interactively (lookup-key (current-global-map) key))
-  (indent-according-to-mode))
-
-
-;; --- Syntax Table And Parsing ---
-
-(defvar javascript-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (c-populate-syntax-table table)
-
-    ;; The syntax class of underscore should really be `symbol' ("_")
-    ;; but that makes matching of tokens much more complex as e.g.
-    ;; "\\<xyz\\>" matches part of e.g. "_xyz" and "xyz_abc". Defines
-    ;; it as word constituent for now.
-    (modify-syntax-entry ?_ "w" table)
-
-    table)
-  "Syntax table used in JavaScript mode.")
-
-
-(defun js-re-search-forward-inner (regexp &optional bound count)
-  "Auxiliary function for `js-re-search-forward'."
-  (let ((parse)
-        (saved-point (point-min)))
-    (while (> count 0)
-      (re-search-forward regexp bound)
-      (setq parse (parse-partial-sexp saved-point (point)))
-      (cond ((nth 3 parse)
-             (re-search-forward
-              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
-              (save-excursion (end-of-line) (point)) t))
-            ((nth 7 parse)
-             (forward-line))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
-             (re-search-forward "\\*/"))
-            (t
-             (setq count (1- count))))
-      (setq saved-point (point))))
-  (point))
-
-
-(defun js-re-search-forward (regexp &optional bound noerror count)
-  "Search forward but ignore strings and comments. Invokes
-`re-search-forward' but treats the buffer as if strings and
-comments have been removed."
-  (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js-re-search-forward-inner regexp bound 1))
-               ((< count 0)
-                '(js-re-search-backward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js-re-search-forward-inner regexp bound count)))))
-    (condition-case err
-        (eval search-expr)
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-
-(defun js-re-search-backward-inner (regexp &optional bound count)
-  "Auxiliary function for `js-re-search-backward'."
-  (let ((parse)
-        (saved-point (point-min)))
-    (while (> count 0)
-      (re-search-backward regexp bound)
-      (when (and (> (point) (point-min))
-                 (save-excursion (backward-char) (looking-at "/[/*]")))
-        (forward-char))
-      (setq parse (parse-partial-sexp saved-point (point)))
-      (cond ((nth 3 parse)
-             (re-search-backward
-              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
-              (save-excursion (beginning-of-line) (point)) t))
-            ((nth 7 parse)
-             (goto-char (nth 8 parse)))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
-             (re-search-backward "/\\*"))
-            (t
-             (setq count (1- count))))))
-  (point))
-
-
-(defun js-re-search-backward (regexp &optional bound noerror count)
-  "Search backward but ignore strings and comments. Invokes
-`re-search-backward' but treats the buffer as if strings and
-comments have been removed."
-  (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js-re-search-backward-inner regexp bound 1))
-               ((< count 0)
-                '(js-re-search-forward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js-re-search-backward-inner regexp bound count)))))
-    (condition-case err
-        (eval search-expr)
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-
-(defun js-continued-var-decl-list-p ()
-  "Return non-nil if point is inside a continued variable declaration
-list."
-  (interactive)
-  (let ((start (save-excursion (js-re-search-backward "\\<var\\>" nil t))))
-    (and start
-         (save-excursion (re-search-backward "\n" start t))
-         (not (save-excursion
-                (js-re-search-backward
-                 ";\\|[^, \t][ \t]*\\(/[/*]\\|$\\)" start t))))))
-
-
-;; --- Font Lock ---
-
-(defun js-inside-param-list-p ()
-  "Return non-nil if point is inside a function parameter list."
-  (condition-case err
-      (save-excursion
-        (up-list -1)
-        (and (looking-at "(")
-             (progn (backward-word 1)
-                    (or (looking-at "function")
-                        (progn (backward-word 1) (looking-at "function"))))))
-    (error nil)))
-
-
-(defconst js-function-heading-1-re
-  "^[ \t]*function[ \t]+\\(\\w+\\)"
-  "Regular expression matching the start of a function header.")
-
-(defconst js-function-heading-2-re
-  "^[ \t]*\\(\\w+\\)[ \t]*:[ \t]*function\\>"
-  "Regular expression matching the start of a function entry in
-  an associative array.")
-
-(defconst js-keyword-re
-  (regexp-opt '("abstract" "break" "case" "catch" "class" "const"
-                "continue" "debugger" "default" "delete" "do" "else"
-                "enum" "export" "extends" "final" "finally" "for"
-                "function" "goto" "if" "implements" "import" "in"
-                "instanceof" "interface" "native" "new" "package"
-                "private" "protected" "public" "return" "static"
-                "super" "switch" "synchronized" "this" "throw"
-                "throws" "transient" "try" "typeof" "var" "void"
-                "volatile" "while" "with") 'words)
-  "Regular expression matching any JavaScript keyword.")
-
-(defconst js-basic-type-re
-  (regexp-opt '("boolean" "byte" "char" "double" "float" "int" "long"
-                "short" "void") 'words)
-  "Regular expression matching any predefined type in JavaScript.")
-
-(defconst js-constant-re
-  (regexp-opt '("false" "null" "true") 'words)
-  "Regular expression matching any future reserved words in JavaScript.")
-
-
-(defconst js-font-lock-keywords-1
-  (list
-   "\\<import\\>"
-   (list js-function-heading-1-re 1 font-lock-function-name-face)
-   (list js-function-heading-2-re 1 font-lock-function-name-face)
-   (list "[=(][ \t]*\\(/.*?[^\\]/\\w*\\)" 1 font-lock-string-face))
-  "Level one font lock.")
-
-(defconst js-font-lock-keywords-2
-  (append js-font-lock-keywords-1
-          (list (list js-keyword-re 1 font-lock-keyword-face)
-                (cons js-basic-type-re font-lock-type-face)
-                (cons js-constant-re font-lock-constant-face)))
-  "Level two font lock.")
-
-
-;; Limitations with variable declarations: There seems to be no
-;; sensible way to highlight variables occuring after an initialized
-;; variable in a variable list. For instance, in
-;;
-;;    var x, y = f(a, b), z
-;;
-;; z will not be highlighted.
-
-(defconst js-font-lock-keywords-3
-  (append
-   js-font-lock-keywords-2
-   (list
-
-    ;; variable declarations
-    (list
-     (concat "\\<\\(const\\|var\\)\\>\\|" js-basic-type-re)
-     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
-           nil
-           nil
-           '(1 font-lock-variable-name-face)))
-
-    ;; continued variable declaration list
-    (list
-     (concat "^[ \t]*\\w+[ \t]*\\([,;=]\\|/[/*]\\|$\\)")
-     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
-           '(if (save-excursion (backward-char) (js-continued-var-decl-list-p))
-                (backward-word 1)
-              (end-of-line))
-           '(end-of-line)
-           '(1 font-lock-variable-name-face)))
-
-    ;; formal parameters
-    (list
-     (concat "\\<function\\>\\([ \t]+\\w+\\)?[ \t]*([ \t]*\\w")
-     (list "\\(\\w+\\)\\([ \t]*).*\\)?"
-           '(backward-char)
-           '(end-of-line)
-           '(1 font-lock-variable-name-face)))
-
-    ;; continued formal parameter list
-    (list
-     (concat "^[ \t]*\\w+[ \t]*[,)]")
-     (list "\\w+"
-           '(if (save-excursion (backward-char) (js-inside-param-list-p))
-                (backward-word 1)
-              (end-of-line))
-           '(end-of-line)
-           '(0 font-lock-variable-name-face)))))
-  "Level three font lock.")
-
-(defconst js-font-lock-keywords
-  '(js-font-lock-keywords-3 js-font-lock-keywords-1 js-font-lock-keywords-2
-                            js-font-lock-keywords-3)
-  "See `font-lock-keywords'.")
-
-
-;; --- Indentation ---
-
-(defconst js-possibly-braceless-keyword-re
-  (regexp-opt
-   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with")
-   'words)
-  "Regular expression matching keywords that are optionally
-  followed by an opening brace.")
-
-(defconst js-indent-operator-re
-  (concat "[-+*/%<>=&^|?:]\\([^-+*/]\\|$\\)\\|"
-          (regexp-opt '("in" "instanceof") 'words))
-  "Regular expression matching operators that affect indentation
-  of continued expressions.")
-
-
-(defun js-looking-at-operator-p ()
-  "Return non-nil if text after point is an operator (that is not
-a comma)."
-  (save-match-data
-    (and (looking-at js-indent-operator-re)
-         (or (not (looking-at ":"))
-             (save-excursion
-               (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
-                    (looking-at "?")))))))
-
-
-(defun js-continued-expression-p ()
-  "Returns non-nil if the current line continues an expression."
-  (save-excursion
-    (back-to-indentation)
-    (or (js-looking-at-operator-p)
-        (and (js-re-search-backward "\n" nil t)
-             (progn
-               (skip-chars-backward " \t")
-               (unless (bobp)
-                 (backward-char)
-                 (and (> (point) (point-min))
-                      (save-excursion (backward-char) (not (looking-at "[/*]/")))
-                      (js-looking-at-operator-p)
-                      (and (progn (backward-char)
-                                  (not (looking-at "++\\|--\\|/[/*]")))))))))))
-
-
-(defun js-end-of-do-while-loop-p ()
-  "Returns non-nil if word after point is `while' of a do-while
-statement, else returns nil. A braceless do-while statement
-spanning several lines requires that the start of the loop is
-indented to the same column as the current line."
-  (interactive)
-  (save-excursion
-    (save-match-data
-      (when (looking-at "\\s-*\\<while\\>")
-        (if (save-excursion
-              (skip-chars-backward "[ \t\n]*}")
-              (looking-at "[ \t\n]*}"))
-            (save-excursion
-              (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
-          (js-re-search-backward "\\<do\\>" (point-at-bol) t)
-          (or (looking-at "\\<do\\>")
-              (let ((saved-indent (current-indentation)))
-                (while (and (js-re-search-backward "^[ \t]*\\<" nil t)
-                            (/= (current-indentation) saved-indent)))
-                (and (looking-at "[ \t]*\\<do\\>")
-                     (not (js-re-search-forward
-                           "\\<while\\>" (point-at-eol) t))
-                     (= (current-indentation) saved-indent)))))))))
-
-
-(defun js-ctrl-statement-indentation ()
-  "Returns the proper indentation of the current line if it
-starts the body of a control statement without braces, else
-returns nil."
-  (save-excursion
-    (back-to-indentation)
-    (when (save-excursion
-            (and (not (looking-at "[{]"))
-                 (progn
-                   (js-re-search-backward "[[:graph:]]" nil t)
-                   (forward-char)
-                   (when (= (char-before) ?\)) (backward-list))
-                   (skip-syntax-backward " ")
-                   (skip-syntax-backward "w")
-                   (looking-at js-possibly-braceless-keyword-re))
-                 (not (js-end-of-do-while-loop-p))))
-      (save-excursion
-        (goto-char (match-beginning 0))
-        (+ (current-indentation) javascript-indent-level)))))
-
-
-(defun js-proper-indentation (parse-status)
-  "Return the proper indentation for the current line."
-  (save-excursion
-    (back-to-indentation)
-    (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
-          (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
-          (continued-expr-p (js-continued-expression-p)))
-      (cond (ctrl-stmt-indent)
-            ((js-continued-var-decl-list-p)
-             (js-re-search-backward "\\<var\\>" nil t)
-             (+ (current-indentation) javascript-indent-level))
-            ((nth 1 parse-status)
-             (goto-char (nth 1 parse-status))
-             (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
-                 (progn
-                   (skip-syntax-backward " ")
-                   (when (= (char-before) ?\)) (backward-list))
-                   (back-to-indentation)
-                   (cond (same-indent-p
-                          (current-column))
-                         (continued-expr-p
-                          (+ (current-column) (* 2 javascript-indent-level)))
-                         (t
-                          (+ (current-column) javascript-indent-level))))
-               (unless same-indent-p
-                 (forward-char)
-                 (skip-chars-forward " \t"))
-               (current-column)))
-            (continued-expr-p javascript-indent-level)
-            ;;(t 0)
-            ;; Try the line above. If nothing useful fall back to 0.
-            (t
-             (let ((ind 0))
-               (while (and (= ind 0)
-                           (/= (point-min) (line-beginning-position)))
-                 (forward-line -1)
-                 (back-to-indentation)
-                 (setq ind (current-column)))
-               ind)
-             )))))
-
-
-(defun javascript-indent-line ()
-  "Indent the current line as JavaScript source text."
-  (interactive)
-  (let ((parse-status
-         (save-excursion (parse-partial-sexp (point-min) (point-at-bol))))
-        (offset (- (current-column) (current-indentation))))
-    (when (not (nth 8 parse-status))
-      (indent-line-to (js-proper-indentation parse-status))
-      (when (> offset 0) (forward-char offset)))))
-
-
-;; --- Filling ---
-
-;; FIXME: It should be possible to use the more sofisticated function
-;; `c-fill-paragraph' in `cc-cmds.el' instead. However, just setting
-;; `fill-paragraph-function' to `c-fill-paragraph' does not work;
-;; inside `c-fill-paragraph', `fill-paragraph-function' evaluates to
-;; nil!?
-
-(defun js-backward-paragraph ()
-  "Move backward to start of paragraph. Postcondition: Point is at
-beginning of buffer or the previous line contains only whitespace."
-  (forward-line -1)
-  (while (not (or (bobp) (looking-at "^[ \t]*$")))
-    (forward-line -1))
-  (when (not (bobp)) (forward-line 1)))
-
-
-(defun js-forward-paragraph ()
-  "Move forward to end of paragraph. Postcondition: Point is at
-end of buffer or the next line contains only whitespace."
-  (forward-line 1)
-  (while (not (or (eobp) (looking-at "^[ \t]*$")))
-    (forward-line 1))
-  (when (not (eobp)) (backward-char 1)))
-
-
-(defun js-fill-block-comment-paragraph (parse-status justify)
-  "Fill current paragraph as a block comment. PARSE-STATUS is the
-result of `parse-partial-regexp' from beginning of buffer to
-point. JUSTIFY has the same meaning as in `fill-paragraph'."
-  (let ((offset (save-excursion
-                  (goto-char (nth 8 parse-status)) (current-indentation))))
-    (save-excursion
-      (save-restriction
-        (narrow-to-region (save-excursion
-                            (goto-char (nth 8 parse-status)) (point-at-bol))
-                          (save-excursion
-                            (goto-char (nth 8 parse-status))
-                            (re-search-forward "*/")))
-        (narrow-to-region (save-excursion
-                            (js-backward-paragraph)
-                            (when (looking-at "^[ \t]*$") (forward-line 1))
-                            (point))
-                          (save-excursion
-                            (js-forward-paragraph)
-                            (when (looking-at "^[ \t]*$") (backward-char))
-                            (point)))
-        (goto-char (point-min))
-        (while (not (eobp))
-          (delete-horizontal-space)
-          (forward-line 1))
-        (let ((fill-column (- fill-column offset))
-              (fill-paragraph-function nil))
-          (fill-paragraph justify))
-
-        ;; In Emacs 21.4 as opposed to CVS Emacs 22,
-        ;; `fill-paragraph' seems toadd a newline at the end of the
-        ;; paragraph. Remove it!
-        (goto-char (point-max))
-        (when (looking-at "^$") (backward-delete-char 1))
-
-        (goto-char (point-min))
-        (while (not (eobp))
-          (indent-to offset)
-          (forward-line 1))))))
-
-
-(defun js-sline-comment-par-start ()
-  "Return point at the beginning of the line where the current
-single-line comment paragraph starts."
-  (save-excursion
-    (beginning-of-line)
-    (while (and (not (bobp))
-                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
-      (forward-line -1))
-    (unless (bobp) (forward-line 1))
-    (point)))
-
-
-(defun js-sline-comment-par-end ()
-  "Return point at end of current single-line comment paragraph."
-  (save-excursion
-    (beginning-of-line)
-    (while (and (not (eobp))
-                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
-      (forward-line 1))
-    (unless (bobp) (backward-char))
-    (point)))
-
-
-(defun js-sline-comment-offset (line)
-  "Return the column at the start of the current single-line
-comment paragraph."
-  (save-excursion
-    (goto-line line)
-    (re-search-forward "//" (point-at-eol))
-    (goto-char (match-beginning 0))
-    (current-column)))
-
-
-(defun js-sline-comment-text-offset (line)
-  "Return the column at the start of the text of the current
-single-line comment paragraph."
-  (save-excursion
-    (goto-line line)
-    (re-search-forward "//[ \t]*" (point-at-eol))
-    (current-column)))
-
-
-(defun js-at-empty-sline-comment-p ()
-  "Return non-nil if inside an empty single-line comment."
-  (and (save-excursion
-         (beginning-of-line)
-         (not (looking-at "^.*//.*[[:graph:]]")))
-       (save-excursion
-         (re-search-backward "//" (point-at-bol) t))))
-
-
-(defun js-fill-sline-comments (parse-status justify)
-  "Fill current paragraph as a sequence of single-line comments.
-PARSE-STATUS is the result of `parse-partial-regexp' from
-beginning of buffer to point. JUSTIFY has the same meaning as in
-`fill-paragraph'."
-  (when (not (js-at-empty-sline-comment-p))
-    (let* ((start (js-sline-comment-par-start))
-           (start-line (1+ (count-lines (point-min) start)))
-           (end (js-sline-comment-par-end))
-           (offset (js-sline-comment-offset start-line))
-           (text-offset (js-sline-comment-text-offset start-line)))
-      (save-excursion
-        (save-restriction
-          (narrow-to-region start end)
-          (goto-char (point-min))
-          (while (re-search-forward "^[ \t]*//[ \t]*" nil t)
-            (replace-match "")
-            (forward-line 1))
-          (let ((fill-paragraph-function nil)
-                (fill-column (- fill-column text-offset)))
-            (fill-paragraph justify))
-
-          ;; In Emacs 21.4 as opposed to CVS Emacs 22,
-          ;; `fill-paragraph' seems toadd a newline at the end of the
-          ;; paragraph. Remove it!
-          (goto-char (point-max))
-          (when (looking-at "^$") (backward-delete-char 1))
-
-          (goto-char (point-min))
-          (while (not (eobp))
-            (indent-to offset)
-            (insert "//")
-            (indent-to text-offset)
-            (forward-line 1)))))))
-
-
-(defun js-trailing-comment-p (parse-status)
-  "Return non-nil if inside a trailing comment. PARSE-STATUS is
-the result of `parse-partial-regexp' from beginning of buffer to
-point."
-  (save-excursion
-    (when (nth 4 parse-status)
-      (goto-char (nth 8 parse-status))
-      (skip-chars-backward " \t")
-      (not (bolp)))))
-
-
-(defun js-block-comment-p (parse-status)
-  "Return non-nil if inside a block comment. PARSE-STATUS is the
-result of `parse-partial-regexp' from beginning of buffer to
-point."
-  (save-excursion
-    (save-match-data
-      (when (nth 4 parse-status)
-        (goto-char (nth 8 parse-status))
-        (looking-at "/\\*")))))
-
-
-(defun javascript-fill-paragraph (&optional justify)
-  "If inside a comment, fill the current comment paragraph.
-Trailing comments are ignored."
-  (interactive)
-  (let ((parse-status (parse-partial-sexp (point-min) (point))))
-    (when (and (nth 4 parse-status)
-               (not (js-trailing-comment-p parse-status)))
-      (if (js-block-comment-p parse-status)
-          (js-fill-block-comment-paragraph parse-status justify)
-        (js-fill-sline-comments parse-status justify))))
-  t)
-
-
-;; --- Imenu ---
-
-(defconst js-imenu-generic-expression
-  (list
-   (list
-    nil
-    "function\\s-+\\(\\w+\\)\\s-*("
-    1))
-  "Regular expression matching top level procedures. Used by imenu.")
-
-
-;; --- Main Function ---
-
-;;;###autoload
-(defun javascript-mode ()
-  "Major mode for editing JavaScript source text.
-
-Key bindings:
-
-\\{javascript-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-
-  (use-local-map javascript-mode-map)
-  (set-syntax-table javascript-mode-syntax-table)
-  (set (make-local-variable 'indent-line-function) 'javascript-indent-line)
-  (set (make-local-variable 'font-lock-defaults) (list js-font-lock-keywords))
-
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-
-  ;; Comments
-  (set (make-local-variable 'comment-start) "// ")
-  (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'fill-paragraph-function)
-       'javascript-fill-paragraph)
-
-  ;; Imenu
-  (setq imenu-case-fold-search nil)
-  (set (make-local-variable 'imenu-generic-expression)
-       js-imenu-generic-expression)
-
-  (setq major-mode 'javascript-mode)
-  (setq mode-name "JavaScript")
-  (run-hooks 'javascript-mode-hook))
-
-
-(provide 'javascript-mode)
-;;; javascript.el ends here
+;;; javascript.el --- Major mode for editing JavaScript source text
+
+;; Copyright (C) 2008 Free Software Foundation, Inc.
+
+;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
+;; Maintainer: Karl Landstrom <karl.landstrom@brgeight.se>
+;; Version: 2.2.1 for nXhtml
+;; Date: 2008-12-27
+;; Keywords: languages, oop
+
+;; This file 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.
+
+;; This file 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:
+;;
+;; The main features of this JavaScript mode are syntactic
+;; highlighting (enabled with `font-lock-mode' or
+;; `global-font-lock-mode'), automatic indentation and filling of
+;; comments.
+;;
+;; This package has (only) been tested with GNU Emacs 21.4 (the latest
+;; stable release).
+;;
+;; Installation:
+;;
+;; Put this file in a directory where Emacs can find it (`C-h v
+;; load-path' for more info). Then add the following lines to your
+;; Emacs initialization file:
+;;
+;;    (add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
+;;    (autoload 'javascript-mode "javascript" nil t)
+;;
+;; General Remarks:
+;;
+;; This mode assumes that block comments are not nested inside block
+;; comments and that strings do not contain line breaks.
+;;
+;; Exported names start with "javascript-" whereas private names start
+;; with "js-".
+;;
+;; Changes:
+;;
+;; See javascript.el.changelog.
+;;
+;; 2008-03-29
+;; - js-proper-indentation: use lines above as fallback, mostly for
+;;   mumamo. (Lennart Borgman)
+
+;;; Code:
+
+(require 'cc-mode)
+(require 'font-lock)
+(require 'newcomment)
+
+(defgroup javascript nil
+  "Customization variables for `javascript-mode'."
+  :tag "JavaScript"
+  :group 'languages)
+
+(defcustom javascript-indent-level 4
+  "Number of spaces for each indentation step."
+  :type 'integer
+  :group 'javascript)
+(make-variable-buffer-local 'javascript-indent-level)
+
+(defcustom javascript-expr-indent-offset 0
+  "Number of additional spaces used for indentation of continued
+expressions. The value must be no less than minus
+`javascript-indent-level'."
+  :type 'integer
+  :group 'javascript)
+
+
+;; --- Keymap ---
+
+(defvar javascript-mode-map (make-sparse-keymap)
+  "Keymap used in JavaScript mode.")
+
+(defcustom javascript-auto-indent-flag t
+  "Automatic indentation with punctuation characters. If non-nil, the
+current line is indented when certain punctuations are inserted."
+  :type 'boolean
+  :set (lambda (sym val)
+         (set-default sym val)
+         (if val
+             (progn
+               (mapc (lambda (key)
+                       (define-key javascript-mode-map key 'javascript-insert-and-indent))
+                     '("{" "}" "(" ")" ":" ";" ",")))
+           (mapc (lambda (key)
+                   (define-key javascript-mode-map key nil)
+                 '("{" "}" "(" ")" ":" ";" ",")))))
+  :group 'javascript)
+
+
+;; (when javascript-auto-indent-flag
+;;   (mapc (lambda (key)
+;; 	  (define-key javascript-mode-map key 'javascript-insert-and-indent))
+;; 	'("{" "}" "(" ")" ":" ";" ",")))
+
+(defun javascript-insert-and-indent (key)
+  "Run command bound to key and indent current line. Runs the command
+bound to KEY in the global keymap and indents the current line."
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (indent-according-to-mode))
+
+
+;; --- Syntax Table And Parsing ---
+
+(defvar javascript-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (c-populate-syntax-table table)
+    (modify-syntax-entry ?$ "_" table)
+    table)
+  "Syntax table used in JavaScript mode.")
+
+(defvar js-ident-as-word-syntax-table
+  (let ((table (copy-syntax-table javascript-mode-syntax-table)))
+    (modify-syntax-entry ?$ "w" table)
+    (modify-syntax-entry ?_ "w" table)
+    table)
+  "Alternative syntax table used internally to simplify detection
+  of identifiers and keywords and its boundaries.")
+
+
+(defun js-re-search-forward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-forward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-forward regexp bound)
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-forward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
+              (save-excursion (end-of-line) (point)) t))
+            ((nth 7 parse)
+             (forward-line))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
+             (re-search-forward "\\*/"))
+            (t
+             (setq count (1- count))))
+      (setq saved-point (point))))
+  (point))
+
+
+(defun js-re-search-forward (regexp &optional bound noerror count)
+  "Search forward but ignore strings and comments. Invokes
+`re-search-forward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(js-re-search-forward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-backward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-forward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun js-re-search-backward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-backward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-backward regexp bound)
+      (when (and (> (point) (point-min))
+                 (save-excursion (backward-char) (looking-at "/[/*]")))
+        (backward-char))
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-backward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
+              (save-excursion (beginning-of-line) (point)) t))
+            ((nth 7 parse)
+             (goto-char (nth 8 parse)))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
+             (re-search-backward "/\\*"))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+
+(defun js-re-search-backward (regexp &optional bound noerror count)
+  "Search backward but ignore strings and comments. Invokes
+`re-search-backward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr
+         (cond ((null count)
+                '(js-re-search-backward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-forward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-backward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun js-continued-var-decl-list-p ()
+  "Return non-nil if point is inside a continued variable declaration
+list."
+  (interactive)
+  (let ((start (save-excursion (js-re-search-backward "\\<var\\>" nil t))))
+    (and start
+         (save-excursion (re-search-backward "\n" start t))
+         (not (save-excursion
+                (js-re-search-backward
+                 ";\\|[^, \t][ \t]*\\(/[/*]\\|$\\)" start t))))))
+
+
+;; --- Font Lock ---
+
+(defun js-inside-param-list-p ()
+  "Return non-nil if point is inside a function parameter list."
+  (condition-case err
+      (save-excursion
+	(up-list -1)
+	(and (looking-at "(")
+	     (progn (backward-word 1)
+		    (or (looking-at "function")
+			(progn (backward-word 1) (looking-at "function"))))))
+    (error nil)))
+
+
+(defconst js-function-heading-1-re
+  "^[ \t]*function[ \t]+\\(\\w+\\)"
+  "Regular expression matching the start of a function header.")
+
+(defconst js-function-heading-2-re
+  "^[ \t]*\\(\\w+\\)[ \t]*:[ \t]*function\\>"
+  "Regular expression matching the start of a function entry in
+  an associative array.")
+
+(defconst js-keyword-re
+  (regexp-opt '("abstract" "break" "case" "catch" "class" "const"
+                "continue" "debugger" "default" "delete" "do" "else"
+                "enum" "export" "extends" "final" "finally" "for"
+                "function" "goto" "if" "implements" "import" "in"
+                "instanceof" "interface" "native" "new" "package"
+                "private" "protected" "public" "return" "static"
+                "super" "switch" "synchronized" "this" "throw"
+                "throws" "transient" "try" "typeof" "var" "void"
+                "volatile" "while" "with") 'words)
+  "Regular expression matching any JavaScript keyword.")
+
+(defconst js-basic-type-re
+  (regexp-opt '("boolean" "byte" "char" "double" "float" "int" "long"
+                "short" "void") 'words)
+  "Regular expression matching any predefined type in JavaScript.")
+
+(defconst js-constant-re
+  (regexp-opt '("false" "null" "true") 'words)
+  "Regular expression matching any future reserved words in JavaScript.")
+
+
+(defconst js-font-lock-keywords-1
+  (list
+   "\\<import\\>"
+   (list js-function-heading-1-re 1 font-lock-function-name-face)
+   (list js-function-heading-2-re 1 font-lock-function-name-face))
+  "Level one font lock.")
+
+(defconst js-font-lock-keywords-2
+  (append js-font-lock-keywords-1
+          (list (list js-keyword-re 1 font-lock-keyword-face)
+                (cons js-basic-type-re font-lock-type-face)
+                (cons js-constant-re font-lock-constant-face)))
+  "Level two font lock.")
+
+
+;; Limitations with variable declarations: There seems to be no
+;; sensible way to highlight variables occuring after an initialized
+;; variable in a variable list. For instance, in
+;;
+;;    var x, y = f(a, b), z
+;;
+;; z will not be highlighted. Also, in variable declaration lists
+;; spanning several lines only variables on the first line will be
+;; highlighted. To get correct fontification, every line with variable
+;; declarations must contain a `var' keyword.
+
+(defconst js-font-lock-keywords-3
+  (append
+   js-font-lock-keywords-2
+   (list
+
+    ;; variable declarations
+    (list
+     (concat "\\<\\(const\\|var\\)\\>\\|" js-basic-type-re)
+     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|\\<in\\>.*\\|,\\|/[/*]\\|$\\)"
+	   nil
+	   nil
+	   '(1 font-lock-variable-name-face)))
+
+    ;; continued variable declaration list
+    (list
+     (concat "^[ \t]*\\w+[ \t]*\\([,;=]\\|/[/*]\\|$\\)")
+     (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
+           '(if (save-excursion (backward-char) (js-continued-var-decl-list-p))
+                (backward-word 1)
+              (end-of-line))
+           '(end-of-line)
+           '(1 font-lock-variable-name-face)))
+
+    ;; formal parameters
+    (list
+     "\\<function\\>\\([ \t]+\\w+\\)?[ \t]*([ \t]*\\w"
+     (list "\\(\\w+\\)\\([ \t]*).*\\)?"
+	   '(backward-char)
+	   '(end-of-line)
+	   '(1 font-lock-variable-name-face)))
+
+    ;; continued formal parameter list
+    (list
+     "^[ \t]*\\w+[ \t]*[,)]"
+     (list "\\w+"
+	   '(if (save-excursion (backward-char) (js-inside-param-list-p))
+		(backward-word 1)
+	      (end-of-line))
+	   '(end-of-line)
+	   '(0 font-lock-variable-name-face)))))
+  "Level three font lock.")
+
+(defconst js-font-lock-keywords
+  '(js-font-lock-keywords-3 js-font-lock-keywords-1 js-font-lock-keywords-2
+                            js-font-lock-keywords-3)
+  "See `font-lock-keywords'.")
+
+(defconst js-font-lock-syntactic-keywords
+  '(("[=(][ \t\n]*\\(/\\)[^/*]\\(.*?[^\\]\\)?\\(/\\)" (1 '(7)) (3 '(7))))
+  "Highlighting of regular expressions. See also the variable
+  `font-lock-keywords'.")
+
+
+;; --- Indentation ---
+
+(defconst js-possibly-braceless-keyword-re
+  (regexp-opt
+   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with")
+   'words)
+  "Regular expression matching keywords that are optionally
+  followed by an opening brace.")
+
+(defconst js-indent-operator-re
+  (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
+          (regexp-opt '("in" "instanceof") 'words))
+  "Regular expression matching operators that affect indentation
+  of continued expressions.")
+
+
+(defun js-looking-at-operator-p ()
+  "Return non-nil if text after point is an operator (that is not
+a comma)."
+  (save-match-data
+    (and (looking-at js-indent-operator-re)
+         (or (not (looking-at ":"))
+             (save-excursion
+               (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
+                    (looking-at "?")))))))
+
+
+(defun js-continued-expression-p ()
+  "Returns non-nil if the current line continues an expression."
+  (save-excursion
+    (back-to-indentation)
+    (or (js-looking-at-operator-p)
+        (and (js-re-search-backward "\n" nil t)
+	     (progn
+	       (skip-chars-backward " \t")
+               (unless (bobp)
+                 (backward-char)
+                 (and (> (point) (point-min))
+                      (save-excursion (backward-char) (not (looking-at "[/*]/")))
+                      (js-looking-at-operator-p)
+                      (and (progn (backward-char)
+                                  (not (looking-at "++\\|--\\|/[/*]")))))))))))
+
+
+(defun js-end-of-do-while-loop-p ()
+  "Returns non-nil if word after point is `while' of a do-while
+statement, else returns nil. A braceless do-while statement
+spanning several lines requires that the start of the loop is
+indented to the same column as the current line."
+  (interactive)
+  (save-excursion
+    (save-match-data
+      (when (looking-at "\\s-*\\<while\\>")
+	(if (save-excursion
+	      (skip-chars-backward "[ \t\n]*}")
+	      (looking-at "[ \t\n]*}"))
+	    (save-excursion
+	      (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
+	  (js-re-search-backward "\\<do\\>" (point-at-bol) t)
+	  (or (looking-at "\\<do\\>")
+	      (let ((saved-indent (current-indentation)))
+		(while (and (js-re-search-backward "^[ \t]*\\<" nil t)
+			    (/= (current-indentation) saved-indent)))
+		(and (looking-at "[ \t]*\\<do\\>")
+		     (not (js-re-search-forward
+			   "\\<while\\>" (point-at-eol) t))
+		     (= (current-indentation) saved-indent)))))))))
+
+
+(defun js-ctrl-statement-indentation ()
+  "Returns the proper indentation of the current line if it
+starts the body of a control statement without braces, else
+returns nil."
+  (save-excursion
+    (back-to-indentation)
+    (when (save-excursion
+            (and (not (looking-at "[{]"))
+                 (progn
+                   (js-re-search-backward "[[:graph:]]" nil t)
+                   (forward-char)
+                   (when (= (char-before) ?\)) (backward-list))
+                   (skip-syntax-backward " ")
+                   (skip-syntax-backward "w")
+                   (looking-at js-possibly-braceless-keyword-re))
+                 (not (js-end-of-do-while-loop-p))))
+      (save-excursion
+        (goto-char (match-beginning 0))
+        (+ (current-indentation) javascript-indent-level)))))
+
+
+(defun js-proper-indentation (parse-status)
+  "Return the proper indentation for the current line."
+  (save-excursion
+    (back-to-indentation)
+    (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
+          (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
+          (continued-expr-p (js-continued-expression-p)))
+      (cond (ctrl-stmt-indent)
+            ((js-continued-var-decl-list-p)
+             (js-re-search-backward "\\<var\\>" nil t)
+             (+ (current-indentation) javascript-indent-level))
+            ((nth 1 parse-status)
+             (goto-char (nth 1 parse-status))
+             (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
+                 (progn
+                   (skip-syntax-backward " ")
+                   (when (= (char-before) ?\)) (backward-list))
+                   (back-to-indentation)
+                   (cond (same-indent-p
+                          (current-column))
+                         (continued-expr-p
+                          (+ (current-column) (* 2 javascript-indent-level)
+                             javascript-expr-indent-offset))
+                         (t
+                          (+ (current-column) javascript-indent-level))))
+               (unless same-indent-p
+                 (forward-char)
+                 (skip-chars-forward " \t"))
+               (current-column)))
+	    (continued-expr-p (+ javascript-indent-level
+                                 javascript-expr-indent-offset))
+            (t
+            ;; Try the line above. If nothing useful fall back to 0.
+             (let ((ind 0))
+               (while (and (= ind 0)
+                           (/= (point-min) (line-beginning-position)))
+                 (forward-line -1)
+                 (back-to-indentation)
+                 (setq ind (current-column)))
+               ind))))))
+
+
+(defun javascript-indent-line ()
+  "Indent the current line as JavaScript source text."
+  (interactive)
+  (with-syntax-table js-ident-as-word-syntax-table
+    (let ((parse-status
+	   (save-excursion (parse-partial-sexp (point-min) (point-at-bol))))
+	  (offset (- (current-column) (current-indentation))))
+      (when (not (nth 8 parse-status))
+	(indent-line-to (js-proper-indentation parse-status))
+	(when (> offset 0) (forward-char offset))))))
+
+
+;; --- Filling ---
+
+;; FIXME: It should be possible to use the more sofisticated function
+;; `c-fill-paragraph' in `cc-cmds.el' instead. However, just setting
+;; `fill-paragraph-function' to `c-fill-paragraph' does not work;
+;; inside `c-fill-paragraph', `fill-paragraph-function' evaluates to
+;; nil!?
+
+(defun js-backward-paragraph ()
+  "Move backward to start of paragraph. Postcondition: Point is at
+beginning of buffer or the previous line contains only whitespace."
+  (forward-line -1)
+  (while (not (or (bobp) (looking-at "^[ \t]*$")))
+    (forward-line -1))
+  (when (not (bobp)) (forward-line 1)))
+
+
+(defun js-forward-paragraph ()
+  "Move forward to end of paragraph. Postcondition: Point is at
+end of buffer or the next line contains only whitespace."
+  (forward-line 1)
+  (while (not (or (eobp) (looking-at "^[ \t]*$")))
+    (forward-line 1))
+  (when (not (eobp)) (backward-char 1)))
+
+
+(defun js-fill-block-comment-paragraph (parse-status justify)
+  "Fill current paragraph as a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point. JUSTIFY has the same meaning as in `fill-paragraph'."
+  (let ((offset (save-excursion
+                  (goto-char (nth 8 parse-status)) (current-indentation))))
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (save-excursion
+                            (goto-char (nth 8 parse-status)) (point-at-bol))
+                          (save-excursion
+			    (goto-char (nth 8 parse-status))
+			    (re-search-forward "*/")))
+        (narrow-to-region (save-excursion
+                            (js-backward-paragraph)
+                            (when (looking-at "^[ \t]*$") (forward-line 1))
+                            (point))
+                          (save-excursion
+                            (js-forward-paragraph)
+                            (when (looking-at "^[ \t]*$") (backward-char))
+                            (point)))
+        (goto-char (point-min))
+        (while (not (eobp))
+          (delete-horizontal-space)
+          (forward-line 1))
+        (let ((fill-column (- fill-column offset))
+              (fill-paragraph-function nil))
+          (fill-paragraph justify))
+
+        ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+        ;; `fill-paragraph' seems toadd a newline at the end of the
+        ;; paragraph. Remove it!
+        (goto-char (point-max))
+        (when (looking-at "^$") (backward-delete-char 1))
+
+        (goto-char (point-min))
+        (while (not (eobp))
+          (indent-to offset)
+          (forward-line 1))))))
+
+
+(defun js-sline-comment-par-start ()
+  "Return point at the beginning of the line where the current
+single-line comment paragraph starts."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (bobp))
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line -1))
+    (unless (bobp) (forward-line 1))
+    (point)))
+
+
+(defun js-sline-comment-par-end ()
+  "Return point at end of current single-line comment paragraph."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (eobp))
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line 1))
+    (unless (bobp) (backward-char))
+    (point)))
+
+
+(defun js-sline-comment-offset (line)
+  "Return the column at the start of the current single-line
+comment paragraph."
+  (save-excursion
+    (goto-line line)
+    (re-search-forward "//" (point-at-eol))
+    (goto-char (match-beginning 0))
+    (current-column)))
+
+
+(defun js-sline-comment-text-offset (line)
+  "Return the column at the start of the text of the current
+single-line comment paragraph."
+  (save-excursion
+    (goto-line line)
+    (re-search-forward "//[ \t]*" (point-at-eol))
+    (current-column)))
+
+
+(defun js-at-empty-sline-comment-p ()
+  "Return non-nil if inside an empty single-line comment."
+  (and (save-excursion
+         (beginning-of-line)
+         (not (looking-at "^.*//.*[[:graph:]]")))
+       (save-excursion
+         (re-search-backward "//" (point-at-bol) t))))
+
+
+(defun js-fill-sline-comments (parse-status justify)
+  "Fill current paragraph as a sequence of single-line comments.
+PARSE-STATUS is the result of `parse-partial-regexp' from
+beginning of buffer to point. JUSTIFY has the same meaning as in
+`fill-paragraph'."
+  (when (not (js-at-empty-sline-comment-p))
+    (let* ((start (js-sline-comment-par-start))
+           (start-line (1+ (count-lines (point-min) start)))
+           (end (js-sline-comment-par-end))
+           (offset (js-sline-comment-offset start-line))
+           (text-offset (js-sline-comment-text-offset start-line)))
+      (save-excursion
+        (save-restriction
+          (narrow-to-region start end)
+          (goto-char (point-min))
+          (while (re-search-forward "^[ \t]*//[ \t]*" nil t)
+            (replace-match "")
+            (forward-line 1))
+          (let ((fill-paragraph-function nil)
+                (fill-column (- fill-column text-offset)))
+            (fill-paragraph justify))
+
+          ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+          ;; `fill-paragraph' seems to add a newline at the end of the
+          ;; paragraph. Remove it!
+          (goto-char (point-max))
+          (when (looking-at "^$") (backward-delete-char 1))
+
+          (goto-char (point-min))
+          (while (not (eobp))
+            (indent-to offset)
+            (insert "//")
+            (indent-to text-offset)
+            (forward-line 1)))))))
+
+
+(defun js-trailing-comment-p (parse-status)
+  "Return non-nil if inside a trailing comment. PARSE-STATUS is
+the result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion
+    (when (nth 4 parse-status)
+      (goto-char (nth 8 parse-status))
+      (skip-chars-backward " \t")
+      (not (bolp)))))
+
+
+(defun js-block-comment-p (parse-status)
+  "Return non-nil if inside a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion
+    (save-match-data
+      (when (nth 4 parse-status)
+        (goto-char (nth 8 parse-status))
+        (looking-at "/\\*")))))
+
+
+(defun javascript-fill-paragraph (&optional justify)
+  "If inside a comment, fill the current comment paragraph.
+Trailing comments are ignored."
+  (interactive)
+  (let ((parse-status (parse-partial-sexp (point-min) (point))))
+    (when (and (nth 4 parse-status)
+               (not (js-trailing-comment-p parse-status)))
+      (if (js-block-comment-p parse-status)
+          (js-fill-block-comment-paragraph parse-status justify)
+        (js-fill-sline-comments parse-status justify))))
+  t)
+
+
+;; --- Imenu ---
+
+(defconst js-imenu-generic-expression
+  (list
+   (list
+    nil
+    "function\\s-+\\(\\(\\w\\|\\s_\\)+\\)\\s-*("
+    1))
+  "Regular expression matching top level procedures. Used by imenu.")
+
+
+;; --- Main Function ---
+
+;;;###autoload
+(defun javascript-mode ()
+  "Major mode for editing JavaScript source text.
+
+Key bindings:
+
+\\{javascript-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+
+  (use-local-map javascript-mode-map)
+  (set-syntax-table javascript-mode-syntax-table)
+  (set (make-local-variable 'indent-line-function) 'javascript-indent-line)
+
+  (set (make-local-variable 'font-lock-defaults)
+       (list js-font-lock-keywords
+	     nil nil '((?$ . "w") (?_ . "w")) nil
+	     '(font-lock-syntactic-keywords . js-font-lock-syntactic-keywords)))
+
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+
+  ;; Comments
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'fill-paragraph-function)
+       'javascript-fill-paragraph)
+
+  ;; Imenu
+  (setq imenu-case-fold-search nil)
+  (set (make-local-variable 'imenu-generic-expression)
+       js-imenu-generic-expression)
+
+  (setq major-mode 'javascript-mode)
+  (setq mode-name "JavaScript")
+  (run-hooks 'javascript-mode-hook))
+
+
+(provide 'javascript-mode)
+;;; javascript.el ends here
diff --git a/elpa-to-submit/nxhtml/related/js2.el b/elpa-to-submit/nxhtml/related/js2.el
deleted file mode 100644
index a624bcb8ef..0000000000
--- a/elpa-to-submit/nxhtml/related/js2.el
+++ /dev/null
@@ -1,11659 +0,0 @@
-;;; js2.el -- an improved JavaScript editing mode
-;;;
-;;; This file was auto-generated on Mon Jun 16 01:46:45 2008 from files:
-;;;  js2-vars.el
-;;;  js2-util.el
-;;;  js2-scan.el
-;;;  js2-messages.el
-;;;  js2-ast.el
-;;;  js2-highlight.el
-;;;  js2-browse.el
-;;;  js2-parse.el
-;;;  js2-indent.el
-;;;  js2-mode.el
-
-;;; js2-mode.el --- an improved JavaScript editing mode
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Version: 20080616
-;; Keywords:  javascript languages
-
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; This JavaScript editing mode supports:
-;;
-;;  - the full JavaScript language through version 1.7
-;;  - support for most Rhino and SpiderMonkey extensions from 1.5 to 1.7
-;;  - accurate syntax highlighting using a recursive-descent parser
-;;  - syntax-error and strict-mode warning reporting
-;;  - "bouncing" line indentation to choose among alternate indentation points
-;;  - smart line-wrapping within comments (Emacs 22+) and strings
-;;  - code folding:
-;;    - show some or all function bodies as {...}
-;;    - show some or all block comments as /*...*/
-;;  - context-sensitive menu bar and popup menus
-;;  - code browsing using the `imenu' package
-;;  - typing helpers (e.g. inserting matching braces/parens)
-;;  - many customization options
-;;
-;; It is only compatible with GNU Emacs versions 21 and higher (not XEmacs).
-;;
-;; Installation:
-;;
-;;  - put `js2.el' somewhere in your emacs load path
-;;  - M-x byte-compile-file RET <path-to-js2.el> RET
-;;    Note:  it will refuse to run unless byte-compiled
-;;  - add these lines to your .emacs file:
-;;    (autoload 'js2-mode "js2" nil t)
-;;    (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-;;
-;; To customize how it works:
-;;   M-x customize-group RET js2-mode RET
-;;
-;; The variable `js2-mode-version' is a date stamp.  When you upgrade
-;; to a newer version, you must byte-compile the file again.
-;;
-;; Notes:
-;;
-;; This mode is different in many ways from standard Emacs language editing
-;; modes, inasmuch as it attempts to be more like an IDE.  If this drives
-;; you crazy, it IS possible to customize it to be more like other Emacs
-;; editing modes.  Please customize the group `js2-mode' to see all of the
-;; configuration options.
-;;
-;; Some of the functionality does not work in Emacs 21 -- upgrading to
-;; Emacs 22 or higher will get you better results.  If you byte-compiled
-;; js2.el with Emacs 21, you should re-compile it for Emacs 22.
-;;
-;; Unlike cc-engine based language modes, js2-mode's line-indentation is not
-;; customizable.  It is a surprising amount of work to support customizable
-;; indentation.  The current compromise is that the tab key lets you cycle among
-;; various likely indentation points, similar to the behavior of python-mode.
-;;
-;; This mode does not yet work with "multi-mode" modes such as mmm-mode
-;; and mumamo, although it could possibly be made to do so with some effort.
-;; This means that js2-mode is currently only useful for editing JavaScript
-;; files, and not for editing JavaScript within <script> tags or templates.
-;;
-;; This code is part of a larger project, in progress, to enable writing
-;; Emacs customizations in JavaScript.
-;;
-;; Please email bug reports and suggestions to the author, or submit them
-;; at http://code.google.com/p/js2-mode/issues
-
-;; TODO:
-;;  - add unreachable-code warning (error?) using the inconsistent-return analysis
-;;  - labeled stmt length is now 1
-;;  - "anonymous function does not always return a value" - use getter/setter name
-;;  - extend js2-missing-semi-one-line-override to handle catch (e) {return x}
-;;  - set a text prop on autoinserted delimiters and don't biff user-entered ones
-;;  - when inserting magic curlies, look for matching close-curly before inserting
-;;  - get more use out of the symbol table:
-;;    - jump to declaration (put hyperlinks on all non-decl var usages?)
-;;    - rename variable/function
-;;    - warn on unused var
-;;  - add some dabbrev-expansions for built-in keywords like finally, function
-;;  - add at least some completion support, e.g. for built-ins
-;;  - code formatting
-
-;;; Code:
-;;; js2-vars.el -- byte-compiler support for js2-mode
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(eval-and-compile
-  (require 'cc-mode)     ; (only) for `c-populate-syntax-table'
-  (require 'cc-langs)    ; it's here in Emacs 21...
-  (require 'cc-engine))  ; for `c-paragraph-start' et. al.
-
-(defvar js2-emacs22 (>= emacs-major-version 22))
-
-(defcustom js2-highlight-level 2
-  "Amount of syntax highlighting to perform.
-nil, zero or negative means none.
-1 adds basic syntax highlighting.
-2 adds highlighting of some Ecma built-in properties.
-3 adds highlighting of many Ecma built-in functions."
-  :type 'integer
-  :group 'js2-mode)
-
-(defvar js2-mode-dev-mode-p nil
-  "Non-nil if running in development mode.  Normally nil.")
-
-(defgroup js2-mode nil
-  "An improved JavaScript mode."
-  :group 'languages)
-
-(defcustom js2-basic-offset (if (and (boundp 'c-basic-offset)
-                                     (numberp c-basic-offset))
-                                c-basic-offset
-                              2)
-  "Number of spaces to indent nested statements.
-Similar to `c-basic-offset'."
-  :group 'js2-mode
-  :type 'integer)
-(make-variable-buffer-local 'js2-basic-offset)
-
-(defcustom js2-cleanup-whitespace t
-  "Non-nil to invoke `delete-trailing-whitespace' before saves."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-move-point-on-right-click t
-  "Non-nil to move insertion point when you right-click.
-This makes right-click context menu behavior a bit more intuitive,
-since menu operations generally apply to the point.  The exception
-is if there is a region selection, in which case the point does -not-
-move, so cut/copy/paste etc. can work properly.
-
-Note that IntelliJ moves the point, and Eclipse leaves it alone,
-so this behavior is customizable."
-  :group 'js2-mode
-  :type 'boolean)
-
-(defcustom js2-mirror-mode t
-  "Non-nil to insert closing brackets, parens, etc. automatically."
-  :group 'js2-mode
-  :type 'boolean)
-
-(defcustom js2-auto-indent-flag t
-  "Automatic indentation with punctuation characters. If non-nil, the
-current line is indented when certain punctuations are inserted."
-  :group 'js2-mode
-  :type 'boolean)
-
-(defcustom js2-bounce-indent-flag t
-  "Non-nil to have indent-line function choose among alternatives.
-If nil, the indent-line function will indent to a predetermined column
-based on heuristic guessing.  If non-nil, then if the current line is
-already indented to that predetermined column, indenting will choose
-another likely column and indent to that spot.  Repeated invocation of
-the indent-line function will cycle among the computed alternatives.
-See the function `js2-bounce-indent' for details."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-indent-on-enter-key nil
-  "Non-nil to have Enter/Return key indent the line.
-This is unusual for Emacs modes but common in IDEs like Eclipse."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-enter-indents-newline t
-  "Non-nil to have Enter/Return key indent the newly-inserted line.
-This is unusual for Emacs modes but common in IDEs like Eclipse."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-rebind-eol-bol-keys t
-  "Non-nil to rebind beginning-of-line and end-of-line keys.
-If non-nil, bounce between bol/eol and first/last non-whitespace char."
-  :group 'js2-mode
-  :type 'boolean)
-
-(defcustom js2-electric-keys '("{" "}" "(" ")" "[" "]" ":" ";" "," "*")
-  "Keys that auto-indent when `js2-auto-indent-flag' is non-nil.
-Each value in the list is passed to `define-key'."
-  :type 'list
-  :group 'js2-mode)
-
-(defcustom js2-idle-timer-delay 0.2
-  "Delay in secs before re-parsing after user makes changes.
-Multiplied by `js2-dynamic-idle-timer-adjust', which see."
-  :type 'number
-  :group 'js2-mode)
-(make-variable-buffer-local 'js2-idle-timer-delay)
-
-(defcustom js2-dynamic-idle-timer-adjust 0
-  "Positive to adjust `js2-idle-timer-delay' based on file size.
-The idea is that for short files, parsing is faster so we can be
-more responsive to user edits without interfering with editing.
-The buffer length in characters (typically bytes) is divided by
-this value and used to multiply `js2-idle-timer-delay' for the
-buffer.  For example, a 21k file and 10k adjust yields 21k/10k
-== 2, so js2-idle-timer-delay is multiplied by 2.
-If `js2-dynamic-idle-timer-adjust' is 0 or negative,
-`js2-idle-timer-delay' is not dependent on the file size."
-  :type 'number
-  :group 'js2-mode)
-
-(defcustom js2-mode-escape-quotes t
-  "Non-nil to disable automatic quote-escaping inside strings."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-squeeze-spaces t
-  "Non-nil to normalize whitespace when filling in comments.
-Multiple runs of spaces are converted to a single space."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-show-parse-errors t
-  "True to highlight parse errors."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-show-strict-warnings t
-  "Non-nil to emit Ecma strict-mode warnings.
-Some of the warnings can be individually disabled by other flags,
-even if this flag is non-nil."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-trailing-comma-warning t
-  "Non-nil to warn about trailing commas in array literals.
-Ecma-262 forbids them, but many browsers permit them.  IE is the
-big exception, and can produce bugs if you have trailing commas."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-missing-semi-warning t
-  "Non-nil to warn about semicolon auto-insertion after statement.
-Technically this is legal per Ecma-262, but some style guides disallow
-depending on it."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-missing-semi-one-line-override nil
-  "Non-nil to permit missing semicolons in one-line functions.
-In one-liner functions such as `function identity(x) {return x}'
-people often omit the semicolon for a cleaner look.  If you are
-such a person, you can suppress the missing-semicolon warning
-by setting this variable to t."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-inconsistent-return-warning t
-  "Non-nil to warn about mixing returns with value-returns.
-It's perfectly legal to have a `return' and a `return foo' in the
-same function, but it's often an indicator of a bug, and it also
-interferes with type inference (in systems that support it.)"
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-cond-assign-warning t
-  "Non-nil to warn about expressions like if (a = b).
-This often should have been '==' instead of '='.  If the warning
-is enabled, you can suppress it on a per-expression basis by
-parenthesizing the expression, e.g. if ((a = b)) ..."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-cond-assign-warning t
-  "Non-nil to warn about expressions like if (a = b).
-This often should have been '==' instead of '='.  If the warning
-is enabled, you can suppress it on a per-expression basis by
-parenthesizing the expression, e.g. if ((a = b)) ..."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-var-redeclaration-warning t
-  "Non-nil to warn about redeclaring variables in a script or function."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-var-hides-function-arg-warning t
-  "Non-nil to warn about a var decl hiding a function argument."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-skip-preprocessor-directives nil
-  "Non-nil to treat lines beginning with # as comments.
-Useful for viewing Mozilla JavaScript source code."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-basic-offset c-basic-offset
-  "Functions like `c-basic-offset' in js2-mode buffers."
-  :type 'integer
-  :group 'js2-mode)
-(make-variable-buffer-local 'js2-basic-offset)
-
-(defcustom js2-language-version 170
-  "Configures what JavaScript language version to recognize.
-Currently only 150, 160 and 170 are supported, corresponding
-to JavaScript 1.5, 1.6 and 1.7, respectively.  In a nutshell,
-1.6 adds E4X support, and 1.7 adds let, yield, and Array
-comprehensions."
-  :type 'integer
-  :group 'js2-mode)
-
-(defcustom js2-allow-keywords-as-property-names t
-  "If non-nil, you can use JavaScript keywords as object property names.
-Examples:
-
-  var foo = {int: 5, while: 6, continue: 7};
-  foo.return = 8;
-
-Ecma-262 forbids this syntax, but many browsers support it."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-instanceof-has-side-effects nil
-  "If non-nil, treats the instanceof operator as having side effects.
-This is useful for xulrunner apps."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-allow-rhino-new-expr-initializer nil
-  "Non-nil to support a Rhino's experimental syntactic construct.
-
-Rhino supports the ability to follow a `new' expression with an object
-literal, which is used to set additional properties on the new object
-after calling its constructor.  Syntax:
-
-  new <expr> [ ( arglist ) ] [initializer]
-
-Hence, this expression:
-
-  new Object {a: 1, b: 2}
-
-results in an Object with properties a=1 and b=2.  This syntax is
-apparently not configurable in Rhino - it's currently always enabled,
-as of Rhino version 1.7R2."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-allow-member-expr-as-function-name nil
-  "Non-nil to support experimental Rhino syntax for function names.
-
-Rhino supports an experimental syntax configured via the Rhino Context
-setting `allowMemberExprAsFunctionName'.  The experimental syntax is:
-
-  function <member-expr> ( [ arg-list ] ) { <body> }
-
-Where member-expr is a non-parenthesized 'member expression', which
-is anything at the grammar level of a new-expression or lower, meaning
-any expression that does not involve infix or unary operators.
-
-When <member-expr> is not a simple identifier, then it is syntactic
-sugar for assigning the anonymous function to the <member-expr>.  Hence,
-this code:
-
-  function a.b().c[2] (x, y) { ... }
-
-is rewritten as:
-
-  a.b().c[2] = function(x, y) {...}
-
-which doesn't seem particularly useful, but Rhino permits it."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defvar js2-mode-version 20080616
-  "Release number for `js2-mode'.")
-
-;; scanner variables
-
-;; We record the start and end position of each token.
-(defvar js2-token-beg 1)
-(make-variable-buffer-local 'js2-token-beg)
-(defvar js2-token-end -1)
-(make-variable-buffer-local 'js2-token-end)
-
-(defvar js2-EOF_CHAR -1
-  "Represents end of stream.  Distinct from js2-EOF token type.")
-
-;; I originally used symbols to represent tokens, but Rhino uses
-;; ints and then sets various flag bits in them, so ints it is.
-;; The upshot is that we need a `js2-' prefix in front of each name.
-(defvar js2-ERROR -1)
-(defvar js2-EOF 0)
-(defvar js2-EOL 1)
-(defvar js2-ENTERWITH 2)       ; begin interpreter bytecodes
-(defvar js2-LEAVEWITH 3)
-(defvar js2-RETURN 4)
-(defvar js2-GOTO 5)
-(defvar js2-IFEQ 6)
-(defvar js2-IFNE 7)
-(defvar js2-SETNAME 8)
-(defvar js2-BITOR 9)
-(defvar js2-BITXOR 10)
-(defvar js2-BITAND 11)
-(defvar js2-EQ 12)
-(defvar js2-NE 13)
-(defvar js2-LT 14)
-(defvar js2-LE 15)
-(defvar js2-GT 16)
-(defvar js2-GE 17)
-(defvar js2-LSH 18)
-(defvar js2-RSH 19)
-(defvar js2-URSH 20)
-(defvar js2-ADD 21)            ; infix plus
-(defvar js2-SUB 22)            ; infix minus
-(defvar js2-MUL 23)
-(defvar js2-DIV 24)
-(defvar js2-MOD 25)
-(defvar js2-NOT 26)
-(defvar js2-BITNOT 27)
-(defvar js2-POS 28)            ; unary plus
-(defvar js2-NEG 29)            ; unary minus
-(defvar js2-NEW 30)
-(defvar js2-DELPROP 31)
-(defvar js2-TYPEOF 32)
-(defvar js2-GETPROP 33)
-(defvar js2-GETPROPNOWARN 34)
-(defvar js2-SETPROP 35)
-(defvar js2-GETELEM 36)
-(defvar js2-SETELEM 37)
-(defvar js2-CALL 38)
-(defvar js2-NAME 39)           ; an identifier
-(defvar js2-NUMBER 40)
-(defvar js2-STRING 41)
-(defvar js2-NULL 42)
-(defvar js2-THIS 43)
-(defvar js2-FALSE 44)
-(defvar js2-TRUE 45)
-(defvar js2-SHEQ 46)           ; shallow equality (===)
-(defvar js2-SHNE 47)           ; shallow inequality (!==)
-(defvar js2-REGEXP 48)
-(defvar js2-BINDNAME 49)
-(defvar js2-THROW 50)
-(defvar js2-RETHROW 51)        ; rethrow caught exception: catch (e if ) uses it
-(defvar js2-IN 52)
-(defvar js2-INSTANCEOF 53)
-(defvar js2-LOCAL_LOAD 54)
-(defvar js2-GETVAR 55)
-(defvar js2-SETVAR 56)
-(defvar js2-CATCH_SCOPE 57)
-(defvar js2-ENUM_INIT_KEYS 58)
-(defvar js2-ENUM_INIT_VALUES 59)
-(defvar js2-ENUM_INIT_ARRAY 60)
-(defvar js2-ENUM_NEXT 61)
-(defvar js2-ENUM_ID 62)
-(defvar js2-THISFN 63)
-(defvar js2-RETURN_RESULT 64)  ; to return previously stored return result
-(defvar js2-ARRAYLIT 65)       ; array literal
-(defvar js2-OBJECTLIT 66)      ; object literal
-(defvar js2-GET_REF 67)        ; *reference
-(defvar js2-SET_REF 68)        ; *reference = something
-(defvar js2-DEL_REF 69)        ; delete reference
-(defvar js2-REF_CALL 70)       ; f(args) = something or f(args)++
-(defvar js2-REF_SPECIAL 71)    ; reference for special properties like __proto
-(defvar js2-YIELD 72)          ; JS 1.7 yield pseudo keyword
-
-;; XML support
-(defvar js2-DEFAULTNAMESPACE 73)
-(defvar js2-ESCXMLATTR 74)
-(defvar js2-ESCXMLTEXT 75)
-(defvar js2-REF_MEMBER 76)     ; Reference for x.@y, x..y etc.
-(defvar js2-REF_NS_MEMBER 77)  ; Reference for x.ns::y, x..ns::y etc.
-(defvar js2-REF_NAME 78)       ; Reference for @y, @[y] etc.
-(defvar js2-REF_NS_NAME 79)    ; Reference for ns::y, @ns::y@[y] etc.
-
-(defvar js2-first-bytecode js2-ENTERWITH)
-(defvar js2-last-bytecode js2-REF_NS_NAME)
-
-(defvar js2-TRY 80)
-(defvar js2-SEMI 81)           ; semicolon
-(defvar js2-LB 82)             ; left and right brackets
-(defvar js2-RB 83)
-(defvar js2-LC 84)             ; left and right curly-braces
-(defvar js2-RC 85)
-(defvar js2-LP 86)             ; left and right parens
-(defvar js2-RP 87)
-(defvar js2-COMMA 88)          ; comma operator
-
-(defvar js2-ASSIGN 89)         ; simple assignment (=)
-(defvar js2-ASSIGN_BITOR 90)   ; |=
-(defvar js2-ASSIGN_BITXOR 91)  ; ^=
-(defvar js2-ASSIGN_BITAND 92)  ; &=
-(defvar js2-ASSIGN_LSH 93)     ; <<=
-(defvar js2-ASSIGN_RSH 94)     ; >>=
-(defvar js2-ASSIGN_URSH 95)    ; >>>=
-(defvar js2-ASSIGN_ADD 96)     ; +=
-(defvar js2-ASSIGN_SUB 97)     ; -=
-(defvar js2-ASSIGN_MUL 98)     ; *=
-(defvar js2-ASSIGN_DIV 99)     ; /=
-(defvar js2-ASSIGN_MOD 100)    ; %=
-
-(defvar js2-first-assign js2-ASSIGN)
-(defvar js2-last-assign js2-ASSIGN_MOD)
-
-(defvar js2-HOOK 101)          ; conditional (?:)
-(defvar js2-COLON 102)
-(defvar js2-OR 103)            ; logical or (||)
-(defvar js2-AND 104)           ; logical and (&&)
-(defvar js2-INC 105)           ; increment/decrement (++ --)
-(defvar js2-DEC 106)
-(defvar js2-DOT 107)           ; member operator (.)
-(defvar js2-FUNCTION 108)      ; function keyword
-(defvar js2-EXPORT 109)        ; export keyword
-(defvar js2-IMPORT 110)        ; import keyword
-(defvar js2-IF 111)            ; if keyword
-(defvar js2-ELSE 112)          ; else keyword
-(defvar js2-SWITCH 113)        ; switch keyword
-(defvar js2-CASE 114)          ; case keyword
-(defvar js2-DEFAULT 115)       ; default keyword
-(defvar js2-WHILE 116)         ; while keyword
-(defvar js2-DO 117)            ; do keyword
-(defvar js2-FOR 118)           ; for keyword
-(defvar js2-BREAK 119)         ; break keyword
-(defvar js2-CONTINUE 120)      ; continue keyword
-(defvar js2-VAR 121)           ; var keyword
-(defvar js2-WITH 122)          ; with keyword
-(defvar js2-CATCH 123)         ; catch keyword
-(defvar js2-FINALLY 124)       ; finally keyword
-(defvar js2-VOID 125)          ; void keyword
-(defvar js2-RESERVED 126)      ; reserved keywords
-
-(defvar js2-EMPTY 127)
-
-;; Types used for the parse tree - never returned by scanner.
-
-(defvar js2-BLOCK 128)         ; statement block
-(defvar js2-LABEL 129)         ; label
-(defvar js2-TARGET 130)
-(defvar js2-LOOP 131)
-(defvar js2-EXPR_VOID 132)     ; expression statement in functions
-(defvar js2-EXPR_RESULT 133)   ; expression statement in scripts
-(defvar js2-JSR 134)
-(defvar js2-SCRIPT 135)        ; top-level node for entire script
-(defvar js2-TYPEOFNAME 136)    ; for typeof(simple-name)
-(defvar js2-USE_STACK 137)
-(defvar js2-SETPROP_OP 138)    ; x.y op= something
-(defvar js2-SETELEM_OP 139)    ; x[y] op= something
-(defvar js2-LOCAL_BLOCK 140)
-(defvar js2-SET_REF_OP 141)    ; *reference op= something
-
-;; For XML support:
-(defvar js2-DOTDOT 142)        ; member operator (..)
-(defvar js2-COLONCOLON 143)    ; namespace::name
-(defvar js2-XML 144)           ; XML type
-(defvar js2-DOTQUERY 145)      ; .() -- e.g., x.emps.emp.(name == "terry")
-(defvar js2-XMLATTR 146)       ; @
-(defvar js2-XMLEND 147)
-
-;; Optimizer-only tokens
-(defvar js2-TO_OBJECT 148)
-(defvar js2-TO_DOUBLE 149)
-
-(defvar js2-GET 150)           ; JS 1.5 get pseudo keyword
-(defvar js2-SET 151)           ; JS 1.5 set pseudo keyword
-(defvar js2-LET 152)           ; JS 1.7 let pseudo keyword
-(defvar js2-CONST 153)
-(defvar js2-SETCONST 154)
-(defvar js2-SETCONSTVAR 155)
-(defvar js2-ARRAYCOMP 156)
-(defvar js2-LETEXPR 157)
-(defvar js2-WITHEXPR 158)
-(defvar js2-DEBUGGER 159)
-
-(defvar js2-COMMENT 160)  ; not yet in Rhino
-
-(defvar js2-num-tokens (1+ js2-COMMENT))
-
-(defconst js2-debug-print-trees nil)
-
-;; Rhino accepts any string or stream as input.
-;; Emacs character processing works best in buffers, so we'll
-;; assume the input is a buffer.  JavaScript strings can be
-;; copied into temp buffers before scanning them.
-
-(defmacro deflocal (name value comment)
-  `(progn
-     (defvar ,name ,value ,comment)
-     (make-variable-buffer-local ',name)))
-
-;; Buffer-local variables yield much cleaner code than using `defstruct'.
-;; They're the Emacs equivalent of instance variables, more or less.
-
-(deflocal js2-ts-dirty-line nil
-  "Token stream buffer-local variable.
-Indicates stuff other than whitespace since start of line.")
-
-(deflocal js2-ts-regexp-flags nil
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-string ""
-  "Token stream buffer-local variable.
-Last string scanned.")
-
-(deflocal js2-ts-number nil
-  "Token stream buffer-local variable.
-Last literal number scanned.")
-
-(deflocal js2-ts-hit-eof nil
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-line-start 0
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-lineno 1
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-line-end-char -1
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-cursor 1  ; emacs buffers are 1-indexed
-  "Token stream buffer-local variable.
-Current scan position.")
-
-(deflocal js2-ts-is-xml-attribute nil
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-xml-is-tag-content nil
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-xml-open-tags-count 0
-  "Token stream buffer-local variable.")
-
-(deflocal js2-ts-string-buffer nil
-  "Token stream buffer-local variable.
-List of chars built up while scanning various tokens.")
-
-(deflocal js2-ts-comment-type nil
-  "Token stream buffer-local variable.")
-
-;;; Parser variables
-
-(defvar js2-parsed-errors nil
-  "List of errors produced during scanning/parsing.")
-(make-variable-buffer-local 'js2-parsed-errors)
-
-(defvar js2-parsed-warnings nil
-  "List of warnings produced during scanning/parsing.")
-(make-variable-buffer-local 'js2-parsed-warnings)
-
-(defvar js2-recover-from-parse-errors t
-  "Non-nil to continue parsing after a syntax error.
-
-In recovery mode, the AST will be built in full, and any error
-nodes will be flagged with appropriate error information.  If
-this flag is nil, a syntax error will result in an error being
-signaled.
-
-The variable is automatically buffer-local, because different
-modes that use the parser will need different settings.")
-(make-variable-buffer-local 'js2-recover-from-parse-errors)
-
-(defvar js2-parse-hook nil
-  "List of callbacks for receiving parsing progress.")
-(make-variable-buffer-local 'js2-parse-hook)
-
-(defvar js2-parse-finished-hook nil
-  "List of callbacks to notify when parsing finishes.
-Not called if parsing was interrupted.")
-
-(defvar js2-is-eval-code nil
-  "True if we're evaluating code in a string.
-If non-nil, the tokenizer will record the token text, and the AST nodes
-will record their source text.  Off by default for IDE modes, since the
-text is available in the buffer.")
-(make-variable-buffer-local 'js2-is-eval-code)
-
-(defvar js2-parse-ide-mode t
-  "Non-nil if the parser is being used for `js2-mode'.
-If non-nil, the parser will set text properties for fontification
-and the syntax-table.  The value should be nil when using the
-parser as a frontend to an interpreter or byte compiler.")
-
-;;; Parser instance variables (buffer-local vars for js2-parse)
-
-(defconst js2-clear-ti-mask #xFFFF
-  "Mask to clear token information bits.")
-
-(defconst js2-ti-after-eol (lsh 1 16)
-  "Flag:  first token of the source line.")
-
-(defconst js2-ti-check-label (lsh 1 17)
-  "Flag:  indicates to check for label.")
-
-;; Inline Rhino's CompilerEnvirons vars as buffer-locals.
-
-(defvar js2-compiler-generate-debug-info t)
-(make-variable-buffer-local 'js2-compiler-generate-debug-info)
-
-(defvar js2-compiler-use-dynamic-scope nil)
-(make-variable-buffer-local 'js2-compiler-use-dynamic-scope)
-
-(defvar js2-compiler-reserved-keywords-as-identifier nil)
-(make-variable-buffer-local 'js2-compiler-reserved-keywords-as-identifier)
-
-(defvar js2-compiler-xml-available t)
-(make-variable-buffer-local 'js2-compiler-xml-available)
-
-(defvar js2-compiler-optimization-level 0)
-(make-variable-buffer-local 'js2-compiler-optimization-level)
-
-(defvar js2-compiler-generating-source t)
-(make-variable-buffer-local 'js2-compiler-generating-source)
-
-(defvar js2-compiler-strict-mode nil)
-(make-variable-buffer-local 'js2-compiler-strict-mode)
-
-(defvar js2-compiler-report-warning-as-error nil)
-(make-variable-buffer-local 'js2-compiler-report-warning-as-error)
-
-(defvar js2-compiler-generate-observer-count nil)
-(make-variable-buffer-local 'js2-compiler-generate-observer-count)
-
-(defvar js2-compiler-activation-names nil)
-(make-variable-buffer-local 'js2-compiler-activation-names)
-
-;; SKIP:  sourceURI
-
-;; There's a compileFunction method in Context.java - may need it.
-(defvar js2-called-by-compile-function nil
-  "True if `js2-parse' was called by `js2-compile-function'.
-Will only be used when we finish implementing the interpreter.")
-(make-variable-buffer-local 'js2-called-by-compile-function)
-
-;; SKIP:  ts  (we just call `js2-init-scanner' and use its vars)
-
-(defvar js2-current-flagged-token js2-EOF)
-(make-variable-buffer-local 'js2-current-flagged-token)
-
-(defvar js2-current-token js2-EOF)
-(make-variable-buffer-local 'js2-current-token)
-
-;; SKIP:  node factory - we're going to just call functions directly,
-;; and eventually go to a unified AST format.
-
-(defvar js2-nesting-of-function 0)
-(make-variable-buffer-local 'js2-nesting-of-function)
-
-(defvar js2-recorded-assignments nil)
-(make-variable-buffer-local 'js2-assignments-from-parse)
-
-;; SKIP:  decompiler
-;; SKIP:  encoded-source
-
-;;; These variables are per-function and should be saved/restored
-;;; during function parsing.
-
-(defvar js2-current-script-or-fn nil)
-(make-variable-buffer-local 'js2-current-script-or-fn)
-
-(defvar js2-current-scope nil)
-(make-variable-buffer-local 'js2-current-scope)
-
-(defvar js2-nesting-of-with 0)
-(make-variable-buffer-local 'js2-nesting-of-with)
-
-(defvar js2-label-set nil
-  "An alist mapping label names to nodes.")
-(make-variable-buffer-local 'js2-label-set)
-
-(defvar js2-loop-set nil)
-(make-variable-buffer-local 'js2-loop-set)
-
-(defvar js2-loop-and-switch-set nil)
-(make-variable-buffer-local 'js2-loop-and-switch-set)
-
-(defvar js2-has-return-value nil)
-(make-variable-buffer-local 'js2-has-return-value)
-
-(defvar js2-end-flags 0)
-(make-variable-buffer-local 'js2-end-flags)
-
-;;; end of per function variables
-
-;; Without 2-token lookahead, labels are a problem.
-;; These vars store the token info of the last matched name,
-;; iff it wasn't the last matched token.  Only valid in some contexts.
-(defvar js2-prev-name-token-start nil)
-(defvar js2-prev-name-token-string nil)
-
-(defsubst js2-save-name-token-data (pos name)
-  (setq js2-prev-name-token-start pos
-        js2-prev-name-token-string name))
-
-;; These flags enumerate the possible ways a statement/function can
-;; terminate. These flags are used by endCheck() and by the Parser to
-;; detect inconsistent return usage.
-;;
-;; END_UNREACHED is reserved for code paths that are assumed to always be
-;; able to execute (example: throw, continue)
-;;
-;; END_DROPS_OFF indicates if the statement can transfer control to the
-;; next one. Statement such as return dont. A compound statement may have
-;; some branch that drops off control to the next statement.
-;;
-;; END_RETURNS indicates that the statement can return (without arguments)
-;; END_RETURNS_VALUE indicates that the statement can return a value.
-;;
-;; A compound statement such as
-;; if (condition) {
-;;   return value;
-;; }
-;; Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
-
-(defconst js2-end-unreached     #x0)
-(defconst js2-end-drops-off     #x1)
-(defconst js2-end-returns       #x2)
-(defconst js2-end-returns-value #x4)
-(defconst js2-end-yields        #x8)
-
-;; Rhino awkwardly passes a statementLabel parameter to the
-;; statementHelper() function, the main statement parser, which
-;; is then used by quite a few of the sub-parsers.  We just make
-;; it a buffer-local variable and make sure it's cleaned up properly.
-(defvar js2-labeled-stmt nil)  ; type `js2-labeled-stmt-node'
-(make-variable-buffer-local 'js2-labeled-stmt)
-
-;; Similarly, Rhino passes an inForInit boolean through about half
-;; the expression parsers.  We use a dynamically-scoped variable,
-;; which makes it easier to funcall the parsers individually without
-;; worrying about whether they take the parameter or not.
-(defvar js2-in-for-init nil)
-(make-variable-buffer-local 'js2-in-for-init)
-
-(defvar js2-temp-name-counter 0)
-(make-variable-buffer-local 'js2-temp-name-counter)
-
-(defvar js2-parse-stmt-count 0)
-(make-variable-buffer-local 'js2-parse-stmt-count)
-
-(defsubst js2-get-next-temp-name ()
-  (format "$%d" (incf js2-temp-name-counter)))
-
-(defvar js2-parse-interruptable-p t
-  "Set this to nil to force parse to continue until finished.
-This will mostly be useful for interpreters.")
-
-(defvar js2-statements-per-pause 50
-  "Pause after this many statements to check for user input.
-If user input is pending, stop the parse and discard the tree.
-This makes for a smoother user experience for large files.
-You may have to wait a second or two before the highlighting
-and error-reporting appear, but you can always type ahead if
-you wish.  This appears to be more or less how Eclipse, IntelliJ
-and other editors work.")
-
-(defvar js2-record-comments t
-  "Instructs the scanner to record comments in `js2-scanned-comments'.")
-(make-variable-buffer-local 'js2-record-comments)
-
-(defvar js2-scanned-comments nil
-  "List of all comments from the current parse.")
-(make-variable-buffer-local 'js2-scanned-comments)
-
-(defun js2-underline-color (color)
-  "Return a legal value for the :underline face attribute based on COLOR."
-  ;; In XEmacs the :underline attribute can only be a boolean.
-  ;; In GNU it can be the name of a colour.
-  (if (featurep 'xemacs)
-      (if color t nil)
-    color))
-
-(defcustom js2-mode-indent-inhibit-undo nil
-  "Non-nil to disable collection of Undo information when indenting lines.
-Some users have requested this behavior.  It's nil by default because
-other Emacs modes don't work this way."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-indent-ignore-first-tab nil
-  "If non-nil, ignore first TAB keypress if we look indented properly.
-It's fairly common for users to navigate to an already-indented line
-and press TAB for reassurance that it's been indented.  For this class
-of users, we want the first TAB press on a line to be ignored if the
-line is already indented to one of the precomputed alternatives.
-
-This behavior is only partly implemented.  If you TAB-indent a line,
-navigate to another line, and then navigate back, it fails to clear
-the last-indented variable, so it thinks you've already hit TAB once,
-and performs the indent.  A full solution would involve getting on the
-point-motion hooks for the entire buffer.  If we come across another
-use cases that requires watching point motion, I'll consider doing it.
-
-If you set this variable to nil, then the TAB key will always change
-the indentation of the current line, if more than one alternative
-indentation spot exists."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defvar js2-indent-hook nil
-  "A hook for user-defined indentation rules.
-
-Functions on this hook should expect two arguments:    (LIST INDEX)
-The LIST argument is the list of computed indentation points for
-the current line.  INDEX is the list index of the indentation point
-that `js2-bounce-indent' plans to use.  If INDEX is nil, then the
-indent function is not going to change the current line indentation.
-
-If a hook function on this list returns a non-nil value, then
-`js2-bounce-indent' assumes the hook function has performed its own
-indentation, and will do nothing.  If all hook functions on the list
-return nil, then `js2-bounce-indent' will use its computed indentation
-and reindent the line.
-
-When hook functions on this hook list are called, the variable
-`js2-mode-ast' may or may not be set, depending on whether the
-parse tree is available.  If the variable is nil, you can pass a
-callback to `js2-mode-wait-for-parse', and your callback will be
-called after the new parse tree is built.  This can take some time
-in large files.")
-
-(defface js2-warning-face
-  `((((class color) (background light))
-     (:underline ,(js2-underline-color "orange")))
-    (((class color) (background dark))
-     (:underline ,(js2-underline-color "orange")))
-    (t (:underline t)))
-  "Face for JavaScript warnings."
-  :group 'js2-mode)
-
-(defface js2-error-face
-  `((((class color) (background light))
-     (:foreground "red"))
-    (((class color) (background dark))
-     (:foreground "red"))
-    (t (:foreground "red")))
-  "Face for JavaScript errors."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-tag-face
-  '((t :foreground "SlateGray"))
-  "Face used to highlight @whatever tags in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-type-face
-  '((t :foreground "SteelBlue"))
-  "Face used to highlight {FooBar} types in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-value-face
-  '((t :foreground "PeachPuff3"))
-  "Face used to highlight tag values in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-function-param-face
-  '((t :foreground "SeaGreen"))
-  "Face used to highlight function parameters in javascript."
-  :group 'js2-mode)
-
-(defface js2-instance-member-face
-  '((t :foreground "DarkOrchid"))
-  "Face used to highlight instance variables in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-private-member-face
-  '((t :foreground "PeachPuff3"))
-  "Face used to highlight calls to private methods in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-private-function-call-face
-  '((t :foreground "goldenrod"))
-  "Face used to highlight calls to private functions in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-html-tag-name-face
-  (if js2-emacs22
-      '((((class color) (min-colors 88) (background light))
-         (:foreground "rosybrown"))
-        (((class color) (min-colors 8) (background dark))
-         (:foreground "yellow"))
-        (((class color) (min-colors 8) (background light))
-         (:foreground "magenta")))
-    '((((type tty pc) (class color) (background light))
-       (:foreground "magenta"))
-      (((type tty pc) (class color) (background dark))
-       (:foreground "yellow"))
-      (t (:foreground "RosyBrown"))))
-    "Face used to highlight jsdoc html tag names"
-  :group 'js2-mode)
-
-(defface js2-jsdoc-html-tag-delimiter-face
-  (if js2-emacs22
-      '((((class color) (min-colors 88) (background light))
-         (:foreground "dark khaki"))
-        (((class color) (min-colors 8) (background dark))
-         (:foreground "green"))
-        (((class color) (min-colors 8) (background light))
-         (:foreground "green")))
-    '((((type tty pc) (class color) (background light))
-       (:foreground "green"))
-      (((type tty pc) (class color) (background dark))
-       (:foreground "green"))
-      (t (:foreground "dark khaki"))))
-  "Face used to highlight brackets in jsdoc html tags."
-  :group 'js2-mode)
-
-(defface js2-external-variable-face
-  '((t :foreground "orange"))
-  "Face used to highlight assignments to undeclared variables.
-An undeclared variable is any variable not declared with var or let
-in the current scope or any lexically enclosing scope.  If you assign
-to such a variable, then you are either expecting it to originate from
-another file, or you've got a potential bug."
-  :group 'js2-mode)
-
-(defcustom js2-highlight-external-variables t
-  "Non-nil to higlight assignments to undeclared variables."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defvar js2-mode-map
-  (let ((map (make-sparse-keymap))
-        keys)
-    (define-key map [mouse-1] #'js2-mode-show-node)
-    (define-key map "\C-m" #'js2-enter-key)
-    (when js2-rebind-eol-bol-keys
-      (define-key map "\C-a" #'js2-beginning-of-line)
-      (define-key map "\C-e" #'js2-end-of-line))
-    (define-key map "\C-c\C-e" #'js2-mode-hide-element)
-    (define-key map "\C-c\C-s" #'js2-mode-show-element)
-    (define-key map "\C-c\C-a" #'js2-mode-show-all)
-    (define-key map "\C-c\C-f" #'js2-mode-toggle-hide-functions)
-    (define-key map "\C-c\C-t" #'js2-mode-toggle-hide-comments)
-    (define-key map "\C-c\C-o" #'js2-mode-toggle-element)
-    (define-key map "\C-c\C-w" #'js2-mode-toggle-warnings-and-errors)
-    (define-key map (kbd "C-c C-'") #'js2-next-error)
-    ;; also define user's preference for next-error, if available
-    (if (setq keys (where-is-internal #'next-error))
-        (define-key map (car keys) #'js2-next-error))
-    (define-key map (or (car (where-is-internal #'mark-defun))
-                        (kbd "M-C-h"))
-      #'js2-mark-defun)
-    (define-key map (or (car (where-is-internal #'narrow-to-defun))
-                        (kbd "C-x nd"))
-      #'js2-narrow-to-defun)
-    (define-key map [down-mouse-3] #'js2-mouse-3)
-    (when js2-auto-indent-flag
-      (mapc (lambda (key)
-              (define-key map key #'js2-insert-and-indent))
-            js2-electric-keys))
-
-    (define-key map [menu-bar javascript]
-      (cons "JavaScript" (make-sparse-keymap "JavaScript")))
-
-    (define-key map [menu-bar javascript customize-js2-mode]
-      '(menu-item "Customize js2-mode" js2-mode-customize
-                  :help "Customize the behavior of this mode"))
-
-    (define-key map [menu-bar javascript js2-force-refresh]
-      '(menu-item "Force buffer refresh" js2-mode-reset
-                  :help "Re-parse the buffer from scratch"))
-
-    (define-key map [menu-bar javascript separator-2]
-      '("--"))
-
-    (define-key map [menu-bar javascript next-error]
-      '(menu-item "Next warning or error" js2-next-error
-                  :enabled (and js2-mode-ast
-                                (or (js2-ast-root-errors js2-mode-ast)
-                                    (js2-ast-root-warnings js2-mode-ast)))
-                  :help "Move to next warning or error"))
-
-    (define-key map [menu-bar javascript display-errors]
-      '(menu-item "Show errors and warnings" js2-mode-display-warnings-and-errors
-                  :visible (not js2-mode-show-parse-errors)
-                  :help "Turn on display of warnings and errors"))
-
-    (define-key map [menu-bar javascript hide-errors]
-      '(menu-item "Hide errors and warnings" js2-mode-hide-warnings-and-errors
-                  :visible js2-mode-show-parse-errors
-                  :help "Turn off display of warnings and errors"))
-
-    (define-key map [menu-bar javascript separator-1]
-      '("--"))
-
-    (define-key map [menu-bar javascript js2-toggle-function]
-      '(menu-item "Show/collapse element" js2-mode-toggle-element
-                  :help "Hide or show function body or comment"))
-
-    (define-key map [menu-bar javascript show-comments]
-      '(menu-item "Show block comments" js2-mode-toggle-hide-comments
-                  :visible js2-mode-comments-hidden
-                  :help "Expand all hidden block comments"))
-
-    (define-key map [menu-bar javascript hide-comments]
-      '(menu-item "Hide block comments" js2-mode-toggle-hide-comments
-                  :visible (not js2-mode-comments-hidden)
-                  :help "Show block comments as /*...*/"))
-
-    (define-key map [menu-bar javascript show-all-functions]
-      '(menu-item "Show function bodies" js2-mode-toggle-hide-functions
-                  :visible js2-mode-functions-hidden
-                  :help "Expand all hidden function bodies"))
-
-    (define-key map [menu-bar javascript hide-all-functions]
-      '(menu-item "Hide function bodies" js2-mode-toggle-hide-functions
-                  :visible (not js2-mode-functions-hidden)
-                  :help "Show {...} for all top-level function bodies"))
-
-    map)
-  "Keymap used in `js2-mode' buffers.")
-
-(defconst js2-mode-identifier-re "[a-zA-Z_$][a-zA-Z0-9_$]*")
-
-(defvar js2-mode-//-comment-re "^\\(\\s-*\\)//.+"
-  "Matches a //-comment line.  Must be first non-whitespace on line.
-First match-group is the leading whitespace.")
-
-(defvar js2-mode-ast nil "Private variable.")
-(make-variable-buffer-local 'js2-mode-ast)
-
-(defvar js2-mode-hook nil)
-
-(defvar js2-mode-parse-timer nil "Private variable.")
-(make-variable-buffer-local 'js2-mode-parse-timer)
-
-(defvar js2-mode-buffer-dirty-p nil "Private variable.")
-(make-variable-buffer-local 'js2-mode-buffer-dirty-p)
-
-(defvar js2-mode-parsing nil "Private variable.")
-(make-variable-buffer-local 'js2-mode-parsing)
-
-(defvar js2-mode-node-overlay nil)
-(make-variable-buffer-local 'js2-mode-node-overlay)
-
-(defvar js2-mode-show-overlay js2-mode-dev-mode-p
-  "Debug:  Non-nil to highlight AST nodes on mouse-down.")
-
-(defvar js2-mode-fontifications nil "Private variable")
-(make-variable-buffer-local 'js2-mode-fontifications)
-
-(defvar js2-mode-deferred-properties nil "Private variable")
-(make-variable-buffer-local 'js2-mode-deferred-properties)
-
-(defvar js2-imenu-recorder nil "Private variable")
-(make-variable-buffer-local 'js2-imenu-recorder)
-
-(defvar js2-imenu-function-map nil "Private variable")
-(make-variable-buffer-local 'js2-imenu-function-map)
-
-(defvar js2-paragraph-start
-  "\\(@[a-zA-Z]+\\>\\|$\\)")
-
-;; Note that we also set a 'c-in-sws text property in html comments,
-;; so that `c-forward-sws' and `c-backward-sws' work properly.
-(defvar js2-syntactic-ws-start
-  "\\s \\|/[*/]\\|[\n\r]\\|\\\\[\n\r]\\|\\s!\\|<!--\\|^\\s-*-->")
-
-(defvar js2-syntactic-ws-end
-  "\\s \\|[\n\r/]\\|\\s!")
-
-(defvar js2-syntactic-eol
-  (concat "\\s *\\(/\\*[^*\n\r]*"
-          "\\(\\*+[^*\n\r/][^*\n\r]*\\)*"
-          "\\*+/\\s *\\)*"
-          "\\(//\\|/\\*[^*\n\r]*"
-          "\\(\\*+[^*\n\r/][^*\n\r]*\\)*$"
-          "\\|\\\\$\\|$\\)")
-  "Copied from java-mode.  Needed for some cc-engine functions.")
-
-(defvar js2-comment-prefix-regexp
-  "//+\\|\\**")
-
-(defvar js2-comment-start-skip
-  "\\(//+\\|/\\*+\\)\\s *")
-
-(defvar js2-mode-verbose-parse-p js2-mode-dev-mode-p
-  "Non-nil to emit status messages during parsing.")
-
-(defvar js2-mode-functions-hidden nil "private variable")
-(defvar js2-mode-comments-hidden nil "private variable")
-
-(defvar js2-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (c-populate-syntax-table table)
-    table)
-  "Syntax table used in js2-mode buffers.")
-
-(defvar js2-mode-abbrev-table nil
-  "Abbrev table in use in `js2-mode' buffers.")
-(define-abbrev-table 'js2-mode-abbrev-table ())
-
-(defvar js2-mode-must-byte-compile (not js2-mode-dev-mode-p)
-  "Non-nil to have `js2-mode' signal an error if not byte-compiled.")
-
-(defvar js2-mode-pending-parse-callbacks nil
-  "List of functions waiting to be notified that parse is finished.")
-
-(defvar js2-mode-last-indented-line -1)
-
-(eval-when-compile
-  (defvar c-paragraph-start nil)
-  (defvar c-paragraph-separate nil)
-  (defvar c-syntactic-ws-start nil)
-  (defvar c-syntactic-ws-end nil)
-  (defvar c-syntactic-eol nil)
-  (defvar running-xemacs nil)
-  (defvar font-lock-mode nil)
-  (defvar font-lock-keywords nil))
-
-(eval-when-compile
-  (if (< emacs-major-version 22)
-      (defun c-setup-paragraph-variables () nil)))
-
-(provide 'js2-vars)
-
-;;; js2-vars.el ends here
-;;; js2-util.el -- JavaScript utilities
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Code
-
-(eval-when-compile
-  (require 'cl))
-
-
-;; Emacs21 compatibility, plus some stuff to avoid runtime dependency on CL
-
-(unless (fboundp #'looking-back)
-  (defun looking-back (regexp &optional limit greedy)
-    "Return non-nil if text before point matches regular expression REGEXP.
-Like `looking-at' except matches before point, and is slower.
-LIMIT if non-nil speeds up the search by specifying a minimum
-starting position, to avoid checking matches that would start
-before LIMIT.
-
-If GREEDY is non-nil, extend the match backwards as far as possible,
-stopping when a single additional previous character cannot be part
-of a match for REGEXP."
-    (let ((start (point))
-          (pos
-           (save-excursion
-             (and (re-search-backward (concat "\\(?:" regexp "\\)\\=") limit t)
-                  (point)))))
-      (if (and greedy pos)
-          (save-restriction
-            (narrow-to-region (point-min) start)
-            (while (and (> pos (point-min))
-                        (save-excursion
-                          (goto-char pos)
-                          (backward-char 1)
-                          (looking-at (concat "\\(?:"  regexp "\\)\\'"))))
-              (setq pos (1- pos)))
-            (save-excursion
-              (goto-char pos)
-              (looking-at (concat "\\(?:"  regexp "\\)\\'")))))
-      (not (null pos)))))
-
-(unless (fboundp #'copy-overlay)
-  (defun copy-overlay (o)
-    "Return a copy of overlay O."
-    (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
-                            ;; FIXME: there's no easy way to find the
-                            ;; insertion-type of the two markers.
-                            (overlay-buffer o)))
-          (props (overlay-properties o)))
-      (while props
-        (overlay-put o1 (pop props) (pop props)))
-      o1)))
-
-(unless (fboundp #'remove-overlays)
-  (defun remove-overlays (&optional beg end name val)
-    "Clear BEG and END of overlays whose property NAME has value VAL.
-Overlays might be moved and/or split.
-BEG and END default respectively to the beginning and end of buffer."
-    (unless beg (setq beg (point-min)))
-    (unless end (setq end (point-max)))
-    (if (< end beg)
-        (setq beg (prog1 end (setq end beg))))
-    (save-excursion
-      (dolist (o (overlays-in beg end))
-        (when (eq (overlay-get o name) val)
-          ;; Either push this overlay outside beg...end
-          ;; or split it to exclude beg...end
-          ;; or delete it entirely (if it is contained in beg...end).
-          (if (< (overlay-start o) beg)
-              (if (> (overlay-end o) end)
-                  (progn
-                    (move-overlay (copy-overlay o)
-                                  (overlay-start o) beg)
-                    (move-overlay o end (overlay-end o)))
-                (move-overlay o (overlay-start o) beg))
-            (if (> (overlay-end o) end)
-                (move-overlay o end (overlay-end o))
-              (delete-overlay o))))))))
-
-;; we don't want a runtime dependency on the CL package, so define
-;; our own versions of these functions.
-
-(defun js2-delete-if (predicate list)
-  "Remove all items satisfying PREDICATE in LIST."
-  (loop for item in list
-        if (not (funcall predicate item))
-        collect item))
-
-(defun js2-position (element list)
-  "Find 0-indexed position of ELEMENT in LIST comparing with `eq'.
-Returns nil if element is not found in the list."
-  (let ((count 0)
-        found)
-    (while (and list (not found))
-      (if (eq element (car list))
-          (setq found t)
-        (setq count (1+ count)
-              list (cdr list))))
-    (if found count)))
-
-(defun js2-find-if (predicate list)
-  "Find first item satisfying PREDICATE in LIST."
-  (let (result)
-    (while (and list (not result))
-      (if (funcall predicate (car list))
-          (setq result (car list)))
-      (setq list (cdr list)))
-    result))
-
-;;; end Emacs 21 compat
-
-(defmacro js2-time (form)
-  "Evaluate FORM, discard result, and return elapsed time in sec"
-  (let ((beg (make-symbol "--js2-time-beg--"))
-        (delta (make-symbol "--js2-time-end--")))
-    `(let ((,beg (current-time))
-           ,delta)
-       ,form
-       (/ (truncate (* (- (float-time (current-time))
-                          (float-time ,beg)))
-                    10000)
-          10000.0))))
-
-(def-edebug-spec js2-time t)
-
-(defsubst neq (expr1 expr2)
-  "Return (not (eq expr1 expr2))."
-  (not (eq expr1 expr2)))
-
-(defsubst js2-same-line (pos)
-  "Return t if POS is on the same line as current point."
-  (and (>= pos (point-at-bol))
-       (<= pos (point-at-eol))))
-
-(defsubst js2-same-line-2 (p1 p2)
-  "Return t if p1 is on the same line as p2."
-  (save-excursion
-    (goto-char p1)
-    (js2-same-line p2)))
-
-(defun js2-code-bug ()
-  "Signal an error when we encounter an unexpected code path."
-  (error "failed assertion"))
-
-;; I'd like to associate errors with nodes, but for now the
-;; easiest thing to do is get the context info from the last token.
-(defsubst js2-record-parse-error (msg &optional arg pos len)
-  (push (list (list msg arg)
-              (or pos js2-token-beg)
-              (or len (- js2-token-end js2-token-beg)))
-        js2-parsed-errors))
-
-(defsubst js2-report-error (msg &optional msg-arg pos len)
-  "Signal a syntax error or record a parse error."
-  (if js2-recover-from-parse-errors
-      (js2-record-parse-error msg msg-arg pos len)
-  (signal 'js2-syntax-error
-          (list msg
-                js2-ts-lineno
-                (save-excursion
-                  (goto-char js2-ts-cursor)
-                  (current-column))
-                js2-ts-hit-eof))))
-
-(defsubst js2-report-warning (msg &optional msg-arg pos len)
-  (if js2-compiler-report-warning-as-error
-      (js2-report-error msg msg-arg pos len)
-    (push (list (list msg msg-arg)
-                (or pos js2-token-beg)
-                (or len (- js2-token-end js2-token-beg)))
-          js2-parsed-warnings)))
-
-(defsubst js2-add-strict-warning (msg-id &optional msg-arg beg end)
-  (if js2-compiler-strict-mode
-      (js2-report-warning msg-id msg-arg beg
-                          (and beg end (- end beg)))))
-
-(put 'js2-syntax-error 'error-conditions
-     '(error syntax-error js2-syntax-error))
-(put 'js2-syntax-error 'error-message "Syntax error")
-
-(put 'js2-parse-error 'error-conditions
-     '(error parse-error js2-parse-error))
-(put 'js2-parse-error 'error-message "Parse error")
-
-(defmacro js2-clear-flag (flags flag)
-  `(setq ,flags (logand ,flags (lognot ,flag))))
-
-(defmacro js2-set-flag (flags flag)
-  "Logical-or FLAG into FLAGS."
-  `(setq ,flags (logior ,flags ,flag)))
-
-(defsubst js2-flag-set-p (flags flag)
-  (/= 0 (logand flags flag)))
-
-(defsubst js2-flag-not-set-p (flags flag)
-  (zerop (logand flags flag)))
-
-;; Stolen shamelessly from James Clark's nxml-mode.
-(defmacro js2-with-unmodifying-text-property-changes (&rest body)
-  "Evaluate BODY without any text property changes modifying the buffer.
-Any text properties changes happen as usual but the changes are not treated as
-modifications to the buffer."
-  (let ((modified (make-symbol "modified")))
-    `(let ((,modified (buffer-modified-p))
-	   (inhibit-read-only t)
-	   (inhibit-modification-hooks t)
-	   (buffer-undo-list t)
-	   (deactivate-mark nil)
-	   ;; Apparently these avoid file locking problems.
-	   (buffer-file-name nil)
-	   (buffer-file-truename nil))
-       (unwind-protect
-	   (progn ,@body)
-	 (unless ,modified
-	   (restore-buffer-modified-p nil))))))
-
-(put 'js2-with-unmodifying-text-property-changes 'lisp-indent-function 0)
-(def-edebug-spec js2-with-unmodifying-text-property-changes t)
-
-(defmacro js2-with-underscore-as-word-syntax (&rest body)
-  "Evaluate BODY with the _ character set to be word-syntax."
-  (let ((old-syntax (make-symbol "old-syntax")))
-  `(let ((,old-syntax (string (char-syntax ?_))))
-     (unwind-protect
-         (progn
-           (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
-           ,@body)
-       (modify-syntax-entry ?_ ,old-syntax js2-mode-syntax-table)))))
-
-(put 'js2-with-underscore-as-word-syntax 'lisp-indent-function 0)
-(def-edebug-spec js2-with-underscore-as-word-syntax t)
-
-(defmacro with-buffer (buf form)
-  "Executes FORM in buffer BUF.
-BUF can be a buffer name or a buffer object.
-If the buffer doesn't exist, it's created."
-  `(let ((buffer (gentemp)))
-    (setq buffer
-	  (if (stringp ,buf)
-	      (get-buffer-create ,buf)
-	    ,buf))
-    (save-excursion
-      (set-buffer buffer)
-      ,form)))
-
-(defsubst char-is-uppercase (c)
-  "Return t if C is an uppercase character.
-Handles unicode and latin chars properly."
-  (/= c (downcase c)))
-
-(defsubst char-is-lowercase (c)
-  "Return t if C is an uppercase character.
-Handles unicode and latin chars properly."
-  (/= c (upcase c)))
-
-(put 'with-buffer 'lisp-indent-function 1)
-(def-edebug-spec with-buffer t)
-
-(provide 'js2-util)
-
-;;; js2-util.el ends here
-;;; js2-scan.el --- JavaScript scanner
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Commentary:
-
-;; A port of Mozilla Rhino's scanner.
-;; Corresponds to Rhino files Token.java and TokenStream.java.
-
-;;; Code:
-
-
-(eval-when-compile
-  (require 'cl))
-
-(defvar js2-tokens nil
-  "List of all defined token names.")  ; intialized below
-
-(defvar js2-token-names
-  (let* ((names (make-vector js2-num-tokens -1))
-         (case-fold-search nil)  ; only match js2-UPPER_CASE
-         (syms (apropos-internal "^js2-\\(?:[A-Z_]+\\)")))
-    (loop for sym in syms
-          for i from 0
-          do
-          (unless (or (memq sym '(js2-EOF_CHAR js2-ERROR))
-                      (not (boundp sym)))
-            (aset names (symbol-value sym)         ; code, e.g. 152
-                  (substring (symbol-name sym) 4)) ; name, e.g. "LET"
-            (push sym js2-tokens)))
-    names)
-  "Vector mapping int values to token string names, sans `js2-' prefix.")
-
-(defun js2-token-name (tok)
-  "Return a string name for TOK, a token symbol or code.
-Signals an error if it's not a recognized token."
-  (let ((code tok))
-    (if (symbolp tok)
-        (setq code (symbol-value tok)))
-    (if (eq code -1)
-        "ERROR"
-      (if (and (numberp code)
-               (not (minusp code))
-               (< code js2-num-tokens))
-          (aref js2-token-names code)
-        (error "Invalid token: %s" code)))))
-
-(defsubst js2-token-sym (tok)
-  "Return symbol for TOK given its code, e.g. 'js2-LP for code 86."
-  (intern (js2-token-name tok)))
-
-(defvar js2-token-codes
-  (let ((table (make-hash-table :test 'eq :size 256)))
-    (loop for name across js2-token-names
-          for sym = (intern (concat "js2-" name))
-          do
-          (puthash sym (symbol-value sym) table))
-    ;; clean up a few that are "wrong" in Rhino's token codes
-    (puthash 'js2-DELETE js2-DELPROP table)
-    table)
-  "Hashtable mapping token symbols to their bytecodes.")
-
-(defsubst js2-token-code (sym)
-  "Return code for token symbol SYM, e.g. 86 for 'js2-LP."
-  (or (gethash sym js2-token-codes)
-      (error "Invalid token symbol: %s " sym)))  ; signal code bug
-
-(defsubst js2-report-scan-error (msg &optional no-throw beg len)
-  (setq js2-token-end js2-ts-cursor)
-  (js2-report-error msg nil
-                    (or beg js2-token-beg)
-                    (or len (- js2-token-end js2-token-beg)))
-  (unless no-throw
-    (throw 'return js2-ERROR)))
-
-(defsubst js2-get-string-from-buffer ()
-  "Reverse the char accumulator and return it as a string."
-  (setq js2-token-end js2-ts-cursor)
-  (if js2-ts-string-buffer
-      (apply #'string (nreverse js2-ts-string-buffer))
-    ""))
-
-;; TODO:  could potentially avoid a lot of consing by allocating a
-;; char buffer the way Rhino does.
-(defsubst js2-add-to-string (c)
-  (push c js2-ts-string-buffer))
-
-;; Note that when we "read" the end-of-file, we advance js2-ts-cursor
-;; to (1+ (point-max)), which lets the scanner treat end-of-file like
-;; any other character:  when it's not part of the current token, we
-;; unget it, allowing it to be read again by the following call.
-(defsubst js2-unget-char ()
-  (decf js2-ts-cursor))
-
-;; Rhino distinguishes \r and \n line endings.  We don't need to
-;; because we only scan from Emacs buffers, which always use \n.
-(defsubst js2-get-char ()
-  "Read and return the next character from the input buffer.
-Increments `js2-ts-lineno' if the return value is a newline char.
-Updates `js2-ts-cursor' to the point after the returned char.
-Returns `js2-EOF_CHAR' if we hit the end of the buffer.
-Also updates `js2-ts-hit-eof' and `js2-ts-line-start' as needed."
-  (let (c)
-    ;; check for end of buffer
-    (if (>= js2-ts-cursor (point-max))
-        (setq js2-ts-hit-eof t
-              js2-ts-cursor (1+ js2-ts-cursor)
-              c js2-EOF_CHAR)  ; return value
-
-      ;; otherwise read next char
-      (setq c (char-before (incf js2-ts-cursor)))
-
-      ;; if we read a newline, update counters
-      (if (= c ?\n)
-          (setq js2-ts-line-start js2-ts-cursor
-                js2-ts-lineno (1+ js2-ts-lineno)))
-
-      ;; TODO:  skip over format characters
-      c)))
-
-(defsubst js2-read-unicode-escape ()
-  "Read a \\uNNNN sequence from the input.
-Assumes the ?\ and ?u have already been read.
-Returns the unicode character, or nil if it wasn't a valid character.
-Doesn't change the values of any scanner variables."
-  ;; I really wish I knew a better way to do this, but I can't
-  ;; find the Emacs function that takes a 16-bit int and converts
-  ;; it to a Unicode/utf-8 character.  So I basically eval it with (read).
-  ;; Have to first check that it's 4 hex characters or it may stop
-  ;; the read early.
-  (ignore-errors
-    (let ((s (buffer-substring-no-properties js2-ts-cursor
-                                             (+ 4 js2-ts-cursor))))
-      (if (string-match "[a-zA-Z0-9]\\{4\\}" s)
-          (read (concat "?\\u" s))))))
-
-(defsubst js2-match-char (test)
-  "Consume and return next character if it matches TEST, a character.
-Returns nil and consumes nothing if TEST is not the next character."
-  (let ((c (js2-get-char)))
-    (if (eq c test)
-        t
-      (js2-unget-char)
-      nil)))
-
-(defsubst js2-peek-char ()
-  (prog1
-      (js2-get-char)
-    (js2-unget-char)))
-
-(defsubst js2-java-identifier-start-p (c)
-  (or
-   (memq c '(?$ ?_))
-   (char-is-uppercase c)
-   (char-is-lowercase c)))
-
-(defsubst js2-java-identifier-part-p (c)
-  "Implementation of java.lang.Character.isJavaIdentifierPart()"
-  ;; TODO:  make me Unicode-friendly.  See comments above.
-  (or
-   (memq c '(?$ ?_))
-   (char-is-uppercase c)
-   (char-is-lowercase c)
-   (and (>= c ?0) (<= c ?9))))
-
-(defsubst js2-alpha-p (c)
-  ;; Use 'Z' < 'a'
-  (if (<= c ?Z)
-      (<= ?A c)
-    (and (<= ?a c)
-         (<= c ?z))))
-
-(defsubst js2-digit-p (c)
-  (and (<= ?0 c) (<= c ?9)))
-
-(defsubst js2-js-space-p (c)
-  (if (<= c 127)
-      (memq c '(#x20 #x9 #xC #xB))
-    (or
-     (eq c #xA0)
-     ;; TODO:  change this nil to check for Unicode space character
-     nil)))
-
-(defsubst js2-skip-line ()
-  "Skip to end of line"
-  (let (c)
-    (while (and (/= js2-EOF_CHAR (setq c (js2-get-char)))
-                (/= c ?\n)))
-    (js2-unget-char)
-    (setq js2-token-end js2-ts-cursor)))
-
-(defun js2-init-scanner (&optional buf line)
-  "Create token stream for BUF starting on LINE.
-BUF defaults to current-buffer and line defaults to 1.
-
-A buffer can only have one scanner active at a time, which yields
-dramatically simpler code than using a defstruct.  If you need to
-have simultaneous scanners in a buffer, copy the regions to scan
-into temp buffers."
-  (save-excursion
-    (when buf
-      (set-buffer buf))
-    (setq js2-ts-dirty-line nil
-          js2-ts-regexp-flags nil
-          js2-ts-string ""
-          js2-ts-number nil
-          js2-ts-hit-eof nil
-          js2-ts-line-start 0
-          js2-ts-lineno (or line 1)
-          js2-ts-line-end-char -1
-          js2-ts-cursor (point-min)
-          js2-ts-is-xml-attribute nil
-          js2-ts-xml-is-tag-content nil
-          js2-ts-xml-open-tags-count 0
-          js2-ts-string-buffer nil)))
-
-;; This function uses the cached op, string and number fields in
-;; TokenStream; if getToken has been called since the passed token
-;; was scanned, the op or string printed may be incorrect.
-(defun js2-token-to-string (token)
-  ;; Not sure where this function is used in Rhino.  Not tested.
-  (if (not js2-debug-print-trees)
-      ""
-    (let ((name (js2-token-name token)))
-      (cond
-       ((memq token (list js2-STRING js2-REGEXP js2-NAME))
-        (concat name " `" js2-ts-string "'"))
-       ((eq token js2-NUMBER)
-        (format "NUMBER %g" js2-ts-number))
-       (t
-        name)))))
-
-(defconst js2-keywords
-  '(break
-    case catch const continue
-    debugger default delete do
-    else enum
-    false finally for function
-    if in instanceof import
-    let
-    new null
-    return
-    switch
-    this throw true try typeof
-    var void
-    while with
-    yield))
-
-;; Token names aren't exactly the same as the keywords, unfortunately.
-;; E.g. enum isn't in the tokens, and delete is js2-DELPROP.
-(defconst js2-kwd-tokens
-  (let ((table (make-vector js2-num-tokens nil))
-        (tokens
-         (list js2-BREAK
-               js2-CASE js2-CATCH js2-CONST js2-CONTINUE
-               js2-DEBUGGER js2-DEFAULT js2-DELPROP js2-DO
-               js2-ELSE
-               js2-FALSE js2-FINALLY js2-FOR js2-FUNCTION
-               js2-IF js2-IN js2-INSTANCEOF js2-IMPORT
-               js2-LET
-               js2-NEW js2-NULL
-               js2-RETURN
-               js2-SWITCH
-               js2-THIS js2-THROW js2-TRUE js2-TRY js2-TYPEOF
-               js2-VAR
-               js2-WHILE js2-WITH
-               js2-YIELD)))
-    (dolist (i tokens)
-      (aset table i 'font-lock-keyword-face))
-    (aset table js2-STRING 'font-lock-string-face)
-    (aset table js2-REGEXP 'font-lock-string-face)
-    (aset table js2-COMMENT 'font-lock-comment-face)
-    (aset table js2-THIS 'font-lock-builtin-face)
-    (aset table js2-VOID 'font-lock-constant-face)
-    (aset table js2-NULL 'font-lock-constant-face)
-    (aset table js2-TRUE 'font-lock-constant-face)
-    (aset table js2-FALSE 'font-lock-constant-face)
-    table)
-  "Vector whose values are non-nil for tokens that are keywords.
-The values are default faces to use for highlighting the keywords.")
-
-(defconst js2-reserved-words
-  '(abstract
-    boolean byte
-    char class
-    double
-    enum extends
-    final float
-    goto
-    implements int interface
-    long
-    native
-    package private protected public
-    short static super synchronized
-    throws transient
-    volatile))
-
-(defconst js2-keyword-names
-  (let ((table (make-hash-table :test 'equal)))
-    (loop for k in js2-keywords
-          do (puthash
-              (symbol-name k)                            ; instanceof
-              (intern (concat "js2-"
-                              (upcase (symbol-name k)))) ; js2-INSTANCEOF
-              table))
-    table)
-  "JavaScript keywords by name, mapped to their symbols.")
-
-(defconst js2-reserved-word-names
-  (let ((table (make-hash-table :test 'equal)))
-    (loop for k in js2-reserved-words
-          do
-          (puthash (symbol-name k) 'js2-RESERVED table))
-    table)
-  "JavaScript reserved words by name, mapped to 'js2-RESERVED.")
-
-(defsubst js2-collect-string (buf)
-  "Convert BUF, a list of chars, to a string.
-Reverses BUF before converting."
-  (cond
-   ((stringp buf)
-    buf)
-   ((null buf)  ; for emacs21 compat
-    "")
-   (t
-    (if buf
-        (apply #'string (nreverse buf))
-      ""))))
-
-(defun js2-string-to-keyword (s)
-  "Return token for S, a string, if S is a keyword or reserved word.
-Returns a symbol such as 'js2-BREAK, or nil if not keyword/reserved."
-  (or (gethash s js2-keyword-names)
-      (gethash s js2-reserved-word-names)))
-
-(defsubst js2-ts-set-char-token-bounds ()
-  "Used when next token is one character."
-  (setq js2-token-beg (1- js2-ts-cursor)
-        js2-token-end js2-ts-cursor))
-
-(defsubst js2-ts-return (token)
-  "Return an N-character TOKEN from `js2-get-token'.
-Updates `js2-token-end' accordingly."
-  (setq js2-token-end js2-ts-cursor)
-  (throw 'return token))
-
-(defsubst js2-x-digit-to-int (c accumulator)
-  "Build up a hex number.
-If C is a hexadecimal digit, return ACCUMULATOR * 16 plus
-corresponding number.  Otherwise return -1."
-  (catch 'return
-    (catch 'check
-      ;; Use 0..9 < A..Z < a..z
-      (cond
-       ((<= c ?9)
-        (decf c ?0)
-        (if (<= 0 c)
-            (throw 'check nil)))
-       ((<= c ?F)
-        (when (<= ?A c)
-          (decf c (- ?A 10))
-          (throw 'check nil)))
-       ((<= c ?f)
-        (when (<= ?a c)
-          (decf c (- ?a 10))
-          (throw 'check nil))))
-      (throw 'return -1))
-    (logior c (lsh accumulator 4))))
-
-(defun js2-get-token ()
-  "Return next JavaScript token, an int such as js2-RETURN."
-  (let (c
-        c1
-        identifier-start
-        is-unicode-escape-start
-        contains-escape
-        escape-val
-        escape-start
-        str
-        result
-        base
-        is-integer
-        quote-char
-        val
-        look-for-slash
-        continue)
-    (catch 'return
-      (while t
-        ;; Eat whitespace, possibly sensitive to newlines.
-        (setq continue t)
-        (while continue
-          (setq c (js2-get-char))
-          (cond
-           ((eq c js2-EOF_CHAR)
-            (js2-ts-set-char-token-bounds)
-            (throw 'return js2-EOF))
-           ((eq c ?\n)
-            (js2-ts-set-char-token-bounds)
-            (setq js2-ts-dirty-line nil)
-            (throw 'return js2-EOL))
-           ((not (js2-js-space-p c))
-            (if (/= c ?-)               ; in case end of HTML comment
-                (setq js2-ts-dirty-line t))
-            (setq continue nil))))
-
-        ;; Assume the token will be 1 char - fixed up below.
-        (js2-ts-set-char-token-bounds)
-
-        (when (eq c ?@)
-          (throw 'return js2-XMLATTR))
-
-        ;; identifier/keyword/instanceof?
-        ;; watch out for starting with a <backslash>
-        (cond
-         ((eq c ?\\)
-          (setq c (js2-get-char))
-          (if (eq c ?u)
-              (setq identifier-start t
-                    is-unicode-escape-start t
-                    js2-ts-string-buffer nil)
-            (setq identifier-start nil)
-            (js2-unget-char)
-            (setq c ?\\)))
-         (t
-          (when (setq identifier-start (js2-java-identifier-start-p c))
-            (setq js2-ts-string-buffer nil)
-            (js2-add-to-string c))))
-
-        (when identifier-start
-          (setq contains-escape is-unicode-escape-start)
-          (catch 'break
-            (while t
-              (if is-unicode-escape-start
-                  ;; strictly speaking we should probably push-back
-                  ;; all the bad characters if the <backslash>uXXXX
-                  ;; sequence is malformed. But since there isn't a
-                  ;; correct context(is there?) for a bad Unicode
-                  ;; escape sequence in an identifier, we can report
-                  ;; an error here.
-                  (progn
-                    (setq escape-val 0)
-                    (dotimes (i 4)
-                      (setq c (js2-get-char)
-                            escape-val (js2-x-digit-to-int c escape-val))
-                      ;; Next check takes care of c < 0 and bad escape
-                      (if (minusp escape-val)
-                          (throw 'break nil)))
-                    (if (minusp escape-val)
-                        (js2-report-scan-error "msg.invalid.escape" t))
-                    (js2-add-to-string escape-val)
-                    (setq is-unicode-escape-start nil))
-                (setq c (js2-get-char))
-                (cond
-                 ((eq c ?\\)
-                  (setq c (js2-get-char))
-                  (if (eq c ?u)
-                      (setq is-unicode-escape-start t
-                            contains-escape t)
-                    (js2-report-scan-error "msg.illegal.character" t)))
-                 (t
-                  (if (or (eq c js2-EOF_CHAR)
-                          (not (js2-java-identifier-part-p c)))
-                      (throw 'break nil))
-                  (js2-add-to-string c))))))
-          (js2-unget-char)
-
-          (setq str (js2-get-string-from-buffer))
-          (unless contains-escape
-            ;; OPT we shouldn't have to make a string (object!) to
-            ;; check if it's a keyword.
-
-            ;; Return the corresponding token if it's a keyword
-            (when (setq result (js2-string-to-keyword str))
-              (if (and (< js2-language-version 170)
-                       (memq result '(js2-LET js2-YIELD)))
-                  ;; LET and YIELD are tokens only in 1.7 and later
-                  (setq result 'js2-NAME))
-              (if (neq result js2-RESERVED)
-                  (throw 'return (js2-token-code result)))
-              (js2-report-warning "msg.reserved.keyword" str)))
-
-          ;; If we want to intern these as Rhino does, just use (intern str)
-          (setq js2-ts-string str)
-          (throw 'return js2-NAME))     ; end identifier/kwd check
-
-        ;; is it a number?
-        (when (or (js2-digit-p c)
-                  (and (eq c ?.) (js2-digit-p (js2-peek-char))))
-          (setq js2-ts-string-buffer nil
-                base 10)
-          (when (eq c ?0)
-            (setq c (js2-get-char))
-            (cond
-             ((or (eq c ?x) (eq c ?X))
-              (setq base 16)
-              (setq c (js2-get-char)))
-             ((js2-digit-p c)
-              (setq base 8))
-             (t
-              (js2-add-to-string ?0))))
-
-          (if (eq base 16)
-              (while (<= 0 (js2-x-digit-to-int c 0))
-                (js2-add-to-string c)
-                (setq c (js2-get-char)))
-            (while (and (<= ?0 c) (<= c ?9))
-              ;; We permit 08 and 09 as decimal numbers, which
-              ;; makes our behavior a superset of the ECMA
-              ;; numeric grammar.  We might not always be so
-              ;; permissive, so we warn about it.
-              (when (and (eq base 8) (>= c ?8))
-                (js2-report-warning "msg.bad.octal.literal"
-                                    (if (eq c ?8) "8" "9"))
-                (setq base 10))
-              (js2-add-to-string c)
-              (setq c (js2-get-char))))
-
-          (setq is-integer t)
-
-          (when (and (eq base 10) (memq c '(?. ?e ?E)))
-            (setq is-integer nil)
-            (when (eq c ?.)
-              (loop do
-                    (js2-add-to-string c)
-                    (setq c (js2-get-char))
-                    while (js2-digit-p c)))
-            (when (memq c '(?e ?E))
-              (js2-add-to-string c)
-              (setq c (js2-get-char))
-              (when (memq c '(?+ ?-))
-                (js2-add-to-string c)
-                (setq c (js2-get-char)))
-              (unless (js2-digit-p c)
-                (js2-report-scan-error "msg.missing.exponent" t))
-              (loop do
-                    (js2-add-to-string c)
-                    (setq c (js2-get-char))
-                    while (js2-digit-p c))))
-
-          (js2-unget-char)
-          (setq js2-ts-string (js2-get-string-from-buffer)
-                js2-ts-number
-                (if (and (eq base 10) (not is-integer))
-                    (string-to-number js2-ts-string)
-                  ;; TODO:  call runtime number-parser.  Some of it is in
-                  ;; js2-util.el, but I need to port ScriptRuntime.stringToNumber.
-                  (string-to-number js2-ts-string)))
-          (throw 'return js2-NUMBER))
-
-        ;; is it a string?
-        (when (memq c '(?\" ?\'))
-          ;; We attempt to accumulate a string the fast way, by
-          ;; building it directly out of the reader.  But if there
-          ;; are any escaped characters in the string, we revert to
-          ;; building it out of a string buffer.
-          (setq quote-char c
-                js2-ts-string-buffer nil
-                c (js2-get-char))
-          (catch 'break
-            (while (/= c quote-char)
-              (catch 'continue
-                (when (or (eq c ?\n) (eq c js2-EOF_CHAR))
-                  (js2-unget-char)
-                  (setq js2-token-end js2-ts-cursor)
-                  (js2-report-error "msg.unterminated.string.lit")
-                  (throw 'return js2-STRING))
-
-                (when (eq c ?\\)
-                  ;; We've hit an escaped character
-                  (setq c (js2-get-char))
-                  (case c
-                    (?b (setq c ?\b))
-                    (?f (setq c ?\f))
-                    (?n (setq c ?\n))
-                    (?r (setq c ?\r))
-                    (?t (setq c ?\t))
-                    (?v (setq c ?\v))
-                    (?u
-                     (setq c1 (js2-read-unicode-escape))
-                     (if js2-parse-ide-mode
-                         (if c1
-                             (progn
-                               ;; just copy the string in IDE-mode
-                               (js2-add-to-string ?\\)
-                               (js2-add-to-string ?u)
-                               (dotimes (i 3)
-                                 (js2-add-to-string (js2-get-char)))
-                               (setq c (js2-get-char))) ; added at end of loop
-                           ;; flag it as an invalid escape
-                           (js2-report-warning "msg.invalid.escape"
-                                               nil (- js2-ts-cursor 2) 6))
-                       ;; Get 4 hex digits; if the u escape is not
-                       ;; followed by 4 hex digits, use 'u' + the
-                       ;; literal character sequence that follows.
-                       (js2-add-to-string ?u)
-                       (setq escape-val 0)
-                       (dotimes (i 4)
-                         (setq c (js2-get-char)
-                               escape-val (js2-x-digit-to-int c escape-val))
-                         (if (minusp escape-val)
-                             (throw 'continue nil))
-                         (js2-add-to-string c))
-                       ;; prepare for replace of stored 'u' sequence by escape value
-                       (setq js2-ts-string-buffer (nthcdr 5 js2-ts-string-buffer)
-                             c escape-val)))
-                    (?x
-                     ;; Get 2 hex digits, defaulting to 'x'+literal
-                     ;; sequence, as above.
-                     (setq c (js2-get-char)
-                           escape-val (js2-x-digit-to-int c 0))
-                     (if (minusp escape-val)
-                         (progn
-                           (js2-add-to-string ?x)
-                           (throw 'continue nil))
-                       (setq c1 c
-                             c (js2-get-char)
-                             escape-val (js2-x-digit-to-int c escape-val))
-                       (if (minusp escape-val)
-                           (progn
-                             (js2-add-to-string ?x)
-                             (js2-add-to-string c1)
-                             (throw 'continue nil))
-                         ;; got 2 hex digits
-                         (setq c escape-val))))
-                    (?\n
-                     ;; Remove line terminator after escape to follow
-                     ;; SpiderMonkey and C/C++
-                     (setq c (js2-get-char))
-                     (throw 'continue nil))
-                    (t
-                     (when (and (<= ?0 c) (< c ?8))
-                       (setq val (- c ?0)
-                             c (js2-get-char))
-                       (when (and (<= ?0 c) (< c ?8))
-                         (setq val (- (+ (* 8 val) c) ?0)
-                               c (js2-get-char))
-                         (when (and (<= ?0 c)
-                                    (< c ?8)
-                                    (< val #o37))
-                           ;; c is 3rd char of octal sequence only
-                           ;; if the resulting val <= 0377
-                           (setq val (- (+ (* 8 val) c) ?0)
-                                 c (js2-get-char))))
-                       (js2-unget-char)
-                       (setq c val)))))
-                (js2-add-to-string c)
-                (setq c (js2-get-char)))))
-          (setq js2-ts-string (js2-get-string-from-buffer))
-          (throw 'return js2-STRING))
-
-        (case c
-          (?\;
-           (throw 'return js2-SEMI))
-          (?\[
-           (throw 'return js2-LB))
-          (?\]
-           (throw 'return js2-RB))
-          (?{
-           (throw 'return js2-LC))
-          (?}
-           (throw 'return js2-RC))
-          (?\(
-           (throw 'return js2-LP))
-          (?\)
-           (throw 'return js2-RP))
-          (?,
-           (throw 'return js2-COMMA))
-          (??
-           (throw 'return js2-HOOK))
-          (?:
-           (if (js2-match-char ?:)
-               (js2-ts-return js2-COLONCOLON)
-             (throw 'return js2-COLON)))
-          (?.
-           (if (js2-match-char ?.)
-               (js2-ts-return js2-DOTDOT)
-             (if (js2-match-char ?\()
-                 (js2-ts-return js2-DOTQUERY)
-               (throw 'return js2-DOT))))
-          (?|
-           (if (js2-match-char ?|)
-               (throw 'return js2-OR)
-             (if (js2-match-char ?=)
-                 (js2-ts-return js2-ASSIGN_BITOR)
-               (throw 'return js2-BITOR))))
-          (?^
-           (if (js2-match-char ?=)
-               (js2-ts-return js2-ASSIGN_BITOR)
-             (throw 'return js2-BITXOR)))
-          (?&
-           (if (js2-match-char ?&)
-               (throw 'return js2-AND)
-             (if (js2-match-char ?=)
-                 (js2-ts-return js2-ASSIGN_BITAND)
-               (throw 'return js2-BITAND))))
-          (?=
-           (if (js2-match-char ?=)
-               (if (js2-match-char ?=)
-                   (js2-ts-return js2-SHEQ)
-                 (throw 'return js2-EQ))
-             (throw 'return js2-ASSIGN)))
-          (?!
-           (if (js2-match-char ?=)
-               (if (js2-match-char ?=)
-                   (js2-ts-return js2-SHNE)
-                 (js2-ts-return js2-NE))
-             (throw 'return js2-NOT)))
-          (?<
-           ;; NB:treat HTML begin-comment as comment-till-eol
-           (when (js2-match-char ?!)
-             (when (js2-match-char ?-)
-               (when (js2-match-char ?-)
-                 (js2-skip-line)
-                 (setq js2-ts-comment-type 'html)
-                 (throw 'return js2-COMMENT)))
-             (js2-unget-char))
-
-           (if (js2-match-char ?<)
-               (if (js2-match-char ?=)
-                   (js2-ts-return js2-ASSIGN_LSH)
-                 (js2-ts-return js2-LSH))
-             (if (js2-match-char ?=)
-                 (js2-ts-return js2-LE)
-               (throw 'return js2-LT))))
-          (?>
-           (if (js2-match-char ?>)
-               (if (js2-match-char ?>)
-                   (if (js2-match-char ?=)
-                       (js2-ts-return js2-ASSIGN_URSH)
-                     (js2-ts-return js2-URSH))
-                 (if (js2-match-char ?=)
-                     (js2-ts-return js2-ASSIGN_RSH)
-                   (js2-ts-return js2-RSH)))
-             (if (js2-match-char ?=)
-                 (js2-ts-return js2-GE)
-               (throw 'return js2-GT))))
-          (?*
-           (if (js2-match-char ?=)
-               (js2-ts-return js2-ASSIGN_MUL)
-             (throw 'return js2-MUL)))
-
-          (?/
-           ;; is it a // comment?
-           (when (js2-match-char ?/)
-             (setq js2-token-beg (- js2-ts-cursor 2))
-             (js2-skip-line)
-             (setq js2-ts-comment-type 'line)
-             (throw 'return js2-COMMENT))
-
-           ;; is it a /* comment?
-           (when (js2-match-char ?*)
-             (setq look-for-slash nil
-                   js2-token-beg (- js2-ts-cursor 2)
-                   js2-ts-comment-type
-                   (if (js2-match-char ?*)
-                       (progn
-                         (setq look-for-slash t)
-                         'jsdoc)
-                     'block))
-             (while t
-               (setq c (js2-get-char))
-               (cond
-                ((eq c js2-EOF_CHAR)
-                 (setq js2-token-end (1- js2-ts-cursor))
-                 (js2-report-error "msg.unterminated.comment")
-                 (throw 'return js2-COMMENT))
-                ((eq c ?*)
-                 (setq look-for-slash t))
-                ((eq c ?/)
-                 (if look-for-slash
-                   (js2-ts-return js2-COMMENT)))
-                (t
-                 (setq look-for-slash nil
-                       js2-token-end js2-ts-cursor)))))
-
-           (if (js2-match-char ?=)
-               (js2-ts-return js2-ASSIGN_DIV)
-             (throw 'return js2-DIV)))
-
-           (?#
-            (when js2-skip-preprocessor-directives
-              (js2-skip-line)
-              (setq js2-ts-comment-type 'preprocessor
-                    js2-token-end js2-ts-cursor)
-              (throw 'return js2-COMMENT))
-            (throw 'return js2-ERROR))
-
-          (?%
-           (if (js2-match-char ?=)
-               (js2-ts-return js2-ASSIGN_MOD)
-             (throw 'return js2-MOD)))
-          (?~
-           (throw 'return js2-BITNOT))
-          (?+
-           (if (js2-match-char ?=)
-               (js2-ts-return js2-ASSIGN_ADD)
-             (if (js2-match-char ?+)
-                 (js2-ts-return js2-INC)
-               (throw 'return js2-ADD))))
-          (?-
-           (cond
-            ((js2-match-char ?=)
-             (setq c js2-ASSIGN_SUB))
-            ((js2-match-char ?-)
-             (unless js2-ts-dirty-line
-               ;; treat HTML end-comment after possible whitespace
-               ;; after line start as comment-until-eol
-               (when (js2-match-char ?>)
-                 (js2-skip-line)
-                 (setq js2-ts-comment-type 'html)
-                 (throw 'return js2-COMMENT)))
-             (setq c js2-DEC))
-            (t
-             (setq c js2-SUB)))
-           (setq js2-ts-dirty-line t)
-           (js2-ts-return c))
-
-          (otherwise
-           (js2-report-scan-error "msg.illegal.character")))))))
-
-(defun js2-read-regexp (start-token)
-  "Called by parser when it gets / or /= in literal context."
-  (let (c
-        err
-        in-class  ; inside a '[' .. ']' character-class
-        flags
-        (continue t))
-    (setq js2-token-beg js2-ts-cursor
-          js2-ts-string-buffer nil
-          js2-ts-regexp-flags nil)
-
-    (if (eq start-token js2-ASSIGN_DIV)
-        ;; mis-scanned /=
-        (js2-add-to-string ?=)
-      (if (neq start-token js2-DIV)
-          (error "failed assertion")))
-
-    (while (and (not err)
-                (or (/= (setq c (js2-get-char)) ?/)
-                    in-class))
-      (cond
-       ((or (= c ?\n)
-            (= c js2-EOF_CHAR))
-        (setq js2-token-end (1- js2-ts-cursor)
-              err t
-              js2-ts-string (js2-collect-string js2-ts-string-buffer))
-        (js2-report-error "msg.unterminated.re.lit"))
-       (t (cond
-           ((= c ?\\)
-            (js2-add-to-string c)
-            (setq c (js2-get-char)))
-
-           ((= c ?\[)
-            (setq in-class t))
-
-           ((= c ?\])
-            (setq in-class nil)))
-          (js2-add-to-string c))))
-
-    (unless err
-      (while continue
-        (cond
-         ((js2-match-char ?g)
-          (push ?g flags))
-         ((js2-match-char ?i)
-          (push ?i flags))
-         ((js2-match-char ?m)
-          (push ?m flags))
-         (t
-          (setq continue nil))))
-      (if (js2-alpha-p (js2-peek-char))
-          (js2-report-scan-error "msg.invalid.re.flag" t
-                                 js2-ts-cursor 1))
-      (setq js2-ts-string (js2-collect-string js2-ts-string-buffer)
-            js2-ts-regexp-flags (js2-collect-string flags)
-            js2-token-end js2-ts-cursor)
-      ;; tell `parse-partial-sexp' to ignore this range of chars
-      (put-text-property js2-token-beg js2-token-end 'syntax-class '(2)))))
-
-(defun js2-get-first-xml-token ()
-  (setq js2-ts-xml-open-tags-count 0
-        js2-ts-is-xml-attribute nil
-        js2-ts-xml-is-tag-content nil)
-  (js2-unget-char)
-  (js2-get-next-xml-token))
-
-(defsubst js2-xml-discard-string ()
-  "Throw away the string in progress and flag an XML parse error."
-  (setq js2-ts-string-buffer nil
-        js2-ts-string nil)
-  (js2-report-scan-error "msg.XML.bad.form" t))
-
-(defun js2-get-next-xml-token ()
-  (setq js2-ts-string-buffer nil  ; for recording the XML
-        js2-token-beg js2-ts-cursor)
-  (let (c result)
-    (setq result
-          (catch 'return
-            (while t
-              (setq c (js2-get-char))
-              (cond
-               ((= c js2-EOF_CHAR)
-                (throw 'return js2-ERROR))
-
-               (js2-ts-xml-is-tag-content
-                (case c
-                  (?>
-                   (js2-add-to-string c)
-                   (setq js2-ts-xml-is-tag-content nil
-                         js2-ts-is-xml-attribute nil))
-                  (?/
-                   (js2-add-to-string c)
-                   (when (eq ?> (js2-peek-char))
-                     (setq c (js2-get-char))
-                     (js2-add-to-string c)
-                     (setq js2-ts-xml-is-tag-content nil)
-                     (decf js2-ts-xml-open-tags-count)))
-                  (?{
-                   (js2-unget-char)
-                   (setq js2-ts-string (js2-get-string-from-buffer))
-                   (throw 'return js2-XML))
-                  ((?\' ?\")
-                   (js2-add-to-string c)
-                   (unless (js2-read-quoted-string c)
-                     (throw 'return js2-ERROR)))
-                  (?=
-                   (js2-add-to-string c)
-                   (setq js2-ts-is-xml-attribute t))
-                  ((? ?\t ?\r ?\n)
-                   (js2-add-to-string c))
-                  (t
-                   (js2-add-to-string c)
-                   (setq js2-ts-is-xml-attribute nil)))
-                (when (and (not js2-ts-xml-is-tag-content)
-                           (zerop js2-ts-xml-open-tags-count))
-                  (setq js2-ts-string (js2-get-string-from-buffer))
-                  (throw 'return js2-XMLEND)))
-
-               (t
-                ;; else not tag content
-                (case c
-                  (?<
-                   (js2-add-to-string c)
-                   (setq c (js2-peek-char))
-                   (case c
-                     (?!
-                      (setq c (js2-get-char)) ;; skip !
-                      (js2-add-to-string c)
-                      (setq c (js2-peek-char))
-                      (case c
-                        (?-
-                         (setq c (js2-get-char)) ;; skip -
-                         (js2-add-to-string c)
-                         (if (eq c ?-)
-                             (progn
-                               (js2-add-to-string c)
-                               (unless (js2-read-xml-comment)
-                                 (throw 'return js2-ERROR)))
-                           (js2-xml-discard-string)
-                           (throw 'return js2-ERROR)))
-                        (?\[
-                         (setq c (js2-get-char)) ;; skip [
-                         (js2-add-to-string c)
-                         (if (and (= (js2-get-char) ?C)
-                                  (= (js2-get-char) ?D)
-                                  (= (js2-get-char) ?A)
-                                  (= (js2-get-char) ?T)
-                                  (= (js2-get-char) ?A)
-                                  (= (js2-get-char) ?\[))
-                             (progn
-                               (js2-add-to-string ?C)
-                               (js2-add-to-string ?D)
-                               (js2-add-to-string ?A)
-                               (js2-add-to-string ?T)
-                               (js2-add-to-string ?A)
-                               (js2-add-to-string ?\[)
-                               (unless (js2-read-cdata)
-                                 (throw 'return js2-ERROR)))
-                           (js2-xml-discard-string)
-                           (throw 'return js2-ERROR)))
-                        (t
-                         (unless (js2-read-entity)
-                           (throw 'return js2-ERROR)))))
-                     (??
-                      (setq c (js2-get-char)) ;; skip ?
-                      (js2-add-to-string c)
-                      (unless (js2-read-PI)
-                        (throw 'return js2-ERROR)))
-                     (?/
-                      ;; end tag
-                      (setq c (js2-get-char)) ;; skip /
-                      (js2-add-to-string c)
-                      (when (zerop js2-ts-xml-open-tags-count)
-                        (js2-xml-discard-string)
-                        (throw 'return js2-ERROR))
-                      (setq js2-ts-xml-is-tag-content t)
-                      (decf js2-ts-xml-open-tags-count))
-                     (t
-                      ;; start tag
-                      (setq js2-ts-xml-is-tag-content t)
-                      (incf js2-ts-xml-open-tags-count))))
-                  (?{
-                   (js2-unget-char)
-                   (setq js2-ts-string (js2-get-string-from-buffer))
-                   (throw 'return js2-XML))
-                  (t
-                   (js2-add-to-string c))))))))
-    (setq js2-token-end js2-ts-cursor)
-    result))
-
-(defun js2-read-quoted-string (quote)
-  (let (c)
-    (catch 'return
-      (while (/= (setq c (js2-get-char)) js2-EOF_CHAR)
-        (js2-add-to-string c)
-        (if (eq c quote)
-            (throw 'return t)))
-      (js2-xml-discard-string)  ;; throw away string in progress
-      nil)))
-
-(defun js2-read-xml-comment ()
-  (let ((c (js2-get-char)))
-    (catch 'return
-      (while (/= c js2-EOF_CHAR)
-        (catch 'continue
-          (js2-add-to-string c)
-          (when (and (eq c ?-) (eq ?- (js2-peek-char)))
-            (setq c (js2-get-char))
-            (js2-add-to-string c)
-            (if (eq (js2-peek-char) ?>)
-                (progn
-                  (setq c (js2-get-char)) ;; skip >
-                  (js2-add-to-string c)
-                  (throw 'return t))
-              (throw 'continue nil)))
-          (setq c (js2-get-char))))
-      (js2-xml-discard-string)
-      nil)))
-
-(defun js2-read-cdata ()
-  (let ((c (js2-get-char)))
-    (catch 'return
-      (while (/= c js2-EOF_CHAR)
-        (catch 'continue
-          (js2-add-to-string c)
-          (when (and (eq c ?\]) (eq (js2-peek-char) ?\]))
-            (setq c (js2-get-char))
-            (js2-add-to-string c)
-            (if (eq (js2-peek-char) ?>)
-                (progn
-                  (setq c (js2-get-char)) ;; Skip >
-                  (js2-add-to-string c)
-                  (throw 'return t))
-              (throw 'continue nil)))
-          (setq c (js2-get-char))))
-      (js2-xml-discard-string)
-      nil)))
-
-(defun js2-read-entity ()
-  (let ((decl-tags 1)
-        c)
-    (catch 'return
-      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
-        (js2-add-to-string c)
-        (case c
-          (?<
-           (incf decl-tags))
-          (?>
-           (decf decl-tags)
-           (if (zerop decl-tags)
-               (throw 'return t)))))
-      (js2-xml-discard-string)
-      nil)))
-
-(defun js2-read-PI ()
-  "Scan an XML processing instruction."
-  (let (c)
-    (catch 'return
-      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
-        (js2-add-to-string c)
-        (when (and (eq c ??) (eq (js2-peek-char) ?>))
-          (setq c (js2-get-char))  ;; Skip >
-          (js2-add-to-string c)
-          (throw 'return t)))
-      (js2-xml-discard-string)
-      nil)))
-
-(defun js2-scanner-get-line ()
-  "Return the text of the current scan line."
-  (buffer-substring (point-at-bol) (point-at-eol)))
-
-(provide 'js2-scan)
-
-;;; js2-scan.el ends here
-;;; js2-messages:  localizable messages for js2-mode
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Commentary:
-
-;; Messages are copied from Rhino's Messages.properties.
-;; Many of the Java-specific messages have been elided.
-;; Add any js2-specific ones at the end, so we can keep
-;; this file synced with changes to Rhino's.
-;;
-;; TODO:
-;;  - move interpreter messages into separate file
-
-;;; Code:
-
-(defvar js2-message-table
-  (make-hash-table :test 'equal :size 250)
-  "Contains localized messages for js2-mode.")
-
-;; TODO:  construct this hashtable at compile-time.
-(defmacro js2-msg (key &rest strings)
-  `(puthash ,key (funcall #'concat ,@strings)
-            js2-message-table))
-
-(defun js2-get-msg (msg-key)
-  "Look up a localized message.
-MSG-KEY is a list of (MSG ARGS).  If the message takes parameters,
-the correct number of ARGS must be provided."
-  (let* ((key (if (listp msg-key) (car msg-key) msg-key))
-         (args (if (listp msg-key) (cdr msg-key)))
-         (msg (gethash key js2-message-table)))
-    (if msg
-        (apply #'format msg args)
-      key)))  ; default to showing the key
-
-(js2-msg "msg.dup.parms"
-         "Duplicate parameter name '%s'.")
-
-(js2-msg "msg.too.big.jump"
-         "Program too complex: jump offset too big.")
-
-(js2-msg "msg.too.big.index"
-         "Program too complex: internal index exceeds 64K limit.")
-
-(js2-msg "msg.while.compiling.fn"
-         "Encountered code generation error while compiling function '%s': %s")
-
-(js2-msg "msg.while.compiling.script"
-         "Encountered code generation error while compiling script: %s")
-
-;; Context
-(js2-msg "msg.ctor.not.found"
-         "Constructor for '%s' not found.")
-
-(js2-msg "msg.not.ctor"
-         "'%s' is not a constructor.")
-
-;; FunctionObject
-(js2-msg "msg.varargs.ctor"
-         "Method or constructor '%s' must be static "
-         "with the signature (Context cx, Object[] args, "
-         "Function ctorObj, boolean inNewExpr) "
-         "to define a variable arguments constructor.")
-
-(js2-msg "msg.varargs.fun"
-         "Method '%s' must be static with the signature "
-         "(Context cx, Scriptable thisObj, Object[] args, Function funObj) "
-         "to define a variable arguments function.")
-
-(js2-msg "msg.incompat.call"
-         "Method '%s' called on incompatible object.")
-
-(js2-msg "msg.bad.parms"
-         "Unsupported parameter type '%s' in method '%s'.")
-
-(js2-msg "msg.bad.method.return"
-         "Unsupported return type '%s' in method '%s'.")
-
-(js2-msg "msg.bad.ctor.return"
-         "Construction of objects of type '%s' is not supported.")
-
-(js2-msg "msg.no.overload"
-         "Method '%s' occurs multiple times in class '%s'.")
-
-(js2-msg "msg.method.not.found"
-         "Method '%s' not found in '%s'.")
-
-;; IRFactory
-
-(js2-msg "msg.bad.for.in.lhs"
-         "Invalid left-hand side of for..in loop.")
-
-(js2-msg "msg.mult.index"
-         "Only one variable allowed in for..in loop.")
-
-(js2-msg "msg.bad.for.in.destruct"
-         "Left hand side of for..in loop must be an array of "
-         "length 2 to accept key/value pair.")
-
-(js2-msg "msg.cant.convert"
-         "Can't convert to type '%s'.")
-
-(js2-msg "msg.bad.assign.left"
-         "Invalid assignment left-hand side.")
-
-(js2-msg "msg.bad.decr"
-         "Invalid decerement operand.")
-
-(js2-msg "msg.bad.incr"
-         "Invalid increment operand.")
-
-(js2-msg "msg.bad.yield"
-         "yield must be in a function.")
-
-(js2-msg "msg.yield.parenthesized"
-         "yield expression must be parenthesized.")
-
-;; NativeGlobal
-(js2-msg "msg.cant.call.indirect"
-          "Function '%s' must be called directly, and not by way of a "
-          "function of another name.")
-
-(js2-msg "msg.eval.nonstring"
-          "Calling eval() with anything other than a primitive "
-          "string value will simply return the value. "
-          "Is this what you intended?")
-
-(js2-msg "msg.eval.nonstring.strict"
-         "Calling eval() with anything other than a primitive "
-         "string value is not allowed in strict mode.")
-
-(js2-msg "msg.bad.destruct.op"
-         "Invalid destructuring assignment operator")
-
-;; NativeCall
-(js2-msg "msg.only.from.new"
-         "'%s' may only be invoked from a `new' expression.")
-
-(js2-msg "msg.deprec.ctor"
-         "The '%s' constructor is deprecated.")
-
-;; NativeFunction
-(js2-msg "msg.no.function.ref.found"
-         "no source found to decompile function reference %s")
-
-(js2-msg "msg.arg.isnt.array"
-         "second argument to Function.prototype.apply must be an array")
-
-;; NativeGlobal
-(js2-msg "msg.bad.esc.mask"
-         "invalid string escape mask")
-
-;; NativeRegExp
-(js2-msg "msg.bad.quant"
-  "Invalid quantifier %s")
-
-(js2-msg "msg.overlarge.backref"
-  "Overly large back reference %s")
-
-(js2-msg "msg.overlarge.min"
-  "Overly large minimum %s")
-
-(js2-msg "msg.overlarge.max"
-  "Overly large maximum %s")
-
-(js2-msg "msg.zero.quant"
-  "Zero quantifier %s")
-
-(js2-msg "msg.max.lt.min"
-  "Maximum %s less than minimum")
-
-(js2-msg "msg.unterm.quant"
-  "Unterminated quantifier %s")
-
-(js2-msg "msg.unterm.paren"
-  "Unterminated parenthetical %s")
-
-(js2-msg "msg.unterm.class"
-  "Unterminated character class %s")
-
-(js2-msg "msg.bad.range"
-  "Invalid range in character class.")
-
-(js2-msg "msg.trail.backslash"
-  "Trailing \\ in regular expression.")
-
-(js2-msg "msg.re.unmatched.right.paren"
-  "unmatched ) in regular expression.")
-
-(js2-msg "msg.no.regexp"
-  "Regular expressions are not available.")
-
-(js2-msg "msg.bad.backref"
-  "back-reference exceeds number of capturing parentheses.")
-
-(js2-msg "msg.bad.regexp.compile"
-         "Only one argument may be specified if the first "
-         "argument to RegExp.prototype.compile is a RegExp object.")
-
-;; Parser
-(js2-msg "msg.got.syntax.errors"
-         "Compilation produced %s syntax errors.")
-
-(js2-msg "msg.var.redecl"
-         "TypeError: redeclaration of var %s.")
-
-(js2-msg "msg.const.redecl"
-         "TypeError: redeclaration of const %s.")
-
-(js2-msg "msg.let.redecl"
-         "TypeError: redeclaration of variable %s.")
-
-(js2-msg "msg.parm.redecl"
-         "TypeError: redeclaration of formal parameter %s.")
-
-(js2-msg "msg.fn.redecl"
-         "TypeError: redeclaration of function %s.")
-
-(js2-msg "msg.let.decl.not.in.block"
-         "SyntaxError: let declaration not directly within block")
-
-;; NodeTransformer
-(js2-msg "msg.dup.label"
-         "duplicated label")
-
-(js2-msg "msg.undef.label"
-         "undefined label")
-
-(js2-msg "msg.bad.break"
-         "unlabelled break must be inside loop or switch")
-
-(js2-msg "msg.continue.outside"
-         "continue must be inside loop")
-
-(js2-msg "msg.continue.nonloop"
-         "continue can only use labels of iteration statements")
-
-(js2-msg "msg.bad.throw.eol"
-         "Line terminator is not allowed between the throw "
-         "keyword and throw expression.")
-
-(js2-msg "msg.no.paren.parms"
-         "missing ( before function parameters.")
-
-(js2-msg "msg.no.parm"
-         "missing formal parameter")
-
-(js2-msg "msg.no.paren.after.parms"
-         "missing ) after formal parameters")
-
-(js2-msg "msg.no.brace.body"
-         "missing '{' before function body")
-
-(js2-msg "msg.no.brace.after.body"
-         "missing } after function body")
-
-(js2-msg "msg.no.paren.cond"
-         "missing ( before condition")
-
-(js2-msg "msg.no.paren.after.cond"
-         "missing ) after condition")
-
-(js2-msg "msg.no.semi.stmt"
-         "missing ; before statement")
-
-(js2-msg "msg.missing.semi"
-         "missing ; after statement")
-
-(js2-msg "msg.no.name.after.dot"
-         "missing name after . operator")
-
-(js2-msg "msg.no.name.after.coloncolon"
-         "missing name after :: operator")
-
-(js2-msg "msg.no.name.after.dotdot"
-         "missing name after .. operator")
-
-(js2-msg "msg.no.name.after.xmlAttr"
-         "missing name after .@")
-
-(js2-msg "msg.no.bracket.index"
-         "missing ] in index expression")
-
-(js2-msg "msg.no.paren.switch"
-         "missing ( before switch expression")
-
-(js2-msg "msg.no.paren.after.switch"
-         "missing ) after switch expression")
-
-(js2-msg "msg.no.brace.switch"
-         "missing '{' before switch body")
-
-(js2-msg "msg.bad.switch"
-         "invalid switch statement")
-
-(js2-msg "msg.no.colon.case"
-         "missing : after case expression")
-
-(js2-msg "msg.double.switch.default"
-         "double default label in the switch statement")
-
-(js2-msg "msg.no.while.do"
-         "missing while after do-loop body")
-
-(js2-msg "msg.no.paren.for"
-         "missing ( after for")
-
-(js2-msg "msg.no.semi.for"
-         "missing ; after for-loop initializer")
-
-(js2-msg "msg.no.semi.for.cond"
-         "missing ; after for-loop condition")
-
-(js2-msg "msg.in.after.for.name"
-         "missing in after for")
-
-(js2-msg "msg.no.paren.for.ctrl"
-         "missing ) after for-loop control")
-
-(js2-msg "msg.no.paren.with"
-         "missing ( before with-statement object")
-
-(js2-msg "msg.no.paren.after.with"
-         "missing ) after with-statement object")
-
-(js2-msg "msg.no.paren.after.let"
-         "missing ( after let")
-
-(js2-msg "msg.no.paren.let"
-         "missing ) after variable list")
-
-(js2-msg "msg.no.curly.let"
-         "missing } after let statement")
-
-(js2-msg "msg.bad.return"
-         "invalid return")
-
-(js2-msg "msg.no.brace.block"
-         "missing } in compound statement")
-
-(js2-msg "msg.bad.label"
-         "invalid label")
-
-(js2-msg "msg.bad.var"
-         "missing variable name")
-
-(js2-msg "msg.bad.var.init"
-         "invalid variable initialization")
-
-(js2-msg "msg.no.colon.cond"
-         "missing : in conditional expression")
-
-(js2-msg "msg.no.paren.arg"
-         "missing ) after argument list")
-
-(js2-msg "msg.no.bracket.arg"
-         "missing ] after element list")
-
-(js2-msg "msg.bad.prop"
-         "invalid property id")
-
-(js2-msg "msg.no.colon.prop"
-         "missing : after property id")
-
-(js2-msg "msg.no.brace.prop"
-         "missing } after property list")
-
-(js2-msg "msg.no.paren"
-         "missing ) in parenthetical")
-
-(js2-msg "msg.reserved.id"
-         "identifier is a reserved word")
-
-(js2-msg "msg.no.paren.catch"
-         "missing ( before catch-block condition")
-
-(js2-msg "msg.bad.catchcond"
-         "invalid catch block condition")
-
-(js2-msg "msg.catch.unreachable"
-         "any catch clauses following an unqualified catch are unreachable")
-
-(js2-msg "msg.no.brace.try"
-         "missing '{' before try block")
-
-(js2-msg "msg.no.brace.catchblock"
-         "missing '{' before catch-block body")
-
-(js2-msg "msg.try.no.catchfinally"
-         "'try' without 'catch' or 'finally'")
-
-(js2-msg "msg.no.return.value"
-         "function %s does not always return a value")
-
-(js2-msg "msg.anon.no.return.value"
-         "anonymous function does not always return a value")
-
-(js2-msg "msg.return.inconsistent"
-         "return statement is inconsistent with previous usage")
-
-(js2-msg "msg.generator.returns"
-         "TypeError: generator function '%s' returns a value")
-
-(js2-msg "msg.anon.generator.returns"
-         "TypeError: anonymous generator function returns a value")
-
-(js2-msg "msg.syntax"
-         "syntax error")
-
-(js2-msg "msg.unexpected.eof"
-         "Unexpected end of file")
-
-(js2-msg "msg.XML.bad.form"
-         "illegally formed XML syntax")
-
-(js2-msg "msg.XML.not.available"
-         "XML runtime not available")
-
-(js2-msg "msg.too.deep.parser.recursion"
-         "Too deep recursion while parsing")
-
-(js2-msg "msg.no.side.effects"
-         "Code has no side effects")
-
-(js2-msg "msg.extra.trailing.comma"
-         "Trailing comma is not legal in an ECMA-262 object initializer")
-
-(js2-msg "msg.array.trailing.comma"
-         "Trailing comma yields different behavior across browsers")
-
-(js2-msg "msg.equal.as.assign"
-         (concat "Test for equality (==) mistyped as assignment (=)?"
-                 " (parenthesize to suppress warning)"))
-
-(js2-msg "msg.var.hides.arg"
-         "Variable %s hides argument")
-
-(js2-msg "msg.destruct.assign.no.init"
-         "Missing = in destructuring declaration")
-
-;; ScriptRuntime
-(js2-msg "msg.no.properties"
-         "%s has no properties.")
-
-(js2-msg "msg.invalid.iterator"
-         "Invalid iterator value")
-
-(js2-msg "msg.iterator.primitive"
-         "__iterator__ returned a primitive value")
-
-(js2-msg "msg.assn.create.strict"
-         "Assignment to undeclared variable %s")
-
-(js2-msg "msg.ref.undefined.prop"
-         "Reference to undefined property '%s'")
-
-(js2-msg "msg.prop.not.found"
-         "Property %s not found.")
-
-(js2-msg "msg.invalid.type"
-         "Invalid JavaScript value of type %s")
-
-(js2-msg "msg.primitive.expected"
-         "Primitive type expected (had %s instead)")
-
-(js2-msg "msg.namespace.expected"
-         "Namespace object expected to left of :: (found %s instead)")
-
-(js2-msg "msg.null.to.object"
-         "Cannot convert null to an object.")
-
-(js2-msg "msg.undef.to.object"
-         "Cannot convert undefined to an object.")
-
-(js2-msg "msg.cyclic.value"
-         "Cyclic %s value not allowed.")
-
-(js2-msg "msg.is.not.defined"
-         "'%s' is not defined.")
-
-(js2-msg "msg.undef.prop.read"
-         "Cannot read property '%s' from %s")
-
-(js2-msg "msg.undef.prop.write"
-         "Cannot set property '%s' of %s to '%s'")
-
-(js2-msg "msg.undef.prop.delete"
-         "Cannot delete property '%s' of %s")
-
-(js2-msg "msg.undef.method.call"
-         "Cannot call method '%s' of %s")
-
-(js2-msg "msg.undef.with"
-         "Cannot apply 'with' to %s")
-
-(js2-msg "msg.isnt.function"
-         "%s is not a function, it is %s.")
-
-(js2-msg "msg.isnt.function.in"
-         "Cannot call property %s in object %s. "
-         "It is not a function, it is '%s'.")
-
-(js2-msg "msg.function.not.found"
-         "Cannot find function %s.")
-
-(js2-msg "msg.function.not.found.in"
-         "Cannot find function %s in object %s.")
-
-(js2-msg "msg.isnt.xml.object"
-         "%s is not an xml object.")
-
-(js2-msg "msg.no.ref.to.get"
-         "%s is not a reference to read reference value.")
-
-(js2-msg "msg.no.ref.to.set"
-         "%s is not a reference to set reference value to %s.")
-
-(js2-msg "msg.no.ref.from.function"
-         "Function %s can not be used as the left-hand "
-         "side of assignment or as an operand of ++ or -- operator.")
-
-(js2-msg "msg.bad.default.value"
-         "Object's getDefaultValue() method returned an object.")
-
-(js2-msg "msg.instanceof.not.object"
-         "Can't use instanceof on a non-object.")
-
-(js2-msg "msg.instanceof.bad.prototype"
-         "'prototype' property of %s is not an object.")
-
-(js2-msg "msg.bad.radix"
-         "illegal radix %s.")
-
-;; ScriptableObject
-(js2-msg "msg.default.value"
-         "Cannot find default value for object.")
-
-(js2-msg "msg.zero.arg.ctor"
-         "Cannot load class '%s' which has no zero-parameter constructor.")
-
-(js2-msg "msg.ctor.multiple.parms"
-         "Can't define constructor or class %s since more than "
-         "one constructor has multiple parameters.")
-
-(js2-msg "msg.extend.scriptable"
-         "%s must extend ScriptableObject in order to define property %s.")
-
-(js2-msg "msg.bad.getter.parms"
-         "In order to define a property, getter %s must have zero "
-         "parameters or a single ScriptableObject parameter.")
-
-(js2-msg "msg.obj.getter.parms"
-         "Expected static or delegated getter %s to take "
-         "a ScriptableObject parameter.")
-
-(js2-msg "msg.getter.static"
-         "Getter and setter must both be static or neither be static.")
-
-(js2-msg "msg.setter.return"
-         "Setter must have void return type: %s")
-
-(js2-msg "msg.setter2.parms"
-         "Two-parameter setter must take a ScriptableObject as "
-         "its first parameter.")
-
-(js2-msg "msg.setter1.parms"
-         "Expected single parameter setter for %s")
-
-(js2-msg "msg.setter2.expected"
-         "Expected static or delegated setter %s to take two parameters.")
-
-(js2-msg "msg.setter.parms"
-         "Expected either one or two parameters for setter.")
-
-(js2-msg "msg.setter.bad.type"
-         "Unsupported parameter type '%s' in setter '%s'.")
-
-(js2-msg "msg.add.sealed"
-         "Cannot add a property to a sealed object: %s.")
-
-(js2-msg "msg.remove.sealed"
-         "Cannot remove a property from a sealed object: %s.")
-
-(js2-msg "msg.modify.sealed"
-         "Cannot modify a property of a sealed object: %s.")
-
-(js2-msg "msg.modify.readonly"
-         "Cannot modify readonly property: %s.")
-
-;; TokenStream
-(js2-msg "msg.missing.exponent"
-         "missing exponent")
-
-(js2-msg "msg.caught.nfe"
-         "number format error")
-
-(js2-msg "msg.unterminated.string.lit"
-         "unterminated string literal")
-
-(js2-msg "msg.unterminated.comment"
-         "unterminated comment")
-
-(js2-msg "msg.unterminated.re.lit"
-         "unterminated regular expression literal")
-
-(js2-msg "msg.invalid.re.flag"
-         "invalid flag after regular expression")
-
-(js2-msg "msg.no.re.input.for"
-         "no input for %s")
-
-(js2-msg "msg.illegal.character"
-         "illegal character")
-
-(js2-msg "msg.invalid.escape"
-         "invalid Unicode escape sequence")
-
-(js2-msg "msg.bad.namespace"
-         "not a valid default namespace statement. "
-         "Syntax is: default xml namespace = EXPRESSION;")
-
-;; TokensStream warnings
-(js2-msg "msg.bad.octal.literal"
-         "illegal octal literal digit %s; "
-         "interpreting it as a decimal digit")
-
-(js2-msg "msg.reserved.keyword"
-         "illegal usage of future reserved keyword %s; "
-         "interpreting it as ordinary identifier")
-
-(js2-msg "msg.script.is.not.constructor"
-         "Script objects are not constructors.")
-
-;; Arrays
-(js2-msg "msg.arraylength.bad"
-         "Inappropriate array length.")
-
-;; Arrays
-(js2-msg "msg.arraylength.too.big"
-         "Array length %s exceeds supported capacity limit.")
-
-;; URI
-(js2-msg "msg.bad.uri"
-         "Malformed URI sequence.")
-
-;; Number
-(js2-msg "msg.bad.precision"
-         "Precision %s out of range.")
-
-;; NativeGenerator
-(js2-msg "msg.send.newborn"
-         "Attempt to send value to newborn generator")
-
-(js2-msg "msg.already.exec.gen"
-         "Already executing generator")
-
-(js2-msg "msg.StopIteration.invalid"
-         "StopIteration may not be changed to an arbitrary object.")
-
-;; Interpreter
-(js2-msg "msg.yield.closing"
-         "Yield from closing generator")
-
-(provide 'js2-messages)
-;;; js2-ast.el --- JavaScript syntax tree node definitions
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Code:
-
-(eval-and-compile
-  (require 'cl))
-
-
-;; flags for ast node property 'member-type (used for e4x operators)
-(defvar js2-property-flag    #x1 "property access: element is valid name")
-(defvar js2-attribute-flag   #x2 "x.@y or x..@y")
-(defvar js2-descendants-flag #x4 "x..y or x..@i")
-
-(defsubst js2-relpos (pos anchor)
-  "Convert POS to be relative to ANCHOR.
-If POS is nil, returns nil."
-  (and pos (- pos anchor)))
-
-(defsubst js2-make-pad (indent)
-  (if (zerop indent)
-      ""
-    (make-string (* indent js2-basic-offset) ? )))
-
-(defsubst js2-visit-ast (node callback)
-  "Visit every node in ast NODE with visitor CALLBACK.
-
-CALLBACK is a function that takes two arguments:  (NODE END-P).  It is
-called twice:  once to visit the node, and again after all the node's
-children have been processed.  The END-P argument is nil on the first
-call and non-nil on the second call.  The return value of the callback
-affects the traversal:  if non-nil, the children of NODE are processed.
-If the callback returns nil, or if the node has no children, then the
-callback is called immediately with a non-nil END-P argument.
-
-The node traversal is approximately lexical-order, although there
-are currently no guarantees around this."
-  (let ((vfunc (get (aref node 0) 'js2-visitor)))
-    ;; visit the node
-    (when  (funcall callback node nil)
-      ;; visit the kids
-      (cond
-       ((eq vfunc 'js2-visit-none)
-        nil)                            ; don't even bother calling it
-       ;; Each AST node type has to define a `js2-visitor' function
-       ;; that takes a node and a callback, and calls `js2-visit-ast'
-       ;; on each child of the node.
-       (vfunc
-        (funcall vfunc node callback))
-       (t
-        (error "%s does not define a visitor-traversal function"
-               (aref node 0)))))
-    ;; call the end-visit
-    (funcall callback node t)))
-
-(defstruct (js2-node
-            (:constructor nil))  ; abstract
-  "Base AST node type."
-  (type -1)  ; token type
-  (pos -1)   ; start position of this AST node in parsed input
-  (len 1)    ; num characters spanned by the node
-  props      ; optional node property list (an alist)
-  parent)    ; link to parent node; null for root
-
-(defsubst js2-node-get-prop (node prop &optional default)
-  (or (cadr (assoc prop (js2-node-props node))) default))
-
-(defsubst js2-node-set-prop (node prop value)
-  (setf (js2-node-props node)
-        (cons (list prop value) (js2-node-props node))))
-
-(defsubst js2-fixup-starts (n nodes)
-  "Adjust the start positions of NODES to be relative to N.
-Any node in the list may be nil, for convenience."
-  (dolist (node nodes)
-    (when node
-      (setf (js2-node-pos node) (- (js2-node-pos node)
-                                   (js2-node-pos n))))))
-
-(defsubst js2-node-add-children (parent &rest nodes)
-  "Set parent node of NODES to PARENT, and return PARENT.
-Does nothing if we're not recording parent links.
-If any given node in NODES is nil, doesn't record that link."
-  (js2-fixup-starts parent nodes)
-  (dolist (node nodes)
-    (and node
-         (setf (js2-node-parent node) parent))))
-
-;; Non-recursive since it's called a frightening number of times.
-(defsubst js2-node-abs-pos (n)
-  (let ((pos (js2-node-pos n)))
-    (while (setq n (js2-node-parent n))
-      (setq pos (+ pos (js2-node-pos n))))
-    pos))
-
-(defsubst js2-node-abs-end (n)
-  "Return absolute buffer position of end of N."
-  (+ (js2-node-abs-pos n) (js2-node-len n)))
-
-;; It's important to make sure block nodes have a lisp list for the
-;; child nodes, to limit printing recursion depth in an AST that
-;; otherwise consists of defstruct vectors.  Emacs will crash printing
-;; a sufficiently large vector tree.
-
-(defstruct (js2-block-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-block-node (&key (type js2-BLOCK)
-                                                    (pos js2-token-beg)
-                                                    len
-                                                    props
-                                                    kids)))
-  "A block of statements."
-  kids)  ; a lisp list of the child statement nodes
-
-(put 'cl-struct-js2-block-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-block-node 'js2-printer 'js2-print-block)
-
-(defsubst js2-visit-block (ast callback)
-  "Visit the `js2-block-node' children of AST."
-  (dolist (kid (js2-block-node-kids ast))
-    (js2-visit-ast kid callback)))
-
-(defun js2-print-block (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "{\n")
-    (dolist (kid (js2-block-node-kids n))
-      (js2-print-ast kid (1+ i)))
-    (insert pad "}")))
-
-(defstruct (js2-scope
-            (:include js2-block-node)
-            (:constructor nil)
-            (:constructor make-js2-scope (&key (type js2-BLOCK)
-                                               (pos js2-token-beg)
-                                               len
-                                               kids)))
-  ;; The symbol-table is a LinkedHashMap<String,Symbol> in Rhino.
-  ;; I don't have one of those handy, so I'll use an alist for now.
-  ;; It's as fast as an emacs hashtable for up to about 50 elements,
-  ;; and is much lighter-weight to construct (both CPU and mem).
-  ;; The keys are interned strings (symbols) for faster lookup.
-  ;; Should switch to hybrid alist/hashtable eventually.
-  symbol-table  ; an alist of (symbol . js2-symbol)
-  parent-scope  ; a `js2-scope'
-  top)          ; top-level `js2-scope' (script/function)
-
-(put 'cl-struct-js2-scope 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-scope 'js2-printer 'js2-print-none)
-
-(defun js2-scope-set-parent-scope (scope parent)
-  (setf (js2-scope-parent-scope scope) parent
-        (js2-scope-top scope) (if (null parent)
-                                  scope
-                                (js2-scope-top parent))))
-
-(defun js2-node-get-enclosing-scope (node)
-  "Return the innermost `js2-scope' node surrounding NODE.
-Returns nil if there is no enclosing scope node."
-  (let ((parent (js2-node-parent node)))
-    (while (not (js2-scope-p parent))
-      (setq parent (js2-node-parent parent)))
-    parent))
-
-(defun js2-get-defining-scope (scope name)
-  "Search up scope chain from SCOPE looking for NAME, a string or symbol.
-Returns `js2-scope' in which NAME is defined, or nil if not found."
-  (let ((sym (if (symbolp name)
-                 name
-               (intern name)))
-        table
-        result
-        (continue t))
-    (while (and scope continue)
-      (if (and (setq table (js2-scope-symbol-table scope))
-               (assq sym table))
-          (setq continue nil
-                result scope)
-        (setq scope (js2-scope-parent-scope scope))))
-    result))
-
-(defsubst js2-scope-get-symbol (scope name)
-  "Return symbol table entry for NAME in SCOPE.
-NAME can be a string or symbol.   Returns a `js2-symbol' or nil if not found."
-  (and (js2-scope-symbol-table scope)
-       (cdr (assq (if (symbolp name)
-                      name
-                    (intern name))
-                  (js2-scope-symbol-table scope)))))
-
-(defsubst js2-scope-put-symbol (scope name symbol)
-  "Enter SYMBOL into symbol-table for SCOPE under NAME.
-NAME can be a lisp symbol or string.  SYMBOL is a `js2-symbol'."
-  (let* ((table (js2-scope-symbol-table scope))
-         (sym (if (symbolp name) name (intern name)))
-         (entry (assq sym table)))
-    (if entry
-        (setcdr entry symbol)
-      (push (cons sym symbol)
-            (js2-scope-symbol-table scope)))))
-
-(defstruct (js2-symbol
-            (:constructor nil)
-            (:constructor make-js2-symbol (decl-type name &optional ast-node)))
-  "A symbol table entry."
-  ;; One of js2-FUNCTION, js2-LP (for parameters), js2-VAR,
-  ;; js2-LET, or js2-CONST
-  decl-type
-  name  ; string
-  ast-node) ; a `js2-node'
-
-(defstruct (js2-error-node
-            (:include js2-node)
-            (:constructor nil) ; silence emacs21 byte-compiler
-            (:constructor make-js2-error-node (&key (type js2-ERROR)
-                                                    (pos js2-token-beg)
-                                                    len)))
-  "AST node representing a parse error.")
-
-(put 'cl-struct-js2-error-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-error-node 'js2-printer 'js2-print-none)
-
-(defstruct (js2-script-node
-            (:include js2-scope)
-            (:constructor nil)
-            (:constructor make-js2-script-node (&key (type js2-SCRIPT)
-                                                     (pos js2-token-beg)
-                                                     len
-                                                     var-decls
-                                                     fun-decls)))
-  functions   ; lisp list of nested functions
-  regexps     ; lisp list of (string . flags)
-  symbols     ; alist (every symbol gets unique index)
-  (param-count 0)
-  var-names   ; vector of string names
-  consts      ; bool-vector matching var-decls
-  (temp-number 0))  ; for generating temp variables
-
-(put 'cl-struct-js2-script-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-script-node 'js2-printer 'js2-print-script)
-
-(defun js2-print-script (node indent)
-  (dolist (kid (js2-block-node-kids node))
-    (js2-print-ast kid indent)))
-
-(defstruct (js2-ast-root
-            (:include js2-script-node)
-            (:constructor nil)
-            (:constructor make-js2-ast-root (&key (type js2-SCRIPT)
-                                                  (pos js2-token-beg)
-                                                  len
-                                                  buffer)))
-  "The root node of a js2 AST."
-  buffer         ; the source buffer from which the code was parsed
-  comments       ; a lisp list of comments, ordered by start position
-  errors         ; a lisp list of errors found during parsing
-  warnings       ; a lisp list of warnings found during parsing
-  node-count)    ; number of nodes in the tree, including the root
-
-(put 'cl-struct-js2-ast-root 'js2-visitor 'js2-visit-ast-root)
-(put 'cl-struct-js2-ast-root 'js2-printer 'js2-print-script)
-
-(defun js2-visit-ast-root (ast callback)
-  (dolist (kid (js2-ast-root-kids ast))
-    (js2-visit-ast kid callback))
-  (dolist (comment (js2-ast-root-comments ast))
-    (js2-visit-ast comment callback)))
-
-(defstruct (js2-comment-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-comment-node (&key (type js2-COMMENT)
-                                                      (pos js2-token-beg)
-                                                      len
-                                                      (format js2-ts-comment-type))))
-  format)  ; 'line, 'block, 'jsdoc or 'html
-
-(put 'cl-struct-js2-comment-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-comment-node 'js2-printer 'js2-print-comment)
-
-(defun js2-print-comment (n i)
-  ;; We really ought to link end-of-line comments to their nodes.
-  ;; Or maybe we could add a new comment type, 'endline.
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-(defstruct (js2-expr-stmt-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-expr-stmt-node (&key (type js2-EXPR_VOID)
-                                                        (pos js2-ts-cursor)
-                                                        len
-                                                        expr)))
-  "An expression statement."
-  expr)
-
-(defsubst js2-expr-stmt-node-set-has-result (node)
-  "Change the node type to `js2-EXPR_RESULT'.  Used for code generation."
-  (setf (js2-node-type node) js2-EXPR_RESULT))
-
-(put 'cl-struct-js2-expr-stmt-node 'js2-visitor 'js2-visit-expr-stmt-node)
-(put 'cl-struct-js2-expr-stmt-node 'js2-printer 'js2-print-expr-stmt-node)
-
-(defun js2-visit-expr-stmt-node (n v)
-  (js2-visit-ast (js2-expr-stmt-node-expr n) v))
-
-(defun js2-print-expr-stmt-node (n indent)
-  (js2-print-ast (js2-expr-stmt-node-expr n) indent)
-  (insert ";\n"))
-
-(defstruct (js2-loop-node
-            (:include js2-scope)
-            (:constructor nil))
-  "Abstract supertype of loop nodes."
-  body      ; a `js2-block-node'
-  lp        ; position of left-paren, nil if omitted
-  rp)       ; position of right-paren, nil if omitted
-
-(defstruct (js2-do-node
-            (:include js2-loop-node)
-            (:constructor nil)
-            (:constructor make-js2-do-node (&key (type js2-DO)
-                                                 (pos js2-token-beg)
-                                                 len
-                                                 body
-                                                 condition
-                                                 while-pos
-                                                 lp
-                                                 rp)))
-  "AST node for do-loop."
-  condition  ; while (expression)
-  while-pos) ; buffer position of 'while' keyword
-
-(put 'cl-struct-js2-do-node 'js2-visitor 'js2-visit-do-node)
-(put 'cl-struct-js2-do-node 'js2-printer 'js2-print-do-node)
-
-(defun js2-visit-do-node (n v)
-  (js2-visit-ast (js2-do-node-body n) v)
-  (js2-visit-ast (js2-do-node-condition n) v))
-
-(defun js2-print-do-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "do {\n")
-    (dolist (kid (js2-block-node-kids (js2-do-node-body n)))
-      (js2-print-ast kid (1+ i)))
-    (insert pad "} while (")
-    (js2-print-ast (js2-do-node-condition n) 0)
-    (insert ");\n")))
-
-(defstruct (js2-while-node
-            (:include js2-loop-node)
-            (:constructor nil)
-            (:constructor make-js2-while-node (&key (type js2-WHILE)
-                                                    (pos js2-token-beg)
-                                                    len
-                                                    body
-                                                    condition
-                                                    lp
-                                                    rp)))
-  "AST node for while-loop."
-  condition)    ; while-condition
-
-(put 'cl-struct-js2-while-node 'js2-visitor 'js2-visit-while-node)
-(put 'cl-struct-js2-while-node 'js2-printer 'js2-print-while-node)
-
-(defun js2-visit-while-node (n v)
-  (js2-visit-ast (js2-while-node-condition n) v)
-  (js2-visit-ast (js2-while-node-body n) v))
-
-(defun js2-print-while-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "while (")
-    (js2-print-ast (js2-while-node-condition n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-while-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(defstruct (js2-for-node
-            (:include js2-loop-node)
-            (:constructor nil)
-            (:constructor make-js2-for-node (&key (type js2-FOR)
-                                                  (pos js2-ts-cursor)
-                                                  len
-                                                  body
-                                                  init
-                                                  condition
-                                                  update
-                                                  lp
-                                                  rp)))
-  "AST node for a C-style for-loop."
-  init       ; initialization expression
-  condition  ; loop condition
-  update)    ; update clause
-
-(put 'cl-struct-js2-for-node 'js2-visitor 'js2-visit-for-node)
-(put 'cl-struct-js2-for-node 'js2-printer 'js2-print-for-node)
-
-(defun js2-visit-for-node (n v)
-  (js2-visit-ast (js2-for-node-init n) v)
-  (js2-visit-ast (js2-for-node-condition n) v)
-  (js2-visit-ast (js2-for-node-update n) v)
-  (js2-visit-ast (js2-for-node-body n) v))
-
-(defun js2-print-for-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "for (")
-    (js2-print-ast (js2-for-node-init n) 0)
-    (insert "; ")
-    (js2-print-ast (js2-for-node-condition n) 0)
-    (insert "; ")
-    (js2-print-ast (js2-for-node-update n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-for-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(defstruct (js2-for-in-node
-            (:include js2-loop-node)
-            (:constructor nil)
-            (:constructor make-js2-for-in-node (&key (type js2-FOR)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     body
-                                                     iterator
-                                                     object
-                                                     in-pos
-                                                     each-pos
-                                                     foreach-p
-                                                     lp
-                                                     rp)))
-  "AST node for a for..in loop."
-  iterator  ; [var] foo in ...
-  object    ; object over which we're iterating
-  in-pos    ; buffer position of 'in' keyword
-  each-pos  ; buffer position of 'each' keyword, if foreach-p
-  foreach-p) ; t if it's a for-each loop
-
-(put 'cl-struct-js2-for-in-node 'js2-visitor 'js2-visit-for-in-node)
-(put 'cl-struct-js2-for-in-node 'js2-printer 'js2-print-for-in-node)
-
-(defun js2-visit-for-in-node (n v)
-  (js2-visit-ast (js2-for-in-node-iterator n) v)
-  (js2-visit-ast (js2-for-in-node-object n) v)
-  (js2-visit-ast (js2-for-in-node-body n) v))
-
-(defun js2-print-for-in-node (n i)
-  (let ((pad (js2-make-pad i))
-        (foreach (js2-for-in-node-foreach-p n)))
-    (insert pad "for ")
-    (if foreach
-        (insert "each "))
-    (insert "(")
-    (js2-print-ast (js2-for-in-node-iterator n) 0)
-    (insert " in ")
-    (js2-print-ast (js2-for-in-node-object n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-for-in-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(defstruct (js2-return-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-return-node (&key (type js2-RETURN)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     retval)))
-  "AST node for a return statement."
-  retval)  ; expression to return, or 'undefined
-
-(put 'cl-struct-js2-return-node 'js2-visitor 'js2-visit-return-node)
-(put 'cl-struct-js2-return-node 'js2-printer 'js2-print-return-node)
-
-(defun js2-visit-return-node (n v)
-  (if (js2-return-node-retval n)
-      (js2-visit-ast (js2-return-node-retval n) v)))
-
-(defun js2-print-return-node (n i)
-  (insert (js2-make-pad i) "return")
-  (when (js2-return-node-retval n)
-    (insert " ")
-    (js2-print-ast (js2-return-node-retval n) 0))
-  (insert ";\n"))
-
-(defstruct (js2-if-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-if-node (&key (type js2-IF)
-                                                 (pos js2-ts-cursor)
-                                                 len
-                                                 condition
-                                                 then-part
-                                                 else-pos
-                                                 else-part
-                                                 lp
-                                                 rp)))
-  "AST node for an if-statement."
-  condition   ; expression
-  then-part   ; statement or block
-  else-pos    ; optional buffer position of 'else' keyword
-  else-part   ; optional statement or block
-  lp          ; position of left-paren, nil if omitted
-  rp)         ; position of right-paren, nil if omitted
-
-(put 'cl-struct-js2-if-node 'js2-visitor 'js2-visit-if-node)
-(put 'cl-struct-js2-if-node 'js2-printer 'js2-print-if-node)
-
-(defun js2-visit-if-node (n v)
-  (js2-visit-ast (js2-if-node-condition n) v)
-  (js2-visit-ast (js2-if-node-then-part n) v)
-  (if (js2-if-node-else-part n)
-      (js2-visit-ast (js2-if-node-else-part n) v)))
-
-(defun js2-print-if-node (n i)
-  (let ((pad (js2-make-pad i))
-        (then-part (js2-if-node-then-part n))
-        (else-part (js2-if-node-else-part n)))
-    (insert pad "if (")
-    (js2-print-ast (js2-if-node-condition n) 0)
-    (insert ") {\n")
-    (js2-print-body then-part (1+ i))
-    (insert pad "}")
-    (cond
-     ((not else-part)
-      (insert "\n"))
-     ((js2-if-node-p else-part)
-      (insert " else ")
-      (js2-print-body else-part i))
-     (t
-      (insert " else {\n")
-      (js2-print-body else-part (1+ i))
-      (insert pad "}\n")))))
-
-(defstruct (js2-try-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-try-node (&key (type js2-TRY)
-                                                  (pos js2-ts-cursor)
-                                                  len
-                                                  try-block
-                                                  catch-clauses
-                                                  finally-block)))
-  "AST node for a try-statement."
-  try-block
-  catch-clauses  ; a lisp list of `js2-catch-node'
-  finally-block) ; a `js2-finally-node'
-
-(put 'cl-struct-js2-try-node 'js2-visitor 'js2-visit-try-node)
-(put 'cl-struct-js2-try-node 'js2-printer 'js2-print-try-node)
-
-(defun js2-visit-try-node (n v)
-  (js2-visit-ast (js2-try-node-try-block n) v)
-  (dolist (clause (js2-try-node-catch-clauses n))
-    (js2-visit-ast clause v))
-  (if (js2-try-node-finally-block n)
-      (js2-visit-ast (js2-try-node-finally-block n) v)))
-
-(defun js2-print-try-node (n i)
-  (let ((pad (js2-make-pad i))
-        (catches (js2-try-node-catch-clauses n))
-        (finally (js2-try-node-finally-block n)))
-    (insert pad "try {\n")
-    (js2-print-body (js2-try-node-try-block n) (1+ i))
-    (insert pad "}")
-    (when catches
-      (dolist (catch catches)
-        (js2-print-ast catch i)))
-    (if finally
-        (js2-print-ast finally i)
-      (insert "\n"))))
-
-(defstruct (js2-catch-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-catch-node (&key (type js2-CATCH)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    var-name
-                                                    guard-kwd
-                                                    guard-expr
-                                                    block
-                                                    lp
-                                                    rp)))
-  "AST node for a catch clause."
-  var-name    ; a `js2-name-node'
-  guard-kwd   ; relative buffer position of "if" in "catch (x if ...)"
-  guard-expr  ; catch condition, a `js2-node'
-  block       ; statements, a `js2-block-node'
-  lp          ; buffer position of left-paren, nil if omitted
-  rp)         ; buffer position of right-paren, nil if omitted
-
-(put 'cl-struct-js2-catch-node 'js2-visitor 'js2-visit-catch-node)
-(put 'cl-struct-js2-catch-node 'js2-printer 'js2-print-catch-node)
-
-(defun js2-visit-catch-node (n v)
-  (js2-visit-ast (js2-catch-node-var-name n) v)
-  (when (js2-catch-node-guard-kwd n)
-    (js2-visit-ast (js2-catch-node-guard-expr n) v))
-  (js2-visit-ast (js2-catch-node-block n) v))
-
-(defun js2-print-catch-node (n i)
-  (let ((pad (js2-make-pad i))
-        (guard-kwd (js2-catch-node-guard-kwd n))
-        (guard-expr (js2-catch-node-guard-expr n)))
-    (insert " catch (")
-    (js2-print-ast (js2-catch-node-var-name n) 0)
-    (when guard-kwd
-      (insert " if ")
-      (js2-print-ast guard-expr 0))
-    (insert ") {\n")
-    (js2-print-body (js2-catch-node-block n) (1+ i))
-    (insert pad "}")))
-
-(defstruct (js2-finally-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-finally-node (&key (type js2-FINALLY)
-                                                      (pos js2-ts-cursor)
-                                                      len
-                                                      body)))
-  "AST node for a finally clause."
-  body)  ; a `js2-node', often but not always a block node
-
-(put 'cl-struct-js2-finally-node 'js2-visitor 'js2-visit-finally-node)
-(put 'cl-struct-js2-finally-node 'js2-printer 'js2-print-finally-node)
-
-(defun js2-visit-finally-node (n v)
-  (js2-visit-ast (js2-finally-node-body n) v))
-
-(defun js2-print-finally-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert " finally {\n")
-    (js2-print-body (js2-finally-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(defstruct (js2-switch-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-switch-node (&key (type js2-SWITCH)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     discriminant
-                                                     cases
-                                                     lp
-                                                     rp)))
-  "AST node for a switch statement."
-  discriminant  ; a `js2-node' (switch expression)
-  cases  ; a lisp list of `js2-case-node'
-  lp     ; position of open-paren for discriminant, nil if omitted
-  rp)    ; position of close-paren for discriminant, nil if omitted
-
-(put 'cl-struct-js2-switch-node 'js2-visitor 'js2-visit-switch-node)
-(put 'cl-struct-js2-switch-node 'js2-printer 'js2-print-switch-node)
-
-(defun js2-visit-switch-node (n v)
-  (js2-visit-ast (js2-switch-node-discriminant n) v)
-  (dolist (c (js2-switch-node-cases n))
-    (js2-visit-ast c v)))
-
-(defun js2-print-switch-node (n i)
-  (let ((pad (js2-make-pad i))
-        (cases (js2-switch-node-cases n)))
-    (insert pad "switch (")
-    (js2-print-ast (js2-switch-node-discriminant n) 0)
-    (insert ") {\n")
-    (dolist (case cases)
-      (js2-print-ast case i))
-    (insert pad "}\n")))
-
-(defstruct (js2-case-node
-            (:include js2-block-node)
-            (:constructor nil)
-            (:constructor make-js2-case-node (&key (type js2-CASE)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   kids
-                                                   expr)))
-  "AST node for a case clause of a switch statement."
-  expr)   ; the case expression (nil for default)
-
-(put 'cl-struct-js2-case-node 'js2-visitor 'js2-visit-case-node)
-(put 'cl-struct-js2-case-node 'js2-printer 'js2-print-case-node)
-
-(defun js2-visit-case-node (n v)
-  (if (js2-case-node-expr n)  ; nil for default: case
-      (js2-visit-ast (js2-case-node-expr n) v))
-  (js2-visit-block n v))
-
-(defun js2-print-case-node (n i)
-  (let ((pad (js2-make-pad i))
-        (expr (js2-case-node-expr n)))
-    (insert pad)
-    (if (null expr)
-        (insert "default:\n")
-      (insert "case ")
-      (js2-print-ast expr 0)
-      (insert ":\n"))
-    (dolist (kid (js2-case-node-kids n))
-      (js2-print-ast kid (1+ i)))))
-
-(defstruct (js2-throw-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-throw-node (&key (type js2-THROW)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    expr)))
-  "AST node for a throw statement."
-  expr)   ; the expression to throw
-
-(put 'cl-struct-js2-throw-node 'js2-visitor 'js2-visit-throw-node)
-(put 'cl-struct-js2-throw-node 'js2-printer 'js2-print-throw-node)
-
-(defun js2-visit-throw-node (n v)
-  (js2-visit-ast (js2-throw-node-expr n) v))
-
-(defun js2-print-throw-node (n i)
-  (insert (js2-make-pad i) "throw ")
-  (js2-print-ast (js2-throw-node-expr n) 0)
-  (insert ";\n"))
-
-(defstruct (js2-with-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-with-node (&key (type js2-WITH)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   object
-                                                   body
-                                                   lp
-                                                   rp)))
-  "AST node for a with-statement."
-  object
-  body
-  lp    ; buffer position of left-paren around object, nil if omitted
-  rp)   ; buffer position of right-paren around object, nil if omitted
-
-(put 'cl-struct-js2-with-node 'js2-visitor 'js2-visit-with-node)
-(put 'cl-struct-js2-with-node 'js2-printer 'js2-print-with-node)
-
-(defun js2-visit-with-node (n v)
-  (js2-visit-ast (js2-with-node-object n) v)
-  (js2-visit-ast (js2-with-node-body n) v))
-
-(defun js2-print-with-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "with (")
-    (js2-print-ast (js2-with-node-object n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-with-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(defstruct (js2-label-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-label-node (&key (type js2-LABEL)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    name)))
-  "AST node for a statement label or case label."
-  name   ; a string
-  loop)  ; for validating and code-generating continue-to-label
-
-(put 'cl-struct-js2-label-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-label-node 'js2-printer 'js2-print-label)
-
-(defun js2-print-label (n i)
-  (insert (js2-make-pad i)
-          (js2-label-node-name n)
-          ":\n"))
-
-(defstruct (js2-labeled-stmt-node
-            (:include js2-node)
-            (:constructor nil)
-            ;; type needs to be in `js2-side-effecting-tokens' to avoid spurious
-            ;; no-side-effects warnings, hence js2-EXPR_RESULT.
-            (:constructor make-js2-labeled-stmt-node (&key (type js2-EXPR_RESULT)
-                                                           (pos js2-ts-cursor)
-                                                           len
-                                                           labels
-                                                           stmt)))
-  "AST node for a statement with one or more labels.
-Multiple labels for a statement are collapsed into the labels field."
-  labels  ; lisp list of `js2-label-node'
-  stmt)   ; the statement these labels are for
-
-(put 'cl-struct-js2-labeled-stmt-node 'js2-visitor 'js2-visit-labeled-stmt)
-(put 'cl-struct-js2-labeled-stmt-node 'js2-printer 'js2-print-labeled-stmt)
-
-(defun js2-get-label-by-name (lbl-stmt name)
-  "Return a `js2-label-node' by NAME from LBL-STMT's labels list.
-Returns nil if no such label is in the list."
-  (let ((label-list (js2-labeled-stmt-node-labels lbl-stmt))
-        result)
-    (while (and label-list (not result))
-      (if (string= (js2-label-node-name (car label-list)) name)
-          (setq result (car label-list))
-        (setq label-list (cdr label-list))))
-    result))
-
-(defun js2-visit-labeled-stmt (n v)
-  (dolist (label (js2-labeled-stmt-node-labels n))
-    (js2-visit-ast label v))
-  (js2-visit-ast (js2-labeled-stmt-node-stmt n) v))
-
-(defun js2-print-labeled-stmt (n i)
-  (dolist (label (js2-labeled-stmt-node-labels n))
-    (js2-print-ast label i))
-  (js2-print-ast (js2-labeled-stmt-node-stmt n) (1+ i)))
-
-(defun js2-labeled-stmt-node-contains (node label)
-  "Return t if NODE contains LABEL in its label set.
-NODE is a `js2-labels-node'.  LABEL is an identifier."
-  (loop for nl in (js2-labeled-stmt-node-labels node)
-        if (string= label (js2-label-node-name nl))
-          return t
-        finally return nil))
-
-(defsubst js2-labeled-stmt-node-add-label (node label)
-  "Add a `js2-label-node' to the label set for this statement."
-  (setf (js2-labeled-stmt-node-labels node)
-        (nconc (js2-labeled-stmt-node-labels node) (list label))))
-
-(defstruct (js2-jump-node
-            (:include js2-node)
-            (:constructor nil))
-  "Abstract supertype of break and continue nodes."
-  label   ; `js2-name-node' for location of label identifier, if present
-  target) ; target js2-labels-node or loop/switch statement
-
-(defun js2-visit-jump-node (n v)
-  ;; we don't visit the target, since it's a back-link
-  (if (js2-jump-node-label n)
-      (js2-visit-ast (js2-jump-node-label n) v)))
-
-(defstruct (js2-break-node
-            (:include js2-jump-node)
-            (:constructor nil)
-            (:constructor make-js2-break-node (&key (type js2-BREAK)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    label
-                                                    target)))
-  "AST node for a break statement.
-The label field is a `js2-name-node', possibly nil, for the named label
-if provided.  E.g. in 'break foo', it represents 'foo'.  The target field
-is the target of the break - a label node or enclosing loop/switch statement.")
-
-(put 'cl-struct-js2-break-node 'js2-visitor 'js2-visit-jump-node)
-(put 'cl-struct-js2-break-node 'js2-printer 'js2-print-break-node)
-
-(defun js2-print-break-node (n i)
-  (insert (js2-make-pad i) "break")
-  (when (js2-break-node-label n)
-    (insert " ")
-    (js2-print-ast (js2-break-node-label n) 0))
-  (insert ";\n"))
-
-(defstruct (js2-continue-node
-            (:include js2-jump-node)
-            (:constructor nil)
-            (:constructor make-js2-continue-node (&key (type js2-CONTINUE)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       label
-                                                       target)))
-  "AST node for a continue statement.
-The label field is the user-supplied enclosing label name, a `js2-name-node'.
-It is nil if continue specifies no label.  The target field is the jump target:
-a `js2-label-node' or the innermost enclosing loop.")
-
-(put 'cl-struct-js2-continue-node 'js2-visitor 'js2-visit-jump-node)
-(put 'cl-struct-js2-continue-node 'js2-printer 'js2-print-continue-node)
-
-(defun js2-print-continue-node (n i)
-  (insert (js2-make-pad i) "continue")
-  (when (js2-continue-node-label n)
-    (insert " ")
-    (js2-print-ast (js2-continue-node-label n) 0))
-  (insert ";\n"))
-
-(defstruct (js2-function-node
-            (:include js2-script-node)
-            (:constructor nil)
-            (:constructor make-js2-function-node (&key (type js2-FUNCTION)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       (ftype 'FUNCTION)
-                                                       (form 'FUNCTION_STATEMENT)
-                                                       (name "")
-                                                       params
-                                                       body
-                                                       lp
-                                                       rp)))
-  "AST node for a function declaration.
-The `params' field is a lisp list of nodes.  Each node is either a simple
-`js2-name-node', or if it's a destructuring-assignment parameter, a
-`js2-array-node' or `js2-object-node'."
-  ftype            ; FUNCTION, GETTER or SETTER
-  form             ; FUNCTION_{STATEMENT|EXPRESSION|EXPRESSION_STATEMENT}
-  name             ; function name (a `js2-name-node', or nil if anonymous)
-  params           ; a lisp list of destructuring forms or simple name nodes
-  body             ; a `js2-block-node'
-  lp               ; position of arg-list open-paren, or nil if omitted
-  rp               ; position of arg-list close-paren, or nil if omitted
-  ignore-dynamic   ; ignore value of the dynamic-scope flag (interpreter only)
-  needs-activation ; t if we need an activation object for this frame
-  is-generator     ; t if this function contains a yield
-  member-expr)     ; nonstandard Ecma extension from Rhino
-
-(put 'cl-struct-js2-function-node 'js2-visitor 'js2-visit-function-node)
-(put 'cl-struct-js2-function-node 'js2-printer 'js2-print-function-node)
-
-(defun js2-visit-function-node (n v)
-  (if (js2-function-node-name n)
-      (js2-visit-ast (js2-function-node-name n) v))
-  (dolist (p (js2-function-node-params n))
-    (js2-visit-ast p v))
-  (js2-visit-ast (js2-function-node-body n) v))
-
-(defun js2-print-function-node (n i)
-  (let ((pad (js2-make-pad i))
-        (getter (js2-node-get-prop n 'GETTER_SETTER))
-        (name (js2-function-node-name n))
-        (params (js2-function-node-params n))
-        (body (js2-function-node-body n))
-        (expr (eq (js2-function-node-form n) 'FUNCTION_EXPRESSION)))
-    (unless getter
-      (insert pad "function"))
-    (when name
-        (insert " ")
-        (js2-print-ast name 0))
-    (insert "(")
-    (loop with len = (length params)
-          for param in params
-          for count from 1
-          do
-          (js2-print-ast param 0)
-          (if (< count len)
-              (insert ", ")))
-    (insert ") {")
-    (unless expr
-      (insert "\n"))
-    ;; TODO:  fix this to be smarter about indenting, etc.
-    (js2-print-body body (1+ i))
-    (insert pad "}")
-    (unless expr
-      (insert "\n"))))
-
-(defsubst js2-function-name (node)
-  "Return function name for NODE, a `js2-function-node', or nil if anonymous."
-  (and (js2-function-node-name node)
-       (js2-name-node-name (js2-function-node-name node))))
-
-;; Having this be an expression node makes it more flexible.
-;; There are IDE contexts, such as indentation in a for-loop initializer,
-;; that work better if you assume it's an expression.  Whenever we have
-;; a standalone var/const declaration, we just wrap with an expr stmt.
-;; Eclipse apparently screwed this up and now has two versions, expr and stmt.
-(defstruct (js2-var-decl-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-var-decl-node (&key (type js2-VAR)
-                                                       (pos js2-token-beg)
-                                                       len
-                                                       kids
-                                                       decl-type)))
-  "AST node for a variable declaration list (VAR, CONST or LET).
-The node bounds differ depending on the declaration type.  For VAR or
-CONST declarations, the bounds include the var/const keyword.  For LET
-declarations, the node begins at the position of the first child."
-  kids        ; a lisp list of `js2-var-init-node' structs.
-  decl-type)  ; js2-VAR, js2-CONST or js2-LET
-
-(put 'cl-struct-js2-var-decl-node 'js2-visitor 'js2-visit-var-decl)
-(put 'cl-struct-js2-var-decl-node 'js2-printer 'js2-print-var-decl)
-
-(defun js2-visit-var-decl (n v)
-  (dolist (kid (js2-var-decl-node-kids n))
-    (js2-visit-ast kid v)))
-
-(defun js2-print-var-decl (n i)
-  (let ((pad (js2-make-pad i))
-        (tt (js2-var-decl-node-decl-type n)))
-    (insert pad)
-    (insert (cond
-             ((= tt js2-VAR) "var ")
-             ((= tt js2-LET) "")  ; handled by parent let-{expr/stmt}
-             ((= tt js2-CONST) "const ")
-             (t
-              (error "malformed var-decl node"))))
-    (loop with kids = (js2-var-decl-node-kids n)
-          with len = (length kids)
-          for kid in kids
-          for count from 1
-          do
-          (js2-print-ast kid 0)
-          (if (< count len)
-              (insert ", ")))))
-
-(defstruct (js2-var-init-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-var-init-node (&key (type js2-VAR)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       target
-                                                       initializer)))
-  "AST node for a variable declaration.
-The type field will be js2-CONST for a const decl."
-  target        ; `js2-name-node', `js2-object-node', or `js2-array-node'
-  initializer)  ; initializer expression, a `js2-node'
-
-(put 'cl-struct-js2-var-init-node 'js2-visitor 'js2-visit-var-init-node)
-(put 'cl-struct-js2-var-init-node 'js2-printer 'js2-print-var-init-node)
-
-(defun js2-visit-var-init-node (n v)
-  (js2-visit-ast (js2-var-init-node-target n) v)
-  (if (js2-var-init-node-initializer n)
-      (js2-visit-ast (js2-var-init-node-initializer n) v)))
-
-(defun js2-print-var-init-node (n i)
-  (let ((pad (js2-make-pad i))
-        (name (js2-var-init-node-target n))
-        (init (js2-var-init-node-initializer n)))
-    (insert pad)
-    (js2-print-ast name 0)
-    (when init
-      (insert " = ")
-      (js2-print-ast init 0))))
-
-(defstruct (js2-cond-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-cond-node (&key (type js2-HOOK)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   test-expr
-                                                   true-expr
-                                                   false-expr
-                                                   q-pos
-                                                   c-pos)))
-  "AST node for the ternary operator"
-  test-expr
-  true-expr
-  false-expr
-  q-pos   ; buffer position of ?
-  c-pos)  ; buffer position of :
-
-(put 'cl-struct-js2-cond-node 'js2-visitor 'js2-visit-cond-node)
-(put 'cl-struct-js2-cond-node 'js2-printer 'js2-print-cond-node)
-
-(defun js2-visit-cond-node (n v)
-  (js2-visit-ast (js2-cond-node-test-expr n) v)
-  (js2-visit-ast (js2-cond-node-true-expr n) v)
-  (js2-visit-ast (js2-cond-node-false-expr n) v))
-
-(defun js2-print-cond-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad)
-    (js2-print-ast (js2-cond-node-test-expr n) 0)
-    (insert " ? ")
-    (js2-print-ast (js2-cond-node-true-expr n) 0)
-    (insert " : ")
-    (js2-print-ast (js2-cond-node-false-expr n) 0)))
-
-(defstruct (js2-infix-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-infix-node (&key type
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    op-pos
-                                                    left
-                                                    right)))
-  "Represents infix expressions.
-Includes assignment ops like `|=', and the comma operator.
-The type field inherited from `js2-node' holds the operator."
-  op-pos    ; buffer position where operator begins
-  left      ; any `js2-node'
-  right)    ; any `js2-node'
-
-(put 'cl-struct-js2-infix-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-infix-node 'js2-printer 'js2-print-infix-node)
-
-(defun js2-visit-infix-node (n v)
-  (when (js2-infix-node-left n)
-    (js2-visit-ast (js2-infix-node-left n) v))
-  (when (js2-infix-node-right n)
-    (js2-visit-ast (js2-infix-node-right n) v)))
-
-(defconst js2-operator-tokens
-  (let ((table (make-hash-table :test 'eq))
-        (tokens
-         (list (cons js2-IN "in")
-               (cons js2-TYPEOF "typeof")
-               (cons js2-INSTANCEOF "instanceof")
-               (cons js2-DELPROP "delete")
-               (cons js2-COMMA ",")
-               (cons js2-COLON ":")
-               (cons js2-OR "||")
-               (cons js2-AND "&&")
-               (cons js2-INC "++")
-               (cons js2-DEC "--")
-               (cons js2-BITOR "|")
-               (cons js2-BITXOR "^")
-               (cons js2-BITAND "&")
-               (cons js2-EQ "==")
-               (cons js2-NE "!=")
-               (cons js2-LT "<")
-               (cons js2-LE "<=")
-               (cons js2-GT ">")
-               (cons js2-GE ">=")
-               (cons js2-LSH "<<")
-               (cons js2-RSH ">>")
-               (cons js2-URSH ">>>")
-               (cons js2-ADD "+")       ; infix plus
-               (cons js2-SUB "-")       ; infix minus
-               (cons js2-MUL "*")
-               (cons js2-DIV "/")
-               (cons js2-MOD "%")
-               (cons js2-NOT "!")
-               (cons js2-BITNOT "~")
-               (cons js2-POS "+")       ; unary plus
-               (cons js2-NEG "-")       ; unary minus
-               (cons js2-SHEQ "===")    ; shallow equality
-               (cons js2-SHNE "!==")    ; shallow inequality
-               (cons js2-ASSIGN "=")
-               (cons js2-ASSIGN_BITOR "|=")
-               (cons js2-ASSIGN_BITXOR "^=")
-               (cons js2-ASSIGN_BITAND "&=")
-               (cons js2-ASSIGN_LSH "<<=")
-               (cons js2-ASSIGN_RSH ">>=")
-               (cons js2-ASSIGN_URSH ">>>=")
-               (cons js2-ASSIGN_ADD "+=")
-               (cons js2-ASSIGN_SUB "-=")
-               (cons js2-ASSIGN_MUL "*=")
-               (cons js2-ASSIGN_DIV "/=")
-               (cons js2-ASSIGN_MOD "%="))))
-    (loop for (k . v) in tokens do
-          (puthash k v table))
-    table))
-
-(defun js2-print-infix-node (n i)
-  (let* ((tt (js2-node-type n))
-         (op (gethash tt js2-operator-tokens)))
-    (unless op
-      (error "unrecognized infix operator %s" (js2-node-type n)))
-    (insert (js2-make-pad i))
-    (js2-print-ast (js2-infix-node-left n) 0)
-    (unless (= tt js2-COMMA)
-      (insert " "))
-    (insert op)
-    (insert " ")
-    (js2-print-ast (js2-infix-node-right n) 0)))
-
-(defstruct (js2-assign-node
-            (:include js2-infix-node)
-            (:constructor nil)
-            (:constructor make-js2-assign-node (&key type
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     op-pos
-                                                     left
-                                                     right)))
-  "Represents any assignment.
-The type field holds the actual assignment operator.")
-
-(put 'cl-struct-js2-assign-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-assign-node 'js2-printer 'js2-print-infix-node)
-
-(defstruct (js2-unary-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-unary-node (&key type ; required
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    operand)))
-  "AST node type for unary operator nodes.
-The type field can be NOT, BITNOT, POS, NEG, INC, DEC,
-TYPEOF, or DELPROP.  For INC or DEC, a 'postfix node
-property is added if the operator follows the operand."
-  operand)  ; a `js2-node' expression
-
-(put 'cl-struct-js2-unary-node 'js2-visitor 'js2-visit-unary-node)
-(put 'cl-struct-js2-unary-node 'js2-printer 'js2-print-unary-node)
-
-(defun js2-visit-unary-node (n v)
-  (js2-visit-ast (js2-unary-node-operand n) v))
-
-(defun js2-print-unary-node (n i)
-  (let* ((tt (js2-node-type n))
-         (op (gethash tt js2-operator-tokens))
-         (postfix (js2-node-get-prop n 'postfix)))
-    (unless op
-      (error "unrecognized unary operator %s" tt))
-    (insert (js2-make-pad i))
-    (unless postfix
-      (insert op))
-    (if (or (= tt js2-TYPEOF)
-            (= tt js2-DELPROP))
-        (insert " "))
-    (js2-print-ast (js2-unary-node-operand n) 0)
-    (when postfix
-      (insert op))))
-
-(defstruct (js2-let-node
-            (:include js2-scope)
-            (:constructor nil)
-            (:constructor make-js2-let-node (&key (type js2-LETEXPR)
-                                                  (pos js2-token-beg)
-                                                  len
-                                                  vars
-                                                  body
-                                                  lp
-                                                  rp)))
-  "AST node for a let expression or a let statement.
-Note that a let declaration such as let x=6, y=7 is a `js2-var-decl-node'."
-  vars   ; a `js2-var-decl-node'
-  body   ; a `js2-node' representing the expression or body block
-  lp
-  rp)
-
-(put 'cl-struct-js2-let-node 'js2-visitor 'js2-visit-let-node)
-(put 'cl-struct-js2-let-node 'js2-printer 'js2-print-let-node)
-
-(defun js2-visit-let-node (n v)
-  (when (js2-let-node-vars n)
-    (js2-visit-ast (js2-let-node-vars n) v))
-  (when (js2-let-node-body n)
-    (js2-visit-ast (js2-let-node-body n) v)))
-
-(defun js2-print-let-node (n i)
-  (insert (js2-make-pad i) "let (")
-  (js2-print-ast (js2-let-node-vars n) 0)
-  (insert ") ")
-  (js2-print-ast (js2-let-node-body n) i))
-
-(defstruct (js2-keyword-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-keyword-node (&key type
-                                                      (pos js2-token-beg)
-                                                      (len (- js2-ts-cursor pos)))))
-  "AST node representing a literal keyword such as `null'.
-Used for `null', `this', `true', `false' and `debugger'.
-The node type is set to js2-NULL, js2-THIS, etc.")
-
-(put 'cl-struct-js2-keyword-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-keyword-node 'js2-printer 'js2-print-keyword-node)
-
-(defun js2-print-keyword-node (n i)
-  (insert (js2-make-pad i)
-          (let ((tt (js2-node-type n)))
-            (cond
-             ((= tt 'js2-THIS) "this")
-             ((= tt 'js2-NULL) "null")
-             ((= tt 'js2-TRUE) "true")
-             ((= tt 'js2-FALSE) "false")
-             ((= tt 'js2-DEBUGGER) "debugger")
-             (t (error "Invalid keyword literal type: %d" tt))))))
-
-(defsubst js2-this-node-p (node)
-  "Return t if this node is a `js2-literal-node' of type js2-THIS."
-  (eq (js2-node-type node) js2-THIS))
-
-(defstruct (js2-new-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-new-node (&key (type js2-NEW)
-                                                  (pos js2-token-beg)
-                                                  len
-                                                  target
-                                                  args
-                                                  initializer
-                                                  lp
-                                                  rp)))
-  "AST node for new-expression such as new Foo()."
-  target  ; an identifier or reference
-  args    ; a lisp list of argument nodes
-  lp      ; position of left-paren, nil if omitted
-  rp      ; position of right-paren, nil if omitted
-  initializer) ; experimental Rhino syntax:  optional `js2-object-node'
-
-(put 'cl-struct-js2-new-node 'js2-visitor 'js2-visit-new-node)
-(put 'cl-struct-js2-new-node 'js2-printer 'js2-print-new-node)
-
-(defun js2-visit-new-node (n v)
-  (js2-visit-ast (js2-new-node-target n) v)
-  (dolist (arg (js2-new-node-args n))
-    (js2-visit-ast arg v))
-  (when (js2-new-node-initializer n)
-    (js2-visit-ast (js2-new-node-initializer n) v)))
-
-(defun js2-print-new-node (n i)
-  (insert (js2-make-pad i) "new ")
-  (js2-print-ast (js2-new-node-target n))
-  (insert "(")
-  (js2-print-list (js2-new-node-args n))
-  (insert ")")
-  (when (js2-new-node-initializer n)
-    (insert " ")
-    (js2-print-ast (js2-new-node-initializer n))))
-
-(defstruct (js2-name-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-name-node (&key (type js2-NAME)
-                                                   (pos js2-token-beg)
-                                                   (len (- js2-ts-cursor
-                                                           js2-token-beg))
-                                                   (name js2-ts-string))))
-  "AST node for a JavaScript identifier"
-  name   ; a string
-  scope) ; a `js2-scope' (optional, used for codegen)
-
-(put 'cl-struct-js2-name-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-name-node 'js2-printer 'js2-print-name-node)
-
-(defun js2-print-name-node (n i)
-  (insert (js2-make-pad i)
-          (js2-name-node-name n)))
-
-(defsubst js2-name-node-length (node)
-  "Return identifier length of NODE, a `js2-name-node'.
-Returns 0 if NODE is nil or its identifier field is nil."
-  (if node
-      (length (js2-name-node-name node))
-    0))
-
-(defstruct (js2-number-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-number-node (&key (type js2-NUMBER)
-                                                     (pos js2-token-beg)
-                                                     (len (- js2-ts-cursor
-                                                             js2-token-beg))
-                                                     (value js2-ts-string)
-                                                     (num-value js2-ts-number))))
-  "AST node for a number literal."
-  value      ; the original string, e.g. "6.02e23"
-  num-value) ; the parsed number value
-
-(put 'cl-struct-js2-number-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-number-node 'js2-printer 'js2-print-number-node)
-
-(defun js2-print-number-node (n i)
-  (insert (js2-make-pad i)
-          (number-to-string (js2-number-node-value n))))
-
-(defstruct (js2-regexp-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-regexp-node (&key (type js2-REGEXP)
-                                                     (pos js2-token-beg)
-                                                     (len (- js2-ts-cursor
-                                                             js2-token-beg))
-                                                     value
-                                                     flags)))
-  "AST node for a regular expression literal."
-  value  ; the regexp string, without // delimiters
-  flags) ; a string of flags, e.g. `mi'.
-
-(put 'cl-struct-js2-regexp-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-regexp-node 'js2-printer 'js2-print-regexp)
-
-(defun js2-print-regexp (n i)
-  (insert (js2-make-pad i)
-          "/"
-          (js2-regexp-node-value n)
-          "/")
-  (if (js2-regexp-node-flags n)
-      (insert (js2-regexp-node-flags n))))
-
-(defstruct (js2-string-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-string-node (&key (type js2-STRING)
-                                                     (pos js2-token-beg)
-                                                     (len (- js2-ts-cursor
-                                                             js2-token-beg))
-                                                     (value js2-ts-string))))
-  "String literal.
-Escape characters are not evaluated; e.g. \n is 2 chars in value field.
-You can tell the quote type by looking at the first character."
-  value) ; the characters of the string, including the quotes
-
-(put 'cl-struct-js2-string-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-string-node 'js2-printer 'js2-print-string-node)
-
-(defun js2-print-string-node (n i)
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-(defstruct (js2-array-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-array-node (&key (type js2-ARRAYLIT)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    elems)))
-  "AST node for an array literal."
-  elems)  ; list of expressions.  [foo,,bar] yields a nil middle element.
-
-(put 'cl-struct-js2-array-node 'js2-visitor 'js2-visit-array-node)
-(put 'cl-struct-js2-array-node 'js2-printer 'js2-print-array-node)
-
-(defun js2-visit-array-node (n v)
-  (dolist (e (js2-array-node-elems n))
-    (when e  ; can be nil, e.g. [a, ,b]
-      (js2-visit-ast e v))))
-
-(defun js2-print-array-node (n i)
-  (insert (js2-make-pad i) "[")
-  (js2-print-list (js2-array-node-elems n))
-  (insert "]"))
-
-(defstruct (js2-object-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-object-node (&key (type js2-OBJECTLIT)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     elems)))
-  "AST node for an object literal expression."
-  elems)  ; a lisp list of `js2-object-prop-node'
-
-(put 'cl-struct-js2-object-node 'js2-visitor 'js2-visit-object-node)
-(put 'cl-struct-js2-object-node 'js2-printer 'js2-print-object-node)
-
-(defun js2-visit-object-node (n v)
-  (dolist (e (js2-object-node-elems n))
-    (js2-visit-ast e v)))
-
-(defun js2-print-object-node (n i)
-  (insert (js2-make-pad i) "{")
-  (js2-print-list (js2-object-node-elems n))
-  (insert "}"))
-
-(defstruct (js2-object-prop-node
-            (:include js2-infix-node)
-            (:constructor nil)
-            (:constructor make-js2-object-prop-node (&key (type js2-COLON)
-                                                          (pos js2-ts-cursor)
-                                                          len
-                                                          left
-                                                          right
-                                                          op-pos)))
-  "AST node for an object literal prop:value entry.
-The `left' field is the property:  a name node, string node or number node.
-The `right' field is a `js2-node' representing the initializer value.")
-
-(put 'cl-struct-js2-object-prop-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-object-prop-node 'js2-printer 'js2-print-object-prop-node)
-
-(defun js2-print-object-prop-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-object-prop-node-left n) 0)
-  (insert ":")
-  (js2-print-ast (js2-object-prop-node-right n) 0))
-
-(defstruct (js2-getter-setter-node
-            (:include js2-infix-node)
-            (:constructor nil)
-            (:constructor make-js2-getter-setter-node (&key type ; GET or SET
-                                                            (pos js2-ts-cursor)
-                                                            len
-                                                            left
-                                                            right)))
-  "AST node for a getter/setter property in an object literal.
-The `left' field is the `js2-name-node' naming the getter/setter prop.
-The `right' field is always an anonymous `js2-function-node' with a node
-property `GETTER_SETTER' set to js2-GET or js2-SET. ")
-
-(put 'cl-struct-js2-getter-setter-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-getter-setter-node 'js2-printer 'js2-print-getter-setter)
-
-(defun js2-print-getter-setter (n i)
-  (let ((pad (js2-make-pad i))
-        (left (js2-getter-setter-node-left n))
-        (right (js2-getter-setter-node-right n)))
-    (insert pad)
-    (insert (if (= (js2-node-type n) js2-GET) "get " "set "))
-    (js2-print-ast left 0)
-    (js2-print-ast right 0)))
-
-(defstruct (js2-prop-get-node
-            (:include js2-infix-node)
-            (:constructor nil)
-            (:constructor make-js2-prop-get-node (&key (type js2-GETPROP)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       left
-                                                       right)))
-  "AST node for a dotted property reference, e.g. foo.bar or foo().bar")
-
-(put 'cl-struct-js2-prop-get-node 'js2-visitor 'js2-visit-prop-get-node)
-(put 'cl-struct-js2-prop-get-node 'js2-printer 'js2-print-prop-get-node)
-
-(defun js2-visit-prop-get-node (n v)
-  (when (js2-prop-get-node-left n)
-    (js2-visit-ast (js2-prop-get-node-left n) v))
-  (when (js2-prop-get-node-right n)
-    (js2-visit-ast (js2-prop-get-node-right n) v)))
-
-(defun js2-print-prop-get-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-prop-get-node-left n) 0)
-  (insert ".")
-  (js2-print-ast (js2-prop-get-node-right n) 0))
-
-(defstruct (js2-elem-get-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-elem-get-node (&key (type js2-GETELEM)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       target
-                                                       element
-                                                       lb
-                                                       rb)))
-  "AST node for an array index expression such as foo[bar]."
-  target  ; a `js2-node' - the expression preceding the "."
-  element ; a `js2-node' - the expression in brackets
-  lb      ; position of left-bracket, nil if omitted
-  rb)     ; position of right-bracket, nil if omitted
-
-(put 'cl-struct-js2-elem-get-node 'js2-visitor 'js2-visit-elem-get-node)
-(put 'cl-struct-js2-elem-get-node 'js2-printer 'js2-print-elem-get-node)
-
-(defun js2-visit-elem-get-node (n v)
-  (when (js2-elem-get-node-target n)
-    (js2-visit-ast (js2-elem-get-node-target n) v))
-  (when (js2-elem-get-node-element n)
-    (js2-visit-ast (js2-elem-get-node-element n) v)))
-
-(defun js2-print-elem-get-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-elem-get-node-target n) 0)
-  (insert "[")
-  (js2-print-ast (js2-elem-get-node-element n) 0)
-  (insert "]"))
-
-(defstruct (js2-call-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-call-node (&key (type js2-CALL)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   target
-                                                   args
-                                                   lp
-                                                   rp)))
-  "AST node for a JavaScript function call."
-  target  ; a `js2-node' evaluating to the function to call
-  args  ; a lisp list of `js2-node' arguments
-  lp    ; position of open-paren, or nil if missing
-  rp)   ; position of close-paren, or nil if missing
-
-(put 'cl-struct-js2-call-node 'js2-visitor 'js2-visit-call-node)
-(put 'cl-struct-js2-call-node 'js2-printer 'js2-print-call-node)
-
-(defun js2-visit-call-node (n v)
-  (js2-visit-ast (js2-call-node-target n) v)
-  (dolist (arg (js2-call-node-args n))
-    (js2-visit-ast arg v)))
-
-(defun js2-print-call-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-call-node-target n) 0)
-  (insert "(")
-  (js2-print-list (js2-call-node-args n))
-  (insert ")"))
-
-(defstruct (js2-yield-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-yield-node (&key (type js2-YIELD)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    value)))
-  "AST node for yield statement or expression."
-  value) ; optional:  value to be yielded
-
-(put 'cl-struct-js2-yield-node 'js2-visitor 'js2-visit-yield-node)
-(put 'cl-struct-js2-yield-node 'js2-printer 'js2-print-yield-node)
-
-(defun js2-visit-yield-node (n v)
-  (js2-visit-ast (js2-yield-node-value n) v))
-
-(defun js2-print-yield-node (n i)
-  (insert (js2-make-pad i))
-  (insert "yield")
-  (when (js2-yield-node-value n)
-    (insert " ")
-    (js2-print-ast (js2-yield-node-value n) 0)))
-
-(defstruct (js2-paren-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-paren-node (&key (type js2-LP)
-                                                    (pos js2-ts-cursor)
-                                                    len
-                                                    expr)))
-  "AST node for a parenthesized expression.
-In particular, used when the parens are syntactically optional,
-as opposed to required parens such as those enclosing an if-conditional."
-  expr)   ; `js2-node'
-
-(put 'cl-struct-js2-paren-node 'js2-visitor 'js2-visit-paren-node)
-(put 'cl-struct-js2-paren-node 'js2-printer 'js2-print-paren-node)
-
-(defun js2-visit-paren-node (n v)
-  (js2-visit-ast (js2-paren-node-expr n) v))
-
-(defun js2-print-paren-node (n i)
-  (insert (js2-make-pad i))
-  (insert "(")
-  (js2-print-ast (js2-paren-node-expr n) 0)
-  (insert ")"))
-
-(defstruct (js2-array-comp-node
-            (:include js2-scope)
-            (:constructor nil)
-            (:constructor make-js2-array-comp-node (&key (type js2-ARRAYCOMP)
-                                                         (pos js2-ts-cursor)
-                                                         len
-                                                         result
-                                                         loops
-                                                         filter
-                                                         if-pos
-                                                         lp
-                                                         rp)))
-  "AST node for an Array comprehension such as [[x,y] for (x in foo) for (y in bar)]."
-  result  ; result expression (just after left-bracket)
-  loops   ; a lisp list of `js2-array-comp-loop-node'
-  filter  ; guard/filter expression
-  if-pos  ; buffer pos of 'if' keyword, if present, else nil
-  lp      ; buffer position of if-guard left-paren, or nil if not present
-  rp)     ; buffer position of if-guard right-paren, or nil if not present
-
-(put 'cl-struct-js2-array-comp-node 'js2-visitor 'js2-visit-array-comp-node)
-(put 'cl-struct-js2-array-comp-node 'js2-printer 'js2-print-array-comp-node)
-
-(defun js2-visit-array-comp-node (n v)
-  (js2-visit-ast (js2-array-comp-node-result n) v)
-  (dolist (l (js2-array-comp-node-loops n))
-    (js2-visit-ast l v))
-  (if (js2-array-comp-node-filter n)
-      (js2-visit-ast (js2-array-comp-node-filter n) v)))
-
-(defun js2-print-array-comp-node (n i)
-  (let ((pad (js2-make-pad i))
-        (result (js2-array-comp-node-result n))
-        (loops (js2-array-comp-node-loops n))
-        (filter (js2-array-comp-node-filter n)))
-    (insert pad "[")
-    (js2-print-ast result 0)
-    (dolist (l loops)
-      (insert " ")
-      (js2-print-ast l 0))
-    (when filter
-      (insert " if (")
-      (js2-print-ast filter 0))
-    (insert ")]")))
-
-(defstruct (js2-array-comp-loop-node
-            (:include js2-for-in-node)
-            (:constructor nil)
-            (:constructor make-js2-array-comp-loop-node (&key (type js2-FOR)
-                                                              (pos js2-ts-cursor)
-                                                              len
-                                                              iterator
-                                                              object
-                                                              in-pos
-                                                              foreach-p
-                                                              each-pos
-                                                              lp
-                                                              rp)))
-  "AST subtree for each 'for (foo in bar)' loop in an array comprehension.")
-
-(put 'cl-struct-js2-array-comp-loop-node 'js2-visitor 'js2-visit-array-comp-loop)
-(put 'cl-struct-js2-array-comp-loop-node 'js2-printer 'js2-print-array-comp-loop)
-
-(defun js2-visit-array-comp-loop (n v)
-  (js2-visit-ast (js2-array-comp-loop-node-iterator n) v)
-  (js2-visit-ast (js2-array-comp-loop-node-object n) v))
-
-(defun js2-print-array-comp-loop (n i)
-  (insert "for (")
-  (js2-print-ast (js2-array-comp-loop-node-iterator n) 0)
-  (insert " in ")
-  (js2-print-ast (js2-array-comp-loop-node-object n) 0)
-  (insert ")"))
-
-(defstruct (js2-empty-expr-node
-            (:include js2-node)
-            (:constructor nil)
-            (:constructor make-js2-empty-expr-node (&key (type js2-EMPTY)
-                                                         (pos js2-token-beg)
-                                                         len)))
-  "AST node for an empty expression.")
-
-(put 'cl-struct-js2-empty-expr-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-empty-expr-node 'js2-printer 'js2-print-none)
-
-(defstruct (js2-xml-node
-            (:include js2-block-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-node (&key (type js2-XML)
-                                                  (pos js2-token-beg)
-                                                  len
-                                                  kids)))
-  "AST node for initial parse of E4X literals.
-The kids field is a list of XML fragments, each a `js2-string-node' or
-a `js2-xml-js-expr-node'.  Equivalent to Rhino's XmlLiteral node.")
-
-(put 'cl-struct-js2-xml-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-xml-node 'js2-printer 'js2-print-xml-node)
-
-(defun js2-print-xml-node (n i)
-  (dolist (kid (js2-xml-node-kids n))
-    (js2-print-ast kid i)))
-
-(defstruct (js2-xml-js-expr-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-js-expr-node (&key (type js2-XML)
-                                                          (pos js2-ts-cursor)
-                                                          len
-                                                          expr)))
-  "AST node for an embedded JavaScript {expression} in an E4X literal.
-The start and end fields correspond to the curly-braces."
-  expr)  ; a `js2-expr-node' of some sort
-
-(put 'cl-struct-js2-xml-js-expr-node 'js2-visitor 'js2-visit-xml-js-expr)
-(put 'cl-struct-js2-xml-js-expr-node 'js2-printer 'js2-print-xml-js-expr)
-
-(defun js2-visit-xml-js-expr (n v)
-  (js2-visit-ast (js2-xml-js-expr-node-expr n) v))
-
-(defun js2-print-xml-js-expr (n i)
-  (insert (js2-make-pad i))
-  (insert "{")
-  (js2-print-ast (js2-xml-js-expr-node-expr n) 0)
-  (insert "}"))
-
-(defstruct (js2-xml-dot-query-node
-            (:include js2-infix-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-dot-query-node (&key (type js2-DOTQUERY)
-                                                            (pos js2-ts-cursor)
-                                                            op-pos
-                                                            len
-                                                            left
-                                                            right
-                                                            rp)))
-  "AST node for an E4X foo.(bar) filter expression.
-Note that the left-paren is automatically the character immediately
-following the dot (.) in the operator.  No whitespace is permitted
-between the dot and the lp by the scanner."
-  rp)
-
-(put 'cl-struct-js2-xml-dot-query-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-xml-dot-query-node 'js2-printer 'js2-print-xml-dot-query)
-
-(defun js2-print-xml-dot-query (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-xml-dot-query-node-left n) 0)
-  (insert ".(")
-  (js2-print-ast (js2-xml-dot-query-node-right n) 0)
-  (insert ")"))
-
-(defstruct (js2-xml-ref-node
-            (:include js2-node)
-            (:constructor nil))  ; abstract
-  "Base type for E4X XML attribute-access or property-get expressions.
-Such expressions can take a variety of forms.  The general syntax has
-three parts:
-
-  - (optional) an @ (specifying an attribute access)
-  - (optional) a namespace (a `js2-name-node') and double-colon
-  - (required) either a `js2-name-node' or a bracketed [expression]
-
-The property-name expressions (examples:  ns::name, @name) are
-represented as `js2-xml-prop-ref' nodes.  The bracketed-expression
-versions (examples:  ns::[name], @[name]) become `js2-xml-elem-ref' nodes.
-
-This node type (or more specifically, its subclasses) will sometimes
-be the right-hand child of a `js2-prop-get-node' or a
-`js2-infix-node' of type `js2-DOTDOT', the .. xml-descendants operator.
-The `js2-xml-ref-node' may also be a standalone primary expression with
-no explicit target, which is valid in certain expression contexts such as
-
-  company..employee.(@id < 100)
-
-in this case, the @id is a `js2-xml-ref' that is part of an infix '<'
-expression whose parent is a `js2-xml-dot-query-node'."
-  namespace
-  at-pos
-  colon-pos)
-
-(defsubst js2-xml-ref-node-attr-access-p (node)
-  "Return non-nil if this expression began with an @-token."
-  (and (numberp (js2-xml-ref-node-at-pos node))
-       (plusp (js2-xml-ref-node-at-pos node))))
-
-(defstruct (js2-xml-prop-ref-node
-            (:include js2-xml-ref-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-prop-ref-node (&key (type js2-REF_NAME)
-                                                           (pos js2-token-beg)
-                                                           len
-                                                           propname
-                                                           namespace
-                                                           at-pos
-                                                           colon-pos)))
-  "AST node for an E4X XML [expr] property-ref expression.
-The JavaScript syntax is an optional @, an optional ns::, and a name.
-
-  [ '@' ] [ name '::' ] name
-
-Examples include name, ns::name, ns::*, *::name, *::*, @attr, @ns::attr,
-@ns::*, @*::attr, @*::*, and @*.
-
-The node starts at the @ token, if present.  Otherwise it starts at the
-namespace name.  The node bounds extend through the closing right-bracket,
-or if it is missing due to a syntax error, through the end of the index
-expression."
-  propname)
-
-(put 'cl-struct-js2-xml-prop-ref-node 'js2-visitor 'js2-visit-xml-prop-ref-node)
-(put 'cl-struct-js2-xml-prop-ref-node 'js2-printer 'js2-print-xml-prop-ref-node)
-
-(defun js2-visit-xml-prop-ref-node (n v)
-  (if (js2-xml-prop-ref-node-namespace n)
-      (js2-visit-ast (js2-xml-prop-ref-node-namespace n) v))
-  (if (js2-xml-prop-ref-node-propname n)
-      (js2-visit-ast (js2-xml-prop-ref-node-propname n) v)))
-
-(defun js2-print-xml-prop-ref-node (n i)
-  (insert (js2-make-pad i))
-  (if (js2-xml-ref-node-attr-access-p n)
-      (insert "@"))
-  (when (js2-xml-prop-ref-node-namespace n)
-    (js2-print-ast (js2-xml-prop-ref-node-namespace n) 0)
-    (insert "::"))
-  (if (js2-xml-prop-ref-node-propname n)
-      (js2-print-ast (js2-xml-prop-ref-node-propname n) 0)))
-
-(defstruct (js2-xml-elem-ref-node
-            (:include js2-xml-ref-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-elem-ref-node (&key (type js2-REF_MEMBER)
-                                                           (pos js2-token-beg)
-                                                           len
-                                                           expr
-                                                           lb
-                                                           rb
-                                                           namespace
-                                                           at-pos
-                                                           colon-pos)))
-  "AST node for an E4X XML [expr] member-ref expression.
-Syntax:
-
- [ '@' ] [ name '::' ] '[' expr ']'
-
-Examples include ns::[expr], @ns::[expr], @[expr], *::[expr] and @*::[expr].
-
-Note that the form [expr] (i.e. no namespace or attribute-qualifier)
-is not a legal E4X XML element-ref expression, since it's already used
-for standard JavaScript element-get array indexing.  Hence, a
-`js2-xml-elem-ref-node' always has either the attribute-qualifier, a
-non-nil namespace node, or both.
-
-The node starts at the @ token, if present.  Otherwise it starts
-at the namespace name.  The node bounds extend through the closing
-right-bracket, or if it is missing due to a syntax error, through the
-end of the index expression."
-  expr  ; the bracketed index expression
-  lb
-  rb)
-
-(put 'cl-struct-js2-xml-elem-ref-node 'js2-visitor 'js2-visit-xml-elem-ref-node)
-(put 'cl-struct-js2-xml-elem-ref-node 'js2-printer 'js2-print-xml-elem-ref-node)
-
-(defun js2-visit-xml-elem-ref-node (n v)
-  (if (js2-xml-elem-ref-node-namespace n)
-      (js2-visit-ast (js2-xml-elem-ref-node-namespace n) v))
-  (if (js2-xml-elem-ref-node-expr n)
-      (js2-visit-ast (js2-xml-elem-ref-node-expr n) v)))
-
-(defun js2-print-xml-elem-ref-node (n i)
-  (insert (js2-make-pad i))
-  (if (js2-xml-ref-node-attr-access-p n)
-      (insert "@"))
-  (when (js2-xml-elem-ref-node-namespace n)
-    (js2-print-ast (js2-xml-elem-ref-node-namespace n) 0)
-    (insert "::"))
-  (insert "[")
-  (if (js2-xml-elem-ref-node-expr n)
-      (js2-print-ast (js2-xml-elem-ref-node-expr n) 0))
-  (insert "]"))
-
-;;; Placeholder nodes for when we try parsing the XML literals structurally.
-
-(defstruct (js2-xml-start-tag-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-start-tag-node (&key (type js2-XML)
-                                                            (pos js2-ts-cursor)
-                                                            len
-                                                            name
-                                                            attrs
-                                                            kids
-                                                            empty-p)))
-  "AST node for an XML start-tag.  Not currently used.
-The `kids' field is a lisp list of child content nodes."
-  name      ; a `js2-xml-name-node'
-  attrs     ; a lisp list of `js2-xml-attr-node'
-  empty-p)  ; t if this is an empty element such as <foo bar="baz"/>
-
-(put 'cl-struct-js2-xml-start-tag-node 'js2-visitor 'js2-visit-xml-start-tag)
-(put 'cl-struct-js2-xml-start-tag-node 'js2-printer 'js2-print-xml-start-tag)
-
-(defun js2-visit-xml-start-tag (n v)
-  (js2-visit-ast (js2-xml-start-tag-node-name n) v)
-  (dolist (attr (js2-xml-start-tag-node-attrs n))
-    (js2-visit-ast attr v))
-  (js2-visit-block n v))
-
-(defun js2-print-xml-start-tag (n i)
-  (insert (js2-make-pad i) "<")
-  (js2-print-ast (js2-xml-start-tag-node-name n) 0)
-  (when (js2-xml-start-tag-node-attrs n)
-    (insert " ")
-    (js2-print-list (js2-xml-start-tag-node-attrs n) " "))
-  (insert ">"))
-
-;; I -think- I'm going to make the parent node the corresponding start-tag,
-;; and add the end-tag to the kids list of the parent as well.
-(defstruct (js2-xml-end-tag-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-end-tag-node (&key (type js2-XML)
-                                                          (pos js2-ts-cursor)
-                                                          len
-                                                          name)))
-  "AST node for an XML end-tag.  Not currently used."
-  name)  ; a `js2-xml-name-node'
-
-(put 'cl-struct-js2-xml-end-tag-node 'js2-visitor 'js2-visit-xml-end-tag)
-(put 'cl-struct-js2-xml-end-tag-node 'js2-printer 'js2-print-xml-end-tag)
-
-(defun js2-visit-xml-end-tag (n v)
-  (js2-visit-ast (js2-xml-end-tag-node-name n) v))
-
-(defun js2-print-xml-end-tag (n i)
-  (insert (js2-make-pad i))
-  (insert "</")
-  (js2-print-ast (js2-xml-end-tag-node-name n) 0)
-  (insert ">"))
-
-(defstruct (js2-xml-name-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-name-node (&key (type js2-XML)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       namespace
-                                                       kids)))
-  "AST node for an E4X XML name.  Not currently used.
-Any XML name can be qualified with a namespace, hence the namespace field.
-Further, any E4X name can be comprised of arbitrary JavaScript {} expressions.
-The kids field is a list of `js2-name-node' and `js2-xml-js-expr-node'.
-For a simple name, the kids list has exactly one node, a `js2-name-node'."
-  namespace)  ; a `js2-string-node'
-
-(put 'cl-struct-js2-xml-name-node 'js2-visitor 'js2-visit-xml-name-node)
-(put 'cl-struct-js2-xml-name-node 'js2-printer 'js2-print-xml-name-node)
-
-(defun js2-visit-xml-name-node (n v)
-  (js2-visit-ast (js2-xml-name-node-namespace n) v))
-
-(defun js2-print-xml-name-node (n i)
-  (insert (js2-make-pad i))
-  (when (js2-xml-name-node-namespace n)
-    (js2-print-ast (js2-xml-name-node-namespace n) 0)
-    (insert "::"))
-  (dolist (kid (js2-xml-name-node-kids n))
-    (js2-print-ast kid 0)))
-
-(defstruct (js2-xml-pi-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-pi-node (&key (type js2-XML)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     name
-                                                     attrs)))
-  "AST node for an E4X XML processing instruction.  Not currently used."
-  name   ; a `js2-xml-name-node'
-  attrs) ; a list of `js2-xml-attr-node'
-
-(put 'cl-struct-js2-xml-pi-node 'js2-visitor 'js2-visit-xml-pi-node)
-(put 'cl-struct-js2-xml-pi-node 'js2-printer 'js2-print-xml-pi-node)
-
-(defun js2-visit-xml-pi-node (n v)
-  (js2-visit-ast (js2-xml-pi-node-name n) v)
-  (dolist (attr (js2-xml-pi-node-attrs n))
-    (js2-visit-ast attr v)))
-
-(defun js2-print-xml-pi-node (n i)
-  (insert (js2-make-pad i) "<?")
-  (js2-print-ast (js2-xml-pi-node-name n))
-  (when (js2-xml-pi-node-attrs n)
-    (insert " ")
-    (js2-print-list (js2-xml-pi-node-attrs n)))
-  (insert "?>"))
-
-(defstruct (js2-xml-cdata-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-cdata-node (&key (type js2-XML)
-                                                        (pos js2-ts-cursor)
-                                                        len
-                                                        content)))
-  "AST node for a CDATA escape section.  Not currently used."
-  content)  ; a `js2-string-node' with node-property 'quote-type 'cdata
-
-(put 'cl-struct-js2-xml-cdata-node 'js2-visitor 'js2-visit-xml-cdata-node)
-(put 'cl-struct-js2-xml-cdata-node 'js2-printer 'js2-print-xml-cdata-node)
-
-(defun js2-visit-xml-cdata-node (n v)
-  (js2-visit-ast (js2-xml-cdata-node-content n) v))
-
-(defun js2-print-xml-cdata-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-xml-cdata-node-content n)))
-
-(defstruct (js2-xml-attr-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-attr-node (&key (type js2-XML)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   name
-                                                   value
-                                                   eq-pos
-                                                   quote-type)))
-  "AST node representing a foo='bar' XML attribute value.  Not yet used."
-  name   ; a `js2-xml-name-node'
-  value  ; a `js2-xml-name-node'
-  eq-pos ; buffer position of "=" sign
-  quote-type) ; 'single or 'double
-
-(put 'cl-struct-js2-xml-attr-node 'js2-visitor 'js2-visit-xml-attr-node)
-(put 'cl-struct-js2-xml-attr-node 'js2-printer 'js2-print-xml-attr-node)
-
-(defun js2-visit-xml-attr-node (n v)
-  (js2-visit-ast (js2-xml-attr-node-name n) v)
-  (js2-visit-ast (js2-xml-attr-node-value n) v))
-
-(defun js2-print-xml-attr-node (n i)
-  (let ((quote (if (eq (js2-xml-attr-node-quote-type n) 'single)
-                   "'"
-                 "\"")))
-    (insert (js2-make-pad i))
-    (js2-print-ast (js2-xml-attr-node-name n) 0)
-    (insert "=" quote)
-    (js2-print-ast (js2-xml-attr-node-value n) 0)
-    (insert quote)))
-
-(defstruct (js2-xml-text-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-text-node (&key (type js2-XML)
-                                                   (pos js2-ts-cursor)
-                                                   len
-                                                   content)))
-  "AST node for an E4X XML text node.  Not currently used."
-  content)  ; a lisp list of `js2-string-node' and `js2-xml-js-expr-node'
-
-(put 'cl-struct-js2-xml-text-node 'js2-visitor 'js2-visit-xml-text-node)
-(put 'cl-struct-js2-xml-text-node 'js2-printer 'js2-print-xml-text-node)
-
-(defun js2-visit-xml-text-node (n v)
-  (js2-visit-ast (js2-xml-text-node-content n) v))
-
-(defun js2-print-xml-text-node (n i)
-  (insert (js2-make-pad i))
-  (dolist (kid (js2-xml-text-node-content n))
-    (js2-print-ast kid)))
-
-(defstruct (js2-xml-comment-node
-            (:include js2-xml-node)
-            (:constructor nil)
-            (:constructor make-js2-xml-comment-node (&key (type js2-XML)
-                                                          (pos js2-ts-cursor)
-                                                          len)))
-  "AST node for E4X XML comment.  Not currently used.")
-
-(put 'cl-struct-js2-xml-comment-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-xml-comment-node 'js2-printer 'js2-print-xml-comment)
-
-(defun js2-print-xml-comment (n i)
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-;;; Node utilities
-
-(defsubst js2-node-line (n)
-  "Fetch the source line number at the start of node N.
-This is O(n) in the length of the source buffer; use prudently."
-  (1+ (count-lines (point-min) (js2-node-abs-pos n))))
-
-(defsubst js2-block-node-kid (n i)
-  "Return child I of node N, or nil if there aren't that many."
-  (nth i (js2-block-node-kids n)))
-
-(defsubst js2-block-node-first (n)
-  "Return first child of block node N, or nil if there is none."
-  (first (js2-block-node-kids n)))
-
-(defun js2-node-root (n)
-  "Return the root of the AST containing N.
-If N has no parent pointer, returns N."
-  (let ((parent (js2-node-parent n)))
-    (if parent
-        (js2-node-root parent)
-      n)))
-
-(defun js2-node-position-in-parent (node &optional parent)
-  "Return the position of NODE in parent's block-kids list.
-PARENT can be supplied if known.  Positioned returned is zero-indexed.
-Returns 0 if NODE is not a child of a block statement, or if NODE
-is not a statement node."
-  (let ((p (or parent (js2-node-parent node)))
-        (i 0))
-    (if (not (js2-block-node-p p))
-        i
-      (or (js2-position node (js2-block-node-kids p))
-          0))))
-
-(defsubst js2-node-short-name (n)
-  "Return the short name of node N as a string, e.g. `js2-if-node'."
-  (substring (symbol-name (aref n 0))
-             (length "cl-struct-")))
-
-(defsubst js2-node-child-list (node)
-  "Return the child list for NODE, a lisp list of nodes.
-Works for block nodes, array nodes, obj literals, funarg lists,
-var decls and try nodes (for catch clauses).  Note that you should call
-`js2-block-node-kids' on the function body for the body statements.
-Returns nil for zero-length child lists or unsupported nodes."
-  (cond
-   ((js2-function-node-p node)
-    (js2-function-node-params node))
-   ((js2-block-node-p node)
-    (js2-block-node-kids node))
-   ((js2-try-node-p node)
-    (js2-try-node-catch-clauses node))
-   ((js2-array-node-p node)
-    (js2-array-node-elems node))
-   ((js2-object-node-p node)
-    (js2-object-node-elems node))
-   ((js2-call-node-p node)
-    (js2-call-node-args node))
-   ((js2-new-node-p node)
-    (js2-new-node-args node))
-   ((js2-var-decl-node-p node)
-    (js2-var-decl-node-kids node))
-   (t
-    nil)))
-
-(defsubst js2-node-set-child-list (node kids)
-  "Set the child list for NODE to KIDS."
-   (cond
-    ((js2-function-node-p node)
-     (setf (js2-function-node-params node) kids))
-    ((js2-block-node-p node)
-     (setf (js2-block-node-kids node) kids))
-    ((js2-try-node-p node)
-     (setf (js2-try-node-catch-clauses node) kids))
-    ((js2-array-node-p node)
-     (setf (js2-array-node-elems node) kids))
-    ((js2-object-node-p node)
-     (setf (js2-object-node-elems node) kids))
-    ((js2-call-node-p node)
-     (setf (js2-call-node-args node) kids))
-    ((js2-new-node-p node)
-     (setf (js2-new-node-args node) kids))
-    ((js2-var-decl-node-p node)
-     (setf (js2-var-decl-node-kids node) kids))
-    (t
-     (error "Unsupported node type: %s" (js2-node-short-name node))))
-   kids)
-
-;; All because Common Lisp doesn't support multiple inheritance for defstructs.
-(defconst js2-paren-expr-nodes
-  '(cl-struct-js2-array-comp-loop-node
-    cl-struct-js2-array-comp-node
-    cl-struct-js2-call-node
-    cl-struct-js2-catch-node
-    cl-struct-js2-do-node
-    cl-struct-js2-elem-get-node
-    cl-struct-js2-for-in-node
-    cl-struct-js2-for-node
-    cl-struct-js2-function-node
-    cl-struct-js2-if-node
-    cl-struct-js2-let-node
-    cl-struct-js2-new-node
-    cl-struct-js2-paren-node
-    cl-struct-js2-switch-node
-    cl-struct-js2-while-node
-    cl-struct-js2-with-node
-    cl-struct-js2-xml-dot-query-node)
-  "Node types that can have a parenthesized child expression.
-In particular, nodes that respond to `js2-node-lp' and `js2-node-rp'.")
-
-(defsubst js2-paren-expr-node-p (node)
-  "Return t for nodes that typically have a parenthesized child expression.
-Useful for computing the indentation anchors for arg-lists and conditions.
-Note that it may return a false positive, for instance when NODE is
-a `js2-new-node' and there are no arguments or parentheses."
-  (memq (aref node 0) js2-paren-expr-nodes))
-
-;; Fake polymorphism... yech.
-(defsubst js2-node-lp (node)
-  "Return relative left-paren position for NODE, if applicable.
-For `js2-elem-get-node' structs, returns left-bracket position.
-Note that the position may be nil in the case of a parse error."
-  (cond
-   ((js2-elem-get-node-p node)
-    (js2-elem-get-node-lb node))
-   ((js2-loop-node-p node)
-    (js2-loop-node-lp node))
-   ((js2-function-node-p node)
-    (js2-function-node-lp node))
-   ((js2-if-node-p node)
-    (js2-if-node-lp node))
-   ((js2-new-node-p node)
-    (js2-new-node-lp node))
-   ((js2-call-node-p node)
-    (js2-call-node-lp node))
-   ((js2-paren-node-p node)
-    (js2-node-pos node))
-   ((js2-switch-node-p node)
-    (js2-switch-node-lp node))
-   ((js2-catch-node-p node)
-    (js2-catch-node-lp node))
-   ((js2-let-node-p node)
-    (js2-let-node-lp node))
-   ((js2-array-comp-node-p node)
-    (js2-array-comp-node-lp node))
-   ((js2-with-node-p node)
-    (js2-with-node-lp node))
-   ((js2-xml-dot-query-node-p node)
-    (1+ (js2-infix-node-op-pos node)))
-   (t
-    (error "Unsupported node type: %s" (js2-node-short-name node)))))
-
-;; Fake polymorphism... blech.
-(defsubst js2-node-rp (node)
-  "Return relative right-paren position for NODE, if applicable.
-For `js2-elem-get-node' structs, returns right-bracket position.
-Note that the position may be nil in the case of a parse error."
-  (cond
-   ((js2-elem-get-node-p node)
-    (js2-elem-get-node-lb node))
-   ((js2-loop-node-p node)
-    (js2-loop-node-rp node))
-   ((js2-function-node-p node)
-    (js2-function-node-rp node))
-   ((js2-if-node-p node)
-    (js2-if-node-rp node))
-   ((js2-new-node-p node)
-    (js2-new-node-rp node))
-   ((js2-call-node-p node)
-    (js2-call-node-rp node))
-   ((js2-paren-node-p node)
-    (+ (js2-node-pos node) (js2-node-len node)))
-   ((js2-switch-node-p node)
-    (js2-switch-node-rp node))
-   ((js2-catch-node-p node)
-    (js2-catch-node-rp node))
-   ((js2-let-node-p node)
-    (js2-let-node-rp node))
-   ((js2-array-comp-node-p node)
-    (js2-array-comp-node-rp node))
-   ((js2-with-node-p node)
-    (js2-with-node-rp node))
-   ((js2-xml-dot-query-node-p node)
-    (1+ (js2-xml-dot-query-node-rp node)))
-   (t
-    (error "Unsupported node type: %s" (js2-node-short-name node)))))
-
-(defsubst js2-node-first-child (node)
-  "Returns the first element of `js2-node-child-list' for NODE."
-  (car (js2-node-child-list node)))
-
-(defsubst js2-node-last-child (node)
-  "Returns the last element of `js2-node-last-child' for NODE."
-  (car (last (js2-node-child-list node))))
-
-(defun js2-node-prev-sibling (node)
-  "Return the previous statement in parent.
-Works for parents supported by `js2-node-child-list'.
-Returns nil if NODE is not in the parent, or PARENT is
-not a supported node, or if NODE is the first child."
-  (let* ((p (js2-node-parent node))
-         (kids (js2-node-child-list p))
-         (sib (car kids)))
-    (while (and kids
-                (neq node (cadr kids)))
-      (setq kids (cdr kids)
-            sib (car kids)))
-    sib))
-
-(defun js2-node-next-sibling (node)
-  "Return the next statement in parent block.
-Returns nil if NODE is not in the block, or PARENT is not
-a block node, or if NODE is the last statement."
-  (let* ((p (js2-node-parent node))
-         (kids (js2-node-child-list p)))
-    (while (and kids
-                (neq node (car kids)))
-      (setq kids (cdr kids)))
-    (cadr kids)))
-
-(defun js2-node-find-child-before (pos parent &optional after)
-  "Find the last child that starts before POS in parent.
-If AFTER is non-nil, returns first child starting after POS.
-POS is an absolute buffer position.  PARENT is any node
-supported by `js2-node-child-list'.
-Returns nil if no applicable child is found."
-  (let ((kids (if (js2-function-node-p parent)
-                  (js2-block-node-kids (js2-function-node-body parent))
-                (js2-node-child-list parent)))
-        (beg (if (js2-function-node-p parent)
-                 (js2-node-abs-pos (js2-function-node-body parent))
-               (js2-node-abs-pos parent)))
-        kid
-        result
-        fn
-        (continue t))
-    (setq fn (if after '> '<))
-    (while (and kids continue)
-      (setq kid (car kids))
-      (if (funcall fn (+ beg (js2-node-pos kid)) pos)
-          (setq result kid
-                continue (if after nil t))
-        (setq continue (if after t nil)))
-      (setq kids (cdr kids)))
-    result))
-
-(defun js2-node-find-child-after (pos parent)
-  "Find first child that starts after POS in parent.
-POS is an absolute buffer position.  PARENT is any node
-supported by `js2-node-child-list'.
-Returns nil if no applicable child is found."
-  (js2-node-find-child-before pos parent 'after))
-
-(defun js2-node-replace-child (pos parent new-node)
-  "Replace node at index POS in PARENT with NEW-NODE.
-Only works for parents supported by `js2-node-child-list'."
-  (let ((kids (js2-node-child-list parent))
-        (i 0))
-    (while (< i pos)
-      (setq kids (cdr kids)
-            i (1+ i)))
-    (setcar kids new-node)
-    (js2-node-add-children parent new-node)))
-
-(defun js2-node-buffer (n)
-  "Return the buffer associated with AST N.
-Returns nil if the buffer is not set as a property on the root
-node, or if parent links were not recorded during parsing."
-  (let ((root (js2-node-root n)))
-    (and root
-         (js2-ast-root-p root)
-         (js2-ast-root-buffer root))))
-
-(defsubst js2-block-node-push (n kid)
-  "Push js2-node KID onto the end of js2-block-node N's child list.
-KID is always added to the -end- of the kids list.
-Function also calls `js2-node-add-children' to add the parent link."
-  (let ((kids (js2-node-child-list n)))
-    (if kids
-        (setcdr kids (nconc (cdr kids) (list kid)))
-      (js2-node-set-child-list n (list kid)))
-    (js2-node-add-children n kid)))
-
-(defun js2-node-string (node)
-  (let ((buf (js2-node-buffer node))
-        pos)
-    (unless buf
-      (error "No buffer available for node %s" node))
-    (save-excursion
-      (set-buffer buf)
-      (buffer-substring-no-properties (setq pos (js2-node-abs-pos node))
-                                      (+ pos (js2-node-len node))))))
-
-;; Container for storing the node we're looking for in a traversal.
-(defvar js2-discovered-node nil)
-(make-variable-buffer-local 'js2-discovered-node)
-
-;; Keep track of absolute node position during traversals.
-(defvar js2-visitor-offset nil)
-(make-variable-buffer-local 'js2-visitor-offset)
-
-(defvar js2-node-search-point nil)
-(make-variable-buffer-local 'js2-node-search-point)
-
-(when js2-mode-dev-mode-p
-  (defun js2-find-node-at-point ()
-    (interactive)
-    (let ((node (js2-node-at-point)))
-      (message "%s" (or node "No node found at point"))))
-  (defun js2-node-name-at-point ()
-    (interactive)
-    (let ((node (js2-node-at-point)))
-      (message "%s" (if node
-                        (js2-node-short-name node)
-                      "No node found at point.")))))
-
-(defun js2-node-at-point (&optional pos skip-comments)
-  "Return AST node at POS, a buffer position, defaulting to current point.
-The `js2-mode-ast' variable must be set to the current parse tree.
-Signals an error if the AST (`js2-mode-ast') is nil.
-Always returns a node - if it can't find one, it returns the root.
-If SKIP-COMMENTS is non-nil, comment nodes are ignored."
-  (let ((ast js2-mode-ast)
-        result)
-    (unless ast
-      (error "No JavaScript AST available"))
-    ;; Look through comments first, since they may be inside nodes that
-    ;; would otherwise report a match.
-    (setq pos (or pos (point))
-          result (if (> pos (js2-node-abs-end ast))
-                     ast
-                   (if (not skip-comments)
-                       (js2-comment-at-point pos))))
-    (unless result
-      (setq js2-discovered-node nil
-            js2-visitor-offset 0
-            js2-node-search-point pos)
-      (unwind-protect
-          (catch 'js2-visit-done
-            (js2-visit-ast ast #'js2-node-at-point-visitor))
-        (setq js2-visitor-offset nil
-              js2-node-search-point nil))
-      (setq result js2-discovered-node))
-    ;; may have found a comment beyond end of last child node,
-    ;; since visiting the ast-root looks at the comment-list last.
-    (if (and skip-comments
-             (js2-comment-node-p result))
-        (setq result nil))
-    (or result js2-mode-ast)))
-
-(defun js2-node-at-point-visitor (node end-p)
-  (let ((rel-pos (js2-node-pos node))
-        abs-pos
-        abs-end
-        (point js2-node-search-point))
-    (cond
-     (end-p
-      ;; this evaluates to a non-nil return value, even if it's zero
-      (decf js2-visitor-offset rel-pos))
-     ;; we already looked for comments before visiting, and don't want them now
-     ((js2-comment-node-p node)
-      nil)
-     (t
-      (setq abs-pos (incf js2-visitor-offset rel-pos)
-            ;; we only want to use the node if the point is before
-            ;; the last character position in the node, so we decrement
-            ;; the absolute end by 1.
-            abs-end (+ abs-pos (js2-node-len node) -1))
-      (cond
-       ;; If this node starts after search-point, stop the search.
-       ((> abs-pos point)
-        (throw 'js2-visit-done nil))
-       ;; If this node ends before the search-point, don't check kids.
-       ((> point abs-end)
-        nil)
-       (t
-        ;; Otherwise point is within this node, possibly in a child.
-        (setq js2-discovered-node node)
-        t))))))  ; keep processing kids to look for more specific match
-
-(defsubst js2-block-comment-p (node)
-  "Return non-nil if NODE is a comment node of format `jsdoc' or `block'."
-  (and (js2-comment-node-p node)
-       (memq (js2-comment-node-format node) '(jsdoc block))))
-
-;; TODO:  put the comments in a vector and binary-search them instead
-(defun js2-comment-at-point (&optional pos)
-  "Look through scanned comment nodes for one containing POS.
-POS is a buffer position that defaults to current point.
-Function returns nil if POS was not in any comment node."
-  (let ((ast js2-mode-ast)
-        (x (or pos (point)))
-        beg
-        end)
-    (unless ast
-      (error "No JavaScript AST available"))
-    (catch 'done
-      ;; Comments are stored in lexical order.
-      (dolist (comment (js2-ast-root-comments ast) nil)
-        (setq beg (js2-node-abs-pos comment)
-              end (+ beg (js2-node-len comment)))
-        (if (and (>= x beg)
-                 (<= x end))
-            (throw 'done comment))))))
-
-(defun js2-mode-find-parent-fn (node)
-  "Find function enclosing NODE.
-Returns nil if NODE is not inside a function."
-  (setq node (js2-node-parent node))
-  (while (and node (not (js2-function-node-p node)))
-    (setq node (js2-node-parent node)))
-  (and (js2-function-node-p node) node))
-
-(defun js2-mode-find-enclosing-fn (node)
-  "Find function or root enclosing NODE."
-  (if (js2-ast-root-p node)
-      node
-    (setq node (js2-node-parent node))
-    (while (not (or (js2-ast-root-p node)
-                    (js2-function-node-p node)))
-      (setq node (js2-node-parent node)))
-    node))
-
-(defun js2-mode-find-enclosing-node (beg end)
-  "Find script or function fully enclosing BEG and END."
-  (let ((node (js2-node-at-point beg))
-        pos
-        (continue t))
-    (while continue
-      (if (or (js2-ast-root-p node)
-              (and (js2-function-node-p node)
-                   (<= (setq pos (js2-node-abs-pos node)) beg)
-                   (>= (+ pos (js2-node-len node)) end)))
-          (setq continue nil)
-        (setq node (js2-node-parent node))))
-    node))
-
-(defun js2-node-parent-script-or-fn (node)
-  "Find script or function immediately enclosing NODE.
-If NODE is the ast-root, returns nil."
-  (if (js2-ast-root-p node)
-      nil
-    (setq node (js2-node-parent node))
-    (while (and node (not (or (js2-function-node-p node)
-                              (js2-script-node-p node))))
-      (setq node (js2-node-parent node)))
-    node))
-
-(defsubst js2-nested-function-p (node)
-  "Return t if NODE is a nested function, or is inside a nested function."
-  (js2-function-node-p (if (js2-function-node-p node)
-                           (js2-node-parent-script-or-fn node)
-                         (js2-node-parent-script-or-fn
-                          (js2-node-parent-script-or-fn node)))))
-
-(defsubst js2-mode-shift-kids (kids start offset)
-  (dolist (kid kids)
-    (if (> (js2-node-pos kid) start)
-        (incf (js2-node-pos kid) offset))))
-
-(defsubst js2-mode-shift-children (parent start offset)
-  "Update start-positions of all children of PARENT beyond START."
-  (let ((root (js2-node-root parent)))
-    (js2-mode-shift-kids (js2-node-child-list parent) start offset)
-    (js2-mode-shift-kids (js2-ast-root-comments root) start offset)))
-
-(defsubst js2-node-is-descendant (node ancestor)
-  "Return t if NODE is a descendant of ANCESTOR."
-  (while (and node
-              (neq node ancestor))
-    (setq node (js2-node-parent node)))
-  node)
-
-;;; visitor infrastructure
-
-(defun js2-visit-none (node callback)
-  "Visitor for AST node that have no node children."
-  nil)
-
-(defun js2-print-none (node indent)
-  "Visitor for AST node with no printed representation.")
-
-(defun js2-print-body (node indent)
-  "Print a statement, or a block without braces."
-  (if (js2-block-node-p node)
-      (dolist (kid (js2-block-node-kids node))
-        (js2-print-ast kid indent))
-    (js2-print-ast node indent)))
-
-(defun js2-print-list (args &optional delimiter)
-  (loop with len = (length args)
-        for arg in args
-        for count from 1
-        do
-        (js2-print-ast arg 0)
-        (if (< count len)
-            (insert (or delimiter ", ")))))
-
-(defun js2-print-tree (ast)
-  "Prints an AST to the current buffer.
-Makes `js2-ast-parent-nodes' available to the printer functions."
-  (let ((max-lisp-eval-depth (max max-lisp-eval-depth 1500)))
-    (js2-print-ast ast)))
-
-(defun js2-print-ast (node &optional indent)
-  "Helper function for printing AST nodes.
-Requires `js2-ast-parent-nodes' to be non-nil.
-You should use `js2-print-tree' instead of this function."
-  (let ((printer (get (aref node 0) 'js2-printer))
-        (i (or indent 0))
-        (pos (js2-node-abs-pos node)))
-    ;; TODO:  wedge comments in here somewhere
-    (if printer
-        (funcall printer node i))))
-
-(defconst js2-side-effecting-tokens
-  (let ((tokens (make-bool-vector js2-num-tokens nil)))
-    (dolist (tt (list js2-ASSIGN
-                      js2-ASSIGN_ADD
-                      js2-ASSIGN_BITAND
-                      js2-ASSIGN_BITOR
-                      js2-ASSIGN_BITXOR
-                      js2-ASSIGN_DIV
-                      js2-ASSIGN_LSH
-                      js2-ASSIGN_MOD
-                      js2-ASSIGN_MUL
-                      js2-ASSIGN_RSH
-                      js2-ASSIGN_SUB
-                      js2-ASSIGN_URSH
-                      js2-BLOCK
-                      js2-BREAK
-                      js2-CALL
-                      js2-CATCH
-                      js2-CATCH_SCOPE
-                      js2-CONST
-                      js2-CONTINUE
-                      js2-DEBUGGER
-                      js2-DEC
-                      js2-DELPROP
-                      js2-DEL_REF
-                      js2-DO
-                      js2-ELSE
-                      js2-EMPTY
-                      js2-ENTERWITH
-                      js2-EXPORT
-                      js2-EXPR_RESULT
-                      js2-FINALLY
-                      js2-FOR
-                      js2-FUNCTION
-                      js2-GOTO
-                      js2-IF
-                      js2-IFEQ
-                      js2-IFNE
-                      js2-IMPORT
-                      js2-INC
-                      js2-JSR
-                      js2-LABEL
-                      js2-LEAVEWITH
-                      js2-LET
-                      js2-LETEXPR
-                      js2-LOCAL_BLOCK
-                      js2-LOOP
-                      js2-NEW
-                      js2-REF_CALL
-                      js2-RETHROW
-                      js2-RETURN
-                      js2-RETURN_RESULT
-                      js2-SEMI
-                      js2-SETELEM
-                      js2-SETELEM_OP
-                      js2-SETNAME
-                      js2-SETPROP
-                      js2-SETPROP_OP
-                      js2-SETVAR
-                      js2-SET_REF
-                      js2-SET_REF_OP
-                      js2-SWITCH
-                      js2-TARGET
-                      js2-THROW
-                      js2-TRY
-                      js2-VAR
-                      js2-WHILE
-                      js2-WITH
-                      js2-WITHEXPR
-                      js2-YIELD))
-      (aset tokens tt t))
-    (if js2-instanceof-has-side-effects
-        (aset tokens js2-INSTANCEOF t))
-    tokens))
-
-(defun js2-node-has-side-effects (node)
-  "Return t if NODE has side effects."
-  (when node  ; makes it easier to handle malformed expressions
-    (let ((tt (js2-node-type node)))
-      (cond
-       ;; This doubtless needs some work, since EXPR_VOID is used
-       ;; in several ways in Rhino, and I may not have caught them all.
-       ;; I'll wait for people to notice incorrect warnings.
-       ((and (= tt js2-EXPR_VOID)
-             (js2-expr-stmt-node-p node)) ; but not if EXPR_RESULT
-        (js2-node-has-side-effects (js2-expr-stmt-node-expr node)))
-
-       ((= tt js2-COMMA)
-        (js2-node-has-side-effects (js2-infix-node-right node)))
-
-       ((or (= tt js2-AND)
-            (= tt js2-OR))
-        (or (js2-node-has-side-effects (js2-infix-node-right node))
-            (js2-node-has-side-effects (js2-infix-node-left node))))
-
-       ((= tt js2-HOOK)
-        (and (js2-node-has-side-effects (js2-cond-node-true-expr node))
-             (js2-node-has-side-effects (js2-cond-node-false-expr node))))
-
-       ((js2-paren-node-p node)
-        (js2-node-has-side-effects (js2-paren-node-expr node)))
-
-       ((= tt js2-ERROR) ; avoid cascaded error messages
-        nil)
-       (t
-        (aref js2-side-effecting-tokens tt))))))
-
-(defun js2-member-expr-leftmost-name (node)
-  "For an expr such as foo.bar.baz, return leftmost node foo.
-NODE is any `js2-node' object.  If it represents a member expression,
-which is any sequence of property gets, element-gets, function calls,
-or xml descendants/filter operators, then we look at the lexically
-leftmost (first) node in the chain.  If it is a name-node we return it.
-Note that NODE can be a raw name-node and it will be returned as well.
-If NODE is not a name-node or member expression, or if it is a member
-expression whose leftmost target is not a name node, returns nil."
-  (let ((continue t)
-        result)
-    (while (and continue (not result))
-      (cond
-       ((js2-name-node-p node)
-        (setq result node))
-       ((js2-prop-get-node-p node)
-        (setq node (js2-prop-get-node-left node)))
-       ;; TODO:  handle call-nodes, xml-nodes, others?
-       (t
-        (setq continue nil))))
-    result))
-
-(defconst js2-stmt-node-types
-  (list js2-BLOCK
-        js2-BREAK
-        js2-CONTINUE
-        js2-DEFAULT  ; e4x "default xml namespace" statement
-        js2-DO
-        js2-EXPR_RESULT
-        js2-EXPR_VOID
-        js2-FOR
-        js2-IF
-        js2-RETURN
-        js2-SWITCH
-        js2-THROW
-        js2-TRY
-        js2-WHILE
-        js2-WITH)
-  "Node types that only appear in statement contexts.
-The list does not include nodes that always appear as the child
-of another specific statement type, such as switch-cases,
-catch and finally blocks, and else-clauses.  The list also excludes
-nodes like yield, let and var, which may appear in either expression
-or statement context, and in the latter context always have a
-`js2-expr-stmt-node' parent.  Finally, the list does not include
-functions or scripts, which are treated separately from statements
-by the JavaScript parser and runtime.")
-
-(defun js2-stmt-node-p (node)
-  "Heuristic for figuring out if NODE is a statement.
-Some node types can appear in either an expression context or a
-statement context, e.g. let-nodes, yield-nodes, and var-decl nodes.
-For these node types in a statement context, the parent will be a
-`js2-expr-stmt-node'.
-Functions aren't included in the check."
-  (memq (js2-node-type node) js2-stmt-node-types))
-
-(defsubst js2-mode-find-first-stmt (node)
-  "Search upward starting from NODE looking for a statement.
-For purposes of this function, a `js2-function-node' counts."
-  (while (not (or (js2-stmt-node-p node)
-                  (js2-function-node-p node)))
-    (setq node (js2-node-parent node)))
-  node)
-
-(defun js2-node-parent-stmt (node)
-  "Return the node's first ancestor that is a statement.
-Returns nil if NODE is a `js2-ast-root'.  Note that any expression
-appearing in a statement context will have a parent that is a
-`js2-expr-stmt-node' that will be returned by this function."
-  (let ((parent (js2-node-parent node)))
-    (if (or (null parent)
-            (js2-stmt-node-p parent)
-            (and (js2-function-node-p parent)
-                 (neq (js2-function-node-form parent) 'FUNCTION_EXPRESSION)))
-        parent
-      (js2-node-parent-stmt parent))))
-
-;; Roshan James writes:
-;;  Does consistent-return analysis on the function body when strict mode is
-;;  enabled.
-;;
-;;    function (x) { return (x+1) }
-;;
-;;  is ok, but
-;;
-;;    function (x) { if (x < 0) return (x+1); }
-;;
-;;  is not because the function can potentially return a value when the
-;;  condition is satisfied and if not, the function does not explicitly
-;;  return a value.
-;;
-;;  This extends to checking mismatches such as "return" and "return <value>"
-;;  used in the same function. Warnings are not emitted if inconsistent
-;;  returns exist in code that can be statically shown to be unreachable.
-;;  Ex.
-;;    function (x) { while (true) { ... if (..) { return value } ... } }
-;;
-;;  emits no warning. However if the loop had a break statement, then a
-;;  warning would be emitted.
-;;
-;;  The consistency analysis looks at control structures such as loops, ifs,
-;;  switch, try-catch-finally blocks, examines the reachable code paths and
-;;  warns the user about an inconsistent set of termination possibilities.
-;;
-;;  These flags enumerate the possible ways a statement/function can
-;;  terminate. These flags are used by endCheck() and by the Parser to
-;;  detect inconsistent return usage.
-;;
-;;  END_UNREACHED is reserved for code paths that are assumed to always be
-;;  able to execute (example: throw, continue)
-;;
-;;  END_DROPS_OFF indicates if the statement can transfer control to the
-;;  next one. Statement such as return dont. A compound statement may have
-;;  some branch that drops off control to the next statement.
-;;
-;;  END_RETURNS indicates that the statement can return with no value.
-;;  END_RETURNS_VALUE indicates that the statement can return a value.
-;;
-;;  A compound statement such as
-;;  if (condition) {
-;;    return value;
-;;  }
-;;  Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
-
-(defconst js2-END_UNREACHED 0)
-(defconst js2-END_DROPS_OFF 1)
-(defconst js2-END_RETURNS 2)
-(defconst js2-END_RETURNS_VALUE 4)
-(defconst js2-END_YIELDS 8)
-
-(defun js2-has-consistent-return-usage (node)
-  "Check that every return usage in a function body is consistent.
-Returns t if the function satisfies strict mode requirement."
-  (let ((n (js2-end-check node)))
-    ;; either it doesn't return a value in any branch...
-    (or (js2-flag-not-set-p n js2-END_RETURNS_VALUE)
-        ;; or it returns a value (or is unreached) at every branch
-        (js2-flag-not-set-p n (logior js2-END_DROPS_OFF
-                                      js2-END_RETURNS
-                                      js2-END_YIELDS)))))
-
-(defun js2-end-check-if (node)
-  "Returns in the then and else blocks must be consistent with each other.
-If there is no else block, then the return statement can fall through.
-Returns logical OR of END_* flags"
-  (let ((th (js2-if-node-then-part node))
-        (el (js2-if-node-else-part node)))
-    (if (null th)
-        js2-END_UNREACHED
-      (logior (js2-end-check th) (if el
-                                     (js2-end-check el)
-                                   js2-END_DROPS_OFF)))))
-
-(defun js2-end-check-switch (node)
-  "Consistency of return statements is checked between the case statements.
-If there is no default, then the switch can fall through. If there is a
-default, we check to see if all code paths in the default return or if
-there is a code path that can fall through.
-Returns logical OR of END_* flags."
-  (let ((rv js2-END_UNREACHED)
-        default-case)
-    ;; examine the cases
-    (catch 'break
-      (dolist (c (js2-switch-node-cases node))
-        (if (js2-case-node-expr c)
-            (js2-set-flag rv (js2-end-check-block c))
-          (setq default-case c)
-          (throw 'break nil))))
-
-    ;; we don't care how the cases drop into each other
-    (js2-clear-flag rv js2-END_DROPS_OFF)
-
-    ;; examine the default
-    (js2-set-flag rv (if default-case
-                         (js2-end-check default-case)
-                       js2-END_DROPS_OFF))
-    rv))
-
-(defun js2-end-check-try (node)
- "If the block has a finally, return consistency is checked in the
-finally block. If all code paths in the finally return, then the
-returns in the try-catch blocks don't matter. If there is a code path
-that does not return or if there is no finally block, the returns
-of the try and catch blocks are checked for mismatch.
-Returns logical OR of END_* flags."
- (let ((finally (js2-try-node-finally-block node))
-       rv)
-   ;; check the finally if it exists
-   (setq rv (if finally
-                (js2-end-check (js2-finally-node-body finally))
-              js2-END_DROPS_OFF))
-
-   ;; If the finally block always returns, then none of the returns
-   ;; in the try or catch blocks matter.
-   (when (js2-flag-set-p rv js2-END_DROPS_OFF)
-     (js2-clear-flag rv js2-END_DROPS_OFF)
-
-     ;; examine the try block
-     (js2-set-flag rv (js2-end-check (js2-try-node-try-block node)))
-
-     ;; check each catch block
-     (dolist (cb (js2-try-node-catch-clauses node))
-       (js2-set-flag rv (js2-end-check (js2-catch-node-block cb)))))
-   rv))
-
-(defun js2-end-check-loop (node)
-  "Return statement in the loop body must be consistent. The default
-assumption for any kind of a loop is that it will eventually terminate.
-The only exception is a loop with a constant true condition. Code that
-follows such a loop is examined only if one can statically determine
-that there is a break out of the loop.
-
-    for(... ; ... ; ...) {}
-    for(... in ... ) {}
-    while(...) { }
-    do { } while(...)
-
-Returns logical OR of END_* flags."
-  (let ((rv (js2-end-check (js2-loop-node-body node)))
-        (condition (cond
-                    ((js2-while-node-p node)
-                     (js2-while-node-condition node))
-                     ((js2-do-node-p node)
-                      (js2-do-node-condition node))
-                     ((js2-for-node-p node)
-                      (js2-for-node-condition node)))))
-
-    ;; check to see if the loop condition is always true
-    (if (and condition
-             (eq (js2-always-defined-boolean-p condition) 'ALWAYS_TRUE))
-        (js2-clear-flag rv js2-END_DROPS_OFF))
-
-    ;; look for effect of breaks
-    (js2-set-flag rv (js2-node-get-prop node
-                                        'CONTROL_BLOCK_PROP
-                                        js2-END_UNREACHED))
-    rv))
-
-(defun js2-end-check-block (node)
-  "A general block of code is examined statement by statement.
-If any statement (even a compound one) returns in all branches, then
-subsequent statements are not examined.
-Returns logical OR of END_* flags."
-  (let* ((rv js2-END_DROPS_OFF)
-         (kids (js2-block-node-kids node))
-         (n (car kids)))
-    ;; Check each statment.  If the statement can continue onto the next
-    ;; one (i.e. END_DROPS_OFF is set), then check the next statement.
-    (while (and n (js2-flag-set-p rv js2-END_DROPS_OFF))
-      (js2-clear-flag rv js2-END_DROPS_OFF)
-      (js2-set-flag rv (js2-end-check n))
-      (setq kids (cdr kids)
-            n (car kids)))
-    rv))
-
-(defun js2-end-check-label (node)
-  "A labeled statement implies that there may be a break to the label.
-The function processes the labeled statement and then checks the
-CONTROL_BLOCK_PROP property to see if there is ever a break to the
-particular label.
-Returns logical OR of END_* flags."
-  (let ((rv (js2-end-check (js2-labeled-stmt-node-stmt node))))
-    (logior rv (js2-node-get-prop node
-                                  'CONTROL_BLOCK_PROP
-                                  js2-END_UNREACHED))))
-
-(defun js2-end-check-break (node)
-  "When a break is encountered annotate the statement being broken
-out of by setting its CONTROL_BLOCK_PROP property.
-Returns logical OR of END_* flags."
-  (and (js2-break-node-target node)
-       (js2-node-set-prop (js2-break-node-target node)
-                          'CONTROL_BLOCK_PROP
-                          js2-END_DROPS_OFF))
-  js2-END_UNREACHED)
-
-(defun js2-end-check (node)
-  "Examine the body of a function, doing a basic reachability analysis.
-Returns a combination of flags END_* flags that indicate
-how the function execution can terminate. These constitute only the
-pessimistic set of termination conditions. It is possible that at
-runtime certain code paths will never be actually taken. Hence this
-analysis will flag errors in cases where there may not be errors.
-Returns logical OR of END_* flags"
-  (let (kid)
-    (cond
-     ((js2-break-node-p node)
-      (js2-end-check-break node))
-
-     ((js2-expr-stmt-node-p node)
-      (if (setq kid (js2-expr-stmt-node-expr node))
-          (js2-end-check kid)
-        js2-END_DROPS_OFF))
-
-     ((or (js2-continue-node-p node)
-          (js2-throw-node-p node))
-      js2-END_UNREACHED)
-
-     ((js2-return-node-p node)
-      (if (setq kid (js2-return-node-retval node))
-          js2-END_RETURNS_VALUE
-        js2-END_RETURNS))
-
-     ((js2-loop-node-p node)
-      (js2-end-check-loop node))
-
-     ((js2-switch-node-p node)
-      (js2-end-check-switch node))
-
-     ((js2-labeled-stmt-node-p node)
-      (js2-end-check-label node))
-
-     ((js2-if-node-p node)
-      (js2-end-check-if node))
-
-     ((js2-try-node-p node)
-      (js2-end-check-try node))
-
-     ((js2-block-node-p node)
-      (if (null (js2-block-node-kids node))
-          js2-END_DROPS_OFF
-        (js2-end-check-block node)))
-
-     ((js2-yield-node-p node)
-      js2-END_YIELDS)
-
-     (t
-      js2-END_DROPS_OFF))))
-
-(defun js2-always-defined-boolean-p (node)
-  "Check if NODE always evaluates to true or false in boolean context.
-Returns 'ALWAYS_TRUE, 'ALWAYS_FALSE, or nil if it's neither always true
-nor always false."
-  (let ((tt (js2-node-type node))
-        num)
-    (cond
-     ((or (= tt js2-FALSE) (= tt js2-NULL))
-      'ALWAYS_FALSE)
-     ((= tt js2-TRUE)
-      'ALWAYS_TRUE)
-     ((= tt js2-NUMBER)
-      (setq num (js2-number-node-num-value node))
-      (if (and (not (eq num 0.0e+NaN))
-               (not (zerop num)))
-          'ALWAYS_TRUE
-        'ALWAYS_FALSE))
-     (t
-      nil))))
-
-(provide 'js2-ast)
-
-;;; js2-ast.el ends here
-;;; js2-highlight.el --- JavaScript syntax coloring support
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;;; Code:
-
-
-(defsubst js2-set-face (beg end face &optional record)
-  "Fontify a region.  If RECORD is non-nil, record for later."
-  (when (plusp js2-highlight-level)
-    (setq beg (min (point-max) beg)
-          beg (max (point-min) beg)
-          end (min (point-max) end)
-          end (max (point-min) end))
-    (if record
-        (push (list beg end face) js2-mode-fontifications)
-      (put-text-property beg end 'face face))))
-
-(defsubst js2-set-kid-face (pos kid len face)
-  "Set-face on a child node.
-POS is absolute buffer position of parent.
-KID is the child node.
-LEN is the length to fontify.
-FACE is the face to fontify with."
-  (js2-set-face (+ pos (js2-node-pos kid))
-                (+ pos (js2-node-pos kid) (js2-node-len kid))
-                face))
-
-(defsubst js2-fontify-kwd (start length)
-  (js2-set-face start (+ start length) 'font-lock-keyword-face))
-
-(defsubst js2-clear-face (beg end)
-  (remove-text-properties beg end '(face nil
-                                    help-echo nil
-                                    point-entered nil
-                                    c-in-sws nil)))
-
-(defsubst js2-record-text-property (beg end prop value)
-  "Record a text property to set when parsing finishes."
-  (push (list beg end prop value) js2-mode-deferred-properties))
-
-(defconst js2-ecma-global-props
-  (concat "^"
-          (regexp-opt
-           '("Infinity" "NaN" "undefined" "arguments") t)
-          "$")
-  "Value properties of the Ecma-262 Global Object.
-Shown at or above `js2-highlight-level' 2.")
-
-;; might want to add the name "arguments" to this list?
-(defconst js2-ecma-object-props
-  (concat "^"
-          (regexp-opt
-           '("prototype" "__proto__" "__parent__") t)
-          "$")
-  "Value properties of the Ecma-262 Object constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-global-funcs
-  (concat
-   "^"
-   (regexp-opt
-    '("decodeURI" "decodeURIComponent" "encodeURI" "encodeURIComponent"
-      "eval" "isFinite" "isNaN" "parseFloat" "parseInt") t)
-   "$")
-  "Function properties of the Ecma-262 Global object.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-number-props
-  (concat "^"
-          (regexp-opt '("MAX_VALUE" "MIN_VALUE" "NaN"
-                        "NEGATIVE_INFINITY"
-                        "POSITIVE_INFINITY") t)
-          "$")
-  "Properties of the Ecma-262 Number constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-date-props "^\\(parse\\|UTC\\)$"
-  "Properties of the Ecma-262 Date constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-
-(defconst js2-ecma-math-props
-  (concat "^"
-          (regexp-opt
-           '("E" "LN10" "LN2" "LOG2E" "LOG10E" "PI" "SQRT1_2" "SQRT2")
-           t)
-          "$")
-  "Properties of the Ecma-262 Math object.
-Shown at or above `js2-highlight-level' 2.")
-
-
-(defconst js2-ecma-math-funcs
-  (concat "^"
-          (regexp-opt
-           '("abs" "acos" "asin" "atan" "atan2" "ceil" "cos" "exp" "floor"
-             "log" "max" "min" "pow" "random" "round" "sin" "sqrt" "tan") t)
-          "$")
-  "Function properties of the Ecma-262 Math object.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-function-props
-  (concat
-   "^"
-   (regexp-opt
-    '(;; properties of the Object prototype object
-      "hasOwnProperty" "isPrototypeOf" "propertyIsEnumerable"
-      "toLocaleString" "toString" "valueOf"
-      ;; properties of the Function prototype object
-      "apply" "call"
-      ;; properties of the Array prototype object
-      "concat" "join" "pop" "push" "reverse" "shift" "slice" "sort"
-      "splice" "unshift"
-      ;; properties of the String prototype object
-      "charAt" "charCodeAt" "fromCharCode" "indexOf" "lastIndexOf"
-      "localeCompare" "match" "replace" "search" "split" "substring"
-      "toLocaleLowerCase" "toLocaleUpperCase" "toLowerCase"
-      "toUpperCase"
-      ;; properties of the Number prototype object
-      "toExponential" "toFixed" "toPrecision"
-      ;; properties of the Date prototype object
-      "getDate" "getDay" "getFullYear" "getHours" "getMilliseconds"
-      "getMinutes" "getMonth" "getSeconds" "getTime"
-      "getTimezoneOffset" "getUTCDate" "getUTCDay" "getUTCFullYear"
-      "getUTCHours" "getUTCMilliseconds" "getUTCMinutes" "getUTCMonth"
-      "getUTCSeconds" "setDate" "setFullYear" "setHours"
-      "setMilliseconds" "setMinutes" "setMonth" "setSeconds" "setTime"
-      "setUTCDate" "setUTCFullYear" "setUTCHours" "setUTCMilliseconds"
-      "setUTCMinutes" "setUTCMonth" "setUTCSeconds" "toDateString"
-      "toLocaleDateString" "toLocaleString" "toLocaleTimeString"
-      "toTimeString" "toUTCString"
-      ;; properties of the RegExp prototype object
-      "exec" "test"
-      ;; SpiderMonkey/Rhino extensions, versions 1.5+
-      "toSource" "__defineGetter__" "__defineSetter__"
-      "__lookupGetter__" "__lookupSetter__" "__noSuchMethod__"
-      "every" "filter" "forEach" "lastIndexOf" "map" "some")
-    t)
-   "$")
-  "Built-in functions defined by Ecma-262 and SpiderMonkey extensions.
-Shown at or above `js2-highlight-level' 3.")
-
-(defsubst js2-parse-highlight-prop-get (parent target prop call-p)
-  (let ((target-name (and target
-                          (js2-name-node-p target)
-                          (js2-name-node-name target)))
-        (prop-name (if prop (js2-name-node-name prop)))
-        (level1 (>= js2-highlight-level 1))
-        (level2 (>= js2-highlight-level 2))
-        (level3 (>= js2-highlight-level 3))
-        pos
-        face)
-    (when level2
-      (if call-p
-          (cond
-           ((and target prop)
-            (cond
-             ((and level3 (string-match js2-ecma-function-props prop-name))
-              (setq face 'font-lock-builtin-face))
-             ((and target-name prop)
-              (cond
-               ((string= target-name "Date")
-                (if (string-match js2-ecma-date-props prop-name)
-                    (setq face 'font-lock-builtin-face)))
-               ((string= target-name "Math")
-                (if (string-match js2-ecma-math-funcs prop-name)
-                    (setq face 'font-lock-builtin-face)))))))
-           (prop
-            (if (string-match js2-ecma-global-funcs prop-name)
-                (setq face 'font-lock-builtin-face))))
-        (cond
-         ((and target prop)
-          (cond
-           ((string= target-name "Number")
-            (if (string-match js2-ecma-number-props prop-name)
-                (setq face 'font-lock-constant-face)))
-           ((string= target-name "Math")
-            (if (string-match js2-ecma-math-props prop-name)
-                (setq face 'font-lock-constant-face)))))
-         (prop
-          (if (string-match js2-ecma-object-props prop-name)
-              (setq face 'font-lock-constant-face)))))
-      (when face
-        (js2-set-face (setq pos (+ (js2-node-pos parent) ; absolute
-                                   (js2-node-pos prop))) ; relative
-                      (+ pos (js2-node-len prop))
-                      face)))))
-
-(defun js2-parse-highlight-member-expr-node (node)
-  "Perform syntax highlighting of EcmaScript built-in properties.
-The variable `js2-highlight-level' governs this highighting."
-  (let (face target prop name pos end parent call-p callee)
-    (cond
-     ;; case 1:  simple name, e.g. foo
-     ((js2-name-node-p node)
-      (setq name (js2-name-node-name node))
-      ;; possible for name to be nil in rare cases - saw it when
-      ;; running js2-mode on an elisp buffer.  Might as well try to
-      ;; make it so js2-mode never barfs.
-      (when name
-        (setq face (if (string-match js2-ecma-global-props name)
-                       'font-lock-constant-face))
-        (when face
-          (setq pos (js2-node-pos node)
-                end (+ pos (js2-node-len node)))
-          (js2-set-face pos end face))))
-
-     ;; case 2:  property access or function call
-     ((or (js2-prop-get-node-p node)
-          ;; highlight function call if expr is a prop-get node
-          ;; or a plain name (i.e. unqualified function call)
-          (and (setq call-p (js2-call-node-p node))
-               (setq callee (js2-call-node-target node)) ; separate setq!
-               (or (js2-prop-get-node-p callee)
-                   (js2-name-node-p callee))))
-      (setq parent node
-            node (if call-p callee node))
-      (if (and call-p (js2-name-node-p callee))
-          (setq prop callee)
-        (setq target (js2-prop-get-node-left node)
-              prop (js2-prop-get-node-right node)))
-      (cond
-       ((js2-name-node-p target)
-        (if (js2-name-node-p prop)
-            ;; case 2a:  simple target, simple prop name, e.g. foo.bar
-            (js2-parse-highlight-prop-get parent target prop call-p)
-          ;; case 2b:  simple target, complex name, e.g. foo.x[y]
-          (js2-parse-highlight-prop-get parent target nil call-p)))
-       ((js2-name-node-p prop)
-        ;; case 2c:  complex target, simple name, e.g. x[y].bar
-        (js2-parse-highlight-prop-get parent target prop call-p)))))))
-
-(defun js2-parse-highlight-member-expr-fn-name (expr)
-  "Highlight the `baz' in function foo.bar.baz(args) {...}.
-This is experimental Rhino syntax.  EXPR is the foo.bar.baz member expr.
-We currently only handle the case where the last component is a prop-get
-of a simple name.  Called before EXPR has a parent node."
-  (let (pos
-        (name (and (js2-prop-get-node-p expr)
-                   (js2-prop-get-node-right expr))))
-    (when (js2-name-node-p name)
-      (js2-set-face (setq pos (+ (js2-node-pos expr)  ; parent is absolute
-                                 (js2-node-pos name)))
-                    (+ pos (js2-node-len name))
-                    'font-lock-function-name-face
-                    'record))))
-
-;; source:  http://jsdoc.sourceforge.net/
-;; Note - this syntax is for Google's enhanced jsdoc parser that
-;; allows type specifications, and needs work before entering the wild.
-
-(defconst js2-jsdoc-param-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@"
-          "\\(?:param\\|argument\\)"
-          "\\)"
-          "\\s-*\\({[^}]+}\\)?"         ; optional type
-          "\\s-*\\([a-zA-Z0-9_$]+\\)?"  ; name
-          "\\>")
-  "Matches jsdoc tags with optional type and optional param name.")
-
-(defconst js2-jsdoc-typed-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("requires" "return" "returns" "throw" "throws"))
-          "\\)\\)\\s-*\\({[^}]+}\\)?")
-  "Matches jsdoc tags with optional type.")
-
-(defconst js2-jsdoc-arg-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("base" "extends" "member" "type" "version"))
-          "\\)\\)\\s-+\\([^ \t]+\\)")
-  "Matches jsdoc tags with a single argument.")
-
-(defconst js2-jsdoc-empty-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("addon" "author" "class" "constructor" "deprecated" "exec"
-             "exception" "fileoverview" "final" "ignore" "private"))
-          "\\)\\)\\s-*")
-  "Matches empty jsdoc tags.")
-
-(defconst js2-jsdoc-link-tag-regexp
-  "{\\(@link\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?}"
-  "Matches a jsdoc link tag.")
-
-(defconst js2-jsdoc-see-tag-regexp
-  "^\\s-*\\*+\\s-*\\(@see\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?"
-  "Matches a jsdoc @see tag.")
-
-(defconst js2-jsdoc-html-tag-regexp
-  "\\(</?\\)\\([a-zA-Z]+\\)\\s-*\\(/?>\\)"
-  "Matches a simple (no attributes) html start- or end-tag.")
-
-(defsubst js2-jsdoc-highlight-helper ()
-  (js2-set-face (match-beginning 1)
-                (match-end 1)
-                'js2-jsdoc-tag-face)
-  (if (match-beginning 2)
-      (if (save-excursion
-            (goto-char (match-beginning 2))
-            (= (char-after) ?{))
-          (js2-set-face (1+ (match-beginning 2))
-                        (1- (match-end 2))
-                        'js2-jsdoc-type-face)
-        (js2-set-face (match-beginning 2)
-                      (match-end 2)
-                      'js2-jsdoc-value-face)))
-  (if (match-beginning 3)
-      (js2-set-face (match-beginning 3)
-                    (match-end 3)
-                    'js2-jsdoc-value-face)))
-
-(defun js2-highlight-jsdoc (ast)
-  "Highlight doc comment tags."
-  (let ((comments (js2-ast-root-comments ast))
-        beg end)
-    (save-excursion
-      (dolist (node comments)
-        (when (eq (js2-comment-node-format node) 'jsdoc)
-          (setq beg (js2-node-abs-pos node)
-                end (+ beg (js2-node-len node)))
-          (save-restriction
-            (narrow-to-region beg end)
-            (dolist (re (list js2-jsdoc-param-tag-regexp
-                              js2-jsdoc-typed-tag-regexp
-                              js2-jsdoc-arg-tag-regexp
-                              js2-jsdoc-link-tag-regexp
-                              js2-jsdoc-see-tag-regexp
-                              js2-jsdoc-empty-tag-regexp))
-              (goto-char beg)
-              (while (re-search-forward re nil t)
-                (js2-jsdoc-highlight-helper)))
-            ;; simple highlighting for html tags
-            (goto-char beg)
-            (while (re-search-forward js2-jsdoc-html-tag-regexp nil t)
-              (js2-set-face (match-beginning 1)
-                            (match-end 1)
-                            'js2-jsdoc-html-tag-delimiter-face)
-              (js2-set-face (match-beginning 2)
-                            (match-end 2)
-                            'js2-jsdoc-html-tag-name-face)
-              (js2-set-face (match-beginning 3)
-                            (match-end 3)
-                            'js2-jsdoc-html-tag-delimiter-face))))))))
-
-(defun js2-highlight-assign-targets (node left right)
-  "Highlight function properties and external variables."
-  (let (leftpos end name)
-    ;; highlight vars and props assigned function values
-    (when (js2-function-node-p right)
-      (cond
-       ;; var foo = function() {...}
-       ((js2-name-node-p left)
-        (setq name left))
-
-       ;; foo.bar.baz = function() {...}
-       ((and (js2-prop-get-node-p left)
-             (js2-name-node-p (js2-prop-get-node-right left)))
-        (setq name (js2-prop-get-node-right left))))
-
-      (when name
-        (js2-set-face (setq leftpos (js2-node-abs-pos name))
-                      (+ leftpos (js2-node-len name))
-                      'font-lock-function-name-face
-                      'record)))
-
-    ;; save variable assignments so we can check for undeclared later
-    ;; (can't do it here since var decls can come at end of script)
-    (when (and js2-highlight-external-variables
-               (setq name (js2-member-expr-leftmost-name left)))
-      (push (list name js2-current-scope
-                  (setq leftpos (js2-node-abs-pos name))
-                  (setq end (+ leftpos (js2-node-len name))))
-            js2-recorded-assignments))))
-
-(defun js2-highlight-undeclared-vars ()
-  "After entire parse is finished, look for undeclared variable assignments.
-Have to wait until entire buffer is parsed, since JavaScript permits var
-decls to occur after they're used.
-
-We currently use a simple heuristic to rule out complaining about built-ins:
-if the name is capitalized we don't highlight it.  This could be improved a
-bit by declaring all the Ecma global object, constructor and function names
-in a hashtable, but we'd still wind up complaining about all the DHTML
-builtins, the Mozilla builtins, etc."
-  (let (name first-char)
-    (dolist (entry js2-recorded-assignments)
-      (destructuring-bind (name-node scope pos end) entry
-        (setq name (js2-name-node-name name-node)
-              first-char (aref name 0))
-        (unless (or (and (>= first-char ?A) (<= first-char ?Z))
-                    (js2-get-defining-scope scope name))
-          (js2-set-face pos end 'js2-external-variable-face 'record)
-          (js2-record-text-property pos end 'help-echo "Undeclared variable")
-          (js2-record-text-property pos end 'point-entered #'js2-echo-help))))
-    (setq js2-recorded-assignments nil)))
-
-(provide 'js2-highlight)
-
-;;; js2-highlight.el ends here
-;;; js2-browse.el --- browsing/hierarchy support for js2-mode
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;; Commentary:
-;;
-;; We currently only support imenu, but eventually should support speedbar and
-;; possibly other browsing mechanisms.
-;;
-;; The basic strategy is to identify function assignment targets of the form
-;; `foo.bar.baz', convert them to (list foo bar baz <position>), and push the
-;; list into `js2-imenu-recorder'.  The lists are merged into a trie-like tree
-;; for imenu after parsing is finished.
-;;
-;; A `foo.bar.baz' assignment target may be expressed in many ways in
-;; JavaScript, and the general problem is undecidable.  However, several forms
-;; are readily recognizable at parse-time; the forms we attempt to recognize
-;; include:
-;;
-;;  function foo()  -- function declaration
-;;  foo = function()  -- function expression assigned to variable
-;;  foo.bar.baz = function()  -- function expr assigned to nested property-get
-;;  foo = {bar: function()}  -- fun prop in object literal assigned to var
-;;  foo = {bar: {baz: function()}} -- inside nested object literal
-;;  foo.bar = {baz: function()}} -- obj lit assigned to nested prop get
-;;  a.b = {c: {d: function()}} -- nested obj lit assigned to nested prop get
-;;  foo = {get bar() {...}}  -- getter/setter in obj literal
-;;  function foo() {function bar() {...}}  -- nested function
-;;  foo['a'] = function()  -- fun expr assigned to deterministic element-get
-;;
-;; This list boils down to a few forms that can be combined recursively.
-;; Top-level named function declarations include both the left-hand (name)
-;; and the right-hand (function value) expressions needed to produce an imenu
-;; entry.  The other "right-hand" forms we need to look for are:
-;;  - functions declared as props/getters/setters in object literals
-;;  - nested named function declarations
-;; The "left-hand" expressions that functions can be assigned to include:
-;;  - local/global variables
-;;  - nested property-get expressions like a.b.c.d
-;;  - element gets like foo[10] or foo['bar'] where the index
-;;    expression can be trivially converted to a property name.  They
-;;    effectively then become property gets.
-;;
-;; All the different definition types are canonicalized into the form
-;; foo.bar.baz = position-of-function-keyword
-;;
-;; We need to build a trie-like structure for imenu.  As an example,
-;; consider the following JavaScript code:
-;;
-;; a = function() {...}  // function at position 5
-;; b = function() {...}  // function at position 25
-;; foo = function() {...} // function at position 100
-;; foo.bar = function() {...} // function at position 200
-;; foo.bar.baz = function() {...} // function at position 300
-;; foo.bar.zab = function() {...} // function at position 400
-;;
-;; During parsing we accumulate an entry for each definition in
-;; the variable `js2-imenu-recorder', like so:
-;;
-;; '((a 5)
-;;   (b 25)
-;;   (foo 100)
-;;   (foo bar 200)
-;;   (foo bar baz 300)
-;;   (foo bar zab 400))
-;;
-;; After parsing these entries are merged into this alist-trie:
-;;
-;; '((a . 1)
-;;   (b . 2)
-;;   (foo (<definition> . 3)
-;;        (bar (<definition> . 6)
-;;             (baz . 100)
-;;             (zab . 200))))
-;;
-;; Note the wacky need for a <definition> name.  The token can be anything
-;; that isn't a valid JavaScript identifier, because you might make foo
-;; a function and then start setting properties on it that are also functions.
-
-;;; Code:
-
-
-(defsubst js2-prop-node-name (node)
-  "Return the name of a node that may be a property-get/property-name.
-If NODE is not a valid name-node, string-node or integral number-node,
-returns nil.  Otherwise returns the string name/value of the node."
-  (cond
-   ((js2-name-node-p node)
-    (js2-name-node-name node))
-   ((js2-string-node-p node)
-    (js2-string-node-value node))
-   ((and (js2-number-node-p node)
-         (string-match "^[0-9]+$" (js2-number-node-value node)))
-    (js2-number-node-value node))
-   ((js2-this-node-p node)
-    "this")))
-
-(defsubst js2-node-qname-component (node)
-  "Test function:  return the name of this node, if it contributes to a qname.
-Returns nil if the node doesn't contribute."
-  (copy-sequence
-   (or (js2-prop-node-name node)
-       (if (and (js2-function-node-p node)
-                (js2-function-node-name node))
-           (js2-name-node-name (js2-function-node-name node))))))
-
-(defsubst js2-record-function-qname (fn-node qname)
-  "Associate FN-NODE with its QNAME for later lookup.
-This is used in postprocessing the chain list.  When we find a chain
-whose first element is a js2-THIS keyword node, we look up the parent
-function and see (using this map) whether it is the tail of a chain.
-If so, we replace the this-node with a copy of the parent's qname."
-  (unless js2-imenu-function-map
-    (setq js2-imenu-function-map (make-hash-table :test 'eq)))
-  (puthash fn-node qname js2-imenu-function-map))
-
-(defun js2-record-imenu-functions (node &optional var)
-  "Record function definitions for imenu.
-NODE is a function node or an object literal.
-VAR, if non-nil, is the expression that NODE is being assigned to."
-  (when js2-parse-ide-mode
-    (let ((fun-p (js2-function-node-p node))
-          qname left fname-node pos)
-      (cond
-       ;; non-anonymous function declaration?
-       ((and fun-p
-             (not var)
-             (setq fname-node (js2-function-node-name node)))
-        (push (setq qname (list fname-node (js2-node-pos node)))
-              js2-imenu-recorder)
-        (js2-record-function-qname node qname))
-
-       ;; for remaining forms, compute left-side tree branch first
-       ((and var (setq qname (js2-compute-nested-prop-get var)))
-        (cond
-         ;; foo.bar.baz = function
-         (fun-p
-          (push (nconc qname (list (js2-node-pos node)))
-                js2-imenu-recorder)
-          (js2-record-function-qname node qname))
-         ;; foo.bar.baz = object-literal
-         ;; look for nested functions:  {a: {b: function() {...} }}
-         ((js2-object-node-p node)
-          (js2-record-object-literal node qname))))))))
-
-(defun js2-compute-nested-prop-get (node)
-  "If NODE is of form foo.bar.baz, return component nodes as a list.
-Otherwise returns nil.  Element-gets can be treated as property-gets
-if the index expression is a name, a string, or a positive integer."
-  (let (left right head)
-    (cond
-     ((or (js2-name-node-p node)
-          (js2-this-node-p node))
-      (list node))
-     ;; foo.bar.baz is parenthesized as (foo.bar).baz => right operand is a leaf
-     ((js2-prop-get-node-p node)  ; includes elem-get nodes
-      (setq left (js2-prop-get-node-left node)
-            right (js2-prop-get-node-right node))
-      (if (and (or (js2-prop-get-node-p left)     ; left == foo.bar
-                   (js2-name-node-p left)
-                   (js2-this-node-p left))        ; or left == foo
-               (or (js2-name-node-p right)        ; .bar
-                   (js2-string-node-p right)      ; ['bar']
-                   (and (js2-number-node-p right) ; [10]
-                        (string-match "^[0-9]+$"
-                                      (js2-number-node-value right)))))
-          (if (setq head (js2-compute-nested-prop-get left))
-              (nconc head (list right))))))))
-
-(defun js2-record-object-literal (node qname)
-  "Recursively process an object literal looking for functions.
-NODE is an object literal that is the right-hand child of an assignment
-expression.  QNAME is a list of nodes representing the assignment target,
-e.g. for foo.bar.baz = {...}, QNAME is (foo-node bar-node baz-node).
-We do a depth-first traversal of NODE.  Any functions we find are prefixed
-with QNAME plus the property name of the function and appended to the
-variable `js2-imenu-recorder'."
-  ;; Elements are relative to parent position, which is still absolute,
-  ;; since the parser passes the assignment target and value expressions
-  ;; to us before they are added as children of the assignment node.
-  (let ((pos (js2-node-pos node))
-        left right)
-    (dolist (e (js2-object-node-elems node))  ; e is a `js2-object-prop-node'
-      (setq left (js2-infix-node-left e))
-      (cond
-       ;; foo: function() {...}
-       ((js2-function-node-p (setq right (js2-infix-node-right e)))
-        (when (js2-prop-node-name left)
-          ;; As a policy decision, we record the position of the property,
-          ;; not the position of the `function' keyword, since the property
-          ;; is effectively the name of the function.
-          (push (append qname (list left) (list (+ pos (js2-node-pos e))))
-                js2-imenu-recorder)
-          (js2-record-function-qname right qname)))
-       ;; foo: {object-literal} -- add foo to qname and recurse
-       ((js2-object-node-p right)
-        (js2-record-object-literal right
-                                   (append qname (list (js2-infix-node-left e)))))))))
-
-(defsubst js2-node-top-level-decl-p (node)
-  "Return t if NODE's name is defined in the top-level scope.
-Also returns t if NODE's name is not defined in any scope, since it implies
-that it's an external variable, which must also be in the top-level scope."
-  (let* ((name (js2-prop-node-name node))
-         (this-scope (js2-node-get-enclosing-scope node))
-         defining-scope)
-    (cond
-     ((js2-this-node-p node)
-      nil)
-     ((null this-scope)
-      t)
-     ((setq defining-scope (js2-get-defining-scope this-scope name))
-      (js2-ast-root-p defining-scope))
-     (t t))))
-
-(defun js2-browse-postprocess-chains (chains)
-  "Modify function-declaration name chains after parsing finishes.
-Some of the information is only available after the parse tree is complete.
-For instance, following a 'this' reference requires a parent function node."
-  (let (result head fn parent-chain p elem)
-    (dolist (chain chains)
-      ;; examine the head of each node to get its defining scope
-      (setq head (car chain))
-      (cond
-       ;; if top-level/external, keep as-is
-       ((js2-node-top-level-decl-p head)
-        (push chain result))
-       ;; check for a this-reference
-       ((eq (js2-node-type head) js2-THIS)
-        (setq fn (js2-node-parent-script-or-fn head))
-        ;; if there is no parent function, or if the parent function
-        ;; is nested, discard the head node and keep the rest of the chain.
-        (if (or (null fn) (js2-nested-function-p fn))
-            (push (cdr chain) result)
-          ;; else look up parent in function-map.  If not found, discard chain.
-          (when (setq parent-chain (and js2-imenu-function-map
-                                        (gethash fn js2-imenu-function-map)))
-            ;; else discard head node and prefix parent fn qname, which is
-            ;; the parent-chain sans tail, to this chain.
-            (push (append (butlast parent-chain) (cdr chain)) result))))))
-    ;; finally replace each node in each chain with its name.
-    (dolist (chain result)
-      (setq p chain)
-      (while p
-        (if (js2-node-p (setq elem (car p)))
-            (setcar p (js2-node-qname-component elem)))
-        (setq p (cdr p))))
-    result))
-
-;; Merge name chains into a trie-like tree structure of nested lists.
-;; To simplify construction of the trie, we first build it out using the rule
-;; that the trie consists of lists of pairs.  Each pair is a 2-element array:
-;; [key, num-or-list].  The second element can be a number; if so, this key
-;; is a leaf-node with only one value.  (I.e. there is only one declaration
-;; associated with the key at this level.)  Otherwise the second element is
-;; a list of pairs, with the rule applied recursively.  This symmetry permits
-;; a simple recursive formulation.
-;;
-;; js2-mode is building the data structure for imenu.  The imenu documentation
-;; claims that it's the structure above, but in practice it wants the children
-;; at the same list level as the key for that level, which is how I've drawn
-;; the "Expected final result" above.  We'll postprocess the trie to remove the
-;; list wrapper around the children at each level.
-;;
-;; A completed nested imenu-alist entry looks like this:
-;;       '(("foo"
-;;          ("<definition>" . 7)
-;;          ("bar"
-;;           ("a" . 40)
-;;           ("b" . 60))))
-;;
-;; In particular, the documentation for `imenu--index-alist' says that
-;; a nested sub-alist element looks like (INDEX-NAME SUB-ALIST).
-;; The sub-alist entries immediately follow INDEX-NAME, the head of the list.
-
-(defsubst js2-treeify (lst)
-  "Convert (a b c d) to (a ((b ((c d)))))"
-  (if (null (cddr lst))  ; list length <= 2
-      lst
-    (list (car lst) (list (js2-treeify (cdr lst))))))
-
-(defun js2-build-alist-trie (chains trie)
-  "Merge declaration name chains into a trie-like alist structure for imenu.
-CHAINS is the qname chain list produced during parsing. TRIE is a
-list of elements built up so far."
-  (let (head tail pos branch kids)
-    (dolist (chain chains)
-      (setq head (car chain)
-            tail (cdr chain)
-            pos (if (numberp (car tail)) (car tail))
-            branch (js2-find-if (lambda (n)
-                                  (string= (car n) head))
-                                trie)
-            kids (second branch))
-      (cond
-       ;; case 1:  this key isn't in the trie yet
-       ((null branch)
-        (if trie
-            (setcdr (last trie) (list (js2-treeify chain)))
-          (setq trie (list (js2-treeify chain)))))
-
-       ;; case 2:  key is present with a single number entry:  replace w/ list
-       ;;  ("a1" 10)  +  ("a1" 20) => ("a1" (("<definition>" 10)
-       ;;                                    ("<definition>" 20)))
-       ((numberp kids)
-        (setcar (cdr branch)
-                (list (list "<definition-1>" kids)
-                      (if pos
-                          (list "<definition-2>" pos)
-                        (js2-treeify tail)))))
-
-       ;; case 3:  key is there (with kids), and we're a number entry
-       (pos
-        (setcdr (last kids)
-                (list
-                 (list (format "<definition-%d>"
-                               (1+ (loop for kid in kids
-                                         count (eq ?< (aref (car kid) 0)))))
-                       pos))))
-
-       ;; case 4:  key is there with kids, need to merge in our chain
-       (t
-        (js2-build-alist-trie (list tail) kids))))
-    trie))
-
-(defun js2-flatten-trie (trie)
-  "Convert TRIE to imenu-format.
-Recurses through nodes, and for each one whose second element is a list,
-appends the list's flattened elements to the current element.  Also
-changes the tails into conses.  For instance, this pre-flattened trie
-
-'(a ((b 20)
-     (c ((d 30)
-         (e 40)))))
-
-becomes
-
-'(a (b . 20)
-    (c (d . 30)
-       (e . 40)))
-
-Note that the root of the trie has no key, just a list of chains.
-This is also true for the value of any key with multiple children,
-e.g. key 'c' in the example above."
-  (cond
-   ((listp (car trie))
-    (mapcar #'js2-flatten-trie trie))
-   (t
-    (if (numberp (second trie))
-        (cons (car trie) (second trie))
-      ;; else pop list and append its kids
-      (apply #'append (list (car trie)) (js2-flatten-trie (cdr trie)))))))
-
-(defun js2-build-imenu-index ()
-  "Turn `js2-imenu-recorder' into an imenu data structure."
-  (unless (eq js2-imenu-recorder 'empty)
-    (let* ((chains (js2-browse-postprocess-chains js2-imenu-recorder))
-           (result (js2-build-alist-trie chains nil)))
-      (js2-flatten-trie result))))
-
-(defun js2-test-print-chains (chains)
-  "Print a list of qname chains.
-Each element of CHAINS is a list of the form (NODE [NODE *] pos);
-i.e. one or more nodes, and an integer position as the list tail."
-  (mapconcat (lambda (chain)
-               (concat "("
-                       (mapconcat (lambda (elem)
-                                    (if (js2-node-p elem)
-                                        (or (js2-node-qname-component elem)
-                                            "nil")
-                                      (number-to-string elem)))
-                                  chain
-                                  " ")
-                       ")"))
-             chains
-             "\n"))
-
-
-(provide 'js2-browse)
-
-;;; js2-browse.el ends here
-;;; js2-parse.el --- JavaScript parser
-
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Keywords:  javascript languages
-
-;; Commentary:
-
-;; This is based on Rhino's parser and tries to follow its code
-;; structure as closely as practical, so that changes to the Rhino
-;; parser can easily be propagated into this code.  However, Rhino
-;; does not currently generate a usable AST representation, at least
-;; from an IDE perspective, so we build our own more suitable AST.
-
-;; The AST node structures are defined in `js2-ast.el'.
-;; Every parser function that creates and returns an AST node has
-;; the following responsibilities:
-
-;;   1) set the node start to the absolute buffer start position
-;;   2) set the node length to include any closing chars (RC, SEMI)
-;;   3) fix up any child-node starts to be relative to this node
-;;   4) set any field positions (e.g. keywords) relative to this node
-;;   5) report any child nodes with `js2-node-add-children'
-;;      (note that this call fixes up start positions by default)
-
-;; The resulting AST has all node start positions relative to the
-;; parent nodes; only the root has an absolute start position.
-
-;; Note: fontification is done inline while parsing.  It used to be
-;; done in a second pass over the AST, but doing it inline is about
-;; twice as fast.  Most of the fontification happens when tokens are
-;; scanned, and the parser has a few spots that perform extra
-;; fontification.  In addition to speed, a second benefit of inline
-;; parsing is that if a long parse is interrupted, everything parsed
-;; so far is still fontified.
-
-;; The editing mode that uses this parser, `js2-mode', directs the
-;; parser to check periodically for user input.  If user input
-;; arrives, the parse is abandoned, except for the highlighting that
-;; has occurred so far, and a re-parse is rescheduled for when Emacs
-;; becomes idle again.  This works pretty well, but could be better.
-;; In particular, when the user input has not resulted in changes to
-;; the buffer (for instance, navigation input), the parse tree built
-;; so far should not be discarded, and the parse should continue where
-;; it left off.  It will be some work to create what amounts to a
-;; continuation, but it should not be unreasonably difficult.
-
-;; TODO:
-;; - make non-editing input restart parse at previous continuation
-;; - in Eclipse, sibling nodes never overlap start/end ranges
-;;   - for getters, prop name and function nodes overlap
-;;   - should write a debug tree visitor to look for overlaps
-;; - mark array and object literals as "destructuring" (node prop?)
-;;   so we can syntax-highlight them properly.
-;; - figure out a way not to store value in string/name nodes
-;;   - needs a solution for synthetic nodes
-
-;;; Code
-
-(eval-and-compile
-  (require 'cl))  ; for delete-if
-
-
-(defconst js2-version "1.7.0"
-  "Version of JavaScript supported, plus minor js2 version.")
-
-(defmacro js2-record-face (face)
-  "Record a style run of FACE for the current token."
-  `(js2-set-face js2-token-beg js2-token-end ,face 'record))
-
-(defsubst js2-node-end (n)
-  "Computes the absolute end of node N.
-Use with caution!  Assumes `js2-node-pos' is -absolute-, which
-is only true until the node is added to its parent; i.e., while parsing."
-  (+ (js2-node-pos n)
-     (js2-node-len n)))
-
-(defsubst js2-record-comment ()
-  (push (make-js2-comment-node :len (- js2-token-end js2-token-beg)
-                               :format js2-ts-comment-type)
-        js2-scanned-comments)
-  (when js2-parse-ide-mode
-    (js2-record-face 'font-lock-comment-face)
-    (when (memq js2-ts-comment-type '(html preprocessor))
-      ;; Tell cc-engine the bounds of the comment.
-      (put-text-property js2-token-beg (1- js2-token-end) 'c-in-sws t))))
-
-;; This function is called depressingly often, so it should be fast.
-;; Most of the time it's looking at the same token it peeked before.
-(defsubst js2-peek-token ()
-  "Returns the next token without consuming it.
-If previous token was consumed, calls scanner to get new token.
-If previous token was -not- consumed, returns it (idempotent).
-
-This function will not return a newline (js2-EOL) - instead, it
-gobbles newlines until it finds a non-newline token, and flags
-that token as appearing just after a newline.
-
-This function will also not return a js2-COMMENT.  Instead, it
-records comments found in `js2-scanned-comments'.  If the token
-returned by this function immediately follows a jsdoc comment,
-the token is flagged as such.
-
-Note that this function always returned the un-flagged token!
-The flags, if any, are saved in `js2-current-flagged-token'."
-  (if (/= js2-current-flagged-token js2-EOF) ; last token not consumed
-      js2-current-token  ; most common case - return already-peeked token
-    (let ((tt (js2-get-token))          ; call scanner
-          saw-eol
-          face)
-      ;; process comments and whitespace
-      (while (or (= tt js2-EOL)
-                 (= tt js2-COMMENT))
-        (if (= tt js2-EOL)
-            (setq saw-eol t)
-          (setq saw-eol nil)
-          (if js2-record-comments
-              (js2-record-comment)))
-        (setq tt (js2-get-token)))  ; call scanner
-
-      (setq js2-current-token tt
-            js2-current-flagged-token (if saw-eol
-                                          (logior tt js2-ti-after-eol)
-                                        tt))
-      ;; perform lexical fontification as soon as token is scanned
-      (when js2-parse-ide-mode
-        (cond
-         ((minusp tt)
-          (js2-record-face 'js2-error-face))
-         ((setq face (aref js2-kwd-tokens tt))
-          (js2-record-face face))
-         ((and (= tt js2-NAME)
-               (equal js2-ts-string "undefined"))
-          (js2-record-face 'font-lock-constant-face))))
-      tt)))  ; return unflagged token
-
-(defsubst js2-peek-flagged-token ()
-  "Returns the current token along with any flags set for it."
-  (js2-peek-token)
-  js2-current-flagged-token)
-
-(defsubst js2-consume-token ()
-  (setq js2-current-flagged-token js2-EOF))
-
-(defsubst js2-next-token ()
-  (prog1
-      (js2-peek-token)
-    (js2-consume-token)))
-
-(defsubst js2-next-flagged-token ()
-  (js2-peek-token)
-  (prog1 js2-current-flagged-token
-    (js2-consume-token)))
-
-(defsubst js2-match-token (match)
-  "Consume and return t if next token matches MATCH, a bytecode.
-Returns nil and consumes nothing if MATCH is not the next token."
-  (if (/= (js2-peek-token) match)
-      nil
-    (js2-consume-token)
-    t))
-
-(defsubst js2-valid-prop-name-token (tt)
-  (or (= tt js2-NAME)
-      (and js2-allow-keywords-as-property-names
-           (plusp tt)
-           (aref js2-kwd-tokens tt))))
-
-(defsubst js2-match-prop-name ()
-  "Consume token and return t if next token is a valid property name.
-It's valid if it's a js2-NAME, or `js2-allow-keywords-as-property-names'
-is non-nil and it's a keyword token."
-  (if (js2-valid-prop-name-token (js2-peek-token))
-      (progn
-        (js2-consume-token)
-        t)
-    nil))
-
-(defsubst js2-must-match-prop-name (msg-id &optional pos len)
-  (if (js2-match-prop-name)
-      t
-    (js2-report-error msg-id nil pos len)
-    nil))
-
-(defsubst js2-peek-token-or-eol ()
-  "Return js2-EOL if the current token immediately follows a newline.
-Else returns the current token.  Used in situations where we don't
-consider certain token types valid if they are preceded by a newline.
-One example is the postfix ++ or -- operator, which has to be on the
-same line as its operand."
-  (let ((tt (js2-peek-token)))
-    ;; Check for last peeked token flags
-    (if (js2-flag-set-p js2-current-flagged-token js2-ti-after-eol)
-        js2-EOL
-      tt)))
-
-(defsubst js2-set-check-for-label ()
-  (assert (= (logand js2-current-flagged-token js2-clear-ti-mask) js2-NAME))
-  (js2-set-flag js2-current-flagged-token js2-ti-check-label))
-
-(defsubst js2-must-match (token msg-id &optional pos len)
-  "Match next token to token code TOKEN, or record a syntax error.
-MSG-ID is the error message to report if the match fails.
-Returns t on match, nil if no match."
-  (if (js2-match-token token)
-      t
-    (js2-report-error msg-id nil pos len)
-    nil))
-
-(defsubst js2-inside-function ()
-  (plusp js2-nesting-of-function))
-
-(defsubst js2-set-requires-activation ()
-  (if (js2-function-node-p js2-current-script-or-fn)
-      (setf (js2-function-node-needs-activation js2-current-script-or-fn) t)))
-
-(defsubst js2-check-activation-name (name token)
-  (when (js2-inside-function)
-    ;; skip language-version 1.2 check from Rhino
-    (if (or (string= "arguments" name)
-            (and js2-compiler-activation-names  ; only used in codegen
-                 (gethash name js2-compiler-activation-names)))
-        (js2-set-requires-activation))))
-
-(defsubst js2-set-is-generator ()
-  (if (js2-function-node-p js2-current-script-or-fn)
-      (setf (js2-function-node-is-generator js2-current-script-or-fn) t)))
-
-(defsubst js2-must-have-xml ()
-  (unless js2-compiler-xml-available
-    (js2-report-error "msg.XML.not.available")))
-
-(defsubst js2-push-scope (scope)
-  "Push SCOPE, a `js2-scope', onto the lexical scope chain."
-  (assert (js2-scope-p scope))
-  (assert (null (js2-scope-parent-scope scope)))
-  (assert (neq js2-current-scope scope))
-  (setf (js2-scope-parent-scope scope) js2-current-scope
-        js2-current-scope scope))
-
-(defsubst js2-pop-scope ()
-  (setq js2-current-scope
-        (js2-scope-parent-scope js2-current-scope)))
-
-(defsubst js2-enter-loop (loop-node)
-  (push loop-node js2-loop-set)
-  (push loop-node js2-loop-and-switch-set)
-  (js2-push-scope loop-node)
-  ;; Tell the current labeled statement (if any) its statement,
-  ;; and set the jump target of the first label to the loop.
-  ;; These are used in `js2-parse-continue' to verify that the
-  ;; continue target is an actual labeled loop.  (And for codegen.)
-  (when js2-labeled-stmt
-    (setf (js2-labeled-stmt-node-stmt js2-labeled-stmt) loop-node
-          (js2-label-node-loop (car (js2-labeled-stmt-node-labels
-                                     js2-labeled-stmt))) loop-node)))
-
-(defsubst js2-exit-loop ()
-  (pop js2-loop-set)
-  (pop js2-loop-and-switch-set)
-  (js2-pop-scope))
-
-(defsubst js2-enter-switch (switch-node)
-  (push switch-node js2-loop-and-switch-set))
-
-(defsubst js2-exit-switch ()
-  (pop js2-loop-and-switch-set))
-
-(defun js2-parse (&optional buf cb)
-  "Tells the js2 parser to parse a region of JavaScript.
-
-BUF is a buffer or buffer name containing the code to parse.
-Call `narrow-to-region' first to parse only part of the buffer.
-
-The returned AST root node is given some additional properties:
-  `node-count' - total number of nodes in the AST
-  `buffer' - BUF.  The buffer it refers to may change or be killed,
-             so the value is not necessarily reliable.
-
-An optional callback CB can be specified to report parsing
-progress.  If `(functionp CB)' returns t, it will be called with
-the current line number once before parsing begins, then again
-each time the lexer reaches a new line number.
-
-CB can also be a list of the form `(symbol cb ...)' to specify
-multiple callbacks with different criteria.  Each symbol is a
-criterion keyword, and the following element is the callback to
-call
-
-  :line  - called whenever the line number changes
-  :token - called for each new token consumed
-
-The list of criteria could be extended to include entering or
-leaving a statement, an expression, or a function definition."
-  (if (and cb (not (functionp cb)))
-      (error "criteria callbacks not yet implemented"))
-  (let ((inhibit-point-motion-hooks t)
-        (js2-compiler-xml-available (>= js2-language-version 160))
-        ;; This is a recursive-descent parser, so give it a big stack.
-        (max-lisp-eval-depth (max max-lisp-eval-depth 3000))
-        (max-specpdl-size (max max-specpdl-size 3000))
-        (case-fold-search nil)
-        ast)
-    (or buf (setq buf (current-buffer)))
-    (save-excursion
-      (set-buffer buf)
-      (setq js2-scanned-comments nil
-            js2-parsed-errors nil
-            js2-parsed-warnings nil
-            js2-imenu-recorder nil
-            js2-imenu-function-map nil
-            js2-label-set nil)
-      (js2-init-scanner)
-      (setq ast (js2-with-unmodifying-text-property-changes
-                  (js2-do-parse)))
-      (unless js2-ts-hit-eof
-        (js2-report-error "msg.got.syntax.errors" (length js2-parsed-errors)))
-      (setf (js2-ast-root-errors ast) js2-parsed-errors
-            (js2-ast-root-warnings ast) js2-parsed-warnings)
-      ;; if we didn't find any declarations, put a dummy in this list so we
-      ;; don't end up re-parsing the buffer in `js2-mode-create-imenu-index'
-      (unless js2-imenu-recorder
-        (setq js2-imenu-recorder 'empty))
-      (run-hooks 'js2-parse-finished-hook)
-      ast)))
-
-;; Corresponds to Rhino's Parser.parse() method.
-(defun js2-do-parse ()
-  "Parse current buffer starting from current point.
-Scanner should be initialized."
-  (let ((pos js2-ts-cursor)
-        (end js2-ts-cursor)  ; in case file is empty
-        root n tt)
-    ;; initialize buffer-local parsing vars
-    (setf root (make-js2-ast-root :buffer (buffer-name) :pos pos)
-          js2-current-script-or-fn root
-          js2-current-scope root
-          js2-current-flagged-token js2-EOF
-          js2-nesting-of-function 0
-          js2-labeled-stmt nil
-          js2-recorded-assignments nil)  ; for js2-highlight
-
-    (while (/= (setq tt (js2-peek-token)) js2-EOF)
-      (if (= tt js2-FUNCTION)
-          (progn
-            (js2-consume-token)
-            (setq n (js2-parse-function (if js2-called-by-compile-function
-                                            'FUNCTION_EXPRESSION
-                                          'FUNCTION_STATEMENT)))
-            (js2-record-imenu-functions n))
-        ;; not a function - parse a statement
-        (setq n (js2-parse-statement)))
-      ;; add function or statement to script
-      (setq end (js2-node-end n))
-      (js2-block-node-push root n))
-
-    ;; add comments to root in lexical order
-    (when js2-scanned-comments
-      ;; if we find a comment beyond end of normal kids, use its end
-      (setq end (max end (js2-node-end (first js2-scanned-comments))))
-      (dolist (comment js2-scanned-comments)
-        (push comment (js2-ast-root-comments root))
-        (js2-node-add-children root comment)))
-
-    (setf (js2-node-len root) (- end pos))
-    (js2-highlight-undeclared-vars)
-    root))
-
-(defun js2-function-parser ()
-  (js2-consume-token)
-  (js2-parse-function 'FUNCTION_EXPRESSION_STATEMENT))
-
-(defun js2-parse-function-body (fn-node)
-  (js2-must-match js2-LC "msg.no.brace.body")
-  (let ((pos js2-token-beg)         ; LC position
-        (pn (make-js2-block-node))  ; starts at LC position
-        tt
-        end)
-    (incf js2-nesting-of-function)
-    (unwind-protect
-        (while (not (or (= (setq tt (js2-peek-token)) js2-ERROR)
-                        (= tt js2-EOF)
-                        (= tt js2-RC)))
-          (js2-block-node-push pn (if (/= tt js2-FUNCTION)
-                                      (js2-parse-statement)
-                                    (js2-consume-token)
-                                    (js2-parse-function 'FUNCTION_STATEMENT))))
-      (decf js2-nesting-of-function))
-    (setq end js2-token-end)  ; assume no curly and leave at current token
-    (if (js2-must-match js2-RC "msg.no.brace.after.body" pos)
-        (setq end js2-token-end))
-    (setf (js2-node-pos pn) pos
-          (js2-node-len pn) (- end pos))
-    (setf (js2-function-node-body fn-node) pn)
-    (js2-node-add-children fn-node pn)
-    pn))
-
-(defun js2-parse-function-params (fn-node pos)
-  (if (js2-match-token js2-RP)
-      (setf (js2-function-node-rp fn-node) (- js2-token-beg pos))
-    (let (params len param)
-      (loop for tt = (js2-peek-token)
-            do
-            (cond
-             ;; destructuring param
-             ((or (= tt js2-LB) (= tt js2-LC))
-              (push (js2-parse-primary-expr) params))
-             ;; simple name
-             (t
-              (js2-must-match js2-NAME "msg.no.parm")
-              (js2-record-face 'js2-function-param-face)
-              (setq param (js2-create-name-node))
-              (js2-define-symbol js2-LP js2-ts-string param)
-              (push param params)))
-            while
-            (js2-match-token js2-COMMA))
-      (if (js2-must-match js2-RP "msg.no.paren.after.parms")
-          (setf (js2-function-node-rp fn-node) (- js2-token-beg pos)))
-      (dolist (p params)
-        (js2-node-add-children fn-node p)
-        (push p (js2-function-node-params fn-node))))))
-
-(defsubst js2-check-inconsistent-return-warning (fn-node name)
-  "Possibly show inconsistent-return warning.
-Last token scanned is the close-curly for the function body."
-  (when (and js2-mode-show-strict-warnings
-             js2-strict-inconsistent-return-warning
-             (not (js2-has-consistent-return-usage
-                   (js2-function-node-body fn-node))))
-    ;; Have it extend from close-curly to bol or beginning of block.
-    (let ((pos (save-excursion
-                 (goto-char js2-token-end)
-                 (max (js2-node-abs-pos (js2-function-node-body fn-node))
-                      (point-at-bol))))
-          (end js2-token-end))
-      (if (plusp (js2-name-node-length name))
-          (js2-add-strict-warning "msg.no.return.value"
-                                  (js2-name-node-name name) pos end)
-        (js2-add-strict-warning "msg.anon.no.return.value" nil pos end)))))
-
-(defun js2-parse-function (function-type)
-  "Function parser.  FUNCTION-TYPE is a symbol."
-  (let ((pos js2-token-beg)  ; start of 'function' keyword
-        name
-        name-beg
-        name-end
-        fn-node
-        lp
-        (synthetic-type function-type)
-        member-expr-node)
-
-    ;; parse function name, expression, or non-name (anonymous)
-    (cond
-     ;; function foo(...)
-     ((js2-match-token js2-NAME)
-      (setq name (js2-create-name-node t)
-            name-beg js2-token-beg
-            name-end js2-token-end)
-      (unless (js2-match-token js2-LP)
-        (when js2-allow-member-expr-as-function-name
-          ;; function foo.bar(...)
-          (setq member-expr-node name
-                name nil
-                member-expr-node (js2-parse-member-expr-tail
-                                  nil member-expr-node)))
-        (js2-must-match js2-LP "msg.no.paren.parms")))
-
-     ((js2-match-token js2-LP)
-      nil)  ; anonymous function:  leave name as null
-
-     (t
-      ;; function random-member-expr(...)
-      (when js2-allow-member-expr-as-function-name
-        ;; Note that memberExpr can not start with '(' like
-        ;; in function (1+2).toString(), because 'function (' already
-        ;; processed as anonymous function
-        (setq member-expr-node (js2-parse-member-expr)))
-      (js2-must-match js2-LP "msg.no.paren.parms")))
-
-    (if (= js2-current-token js2-LP)  ; eventually matched LP?
-        (setq lp js2-token-beg))
-
-    (if member-expr-node
-        (progn
-          (setq synthetic-type 'FUNCTION_EXPRESSION)
-          (js2-parse-highlight-member-expr-fn-name member-expr-node))
-      (if name
-          (js2-set-face name-beg name-end
-                        'font-lock-function-name-face 'record)))
-
-    (if (and (neq synthetic-type 'FUNCTION_EXPRESSION)
-             (plusp (js2-name-node-length name)))
-        ;; Function statements define a symbol in the enclosing scope
-        (js2-define-symbol js2-FUNCTION (js2-name-node-name name) fn-node))
-
-    (setf fn-node (make-js2-function-node :pos pos
-                                          :name name
-                                          :form function-type
-                                          :lp (if lp (- lp pos))))
-
-    (if (or (js2-inside-function) (plusp js2-nesting-of-with))
-        ;; 1. Nested functions are not affected by the dynamic scope flag
-        ;;    as dynamic scope is already a parent of their scope.
-        ;; 2. Functions defined under the with statement also immune to
-        ;;    this setup, in which case dynamic scope is ignored in favor
-        ;;    of the with object.
-        (setf (js2-function-node-ignore-dynamic fn-node) t))
-
-    ;; dynamically bind all the per-function variables
-    (let ((js2-current-script-or-fn fn-node)
-          (js2-current-scope fn-node)
-          (js2-nesting-of-with 0)
-          (js2-end-flags 0)
-          js2-label-set
-          js2-loop-set
-          js2-loop-and-switch-set)
-
-      ;; parse params and function body
-      (js2-parse-function-params fn-node pos)
-      (js2-parse-function-body fn-node)
-      (if name
-          (js2-node-add-children fn-node name))
-
-      (js2-check-inconsistent-return-warning fn-node name)
-
-      ;; Function expressions define a name only in the body of the
-      ;; function, and only if not hidden by a parameter name
-      (if (and name
-               (eq synthetic-type 'FUNCTION_EXPRESSION)
-               (null (js2-scope-get-symbol js2-current-scope
-                                           (js2-name-node-name name))))
-          (js2-define-symbol js2-FUNCTION
-                             (js2-name-node-name name)
-                             fn-node))
-      (if (and name
-               (eq function-type 'FUNCTION_EXPRESSION_STATEMENT))
-          (js2-record-imenu-functions fn-node)))
-
-    (setf (js2-node-len fn-node) (- js2-ts-cursor pos)
-          (js2-function-node-member-expr fn-node) member-expr-node)  ; may be nil
-
-    ;; Rhino doesn't do this, but we need it for finding undeclared vars.
-    ;; We wait until after parsing the function to set its parent scope,
-    ;; since `js2-define-symbol' needs the defining-scope check to stop
-    ;; at the function boundary when checking for redeclarations.
-    (setf (js2-scope-parent-scope fn-node) js2-current-scope)
-
-    fn-node))
-
-(defun js2-parse-statements (&optional parent)
-  "Parse a statement list.  Last token consumed must be js2-LC.
-
-PARENT can be a `js2-block-node', in which case the statements are
-appended to PARENT.  Otherwise a new `js2-block-node' is created
-and returned.
-
-This function does not match the closing js2-RC: the caller
-matches the RC so it can provide a suitable error message if not
-matched.  This means it's up to the caller to set the length of
-the node to include the closing RC.  The node start pos is set to
-the absolute buffer start position, and the caller should fix it
-up to be relative to the parent node.  All children of this block
-node are given relative start positions and correct lengths."
-  (let ((pn (or parent (make-js2-block-node)))
-        tt)
-    (setf (js2-node-pos pn) js2-token-beg)
-    (while (and (> (setq tt (js2-peek-token)) js2-EOF)
-                (/= tt js2-RC))
-      (js2-block-node-push pn (js2-parse-statement)))
-    pn))
-
-(defun js2-parse-statement ()
-  (let (tt pn beg end)
-
-    ;; coarse-grained user-interrupt check - needs work
-    (and js2-parse-interruptable-p
-         (zerop (% (incf js2-parse-stmt-count)
-                   js2-statements-per-pause))
-         (input-pending-p)
-         (throw 'interrupted t))
-
-    (setq pn (js2-statement-helper))
-
-    ;; no-side-effects warning check
-    (unless (js2-node-has-side-effects pn)
-      (setq end (js2-node-end pn))
-      (save-excursion
-        (goto-char end)
-        (setq beg (max (js2-node-pos pn) (point-at-bol))))
-      (js2-add-strict-warning "msg.no.side.effects" nil beg end))
-
-    pn))
-
-;; These correspond to the switch cases in Parser.statementHelper
-(defconst js2-parsers
-  (let ((parsers (make-vector js2-num-tokens
-                                #'js2-parse-expr-stmt)))
-    (aset parsers js2-BREAK     #'js2-parse-break)
-    (aset parsers js2-CONST     #'js2-parse-const-var)
-    (aset parsers js2-CONTINUE  #'js2-parse-continue)
-    (aset parsers js2-DEBUGGER  #'js2-parse-debugger)
-    (aset parsers js2-DEFAULT   #'js2-parse-default-xml-namespace)
-    (aset parsers js2-DO        #'js2-parse-do)
-    (aset parsers js2-FOR       #'js2-parse-for)
-    (aset parsers js2-FUNCTION  #'js2-function-parser)
-    (aset parsers js2-IF        #'js2-parse-if)
-    (aset parsers js2-LC        #'js2-parse-block)
-    (aset parsers js2-LET       #'js2-parse-let-stmt)
-    (aset parsers js2-NAME      #'js2-parse-name-or-label)
-    (aset parsers js2-RETURN    #'js2-parse-ret-yield)
-    (aset parsers js2-SEMI      #'js2-parse-semi)
-    (aset parsers js2-SWITCH    #'js2-parse-switch)
-    (aset parsers js2-THROW     #'js2-parse-throw)
-    (aset parsers js2-TRY       #'js2-parse-try)
-    (aset parsers js2-VAR       #'js2-parse-const-var)
-    (aset parsers js2-WHILE     #'js2-parse-while)
-    (aset parsers js2-WITH      #'js2-parse-with)
-    (aset parsers js2-YIELD     #'js2-parse-ret-yield)
-    parsers)
-  "A vector mapping token types to parser functions.")
-
-(defsubst js2-parse-warn-missing-semi (beg end)
-  (and js2-mode-show-strict-warnings
-       js2-strict-missing-semi-warning
-       (js2-add-strict-warning
-        "msg.missing.semi" nil
-        ;; back up to beginning of statement or line
-        (max beg (save-excursion
-                   (goto-char end)
-                   (point-at-bol)))
-        end)))
-
-(defconst js2-no-semi-insertion
-  (list js2-IF
-        js2-SWITCH
-        js2-WHILE
-        js2-DO
-        js2-FOR
-        js2-TRY
-        js2-WITH
-        js2-LC
-        js2-ERROR
-        js2-SEMI
-        js2-FUNCTION)
-  "List of tokens that don't do automatic semicolon insertion.")
-
-(defconst js2-autoinsert-semi-and-warn
-  (list js2-ERROR js2-EOF js2-RC))
-
-(defun js2-statement-helper ()
-  (let* ((tt (js2-peek-token))
-         (first-tt tt)
-         (beg js2-token-beg)
-         (parser (if (= tt js2-ERROR)
-                     #'js2-parse-semi
-                   (aref js2-parsers tt)))
-         pn
-         tt-flagged)
-    ;; If the statement is set, then it's been told its label by now.
-    (and js2-labeled-stmt
-         (js2-labeled-stmt-node-stmt js2-labeled-stmt)
-         (setq js2-labeled-stmt nil))
-
-    (setq pn (funcall parser)
-          tt-flagged (js2-peek-flagged-token)
-          tt (logand tt-flagged js2-clear-ti-mask))
-
-    ;; Don't do auto semi insertion for certain statement types.
-    (unless (or (memq first-tt js2-no-semi-insertion)
-                (js2-labeled-stmt-node-p pn))
-      (cond
-       ((= tt js2-SEMI)
-        ;; Consume ';' as a part of expression
-        (js2-consume-token)
-        ;; extend the node bounds to include the semicolon.
-        (setf (js2-node-len pn) (- js2-token-end beg)))
-       ((memq tt js2-autoinsert-semi-and-warn)
-        ;; Autoinsert ;
-        (js2-parse-warn-missing-semi beg (js2-node-end pn)))
-       (t
-        (if (js2-flag-not-set-p tt-flagged js2-ti-after-eol)
-            ;; Report error if no EOL or autoinsert ';' otherwise
-            (js2-report-error "msg.no.semi.stmt")
-          (js2-parse-warn-missing-semi beg (js2-node-end pn))))))
-    pn))
-
-(defun js2-parse-condition ()
-  "Parse a parenthesized boolean expression, e.g. in an if- or while-stmt.
-The parens are discarded and the expression node is returned.
-The `pos' field of the return value is set to an absolute position
-that must be fixed up by the caller.
-Return value is a list (EXPR LP RP), with absolute paren positions."
-  (let (pn lp rp)
-    (if (js2-must-match js2-LP "msg.no.paren.cond")
-        (setq lp js2-token-beg))
-    (setq pn (js2-parse-expr))
-    (if (js2-must-match js2-RP "msg.no.paren.after.cond")
-        (setq rp js2-token-beg))
-    ;; Report strict warning on code like "if (a = 7) ..."
-    (if (and js2-strict-cond-assign-warning
-             (js2-assign-node-p pn))
-        (js2-add-strict-warning "msg.equal.as.assign" nil
-                                (js2-node-pos pn)
-                                (+ (js2-node-pos pn)
-                                   (js2-node-len pn))))
-    (list pn lp rp)))
-
-(defun js2-parse-if ()
-  "Parser for if-statement.  Last matched token must be js2-IF."
-  (let ((pos js2-token-beg)
-        cond
-        if-true
-        if-false
-        else-pos
-        end
-        pn)
-    (js2-consume-token)
-    (setq cond (js2-parse-condition)
-          if-true (js2-parse-statement)
-          if-false (if (js2-match-token js2-ELSE)
-                       (progn
-                         (setq else-pos (- js2-token-beg pos))
-                         (js2-parse-statement)))
-          end (js2-node-end (or if-false if-true))
-          pn (make-js2-if-node :pos pos
-                               :len (- end pos)
-                               :condition (car cond)
-                               :then-part if-true
-                               :else-part if-false
-                               :else-pos else-pos
-                               :lp (js2-relpos (second cond) pos)
-                               :rp (js2-relpos (third cond) pos)))
-    (js2-node-add-children pn (car cond) if-true if-false)
-    pn))
-
-(defun js2-parse-switch ()
-  "Parser for if-statement.  Last matched token must be js2-SWITCH."
-  (let ((pos js2-token-beg)
-        tt
-        pn
-        discriminant
-        has-default
-        case-expr
-        case-node
-        case-pos
-        cases
-        stmt
-        lp
-        rp)
-    (js2-consume-token)
-    (if (js2-must-match js2-LP "msg.no.paren.switch")
-        (setq lp js2-token-beg))
-    (setq discriminant (js2-parse-expr)
-          pn (make-js2-switch-node :discriminant discriminant
-                                   :pos pos
-                                   :lp (js2-relpos lp pos)))
-    (js2-node-add-children pn discriminant)
-    (js2-enter-switch pn)
-    (unwind-protect
-        (progn
-          (if (js2-must-match js2-RP "msg.no.paren.after.switch")
-              (setf (js2-switch-node-rp pn) (- js2-token-beg pos)))
-          (js2-must-match js2-LC "msg.no.brace.switch")
-          (catch 'break
-            (while t
-              (setq tt (js2-next-token)
-                    case-pos js2-token-beg)
-              (cond
-               ((= tt js2-RC)
-                (setf (js2-node-len pn) (- js2-token-end pos))
-                (throw 'break nil))  ; done
-
-               ((= tt js2-CASE)
-                (setq case-expr (js2-parse-expr))
-                (js2-must-match js2-COLON "msg.no.colon.case"))
-
-               ((= tt js2-DEFAULT)
-                (if has-default
-                    (js2-report-error "msg.double.switch.default"))
-                (setq has-default t
-                      case-expr nil)
-                (js2-must-match js2-COLON "msg.no.colon.case"))
-
-               (t
-                (js2-report-error "msg.bad.switch")
-                (throw 'break nil)))
-
-              (setq case-node (make-js2-case-node :pos case-pos
-                                                  :len (- js2-token-end case-pos)
-                                                  :expr case-expr))
-              (js2-node-add-children case-node case-expr)
-              (while (and (/= (setq tt (js2-peek-token)) js2-RC)
-                          (/= tt js2-CASE)
-                          (/= tt js2-DEFAULT)
-                          (/= tt js2-EOF))
-                (setf stmt (js2-parse-statement)
-                      (js2-node-len case-node) (- (js2-node-end stmt) case-pos))
-                (js2-block-node-push case-node stmt))
-              (push case-node cases)))
-          ;; add cases last, as pushing reverses the order to be correct
-          (dolist (kid cases)
-            (js2-node-add-children pn kid)
-            (push kid (js2-switch-node-cases pn)))
-          pn)  ; return value
-      (js2-exit-switch))))
-
-(defun js2-parse-while ()
-  "Parser for while-statement.  Last matched token must be js2-WHILE."
-  (let ((pos js2-token-beg)
-        (pn (make-js2-while-node))
-        cond
-        body)
-    (js2-consume-token)
-    (js2-enter-loop pn)
-    (unwind-protect
-        (progn
-          (setf cond (js2-parse-condition)
-                (js2-while-node-condition pn) (car cond)
-                body (js2-parse-statement)
-                (js2-while-node-body pn) body
-                (js2-node-len pn) (- (js2-node-end body) pos)
-                (js2-while-node-lp pn) (js2-relpos (second cond) pos)
-                (js2-while-node-rp pn) (js2-relpos (third cond) pos))
-          (js2-node-add-children pn body (car cond)))
-      (js2-exit-loop))
-    pn))
-
-(defun js2-parse-do ()
-  "Parser for do-statement.  Last matched token must be js2-DO."
-  (let ((pos js2-token-beg)
-        (pn (make-js2-do-node))
-        cond
-        body
-        end)
-    (js2-consume-token)
-    (js2-enter-loop pn)
-    (unwind-protect
-        (progn
-          (setq body (js2-parse-statement))
-          (js2-must-match js2-WHILE "msg.no.while.do")
-          (setf (js2-do-node-while-pos pn) (- js2-token-beg pos)
-                cond (js2-parse-condition)
-                (js2-do-node-condition pn) (car cond)
-                (js2-do-node-body pn) body
-                end js2-ts-cursor
-                (js2-do-node-lp pn) (js2-relpos (second cond) pos)
-                (js2-do-node-rp pn) (js2-relpos (third cond) pos))
-          (js2-node-add-children pn (car cond) body))
-      (js2-exit-loop))
-    ;; Always auto-insert semicolon to follow SpiderMonkey:
-    ;; It is required by ECMAScript but is ignored by the rest of
-    ;; world; see bug 238945
-    (if (js2-match-token js2-SEMI)
-        (setq end js2-ts-cursor))
-    (setf (js2-node-len pn) (- end pos))
-    pn))
-
-(defun js2-parse-for ()
-  "Parser for for-statement.  Last matched token must be js2-FOR.
-Parses for, for-in, and for each-in statements."
-  (let ((for-pos js2-token-beg)
-        pn
-        is-for-each
-        is-for-in
-        in-pos
-        each-pos
-        tmp-pos
-        init  ; Node init is also foo in 'foo in object'
-        cond  ; Node cond is also object in 'foo in object'
-        incr  ; 3rd section of for-loop initializer
-        body
-        tt
-        lp
-        rp)
-    (js2-consume-token)
-    ;; See if this is a for each () instead of just a for ()
-    (when (js2-match-token js2-NAME)
-      (if (string= "each" js2-ts-string)
-          (progn
-            (setq is-for-each t
-                  each-pos (- js2-token-beg for-pos)) ; relative
-            (js2-record-face 'font-lock-keyword-face))
-        (js2-report-error "msg.no.paren.for")))
-
-    (if (js2-must-match js2-LP "msg.no.paren.for")
-        (setq lp (- js2-token-beg for-pos)))
-    (setq tt (js2-peek-token))
-
-    ;; parse init clause
-    (let ((js2-in-for-init t))  ; set as dynamic variable
-      (cond
-       ((= tt js2-SEMI)
-        (setq init (make-js2-empty-expr-node)))
-       ((or (= tt js2-VAR) (= tt js2-LET))
-        (js2-consume-token)
-        (setq init (js2-parse-variables tt js2-token-beg)))
-       (t
-        (setq init (js2-parse-expr)))))
-
-    (if (js2-match-token js2-IN)
-        (setq is-for-in t
-              in-pos (- js2-token-beg for-pos)
-              cond (js2-parse-expr))  ; object over which we're iterating
-      ;; else ordinary for loop - parse cond and incr
-      (js2-must-match js2-SEMI "msg.no.semi.for")
-      (setq cond (if (= (js2-peek-token) js2-SEMI)
-                     (make-js2-empty-expr-node) ; no loop condition
-                   (js2-parse-expr)))
-      (js2-must-match js2-SEMI "msg.no.semi.for.cond")
-      (setq tmp-pos js2-token-end
-            incr (if (= (js2-peek-token) js2-RP)
-                     (make-js2-empty-expr-node :pos tmp-pos)
-                   (js2-parse-expr))))
-
-    (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
-        (setq rp (- js2-token-beg for-pos)))
-    (if (not is-for-in)
-        (setq pn (make-js2-for-node :init init
-                                    :condition cond
-                                    :update incr
-                                    :lp lp
-                                    :rp rp))
-      ;; cond could be null if 'in obj' got eaten by the init node.
-      (if (js2-infix-node-p init)
-          ;; it was (foo in bar) instead of (var foo in bar)
-          (setq cond (js2-infix-node-right init)
-                init (js2-infix-node-left init))
-        (if (and (js2-var-decl-node-p init)
-                 (> (length (js2-var-decl-node-kids init)) 1))
-            (js2-report-error "msg.mult.index")))
-
-      (setq pn (make-js2-for-in-node :iterator init
-                                     :object cond
-                                     :in-pos in-pos
-                                     :foreach-p is-for-each
-                                     :each-pos each-pos
-                                     :lp lp
-                                     :rp rp)))
-    (unwind-protect
-        (progn
-          (js2-enter-loop pn)
-          ;; We have to parse the body -after- creating the loop node,
-          ;; so that the loop node appears in the js2-loop-set, allowing
-          ;; break/continue statements to find the enclosing loop.
-          (setf body (js2-parse-statement)
-                (js2-loop-node-body pn) body
-                (js2-node-pos pn) for-pos
-                (js2-node-len pn) (- (js2-node-end body) for-pos))
-          (js2-node-add-children pn init cond incr body))
-      ;; finally
-      (js2-exit-loop))
-    pn))
-
-(defun js2-parse-try ()
-  "Parser for try-statement.  Last matched token must be js2-TRY."
-  (let ((try-pos js2-token-beg)
-        try-end
-        try-block
-        catch-blocks
-        finally-block
-        saw-default-catch
-        peek
-        var-name
-        catch-cond
-        catch-node
-        guard-kwd
-        catch-pos
-        finally-pos
-        pn
-        block
-        lp
-        rp)
-    (js2-consume-token)
-    (if (/= (js2-peek-token) js2-LC)
-        (js2-report-error "msg.no.brace.try"))
-    (setq try-block (js2-parse-statement)
-          try-end (js2-node-end try-block)
-          peek (js2-peek-token))
-    (cond
-     ((= peek js2-CATCH)
-      (while (js2-match-token js2-CATCH)
-        (setq catch-pos js2-token-beg
-              guard-kwd nil
-              catch-cond nil
-              lp nil
-              rp nil)
-        (if saw-default-catch
-            (js2-report-error "msg.catch.unreachable"))
-        (if (js2-must-match js2-LP "msg.no.paren.catch")
-            (setq lp (- js2-token-beg catch-pos)))
-
-        (js2-must-match js2-NAME "msg.bad.catchcond")
-        (setq var-name (js2-create-name-node))
-
-        (if (js2-match-token js2-IF)
-            (setq guard-kwd (- js2-token-beg catch-pos)
-                  catch-cond (js2-parse-expr))
-          (setq saw-default-catch t))
-
-        (if (js2-must-match js2-RP "msg.bad.catchcond")
-            (setq rp (- js2-token-beg catch-pos)))
-        (js2-must-match js2-LC "msg.no.brace.catchblock")
-
-        (setq block (js2-parse-statements)
-              try-end (js2-node-end block)
-              catch-node (make-js2-catch-node :pos catch-pos
-                                              :var-name var-name
-                                              :guard-expr catch-cond
-                                              :guard-kwd guard-kwd
-                                              :block block
-                                              :lp lp
-                                              :rp rp))
-        (if (js2-must-match js2-RC "msg.no.brace.after.body")
-            (setq try-end js2-token-beg))
-        (setf (js2-node-len block) (- try-end (js2-node-pos block))
-              (js2-node-len catch-node) (- try-end catch-pos))
-        (js2-node-add-children catch-node var-name catch-cond block)
-        (push catch-node catch-blocks)))
-
-     ((/= peek js2-FINALLY)
-      (js2-must-match js2-FINALLY "msg.try.no.catchfinally"
-                      (js2-node-pos try-block)
-                      (- (setq try-end (js2-node-end try-block))
-                         (js2-node-pos try-block)))))
-
-    (when (js2-match-token js2-FINALLY)
-      (setq finally-pos js2-token-beg
-            block (js2-parse-statement)
-            try-end (js2-node-end block)
-            finally-block (make-js2-finally-node :pos finally-pos
-                                                 :len (- try-end finally-pos)
-                                                 :body block))
-      (js2-node-add-children finally-block block))
-
-    (setq pn (make-js2-try-node :pos try-pos
-                                :len (- try-end try-pos)
-                                :try-block try-block
-                                :finally-block finally-block))
-    (js2-node-add-children pn try-block finally-block)
-
-    ;; push them onto the try-node, which reverses and corrects their order
-    (dolist (cb catch-blocks)
-      (js2-node-add-children pn cb)
-      (push cb (js2-try-node-catch-clauses pn)))
-    pn))
-
-(defun js2-parse-throw ()
-  "Parser for throw-statement.  Last matched token must be js2-THROW."
-  (let ((pos js2-token-beg)
-        expr
-        pn)
-    (js2-consume-token)
-    (if (= (js2-peek-token-or-eol) js2-EOL)
-        ;; ECMAScript does not allow new lines before throw expression,
-        ;; see bug 256617
-        (js2-report-error "msg.bad.throw.eol"))
-    (setq expr (js2-parse-expr)
-          pn (make-js2-throw-node :pos pos
-                                  :len (- (js2-node-end expr) pos)
-                                  :expr expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defsubst js2-match-jump-label-name (label-name)
-  "If break/continue specified a label, return that label's labeled stmt.
-Returns the corresponding `js2-labeled-stmt-node', or if LABEL-NAME
-does not match an existing label, reports an error and returns nil."
-  (let ((bundle (cdr (assoc label-name js2-label-set))))
-    (if (null bundle)
-        (js2-report-error "msg.undef.label"))
-    bundle))
-
-(defun js2-parse-break ()
-  "Parser for break-statement.  Last matched token must be js2-BREAK."
-  (let ((pos js2-token-beg)
-        (end js2-token-end)
-        break-target ; statement to break from
-        break-label  ; in "break foo", name-node representing the foo
-        labels       ; matching labeled statement to break to
-        pn)
-    (js2-consume-token)  ; `break'
-    (when (eq (js2-peek-token-or-eol) js2-NAME)
-      (js2-consume-token)
-      (setq break-label (js2-create-name-node)
-            end (js2-node-end break-label)
-            ;; matchJumpLabelName only matches if there is one
-            labels (js2-match-jump-label-name js2-ts-string)
-            break-target (if labels (car (js2-labeled-stmt-node-labels labels)))))
-
-    (unless (or break-target break-label)
-      ;; no break target specified - try for innermost enclosing loop/switch
-      (if (null js2-loop-and-switch-set)
-          (unless break-label
-            (js2-report-error "msg.bad.break" nil pos (length "break")))
-        (setq break-target (car js2-loop-and-switch-set))))
-
-    (setq pn (make-js2-break-node :pos pos
-                                  :len (- end pos)
-                                  :label break-label
-                                  :target break-target))
-    (js2-node-add-children pn break-label)  ; but not break-target
-    pn))
-
-(defun js2-parse-continue ()
-  "Parser for continue-statement.  Last matched token must be js2-CONTINUE."
-  (let ((pos js2-token-beg)
-        (end js2-token-end)
-        label   ; optional user-specified label, a `js2-name-node'
-        labels  ; current matching labeled stmt, if any
-        target  ; the `js2-loop-node' target of this continue stmt
-        pn)
-    (js2-consume-token)  ; `continue'
-    (when (= (js2-peek-token-or-eol) js2-NAME)
-      (js2-consume-token)
-      (setq label (js2-create-name-node)
-            end (js2-node-end label)
-            ;; matchJumpLabelName only matches if there is one
-            labels (js2-match-jump-label-name js2-ts-string)))
-    (cond
-     ((null labels)  ; no current label to go to
-      (if (null js2-loop-set)  ; no loop to continue to
-          (js2-report-error "msg.continue.outside" nil pos
-                            (length "continue"))
-        (setq target (car js2-loop-set))))  ; innermost enclosing loop
-     (t
-      (if (js2-loop-node-p (js2-labeled-stmt-node-stmt labels))
-          (setq target (js2-labeled-stmt-node-stmt labels))
-        (js2-report-error "msg.continue.nonloop" nil pos (- end pos)))))
-
-    (setq pn (make-js2-continue-node :pos pos
-                                     :len (- end pos)
-                                     :label label
-                                     :target target))
-    (js2-node-add-children pn label)  ; but not target - it's not our child
-    pn))
-
-(defun js2-parse-with ()
-  "Parser for with-statement.  Last matched token must be js2-WITH."
-  (js2-consume-token)
-  (let ((pos js2-token-beg)
-        obj body pn lp rp)
-
-    (if (js2-must-match js2-LP "msg.no.paren.with")
-        (setq lp js2-token-beg))
-
-    (setq obj (js2-parse-expr))
-
-    (if (js2-must-match js2-RP "msg.no.paren.after.with")
-        (setq rp js2-token-beg))
-
-    (let ((js2-nesting-of-with (1+ js2-nesting-of-with)))
-        (setq body (js2-parse-statement)))
-
-    (setq pn (make-js2-with-node :pos pos
-                                 :len (- (js2-node-end body) pos)
-                                 :object obj
-                                 :body body
-                                 :lp (js2-relpos lp pos)
-                                 :rp (js2-relpos rp pos)))
-    (js2-node-add-children pn obj body)
-    pn))
-
-(defun js2-parse-const-var ()
-  "Parser for var- or const-statement.
-Last matched token must be js2-CONST or js2-VAR."
-  (let ((tt (js2-peek-token))
-        (pos js2-token-beg)
-        expr
-        pn)
-    (js2-consume-token)
-    (setq expr (js2-parse-variables tt js2-token-beg)
-          pn (make-js2-expr-stmt-node :pos pos
-                                      :len (- (js2-node-end expr) pos)
-                                      :expr expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defsubst js2-wrap-with-expr-stmt (pos expr &optional add-child)
-  (let ((pn (make-js2-expr-stmt-node :pos pos
-                                     :len (js2-node-len expr)
-                                     :type (if (js2-inside-function)
-                                               js2-EXPR_VOID
-                                             js2-EXPR_RESULT)
-                                     :expr expr)))
-    (if add-child
-        (js2-node-add-children pn expr))
-    pn))
-
-(defun js2-parse-let-stmt ()
-  "Parser for let-statement.  Last matched token must be js2-LET."
-  (js2-consume-token)
-  (let ((pos js2-token-beg)
-        expr
-        pn)
-    (if (= (js2-peek-token) js2-LP)
-        ;; let expression in statement context
-        (setq expr (js2-parse-let pos 'statement)
-              pn (js2-wrap-with-expr-stmt pos expr t))
-      ;; else we're looking at a statement like let x=6, y=7;
-      (setf expr (js2-parse-variables js2-LET pos)
-            pn (js2-wrap-with-expr-stmt pos expr t)
-            (js2-node-type pn) js2-EXPR_RESULT))
-    pn))
-
-(defun js2-parse-ret-yield ()
-  (js2-parse-return-or-yield (js2-peek-token) nil))
-
-(defconst js2-parse-return-stmt-enders
-  (list js2-SEMI js2-RC js2-EOF js2-EOL js2-ERROR js2-RB js2-RP js2-YIELD))
-
-(defsubst js2-now-all-set (before after mask)
-  "Return whether or not the bits in the mask have changed to all set.
-BEFORE is bits before change, AFTER is bits after change, and MASK is
-the mask for bits.  Returns t if all the bits in the mask are set in AFTER
-but not BEFORE."
-  (and (/= (logand before mask) mask)
-       (= (logand after mask) mask)))
-
-(defun js2-parse-return-or-yield (tt expr-context)
-  (let ((pos js2-token-beg)
-        (end js2-token-end)
-        (before js2-end-flags)
-        (inside-function (js2-inside-function))
-        e
-        ret
-        name)
-    (unless inside-function
-      (js2-report-error (if (eq tt js2-RETURN)
-                            "msg.bad.return"
-                          "msg.bad.yield")))
-    (js2-consume-token)
-    ;; This is ugly, but we don't want to require a semicolon.
-    (unless (memq (js2-peek-token-or-eol) js2-parse-return-stmt-enders)
-      (setq e (js2-parse-expr)
-            end (js2-node-end e)))
-    (cond
-     ((eq tt js2-RETURN)
-      (js2-set-flag js2-end-flags (if (null e)
-                                      js2-end-returns
-                                    js2-end-returns-value))
-      (setq ret (make-js2-return-node :pos pos
-                                      :len (- end pos)
-                                      :retval e))
-      (js2-node-add-children ret e)
-      ;; See if we need a strict mode warning.
-      ;; TODO:  The analysis done by `js2-has-consistent-return-usage' is
-      ;; more thorough and accurate than this before/after flag check.
-      ;; E.g. if there's a finally-block that always returns, we shouldn't
-      ;; show a warning generated by inconsistent returns in the catch blocks.
-      ;; Basically `js2-has-consistent-return-usage' needs to keep more state,
-      ;; so we know which returns/yields to highlight, and we should get rid of
-      ;; all the checking in `js2-parse-return-or-yield'.
-      (if (and js2-strict-inconsistent-return-warning
-               (js2-now-all-set before js2-end-flags
-                                (logior js2-end-returns js2-end-returns-value)))
-          (js2-add-strict-warning "msg.return.inconsistent" nil pos end)))
-     (t
-      (unless (js2-inside-function)
-        (js2-report-error "msg.bad.yield"))
-      (js2-set-flag js2-end-flags js2-end-yields)
-      (setq ret (make-js2-yield-node :pos pos
-                                     :len (- end pos)
-                                     :value e))
-      (js2-node-add-children ret e)
-      (unless expr-context
-        (setq e ret
-              ret (js2-wrap-with-expr-stmt pos e t))
-      (js2-set-requires-activation)
-      (js2-set-is-generator))))
-
-    ;; see if we are mixing yields and value returns.
-    (when (and inside-function
-               (js2-now-all-set before js2-end-flags
-                                (logior js2-end-yields js2-end-returns-value)))
-      (setq name (js2-function-name js2-current-script-or-fn))
-      (if (zerop (length name))
-          (js2-report-error "msg.anon.generator.returns" nil pos (- end pos))
-        (js2-report-error "msg.generator.returns" name pos (- end pos))))
-
-    ret))
-
-(defun js2-parse-debugger ()
-  (js2-consume-token)
-  (make-js2-keyword-node :type js2-DEBUGGER))
-
-(defun js2-parse-block ()
-  "Parser for a curly-delimited statement block.
-Last token matched must be js2-LC."
-  (let ((pos js2-token-beg)
-        (pn (make-js2-scope)))
-    (js2-consume-token)
-    (js2-push-scope pn)
-    (unwind-protect
-        (progn
-          (js2-parse-statements pn)
-          (js2-must-match js2-RC "msg.no.brace.block")
-          (setf (js2-node-len pn) (- js2-token-end pos)))
-      (js2-pop-scope))
-    pn))
-
-;; for js2-ERROR too, to have a node for error recovery to work on
-(defun js2-parse-semi ()
-  "Parse a statement or handle an error.
-Last matched token is js-SEMI or js-ERROR."
-  (let ((tt (js2-peek-token)) pos len)
-    (js2-consume-token)
-    (if (eq tt js2-SEMI)
-        (make-js2-empty-expr-node :len 1)
-      (setq pos js2-token-beg
-            len (- js2-token-beg pos))
-      (js2-report-error "msg.syntax" nil pos len)
-      (make-js2-error-node :pos pos :len len))))
-
-(defun js2-parse-default-xml-namespace ()
-  "Parse a `default xml namespace = <expr>' e4x statement."
-  (let ((pos js2-token-beg)
-        end len expr unary es)
-    (js2-consume-token)
-    (js2-must-have-xml)
-    (js2-set-requires-activation)
-    (setq len (- js2-ts-cursor pos))
-    (unless (and (js2-match-token js2-NAME)
-                 (string= js2-ts-string "xml"))
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (unless (and (js2-match-token js2-NAME)
-                 (string= js2-ts-string "namespace"))
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (unless (js2-match-token js2-ASSIGN)
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (setq expr (js2-parse-expr)
-          end (js2-node-end expr)
-          unary (make-js2-unary-node :type js2-DEFAULTNAMESPACE
-                                     :pos pos
-                                     :len (- end pos)
-                                     :operand expr))
-    (js2-node-add-children unary expr)
-    (make-js2-expr-stmt-node :pos pos
-                             :len (- end pos)
-                             :expr unary)))
-
-(defun js2-record-label (label bundle)
-  ;; current token should be colon that `js2-parse-primary-expr' left untouched
-  (js2-consume-token)
-  (let ((name (js2-label-node-name label))
-        labeled-stmt
-        dup)
-    (when (setq labeled-stmt (cdr (assoc name js2-label-set)))
-      ;; flag both labels if possible when used in editing mode
-      (if (and js2-parse-ide-mode
-               (setq dup (js2-get-label-by-name labeled-stmt name)))
-          (js2-report-error "msg.dup.label" nil
-                            (js2-node-abs-pos dup) (js2-node-len dup)))
-      (js2-report-error "msg.dup.label" nil
-                        (js2-node-pos label) (js2-node-len label)))
-    (js2-labeled-stmt-node-add-label bundle label)
-    (js2-node-add-children bundle label)
-    ;; Add one reference to the bundle per label in `js2-label-set'
-    (push (cons name bundle) js2-label-set)))
-
-(defun js2-parse-name-or-label ()
-  "Parser for identifier or label.  Last token matched must be js2-NAME.
-Called when we found a name in a statement context.  If it's a label, we gather
-up any following labels and the next non-label statement into a
-`js2-labeled-stmt-node' bundle and return that.  Otherwise we parse an
-expression and return it wrapped in a `js2-expr-stmt-node'."
-  (let ((pos js2-token-beg)
-        (end js2-token-end)
-        expr
-        stmt
-        pn
-        bundle
-        (continue t))
-    ;; set check for label and call down to `js2-parse-primary-expr'
-    (js2-set-check-for-label)
-    (setq expr (js2-parse-expr))
-
-    (if (/= (js2-node-type expr) js2-LABEL)
-        ;; Parsed non-label expression - wrap with expression stmt.
-        (setq pn (js2-wrap-with-expr-stmt pos expr t))
-
-      ;; else parsed a label
-      (setq bundle (make-js2-labeled-stmt-node :pos pos))
-      (js2-record-label expr bundle)
-
-      ;; look for more labels
-      (while (and continue (= (js2-peek-token) js2-NAME))
-        (js2-set-check-for-label)
-        (setq expr (js2-parse-expr))
-        (if (/= (js2-node-type expr) js2-LABEL)
-            (setq stmt (js2-wrap-with-expr-stmt pos expr t)
-                  continue nil)
-          (js2-record-label expr bundle)))
-
-      ;; no more labels; now parse the labeled statement
-      (unwind-protect
-            (unless stmt
-              (let ((js2-labeled-stmt bundle))  ; bind dynamically
-                (setq stmt (js2-statement-helper))))
-        ;; remove the labels for this statement from the global set
-        (dolist (label (js2-labeled-stmt-node-labels bundle))
-          (setq js2-label-set (remove label js2-label-set))))
-
-      (setf (js2-labeled-stmt-node-stmt bundle) stmt)
-      (js2-node-add-children bundle stmt)
-      bundle)))
-
-(defun js2-parse-expr-stmt ()
-  "Default parser in statement context, if no recognized statement found."
-  (js2-wrap-with-expr-stmt js2-token-beg (js2-parse-expr) t))
-
-(defun js2-parse-variables (decl-type pos)
-  "Parse a comma-separated list of variable declarations.
-Could be a 'var', 'const' or 'let' expression, possibly in a for-loop initializer.
-
-DECL-TYPE is a token value: either VAR, CONST, or LET depending on context.
-For 'var' or 'const', the keyword should be the token last scanned.
-
-POS is the position where the node should start. It's sometimes the
-var/const/let keyword, and other times the beginning of the first token
-in the first variable declaration.
-
-Returns the parsed `js2-var-decl-node' expression node."
-  (let* ((result (make-js2-var-decl-node :decl-type decl-type
-                                         :pos pos))
-         destructuring
-         kid-pos
-         tt
-         init
-         name
-         end
-         nbeg nend
-         vi
-         (continue t))
-    ;; Example:
-    ;; var foo = {a: 1, b: 2}, bar = [3, 4];
-    ;; var {b: s2, a: s1} = foo, x = 6, y, [s3, s4] = bar;
-    (while continue
-      (setq destructuring nil
-            name nil
-            tt (js2-peek-token)
-            kid-pos js2-token-beg
-            end js2-token-end
-            init nil)
-      (if (or (= tt js2-LB) (= tt js2-LC))
-          ;; Destructuring assignment, e.g., var [a, b] = ...
-          (setq destructuring (js2-parse-primary-expr)
-                end (js2-node-end destructuring))
-        ;; Simple variable name
-        (when (js2-must-match js2-NAME "msg.bad.var")
-          (setq name (js2-create-name-node)
-                nbeg js2-token-beg
-                nend js2-token-end
-                end nend)
-          (js2-define-symbol decl-type js2-ts-string name js2-in-for-init)))
-
-      (when (js2-match-token js2-ASSIGN)
-        (setq init (js2-parse-assign-expr)
-              end (js2-node-end init))
-        (if (and js2-parse-ide-mode
-                 (or (js2-object-node-p init)
-                     (js2-function-node-p init)))
-            (js2-record-imenu-functions init name)))
-
-      (when name
-        (js2-set-face nbeg nend (if (js2-function-node-p init)
-                                    'font-lock-function-name-face
-                                  'font-lock-variable-name-face)
-                      'record))
-
-      (setq vi (make-js2-var-init-node :pos kid-pos
-                                       :len (- end kid-pos)
-                                       :type decl-type))
-      (if destructuring
-          (progn
-            (if (and (null init) (not js2-in-for-init))
-                (js2-report-error "msg.destruct.assign.no.init"))
-            (setf (js2-var-init-node-target vi) destructuring))
-        (setf (js2-var-init-node-target vi) name))
-      (setf (js2-var-init-node-initializer vi) init)
-      (js2-node-add-children vi name destructuring init)
-
-      (js2-block-node-push result vi)
-      (unless (js2-match-token js2-COMMA)
-        (setq continue nil)))
-
-    (setf (js2-node-len result) (- end pos))
-    result))
-
-(defun js2-parse-let (pos &optional stmt-p)
-  "Parse a let expression or statement.
-A let-expression is of the form `let (vars) expr'.
-A let-statment is of the form `let (vars) {statements}'.
-The third form of let is a variable declaration list, handled
-by `js2-parse-variables'."
-  (let ((pn (make-js2-let-node :pos pos))
-        beg vars body)
-    (if (js2-must-match js2-LP "msg.no.paren.after.let")
-        (setf (js2-let-node-lp pn) (- js2-token-beg pos)))
-    (js2-push-scope pn)
-    (unwind-protect
-        (progn
-          (setq vars (js2-parse-variables js2-LET js2-token-beg))
-          (if (js2-must-match js2-RP "msg.no.paren.let")
-              (setf (js2-let-node-rp pn) (- js2-token-beg pos)))
-          (if (and stmt-p (eq (js2-peek-token) js2-LC))
-              ;; let statement
-              (progn
-                (js2-consume-token)
-                (setf beg js2-token-beg  ; position stmt at LC
-                      body (js2-parse-statements))
-                (js2-must-match js2-RC "msg.no.curly.let")
-                (setf (js2-node-len body) (- js2-token-end beg)
-                      (js2-node-len pn) (- js2-token-end pos)
-                      (js2-let-node-body pn) body
-                      (js2-node-type pn) js2-LET))
-            ;; let expression
-            (setf body (js2-parse-expr)
-                  (js2-node-len pn) (- (js2-node-end body) pos)
-                  (js2-let-node-body pn) body))
-          (js2-node-add-children pn vars body))
-      (js2-pop-scope))
-    pn))
-
-(defsubst js2-define-new-symbol (decl-type name node)
-  (js2-scope-put-symbol js2-current-scope
-                        name
-                        (make-js2-symbol decl-type name node)))
-
-(defun js2-define-symbol (decl-type name &optional node ignore-not-in-block)
-  "Define a symbol in the current scope.
-If NODE is non-nil, it is the AST node associated with the symbol."
-  (let* ((defining-scope (js2-get-defining-scope js2-current-scope name))
-         (symbol (if defining-scope
-                     (js2-scope-get-symbol defining-scope name)))
-         (sdt (if symbol (js2-symbol-decl-type symbol) -1)))
-    (cond
-     ((and symbol ; already defined
-           (or (= sdt js2-CONST) ; old version is const
-               (= decl-type js2-CONST) ; new version is const
-               ;; two let-bound vars in this block have same name
-               (and (= sdt js2-LET)
-                    (eq defining-scope js2-current-scope))))
-      (js2-report-error
-       (cond
-        ((= sdt js2-CONST) "msg.const.redecl")
-        ((= sdt js2-LET) "msg.let.redecl")
-        ((= sdt js2-VAR) "msg.var.redecl")
-        ((= sdt js2-FUNCTION) "msg.function.redecl")
-        (t "msg.parm.redecl"))
-       name))
-
-     ((= decl-type js2-LET)
-      (if (and (not ignore-not-in-block)
-               (or (= (js2-node-type js2-current-scope) js2-IF)
-                   (js2-loop-node-p js2-current-scope)))
-          (js2-report-error "msg.let.decl.not.in.block")
-        (js2-define-new-symbol decl-type name node)))
-
-     ((or (= decl-type js2-VAR)
-          (= decl-type js2-CONST)
-          (= decl-type js2-FUNCTION))
-      (if symbol
-          (if (and js2-strict-var-redeclaration-warning (= sdt js2-VAR))
-              (js2-add-strict-warning "msg.var.redecl" name)
-            (if (and js2-strict-var-hides-function-arg-warning (= sdt js2-LP))
-                (js2-add-strict-warning "msg.var.hides.arg" name)))
-        (js2-define-new-symbol decl-type name node)))
-
-     ((= decl-type js2-LP)
-      (if symbol
-          ;; must be duplicate parameter. Second parameter hides the
-          ;; first, so go ahead and add the second pararameter
-          (js2-report-warning "msg.dup.parms" name))
-      (js2-define-new-symbol decl-type name node))
-
-     (t (js2-code-bug)))))
-
-(defun js2-parse-expr ()
-  (let* ((pn (js2-parse-assign-expr))
-         (pos (js2-node-pos pn))
-         left
-         right
-         op-pos)
-    (while (js2-match-token js2-COMMA)
-      (setq op-pos (- js2-token-beg pos))  ; relative
-      (if (= (js2-peek-token) js2-YIELD)
-          (js2-report-error "msg.yield.parenthesized"))
-      (setq right (js2-parse-assign-expr)
-            left pn
-            pn (make-js2-infix-node :type js2-COMMA
-                                    :pos pos
-                                    :len (- js2-ts-cursor pos)
-                                    :op-pos op-pos
-                                    :left left
-                                    :right right))
-      (js2-node-add-children pn left right))
-    pn))
-
-(defun js2-parse-assign-expr ()
-  (let ((tt (js2-peek-token))
-        (pos js2-token-beg)
-        pn
-        left
-        right
-        op-pos)
-    (if (= tt js2-YIELD)
-        (js2-parse-return-or-yield tt t)
-      ;; not yield - parse assignment expression
-      (setq pn (js2-parse-cond-expr)
-            tt (js2-peek-token))
-      (when (and (<= js2-first-assign tt)
-                 (<= tt js2-last-assign))
-        (js2-consume-token)
-        (setq op-pos (- js2-token-beg pos)  ; relative
-              left pn
-              right (js2-parse-assign-expr)
-              pn (make-js2-assign-node :type tt
-                                       :pos pos
-                                       :len (- (js2-node-end right) pos)
-                                       :op-pos op-pos
-                                       :left left
-                                       :right right))
-        (when js2-parse-ide-mode
-          (js2-highlight-assign-targets pn left right)
-          (if (or (js2-function-node-p right)
-                  (js2-object-node-p right))
-              (js2-record-imenu-functions right left)))
-        ;; do this last so ide checks above can use absolute positions
-        (js2-node-add-children pn left right))
-      pn)))
-
-(defun js2-parse-cond-expr ()
-  (let ((pos js2-token-beg)
-        (pn (js2-parse-or-expr))
-        test-expr
-        if-true
-        if-false
-        q-pos
-        c-pos)
-    (when (js2-match-token js2-HOOK)
-      (setq q-pos (- js2-token-beg pos)
-            if-true (js2-parse-assign-expr))
-      (js2-must-match js2-COLON "msg.no.colon.cond")
-      (setq c-pos (- js2-token-beg pos)
-            if-false (js2-parse-assign-expr)
-            test-expr pn
-            pn (make-js2-cond-node :pos pos
-                                   :len (- (js2-node-end if-false) pos)
-                                   :test-expr test-expr
-                                   :true-expr if-true
-                                   :false-expr if-false
-                                   :q-pos q-pos
-                                   :c-pos c-pos))
-      (js2-node-add-children pn test-expr if-true if-false))
-    pn))
-
-(defun js2-make-binary (type left parser)
-  "Helper for constructing a binary-operator AST node.
-LEFT is the left-side-expression, already parsed, and the
-binary operator should have just been matched.
-PARSER is a function to call to parse the right operand,
-or a `js2-node' struct if it has already been parsed."
-  (let* ((pos (js2-node-pos left))
-         (op-pos (- js2-token-beg pos))
-         (right (if (js2-node-p parser)
-                    parser
-                  (funcall parser)))
-         (pn (make-js2-infix-node :type type
-                                  :pos pos
-                                  :len (- (js2-node-end right) pos)
-                                  :op-pos op-pos
-                                  :left left
-                                  :right right)))
-    (js2-node-add-children pn left right)
-    pn))
-
-(defun js2-parse-or-expr ()
-  (let ((pn (js2-parse-and-expr)))
-    (when (js2-match-token js2-OR)
-      (setq pn (js2-make-binary js2-OR
-                                pn
-                                'js2-parse-or-expr)))
-    pn))
-
-(defun js2-parse-and-expr ()
-  (let ((pn (js2-parse-bit-or-expr)))
-    (when (js2-match-token js2-AND)
-      (setq pn (js2-make-binary js2-AND
-                                pn
-                                'js2-parse-and-expr)))
-    pn))
-
-(defun js2-parse-bit-or-expr ()
-  (let ((pn (js2-parse-bit-xor-expr)))
-    (while (js2-match-token js2-BITOR)
-      (setq pn (js2-make-binary js2-BITOR
-                                pn
-                                'js2-parse-bit-xor-expr)))
-    pn))
-
-(defun js2-parse-bit-xor-expr ()
-  (let ((pn (js2-parse-bit-and-expr)))
-    (while (js2-match-token js2-BITXOR)
-      (setq pn (js2-make-binary js2-BITXOR
-                                pn
-                                'js2-parse-bit-and-expr)))
-    pn))
-
-(defun js2-parse-bit-and-expr ()
-  (let ((pn (js2-parse-eq-expr)))
-    (while (js2-match-token js2-BITAND)
-      (setq pn (js2-make-binary js2-BITAND
-                                pn
-                                'js2-parse-eq-expr)))
-    pn))
-
-(defconst js2-parse-eq-ops
-  (list js2-EQ js2-NE js2-SHEQ js2-SHNE))
-
-(defun js2-parse-eq-expr ()
-  (let ((pn (js2-parse-rel-expr))
-        tt)
-    (while (memq (setq tt (js2-peek-token)) js2-parse-eq-ops)
-      (js2-consume-token)
-      (setq pn (js2-make-binary tt
-                                pn
-                                'js2-parse-rel-expr)))
-    pn))
-
-(defconst js2-parse-rel-ops
-  (list js2-IN js2-INSTANCEOF js2-LE js2-LT js2-GE js2-GT))
-
-(defun js2-parse-rel-expr ()
-  (let ((pn (js2-parse-shift-expr))
-        (continue t)
-        tt)
-    (while continue
-      (setq tt (js2-peek-token))
-      (cond
-       ((and js2-in-for-init (= tt js2-IN))
-        (setq continue nil))
-       ((memq tt js2-parse-rel-ops)
-        (js2-consume-token)
-        (setq pn (js2-make-binary tt pn 'js2-parse-shift-expr)))
-       (t
-        (setq continue nil))))
-    pn))
-
-(defconst js2-parse-shift-ops
-  (list js2-LSH js2-URSH js2-RSH))
-
-(defun js2-parse-shift-expr ()
-  (let ((pn (js2-parse-add-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (if (memq tt js2-parse-shift-ops)
-          (progn
-            (js2-consume-token)
-            (setq pn (js2-make-binary tt pn 'js2-parse-add-expr)))
-        (setq continue nil)))
-    pn))
-
-(defun js2-parse-add-expr ()
-  (let ((pn (js2-parse-mul-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (if (or (= tt js2-ADD) (= tt js2-SUB))
-          (progn
-            (js2-consume-token)
-            (setq pn (js2-make-binary tt pn 'js2-parse-mul-expr)))
-        (setq continue nil)))
-    pn))
-
-(defconst js2-parse-mul-ops
-  (list js2-MUL js2-DIV js2-MOD))
-
-(defun js2-parse-mul-expr ()
-  (let ((pn (js2-parse-unary-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (if (memq tt js2-parse-mul-ops)
-          (progn
-            (js2-consume-token)
-            (setq pn (js2-make-binary tt pn 'js2-parse-unary-expr)))
-        (setq continue nil)))
-    pn))
-
-(defsubst js2-make-unary (type parser &rest args)
-  "Make a unary node of type TYPE.
-PARSER is either a node (for postfix operators) or a function to call
-to parse the operand (for prefix operators)."
-  (let* ((pos js2-token-beg)
-         (postfix (js2-node-p parser))
-         (expr (if postfix
-                   parser
-                 (apply parser args)))
-         end
-         pn)
-    (if postfix  ; e.g. i++
-        (setq pos (js2-node-pos expr)
-              end js2-token-end)
-      (setq end (js2-node-end expr)))
-    (setq pn (make-js2-unary-node :type type
-                                  :pos pos
-                                  :len (- end pos)
-                                  :operand expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defconst js2-incrementable-node-types
-  (list js2-NAME js2-GETPROP js2-GETELEM js2-GET_REF js2-CALL)
-  "Node types that can be the operand of a ++ or -- operator.")
-
-(defsubst js2-check-bad-inc-dec (tt beg end unary)
-  (unless (memq (js2-node-type (js2-unary-node-operand unary))
-                js2-incrementable-node-types)
-    (js2-report-error (if (= tt js2-INC)
-                          "msg.bad.incr"
-                        "msg.bad.decr")
-                      nil beg (- end beg))))
-
-(defun js2-parse-unary-expr ()
-  (let ((tt (js2-peek-token))
-        pn expr beg end)
-    (cond
-     ((or (= tt js2-VOID)
-          (= tt js2-NOT)
-          (= tt js2-BITNOT)
-          (= tt js2-TYPEOF))
-      (js2-consume-token)
-      (js2-make-unary tt 'js2-parse-unary-expr))
-
-     ((= tt js2-ADD)
-      (js2-consume-token)
-      ;; Convert to special POS token in decompiler and parse tree
-      (js2-make-unary js2-POS 'js2-parse-unary-expr))
-
-     ((= tt js2-SUB)
-      (js2-consume-token)
-      ;; Convert to special NEG token in decompiler and parse tree
-      (js2-make-unary js2-NEG 'js2-parse-unary-expr))
-
-     ((or (= tt js2-INC)
-          (= tt js2-DEC))
-      (js2-consume-token)
-      (prog1
-          (setq beg js2-token-beg
-                end js2-token-end
-                expr (js2-make-unary tt 'js2-parse-member-expr t))
-        (js2-check-bad-inc-dec tt beg end expr)))
-
-     ((= tt js2-DELPROP)
-      (js2-consume-token)
-      (js2-make-unary js2-DELPROP 'js2-parse-unary-expr))
-
-     ((= tt js2-ERROR)
-      (js2-consume-token)
-      (make-js2-error-node))  ; try to continue
-
-     ((and (= tt js2-LT)
-           js2-compiler-xml-available)
-      ;; XML stream encountered in expression.
-      (js2-consume-token)
-      (js2-parse-member-expr-tail t (js2-parse-xml-initializer)))
-     (t
-      (setq pn (js2-parse-member-expr t)
-            ;; Don't look across a newline boundary for a postfix incop.
-            tt (js2-peek-token-or-eol))
-      (when (or (= tt js2-INC) (= tt js2-DEC))
-        (js2-consume-token)
-        (setf expr pn
-              pn (js2-make-unary tt expr))
-        (js2-node-set-prop pn 'postfix t)
-        (js2-check-bad-inc-dec tt js2-token-beg js2-token-end pn))
-      pn))))
-
-(defun js2-parse-xml-initializer ()
-  "Parse an E4X XML initializer.
-I'm parsing it the way Rhino parses it, but without the tree-rewriting.
-Then I'll postprocess the result, depending on whether we're in IDE
-mode or codegen mode, and generate the appropriate rewritten AST.
-IDE mode uses a rich AST that models the XML structure.  Codegen mode
-just concatenates everything and makes a new XML or XMLList out of it."
-  (let ((tt (js2-get-first-xml-token))
-        pn-xml
-        pn
-        expr
-        kids
-        expr-pos
-        (continue t)
-        (first-token t))
-    (when (not (or (= tt js2-XML) (= tt js2-XMLEND)))
-      (js2-report-error "msg.syntax"))
-    (setq pn-xml (make-js2-xml-node))
-    (while continue
-      (if first-token
-          (setq first-token nil)
-        (setq tt (js2-get-next-xml-token)))
-      (cond
-       ;; js2-XML means we found a {expr} in the XML stream.
-       ;; The js2-ts-string is the XML up to the left-curly.
-       ((= tt js2-XML)
-        (push (make-js2-string-node :pos js2-token-beg
-                                    :len (- js2-ts-cursor js2-token-beg))
-              kids)
-        (js2-must-match js2-LC "msg.syntax")
-        (setq expr-pos js2-ts-cursor
-              expr (if (eq (js2-peek-token) js2-RC)
-                       (make-js2-empty-expr-node :pos expr-pos)
-                     (js2-parse-expr)))
-        (js2-must-match js2-RC "msg.syntax")
-        (setq pn (make-js2-xml-js-expr-node :pos (js2-node-pos expr)
-                                            :len (js2-node-len expr)
-                                            :expr expr))
-        (js2-node-add-children pn expr)
-        (push pn kids))
-
-       ;; a js2-XMLEND token means we hit the final close-tag.
-       ((= tt js2-XMLEND)
-        (push (make-js2-string-node :pos js2-token-beg
-                                    :len (- js2-ts-cursor js2-token-beg))
-              kids)
-        (dolist (kid (nreverse kids))
-          (js2-block-node-push pn-xml kid))
-        (setf (js2-node-len pn-xml) (- js2-ts-cursor
-                                       (js2-node-pos pn-xml))
-              continue nil))
-       (t
-        (js2-report-error "msg.syntax")
-        (setq continue nil))))
-    pn-xml))
-
-
-(defun js2-parse-argument-list ()
-  "Parse an argument list and return it as a lisp list of nodes.
-Returns the list in reverse order.  Consumes the right-paren token."
-  (let (result)
-    (unless (js2-match-token js2-RP)
-      (loop do
-            (if (= (js2-peek-token) js2-YIELD)
-                (js2-report-error "msg.yield.parenthesized"))
-            (push (js2-parse-assign-expr) result)
-            while
-            (js2-match-token js2-COMMA))
-      (js2-must-match js2-RP "msg.no.paren.arg")
-      result)))
-
-(defun js2-parse-member-expr (&optional allow-call-syntax)
-  (let ((tt (js2-peek-token))
-        pn
-        pos
-        target
-        args
-        beg
-        end
-        init
-        tail)
-    (if (/= tt js2-NEW)
-        (setq pn (js2-parse-primary-expr))
-      ;; parse a 'new' expression
-      (js2-consume-token)
-      (setq pos js2-token-beg
-            beg pos
-            target (js2-parse-member-expr)
-            end (js2-node-end target)
-            pn (make-js2-new-node :pos pos
-                                  :target target
-                                  :len (- end pos)))
-      (js2-node-add-children pn target)
-      (when (js2-match-token js2-LP)
-        ;; Add the arguments to pn, if any are supplied.
-        (setf beg pos  ; start of "new" keyword
-              pos js2-token-beg
-              args (nreverse (js2-parse-argument-list))
-              (js2-new-node-args pn) args
-              end js2-token-end
-              (js2-new-node-lp pn) (- pos beg)
-              (js2-new-node-rp pn) (- end 1 beg))
-        (apply #'js2-node-add-children pn args))
-
-      (when (and js2-allow-rhino-new-expr-initializer
-                 (js2-match-token js2-LC))
-        (setf init (js2-parse-object-literal)
-              end (js2-node-end init)
-              (js2-new-node-initializer pn) init)
-        (js2-node-add-children pn init))
-
-        (setf (js2-node-len pn) (- beg pos)))  ; end outer if
-
-    (js2-parse-member-expr-tail allow-call-syntax pn)))
-
-(defun js2-parse-member-expr-tail (allow-call-syntax pn)
-  "Parse a chain of property/array accesses or function calls.
-Includes parsing for E4X operators like `..' and `.@'.
-If ALLOW-CALL-SYNTAX is nil, stops when we encounter a left-paren.
-Returns an expression tree that includes PN, the parent node."
-  (let ((beg (js2-node-pos pn))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (cond
-       ((or (= tt js2-DOT) (= tt js2-DOTDOT))
-        (setq pn (js2-parse-property-access tt pn)))
-
-       ((= tt js2-DOTQUERY)
-        (setq pn (js2-parse-dot-query pn)))
-
-       ((= tt js2-LB)
-        (setq pn (js2-parse-element-get pn)))
-
-       ((= tt js2-LP)
-        (if allow-call-syntax
-            (setq pn (js2-parse-function-call pn))
-          (setq continue nil)))
-       (t
-        (setq continue nil))))
-    (if (>= js2-highlight-level 2)
-        (js2-parse-highlight-member-expr-node pn))
-    pn))
-
-(defun js2-parse-dot-query (pn)
-  "Parse a dot-query expression, e.g. foo.bar.(@name == 2)
-Last token parsed must be `js2-DOTQUERY'."
-  (let ((pos (js2-node-pos pn))
-        op-pos
-        expr
-        end)
-    (js2-consume-token)
-    (js2-must-have-xml)
-    (js2-set-requires-activation)
-    (setq op-pos js2-token-beg
-          expr (js2-parse-expr)
-          end (js2-node-end expr)
-          pn (make-js2-xml-dot-query-node :left pn
-                                          :pos pos
-                                          :op-pos op-pos
-                                          :right expr))
-    (js2-node-add-children pn
-                           (js2-xml-dot-query-node-left pn)
-                           (js2-xml-dot-query-node-right pn))
-    (if (js2-must-match js2-RP "msg.no.paren")
-        (setf (js2-xml-dot-query-node-rp pn) js2-token-beg
-              end js2-token-end))
-    (setf (js2-node-len pn) (- end pos))
-    pn))
-
-(defun js2-parse-element-get (pn)
-  "Parse an element-get expression, e.g. foo[bar].
-Last token parsed must be `js2-RB'."
-  (let ((lb js2-token-beg)
-        (pos (js2-node-pos pn))
-        rb
-        expr)
-    (js2-consume-token)
-    (setq expr (js2-parse-expr))
-    (if (js2-must-match js2-RB "msg.no.bracket.index")
-        (setq rb js2-token-beg))
-    (setq pn (make-js2-elem-get-node :target pn
-                                     :pos pos
-                                     :element expr
-                                     :lb (js2-relpos lb pos)
-                                     :rb (js2-relpos rb pos)
-                                     :len (- js2-token-end pos)))
-    (js2-node-add-children pn
-                           (js2-elem-get-node-target pn)
-                           (js2-elem-get-node-element pn))
-    pn))
-
-(defun js2-parse-function-call (pn)
-  (let (args
-        (pos (js2-node-pos pn)))
-    (js2-consume-token)
-    (setq pn (make-js2-call-node :pos pos
-                                 :target pn
-                                 :lp (- js2-token-beg pos)))
-    (js2-node-add-children pn (js2-call-node-target pn))
-
-    ;; Add the arguments to pn, if any are supplied.
-    (setf args (nreverse (js2-parse-argument-list))
-          (js2-call-node-rp pn) (- js2-token-beg pos)
-          (js2-call-node-args pn) args)
-    (apply #'js2-node-add-children pn args)
-
-    (setf (js2-node-len pn) (- js2-ts-cursor pos))
-    pn))
-
-(defun js2-parse-property-access (tt pn)
-  "Parse a property access, XML descendants access, or XML attr access."
-  (let ((member-type-flags 0)
-        (dot-pos js2-token-beg)
-        (dot-len (if (= tt js2-DOTDOT) 2 1))
-        name
-        ref  ; right side of . or .. operator
-        result)
-    (js2-consume-token)
-    (when (= tt js2-DOTDOT)
-      (js2-must-have-xml)
-      (setq member-type-flags js2-descendants-flag))
-    (if (not js2-compiler-xml-available)
-        (progn
-          (js2-must-match-prop-name "msg.no.name.after.dot")
-          (setq name (js2-create-name-node t js2-GETPROP)
-                result (make-js2-prop-get-node :left pn
-                                               :pos js2-token-beg
-                                               :right name
-                                               :len (- js2-token-end
-                                                       js2-token-beg)))
-          (js2-node-add-children result pn name)
-          result)
-      ;; otherwise look for XML operators
-      (setf result (if (= tt js2-DOT)
-                       (make-js2-prop-get-node)
-                     (make-js2-infix-node :type js2-DOTDOT))
-            (js2-node-pos result) (js2-node-pos pn)
-            (js2-infix-node-op-pos result) dot-pos
-            (js2-infix-node-left result) pn  ; do this after setting position
-            tt (js2-next-token))
-      (cond
-       ;; needed for generator.throw()
-       ((= tt js2-THROW)
-        (js2-save-name-token-data js2-token-beg "throw")
-        (setq ref (js2-parse-property-name nil js2-ts-string member-type-flags)))
-
-       ;; handles: name, ns::name, ns::*, ns::[expr]
-       ((js2-valid-prop-name-token tt)
-        (setq ref (js2-parse-property-name -1 js2-ts-string member-type-flags)))
-
-       ;; handles: *, *::name, *::*, *::[expr]
-       ((= tt js2-MUL)
-        (js2-save-name-token-data js2-token-beg "*")
-        (setq ref (js2-parse-property-name nil "*" member-type-flags)))
-
-       ;; handles: '@attr', '@ns::attr', '@ns::*', '@ns::[expr]', etc.
-       ((= tt js2-XMLATTR)
-        (setq result (js2-parse-attribute-access)))
-
-       (t
-        (js2-report-error "msg.no.name.after.dot" nil dot-pos dot-len)))
-
-      (if ref
-          (setf (js2-node-len result) (- (js2-node-end ref)
-                                         (js2-node-pos result))
-                (js2-infix-node-right result) ref))
-      (if (js2-infix-node-p result)
-          (js2-node-add-children result
-                                 (js2-infix-node-left result)
-                                 (js2-infix-node-right result)))
-      result)))
-
-(defun js2-parse-attribute-access ()
-  "Parse an E4X XML attribute expression.
-This includes expressions of the forms:
-
-  @attr      @ns::attr     @ns::*
-  @*         @*::attr      @*::*
-  @[expr]    @*::[expr]    @ns::[expr]
-
-Called if we peeked an '@' token."
-  (let ((tt (js2-next-token))
-        (at-pos js2-token-beg))
-    (cond
-     ;; handles: @name, @ns::name, @ns::*, @ns::[expr]
-     ((js2-valid-prop-name-token tt)
-      (js2-parse-property-name at-pos js2-ts-string 0))
-
-     ;; handles: @*, @*::name, @*::*, @*::[expr]
-     ((= tt js2-MUL)
-      (js2-save-name-token-data js2-token-beg "*")
-      (js2-parse-property-name js2-token-beg "*" 0))
-
-     ;; handles @[expr]
-     ((= tt js2-LB)
-      (js2-parse-xml-elem-ref at-pos))
-
-     (t
-      (js2-report-error "msg.no.name.after.xmlAttr")
-      ;; Avoid cascaded errors that happen if we make an error node here.
-      (js2-save-name-token-data js2-token-beg "")
-      (js2-parse-property-name js2-token-beg "" 0)))))
-
-(defun js2-parse-property-name (at-pos s member-type-flags)
-  "Check if :: follows name in which case it becomes qualified name.
-
-AT-POS is a natural number if we just read an '@' token, else nil.
-S is the name or string that was matched:  an identifier, 'throw' or '*'.
-MEMBER-TYPE-FLAGS is a bit set tracking whether we're a '.' or '..' child.
-
-Returns a `js2-xml-ref-node' if it's an attribute access, a child of a '..'
-operator, or the name is followed by ::.  For a plain name, returns a
-`js2-name-node'.  Returns a `js2-error-node' for malformed XML expressions."
-  (let ((pos (or at-pos js2-token-beg))
-        colon-pos
-        (name (js2-create-name-node t js2-current-token))
-        ns
-        tt
-        ref
-        pn)
-    (catch 'return
-      (when (js2-match-token js2-COLONCOLON)
-        (setq ns name
-              colon-pos js2-token-beg
-              tt (js2-next-token))
-        (cond
-         ;; handles name::name
-         ((js2-valid-prop-name-token tt)
-          (setq name (js2-create-name-node)))
-
-         ;; handles name::*
-         ((= tt js2-MUL)
-          (js2-save-name-token-data js2-token-beg "*")
-          (setq name (js2-create-name-node)))
-
-         ;; handles name::[expr]
-         ((= tt js2-LB)
-          (throw 'return (js2-parse-xml-elem-ref at-pos ns colon-pos)))
-
-         (t
-          (js2-report-error "msg.no.name.after.coloncolon"))))
-
-      (if (and (null ns) (zerop member-type-flags))
-          name
-        (prog1
-            (setq pn
-                  (make-js2-xml-prop-ref-node :pos pos
-                                              :len (- (js2-node-end name) pos)
-                                              :at-pos at-pos
-                                              :colon-pos colon-pos
-                                              :propname name))
-          (js2-node-add-children pn name))))))
-
-(defun js2-parse-xml-elem-ref (at-pos &optional namespace colon-pos)
-  "Parse the [expr] portion of an xml element reference.
-For instance, @[expr], @*::[expr], or ns::[expr]."
-  (let* ((lb js2-token-beg)
-         (pos (or at-pos lb))
-         rb
-         (expr (js2-parse-expr))
-         (end (js2-node-end expr))
-         pn)
-    (if (js2-must-match js2-RB "msg.no.bracket.index")
-        (setq rb js2-token-beg
-              end js2-token-end))
-    (prog1
-        (setq pn
-              (make-js2-xml-elem-ref-node :pos pos
-                                          :len (- end pos)
-                                          :namespace namespace
-                                          :colon-pos colon-pos
-                                          :at-pos at-pos
-                                          :expr expr
-                                          :lb (js2-relpos lb pos)
-                                          :rb (js2-relpos rb pos)))
-      (js2-node-add-children pn namespace expr))))
-
-(defun js2-parse-primary-expr ()
-  "Parses a literal (leaf) expression of some sort.
-Includes complex literals such as functions, object-literals,
-array-literals, array comprehensions and regular expressions."
-  (let ((tt-flagged (js2-next-flagged-token))
-        pn      ; parent node  (usually return value)
-        tt
-        px-pos  ; paren-expr pos
-        len
-        flags   ; regexp flags
-        expr)
-    (setq tt js2-current-token)
-    (cond
-     ((= tt js2-FUNCTION)
-      (js2-parse-function 'FUNCTION_EXPRESSION))
-
-     ((= tt js2-LB)
-      (js2-parse-array-literal))
-
-     ((= tt js2-LC)
-      (js2-parse-object-literal))
-
-     ((= tt js2-LET)
-      (js2-parse-let js2-token-beg))
-
-     ((= tt js2-LP)
-      (setq px-pos js2-token-beg
-            expr (js2-parse-expr))
-      (js2-must-match js2-RP "msg.no.paren")
-      (setq pn (make-js2-paren-node :pos px-pos
-                                    :expr expr
-                                    :len (- js2-token-end px-pos)))
-      (js2-node-add-children pn (js2-paren-node-expr pn))
-      pn)
-
-     ((= tt js2-XMLATTR)
-      (js2-must-have-xml)
-      (js2-parse-attribute-access))
-
-     ((= tt js2-NAME)
-      (js2-parse-name tt-flagged tt))
-
-     ((= tt js2-NUMBER)
-      (make-js2-number-node))
-
-     ((= tt js2-STRING)
-      (prog1
-          (make-js2-string-node)
-        (js2-record-face 'font-lock-string-face)))
-
-     ((or (= tt js2-DIV) (= tt js2-ASSIGN_DIV))
-      ;; Got / or /= which in this context means a regexp literal
-      (setq px-pos js2-token-beg)
-      (js2-read-regexp tt)
-      (setq flags js2-ts-regexp-flags
-            js2-ts-regexp-flags nil)
-      (prog1
-          (make-js2-regexp-node :pos px-pos
-                                :len (- js2-ts-cursor px-pos)
-                                :value js2-ts-string
-                                :flags flags)
-        (js2-set-face px-pos js2-ts-cursor 'font-lock-string-face 'record)))
-
-     ((or (= tt js2-NULL)
-          (= tt js2-THIS)
-          (= tt js2-FALSE)
-          (= tt js2-TRUE))
-      (make-js2-keyword-node :type tt))
-
-     ((= tt js2-RESERVED)
-      (js2-report-error "msg.reserved.id")
-      (make-js2-name-node))
-
-     ((= tt js2-ERROR)
-      ;; the scanner or one of its subroutines reported the error.
-      (make-js2-error-node))
-
-     ((= tt js2-EOF)
-      (setq px-pos (point-at-bol)
-            len (- js2-ts-cursor px-pos))
-      (js2-report-error "msg.unexpected.eof" nil px-pos len)
-      (make-js2-error-node :pos px-pos :len len))
-
-     (t
-      (js2-report-error "msg.syntax")
-      (make-js2-error-node)))))
-
-(defun js2-parse-name (tt-flagged tt)
-  (let ((name js2-ts-string)
-        (name-pos js2-token-beg))
-      (if (and (js2-flag-set-p tt-flagged js2-ti-check-label)
-               (= (js2-peek-token) js2-COLON))
-          (prog1
-            ;; Do not consume colon, it is used as unwind indicator
-            ;; to return to statementHelper.
-            (make-js2-label-node :pos name-pos
-                                 :len (- js2-token-end name-pos)
-                                 :name name)
-            (js2-set-face name-pos
-                          js2-token-end
-                          'font-lock-variable-name-face 'record))
-        ;; Otherwise not a label, just a name.  Unfortunately peeking
-        ;; the next token to check for a colon has biffed js2-token-beg
-        ;; and js2-token-end.  We store the name's bounds in buffer vars
-        ;; and `js2-create-name-node' uses them.
-        (js2-save-name-token-data name-pos name)
-        (if js2-compiler-xml-available
-            (js2-parse-property-name nil name 0)
-          (js2-create-name-node 'check-activation)))))
-
-(defsubst js2-parse-warn-trailing-comma (msg pos elems comma-pos)
-  (js2-add-strict-warning
-   msg nil
-   ;; back up from comma to beginning of line or array/objlit
-   (max (if elems
-            (js2-node-pos (car elems))
-          pos)
-        (save-excursion
-          (goto-char comma-pos)
-          (back-to-indentation)
-          (point)))
-   comma-pos))
-
-(defun js2-parse-array-literal ()
-  (let ((pos js2-token-beg)
-        (end js2-token-end)
-        (after-lb-or-comma t)
-        after-comma
-        tt
-        elems
-        pn
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (cond
-       ;; comma
-       ((= tt js2-COMMA)
-        (js2-consume-token)
-        (setq after-comma js2-token-end)
-        (if (not after-lb-or-comma)
-            (setq after-lb-or-comma t)
-          (push nil elems)))
-
-       ;; end of array
-       ((or (= tt js2-RB)
-            (= tt js2-EOF))  ; prevent infinite loop
-        (if (= tt js2-EOF)
-            (js2-report-error "msg.no.bracket.arg" nil pos)
-          (js2-consume-token))
-        (setq continue nil
-              end js2-token-end
-              pn (make-js2-array-node :pos pos
-                                      :len (- js2-ts-cursor pos)
-                                      :elems (nreverse elems)))
-        (apply #'js2-node-add-children pn (js2-array-node-elems pn))
-        (when after-comma
-          (js2-parse-warn-trailing-comma "msg.array.trailing.comma"
-                                         pos elems after-comma)))
-
-       ;; array comp
-       ((and (>= js2-language-version 170)
-             (= tt js2-FOR)          ; check for array comprehension
-             (not after-lb-or-comma) ; "for" can't follow a comma
-             elems                   ; must have at least 1 element
-             (not (cdr elems)))      ; but no 2nd element
-        (setf continue nil
-              pn (js2-parse-array-comprehension (car elems) pos)))
-
-       ;; another element
-       (t
-        (unless after-lb-or-comma
-          (js2-report-error "msg.no.bracket.arg"))
-        (push (js2-parse-assign-expr) elems)
-        (setq after-lb-or-comma nil
-              after-comma nil))))
-    pn))
-
-(defun js2-parse-array-comprehension (expr pos)
-  "Parse a JavaScript 1.7 Array Comprehension.
-EXPR is the first expression after the opening left-bracket.
-POS is the beginning of the LB token preceding EXPR.
-We should have just parsed the 'for' keyword before calling this function."
-  (let (loops
-        filter
-        if-pos
-        result)
-    (while (= (js2-peek-token) js2-FOR)
-      (push (js2-parse-array-comp-loop) loops))
-    (when (= (js2-peek-token) js2-IF)
-      (js2-consume-token)
-      (setq if-pos (- js2-token-beg pos)  ; relative
-            filter (js2-parse-condition)))
-    (js2-must-match js2-RB "msg.no.bracket.arg" pos)
-    (setq result (make-js2-array-comp-node :pos pos
-                                           :len (- js2-ts-cursor pos)
-                                           :result expr
-                                           :loops (nreverse loops)
-                                           :filter (car filter)
-                                           :lp (js2-relpos (second filter) pos)
-                                           :rp (js2-relpos (third filter) pos)
-                                           :if-pos if-pos))
-    (apply #'js2-node-add-children result expr (car filter)
-           (js2-array-comp-node-loops result))
-    result))
-
-(defun js2-parse-array-comp-loop ()
-  "Parse a 'for [each] (foo in bar)' expression in an Array comprehension.
-Last token peeked should be the initial FOR."
-  (let ((pos js2-token-beg)
-        (pn (make-js2-array-comp-loop-node))
-        tt
-        iter
-        obj
-        foreach-p
-        in-pos
-        each-pos
-        lp
-        rp)
-    (assert (= (js2-next-token) js2-FOR))  ; consumes token
-    (js2-push-scope pn)
-    (unwind-protect
-        (progn
-          (when (js2-match-token js2-NAME)
-            (if (string= js2-ts-string "each")
-                (progn
-                  (setq foreach-p t
-                        each-pos (- js2-token-beg pos)) ; relative
-                  (js2-record-face 'font-lock-keyword-face))
-              (js2-report-error "msg.no.paren.for")))
-
-          (if (js2-must-match js2-LP "msg.no.paren.for")
-              (setq lp (- js2-token-beg pos)))
-
-          (setq tt (js2-peek-token))
-          (cond
-           ((or (= tt js2-LB)
-                (= tt js2-LC))
-            ;; handle destructuring assignment
-            (setq iter (js2-parse-primary-expr)))
-
-           ((js2-valid-prop-name-token tt)
-            (js2-consume-token)
-            (setq iter (js2-create-name-node)))
-
-           (t
-            (js2-report-error "msg.bad.var")))
-
-          ;; Define as a let since we want the scope of the variable to
-          ;; be restricted to the array comprehension
-          (if (js2-name-node-p iter)
-              (js2-define-symbol js2-LET (js2-name-node-name iter) pn t))
-
-          (if (js2-must-match js2-IN "msg.in.after.for.name")
-              (setq in-pos (- js2-token-beg pos)))
-
-          (setq obj (js2-parse-expr))
-          (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
-              (setq rp (- js2-token-beg pos)))
-
-          (setf (js2-node-pos pn) pos
-                (js2-node-len pn) (- js2-ts-cursor pos)
-                (js2-array-comp-loop-node-iterator pn) iter
-                (js2-array-comp-loop-node-object pn) obj
-                (js2-array-comp-loop-node-in-pos pn) in-pos
-                (js2-array-comp-loop-node-each-pos pn) each-pos
-                (js2-array-comp-loop-node-foreach-p pn) foreach-p
-                (js2-array-comp-loop-node-lp pn) lp
-                (js2-array-comp-loop-node-rp pn) rp)
-          (js2-node-add-children pn iter obj))
-      (js2-pop-scope))
-    pn))
-
-(defun js2-parse-object-literal ()
-  (let ((pos js2-token-beg)
-        tt
-        elems
-        result
-        after-comma
-        (continue t))
-    (while continue
-      (setq tt (js2-peek-token))
-      (cond
-       ;; {foo: ...}, {'foo': ...}, {get foo() {...}}, or {set foo(x) {...}}
-       ((or (js2-valid-prop-name-token tt)
-            (= tt js2-STRING))
-        (setq after-comma nil
-              result (js2-parse-named-prop tt))
-        (if (and (null result)
-                 (not js2-recover-from-parse-errors))
-            (setq continue nil)
-          (push result elems)))
-
-       ;; {12: x} or {10.7: x}
-       ((= tt js2-NUMBER)
-        (js2-consume-token)
-        (setq after-comma nil)
-        (push (js2-parse-plain-property (make-js2-number-node)) elems))
-
-       ;; trailing comma
-       ((= tt js2-RC)
-        (setq continue nil)
-        (if after-comma
-            (js2-parse-warn-trailing-comma "msg.extra.trailing.comma"
-                                           pos elems after-comma)))
-       (t
-        (js2-report-error "msg.bad.prop")
-        (unless js2-recover-from-parse-errors
-          (setq continue nil))))         ; end switch
-
-      (if (js2-match-token js2-COMMA)
-          (setq after-comma js2-token-end)
-        (setq continue nil)))           ; end loop
-
-    (js2-must-match js2-RC "msg.no.brace.prop")
-    (setq result (make-js2-object-node :pos pos
-                                       :len (- js2-ts-cursor pos)
-                                       :elems (nreverse elems)))
-    (apply #'js2-node-add-children result (js2-object-node-elems result))
-    result))
-
-(defun js2-parse-named-prop (tt)
-  "Parse a name, string, or getter/setter object property."
-  (js2-consume-token)
-  (let ((string-prop (and (= tt js2-STRING)
-                          (make-js2-string-node)))
-        expr
-        (ppos js2-token-beg)
-        (pend js2-token-end)
-        (name (js2-create-name-node))
-        (prop js2-ts-string))
-
-    (if (and (= tt js2-NAME)
-             (= (js2-peek-token) js2-NAME)
-             (or (string= prop "get")
-                 (string= prop "set")))
-        (progn
-          ;; getter/setter prop
-          (js2-consume-token)
-          (js2-set-face ppos pend 'font-lock-keyword-face 'record)  ; get/set
-          (js2-record-face 'font-lock-function-name-face)      ; for peeked name
-          (setq name (js2-create-name-node)) ; discard get/set & use peeked name
-          (js2-parse-getter-setter-prop ppos name (string= prop "get")))
-
-      ;; regular prop
-      (prog1
-          (setq expr (js2-parse-plain-property (or string-prop name)))
-        (js2-set-face ppos pend
-                      (if (js2-function-node-p
-                           (js2-object-prop-node-right expr))
-                          'font-lock-function-name-face
-                        'font-lock-variable-name-face)
-                      'record)))))
-
-(defun js2-parse-plain-property (prop)
-  "Parse a non-getter/setter property in an object literal.
-PROP is the node representing the property:  a number, name or string."
-  (js2-must-match js2-COLON "msg.no.colon.prop")
-  (let* ((pos (js2-node-pos prop))
-        (colon (- js2-token-beg pos))
-        (expr (js2-parse-assign-expr))
-        (result (make-js2-object-prop-node
-                 :pos pos
-                 ;; don't include last consumed token in length
-                 :len (- (+ (js2-node-pos expr)
-                            (js2-node-len expr))
-                         pos)
-                 :left prop
-                 :right expr
-                 :op-pos colon)))
-    (js2-node-add-children result prop expr)
-    result))
-
-(defun js2-parse-getter-setter-prop (pos prop get-p)
-  "Parse getter or setter property in an object literal.
-JavaScript syntax is:
-
-  { get foo() {...}, set foo(x) {...} }
-
-POS is the start position of the `get' or `set' keyword.
-PROP is the `js2-name-node' representing the property name.
-GET-P is non-nil if the keyword was `get'."
-  (let ((type (if get-p js2-GET js2-SET))
-        result
-        end
-        (fn (js2-parse-function 'FUNCTION_EXPRESSION)))
-
-    ;; it has to be an anonymous function, as we already parsed the name
-    (if (/= (js2-node-type fn) js2-FUNCTION)
-        (js2-report-error "msg.bad.prop")
-      (if (plusp (length (js2-function-name fn)))
-          (js2-report-error "msg.bad.prop")))
-
-    (js2-node-set-prop fn 'GETTER_SETTER type)  ; for codegen
-    (setq end (js2-node-end fn)
-          result (make-js2-getter-setter-node :type type
-                                              :pos pos
-                                              :len (- end pos)
-                                              :left prop
-                                              :right fn))
-    (js2-node-add-children result prop fn)
-    result))
-
-(defun js2-create-name-node (&optional check-activation-p token)
-  "Create a name node using the token info from last scanned name.
-In some cases we need to either synthesize a name node, or we lost
-the name token information by peeking.  If the TOKEN parameter is
-not `js2-NAME', then we use the token info saved in instance vars."
-  (let ((beg js2-token-beg)
-        (s js2-ts-string)
-        name)
-    (when (/= js2-current-token js2-NAME)
-      (setq beg (or js2-prev-name-token-start js2-ts-cursor)
-            s js2-prev-name-token-string
-            js2-prev-name-token-start nil
-            js2-prev-name-token-string nil))
-    (setq name (make-js2-name-node :pos beg
-                                   :name s
-                                   :len (length s)))
-    (if check-activation-p
-        (js2-check-activation-name s (or token js2-NAME)))
-    name))
-
-(provide 'js2-parse)
-
-;;; js2-parse.el ends here
-;;; js2-indent.el --- indentation for js2-mode
-;;
-;; Copyright (C) 2008 Steve Yegge
-;; Author:  Steve Yegge (steve.yegge@gmail.com)
-;; Maintainer:  Steve Yegge (steve.yegge@gmail.com)
-
-;; Commentary:
-;;
-;; This indenter is based on Karl Landström's "javascript.el" indenter.
-;; Karl cleverly deduces that the desired indentation level is often a
-;; function of paren/bracket/brace nesting depth, which can be determined
-;; quickly via the built-in `parse-partial-sexp' function.  His indenter
-;; then does some equally clever checks to see if we're in the context of a
-;; substatement of a possibly braceless statement keyword such as if, while,
-;; or finally.  This approach yields pretty good results.
-;;
-;; The indenter is often "wrong", however, and needs to be overridden.
-;; The right long-term solution is probably to emulate (or modify)
-;; cc-engine, but it's thousands upon thousands of lines of code.  Even
-;; if you were to assume the accurate parse tree from `js2-parse' is
-;; present, indentation is still thousands of lines of code (I've been
-;; down that path) to handle every possible syntactic edge case, and in
-;; any case, relying on the parse tree is undesirable because parsing is
-;; slow.  So you might as well go the cc-engine approach, but it's a
-;; huge pile of work that I'm just not up for any time soon.
-;;
-;; In the meantime, the compromise solution is that we offer a
-;; "bounce indenter", configured with `js2-bounce-indent-flag', which
-;; cycles the current line indent among various likely guess points.
-;; This approach is far from perfect, but should at least make it
-;; slightly easier to move the line towards its desired indentation
-;; when manually overriding Karl's heuristic nesting guesser.
-;;
-;; I've made miscellaneous tweaks to Karl's code to handle some Ecma
-;; extensions such as `let' and Array comprehensions, and will likely
-;; make further tweaks to it, but major kudos to Karl for coming up with
-;; the initial approach, which packs a lot of punch for so little code.
-
-;;; Code:
-
-(defconst js-possibly-braceless-keyword-re
-  (regexp-opt
-   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with" "let")
-   'words)
-  "Regular expression matching keywords that are optionally
-followed by an opening brace.")
-
-(defconst js-indent-operator-re
-  (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
-          (regexp-opt '("in" "instanceof") 'words))
-  "Regular expression matching operators that affect indentation
-of continued expressions.")
-
-;; This function has horrible results if you're typing an array
-;; such as [[1, 2], [3, 4], [5, 6]].  Bounce indenting -really- sucks
-;; in conjunction with electric-indent, so just disabling it.
-(defsubst js2-code-at-bol-p ()
-  "Return t if the first character on line is non-whitespace."
-  nil)
-;;        (not (memq (char-after (point-at-bol))
-;;                   '(? ?\t)))))
-
-(defun js2-insert-and-indent (key)
-  "Run command bound to key and indent current line. Runs the command
-bound to KEY in the global keymap and indents the current line."
-  (interactive (list (this-command-keys)))
-  (let ((cmd (lookup-key (current-global-map) key)))
-    (if (commandp cmd)
-        (call-interactively cmd)))
-  ;; don't do the electric keys inside comments or strings,
-  ;; and don't do bounce-indent with them.
-  (let ((parse-state (parse-partial-sexp (point-min) (point)))
-        (js2-bounce-indent-flag (js2-code-at-bol-p)))
-    (unless (or (nth 3 parse-state)
-                (nth 4 parse-state))
-      (indent-according-to-mode))))
-
-(defun js-re-search-forward-inner (regexp &optional bound count)
-  "Auxiliary function for `js-re-search-forward'."
-  (let ((parse)
-        (saved-point (point-min)))
-    (while (> count 0)
-      (re-search-forward regexp bound)
-      (setq parse (parse-partial-sexp saved-point (point)))
-      (cond ((nth 3 parse)
-             (re-search-forward
-              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
-              (save-excursion (end-of-line) (point)) t))
-            ((nth 7 parse)
-             (forward-line))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
-             (re-search-forward "\\*/"))
-            (t
-             (setq count (1- count))))
-      (setq saved-point (point))))
-  (point))
-
-(defun js-re-search-forward (regexp &optional bound noerror count)
-  "Search forward but ignore strings and comments. Invokes
-`re-search-forward' but treats the buffer as if strings and
-comments have been removed."
-  (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js-re-search-forward-inner regexp bound 1))
-               ((< count 0)
-                '(js-re-search-backward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js-re-search-forward-inner regexp bound count)))))
-    (condition-case err
-        (eval search-expr)
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-(defun js-re-search-backward-inner (regexp &optional bound count)
-  "Auxiliary function for `js-re-search-backward'."
-  (let ((parse)
-        (saved-point (point-min)))
-    (while (> count 0)
-      (re-search-backward regexp bound)
-      (setq parse (parse-partial-sexp saved-point (point)))
-      (cond ((nth 3 parse)
-             (re-search-backward
-              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
-              (save-excursion (beginning-of-line) (point)) t))
-            ((nth 7 parse)
-             (goto-char (nth 8 parse)))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
-             (re-search-backward "/\\*"))
-            (t
-             (setq count (1- count))))))
-  (point))
-
-(defun js-re-search-backward (regexp &optional bound noerror count)
-  "Search backward but ignore strings and comments. Invokes
-`re-search-backward' but treats the buffer as if strings and
-comments have been removed."
-  (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js-re-search-backward-inner regexp bound 1))
-               ((< count 0)
-                '(js-re-search-forward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js-re-search-backward-inner regexp bound count)))))
-    (condition-case err
-        (eval search-expr)
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-(defun js-looking-at-operator-p ()
-  "Return non-nil if text after point is an operator (that is not
-a comma)."
-  (save-match-data
-    (and (looking-at js-indent-operator-re)
-         (or (not (looking-at ":"))
-             (save-excursion
-               (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
-                    (looking-at "?")))))))
-
-(defun js-continued-expression-p ()
-  "Returns non-nil if the current line continues an expression."
-  (save-excursion
-    (back-to-indentation)
-    (or (js-looking-at-operator-p)
-        (and (js-re-search-backward "\n" nil t)
-	     (progn
-	       (skip-chars-backward " \t")
-	       (backward-char)
-	       (and (js-looking-at-operator-p)
-		    (and (progn (backward-char)
-				(not (looking-at "\\*\\|++\\|--\\|/[/*]"))))))))))
-
-(defun js-end-of-do-while-loop-p ()
-  "Returns non-nil if word after point is `while' of a do-while
-statement, else returns nil. A braceless do-while statement
-spanning several lines requires that the start of the loop is
-indented to the same column as the current line."
-  (interactive)
-  (save-excursion
-    (save-match-data
-      (when (looking-at "\\s-*\\<while\\>")
-	(if (save-excursion
-	      (skip-chars-backward "[ \t\n]*}")
-	      (looking-at "[ \t\n]*}"))
-	    (save-excursion
-	      (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
-	  (js-re-search-backward "\\<do\\>" (point-at-bol) t)
-	  (or (looking-at "\\<do\\>")
-	      (let ((saved-indent (current-indentation)))
-		(while (and (js-re-search-backward "^[ \t]*\\<" nil t)
-			    (/= (current-indentation) saved-indent)))
-		(and (looking-at "[ \t]*\\<do\\>")
-		     (not (js-re-search-forward
-			   "\\<while\\>" (point-at-eol) t))
-		     (= (current-indentation) saved-indent)))))))))
-
-(defun js-ctrl-statement-indentation ()
-  "Returns the proper indentation of the current line if it
-starts the body of a control statement without braces, else
-returns nil."
-  (let (forward-sexp-function)  ; temporarily unbind it
-    (save-excursion
-      (back-to-indentation)
-      (when (save-excursion
-              (and (not (js2-same-line (point-min)))
-                   (not (looking-at "{"))
-                   (js-re-search-backward "[[:graph:]]" nil t)
-                   (not (looking-at "[{([]"))
-                   (progn
-                     (forward-char)
-                     ;; scan-sexps sometimes throws an error
-                     (ignore-errors (backward-sexp))
-                     (when (looking-at "(") (backward-word 1))
-                     (and (save-excursion
-                            (skip-chars-backward " \t}" (point-at-bol))
-                            (bolp))
-                          (looking-at js-possibly-braceless-keyword-re)
-                          (not (js-end-of-do-while-loop-p))))))
-        (save-excursion
-          (goto-char (match-beginning 0))
-          (+ (current-indentation) js2-basic-offset))))))
-
-(defun js2-indent-in-array-comp (parse-status)
-  "Return non-nil if we think we're in an array comprehension.
-In particular, return the buffer position of the first `for' kwd."
-  (let ((end (point)))
-    (when (nth 1 parse-status)
-      (save-excursion
-        (goto-char (nth 1 parse-status))
-        (when (looking-at "\\[")
-          (forward-char 1)
-          (js2-forward-sws)
-          (if (looking-at "[[{]")
-              (let (forward-sexp-function) ; use lisp version
-                (forward-sexp)             ; skip destructuring form
-                (js2-forward-sws)
-                (if (and (/= (char-after) ?,) ; regular array
-                         (looking-at "for"))
-                    (match-beginning 0)))
-            ;; to skip arbitrary expressions we need the parser,
-            ;; so we'll just guess at it.
-            (if (re-search-forward "[^,]* \\(for\\) " end t)
-                (match-beginning 1))))))))
-
-(defun js2-array-comp-indentation (parse-status for-kwd)
-  (if (js2-same-line for-kwd)
-      ;; first continuation line
-      (save-excursion
-        (goto-char (nth 1 parse-status))
-        (forward-char 1)
-        (skip-chars-forward " \t")
-        (current-column))
-    (save-excursion
-      (goto-char for-kwd)
-      (current-column))))
-
-(defun js-proper-indentation (parse-status)
-  "Return the proper indentation for the current line."
-  (save-excursion
-    (back-to-indentation)
-    (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
-          (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
-          (continued-expr-p (js-continued-expression-p))
-          (bracket (nth 1 parse-status))
-          beg)
-      (cond
-       ;; indent array comprehension continuation lines specially
-       ((and bracket
-             (not (js2-same-line bracket))
-             (setq beg (js2-indent-in-array-comp parse-status))
-             (>= (point) (save-excursion
-                           (goto-char beg)
-                           (point-at-bol)))) ; at or after first loop?
-        (js2-array-comp-indentation parse-status beg))
-
-       (ctrl-stmt-indent)
-
-       (bracket
-        (goto-char bracket)
-        (cond
-         ((looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
-          (let ((p (parse-partial-sexp (point-at-bol) (point))))
-            (when (save-excursion (skip-chars-backward " \t)")
-                                  (looking-at ")"))
-              (backward-list))
-            (if (nth 1 p)
-                (progn (goto-char (1+ (nth 1 p)))
-                       (skip-chars-forward " \t"))
-              (back-to-indentation))
-            (cond (same-indent-p
-                   (current-column))
-                  (continued-expr-p
-                   (+ (current-column) (* 2 js2-basic-offset)))
-                  (t
-                   (+ (current-column) js2-basic-offset)))))
-         (t
-          (unless same-indent-p
-            (forward-char)
-            (skip-chars-forward " \t"))
-          (current-column))))
-
-       (continued-expr-p js2-basic-offset)
-       (t 0)))))
-
-(defun js2-lineup-comment (parse-status)
-  "Indent a multi-line block comment continuation line."
-  (let* ((beg (nth 8 parse-status))
-         (first-line (js2-same-line beg))
-         (offset (save-excursion
-                   (goto-char beg)
-                   (if (looking-at "/\\*")
-                       (+ 1 (current-column))
-                     0))))
-    (unless first-line
-      (indent-line-to offset))))
-
-(defun js2-backward-sws ()
-  "Move backward through whitespace and comments."
-  (interactive)
-  (while (forward-comment -1)))
-
-(defun js2-forward-sws ()
-  "Move forward through whitespace and comments."
-  (interactive)
-  (while (forward-comment 1)))
-
-(defsubst js2-current-indent (&optional pos)
-  "Return column of indentation on current line.
-If POS is non-nil, go to that point and return indentation for that line."
-  (save-excursion
-    (if pos
-        (goto-char pos))
-    (back-to-indentation)
-    (current-column)))
-
-(defsubst js2-arglist-close ()
-  "Return non-nil if we're on a line beginning with a close-paren/brace."
-  (save-match-data
-    (save-excursion
-      (goto-char (point-at-bol))
-      (js2-forward-sws)
-      (looking-at "[])}]"))))
-
-(defsubst js2-indent-looks-like-label-p ()
-  (goto-char (point-at-bol))
-  (js2-forward-sws)
-  (looking-at (concat js2-mode-identifier-re ":")))
-
-(defun js2-indent-in-objlit-p (parse-status)
-  "Return non-nil if this looks like an object-literal entry."
-  (let ((start (nth 1 parse-status)))
-    (and
-     start
-     (save-excursion
-       (and (zerop (forward-line -1))
-            (not (< (point) start))     ; crossed a {} boundary
-            (js2-indent-looks-like-label-p)))
-     (save-excursion
-       (js2-indent-looks-like-label-p)))))
-
-;; if prev line looks like foobar({ then we're passing an object
-;; literal to a function call, and people pretty much always want to
-;; de-dent back to the previous line, so move the 'basic-offset'
-;; position to the front.
-(defsubst js2-indent-objlit-arg-p (parse-status)
-  (save-excursion
-    (back-to-indentation)
-    (js2-backward-sws)
-    (and (eq (1- (point)) (nth 1 parse-status))
-         (eq (char-before) ?{)
-         (progn
-           (forward-char -1)
-           (skip-chars-backward " \t")
-           (eq (char-before) ?\()))))
-
-(defsubst js2-indent-case-block-p ()
-  (save-excursion
-    (back-to-indentation)
-    (js2-backward-sws)
-    (goto-char (point-at-bol))
-    (skip-chars-forward " \t")
-    (save-match-data
-      (looking-at "case\\s-.+:"))))
-
-(defsubst js2-syntax-bol ()
-  "Return the point at the first non-whitespace char on the line.
-Returns `point-at-bol' if the line is empty."
-  (save-excursion
-    (beginning-of-line)
-    (skip-chars-forward " \t")
-    (point)))
-
-(defun js2-bounce-indent (normal-col parse-status)
-  "Cycle among alternate computed indentation positions.
-PARSE-STATUS is the result of `parse-partial-sexp' from the beginning
-of the buffer to the current point.  NORMAL-COL is the indentation
-column computed by the heuristic guesser based on current paren,
-bracket, brace and statement nesting."
-  (let ((cur-indent (js2-current-indent))
-        (old-buffer-undo-list buffer-undo-list)
-        ;; Emacs 21 only has `count-lines', not `line-number-at-pos'
-        (current-line (save-excursion
-                        (forward-line 0)  ; move to bol
-                        (1+ (count-lines (point-min) (point)))))
-        positions
-        pos
-        anchor
-        arglist-cont
-        same-indent
-        prev-line-col
-        basic-offset
-        computed-pos)
-    ;; temporarily don't record undo info, if user requested this
-    (if js2-mode-indent-inhibit-undo
-        (setq buffer-undo-list t))
-    (unwind-protect
-        (progn
-          ;; first likely point:  indent from beginning of previous code line
-          (push (setq basic-offset
-                      (+ (save-excursion
-                           (back-to-indentation)
-                           (js2-backward-sws)
-                           (back-to-indentation)
-                           (setq prev-line-col (current-column)))
-                         js2-basic-offset))
-                positions)
-
-          ;; second likely point:  indent from assign-expr RHS.  This
-          ;; is just a crude guess based on finding " = " on the previous
-          ;; line containing actual code.
-          (setq pos (save-excursion
-                      (save-match-data
-                        (forward-line -1)
-                        (goto-char (point-at-bol))
-                        (when (re-search-forward "\\s-+\\(=\\)\\s-+"
-                                                 (point-at-eol) t)
-                          (goto-char (match-end 1))
-                          (skip-chars-forward " \t\r\n")
-                          (current-column)))))
-          (when pos
-            (incf pos js2-basic-offset)
-            (unless (member pos positions)
-              (push pos positions)))
-
-          ;; third likely point:  same indent as previous line of code.
-          ;; Make it the first likely point if we're not on an
-          ;; arglist-close line and previous line ends in a comma, or
-          ;; both this line and prev line look like object-literal
-          ;; elements.
-          (setq pos (save-excursion
-                      (goto-char (point-at-bol))
-                      (js2-backward-sws)
-                      (back-to-indentation)
-                      (prog1
-                          (current-column)
-                        ;; while we're here, look for trailing comma
-                        (if (save-excursion
-                              (goto-char (point-at-eol))
-                              (js2-backward-sws)
-                              (eq (char-before) ?,))
-                            (setq arglist-cont (1- (point)))))))
-          (when pos
-            (if (and (or arglist-cont
-                         (js2-indent-in-objlit-p parse-status))
-                     (not (js2-arglist-close)))
-                (setq same-indent pos))
-            (unless (member pos positions)
-              (push pos positions)))
-
-          ;; fourth likely position:  first preceding code with less indentation
-          ;; than the immediately preceding code line.
-          (setq pos (save-excursion
-                      (js2-backward-sws)
-                      (back-to-indentation)
-                      (setq anchor (current-column))
-                      (while (and (zerop (forward-line -1))
-                                  (>= (progn
-                                        (back-to-indentation)
-                                        (current-column))
-                                      anchor)))
-                      (setq pos (current-column))))
-          (unless (member pos positions)
-            (push pos positions))
-
-          ;; put nesting-heuristic position first in list, sort rest
-          (setq positions (nreverse (sort positions '<)))
-          (setq positions (cons normal-col (delete normal-col positions)))
-
-          ;; comma-list continuation lines:  prev line indent takes precedence
-          (if same-indent
-              (setq positions
-                    (cons same-indent
-                          (sort (delete same-indent positions) '<))))
-
-          ;; common special cases where we want to indent in from previous line
-          (if (or (js2-indent-case-block-p)
-                  (js2-indent-objlit-arg-p parse-status))
-              (setq positions
-                    (cons basic-offset
-                          (delete basic-offset positions))))
-
-          ;; record whether we're already sitting on one of the alternatives
-          (setq pos (member cur-indent positions))
-          (cond
-           ;; case 0:  we're one one of the alternatives and this is the
-           ;; first time they've pressed TAB on this line (best-guess).
-           ((and js2-mode-indent-ignore-first-tab
-                 pos
-                 ;; first time pressing TAB on this line?
-                 (not (eq js2-mode-last-indented-line current-line)))
-            ;; do nothing
-            (setq computed-pos nil))
-           ;; case 1:  only one computed position => use it
-           ((null (cdr positions))
-            (setq computed-pos 0))
-           ;; case 2:  not on any of the computed spots => use main spot
-           ((not pos)
-            (setq computed-pos 0))
-           ;; case 3:  on last position:  cycle to first position
-           ((null (cdr pos))
-            (setq computed-pos 0))
-           ;; case 4:  on intermediate position:  cycle to next position
-           (t
-            (setq computed-pos (js2-position (second pos) positions))))
-
-          ;; see if any hooks want to indent; otherwise we do it
-          (loop with result = nil
-                for hook in js2-indent-hook
-                while (null result)
-                do
-                (setq result (funcall hook positions computed-pos))
-                finally do
-                (unless (or result (null computed-pos))
-                  (indent-line-to (nth computed-pos positions)))))
-
-      ;; finally
-      (if js2-mode-indent-inhibit-undo
-          (setq buffer-undo-list old-buffer-undo-list))
-      ;; see commentary for `js2-mode-last-indented-line'
-      (setq js2-mode-last-indented-line current-line))))
-
-(defsubst js2-1-line-comment-continuation-p ()
-  "Return t if we're in a 1-line comment continuation.
-If so, we don't ever want to use bounce-indent."
-  (save-excursion
-    (save-match-data
-      (and (progn
-             (forward-line 0)
-             (looking-at "\\s-*//"))
-           (progn
-             (forward-line -1)
-             (forward-line 0)
-             (when (looking-at "\\s-*$")
-               (js2-backward-sws)
-               (forward-line 0))
-             (looking-at "\\s-*//"))))))
-
-(defun js2-indent-line ()
-  "Indent the current line as JavaScript source text."
-  (interactive)
-  (let (parse-status
-        current-indent
-        offset
-        indent-col
-        moved
-        ;; don't whine about errors/warnings when we're indenting.
-        ;; This has to be set before calling parse-partial-sexp below.
-        (inhibit-point-motion-hooks t))
-    (setq parse-status (save-excursion
-                          (parse-partial-sexp (point-min)
-                                              (point-at-bol)))
-          offset (- (point) (save-excursion
-                               (back-to-indentation)
-                               (setq current-indent (current-column))
-                               (point))))
-    (js2-with-underscore-as-word-syntax
-     (if (nth 4 parse-status)
-         (js2-lineup-comment parse-status)
-       (setq indent-col (js-proper-indentation parse-status))
-       ;; see comments below about js2-mode-last-indented-line
-       (when
-           (cond
-            ;; bounce-indenting is disabled during electric-key indent.
-            ;; It doesn't work well on first line of buffer.
-            ((and js2-bounce-indent-flag
-                  (not (js2-same-line (point-min)))
-                  (not (js2-1-line-comment-continuation-p)))
-             (js2-bounce-indent indent-col parse-status)
-             (setq moved t))
-            ;; just indent to the guesser's likely spot
-            ((/= current-indent indent-col)
-             (indent-line-to indent-col)
-             (setq moved t)))
-         (when (and moved (plusp offset))
-           (forward-char offset)))))))
-
-(defun js2-indent-region (start end)
-  "Indent the region, but don't use bounce indenting."
-  (let ((js2-bounce-indent-flag nil)
-        (indent-region-function nil))
-    (indent-region start end nil)))  ; nil for byte-compiler
-
-(provide 'js2-indent)
-
-;;; js2-indent.el ends here
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'imenu)
-(require 'cc-cmds)  ; for `c-fill-paragraph'
-
-
-;;;###autoload (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-
-;;;###autoload
-(defun js2-mode ()
-  "Major mode for editing JavaScript code."
-  (interactive)
-  (js2-mode-check-compat)
-  (kill-all-local-variables)
-  (set-syntax-table js2-mode-syntax-table)
-  (use-local-map js2-mode-map)
-  (setq major-mode 'js2-mode
-        mode-name "JavaScript-IDE"
-        comment-start "//"  ; used by comment-region; don't change it
-        comment-end "")
-  (setq local-abbrev-table js2-mode-abbrev-table)
-  (set (make-local-variable 'max-lisp-eval-depth)
-       (max max-lisp-eval-depth 3000))
-  (set (make-local-variable 'indent-line-function) #'js2-indent-line)
-  (set (make-local-variable 'indent-region-function) #'js2-indent-region)
-  (set (make-local-variable 'fill-paragraph-function) #'js2-fill-paragraph)
-  (set (make-local-variable 'before-save-hook) #'js2-before-save)
-  (set (make-local-variable 'next-error-function) #'js2-next-error)
-  (set (make-local-variable 'beginning-of-defun-function) #'js2-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) #'js2-end-of-defun)
-  ;; We un-confuse `parse-partial-sexp' by setting syntax-table properties
-  ;; for characters inside regexp literals.
-  (set (make-local-variable 'parse-sexp-lookup-properties) t)
-  ;; this is necessary to make `show-paren-function' work properly
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-  ;; needed for M-x rgrep, among other things
-  (put 'js2-mode 'find-tag-default-function #'js2-mode-find-tag)
-
-  ;; some variables needed by cc-engine for paragraph-fill, etc.
-  (setq c-buffer-is-cc-mode t
-        c-comment-prefix-regexp js2-comment-prefix-regexp
-        c-paragraph-start js2-paragraph-start
-        c-paragraph-separate "$"
-        comment-start-skip js2-comment-start-skip
-        c-syntactic-ws-start js2-syntactic-ws-start
-        c-syntactic-ws-end js2-syntactic-ws-end
-        c-syntactic-eol js2-syntactic-eol)
-  (if js2-emacs22
-      (c-setup-paragraph-variables))
-
-  ;; We do our own syntax highlighting based on the parse tree.
-  ;; However, we want minor modes that add keywords to highlight properly
-  ;; (examples:  doxymacs, column-marker).  We do this by not letting
-  ;; font-lock unfontify anything, and telling it to fontify after we
-  ;; re-parse and re-highlight the buffer.  (We currently don't do any
-  ;; work with regions other than the whole buffer.)
-  (dolist (var '(font-lock-unfontify-buffer-function
-                 font-lock-unfontify-region-function))
-    (set (make-local-variable var) (lambda (&rest args) t)))
-
-  ;; Don't let font-lock do syntactic (string/comment) fontification.
-  (set (make-local-variable #'font-lock-syntactic-face-function)
-       (lambda (state) nil))
-
-  ;; Experiment:  make reparse-delay longer for longer files.
-  (if (plusp js2-dynamic-idle-timer-adjust)
-      (setq js2-idle-timer-delay
-            (* js2-idle-timer-delay
-               (/ (point-max) js2-dynamic-idle-timer-adjust))))
-
-  (add-hook 'change-major-mode-hook #'js2-mode-exit nil t)
-  (add-hook 'after-change-functions #'js2-mode-edit nil t)
-  (setq imenu-create-index-function #'js2-mode-create-imenu-index)
-  (imenu-add-to-menubar (concat "IM-" mode-name))
-  (when js2-mirror-mode
-    (js2-enter-mirror-mode))
-  (add-to-invisibility-spec '(js2-outline . t))
-  (set (make-local-variable 'line-move-ignore-invisible) t)
-  (set (make-local-variable 'forward-sexp-function) #'js2-mode-forward-sexp)
-  (setq js2-mode-functions-hidden nil
-        js2-mode-comments-hidden nil
-        js2-mode-buffer-dirty-p t
-        js2-mode-parsing nil)
-  (js2-reparse)
-  (run-hooks 'js2-mode-hook))
-
-(defun js2-mode-check-compat ()
-  "Signal an error if we can't run with this version of Emacs."
-  (if (and js2-mode-must-byte-compile
-           (not (byte-code-function-p (symbol-function 'js2-mode))))
-      (error "You must byte-compile js2-mode before using it."))
-  (if (and (boundp 'running-xemacs)
-           running-xemacs)
-      (error "js2-mode is not compatible with XEmacs"))
-  (unless (>= emacs-major-version 21)
-    (error "js2-mode requires GNU Emacs version 21 or higher")))
-
-(defun js2-mode-exit ()
-  (interactive)
-  (when js2-mode-node-overlay
-    (delete-overlay js2-mode-node-overlay)
-    (setq js2-mode-node-overlay nil))
-  (js2-remove-overlays)
-  (setq js2-mode-ast nil)
-  (remove-hook 'change-major-mode-hook #'js2-mode-exit t)
-  (remove-from-invisibility-spec '(js2-outline . t))
-  (js2-mode-show-all)
-  (js2-with-unmodifying-text-property-changes
-    (js2-clear-face (point-min) (point-max))))
-
-(defun js2-before-save ()
-  "Clean up whitespace before saving file.
-You can disable this by customizing `js2-cleanup-whitespace'."
-  (when js2-cleanup-whitespace
-    (let ((col (current-column)))
-      (delete-trailing-whitespace)
-      ;; don't change trailing whitespace on current line
-      (unless (eq (current-column) col)
-        (indent-to col)))))
-
-(defsubst js2-mode-reset-timer ()
-  (if js2-mode-parse-timer
-      (cancel-timer js2-mode-parse-timer))
-  (setq js2-mode-parsing nil)
-  (setq js2-mode-parse-timer
-        (run-with-idle-timer js2-idle-timer-delay nil #'js2-reparse)))
-
-(defun js2-mode-edit (beg end len)
-  "Schedule a new parse after buffer is edited."
-  (setq js2-mode-buffer-dirty-p t)
-  (js2-mode-hide-overlay)
-  (js2-mode-reset-timer))
-
-(defun js2-mode-run-font-lock ()
-  "Run `font-lock-fontify-buffer' after parsing/highlighting.
-This is intended to allow modes that install their own font-lock keywords
-to work with js2-mode.  In practice it never seems to work for long.
-Hopefully the Emacs maintainers can help figure out a way to make it work."
-  (when (and (boundp 'font-lock-keywords)
-             font-lock-keywords
-             (boundp 'font-lock-mode)
-             font-lock-mode)
-    ;; TODO:  font-lock and jit-lock really really REALLY don't want to
-    ;; play nicely with js2-mode.  They go out of their way to fail to
-    ;; provide any option for saying "look, fontify the goddamn buffer
-    ;; with just the keywords already".  Argh.
-    (setq font-lock-defaults (list font-lock-keywords 'keywords-only))
-    (let (font-lock-verbose)
-      (font-lock-default-fontify-buffer))))
-
-(defun js2-reparse (&optional force)
-  "Re-parse current buffer after user finishes some data entry.
-If we get any user input while parsing, including cursor motion,
-we discard the parse and reschedule it.  If FORCE is nil, then the
-buffer will only rebuild its `js2-mode-ast' if the buffer is dirty."
-  (let (time
-        interrupted-p
-        (js2-compiler-strict-mode js2-mode-show-strict-warnings))
-    (unless js2-mode-parsing
-      (setq js2-mode-parsing t)
-      (unwind-protect
-          (when (or js2-mode-buffer-dirty-p force)
-            (js2-remove-overlays)
-            (js2-with-unmodifying-text-property-changes
-              (setq js2-mode-buffer-dirty-p nil
-                    js2-mode-fontifications nil
-                    js2-mode-deferred-properties nil)
-              (if js2-mode-verbose-parse-p
-                  (message "parsing..."))
-              (setq time
-                    (js2-time
-                     (setq interrupted-p
-                           (catch 'interrupted
-                             (setq js2-mode-ast (js2-parse))
-                             (js2-mode-fontify-regions)
-                             (js2-mode-remove-suppressed-warnings)
-                             (js2-mode-show-warnings)
-                             (js2-mode-show-errors)
-                             (js2-mode-run-font-lock)  ; note:  doesn't work
-                             (if (>= js2-highlight-level 1)
-                                 (js2-highlight-jsdoc js2-mode-ast))
-                             nil))))
-              (if interrupted-p
-                  (progn
-                    ;; unfinished parse => try again
-                    (setq js2-mode-buffer-dirty-p t)
-                    (js2-mode-reset-timer))
-                (if js2-mode-verbose-parse-p
-                    (message "Parse time: %s" time)))))
-        ;; finally
-        (setq js2-mode-parsing nil)
-        (unless interrupted-p
-          (setq js2-mode-parse-timer nil))))))
-
-(defun js2-mode-show-node ()
-  "Debugging aid:  highlight selected AST node on mouse click."
-  (interactive)
-  (let ((node (js2-node-at-point))
-        beg
-        end)
-    (when js2-mode-show-overlay
-      (if (null node)
-          (message "No node found at location %s" (point))
-        (setq beg (js2-node-abs-pos node)
-              end (+ beg (js2-node-len node)))
-        (if js2-mode-node-overlay
-            (move-overlay js2-mode-node-overlay beg end)
-          (setq js2-mode-node-overlay (make-overlay beg end))
-          (overlay-put js2-mode-node-overlay 'face 'highlight))
-        (js2-with-unmodifying-text-property-changes
-          (put-text-property beg end 'point-left #'js2-mode-hide-overlay))
-        (message "%s, parent: %s"
-                 (js2-node-short-name node)
-                 (if (js2-node-parent node)
-                     (js2-node-short-name (js2-node-parent node))
-                   "nil"))))))
-
-(defun js2-mode-hide-overlay (&optional p1 p2)
-  "Remove the debugging overlay when the point moves."
-  (when js2-mode-node-overlay
-    (let ((beg (overlay-start js2-mode-node-overlay))
-          (end (overlay-end js2-mode-node-overlay)))
-      ;; Sometimes we're called spuriously.
-      (unless (and p2
-                   (>= p2 beg)
-                   (<= p2 end))
-        (js2-with-unmodifying-text-property-changes
-          (remove-text-properties beg end '(point-left nil)))
-        (delete-overlay js2-mode-node-overlay)
-        (setq js2-mode-node-overlay nil)))))
-
-(defun js2-mode-reset ()
-  "Debugging helper; resets everything."
-  (interactive)
-  (js2-mode-exit)
-  (js2-mode))
-
-(defsubst js2-mode-show-warn-or-err (e face)
-  "Highlight a warning or error E with FACE.
-E is a list of ((MSG-KEY MSG-ARG) BEG END)."
-  (let* ((key (first e))
-         (beg (second e))
-         (end (+ beg (third e)))
-         ;; Don't inadvertently go out of bounds.
-         (beg (max (point-min) (min beg (point-max))))
-         (end (max (point-min) (min end (point-max))))
-         (js2-highlight-level 3)    ; so js2-set-face is sure to fire
-         (ovl (make-overlay beg end)))
-    (overlay-put ovl 'face face)
-    (overlay-put ovl 'js2 t)
-    (put-text-property beg end 'help-echo (js2-get-msg key))
-    (put-text-property beg end 'point-entered #'js2-echo-error)))
-
-(defun js2-remove-overlays ()
-  "Remove overlays from buffer that have a `js2' property."
-  (let ((beg (point-min))
-        (end (point-max)))
-    (save-excursion
-      (dolist (o (overlays-in beg end))
-        (when (overlay-get o 'js2)
-          (delete-overlay o))))))
-
-(defun js2-mode-fontify-regions ()
-  "Apply fontifications recorded during parsing."
-  ;; We defer clearing faces as long as possible to eliminate flashing.
-  (js2-clear-face (point-min) (point-max))
-  ;; have to reverse the recorded fontifications so that errors and
-  ;; warnings overwrite the normal fontifications
-  (dolist (f (nreverse js2-mode-fontifications))
-    (put-text-property (first f) (second f) 'face (third f)))
-  (setq js2-mode-fontifications nil)
-  (dolist (p js2-mode-deferred-properties)
-    (apply #'put-text-property p))
-  (setq js2-mode-deferred-properties nil))
-
-(defun js2-mode-show-errors ()
-  "Highlight syntax errors."
-  (when js2-mode-show-parse-errors
-    (dolist (e (js2-ast-root-errors js2-mode-ast))
-      (js2-mode-show-warn-or-err e 'js2-error-face))))
-
-(defun js2-mode-remove-suppressed-warnings ()
-  "Take suppressed warnings out of the AST warnings list.
-This ensures that the counts and `next-error' are correct."
-  (setf (js2-ast-root-warnings js2-mode-ast)
-        (js2-delete-if
-         (lambda (e)
-           (let ((key (caar e)))
-             (or
-              (and (not js2-strict-trailing-comma-warning)
-                   (string-match "trailing\\.comma" key))
-              (and (not js2-strict-cond-assign-warning)
-                   (string= key "msg.equal.as.assign"))
-              (and js2-missing-semi-one-line-override
-                   (string= key "msg.missing.semi")
-                   (let* ((beg (second e))
-                          (node (js2-node-at-point beg))
-                          (fn (js2-mode-find-parent-fn node))
-                          (body (and fn (js2-function-node-body fn)))
-                          (lc (and body (js2-node-abs-pos body)))
-                          (rc (and lc (+ lc (js2-node-len body)))))
-                     (and fn
-                          (or (null body)
-                              (save-excursion
-                                (goto-char beg)
-                                (and (js2-same-line lc)
-                                     (js2-same-line rc))))))))))
-         (js2-ast-root-warnings js2-mode-ast))))
-
-(defun js2-mode-show-warnings ()
-  "Highlight strict-mode warnings."
-  (when js2-mode-show-strict-warnings
-    (dolist (e (js2-ast-root-warnings js2-mode-ast))
-      (js2-mode-show-warn-or-err e 'js2-warning-face))))
-
-(defun js2-echo-error (old-point new-point)
-  "Called by point-motion hooks."
-  (let ((msg (get-text-property new-point 'help-echo)))
-    (if msg
-        (message msg))))
-
-(defalias #'js2-echo-help #'js2-echo-error)
-
-(defun js2-enter-key ()
-  "Handle user pressing the Enter key."
-  (interactive)
-  (let ((parse-status (save-excursion
-                        (parse-partial-sexp (point-min) (point)))))
-    (cond
-     ;; check if we're inside a string
-     ((nth 3 parse-status)
-      (js2-mode-split-string parse-status))
-     ;; check if inside a block comment
-     ((nth 4 parse-status)
-      (js2-mode-extend-comment))
-     (t
-      ;; should probably figure out what the mode-map says we should do
-      (if js2-indent-on-enter-key
-          (let ((js2-bounce-indent-flag nil))
-            (js2-indent-line)))
-      (insert "\n")
-      (if js2-enter-indents-newline
-          (let ((js2-bounce-indent-flag nil))
-            (js2-indent-line)))))))
-
-(defun js2-mode-split-string (parse-status)
-  "Turn a newline in mid-string into a string concatenation."
-  (let* ((col (current-column))
-         (quote-char (nth 3 parse-status))
-         (quote-string (string quote-char))
-         (string-beg (nth 8 parse-status))
-         (indent (save-match-data
-                   (or
-                    (save-excursion
-                      (back-to-indentation)
-                      (if (looking-at "\\+")
-                          (current-column)))
-                    (save-excursion
-                      (goto-char string-beg)
-                      (if (looking-back "\\+\\s-+")
-                          (goto-char (match-beginning 0)))
-                      (current-column))))))
-    (insert quote-char "\n")
-    (indent-to indent)
-    (insert "+ " quote-string)
-    (when (eolp)
-      (insert quote-string)
-      (backward-char 1))))
-
-(defun js2-mode-extend-comment ()
-  "When inside a comment block, add comment prefix."
-  (let (star single col first-line needs-close)
-    (save-excursion
-      (back-to-indentation)
-      (cond
-       ((looking-at "\\*[^/]")
-        (setq star t
-              col (current-column)))
-       ((looking-at "/\\*")
-        (setq star t
-              first-line t
-              col (1+ (current-column))))
-       ((looking-at "//")
-        (setq single t
-              col (current-column)))))
-    ;; Heuristic for whether we need to close the comment:
-    ;; if we've got a parse error here, assume it's an unterminated
-    ;; comment.
-    (setq needs-close
-          (or
-           (eq (get-text-property (1- (point)) 'point-entered)
-               'js2-echo-error)
-           ;; The heuristic above doesn't work well when we're
-           ;; creating a comment and there's another one downstream,
-           ;; as our parser thinks this one ends at the end of the
-           ;; next one.  (You can have a /* inside a js block comment.)
-           ;; So just close it if the next non-ws char isn't a *.
-           (and first-line
-                (eolp)
-                (save-excursion
-                  (skip-syntax-forward " ")
-                  (not (eq (char-after) ?*))))))
-    (insert "\n")
-    (cond
-     (star
-      (indent-to col)
-      (insert "* ")
-      (if (and first-line needs-close)
-          (save-excursion
-            (insert "\n")
-            (indent-to col)
-            (insert "*/"))))
-     (single
-      (when (save-excursion
-              (and (zerop (forward-line 1))
-                   (looking-at "\\s-*//")))
-        (indent-to col)
-        (insert "// "))))))
-
-(defun js2-fill-string (beg quote)
-  "Line-wrap a single-line string into a multi-line string.
-BEG is the string beginning, QUOTE is the quote char."
-  (let* ((squote (string quote))
-         (end (if (re-search-forward (concat "[^\\]" squote)
-                                     (point-at-eol) t)
-                  (1+ (match-beginning 0))
-                (point-at-eol)))
-         (tag (make-marker))
-         (fill-column (- fill-column 4)))  ; make room
-    (unwind-protect
-        (progn
-          (move-marker tag end)
-          (fill-paragraph nil)
-          (goto-char beg)
-          (while (not (js2-same-line tag))
-            (goto-char (point-at-eol))
-            (insert squote)
-            (when (zerop (forward-line 1))
-              (back-to-indentation)
-              (if (looking-at (concat squote "\\s-*$"))
-                  (progn
-                    (setq end (point-at-eol))
-                    (forward-line -1)
-                    (delete-region (point-at-eol) end))
-                (insert "+ " squote)))))
-      (move-marker tag nil))))
-
-(defun js2-fill-paragraph (arg)
-  "Fill paragraph after point.  Prefix ARG means justify as well.
-Has special handling for filling in comments and strings."
-  (let* ((parse-status (save-excursion
-                         (parse-partial-sexp (point-min) (point))))
-         (quote-char (or (nth 3 parse-status)
-                         (save-match-data
-                           (if (looking-at "[\"\']")
-                               (char-after))))))
-    (cond
-     (quote-char
-      (js2-fill-string (or (nth 8 parse-status)
-                           (point))
-                       quote-char)
-      t) ; or fill-paragraph does evil things afterwards
-     ((nth 4 parse-status)  ; in block comment?
-      (js2-fill-comment parse-status arg))
-     (t
-      (fill-paragraph arg)))))
-
-(defun js2-fill-comment (parse-status arg)
-  "Fill-paragraph in a block comment."
-  (let* ((beg (nth 8 parse-status))
-         (end (save-excursion
-                (goto-char beg)
-                (re-search-forward "[^\\]\\*/" nil t)))
-         indent
-         end-marker)
-    (when end
-      (setq end-marker (make-marker))
-      (move-marker end-marker end))
-    (when (and end js2-mode-squeeze-spaces)
-      (save-excursion
-        (save-restriction
-          (narrow-to-region beg end)
-          (goto-char (point-min))
-          (while (re-search-forward "[ \t][ \t]+" nil t)
-            (replace-match " ")))))
-    ;; `c-fill-paragraph' doesn't indent the continuation stars properly
-    ;; if the comment isn't left-justified.  They align to the first star
-    ;; on the first continuation line after the comment-open, so we make
-    ;; sure the first continuation line has the proper indentation.
-    (save-excursion
-      (goto-char beg)
-      (setq indent (1+ (current-column)))
-      (goto-char (point-at-eol))
-      (skip-chars-forward " \t\r\n")
-      (indent-line-to indent)
-
-      ;; Invoke `c-fill-paragraph' from the first continuation line,
-      ;; since it provides better results.  Otherwise if you're on the
-      ;; last line, it doesn't prefix with stars the way you'd expect.
-      ;; TODO:  write our own fill function that works in Emacs 21
-      (c-fill-paragraph arg))
-
-    ;; last line is typically indented wrong, so fix it
-    (when end-marker
-      (save-excursion
-        (goto-char end-marker)
-        (js2-indent-line)))))
-
-(defun js2-beginning-of-line ()
-  "Toggles point between bol and first non-whitespace char in line.
-Also moves past comment delimiters when inside comments."
-  (interactive)
-  (let (node beg)
-    (cond
-     ((bolp)
-      (back-to-indentation))
-     ((looking-at "//")
-      (skip-chars-forward "/ \t"))
-     ((and (eq (char-after) ?*)
-           (setq node (js2-comment-at-point))
-           (memq (js2-comment-node-format node) '(jsdoc block))
-           (save-excursion
-             (skip-chars-backward " \t")
-             (bolp)))
-      (skip-chars-forward "\* \t"))
-     (t
-      (goto-char (point-at-bol))))))
-
-(defun js2-end-of-line ()
-  "Toggles point between eol and last non-whitespace char in line."
-  (interactive)
-  (if (eolp)
-      (skip-chars-backward " \t")
-    (goto-char (point-at-eol))))
-
-(defun js2-enter-mirror-mode()
-  "Turns on mirror mode, where quotes, brackets etc are mirrored automatically
-  on insertion."
-  (interactive)
-  (define-key js2-mode-map (read-kbd-macro "{")  'js2-mode-match-curly)
-  (define-key js2-mode-map (read-kbd-macro "}")  'js2-mode-magic-close-paren)
-  (define-key js2-mode-map (read-kbd-macro "\"") 'js2-mode-match-double-quote)
-  (define-key js2-mode-map (read-kbd-macro "'")  'js2-mode-match-single-quote)
-  (define-key js2-mode-map (read-kbd-macro "(")  'js2-mode-match-paren)
-  (define-key js2-mode-map (read-kbd-macro ")")  'js2-mode-magic-close-paren)
-  (define-key js2-mode-map (read-kbd-macro "[")  'js2-mode-match-bracket)
-  (define-key js2-mode-map (read-kbd-macro "]")  'js2-mode-magic-close-paren))
-
-(defun js2-leave-mirror-mode()
-  "Turns off mirror mode."
-  (interactive)
-  (dolist (key '("{" "\"" "'" "(" ")" "[" "]"))
-    (define-key js2-mode-map (read-kbd-macro key) 'self-insert-command)))
-
-(defsubst js2-mode-inside-string ()
-  "Return non-nil if inside a string.
-Actually returns the quote character that begins the string."
-   (let ((parse-state (save-excursion
-                        (parse-partial-sexp (point-min) (point)))))
-      (nth 3 parse-state)))
-
-(defsubst js2-mode-inside-comment-or-string ()
-  "Return non-nil if inside a comment or string."
-  (or
-   (let ((comment-start
-          (save-excursion
-            (goto-char (point-at-bol))
-            (if (re-search-forward "//" (point-at-eol) t)
-                (match-beginning 0)))))
-     (and comment-start
-          (<= comment-start (point))))
-   (let ((parse-state (save-excursion
-                        (parse-partial-sexp (point-min) (point)))))
-     (or (nth 3 parse-state)
-         (nth 4 parse-state)))))
-
-(defun js2-mode-match-curly (arg)
-  "Insert matching curly-brace."
-  (interactive "p")
-  (insert "{")
-  (if current-prefix-arg
-      (save-excursion
-        (insert "}"))
-    (unless (or (not (looking-at "\\s-*$"))
-                (js2-mode-inside-comment-or-string))
-      (undo-boundary)
-
-      ;; absolutely mystifying bug:  when inserting the next "\n",
-      ;; the buffer-undo-list is given two new entries:  the inserted range,
-      ;; and the incorrect position of the point.  It's recorded incorrectly
-      ;; as being before the opening "{", not after it.  But it's recorded
-      ;; as the correct value if you're debugging `js2-mode-match-curly'
-      ;; in edebug.  I have no idea why it's doing this, but incrementing
-      ;; the inserted position fixes the problem, so that the undo takes us
-      ;; back to just after the user-inserted "{".
-      (insert "\n")
-      (ignore-errors
-        (incf (cadr buffer-undo-list)))
-
-      (js2-indent-line)
-      (save-excursion
-        (insert "\n}")
-        (let ((js2-bounce-indent-flag (js2-code-at-bol-p)))
-          (js2-indent-line))))))
-
-(defun js2-mode-match-bracket ()
-  "Insert matching bracket."
-  (interactive)
-  (insert "[")
-  (unless (or (not (looking-at "\\s-*$"))
-              (js2-mode-inside-comment-or-string))
-    (save-excursion
-      (insert "]"))
-    (when js2-auto-indent-flag
-      (let ((js2-bounce-indent-flag (js2-code-at-bol-p)))
-        (js2-indent-line)))))
-
-(defun js2-mode-match-paren ()
-  "Insert matching paren unless already inserted."
-  (interactive)
-  (insert "(")
-  (unless (or (not (looking-at "\\s-*$"))
-              (js2-mode-inside-comment-or-string))
-    (save-excursion
-      (insert ")"))
-    (when js2-auto-indent-flag
-      (let ((js2-bounce-indent-flag (js2-code-at-bol-p)))
-        (js2-indent-line)))))
-
-(defsubst js2-match-quote (quote-string)
-  (let ((start-quote (js2-mode-inside-string)))
-    (cond
-     ;; inside a comment - don't do quote-matching, since we can't
-     ;; reliably figure out if we're in a string inside the comment
-     ((js2-comment-at-point)
-      (insert quote-string))
-     ((not start-quote)
-      ;; not in string => insert matched quotes
-      (insert quote-string)
-      ;; exception:  if we're just before a word, don't double it.
-      (unless (looking-at "[^ \t\r\n]")
-        (save-excursion
-          (insert quote-string))))
-     ((looking-at quote-string)
-      (if (looking-back "[^\\]\\\\")
-          (insert quote-string)
-        (forward-char 1)))
-     ((and js2-mode-escape-quotes
-           (save-excursion
-             (save-match-data
-               (re-search-forward quote-string (point-at-eol) t))))
-      ;; inside terminated string, escape quote (unless already escaped)
-      (insert (if (looking-back "[^\\]\\\\")
-                  quote-string
-                (concat "\\" quote-string))))
-     (t
-      (insert quote-string)))))        ; else terminate the string
-
-(defun js2-mode-match-single-quote ()
-  "Insert matching single-quote."
-  (interactive)
-  (let ((parse-status (parse-partial-sexp (point-min) (point))))
-    ;; don't match inside comments, since apostrophe is more common
-    (if (nth 4 parse-status)
-        (insert "'")
-      (js2-match-quote "'"))))
-
-(defun js2-mode-match-double-quote ()
-  "Insert matching double-quote."
-  (interactive)
-  (js2-match-quote "\""))
-
-(defun js2-mode-magic-close-paren ()
-  "Skip over close-paren rather than inserting, where appropriate.
-Uses some heuristics to try to figure out the right thing to do."
-  (interactive)
-  (let* ((parse-status (parse-partial-sexp (point-min) (point)))
-         (open-pos (nth 1 parse-status))
-         (close last-input-char)
-         (open (cond
-                ((eq close 41)  ; close-paren
-                 40)            ; open-paren
-                ((eq close 93)  ; close-bracket
-                 91)            ; open-bracket
-                ((eq close ?})
-                 ?{)
-                (t nil))))
-    (if (and (looking-at (string close))
-             (eq open (char-after open-pos))
-             (js2-same-line open-pos))
-        (forward-char 1)
-      (insert (string close)))
-    (blink-matching-open)))
-
-(defun js2-mode-wait-for-parse (callback)
-  "Invoke CALLBACK when parsing is finished.
-If parsing is already finished, calls CALLBACK immediately."
-  (if (not js2-mode-buffer-dirty-p)
-      (funcall callback)
-    (push callback js2-mode-pending-parse-callbacks)
-    (add-hook 'js2-parse-finished-hook #'js2-mode-parse-finished)))
-
-(defun js2-mode-parse-finished ()
-  "Invoke callbacks in `js2-mode-pending-parse-callbacks'."
-  ;; We can't let errors propagate up, since it prevents the
-  ;; `js2-parse' method from completing normally and returning
-  ;; the ast, which makes things mysteriously not work right.
-  (unwind-protect
-      (dolist (cb js2-mode-pending-parse-callbacks)
-        (condition-case err
-            (funcall cb)
-          (error (message "%s" err))))
-    (setq js2-mode-pending-parse-callbacks nil)))
-
-(defun js2-mode-flag-region (from to flag)
-  "Hide or show text from FROM to TO, according to FLAG.
-If FLAG is nil then text is shown, while if FLAG is t the text is hidden.
-Returns the created overlay if FLAG is non-nil."
-  (remove-overlays from to 'invisible 'js2-outline)
-  (when flag
-    (let ((o (make-overlay from to)))
-      (overlay-put o 'invisible 'js2-outline)
-      (overlay-put o 'isearch-open-invisible
-                   'js2-isearch-open-invisible)
-      o)))
-
-;; Function to be set as an outline-isearch-open-invisible' property
-;; to the overlay that makes the outline invisible (see
-;; `js2-mode-flag-region').
-(defun js2-isearch-open-invisible (overlay)
-  ;; We rely on the fact that isearch places point on the matched text.
-  (js2-mode-show-element))
-
-(defun js2-mode-invisible-overlay-bounds (&optional pos)
-  "Return cons cell of bounds of folding overlay at POS.
-Returns nil if not found."
-  (let ((overlays (overlays-at (or pos (point))))
-        o)
-    (while (and overlays
-                (not o))
-      (if (overlay-get (car overlays) 'invisible)
-          (setq o (car overlays))
-        (setq overlays (cdr overlays))))
-    (if o
-        (cons (overlay-start o) (overlay-end o)))))
-
-(defun js2-mode-function-at-point (&optional pos)
-  "Return the innermost function node enclosing current point.
-Returns nil if point is not in a function."
-  (let ((node (js2-node-at-point pos)))
-    (while (and node (not (js2-function-node-p node)))
-      (setq node (js2-node-parent node)))
-    (if (js2-function-node-p node)
-        node)))
-
-(defun js2-mode-toggle-element ()
-  "Hide or show the foldable element at the point."
-  (interactive)
-  (let (comment fn pos)
-    (save-excursion
-      (save-match-data
-        (cond
-         ;; /* ... */ comment?
-         ((js2-block-comment-p (setq comment (js2-comment-at-point)))
-          (if (js2-mode-invisible-overlay-bounds
-               (setq pos (+ 3 (js2-node-abs-pos comment))))
-              (progn
-                (goto-char pos)
-                (js2-mode-show-element))
-            (js2-mode-hide-element)))
-
-         ;; //-comment?
-         ((save-excursion
-            (back-to-indentation)
-            (looking-at js2-mode-//-comment-re))
-          (js2-mode-toggle-//-comment))
-
-         ;; function?
-         ((setq fn (js2-mode-function-at-point))
-          (setq pos (and (js2-function-node-body fn)
-                         (js2-node-abs-pos (js2-function-node-body fn))))
-          (goto-char (1+ pos))
-          (if (js2-mode-invisible-overlay-bounds)
-              (js2-mode-show-element)
-            (js2-mode-hide-element)))
-         (t
-          (message "Nothing at point to hide or show")))))))
-
-(defun js2-mode-hide-element ()
-  "Fold/hide contents of a block, showing ellipses.
-Show the hidden text with \\[js2-mode-show-element]."
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-element))
-  (let (node body beg end)
-    (cond
-     ((js2-mode-invisible-overlay-bounds)
-      (message "already hidden"))
-     (t
-      (setq node (js2-node-at-point))
-      (cond
-       ((js2-block-comment-p node)
-        (js2-mode-hide-comment node))
-       (t
-        (while (and node (not (js2-function-node-p node)))
-          (setq node (js2-node-parent node)))
-        (if (and node
-                 (setq body (js2-function-node-body node)))
-            (progn
-              (setq beg (js2-node-abs-pos body)
-                    end (+ beg (js2-node-len body)))
-              (js2-mode-flag-region (1+ beg) (1- end) 'hide))
-          (message "No collapsable element found at point"))))))))
-
-(defun js2-mode-show-element ()
-  "Show the hidden element at current point."
-  (interactive)
-  (let ((bounds (js2-mode-invisible-overlay-bounds)))
-    (if bounds
-        (js2-mode-flag-region (car bounds) (cdr bounds) nil)
-      (message "Nothing to un-hide"))))
-
-(defun js2-mode-show-all ()
-  "Show all of the text in the buffer."
-  (interactive)
-  (js2-mode-flag-region (point-min) (point-max) nil))
-
-(defun js2-mode-toggle-hide-functions ()
-  (interactive)
-  (if js2-mode-functions-hidden
-      (js2-mode-show-functions)
-    (js2-mode-hide-functions)))
-
-(defun js2-mode-hide-functions ()
-  "Hides all non-nested function bodies in the buffer.
-Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
-to open an individual entry."
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-functions))
-  (if (null js2-mode-ast)
-      (message "Oops - parsing failed")
-    (setq js2-mode-functions-hidden t)
-    (js2-visit-ast js2-mode-ast #'js2-mode-function-hider)))
-
-(defun js2-mode-function-hider (n endp)
-  (when (not endp)
-    (let ((tt (js2-node-type n))
-          body beg end)
-      (cond
-       ((and (= tt js2-FUNCTION)
-             (setq body (js2-function-node-body n)))
-        (setq beg (js2-node-abs-pos body)
-              end (+ beg (js2-node-len body)))
-        (js2-mode-flag-region (1+ beg) (1- end) 'hide)
-        nil)   ; don't process children of function
-       (t
-        t))))) ; keep processing other AST nodes
-
-(defun js2-mode-show-functions ()
-  "Un-hide any folded function bodies in the buffer."
-  (interactive)
-  (setq js2-mode-functions-hidden nil)
-  (save-excursion
-    (goto-char (point-min))
-    (while (/= (goto-char (next-overlay-change (point)))
-               (point-max))
-      (dolist (o (overlays-at (point)))
-        (when (and (overlay-get o 'invisible)
-                   (not (overlay-get o 'comment)))
-          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
-
-(defun js2-mode-hide-comment (n)
-  (let* ((head (if (eq (js2-comment-node-format n) 'jsdoc)
-                   3                    ; /**
-                 2))                    ; /*
-         (beg (+ (js2-node-abs-pos n) head))
-         (end (- (+ beg (js2-node-len n)) head 2))
-         (o (js2-mode-flag-region beg end 'hide)))
-    (overlay-put o 'comment t)))
-
-(defun js2-mode-toggle-hide-comments ()
-  "Folds all block comments in the buffer.
-Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
-to open an individual entry."
-  (interactive)
-  (if js2-mode-comments-hidden
-      (js2-mode-show-comments)
-    (js2-mode-hide-comments)))
-
-(defun js2-mode-hide-comments ()
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-comments))
-  (if (null js2-mode-ast)
-      (message "Oops - parsing failed")
-    (setq js2-mode-comments-hidden t)
-    (dolist (n (js2-ast-root-comments js2-mode-ast))
-      (let ((format (js2-comment-node-format n)))
-        (when (js2-block-comment-p n)
-          (js2-mode-hide-comment n))))
-    (js2-mode-hide-//-comments)))
-
-(defsubst js2-mode-extend-//-comment (direction)
-  "Find start or end of a block of similar //-comment lines.
-DIRECTION is -1 to look back, 1 to look forward.
-INDENT is the indentation level to match.
-Returns the end-of-line position of the furthest adjacent
-//-comment line with the same indentation as the current line.
-If there is no such matching line, returns current end of line."
-  (let ((pos (point-at-eol))
-        (indent (current-indentation)))
-    (save-excursion
-      (save-match-data
-        (while (and (zerop (forward-line direction))
-                    (looking-at js2-mode-//-comment-re)
-                    (eq indent (length (match-string 1))))
-          (setq pos (point-at-eol)))
-      pos))))
-
-(defun js2-mode-hide-//-comments ()
-  "Fold adjacent 1-line comments, showing only snippet of first one."
-  (let (beg end)
-    (save-excursion
-      (save-match-data
-        (goto-char (point-min))
-        (while (re-search-forward js2-mode-//-comment-re nil t)
-          (setq beg (point)
-                end (js2-mode-extend-//-comment 1))
-          (unless (eq beg end)
-            (overlay-put (js2-mode-flag-region beg end 'hide)
-                         'comment t))
-          (goto-char end)
-          (forward-char 1))))))
-
-(defun js2-mode-toggle-//-comment ()
-  "Fold or un-fold any multi-line //-comment at point.
-Caller should have determined that this line starts with a //-comment."
-  (let* ((beg (point-at-eol))
-         (end beg))
-    (save-excursion
-      (goto-char end)
-      (if (js2-mode-invisible-overlay-bounds)
-          (js2-mode-show-element)
-        ;; else hide the comment
-        (setq beg (js2-mode-extend-//-comment -1)
-              end (js2-mode-extend-//-comment 1))
-        (unless (eq beg end)
-          (overlay-put (js2-mode-flag-region beg end 'hide)
-                       'comment t))))))
-
-(defun js2-mode-show-comments ()
-  "Un-hide any hidden comments, leaving other hidden elements alone."
-  (interactive)
-  (setq js2-mode-comments-hidden nil)
-  (save-excursion
-    (goto-char (point-min))
-    (while (/= (goto-char (next-overlay-change (point)))
-               (point-max))
-      (dolist (o (overlays-at (point)))
-        (when (overlay-get o 'comment)
-          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
-
-(defun js2-mode-display-warnings-and-errors ()
-  "Turn on display of warnings and errors."
-  (interactive)
-  (setq js2-mode-show-parse-errors t
-        js2-mode-show-strict-warnings t)
-  (js2-reparse 'force))
-
-(defun js2-mode-hide-warnings-and-errors ()
-  "Turn off display of warnings and errors."
-  (interactive)
-  (setq js2-mode-show-parse-errors nil
-        js2-mode-show-strict-warnings nil)
-  (js2-reparse 'force))
-
-(defun js2-mode-toggle-warnings-and-errors ()
-  "Toggle the display of warnings and errors.
-Some users don't like having warnings/errors reported while they type."
-  (interactive)
-  (setq js2-mode-show-parse-errors (not js2-mode-show-parse-errors)
-        js2-mode-show-strict-warnings (not js2-mode-show-strict-warnings))
-  (if (interactive-p)
-      (message "warnings and errors %s"
-               (if js2-mode-show-parse-errors
-                   "enabled"
-                 "disabled")))
-  (js2-reparse 'force))
-
-(defun js2-mode-customize ()
-  (interactive)
-  (customize-group 'js2-mode))
-
-(defun js2-mode-forward-sexp (&optional arg)
-  "Move forward across one statement or balanced expression.
-With ARG, do it that many times.  Negative arg -N means
-move backward across N balanced expressions."
-  (interactive "p")
-  (setq arg (or arg 1))
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-forward-sexp))
-  (let (node end (start (point)))
-    (cond
-     ;; backward-sexp
-     ;; could probably make this "better" for some cases:
-     ;;  - if in statement block (e.g. function body), go to parent
-     ;;  - infix exprs like (foo in bar) - maybe go to beginning
-     ;;    of infix expr if in the right-side expression?
-     ((and arg (minusp arg))
-      (dotimes (i (- arg))
-        (js2-backward-sws)
-        (forward-char -1)  ; enter the node we backed up to
-        (setq node (js2-node-at-point (point) t))
-        (goto-char (if node
-                       (js2-node-abs-pos node)
-                     (point-min)))))
-    (t
-     ;; forward-sexp
-     (js2-forward-sws)
-     (dotimes (i arg)
-       (js2-forward-sws)
-       (setq node (js2-node-at-point (point) t)
-             end (if node (+ (js2-node-abs-pos node)
-                             (js2-node-len node))))
-       (goto-char (or end (point-max))))))))
-
-(defun js2-next-error (&optional arg reset)
-  "Move to next parse error.
-Typically invoked via \\[next-error].
-ARG is the number of errors, forward or backward, to move.
-RESET means start over from the beginning."
-  (interactive "p")
-  (if (or (null js2-mode-ast)
-          (and (null (js2-ast-root-errors js2-mode-ast))
-               (null (js2-ast-root-warnings js2-mode-ast))))
-      (message "No errors")
-    (when reset
-      (goto-char (point-min)))
-    (let* ((errs (copy-sequence
-                  (append (js2-ast-root-errors js2-mode-ast)
-                          (js2-ast-root-warnings js2-mode-ast))))
-           (continue t)
-           (start (point))
-           (count (or arg 1))
-           (backward (minusp count))
-           (sorter (if backward '> '<))
-           (stopper (if backward '< '>))
-           (count (abs count))
-           all-errs
-           err)
-      ;; sort by start position
-      (setq errs (sort errs (lambda (e1 e2)
-                              (funcall sorter (second e1) (second e2))))
-            all-errs errs)
-      ;; find nth error with pos > start
-      (while (and errs continue)
-        (when (funcall stopper (cadar errs) start)
-          (setq err (car errs))
-          (if (zerop (decf count))
-              (setq continue nil)))
-        (setq errs (cdr errs)))
-      (if err
-          (goto-char (second err))
-        ;; wrap around to first error
-        (goto-char (second (car all-errs)))
-        ;; if we were already on it, echo msg again
-        (if (= (point) start)
-            (js2-echo-error (point) (point)))))))
-
-(defun js2-mouse-3 ()
-  "Make right-click move the point to the click location.
-This makes right-click context menu operations a bit more intuitive.
-The point will not move if the region is active, however, to avoid
-destroying the region selection."
-  (interactive)
-  (when (and js2-move-point-on-right-click
-             (not mark-active))
-    (let ((e last-input-event))
-      (ignore-errors
-        (goto-char (cadadr e))))))
-
-(defun js2-mode-create-imenu-index ()
-  "Return an alist for `imenu--index-alist'."
-  ;; This is built up in `js2-parse-record-imenu' during parsing.
-  (when js2-mode-ast
-    ;; if we have an ast but no recorder, they're requesting a rescan
-    (unless js2-imenu-recorder
-      (js2-reparse 'force))
-    (prog1
-        (js2-build-imenu-index)
-      (setq js2-imenu-recorder nil
-            js2-imenu-function-map nil))))
-
-(defun js2-mode-find-tag ()
-  "Replacement for `find-tag-default'.
-`find-tag-default' returns a ridiculous answer inside comments."
-  (let (beg end)
-    (js2-with-underscore-as-word-syntax
-      (save-excursion
-        (if (and (not (looking-at "[A-Za-z0-9_$]"))
-                 (looking-back "[A-Za-z0-9_$]"))
-            (setq beg (progn (forward-word -1) (point))
-                  end (progn (forward-word 1) (point)))
-          (setq beg (progn (forward-word 1) (point))
-                end (progn (forward-word -1) (point))))
-        (replace-regexp-in-string
-         "[\"']" ""
-         (buffer-substring-no-properties beg end))))))
-
-(defun js2-mode-forward-sibling ()
-  "Move to the end of the sibling following point in parent.
-Returns non-nil if successful, or nil if there was no following sibling."
-  (let* ((node (js2-node-at-point))
-         (parent (js2-mode-find-enclosing-fn node))
-         sib)
-    (when (setq sib (js2-node-find-child-after (point) parent))
-      (goto-char (+ (js2-node-abs-pos sib)
-                    (js2-node-len sib))))))
-
-(defun js2-mode-backward-sibling ()
-  "Move to the beginning of the sibling node preceding point in parent.
-Parent is defined as the enclosing script or function."
-  (let* ((node (js2-node-at-point))
-         (parent (js2-mode-find-enclosing-fn node))
-         sib)
-    (when (setq sib (js2-node-find-child-before (point) parent))
-      (goto-char (js2-node-abs-pos sib)))))
-
-(defun js2-beginning-of-defun ()
-  "Go to line on which current function starts, and return non-nil.
-If we're not in a function, go to beginning of previous script-level element."
-  (interactive)
-  (let ((parent (js2-node-parent-script-or-fn (js2-node-at-point)))
-        pos sib)
-    (cond
-     ((and (js2-function-node-p parent)
-           (not (eq (point) (setq pos (js2-node-abs-pos parent)))))
-      (goto-char pos))
-     (t
-      (js2-mode-backward-sibling)))))
-
-(defun js2-end-of-defun ()
-  "Go to the char after the last position of the current function.
-If we're not in a function, skips over the next script-level element."
-  (interactive)
-  (let ((parent (js2-node-parent-script-or-fn (js2-node-at-point))))
-    (if (not (js2-function-node-p parent))
-        ;; punt:  skip over next script-level element beyond point
-        (js2-mode-forward-sibling)
-      (goto-char (+ 1 (+ (js2-node-abs-pos parent)
-                         (js2-node-len parent)))))))
-
-(defun js2-mark-defun (&optional allow-extend)
-  "Put mark at end of this function, point at beginning.
-The function marked is the one that contains point.
-
-Interactively, if this command is repeated,
-or (in Transient Mark mode) if the mark is active,
-it marks the next defun after the ones already marked."
-  (interactive "p")
-  (let (extended)
-    (when (and allow-extend
-               (or (and (eq last-command this-command) (mark t))
-                   (and transient-mark-mode mark-active)))
-      (let ((sib (save-excursion
-                   (goto-char (mark))
-                   (if (js2-mode-forward-sibling)
-                       (point))))
-            node)
-        (if sib
-            (progn
-              (set-mark sib)
-              (setq extended t))
-          ;; no more siblings - try extending to enclosing node
-          (goto-char (mark t)))))
-   (when (not extended)
-     (let ((node (js2-node-at-point (point) t)) ; skip comments
-           ast fn stmt parent beg end)
-       (when (js2-ast-root-p node)
-         (setq ast node
-               node (or (js2-node-find-child-after (point) node)
-                        (js2-node-find-child-before (point) node))))
-       ;; only mark whole buffer if we can't find any children
-       (if (null node)
-           (setq node ast))
-       (if (js2-function-node-p node)
-           (setq parent node)
-         (setq fn (js2-mode-find-enclosing-fn node)
-               stmt (if (or (null fn)
-                            (js2-ast-root-p fn))
-                        (js2-mode-find-first-stmt node))
-               parent (or stmt fn)))
-       (setq beg (js2-node-abs-pos parent)
-             end (+ beg (js2-node-len parent)))
-       (push-mark beg)
-       (goto-char end)
-       (exchange-point-and-mark)))))
-
-(defun js2-narrow-to-defun ()
-  "Narrow to the function enclosing point."
-  (interactive)
-  (let* ((node (js2-node-at-point (point) t))  ; skip comments
-         (fn (if (js2-script-node-p node)
-                 node
-               (js2-mode-find-enclosing-fn node)))
-         (beg (js2-node-abs-pos fn)))
-    (unless (js2-ast-root-p fn)
-      (narrow-to-region beg (+ beg (js2-node-len fn))))))
-
-(defalias 'js2r 'js2-mode-reset)
-
-(provide 'js2-mode)
-
-;;; js2-mode.el ends here
-
-
-;;; js2.el ends here
diff --git a/elpa-to-submit/nxhtml/related/moz.el b/elpa-to-submit/nxhtml/related/moz.el
index e31e6beb7d..e910286a77 100644
--- a/elpa-to-submit/nxhtml/related/moz.el
+++ b/elpa-to-submit/nxhtml/related/moz.el
@@ -1,5 +1,7 @@
 ;;; moz.el --- Lets current buffer interact with inferior mozilla.
 
+;; URL: http://github.com/bard/mozrepl/raw/master/chrome/content/moz.el
+
 ;; Copyright (C) 2006 by Massimiliano Mirra
 ;;
 ;; This program is free software; you can redistribute it and/or modify
@@ -17,13 +19,15 @@
 ;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ;;
 ;; Author: Massimiliano Mirra, <bard [at] hyperstruct [dot] net>
+;; Contributors:
+;;   - Lennart Borgman
 
 ;;; Commentary:
 ;;
 ;; This file implements communication with Firefox via MozRepl
-;; (http://hyperstruct.net/projects/mozlab).  It is a slightly
+;; (http://hyperstruct.net/projects/mozrepl).  It is a slightly
 ;; modified version of the file moz.el that comes with MozLab.  To use
-;; it you have to install the MozLab addon in Firefox.
+;; it you have to install the MozRepl addon in Firefox.
 ;;
 ;; This file contains
 ;;
@@ -71,6 +75,7 @@
 ;;; Code:
 
 (require 'comint)
+(require 'cc-cmds)
 
 ;; Maybe fix-me: C-c control-char are reserved for major modes. But
 ;; this minor mode is used in only one major mode (or one family of
@@ -115,6 +120,8 @@ The following keys are bound in this minor mode:
 
 (defvar moz-repl-port 4242)
 
+(defvar moz-temporary-file nil)
+
 (defun moz-temporary-file ()
   (if (and moz-temporary-file
            (file-readable-p moz-temporary-file))
@@ -156,7 +163,7 @@ Curent function is the one recognized by c-mark-function."
 Also switch to the interaction buffer."
   (interactive)
   (moz-send-defun)
-  (inferior-moz-switch-to-mozilla))
+  (inferior-moz-switch-to-mozilla nil))
 
 (defun moz-save-buffer-and-send ()
   "Save the current buffer and load it in Firefox via MozRepl."
@@ -183,25 +190,25 @@ Also switch to the interaction buffer."
 (defvar inferior-moz-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Note: changed from C-c c which is reserved for users.
-    (define-key map "\C-c." 'inferior-moz-insert-moz-repl)
+    (define-key map "\C-c\C-c" 'inferior-moz-insert-moz-repl)
     map))
 
 ;;;###autoload
 (define-derived-mode inferior-moz-mode comint-mode "Inf-MozRepl"
   "Major mode for interacting with Firefox via MozRepl."
   (setq comint-input-sender 'inferior-moz-input-sender)
-  ;;(define-key inferior-moz-mode-map "\C-cc" (lambda () (interactive) (insert moz-repl-name ".")))
   (add-hook 'comint-output-filter-functions 'inferior-moz-track-repl-name nil t))
 
 (defun inferior-moz-track-repl-name (comint-output)
-  (when (string-match "\\(\\w+\\)> $" comint-output)
-    (setq moz-repl-name (match-string 1 comint-output))))
+  (save-match-data
+    (when (string-match "\\(\\w+\\)> $" comint-output)
+      (setq moz-repl-name (match-string 1 comint-output)))))
 
 (defun inferior-moz-self-insert-or-repl-name ()
   (interactive)
   (if (looking-back "\\(\\w+\\)> $")
       (insert moz-repl-name ".")
-    (insert last-command-char)))
+    (insert last-command-event)))
 
 (defun inferior-moz-input-sender (proc string)
   "Custom function to send input with comint-send-input.
@@ -233,6 +240,8 @@ See also `inferior-moz-start-process'."
         (inferior-moz-start-process)
         (inferior-moz-process))))
 
+(defvar mozrepl-home-page "http://hyperstruct.net/projects/mozrepl")
+
 (defun inferior-moz-start-process ()
   "Start an inferior Mozrepl process and connect to Firefox.
 It runs the hook `inferior-moz-hook' after starting the process
@@ -249,29 +258,29 @@ Note that you have to start the MozRepl server from Firefox."
           (inferior-moz-mode)
           (run-hooks 'inferior-moz-hook)))
     (file-error
-     (with-output-to-temp-buffer "*MozRepl Error*"
-       (with-current-buffer (get-buffer "*MozRepl Error*")
-         (insert "Can't start MozRepl, the error message was:\n"
+     (with-output-to-temp-buffer (help-buffer)
+       (help-setup-xref (list #'describe-function 'inferior-moz-start-process) (interactive-p))
+       (with-current-buffer (help-buffer)
+         (insert "Can't start MozRepl, the error message was:\n\n     "
                  (error-message-string err)
                  "\n"
-                 "\n  A possible reason is that you have not installed"
-                 "\n  the MozLab add-on to Firefox or that you have not"
-                 "\n  started it.  You start it from the menus in Firefox:"
+                 "\nA possible reason is that you have not installed"
+                 "\nthe MozRepl add-on to Firefox or that you have not"
+                 "\nstarted it.  You start it from the menus in Firefox:"
                  "\n\n    Tools / MozRepl / Start"
                  "\n"
-                 "\n  See ")
+                 "\nSee ")
          (insert-text-button
-          "MozLab home page"
+          "MozRepl home page"
           'action (lambda (button)
-                    (browse-url
-                     "http://hyperstruct.net/projects/mozlab")
-                    )
+                    (browse-url mozrepl-home-page))
+          'help-echo mozrepl-home-page
           'face 'button)
          (insert
           " for more information."
           "\n"
-          "\n  MozLab is also available directly from Firefox add-on"
-          "\n  pages, but is updated less frequently there.")
+          "\nMozRepl is also available directly from Firefox add-on"
+          "\npages, but is updated less frequently there.")
          ))
      (error "Can't start MozRepl"))))
 
diff --git a/elpa-to-submit/nxhtml/related/mozadd.el b/elpa-to-submit/nxhtml/related/mozadd.el
new file mode 100644
index 0000000000..afdb134ce6
--- /dev/null
+++ b/elpa-to-submit/nxhtml/related/mozadd.el
@@ -0,0 +1,364 @@
+;;; mozadd.el --- Additional functionality for MozRepl
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-07-22 Wed
+(defconst mozadd:version "0.2") ;; Version:
+;; Last-Updated: 2009-08-04 Tue
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+  ;; `cc-cmds', `cc-defs', `cc-engine', `cc-vars', `comint', `json',
+  ;; `moz', `regexp-opt', `ring'.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Live tracking of editing changes, see
+;;   `mozadd-mirror-mode'
+;;   `mozadd-refresh-edited-on-save-mode'
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(require 'moz)
+(require 'json)
+
+(defun mozadd-warning (format-string &rest args)
+  (let ((str (apply 'format format-string args)))
+    (message "%s" (propertize str 'face 'secondary-selection))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Refresh Firefox after save etc
+
+;; Partly after an idea on EmacsWiki
+
+(defconst mozadd-edited-buffer nil)
+
+;;;###autoload
+(define-minor-mode mozadd-refresh-edited-on-save-mode
+  "Refresh mozadd edited file in Firefox when saving file.
+The mozadd edited file is the file in the last buffer visited in
+`mozadd-mirror-mode'.
+
+You can use this for example when you edit CSS files.
+
+The mozadd edited file must be shown in Firefox and visible."
+  :lighter "MozRefresh"
+  (if mozadd-refresh-edited-on-save-mode
+      (add-hook 'after-save-hook 'mozadd-queue-reload-mozilla-edited-file nil t)
+    (remove-hook 'after-save-hook 'mozadd-queue-reload-mozilla-edited-file t)))
+(put 'mozadd-refresh-edited-on-save-mode 'permanent-local t)
+
+;;;###autoload
+(define-globalized-minor-mode global-mozadd-refresh-edited-on-save-mode
+  mozadd-refresh-edited-on-save-mode
+  (lambda ()
+    (when (or (derived-mode-p 'css-mode)
+              (mozadd-html-buffer-file-p))
+      (mozadd-refresh-edited-on-save-mode 1))))
+
+(defun mozadd-queue-reload-mozilla-edited-file ()
+  "Reload edited file."
+  (when (buffer-live-p mozadd-edited-buffer)
+    (if (buffer-modified-p mozadd-edited-buffer)
+        (mozadd-warning "Mozadd: Edited buffer %s is not saved, can't reload browser."
+                          (buffer-name mozadd-edited-buffer))
+      (mozadd-add-queue-get-mirror-location)
+      (mozadd-add-task-1 'mozadd-send-refresh-edited-to-mozilla))))
+
+(defun mozadd-send-refresh-edited-to-mozilla ()
+  "Update the remote mozrepl instance"
+  (with-current-buffer mozadd-edited-buffer
+    (if (not (mozadd-edited-file-is-shown))
+        (mozadd-warning "Mozadd: Edited buffer %s is not shown, can't reload browser."
+                          (buffer-name mozadd-edited-buffer))
+      (comint-send-string (inferior-moz-process)
+                          "setTimeout(BrowserReload(), \"1000\");")))
+  (mozadd-exec-next))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Mirror html buffer in Firefox
+
+;; Partly after an idea on
+;; http://people.internetconnection.net/2009/02/interactive-html-development-in-emacs/
+
+;; Fun, it kind of works, but is perhaps totally useless .... - slow
+;; and maybe scrolling... - but the file I am testing with have 3000
+;; lines...
+
+;; Fix-me: How do you get the currently shown page in Firefox?
+
+(defun mozadd-perhaps-start ()
+  "Start if MozRepl if not running. Return message if not ok."
+  (unless (buffer-live-p inferior-moz-buffer)
+    (condition-case err
+        (progn
+          (inferior-moz-start-process)
+          nil)
+      (error (error-message-string err)))))
+
+(defvar mozadd-mirror-location nil)
+(make-variable-buffer-local 'mozadd-mirror-location)
+(put 'mozadd-mirror-location 'permanent-local t)
+
+(defvar mozadd-initial-mirror-location nil)
+(make-variable-buffer-local 'mozadd-initial-mirror-location)
+(put 'mozadd-initial-mirror-location 'permanent-local t)
+
+;;(mozadd-get-comint-string-part "\"hi\" there")
+(defun mozadd-get-comint-string-part (comint-output)
+  (save-match-data
+    (if (string-match "^\".*?\"" comint-output)
+        (match-string 0 comint-output)
+      comint-output)))
+
+(defun mozadd-get-initial-mirror-location (comint-output)
+  ;;(message "mozadd-get-initial-mirror-location %S" comint-output)
+  (with-current-buffer mozadd-edited-buffer
+    (setq mozadd-initial-mirror-location (mozadd-get-comint-string-part comint-output)))
+  (mozadd-exec-next)
+  comint-output)
+
+(defun mozadd-get-mirror-location (comint-output)
+  ;;(message "mozadd-get-mirror-location %S" comint-output)
+  (with-current-buffer mozadd-edited-buffer
+    (setq mozadd-mirror-location (mozadd-get-comint-string-part comint-output)))
+  (mozadd-exec-next)
+  comint-output)
+
+(defun mozadd-add-queue-get-mirror-location ()
+  (mozadd-add-task "content.location.href" 'mozadd-get-mirror-location))
+
+(defun mozadd-skip-output-until-prompt (comint-output)
+  ;;(message "mozadd-skip-output-until-prompt %S" comint-output)
+  (if (not (string-match-p "\\(\\w+\\)> $" comint-output))
+      ""
+    ;;(message "done  recieve %s" (current-time-string))
+    (mozadd-exec-next)
+    comint-output
+    ""
+    ))
+
+(defun mozadd-queue-send-buffer-content-to-mozilla (buffer)
+  (mozadd-add-queue-get-mirror-location)
+  (setq mozadd-edited-buffer buffer)
+  (mozadd-add-task-1 'mozadd-send-buffer-content-to-mozilla))
+
+(defun mozadd-edited-file-is-shown ()
+  (with-current-buffer mozadd-edited-buffer
+    (string= mozadd-mirror-location mozadd-initial-mirror-location)))
+
+(defvar mozadd-xml-path-outline-style "2px solid red")
+(defun mozadd-send-buffer-content-to-mozilla ()
+  "Update the remote mozrepl instance"
+  (with-current-buffer mozadd-edited-buffer
+    (if (mozadd-edited-file-is-shown)
+        (mozadd-requeue-me-as-task
+         (concat "content.document.body.innerHTML="
+                 (json-encode
+                  (save-restriction
+                    (widen)
+                    (let ((where-points nil)
+                          (str "")
+                          (p1 (point-min))
+                          p2)
+                      ;; If nxml-where-mode is on add corresponding outline style.
+                      (when (and (boundp 'nxml-where-mode) nxml-where-mode)
+                        (mapc (lambda (ovl)
+                                (when (overlay-get ovl 'nxml-where)
+                                  (when (/= ?/ (1+ (char-after (overlay-start ovl))))
+                                    (push (1- (overlay-end ovl)) where-points))))
+                              (overlays-in (point-min) (point-max)))
+                        (setq where-points (sort where-points '<)))
+                      (dolist (p2 where-points)
+                        (setq str (concat str
+                                          (buffer-substring-no-properties p1
+                                                                          p2)))
+                        (setq str (concat str
+                                          " style=\"outline: "
+                                          mozadd-xml-path-outline-style
+                                          "\""))
+                        (setq p1 p2)
+                        )
+                      (setq str (concat str
+                                        (buffer-substring-no-properties p1
+                                                                        (point-max))))
+                      str))
+                  )
+                 ";")
+         'mozadd-skip-output-until-prompt)
+      (mozadd-skip-current-task))
+    ;; Timer to avoid looping
+    (run-with-idle-timer 0 nil 'mozadd-maybe-exec-next)
+    ))
+
+(defconst mozadd-current-task nil)
+(defconst mozadd-task-queue nil)
+;;(mozadd-add-task "content.location.href" 'mozadd-get-initial-mirror-location)
+;;(mozadd-add-task "hi" 1)
+;;(mozadd-add-task "hm" 2)
+(defun mozadd-clear-exec-queue ()
+  (setq mozadd-current-task nil)
+  (setq mozadd-task-queue nil)
+  (when (buffer-live-p inferior-moz-buffer)
+    (with-current-buffer inferior-moz-buffer
+      (dolist (fun (buffer-local-value 'comint-preoutput-filter-functions (current-buffer)))
+        (remove-hook 'comint-preoutput-filter-functions fun t)))))
+
+(defun mozadd-add-task (input task)
+  (mozadd-add-task-1 (list input task)))
+
+(defun mozadd-add-task-1 (task)
+  (setq mozadd-task-queue (cons task mozadd-task-queue))
+  (setq mozadd-task-queue (reverse mozadd-task-queue))
+  ;;(message "add-task: mozadd-task-queue=%S, current=%s" mozadd-task-queue mozadd-current-task)
+  (mozadd-maybe-exec-next))
+
+(defun mozadd-maybe-exec-next ()
+  ;;(message "mozadd-maybe-exec-next, current=%s" mozadd-current-task)
+  (unless mozadd-current-task
+    (mozadd-exec-next)))
+
+(defun mozadd-exec-next ()
+  (when mozadd-current-task
+    (let* ((old-task mozadd-current-task) ;;(pop mozadd-task-queue))
+           (old-filter (when (listp old-task) (nth 1 old-task))))
+      (when (and old-filter (buffer-live-p inferior-moz-buffer))
+        (with-current-buffer inferior-moz-buffer
+          (remove-hook 'comint-preoutput-filter-functions old-filter t)))))
+  (setq mozadd-current-task nil)
+  (when mozadd-task-queue
+    (let* ((this  (pop mozadd-task-queue))
+           (input (when (listp this) (nth 0 this)))
+           (task  (when (listp this) (nth 1 this)))
+           )
+      (setq mozadd-current-task this)
+      ;;(message "EXEC: %s" this)
+      (if (not (listp this))
+          (funcall this)
+        (when (buffer-live-p inferior-moz-buffer)
+          (with-current-buffer inferior-moz-buffer
+            (add-hook 'comint-preoutput-filter-functions task nil t)))
+        (comint-send-string (inferior-moz-process) input)))))
+
+(defun mozadd-skip-current-task ()
+  ;;(message "mozadd-skip-current-task")
+  ;;(pop mozadd-task-queue)
+  (setq mozadd-current-task nil))
+
+(defun mozadd-requeue-me-as-task (input task)
+  (mozadd-skip-current-task)
+  ;;(message "mozadd-requeue-me-as-task %S %S" input task)
+  (setq mozadd-task-queue (cons (list input task) mozadd-task-queue)))
+
+(defcustom mozadd-browseable-file-extensions
+  '("html" "htm" "xhtml")
+  "File extensions possibly viewable in a web browser."
+  :type '(repeat (string :tag "File extension (without leading dot)"))
+  :group 'mozadd)
+
+(defun mozadd-html-buffer-file-p ()
+  "Return non-nil if buffer file is viewable in a web browser."
+  (when (buffer-file-name)
+    (member (file-name-extension (buffer-file-name))
+            mozadd-browseable-file-extensions)))
+
+;;;###autoload
+(define-minor-mode mozadd-mirror-mode
+  "Mirror content of current file buffer immediately in Firefox.
+When you turn on this mode the file will be opened in Firefox.
+Every change you make in the buffer will trigger a redraw in
+Firefox - regardless of if you save the file or not.
+
+For the mirroring to work the edited file must be shown in
+Firefox and visible.
+
+If `nxml-where-mode' is on the marks will also be shown in
+Firefox as CSS outline style.  You can customize the style
+through the option `mozadd-xml-path-outline-style'.
+
+See also `mozadd-refresh-edited-on-save-mode'."
+  nil
+  :lighter " MozMirror"
+  :group 'mozadd
+  (if mozadd-mirror-mode
+      (unless (catch 'ok
+                (unless (mozadd-html-buffer-file-p)
+                  (mozadd-warning "You can only mirror html file buffers")
+                  (throw 'ok nil))
+                (when (buffer-modified-p)
+                  (mozadd-warning "Please save buffer first")
+                  (throw 'ok nil))
+                (let ((msg (mozadd-perhaps-start)))
+                  (when msg
+                    (mozadd-warning msg)
+                    (throw 'ok nil)))
+                (mozadd-clear-exec-queue)
+                (setq mozadd-edited-buffer (current-buffer))
+                (mozadd-add-task (concat "content.location.href = "
+                                         "\"file:///" (buffer-file-name) "\";")
+                                 'mozadd-get-initial-mirror-location)
+                (add-hook 'after-change-functions 'mozadd-update-mozilla t t)
+                (add-hook 'nxhtml-where-hook 'mozadd-update-mozilla t t)
+                (add-hook 'post-command-hook 'mozadd-edited-buffer-post-command)
+                t)
+        (setq mozadd-mirror-mode nil))
+    (setq mozadd-edited-buffer nil)
+    (remove-hook 'post-command-hook 'mozadd-edited-buffer-post-command)
+    (remove-hook 'nxhtml-where-hook 'mozadd-update-mozilla t)
+    (remove-hook 'after-change-functions 'mozadd-update-mozilla t)))
+(put 'mozadd-mirror-mode 'permanent-local t)
+
+;;;###autoload
+(define-globalized-minor-mode global-mozadd-mirror-mode mozadd-mirror-mode
+  (lambda ()
+    (when (mozadd-html-buffer-file-p)
+      (mozadd-mirror-mode 1))))
+
+(defun mozadd-edited-buffer-post-command ()
+  "Check if we are in a new edited buffer."
+  (when mozadd-mirror-mode
+    (setq mozadd-edited-buffer (current-buffer))))
+
+
+(defvar mozadd-buffer-content-to-mozilla-timer nil)
+
+(defun mozadd-update-mozilla (&rest ignored)
+  (when (timerp mozadd-buffer-content-to-mozilla-timer)
+    (cancel-timer mozadd-buffer-content-to-mozilla-timer))
+  (setq mozadd-buffer-content-to-mozilla-timer
+        (run-with-idle-timer 1 nil 'mozadd-queue-send-buffer-content-to-mozilla (current-buffer))))
+(put 'mozadd-update-mozilla 'permanent-local-hook t)
+
+
+(provide 'mozadd)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; mozadd.el ends here
diff --git a/elpa-to-submit/nxhtml/related/php-imenu.el b/elpa-to-submit/nxhtml/related/php-imenu.el
index 1255ef8136..560bac032a 100644
--- a/elpa-to-submit/nxhtml/related/php-imenu.el
+++ b/elpa-to-submit/nxhtml/related/php-imenu.el
@@ -33,7 +33,7 @@
 ;;;--------------cut here-------------------------------------------
 ;   ;; Load the php-imenu index function
 ;   (autoload 'php-imenu-create-index "php-imenu" nil t)
-;   ;; Add the index creation function to the php-mode-hook 
+;   ;; Add the index creation function to the php-mode-hook
 ;   (add-hook 'php-mode-user-hook 'php-imenu-setup)
 ;   (defun php-imenu-setup ()
 ;     (setq imenu-create-index-function (function php-imenu-create-index))
@@ -57,6 +57,7 @@
 ;;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'imenu)
 (require 'thingatpt)
 
@@ -78,13 +79,13 @@
             "\\([a-zA-Z0-9_[:space:]\n]*\\)" ; extends / implements clauses
             "[{]")
     (lambda ()
-      (message "%S %S" 
-               (match-string-no-properties 3) 
-               (match-string-no-properties 1)) 
-      (concat (match-string-no-properties 3) 
-              " - " 
+      (message "%S %S"
+               (match-string-no-properties 3)
+               (match-string-no-properties 1))
+      (concat (match-string-no-properties 3)
+              " - "
               (match-string-no-properties 1)))
-    (lambda () 
+    (lambda ()
       (save-excursion
         (backward-up-list 1)
         (forward-sexp)
@@ -121,26 +122,26 @@
       result)))
 
 (defun php-imenu-create-index-helper (min max name)
-  (let ((combined-pattern 
-         (concat "\\(" 
+  (let ((combined-pattern
+         (concat "\\("
                  (mapconcat
-                  (function (lambda (pat) (first pat))) 
-		  php-imenu-patterns "\\)\\|\\(") 
+                  (function (lambda (pat) (first pat)))
+		  php-imenu-patterns "\\)\\|\\(")
 		 "\\)"))
         (index-alist '()))
     (goto-char min)
-    (save-match-data 
+    (save-match-data
       (while (re-search-forward combined-pattern max t)
         (let ((pos (set-marker (make-marker) (match-beginning 0)))
               (min (match-end 0))
-              (pat (save-excursion 
+              (pat (save-excursion
                      (goto-char (match-beginning 0))
-                     (find-if (function 
+                     (find-if (function
                                (lambda (pat) (looking-at (first pat))))
                               php-imenu-patterns))))
           (when (not pat)
             (message "php-imenu: How can no pattern get us here! %S" pos))
-          (when (and pat 
+          (when (and pat
                       (not (php-imenu-in-string-p))
                      )
             (let* ((name (funcall (second pat)))
@@ -165,7 +166,7 @@
   (save-match-data
     (or (in-string-p)
         (let ((pt (point)))
-          (save-excursion 
+          (save-excursion
             (and (re-search-backward "<<<\\([A-Za-z0-9_]+\\)$" nil t)
                  (not (re-search-forward (concat "^"
                                                  (match-string-no-properties 1)
diff --git a/elpa-to-submit/nxhtml/related/php-mode.el b/elpa-to-submit/nxhtml/related/php-mode.el
index ce94946a9a..61e76ed861 100644
--- a/elpa-to-submit/nxhtml/related/php-mode.el
+++ b/elpa-to-submit/nxhtml/related/php-mode.el
@@ -10,7 +10,7 @@
 ;; Modified: 2008-11-28 Fri
 ;; X-URL:   http://php-mode.sourceforge.net/
 
-(defconst php-mode-version-number "1.5.0-nxhtml"
+(defconst php-mode-version-number "1.5.0-nxhtml-1.88"
   "PHP Mode version number.")
 
 ;;; License
@@ -70,6 +70,19 @@
 
 ;;; Changelog:
 
+;; 1.5.0-nxhtml-1.88 (Lennart Borgman)
+;;   Don't indent heredoc end mark
+;; 1.5.0-nxhtml-1.61 (Lennart Borgman)
+;;   Added php-mode-to-use.
+;;   Made underscore be part of identifiers.
+;;   Remove php-mode-to.
+;;   Make the indentation check only on current line.
+;;   Warn only once per session about indentation.
+;;   Tell if can't complete in `php-complete-function'.
+;;   Move back point after checking indentation in
+;;   `php-check-html-for-indentation'.
+;;   Add `c-at-vsemi-p-fn' etc after advice from Alan Mackenzie.
+;;
 ;; 1.5
 ;;   Support function keywords like public, private and the ampersand
 ;;   character for function-based commands.  Support abstract, final,
@@ -84,29 +97,6 @@
 ;;   consistency of code.  Remove conditional bindings and XEmacs code
 ;;   that likely does nothing.
 ;;
-;; 1.4.1d-nxhtml
-;;   Move back point after checking indentation in
-;;   `php-check-html-for-indentation'.
-;;
-;; 1.4.1c-nxhtml
-;;   Add `c-at-vsemi-p-fn' etc after advice from Alan Mackenzi.
-;;
-;; 1.4.1b-nxhtml
-;;   Remove php-mode-to.
-;;   Make the indentation check only on current line.
-;;   Warn only once per session about indentation.
-;;   Tell if can't complete in `php-complete-function'.
-;;
-;; 1.4.1a-nxhtml
-;;   Made underscore be part of identifiers.
-;;
-;; 1.4.1-nxhtml
-;;   Added php-mode-to-use.
-
-;; 1.4.1
-;;   Modified `php-check-html-for-indentation' to check for multiple
-;;   mode support libraries. (Lennart Borgman)
-;;
 ;; 1.4
 ;;   Updated GNU GPL to version 3.  Ported to Emacs 22 (CC mode
 ;;   5.31). M-x php-mode-version shows version.  Provide end-of-defun
@@ -124,6 +114,7 @@
 
 ;;; Code:
 
+(require 'add-log)
 (require 'speedbar)
 (require 'font-lock)
 (require 'cc-mode)
@@ -356,7 +347,15 @@ example `html-mode'.  Known such libraries are:\n\t"
 (defun php-cautious-indent-line ()
   (if (or php-warned-bad-indent
           (php-check-html-for-indentation))
-      (funcall 'c-indent-line)))
+      (let ((here (point))
+            doit)
+        (move-beginning-of-line nil)
+        ;; Don't indent heredoc end mark
+        (save-match-data
+          (unless (looking-at "[a-zA-Z0-9]+;\n")
+            (setq doit t)))
+        (when doit
+          (funcall 'c-indent-line)))))
 
 (defconst php-tags '("<?php" "?>" "<?" "<?="))
 (defconst php-tags-key (regexp-opt php-tags))
diff --git a/elpa-to-submit/nxhtml/related/smarty-mode.el b/elpa-to-submit/nxhtml/related/smarty-mode.el
index 5324932cc0..44ab205335 100644
--- a/elpa-to-submit/nxhtml/related/smarty-mode.el
+++ b/elpa-to-submit/nxhtml/related/smarty-mode.el
@@ -1,9 +1,9 @@
 ;;; smarty-mode.el --- major mode for editing Smarty templates
 
 ;; Author:       Vincent DEBOUT <deboutv@free.fr>
-;; Maintainer:  Vincent DEBOUT <deboutv@free.fr>
-;; Keywords:    languages smarty templates
-;; WWW:         http://deboutv.free.fr/lisp/smarty/
+;; Maintainer:	Vincent DEBOUT <deboutv@free.fr>
+;; Keywords:	languages smarty templates
+;; WWW:		http://deboutv.free.fr/lisp/smarty/
 
 ;;; License
 
@@ -21,107 +21,25 @@
 ;; along with this program; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
-;;; Commentary:
-
-;; 2.3 Installation
-;; ================
-;;
-;; 2.3.1 Installation
-;; ------------------
-;;
-;; To install Smarty Mode you need to choose an installation directory
-;; (for example `/usr/local/share/lisp' or `c:\lisp'). The administrator
-;; must have the write rights on this directory.
-;;
-;; With your favorite unzip software, unzip the archive in the
-;; installation directory.
-;;
-;; Example:
-;;      cd /usr/local/share/lisp
-;;      tar zxvf smarty-0.0.4.tar.gz
-;; Now you have a `smarty' directory in the installation directory. This
-;; directory contains 2 files `smarty-mode.el' and `smarty-mode.elc' and
-;; another directory `docs' containing the documentation.
-;;
-;; You need to configure XEmacs. open you initialization file `init.el'
-;; (open the file or start XEmacs then choose the Options menu and Edit
-;; Init File). Add the following lines (the installation directory in
-;; this example is `/usr/local/share/lisp') :
-;;
-;;      (setq load-path
-;;            (append (list \"/usr/local/share/lisp/\") load-path))
-;;      (autoload 'smarty-mode \"smarty-mode\" \"Smarty Mode\" t)
-;;
-;; 2.3.2 Update
-;; ------------
-;;
-;; The update is easy. You need to unzip the archive in the installation
-;; directory to remove the old release.
-;;
-;; Example:
-;;      cd /usr/local/share/lisp
-;;      rm -rf smarty
-;;      tar zxvf smarty-0.0.4.tar.gz
-;;
-;; 2.4 Invoke Smarty-Mode
-;; ======================
-;;
-;; You have two possibilities to invoke the Smarty Mode.
-;;
-;;    - Manually: At each file opening you need to launch Smarty Mode
-;;      with the following command:
-;;
-;;      `M-x smarty-mode'
-;;
-;;    - Automatically: Add the following linesin your initialization
-;;      file `init.el' :
-;;
-;;           (setq auto-mode-alist
-;;                 (append
-;;                  '((\"\\.tpl$\" . smarty-mode))
-;;               auto-mode-alist))
-
-
-;;; History
-
-;; $Log: smarty-mode.el,v $
-
-;; Beta version 2008/01/16 Lennart Borgman
-;; - Changed to work with Viper
-;; - Changed to allow (expand-abbrev) to be called anywhere.
-;; - Moved the installation instructions to the beginning of the file.
-;; - Checked before insertion of { if it it feasable.
-;; - Initialized smarty-template-map the standard way
-
-;; Revision 1.6  2006/12/16 19:54:26  vincent
-;; Update release version
-;;
-;; Revision 1.5  2006/12/16 19:53:00  vincent
-;; Fix bug #15
-;;
-;; Revision 1.4  2006/12/16 14:59:46  vincent
-;; Fix bugs for release
-;;
-;; Revision 1.3  2006/11/19 12:29:53  vincent
-;; Fix highlight bug, add templates
-;;
-;; Revision 1.2  2006/11/12 11:44:18  vincent
-;; First release commit
-;;
-
-(defconst smarty-version "0.0.4"
+(defconst smarty-version "0.0.5"
   "Smarty Mode version number.")
 
-(defconst smarty-time-stamp "2006-12-16"
+(defconst smarty-time-stamp "2007-11-01"
   "Smarty Mode time stamp for last update.")
 
+(defconst smarty-is-xemacs (string-match "XEmacs" emacs-version)
+  "Non-nil if XEmacs is used.")
+
 (require 'font-lock)
-(require 'cc-mode)
-(require 'custom)
-(require 'etags)
+(when (not smarty-is-xemacs)
+  (require 'cc-mode)
+  (require 'custom)
+  (require 'etags))
 (eval-when-compile
-(require 'regexp-opt))
+  (require 'regexp-opt))
+(when smarty-is-xemacs
+  (require 'easymenu)
+  (require 'hippie-exp))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Customization
@@ -311,25 +229,25 @@ Otherwise, case is ignored."
 elements > `smarty-menu-max-size'."
   (if (> (length list) smarty-menu-max-size)
       (let ((remain list)
-            (result '())
-            (sublist '())
-            (menuno 1)
-            (i 0))
-        (while remain
-          (setq sublist (cons (car remain) sublist))
-          (setq remain (cdr remain))
-          (setq i (+ i 1))
-          (if (= i smarty-menu-max-size)
-              (progn
-                (setq result (cons (cons (format "%s %s" title menuno)
-                                         (nreverse sublist)) result))
-                (setq i 0)
-                (setq menuno (+ menuno 1))
-                (setq sublist '()))))
-        (and sublist
-             (setq result (cons (cons (format "%s %s" title menuno)
-                                      (nreverse sublist)) result)))
-        (nreverse result))
+	    (result '())
+	    (sublist '())
+	    (menuno 1)
+	    (i 0))
+	(while remain
+	  (setq sublist (cons (car remain) sublist))
+	  (setq remain (cdr remain))
+	  (setq i (+ i 1))
+	  (if (= i smarty-menu-max-size)
+	      (progn
+		(setq result (cons (cons (format "%s %s" title menuno)
+					 (nreverse sublist)) result))
+		(setq i 0)
+		(setq menuno (+ menuno 1))
+		(setq sublist '()))))
+	(and sublist
+	     (setq result (cons (cons (format "%s %s" title menuno)
+				      (nreverse sublist)) result)))
+	(nreverse result))
     list))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -345,15 +263,15 @@ The directory of the current source file is scanned."
   (interactive)
   (message "Scanning directory for source files ...")
   (let ((newmap (current-local-map))
-        (file-list (smarty-get-source-files))
-        menu-list found)
+	(file-list (smarty-get-source-files))
+	menu-list found)
     ;; Create list for menu
     (setq found nil)
     (while file-list
       (setq found t)
       (setq menu-list (cons (vector (car file-list)
-                                   (list 'find-file (car file-list)) t)
-                           menu-list))
+				   (list 'find-file (car file-list)) t)
+			   menu-list))
       (setq file-list (cdr file-list)))
     (setq menu-list (smarty-menu-split menu-list "Sources"))
     (when found (setq menu-list (cons "--" menu-list)))
@@ -362,7 +280,7 @@ The directory of the current source file is scanned."
     ;; Create menu
     (easy-menu-add menu-list)
     (easy-menu-define smarty-sources-menu newmap
-                      "Smarty source files menu" menu-list))
+		      "Smarty source files menu" menu-list))
   (message ""))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -433,6 +351,12 @@ The directory of the current source file is scanned."
       ["upper" smarty-template-upper t]
       ["wordwrap" smarty-template-wordwrap t])
      ("Plugins (Functions)"
+      ("BlockRepeatPlugin"
+       ["repeat" smarty-template-repeat t]
+       ["str_repeat" smarty-template-str-repeat t])
+      ("ClipCache"
+       ["clipcache" smarty-template-clipcache t]
+       ["include_clipcache" smarty-template-include-clipcache t])
       ("SmartyFormtool"
        ["formtool_checkall" smarty-template-formtool-checkall t]
        ["formtool_copy" smarty-template-formtool-copy t]
@@ -468,7 +392,7 @@ The directory of the current source file is scanned."
      ["Insert Date" smarty-template-insert-date t]
      ["Modify Date" smarty-template-modify t])
     "--"
-    ["Show Messages" smarty-show-messages]
+    ["Show Messages" smarty-show-messages :keys "C-c M-m"]
     ["Smarty Mode Documentation" smarty-doc-mode :keys "C-c C-h"]
     ["Version" smarty-version :keys "C-c C-v"]
     "--"
@@ -476,48 +400,48 @@ The directory of the current source file is scanned."
      ("Mode"
       ["Electric Mode"
        (progn (customize-set-variable 'smarty-electric-mode
-                                      (not smarty-electric-mode))
-              (smarty-mode-line-update))
+				      (not smarty-electric-mode))
+	      (smarty-mode-line-update))
        :style toggle :selected smarty-electric-mode :keys "C-c C-m C-e"]
       ["Stutter Mode"
        (progn (customize-set-variable 'smarty-stutter-mode
-                                      (not smarty-stutter-mode))
-              (smarty-mode-line-update))
+				      (not smarty-stutter-mode))
+	      (smarty-mode-line-update))
        :style toggle :selected smarty-stutter-mode :keys "C-c C-m C-s"]
       "--"
       ["Customize Group..." (customize-group 'smarty-mode) t])
      ("Menu"
       ["Source Menu"
        (customize-set-variable 'smarty-source-file-menu
-                               (not smarty-source-file-menu))
+			       (not smarty-source-file-menu))
        :style toggle :selected smarty-source-file-menu]
       "--"
       ["Customize Group..." (customize-group 'smarty-menu) t])
      ("Highlight"
       ["Highlight plugin functions"
        (progn (customize-set-variable 'smarty-highlight-plugin-functions
-                                      (not smarty-highlight-plugin-functions)))
+				      (not smarty-highlight-plugin-functions)))
        :style toggle :selected smarty-highlight-plugin-functions]
       "--"
       ["Customize Group..." (customize-group 'smarty-highlight) t])
      ("Template"
       ("Header"
        ["Header template..."
-        (customize-option 'smarty-file-header) t]
+	(customize-option 'smarty-file-header) t]
        ["Footer template..."
-        (customize-option 'smarty-file-footer) t]
+	(customize-option 'smarty-file-footer) t]
        ["Company..."
-        (customize-option 'smarty-company-name) t]
+	(customize-option 'smarty-company-name) t]
        ["Copyright..."
-        (customize-option 'smarty-copyright-string) t]
+	(customize-option 'smarty-copyright-string) t]
        ["Date format..."
-        (customize-option 'smarty-date-format) t]
+	(customize-option 'smarty-date-format) t]
        ["Modify date prefix..."
-        (customize-option 'smarty-modify-date-prefix-string) t]
+	(customize-option 'smarty-modify-date-prefix-string) t]
        ["Modify date on saving"
-        (customize-set-variable 'smarty-modify-date-on-saving
-                                (not smarty-modify-date-on-saving))
-        :style toggle :selected smarty-modify-date-on-saving]
+	(customize-set-variable 'smarty-modify-date-on-saving
+				(not smarty-modify-date-on-saving))
+	:style toggle :selected smarty-modify-date-on-saving]
        "--"
        ["Customize Group..." (customize-group 'smarty-header) t])
       "--"
@@ -529,17 +453,17 @@ The directory of the current source file is scanned."
        (customize-option 'smarty-right-delimiter) t]
       ["Use Intelligent Tab"
        (progn (customize-set-variable 'smarty-intelligent-tab
-                                      (not smarty-intelligent-tab))
-              (smarty-activate-customizations))
+				      (not smarty-intelligent-tab))
+	      (smarty-activate-customizations))
        :style toggle :selected smarty-intelligent-tab]
       ["Word Completion in Minibuffer"
        (progn (customize-set-variable 'smarty-word-completion-in-minibuffer
-                                      (not smarty-word-completion-in-minibuffer))
-              (message "Activate new setting by saving options and restarting Emacs"))
+				      (not smarty-word-completion-in-minibuffer))
+	      (message "Activate new setting by saving options and restarting Emacs"))
        :style toggle :selected smarty-word-completion-in-minibuffer]
       ["Completion is case sensitive"
        (customize-set-variable 'smarty-word-completion-case-sensitive
-                               (not smarty-word-completion-case-sensitive))
+			       (not smarty-word-completion-case-sensitive))
        :style toggle :selected smarty-word-completion-case-sensitive]
       "--"
       ["Customize Group..." (customize-group 'smarty-misc) t])
@@ -561,7 +485,7 @@ The directory of the current source file is scanned."
   (setq smarty-mode-menu-list (smarty-create-mode-menu))
   (easy-menu-add smarty-mode-menu-list)
   (easy-menu-define smarty-mode-menu smarty-mode-map
-                    "Menu keymap for Smarty Mode." smarty-mode-menu-list))
+		    "Menu keymap for Smarty Mode." smarty-mode-menu-list))
 
 
 
@@ -575,7 +499,7 @@ The directory of the current source file is scanned."
   "Regexp for Smarty functions.")
 
 (defconst smarty-01-functions
-  '("capture" "config_load" "foreach" "foreachelse" "include"
+  '("capture" "config_load" "foreach" "foreachelse" "include" 
     "include_php" "insert" "if" "elseif" "else" "ldelim" "rdelim"
     "literal" "php" "section" "sectionelse" "strip" "assign" "counter"
     "cycle" "debug" "eval" "fetch" "html_checkboxes" "html_image"
@@ -608,8 +532,9 @@ The directory of the current source file is scanned."
     "formtool_init" "formtool_move" "formtool_moveall"
     "formtool_movedown" "formtool_moveup" "formtool_remove"
     "formtool_rename" "formtool_save" "formtool_selectall"
-    "paginate_first" "paginate_last" "paginate_middle"
-    "paginate_next" "paginate_prev")
+    "paginate_first" "paginate_last" "paginate_middle" 
+    "paginate_next" "paginate_prev" "clipcache" "include_clipcache"
+    "repeat" "str_repeat")
   "Smarty plugins functions.")
 
 (defvar smarty-plugins-modifiers nil
@@ -624,11 +549,11 @@ The directory of the current source file is scanned."
 
 (defconst smarty-constants
   (eval-when-compile
-        (regexp-opt
-         '("TRUE" "FALSE" "NULL") t))
+	(regexp-opt
+	 '("TRUE" "FALSE" "NULL") t))
   "Smarty constants.")
-
-
+	   
+	
 ;; Syntax table creation
 (defvar smarty-mode-syntax-table nil
   "Syntax table for smarty-mode.")
@@ -640,7 +565,7 @@ The directory of the current source file is scanned."
   (if smarty-mode-syntax-table
       ()
     (setq smarty-mode-syntax-table (make-syntax-table))
-
+    
     ;; Make | a punctuation character
     (modify-syntax-entry ?| "." smarty-mode-syntax-table)
     ;; Make " a punctuation character so highlighing works withing html strings
@@ -675,17 +600,17 @@ message."
 (defun smarty-get-source-files (&optional full directory)
   "Get list of SMARTY source files in DIRECTORY or current directory."
   (let ((mode-alist auto-mode-alist)
-        filename-regexp)
+	filename-regexp)
     ;; create regular expressions for matching file names
     (setq filename-regexp "\\`[^.].*\\(")
     (while mode-alist
       (when (eq (cdar mode-alist) 'smarty-mode)
-        (setq filename-regexp
-              (concat filename-regexp (caar mode-alist) "\\|")))
+	(setq filename-regexp
+	      (concat filename-regexp (caar mode-alist) "\\|")))
       (setq mode-alist (cdr mode-alist)))
     (setq filename-regexp
-          (concat (substring filename-regexp 0
-                             (string-match "\\\\|$" filename-regexp)) "\\)"))
+	  (concat (substring filename-regexp 0
+			     (string-match "\\\\|$" filename-regexp)) "\\)"))
     ;; find files
     (smarty-directory-files
      (or directory default-directory) full filename-regexp)))
@@ -707,11 +632,12 @@ message."
 
 (defun smarty-warning-when-idle (&rest args)
   "Wait until idle, then print out warning STRING and beep."
-  (if noninteractive
-      (smarty-warning (apply 'format args) t)
-    (unless smarty-warnings
-      (smarty-run-when-idle .1 nil 'smarty-print-warnings))
-    (setq smarty-warnings (cons (apply 'format args) smarty-warnings))))
+  (save-match-data ;; runs in timer
+    (if noninteractive
+        (smarty-warning (apply 'format args) t)
+      (unless smarty-warnings
+        (smarty-run-when-idle .1 nil 'smarty-print-warnings))
+      (setq smarty-warnings (cons (apply 'format args) smarty-warnings)))))
 
 (defun smarty-warning (string &optional nobeep)
   "Print out warning STRING and beep."
@@ -751,21 +677,21 @@ Ignore byte-compiler warnings you might see."
   "Enable case insensitive search and switch to syntax table that includes '_',
 then execute BODY, and finally restore the old environment.  Used for
 consistent searching."
-  `(let ((case-fold-search t)           ; case insensitive search
-         (current-syntax-table (syntax-table))
-         result
-         (restore-prog                  ; program to restore enviroment
-          '(progn
-             ;; restore syntax table
-             (set-syntax-table current-syntax-table))))
+  `(let ((case-fold-search t)		; case insensitive search
+	 (current-syntax-table (syntax-table))
+	 result
+	 (restore-prog			; program to restore enviroment
+	  '(progn
+	     ;; restore syntax table
+	     (set-syntax-table current-syntax-table))))
      ;; use extended syntax table
      (set-syntax-table smarty-mode-ext-syntax-table)
      ;; execute BODY safely
      (setq result
-           (condition-case info
-               (progn ,@body)
-             (error (eval restore-prog) ; restore environment on error
-                    (error (cadr info))))) ; pass error up
+	   (condition-case info
+	       (progn ,@body)
+	     (error (eval restore-prog)	; restore environment on error
+		    (error (cadr info))))) ; pass error up
      ;; restore environment
      (eval restore-prog)
      result))
@@ -774,39 +700,39 @@ consistent searching."
   "Enable case insensitive search, switch to syntax table that includes '_',
 and remove `intangible' overlays, then execute BODY, and finally restore the
 old environment.  Used for consistent searching."
-  `(let ((case-fold-search t)           ; case insensitive search
-         (current-syntax-table (syntax-table))
-         result overlay-all-list overlay-intangible-list overlay
-         (restore-prog                  ; program to restore enviroment
-          '(progn
-             ;; restore syntax table
-             (set-syntax-table current-syntax-table)
-             ;; restore `intangible' overlays
-             (when (fboundp 'overlay-lists)
-               (while overlay-intangible-list
-                 (overlay-put (car overlay-intangible-list) 'intangible t)
-                 (setq overlay-intangible-list
-                       (cdr overlay-intangible-list)))))))
+  `(let ((case-fold-search t)		; case insensitive search
+	 (current-syntax-table (syntax-table))
+	 result overlay-all-list overlay-intangible-list overlay
+	 (restore-prog			; program to restore enviroment
+	  '(progn
+	     ;; restore syntax table
+	     (set-syntax-table current-syntax-table)
+	     ;; restore `intangible' overlays
+	     (when (fboundp 'overlay-lists)
+	       (while overlay-intangible-list
+		 (overlay-put (car overlay-intangible-list) 'intangible t)
+		 (setq overlay-intangible-list
+		       (cdr overlay-intangible-list)))))))
      ;; use extended syntax table
      (set-syntax-table smarty-mode-ext-syntax-table)
      ;; remove `intangible' overlays
      (when (fboundp 'overlay-lists)
        (setq overlay-all-list (overlay-lists))
        (setq overlay-all-list
-             (append (car overlay-all-list) (cdr overlay-all-list)))
+	     (append (car overlay-all-list) (cdr overlay-all-list)))
        (while overlay-all-list
-         (setq overlay (car overlay-all-list))
-         (when (memq 'intangible (overlay-properties overlay))
-           (setq overlay-intangible-list
-                 (cons overlay overlay-intangible-list))
-           (overlay-put overlay 'intangible nil))
-         (setq overlay-all-list (cdr overlay-all-list))))
+	 (setq overlay (car overlay-all-list))
+	 (when (memq 'intangible (overlay-properties overlay))
+	   (setq overlay-intangible-list
+		 (cons overlay overlay-intangible-list))
+	   (overlay-put overlay 'intangible nil))
+	 (setq overlay-all-list (cdr overlay-all-list))))
      ;; execute BODY safely
      (setq result
-           (condition-case info
-               (progn ,@body)
-             (error (eval restore-prog) ; restore environment on error
-                    (error (cadr info))))) ; pass error up
+	   (condition-case info
+	       (progn ,@body)
+	     (error (eval restore-prog)	; restore environment on error
+		    (error (cadr info))))) ; pass error up
      ;; restore environment
      (eval restore-prog)
      result))
@@ -817,9 +743,9 @@ old environment.  Used for consistent searching."
 (defun smarty-mode-line-update ()
   "Update the modeline string for Smarty major mode."
   (setq mode-name (concat "Smarty"
-                          (and (or smarty-electric-mode smarty-stutter-mode) "/")
-                          (and smarty-electric-mode "e")
-                          (and smarty-stutter-mode "s")))
+			  (and (or smarty-electric-mode smarty-stutter-mode) "/")
+			  (and smarty-electric-mode "e")
+			  (and smarty-stutter-mode "s")))
   (force-mode-line-update t))
 
 (defun smarty-electric-mode (arg)
@@ -827,8 +753,8 @@ old environment.  Used for consistent searching."
 Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
   (interactive "P")
   (setq smarty-electric-mode
-        (cond ((or (not arg) (zerop arg)) (not smarty-electric-mode))
-              ((> arg 0) t) (t nil)))
+	(cond ((or (not arg) (zerop arg)) (not smarty-electric-mode))
+	      ((> arg 0) t) (t nil)))
   (smarty-mode-line-update))
 
 (defun smarty-stutter-mode (arg)
@@ -836,8 +762,8 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
 Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
   (interactive "P")
   (setq smarty-stutter-mode
-        (cond ((or (not arg) (zerop arg)) (not smarty-stutter-mode))
-              ((> arg 0) t) (t nil)))
+	(cond ((or (not arg) (zerop arg)) (not smarty-stutter-mode))
+	      ((> arg 0) t) (t nil)))
   (smarty-mode-line-update))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -848,7 +774,7 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
   "Determine if point is in a Smarty literal."
   (save-excursion
     (let ((here (point))
-          start state)
+	  start state)
       (beginning-of-line)
       (setq start (point))
       (goto-char here)
@@ -864,8 +790,8 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
     (save-excursion
       (setq found (re-search-backward (regexp-quote (concat smarty-left-delimiter "*")) nil t))
       (when found
-        (setq result (re-search-forward (regexp-quote (concat "*" smarty-right-delimiter)) here t))
-        (setq result (not result))))
+	(setq result (re-search-forward (regexp-quote (concat "*" smarty-right-delimiter)) here t))
+	(setq result (not result))))
     result))
 
 (defun smarty-after-ldelim ()
@@ -877,8 +803,8 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
       (setq ldelim-point (point-marker))
       (goto-char here)
       (if (and (= here ldelim-point) ldelim-found)
-          t
-        nil))))
+	  t
+	nil))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Words to expand
@@ -901,11 +827,11 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
 
 (defun smarty-abbrev-list-init ()
   (setq smarty-abbrev-list
-        (append
-         (list nil) smarty-functions
-         (list nil) smarty-modifiers
-         (list nil) smarty-plugins-functions
-         (list nil) smarty-plugins-modifiers)))
+	(append
+	 (list nil) smarty-functions
+	 (list nil) smarty-modifiers
+	 (list nil) smarty-plugins-functions
+	 (list nil) smarty-plugins-modifiers)))
 
 (defvar smarty-expand-upper-case nil)
 
@@ -914,30 +840,30 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
   (unless old
     (he-init-string (he-dabbrev-beg) (point))
     (setq he-expand-list
-          (let ((abbrev-list smarty-abbrev-list)
-                (sel-abbrev-list '()))
-            (while abbrev-list
-           ;   (if (stringp (car abbrev-list))
-                ;  (insert (concat " " (car abbrev-list))))
-              (when (or (not (stringp (car abbrev-list)))
-                        (string-match
-                         (concat "^" he-search-string) (car abbrev-list)))
-                (setq sel-abbrev-list
-                      (cons (car abbrev-list) sel-abbrev-list)))
-              (setq abbrev-list (cdr abbrev-list)))
-            (nreverse sel-abbrev-list))))
+	  (let ((abbrev-list smarty-abbrev-list)
+		(sel-abbrev-list '()))
+	    (while abbrev-list
+	   ;   (if (stringp (car abbrev-list))
+		;  (insert (concat " " (car abbrev-list))))
+	      (when (or (not (stringp (car abbrev-list)))
+			(string-match
+			 (concat "^" he-search-string) (car abbrev-list)))
+		(setq sel-abbrev-list
+		      (cons (car abbrev-list) sel-abbrev-list)))
+	      (setq abbrev-list (cdr abbrev-list)))
+	    (nreverse sel-abbrev-list))))
   (while (and he-expand-list
-              (or (not (stringp (car he-expand-list)))
-                  (he-string-member (car he-expand-list) he-tried-table t)))
+	      (or (not (stringp (car he-expand-list)))
+		  (he-string-member (car he-expand-list) he-tried-table t)))
     (unless (stringp (car he-expand-list))
       (setq smarty-expand-upper-case (car he-expand-list)))
     (setq he-expand-list (cdr he-expand-list)))
   (if (null he-expand-list)
       (progn (when old (he-reset-string))
-             nil)
+	     nil)
     (he-substitute-string
      (if smarty-expand-upper-case
-         (upcase (car he-expand-list))
+	 (upcase (car he-expand-list))
        (car he-expand-list))
      t)
     (setq he-expand-list (cdr he-expand-list))
@@ -949,15 +875,15 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
 ;; function for expanding abbrevs and dabbrevs
 (defun smarty-expand-abbrev (arg))
 (fset 'smarty-expand-abbrev (make-hippie-expand-function
-                           '(try-expand-dabbrev
-                             try-expand-dabbrev-all-buffers
-                             smarty-try-expand-abbrev)))
+			   '(try-expand-dabbrev
+			     try-expand-dabbrev-all-buffers
+			     smarty-try-expand-abbrev)))
 
 ;; function for expanding parenthesis
 (defun smarty-expand-paren (arg))
 (fset 'smarty-expand-paren (make-hippie-expand-function
-                          '(try-expand-list
-                            try-expand-list-all-buffers)))
+			  '(try-expand-list
+			    try-expand-list-all-buffers)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Stuttering
@@ -975,16 +901,16 @@ else indent `correctly'."
     ;; expand word
     ((= (char-syntax (preceding-char)) ?w)
      (let ((case-fold-search (not smarty-word-completion-case-sensitive))
-           (case-replace nil)
-           (hippie-expand-only-buffers
-            (or (and (boundp 'hippie-expand-only-buffers)
-                     hippie-expand-only-buffers)
-                '(smarty-mode))))
+	   (case-replace nil)
+	   (hippie-expand-only-buffers
+	    (or (and (boundp 'hippie-expand-only-buffers)
+		     hippie-expand-only-buffers)
+		'(smarty-mode))))
        (smarty-expand-abbrev prefix-arg)))
     ;; expand parenthesis
     ((or (= (preceding-char) ?\() (= (preceding-char) ?\)))
      (let ((case-fold-search (not smarty-word-completion-case-sensitive))
-           (case-replace nil))
+	   (case-replace nil))
        (smarty-expand-paren prefix-arg))))
    (setq this-command 'smarty-electric-tab)))
 
@@ -992,7 +918,7 @@ else indent `correctly'."
   "Expand abbreviations and self-insert space(s)."
   (interactive "p")
   (let ((here (point-marker)) ldelim-found ldelim-point rdelim-found rdelim-point
-        delete-a)
+	delete-a)
     (setq ldelim-found (re-search-backward (regexp-quote smarty-left-delimiter) nil t))
     (re-search-forward (regexp-quote smarty-left-delimiter) here t)
     (setq ldelim-point (point-marker))
@@ -1002,93 +928,93 @@ else indent `correctly'."
     (setq rdelim-point (point-marker))
     (goto-char here)
   (cond ((and (= here ldelim-point) ldelim-found) (insert (concat "ldelim" smarty-right-delimiter)))
-        ((and (= here rdelim-point) rdelim-found)
-         (re-search-backward (regexp-quote (concat " " smarty-right-delimiter)) nil t)
-         (delete-char 1)
-         (insert (concat " " smarty-left-delimiter "rdelim"))
-         (goto-char here))
-        ((smarty-in-comment-p)
-         (self-insert-command count)
-         (cond ((>= (current-column) (+ 2 end-comment-column))
-                (backward-char 1)
-                (skip-chars-backward "^ \t\n")
-                (indent-new-comment-line)
-                (skip-chars-forward "^ \t\n")
-                (forward-char 1))
-               ((>= (current-column) end-comment-column)
-                (indent-new-comment-line))
-               (t nil)))
-        ((or (and (>= (preceding-char) ?a) (<= (preceding-char) ?z))
-             (and (>= (preceding-char) ?A) (<= (preceding-char) ?Z))
-             (and (>= (preceding-char) ?0) (<= (preceding-char) ?9)))
-         (progn
-           (setq here (point-marker))
-           (insert " ")
-           (setq delete-a t)
-           (if (re-search-backward "|" nil t)
-               (progn
-                 (setq found (re-search-forward (regexp-quote "B2Smilies") here t))
-                 (if (and found (= here (point-marker)))
-                     (replace-match "btosmilies")
-                   (setq found (re-search-forward (regexp-quote "bbcode2html") here t))
-                   (if (and found (= here (point-marker)))
-                       (replace-match "bbcodetohtml")
-                     (setq found (re-search-forward (regexp-quote "date_format2") here t))
-                     (if (and found (= here (point-marker)))
-                         (replace-match "date_formatto")
-                       (goto-char here)
-                       (setq delete-a nil)
-                       (delete-char 1)))))
-             (goto-char here)
-             (setq delete-a nil)
-             (delete-char 1)))
-         (smarty-prepare-search-1 (expand-abbrev))
-         (self-insert-command count)
-         (if (and delete-a (looking-at " "))
-             (delete-char 1)))
-        (t (self-insert-command count)))))
-
-(defun smarty-electric-open-bracket (count)
+	((and (= here rdelim-point) rdelim-found) 
+	 (re-search-backward (regexp-quote (concat " " smarty-right-delimiter)) nil t)
+	 (delete-char 1)
+	 (insert (concat " " smarty-left-delimiter "rdelim"))
+	 (goto-char here))
+	((smarty-in-comment-p)
+	 (self-insert-command count)
+	 (cond ((>= (current-column) (+ 2 end-comment-column))
+		(backward-char 1)
+		(skip-chars-backward "^ \t\n")
+		(indent-new-comment-line)
+		(skip-chars-forward "^ \t\n")
+		(forward-char 1))
+	       ((>= (current-column) end-comment-column)
+		(indent-new-comment-line))
+	       (t nil)))
+	((or (and (>= (preceding-char) ?a) (<= (preceding-char) ?z))
+	     (and (>= (preceding-char) ?A) (<= (preceding-char) ?Z))
+	     (and (>= (preceding-char) ?0) (<= (preceding-char) ?9)))
+	 (progn 
+	   (setq here (point-marker))
+	   (insert " ")
+	   (setq delete-a t)
+	   (if (re-search-backward "|" nil t)
+	       (progn 
+		 (setq found (re-search-forward (regexp-quote "B2Smilies") here t))
+		 (if (and found (= here (point-marker)))
+		     (replace-match "btosmilies")
+		   (setq found (re-search-forward (regexp-quote "bbcode2html") here t))
+		   (if (and found (= here (point-marker)))
+		       (replace-match "bbcodetohtml")
+		     (setq found (re-search-forward (regexp-quote "date_format2") here t))
+		     (if (and found (= here (point-marker)))
+			 (replace-match "date_formatto")
+		       (goto-char here)
+		       (setq delete-a nil)
+		       (delete-char 1)))))
+	     (goto-char here)
+	     (setq delete-a nil)
+	     (delete-char 1)))
+	 (smarty-prepare-search-1 (expand-abbrev))
+	 (self-insert-command count)
+	 (if (and delete-a (looking-at " "))
+	     (delete-char 1)))
+	(t (self-insert-command count)))))
+
+(defun smarty-electric-open-bracket (count) 
   "'(' --> '(', '((' --> '[', '[(' --> '{'"
   (interactive "p")
   (if (and smarty-stutter-mode (= count 1) (not (smarty-in-literal)))
       (if (= (preceding-char) ?\()
-          (progn (delete-char -1) (insert-char ?\[ 1))
-        (if (= (preceding-char) ?\[)
-            (progn (delete-char -1) (insert-char ?\{ 1))
-          (insert-char ?\( 1)))
+	  (progn (delete-char -1) (insert-char ?\[ 1))
+	(if (= (preceding-char) ?\[)
+	    (progn (delete-char -1) (insert-char ?\{ 1))
+	  (insert-char ?\( 1)))
     (self-insert-command count)))
 
-(defun smarty-electric-close-bracket (count)
+(defun smarty-electric-close-bracket (count) 
   "')' --> ')', '))' --> ']', '])' --> '}'"
   (interactive "p")
   (if (and smarty-stutter-mode (= count 1) (not (smarty-in-literal)))
       (progn
-        (if (= (preceding-char) ?\))
-            (progn (delete-char -1) (insert-char ?\] 1))
-          (if (= (preceding-char) ?\])
-              (progn (delete-char -1) (insert-char ?} 1))
-            (insert-char ?\) 1)))
-        (blink-matching-open))
+	(if (= (preceding-char) ?\))
+	    (progn (delete-char -1) (insert-char ?\] 1))
+	  (if (= (preceding-char) ?\])
+	      (progn (delete-char -1) (insert-char ?} 1))
+	    (insert-char ?\) 1)))
+	(blink-matching-open))
     (self-insert-command count)))
 
-(defun smarty-electric-star (count)
+(defun smarty-electric-star (count) 
   "After a left delimiter add a right delemiter to close the comment"
   (interactive "p")
   (let ((here (point-marker)) found)
     (if (and smarty-stutter-mode (= count 1) (not (smarty-in-literal)))
-        (progn
-          (setq found (re-search-backward (regexp-quote smarty-left-delimiter) nil t))
-          (re-search-forward (regexp-quote smarty-left-delimiter) here t)
-          (if (not (and (= here (point-marker)) found))
-              (progn (goto-char here)
-                     (self-insert-command count))
-            (self-insert-command count)
-            (insert " ")
-            (setq here (point-marker))
-            (insert " *")
-            (insert smarty-right-delimiter)
-            (goto-char here)))
+	(progn
+	  (setq found (re-search-backward (regexp-quote smarty-left-delimiter) nil t))
+	  (re-search-forward (regexp-quote smarty-left-delimiter) here t)
+	  (if (not (and (= here (point-marker)) found))
+	      (progn (goto-char here)
+		     (self-insert-command count))
+	    (self-insert-command count)
+	    (insert " ")
+	    (setq here (point-marker))
+	    (insert " *")
+	    (insert smarty-right-delimiter)
+	    (goto-char here)))
       (self-insert-command count))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1110,16 +1036,16 @@ else insert tab (used for word completion in Smarty minibuffer)."
    ;; expand word
    ((= (char-syntax (preceding-char)) ?w)
     (let ((case-fold-search (not smarty-word-completion-case-sensitive))
-          (case-replace nil)
-          (hippie-expand-only-buffers
-           (or (and (boundp 'hippie-expand-only-buffers)
-                    hippie-expand-only-buffers)
-               '(smarty-mode))))
+	  (case-replace nil)
+	  (hippie-expand-only-buffers
+	   (or (and (boundp 'hippie-expand-only-buffers)
+		    hippie-expand-only-buffers)
+	       '(smarty-mode))))
       (smarty-expand-abbrev prefix-arg)))
    ;; expand parenthesis
    ((or (= (preceding-char) ?\() (= (preceding-char) ?\)))
     (let ((case-fold-search (not smarty-word-completion-case-sensitive))
-          (case-replace nil))
+	  (case-replace nil))
       (smarty-expand-paren prefix-arg)))
    ;; insert tab
    (t (insert-tab))))
@@ -1133,7 +1059,7 @@ else insert tab (used for word completion in Smarty minibuffer)."
 ;; Abbrev ook bindings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconst smarty-mode-abbrev-table nil
+(defvar smarty-mode-abbrev-table nil
   "Abbrev table to use in `smarty-mode' buffers.")
 
 (defun smarty-mode-abbrev-table-init ()
@@ -1141,86 +1067,88 @@ else insert tab (used for word completion in Smarty minibuffer)."
   (when smarty-mode-abbrev-table (clear-abbrev-table smarty-mode-abbrev-table))
   (define-abbrev-table 'smarty-mode-abbrev-table
     (append
-     ;; I changed the second element of the records below to be same
-     ;; as first instead of "". Using "" gives strange behaviour when
-     ;; (expand-abbrev) is called and point is after a space.
-     '(("capture" "capture" smarty-template-capture-hook 0)
-       ("config_load" "config_load" smarty-template-config-load-hook 0)
-       ("else" "else" smarty-template-else-hook 0)
-       ("elseif" "elseif" smarty-template-elseif-hook 0)
-       ("foreach" "foreach" smarty-template-foreach-hook 0)
-       ("foreachelse" "foreachelse" smarty-template-foreachelse-hook 0)
-       ("if" "if" smarty-template-if-hook 0)
-       ("include" "include" smarty-template-include-hook 0)
-       ("include_php" "include_php" smarty-template-include-php-hook 0)
-       ("insert" "insert" smarty-template-insert-hook 0)
-       ("ldelim" "ldelim" smarty-template-ldelim-hook 0)
-       ("literal" "literal" smarty-template-literal-hook 0)
-       ("php" "php" smarty-template-php-hook 0)
-       ("rdelim" "rdelim" smarty-template-rdelim-hook 0)
-       ("section" "section" smarty-template-section-hook 0)
-       ("sectionelse" "sectionelse" smarty-template-sectionelse-hook 0)
-       ("strip" "strip" smarty-template-strip-hook 0)
-       ("assign" "assign" smarty-template-assign-hook 0)
-       ("counter" "counter" smarty-template-counter-hook 0)
-       ("cycle" "cycle" smarty-template-cycle-hook 0)
-       ("debug" "debug" smarty-template-debug-hook 0)
-       ("eval" "eval" smarty-template-eval-hook 0)
-       ("fetch" "fetch"  smarty-template-fetch-hook 0)
-       ("html_checkboxes" "html_checkboxes" smarty-template-html-checkboxes-hook 0)
-       ("html_image" "html_image" smarty-template-html-image-hook 0)
-       ("html_options" "html_options" smarty-template-html-options-hook 0)
-       ("html_radios" "html_radios" smarty-template-html-radios-hook 0)
-       ("html_select_date" "html_select_date" smarty-template-html-select-date-hook 0)
-       ("html_select_time" "html_select_time" smarty-template-html-select-time-hook 0)
-       ("html_table" "html_table" smarty-template-html-table-hook 0)
-       ("mailto" "mailto" smarty-template-mailto-hook 0)
-       ("math" "math" smarty-template-math-hook 0)
-       ("popup" "popup" smarty-template-popup-hook 0)
-       ("popup_init" "popup_init" smarty-template-popup-init-hook 0)
-       ("textformat" "textformat" smarty-template-textformat-hook 0)
-       ("capitalize" "capitalize" smarty-template-capitalize-hook 0)
-       ("cat" "cat" smarty-template-cat-hook 0)
-       ("count_characters" "count_characters" smarty-template-count-characters-hook 0)
-       ("count_paragraphs" "count_paragraphs" smarty-template-count-paragraphs-hook 0)
-       ("count_sentences" "count_sentences" smarty-template-count-sentences-hook 0)
-       ("count_words" "count_words" smarty-template-count-words-hook 0)
-       ("date_format" "date_format" smarty-template-date-format-hook 0)
-       ("default" "default" smarty-template-default-hook 0)
-       ("escape" "escape" smarty-template-escape-hook 0)
-       ("indent" "indent" smarty-template-indent-hook 0)
-       ("lower" "lower" smarty-template-lower-hook 0)
-       ("nl2br" "nl2br" smarty-template-nl2br-hook 0)
-       ("regex_replace" "regex_replace" smarty-template-regex-replace-hook 0)
-       ("replace" "replace" smarty-template-replace-hook 0)
-       ("spacify" "spacify" smarty-template-spacify-hook 0)
-       ("string_format" "string_format" smarty-template-string-format-hook 0)
-       ("strip" "strip" smarty-template-vstrip-hook 0)
-       ("strip_tags" "strip_tags" smarty-template-strip-tags-hook 0)
-       ("truncate" "truncate" smarty-template-truncate-hook 0)
-       ("upper" "upper" smarty-template-upper-hook 0)
-       ("wordwrap" "wordwrap" smarty-template-wordwrap-hook 0)
-       ("validate" "validate" smarty-template-validate-hook 0)
-       ("formtool_checkall" "formtool_checkall" smarty-template-formtool-checkall-hook 0)
-       ("formtool_copy" "formtool_copy" smarty-template-formtool-copy-hook 0)
-       ("formtool_count_chars" "formtool_count_chars" smarty-template-formtool-count-chars-hook 0)
-       ("formtool_init" "formtool_init" smarty-template-formtool-init-hook 0)
-       ("formtool_move" "formtool_move" smarty-template-formtool-move-hook 0)
-       ("formtool_moveall" "formtool_moveall" smarty-template-formtool-moveall-hook 0)
-       ("formtool_movedown" "formtool_movedown" smarty-template-formtool-movedown-hook 0)
-       ("formtool_moveup" "formtool_moveup" smarty-template-formtool-moveup-hook 0)
-       ("formtool_remove" "formtool_remove" smarty-template-formtool-remove-hook 0)
-       ("formtool_rename" "formtool_rename" smarty-template-formtool-rename-hook 0)
-       ("formtool_save" "formtool_save" smarty-template-formtool-save-hook 0)
-       ("formtool_selectall" "formtool_selectall" smarty-template-formtool-selectall-hook 0)
-       ("paginate_first" "paginate_first" smarty-template-paginate-first-hook 0)
-       ("paginate_last" "paginate_last" smarty-template-paginate-last-hook 0)
-       ("paginate_middle" "paginate_middle" smarty-template-paginate-middle-hook 0)
-       ("paginate_next" "paginate_next" smarty-template-paginate-next-hook 0)
-       ("paginate_prev" "paginate_prev" smarty-template-paginate-prev-hook 0)
-       ("btosmilies" "btosmilies" smarty-template-btosmilies-hook 0)
-       ("bbcodetohtml" "bbcodetohtml" smarty-template-bbcodetohtml-hook 0)
-       ("date_formatto" "date_formatto" smarty-template-date-formatto-hook 0)))))
+     '(
+       ("capture" "" smarty-template-capture-hook 0)
+       ("config_load" "" smarty-template-config-load-hook 0)
+       ("else" "" smarty-template-else-hook 0)
+       ("elseif" "" smarty-template-elseif-hook 0)
+       ("foreach" "" smarty-template-foreach-hook 0)
+       ("foreachelse" "" smarty-template-foreachelse-hook 0)
+       ("if" "" smarty-template-if-hook 0)
+       ("include" "" smarty-template-include-hook 0)
+       ("include_php" "" smarty-template-include-php-hook 0)
+       ("insert" "" smarty-template-insert-hook 0)
+       ("ldelim" "" smarty-template-ldelim-hook 0)
+       ("literal" "" smarty-template-literal-hook 0)
+       ("php" "" smarty-template-php-hook 0)
+       ("rdelim" "" smarty-template-rdelim-hook 0)
+       ("section" "" smarty-template-section-hook 0)
+       ("sectionelse" "" smarty-template-sectionelse-hook 0)
+       ("strip" "" smarty-template-strip-hook 0)
+       ("assign" "" smarty-template-assign-hook 0)
+       ("counter" "" smarty-template-counter-hook 0)
+       ("cycle" "" smarty-template-cycle-hook 0)
+       ("debug" "" smarty-template-debug-hook 0)
+       ("eval" "" smarty-template-eval-hook 0)
+       ("fetch" ""  smarty-template-fetch-hook 0)
+       ("html_checkboxes" "" smarty-template-html-checkboxes-hook 0)
+       ("html_image" "" smarty-template-html-image-hook 0)
+       ("html_options" "" smarty-template-html-options-hook 0)
+       ("html_radios" "" smarty-template-html-radios-hook 0)
+       ("html_select_date" "" smarty-template-html-select-date-hook 0)
+       ("html_select_time" "" smarty-template-html-select-time-hook 0)
+       ("html_table" "" smarty-template-html-table-hook 0)
+       ("mailto" "" smarty-template-mailto-hook 0)
+       ("math" "" smarty-template-math-hook 0)
+       ("popup" "" smarty-template-popup-hook 0)
+       ("popup_init" "" smarty-template-popup-init-hook 0)
+       ("textformat" "" smarty-template-textformat-hook 0)
+       ("capitalize" "" smarty-template-capitalize-hook 0)
+       ("cat" "" smarty-template-cat-hook 0)
+       ("count_characters" "" smarty-template-count-characters-hook 0)
+       ("count_paragraphs" "" smarty-template-count-paragraphs-hook 0)
+       ("count_sentences" "" smarty-template-count-sentences-hook 0)
+       ("count_words" "" smarty-template-count-words-hook 0)
+       ("date_format" "" smarty-template-date-format-hook 0)
+       ("default" "" smarty-template-default-hook 0)
+       ("escape" "" smarty-template-escape-hook 0)
+       ("indent" "" smarty-template-indent-hook 0)
+       ("lower" "" smarty-template-lower-hook 0)
+       ("nl2br" "" smarty-template-nl2br-hook 0)
+       ("regex_replace" "" smarty-template-regex-replace-hook 0)
+       ("replace" "" smarty-template-replace-hook 0)
+       ("spacify" "" smarty-template-spacify-hook 0)
+       ("string_format" "" smarty-template-string-format-hook 0)
+       ("strip" "" smarty-template-vstrip-hook 0)
+       ("strip_tags" "" smarty-template-strip-tags-hook 0)
+       ("truncate" "" smarty-template-truncate-hook 0)
+       ("upper" "" smarty-template-upper-hook 0)
+       ("wordwrap" "" smarty-template-wordwrap-hook 0)
+       ("validate" "" smarty-template-validate-hook 0)
+       ("clipcache" "" smarty-template-clipcache-hook 0)
+       ("repeat" "" smarty-template-repeat-hook 0)
+       ("str_repeat" "" smarty-template-str-repeat-hook 0)
+       ("include_clipcache" "" smarty-template-include-clipcache-hook 0)
+       ("formtool_checkall" "" smarty-template-formtool-checkall-hook 0)
+       ("formtool_copy" "" smarty-template-formtool-copy-hook 0)
+       ("formtool_count_chars" "" smarty-template-formtool-count-chars-hook 0)
+       ("formtool_init" "" smarty-template-formtool-init-hook 0)
+       ("formtool_move" "" smarty-template-formtool-move-hook 0)
+       ("formtool_moveall" "" smarty-template-formtool-moveall-hook 0)
+       ("formtool_movedown" "" smarty-template-formtool-movedown-hook 0)
+       ("formtool_moveup" "" smarty-template-formtool-moveup-hook 0)
+       ("formtool_remove" "" smarty-template-formtool-remove-hook 0)
+       ("formtool_rename" "" smarty-template-formtool-rename-hook 0)
+       ("formtool_save" "" smarty-template-formtool-save-hook 0)
+       ("formtool_selectall" "" smarty-template-formtool-selectall-hook 0)
+       ("paginate_first" "" smarty-template-paginate-first-hook 0)
+       ("paginate_last" "" smarty-template-paginate-last-hook 0)
+       ("paginate_middle" "" smarty-template-paginate-middle-hook 0)
+       ("paginate_next" "" smarty-template-paginate-next-hook 0)
+       ("paginate_prev" "" smarty-template-paginate-prev-hook 0)
+       ("btosmilies" "" smarty-template-btosmilies-hook 0)
+       ("bbcodetohtml" "" smarty-template-bbcodetohtml-hook 0)
+       ("date_formatto" "" smarty-template-date-formatto-hook 0)))))
 
 ;; initialize abbrev table for Smarty Mode
 (smarty-mode-abbrev-table-init)
@@ -1233,36 +1161,29 @@ else insert tab (used for word completion in Smarty minibuffer)."
   "Do function, if syntax says abbrev is a keyword, invoked by hooked abbrev,
 but not if inside a comment or quote)."
   (if (or (smarty-in-literal)
-          (smarty-in-comment-p))
+	  (smarty-in-comment-p))
       (progn
-        (insert " ")
-        (unexpand-abbrev)
-        (delete-char -1))
+	(insert " ")
+	(unexpand-abbrev)
+	(delete-char -1))
     (if (not smarty-electric-mode)
-        (progn
-          (insert " ")
-          (unexpand-abbrev)
-          (backward-word 1)
-          (delete-char 1))
-      ;; last-command-event (alias last-command-char) is not always a
-      ;; char. An example is that Viper calls expand-abbrev when
-      ;; escape is pressed. The event is then 'escape.
-      (let* ((base-event (event-basic-type last-command-event))
-             (invoke-char (when (char-valid-p base-event) base-event))
-             (abbrev-mode -1)
-             (smarty-template-invoked-by-hook t))
-        ;;(setq invoke-char last-command-char) ;; to get the orig err
-        (let ((caught (catch 'abort
-                        (funcall func))))
-          (when (stringp caught) (message caught)))
-        (when invoke-char
-          (when (= invoke-char ?-) (setq abbrev-start-location (point))))
-        ;; delete CR which is still in event queue
-        (if (fboundp 'enqueue-eval-event)
-            (enqueue-eval-event 'delete-char -1)
-          (delete-char -1))))))
-;;           (setq unread-command-events        ; push back a delete char
-;;                 (list (smarty-character-to-event ?\177))))))))
+	(progn
+	  (insert " ")
+	  (unexpand-abbrev)
+	  (backward-word 1)
+	  (delete-char 1))
+      (let ((invoke-char last-command-char)
+	    (abbrev-mode -1)
+	    (smarty-template-invoked-by-hook t))
+	(let ((caught (catch 'abort
+			(funcall func))))
+	  (when (stringp caught) (message caught)))
+	(when (= invoke-char ?-) (setq abbrev-start-location (point)))
+	;; delete CR which is still in event queue
+	(if (fboundp 'enqueue-eval-event)
+	    (enqueue-eval-event 'delete-char -1)
+	  (setq unread-command-events	; push back a delete char
+		(list (smarty-character-to-event ?\177))))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Fontification
@@ -1270,45 +1191,41 @@ but not if inside a comment or quote)."
 
 (defvar smarty-font-lock-keywords-1
   (list
-
+   
    ;; Fontify built-in functions
    (cons
-        (concat (regexp-quote smarty-left-delimiter) "[/]*" smarty-functions-regexp)
-        '(1 font-lock-keyword-face))
+	(concat (regexp-quote smarty-left-delimiter) "[/]*" smarty-functions-regexp)
+	'(1 font-lock-keyword-face))
 
    (cons
-        (concat "\\<\\(" smarty-constants "\\)\\>")
-        'font-lock-constant-face)
+	(concat "\\<\\(" smarty-constants "\\)\\>")
+	'font-lock-constant-face)
 
-   (cons (concat "\\(" (regexp-quote (concat smarty-left-delimiter "*")) "\\(\\s-\\|\\w\\|\\s.\\|\\s_\\|\\s(\\|\\s)\\|\\s\\\\)*" (regexp-quote (concat "*" smarty-right-delimiter)) "\\)")
-         'font-lock-comment-face)
+   (cons (concat "\\(" (regexp-quote (concat smarty-left-delimiter "*")) "\\(\\s-\\|\\w\\|\\s.\\|\\s_\\|\\s(\\|\\s)\\|\\s\\\\)*" (regexp-quote (concat "*" smarty-right-delimiter)) "\\)") 
+	 'font-lock-comment-face)
 
    )
-  "Subdued level highlighting for Smarty mode.")
-
-;; I believe default is defined in Xemacs but not in GNU Emacs.
-(unless (boundp 'default)
-  (defvar default 'default))
+  "Subdued level highlighting for Smarty mode.") 
 
 (defconst smarty-font-lock-keywords-2
   (append
-   smarty-font-lock-keywords-1
+   smarty-font-lock-keywords-1  
    (list
 
-        ;; Fontify variable names (\\sw\\|\\s_\\) matches any word character +
-        ;; underscore
-        '("\\$\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face)) ; $variable
-        '("->\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face t t)) ; ->variable
-        '("\\.\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face t t)) ; .variable
-        '("->\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" (1 font-lock-function-name-face t t)) ; ->function_call
-        '("\\<\\(\\(?:\\sw\\|\\s_\\)+\\s-*\\)(" (1 font-lock-function-name-face)) ; word(
-        '("\\<\\(\\(?:\\sw\\|\\s_\\)+\\s-*\\)[[]" (1 font-lock-variable-name-face)) ; word[
-        '("\\<[0-9]+" . default)                        ; number (also matches word)
-
-        ;; Fontify strings
-        ;;'("\"\\([^\"]*\\)\"[^\"]+" (1 font-lock-string-face t t))
-        ))
-
+	;; Fontify variable names (\\sw\\|\\s_\\) matches any word character +
+	;; underscore
+	'("\\$\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face)) ; $variable
+	'("->\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face t t)) ; ->variable
+	'("\\.\\(\\(?:\\sw\\|\\s_\\)+\\)" (1 font-lock-variable-name-face t t)) ; .variable
+	'("->\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" (1 font-lock-function-name-face t t)) ; ->function_call
+	'("\\<\\(\\(?:\\sw\\|\\s_\\)+\\s-*\\)(" (1 font-lock-function-name-face)) ; word(
+	'("\\<\\(\\(?:\\sw\\|\\s_\\)+\\s-*\\)[[]" (1 font-lock-variable-name-face)) ; word[
+	'("\\<[0-9]+" . default)			; number (also matches word)
+
+	;; Fontify strings
+	;;'("\"\\([^\"]*\\)\"[^\"]+" (1 font-lock-string-face t t))
+	))
+  
    "Medium level highlighting for Smarty mode.")
 
 (defconst smarty-font-lock-keywords-3
@@ -1318,7 +1235,7 @@ but not if inside a comment or quote)."
     ;; Fontify modifiers
     (cons (concat "|\\(" smarty-modifiers-regexp "\\)[:|]+") '(1 font-lock-function-name-face))
     (cons (concat "|\\(" smarty-modifiers-regexp "\\)" (regexp-quote smarty-right-delimiter)) '(1 font-lock-function-name-face))
-
+    
     ;; Fontify config vars
     (cons (concat (regexp-quote smarty-left-delimiter) "\\(#\\(?:\\sw\\|\\s_\\)+#\\)") '(1 font-lock-constant-face))))
   "Balls-out highlighting for Smarty mode.")
@@ -1342,71 +1259,77 @@ but not if inside a comment or quote)."
 ;;; Mode map
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defvar smarty-template-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-ba" 'smarty-template-capture)
-    (define-key map "\C-bc" 'smarty-template-config-load)
-    (define-key map "\C-b\M-e" 'smarty-template-else)
-    (define-key map "\C-b\C-e" 'smarty-template-elseif)
-    (define-key map "\C-b\C-f" 'smarty-template-foreach)
-    (define-key map "\C-b\M-f" 'smarty-template-foreachelse)
-    (define-key map "\C-bf" 'smarty-template-if)
-    (define-key map "\C-b\C-i" 'smarty-template-include)
-    (define-key map "\C-b\M-i" 'smarty-template-include-php)
-    (define-key map "\C-bi" 'smarty-template-insert)
-    (define-key map "\C-bl" 'smarty-template-ldelim)
-    (define-key map "\C-b\C-l" 'smarty-template-literal)
-    (define-key map "\C-bp" 'smarty-template-php)
-    (define-key map "\C-br" 'smarty-template-rdelim)
-    (define-key map "\C-b\C-s" 'smarty-template-section)
-    (define-key map "\C-b\M-s" 'smarty-template-sectionelse)
-    (define-key map "\C-bs" 'smarty-template-strip)
-    (define-key map "\C-ca" 'smarty-template-assign)
-    (define-key map "\C-co" 'smarty-template-counter)
-    (define-key map "\C-cc" 'smarty-template-cycle)
-    (define-key map "\C-cd" 'smarty-template-debug)
-    (define-key map "\C-ce" 'smarty-template-eval)
-    (define-key map "\C-cf" 'smarty-template-fetch)
-    (define-key map "\C-c\C-hc" 'smarty-template-html-checkboxes)
-    (define-key map "\C-c\C-hi" 'smarty-template-html-image)
-    (define-key map "\C-c\C-ho" 'smarty-template-html-options)
-    (define-key map "\C-c\C-hr" 'smarty-template-html-radios)
-    (define-key map "\C-c\C-hd" 'smarty-template-html-select-date)
-    (define-key map "\C-c\C-hm" 'smarty-template-html-select-time)
-    (define-key map "\C-c\C-ht" 'smarty-template-html-table)
-    (define-key map "\C-ci" 'smarty-template-mailto)
-    (define-key map "\C-ch" 'smarty-template-math)
-    (define-key map "\C-c\C-p" 'smarty-template-popup)
-    (define-key map "\C-c\M-p" 'smarty-template-popup-init)
-    (define-key map "\C-ct" 'smarty-template-textformat)
-    (define-key map "\C-vp" 'smarty-template-capitalize)
-    (define-key map "\C-vc" 'smarty-template-cat)
-    (define-key map "\C-v\C-cc" 'smarty-template-count-characters)
-    (define-key map "\C-v\C-cp" 'smarty-template-count-paragraphs)
-    (define-key map "\C-v\C-cs" 'smarty-template-count-sentences)
-    (define-key map "\C-v\C-cw" 'smarty-template-count-words)
-    (define-key map "\C-vf" 'smarty-template-date-format)
-    (define-key map "\C-vd" 'smarty-template-default)
-    (define-key map "\C-ve" 'smarty-template-escape)
-    (define-key map "\C-vi" 'smarty-template-indent)
-    (define-key map "\C-vl" 'smarty-template-lower)
-    (define-key map "\C-vn" 'smarty-template-nl2br)
-    (define-key map "\C-vx" 'smarty-template-regex-replace)
-    (define-key map "\C-v\C-p" 'smarty-template-replace)
-    (define-key map "\C-vy" 'smarty-template-spacify)
-    (define-key map "\C-vs" 'smarty-template-string-format)
-    (define-key map "\C-v\C-s" 'smarty-template-vstrip)
-    (define-key map "\C-v\M-s" 'smarty-template-strip-tags)
-    (define-key map "\C-vt" 'smarty-template-truncate)
-    (define-key map "\C-vu" 'smarty-template-upper)
-    (define-key map "\C-vw" 'smarty-template-wordwrap)
-    (define-key map "\C-h" 'smarty-template-header)
-    (define-key map "\C-f" 'smarty-template-footer)
-    (define-key map "\C-di" 'smarty-template-insert-date)
-    (define-key map "\C-dm" 'smarty-template-modify)
-    map)
+(defvar smarty-template-map nil
   "Keymap for Smarty templates.")
 
+(defun smarty-template-map-init ()
+  "Initialize `smarty-template-map'."
+  (setq smarty-template-map (make-sparse-keymap))
+  ;; key bindings for Smarty templates
+  (define-key smarty-template-map "\C-ba" 'smarty-template-capture)
+  (define-key smarty-template-map "\C-bc" 'smarty-template-config-load)
+  (define-key smarty-template-map "\C-b\M-e" 'smarty-template-else)
+  (define-key smarty-template-map "\C-b\C-e" 'smarty-template-elseif)
+  (define-key smarty-template-map "\C-b\C-f" 'smarty-template-foreach)
+  (define-key smarty-template-map "\C-b\M-f" 'smarty-template-foreachelse)
+  (define-key smarty-template-map "\C-bf" 'smarty-template-if)
+  (define-key smarty-template-map "\C-b\C-i" 'smarty-template-include)
+  (define-key smarty-template-map "\C-b\M-i" 'smarty-template-include-php)
+  (define-key smarty-template-map "\C-bi" 'smarty-template-insert)
+  (define-key smarty-template-map "\C-bl" 'smarty-template-ldelim)
+  (define-key smarty-template-map "\C-b\C-l" 'smarty-template-literal)
+  (define-key smarty-template-map "\C-bp" 'smarty-template-php)
+  (define-key smarty-template-map "\C-br" 'smarty-template-rdelim)
+  (define-key smarty-template-map "\C-b\C-s" 'smarty-template-section)
+  (define-key smarty-template-map "\C-b\M-s" 'smarty-template-sectionelse)
+  (define-key smarty-template-map "\C-bs" 'smarty-template-strip)
+  (define-key smarty-template-map "\C-ca" 'smarty-template-assign)
+  (define-key smarty-template-map "\C-co" 'smarty-template-counter)
+  (define-key smarty-template-map "\C-cc" 'smarty-template-cycle)
+  (define-key smarty-template-map "\C-cd" 'smarty-template-debug)
+  (define-key smarty-template-map "\C-ce" 'smarty-template-eval)
+  (define-key smarty-template-map "\C-cf" 'smarty-template-fetch)
+  (define-key smarty-template-map "\C-c\C-hc" 'smarty-template-html-checkboxes)
+  (define-key smarty-template-map "\C-c\C-hi" 'smarty-template-html-image)
+  (define-key smarty-template-map "\C-c\C-ho" 'smarty-template-html-options)
+  (define-key smarty-template-map "\C-c\C-hr" 'smarty-template-html-radios)
+  (define-key smarty-template-map "\C-c\C-hd" 'smarty-template-html-select-date)
+  (define-key smarty-template-map "\C-c\C-hm" 'smarty-template-html-select-time)
+  (define-key smarty-template-map "\C-c\C-ht" 'smarty-template-html-table)
+  (define-key smarty-template-map "\C-ci" 'smarty-template-mailto)
+  (define-key smarty-template-map "\C-ch" 'smarty-template-math)
+  (define-key smarty-template-map "\C-c\C-p" 'smarty-template-popup)
+  (define-key smarty-template-map "\C-c\M-p" 'smarty-template-popup-init)
+  (define-key smarty-template-map "\C-ct" 'smarty-template-textformat)
+  (define-key smarty-template-map "\C-vp" 'smarty-template-capitalize)
+  (define-key smarty-template-map "\C-vc" 'smarty-template-cat)
+  (define-key smarty-template-map "\C-v\C-cc" 'smarty-template-count-characters)
+  (define-key smarty-template-map "\C-v\C-cp" 'smarty-template-count-paragraphs)
+  (define-key smarty-template-map "\C-v\C-cs" 'smarty-template-count-sentences)
+  (define-key smarty-template-map "\C-v\C-cw" 'smarty-template-count-words)
+  (define-key smarty-template-map "\C-vf" 'smarty-template-date-format)
+  (define-key smarty-template-map "\C-vd" 'smarty-template-default)
+  (define-key smarty-template-map "\C-ve" 'smarty-template-escape)
+  (define-key smarty-template-map "\C-vi" 'smarty-template-indent)
+  (define-key smarty-template-map "\C-vl" 'smarty-template-lower)
+  (define-key smarty-template-map "\C-vn" 'smarty-template-nl2br)
+  (define-key smarty-template-map "\C-vx" 'smarty-template-regex-replace)
+  (define-key smarty-template-map "\C-v\C-p" 'smarty-template-replace)
+  (define-key smarty-template-map "\C-vy" 'smarty-template-spacify)
+  (define-key smarty-template-map "\C-vs" 'smarty-template-string-format)
+  (define-key smarty-template-map "\C-v\C-s" 'smarty-template-vstrip)
+  (define-key smarty-template-map "\C-v\M-s" 'smarty-template-strip-tags)
+  (define-key smarty-template-map "\C-vt" 'smarty-template-truncate)
+  (define-key smarty-template-map "\C-vu" 'smarty-template-upper)
+  (define-key smarty-template-map "\C-vw" 'smarty-template-wordwrap)
+  (define-key smarty-template-map "\C-h" 'smarty-template-header)
+  (define-key smarty-template-map "\C-f" 'smarty-template-footer)
+  (define-key smarty-template-map "\C-di" 'smarty-template-insert-date)
+  (define-key smarty-template-map "\C-dm" 'smarty-template-modify))
+
+;; initialize template map for Smarty Mode
+(smarty-template-map-init)
+
 (defun smarty-mode-map-init ()
   "Initialize `smarty-mode-map'."
   (setq smarty-mode-map (make-sparse-keymap))
@@ -1441,8 +1364,8 @@ but not if inside a comment or quote)."
 (mapcar
  (function
   (lambda (sym)
-    (put sym 'delete-selection t)    ; for `delete-selection-mode' (Emacs)
-    (put sym 'pending-delete t)))    ; for `pending-delete-mode' (XEmacs)
+    (put sym 'delete-selection t)	; for `delete-selection-mode' (Emacs)
+    (put sym 'pending-delete t)))	; for `pending-delete-mode' (XEmacs)
  '(smarty-electric-space
    smarty-electric-tab
    smarty-electric-open-bracket
@@ -1451,7 +1374,9 @@ but not if inside a comment or quote)."
 
 ;;;###autoload
 (defun smarty-mode ()
-  "Mode for editing php smarty files.
+  "Smarty Mode
+***********
+
 Smarty Mode is a GNU XEmacs major mode for editing Smarty templates.
 
 1 Introduction
@@ -1482,6 +1407,10 @@ Features (new features in bold) :
         - Variable Modifiers
 
         - Plugin (Functions)
+             * BlockRepeatPlugin
+
+             * ClipCache
+
              * Smarty Formtool
 
              * Smarty Paginate
@@ -1499,7 +1428,105 @@ Features (new features in bold) :
 
 
 
-This manual describes Smarty Mode version 0.0.4.
+This manual describes Smarty Mode version 0.0.5.
+
+2 Installation
+**************
+
+2.1 Requirements
+================
+
+Smarty Mode is a XEmacs major mode that needs the following
+software/packages:
+
+   * XEmacs (http://www.xemacs.org/).
+
+   * `font-lock' mode generaly installed with XEmacs.
+
+   * `assoc' mode generaly installed with XEmacs.
+
+   * `easymenu' mode generaly installed with XEmacs.
+
+   * `hippie-exp' mode generaly installed with XEmacs.
+
+Before continuing, you must be sure to have all this packages
+installed.
+
+2.2 Download
+============
+
+Two internet address to download Smarty Mode :
+
+   * Principal: Smarty-Mode 0.0.5
+     (http://deboutv.free.fr/lisp/smarty/download/smarty-0.0.5.tar.gz)
+     (http://deboutv.free.fr/lisp/smarty/)
+
+   * Secondary: Smarty-Mode 0.0.5
+     (http://www.morinie.fr/lisp/smarty/download/smarty-0.0.5.tar.gz)
+     (http://www.morinie.fr/lisp/smarty/)
+
+   * Old releases: Smarty-Mode
+     (http://deboutv.free.fr/lisp/smarty/download.php)
+     (http://deboutv.free.fr/lisp/smarty/)
+
+2.3 Installation
+================
+
+2.3.1 Installation
+------------------
+
+To install Smarty Mode you need to choose an installation directory
+(for example `/usr/local/share/lisp' or `c:\lisp'). The administrator
+must have the write rights on this directory.
+
+With your favorite unzip software, unzip the archive in the
+installation directory.
+
+Example:
+     cd /usr/local/share/lisp
+     tar zxvf smarty-0.0.5.tar.gz
+Now you have a `smarty' directory in the installation directory. This
+directory contains 2 files `smarty-mode.el' and `smarty-mode.elc' and
+another directory `docs' containing the documentation.
+
+You need to configure XEmacs. open you initialization file `init.el'
+(open the file or start XEmacs then choose the Options menu and Edit
+Init File). Add the following lines (the installation directory in
+this example is `/usr/local/share/lisp') :
+
+     (setq load-path
+           (append (list \"/usr/local/share/lisp/\") load-path))
+     (autoload 'smarty-mode \"smarty-mode\" \"Smarty Mode\" t)
+
+2.3.2 Update
+------------
+
+The update is easy. You need to unzip the archive in the installation
+directory to remove the old release.
+
+Example:
+     cd /usr/local/share/lisp
+     rm -rf smarty
+     tar zxvf smarty-0.0.5.tar.gz
+
+2.4 Invoke Smarty-Mode
+======================
+
+You have two possibilities to invoke the Smarty Mode.
+
+   - Manually: At each file opening you need to launch Smarty Mode
+     with the following command:
+
+     `M-x smarty-mode'
+
+   - Automatically: Add the following linesin your initialization
+     file `init.el' :
+
+          (setq auto-mode-alist
+                (append
+                 '((\"\\.tpl$\" . smarty-mode))
+          	 auto-mode-alist))
+
 
 3 Customization
 ***************
@@ -1679,16 +1706,16 @@ part.
 
 4.1.1 Functions
 ---------------
-\\<smarty-mode-map>
+
 `smarty-show-messages'
      Menu: Smarty -> Show Messages
-     Keybinding: `C-c M-m' \\[smarty-show-messages]
+     Keybinding: `C-c M-m'
      Description: This function opens the *Messages* buffer to
      display previous error messages.
 
 `smarty-doc-mode'
      Menu: Smarty -> Smarty Mode Documentation
-     Keybinding: `C-c C-h' \\[smarty-doc-mode]
+     Keybinding: `C-c C-h'
      Description: This function opens the *Help* buffer and prints in
      it the Smarty Mode documentation.
 
@@ -1859,25 +1886,25 @@ For Smarty functions, see PDF or HTML documentation.
       (setq smarty-font-lock-keywords smarty-font-lock-keywords-4)
     (setq smarty-font-lock-keywords smarty-font-lock-keywords-3))
   (setq font-lock-defaults
-                '((smarty-font-lock-keywords)
-                nil ; Keywords only (i.e. no comment or string highlighting
-                t   ; case fold
-                nil ; syntax-alist
-                nil ; syntax-begin
-                ))
-
+		'((smarty-font-lock-keywords)
+		nil ; Keywords only (i.e. no comment or string highlighting
+		t   ; case fold
+		nil ; syntax-alist
+		nil ; syntax-begin
+		))
+  
   (setq font-lock-maximum-decoration t
-                case-fold-search t)
+		case-fold-search t)
 
   ;; add source file menu
   (if smarty-source-file-menu (smarty-add-source-files-menu))
   ;; add Smarty menu
   (easy-menu-add smarty-mode-menu-list)
   (easy-menu-define smarty-mode-menu smarty-mode-map
-                    "Menu keymap for Smarty Mode." smarty-mode-menu-list)
+		    "Menu keymap for Smarty Mode." smarty-mode-menu-list)
 
   (message "Smarty Mode %s.%s" smarty-version
-           (if noninteractive "" "  See menu for documentation and release notes."))
+	   (if noninteractive "" "  See menu for documentation and release notes."))
   (smarty-mode-line-update)
   (run-hooks 'smarty-mode-hook))
 
@@ -1908,25 +1935,25 @@ For Smarty functions, see PDF or HTML documentation.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun smarty-template-field (prompt &optional follow-string optional
-                                   begin end is-string string-char default)
+				   begin end is-string string-char default)
   "Prompt for string and insert it in buffer with optional FOLLOW-STRING.
 If OPTIONAL is nil, the prompt is left if an empty string is inserted.  If
 an empty string is inserted, return nil and call `smarty-template-undo' for
 the region between BEGIN and END.  IS-STRING indicates whether a string
 with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (let ((position (point))
-        string)
+	string)
     (insert "<" prompt ">")
     (if (not (> (length string-char) 0))
-        (setq string-char "\""))
+	(setq string-char "\""))
     (setq string
-          (condition-case ()
-              (read-from-minibuffer (concat prompt ": ")
-                                    (or (and is-string (cons (concat string-char string-char) 1)) default)
-                                    smarty-minibuffer-local-map)
-            (quit (if (and optional begin end)
-                      (progn (beep) "")
-                    (keyboard-quit)))))
+	  (condition-case ()
+	      (read-from-minibuffer (concat prompt ": ")
+				    (or (and is-string (cons (concat string-char string-char) 1)) default)
+				    smarty-minibuffer-local-map)
+	    (quit (if (and optional begin end)
+		      (progn (beep) "")
+		    (keyboard-quit)))))
     (when (or (not (equal string "")) optional)
       (delete-region position (point)))
     (when (and (equal string "") optional begin end)
@@ -1941,31 +1968,21 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
 (defun smarty-template-undo (begin end)
   "Undo aborted template by deleting region and unexpanding the keyword."
   (cond (smarty-template-invoked-by-hook
-         (goto-char end)
-         (insert " ")
-         (delete-region begin end)
-         (unexpand-abbrev))
-        (t (delete-region begin end))))
+	 (goto-char end)
+	 (insert " ")
+	 (delete-region begin end)
+	 (unexpand-abbrev))
+	(t (delete-region begin end))))
 
-(defun smarty-template-generic-function (label close-label field mandatory-count &optional infinite special-field)
+(defun smarty-template-generic-function (label close-label field mandatory-count &optional infinite special-field force-var)
   "Generic function template 'label field1= field2=..."
   (interactive)
   (let ((start (point)) found here result-value elt continue field-count stop prompt)
     (if smarty-template-invoked-by-hook
-        (setq found (smarty-after-ldelim))
-      (let ((here (point)))
-        (let ((last-left (search-backward smarty-left-delimiter nil t)))
-          (when last-left
-            (goto-char here)
-            (unless (search-backward smarty-right-delimiter last-left t)
-              (goto-char here)
-              ;;(error "Can't insert left delimiter '%s' here" smarty-left-delimiter)
-              (lwarn t :warning "Can't insert left delimiter '%s' here" smarty-left-delimiter)
-              )))
-        (goto-char here))
+	(setq found (smarty-after-ldelim))
       (insert smarty-left-delimiter)
       (setq found t))
-    ;;(insert label) ;; Already done
+    (insert label)
     (setq here (point-marker))
     (insert " ")
     (when found
@@ -1974,82 +1991,84 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
       (setq field-count 0)
       (setq stop nil)
       (while (and elt continue)
-        (setq prompt (car elt))
-        (when (not special-field)
-          (insert prompt "="))
-        (setq result-value (smarty-template-field prompt nil t))
-        (if (and (not result-value)
-                 (< field-count mandatory-count))
-            (progn (setq continue nil)
-                   (delete-region start (point))
-                   (insert (concat label " "))
-                   (setq stop t))
-          (if (not result-value)
-              (setq continue nil)
-            (setq here (point-marker))
-            (insert " ")))
-        (setq field-count (+ 1 field-count))
-        (setq elt (cdr elt)))
-      (when (and infinite continue)
-        (while continue
-          (setq result-value (smarty-template-field "var_name" "=" t here))
-          (if (not result-value)
-              (setq continue nil)
-            (setq continue (smarty-template-field "var_value" nil t here))
-            (setq here (point-marker))
-            (insert " "))))
+	(setq prompt (car elt))
+	(when (not special-field)
+	  (insert prompt "="))
+	(setq result-value (smarty-template-field prompt nil t))
+	(if (and (not result-value)
+		 (< field-count mandatory-count))
+	    (progn (setq continue nil)
+		   (delete-region start (point))
+		   (insert (concat label " "))
+		   (setq stop t))
+	  (if (not result-value)
+	      (setq continue nil)
+	    (setq here (point-marker))
+	    (insert " ")))
+	(setq field-count (+ 1 field-count))
+	(setq elt (cdr elt)))
+      (when (and infinite (or continue force-var))
+	(when (not continue)
+	  (delete-region here (point))
+	  (insert " "))
+	(setq continue t)
+	(while continue
+	  (setq result-value (smarty-template-field "var_name" "=" t here))
+	  (if (not result-value)
+	      (setq continue nil)
+	    (setq continue (smarty-template-field "var_value" nil t here))
+	    (setq here (point-marker))
+	    (insert " "))))
       (when (not stop)
-        (delete-region here (point))
-        (if (> 0 mandatory-count)
-            (delete-char -1))
-        (if special-field
-            (delete-char -1))
-        (insert smarty-right-delimiter)
-        (setq here (point-marker))
-        (if close-label
-            (insert smarty-left-delimiter "/" label smarty-right-delimiter))
-        (goto-char here)))))
+	(delete-region here (point))
+	(if (> 0 mandatory-count)
+	    (delete-char -1))
+	(insert smarty-right-delimiter)
+	(setq here (point-marker))
+	(if close-label
+	    (insert smarty-left-delimiter "/" label smarty-right-delimiter))
+	(goto-char here)))))
 
 (defun smarty-template-generic-modifier (label field mandatory-count)
   "Generic modifier template '|label:field1:field2..."
   (interactive)
   (let ((start (point)) found here result-value elt continue field-count stop prompt)
-    (setq found (re-search-backward (concat (regexp-quote smarty-left-delimiter) "\\$\\(\\w+\\)" (regexp-quote "|")) nil t))
+    (setq found (re-search-backward (concat (regexp-quote smarty-left-delimiter) "\\$\\(\\sw\\|\\s.\\)+" (regexp-quote "|")) nil t))
     (if found
-        (progn
-          (setq found (re-search-forward (regexp-quote smarty-right-delimiter) start t))
-          (if (not found)
-              (progn
-                (goto-char start)
-                (insert label)
-                (setq here (point-marker))
-                (setq elt field)
-                (setq continue t)
-                (setq field-count 0)
-                (setq stop nil)
-                (while (and elt continue)
-                  (setq prompt (car elt))
-                  (insert ":")
-                  (setq result-value (smarty-template-field prompt nil t))
-                  (if (and (not result-value)
-                           (< field-count mandatory-count))
-                      (progn (setq continue nil)
-                             (delete-region start (point))
-                             (insert (concat label " "))
-                             (setq stop t))
-                    (if (not result-value)
-                        (setq continue nil)
-                      (setq here (point-marker))
-                      (insert ":")))
-                  (setq field-count (+ 1 field-count))
-                  (setq elt (cdr elt)))
-                (when (not stop)
-                  (delete-region here (point))
-                  (if (not (or (looking-at smarty-right-delimiter)
-                               (looking-at "|")))
-                      (insert smarty-right-delimiter))))
-            (goto-char start)
-            (insert label " ")))
+	(progn
+	  (setq found (re-search-forward (regexp-quote smarty-right-delimiter) start t))
+	  (if (not found)
+	      (progn
+		(goto-char start)
+		(insert label)
+		(setq here (point-marker))
+		(setq elt field)
+		(setq continue t)
+		(setq field-count 0)
+		(setq stop nil)
+		(while (and elt continue)
+		  (setq prompt (car elt))
+		  (insert ":")
+		  (setq result-value (smarty-template-field prompt nil t))
+		  (if (and (not result-value)
+			   (< field-count mandatory-count))
+		      (progn (setq continue nil)
+			     (delete-region start (point))
+			     (insert (concat label " "))
+			     (setq stop t))
+		    (if (not result-value)
+			(setq continue nil)
+		      (setq here (point-marker))
+		      (insert ":")))
+		  (setq field-count (+ 1 field-count))
+		  (setq elt (cdr elt)))
+		(when (not stop)
+		  (delete-region here (point))
+		  (if (not (or (looking-at smarty-right-delimiter)
+			       (looking-at "|")))
+		      (insert smarty-right-delimiter))))
+	    (goto-char start)
+	    (insert label " ")))
       (goto-char start)
       (insert label " "))))
 
@@ -2170,6 +2189,10 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
 
 (defun smarty-template-validate-hook ()
   (smarty-hooked-abbrev 'smarty-template-validate))
+(defun smarty-template-clipcache-hook ()
+  (smarty-hooked-abbrev 'smarty-template-clipcache))
+(defun smarty-template-include-clipcache-hook ()
+  (smarty-hooked-abbrev 'smarty-template-include-clipcache))
 (defun smarty-template-formtool-checkall-hook ()
   (smarty-hooked-abbrev 'smarty-template-formtool-checkall))
 (defun smarty-template-formtool-copy-hook ()
@@ -2371,7 +2394,7 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
 (defun smarty-template-math ()
   "Insert a math statement."
   (interactive)
-  (smarty-template-generic-function "math" nil '("equation" "var" "format" "assign") 2 t))
+  (smarty-template-generic-function "math" nil '("equation" "format" "assign") 1 t nil t))
 
 (defun smarty-template-popup ()
   "Insert a popup statement."
@@ -2499,6 +2522,26 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (interactive)
   (smarty-template-generic-function "validate" nil '("field" "criteria" "message" "form" "transform" "trim" "empty" "halt" "assign" "append" "page") 3))
 
+(defun smarty-template-repeat ()
+  "Insert a repeat statement."
+  (interactive)
+  (smarty-template-generic-function "repeat" nil '("count" "assign") 1))
+
+(defun smarty-template-str_repeat ()
+  "Insert a str_repeat statement."
+  (interactive)
+  (smarty-template-generic-function "str_repeat" nil '("string" "count" "assign") 2))
+
+(defun smarty-template-clipcache ()
+  "Insert a clipcache statement."
+  (interactive)
+  (smarty-template-generic-function "clipcache" nil '("id" "group" "ttl" "ldelim" "rdelim") 3))
+
+(defun smarty-template-include-clipcache ()
+  "Insert a include_clipcache statement."
+  (interactive)
+  (smarty-template-generic-function "include_clipcache" nil '("file" "cache_id" "cache_lifetime" "ldelim" "rdelim") 3))
+
 (defun smarty-template-formtool-checkall ()
   "Insert a formtool_checkall statement."
   (interactive)
@@ -2606,19 +2649,19 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   "Resolve environment variables in STRING."
   (while (string-match "\\(.*\\)${?\\(\\(\\w\\|_\\)+\\)}?\\(.*\\)" string)
     (setq string (concat (match-string 1 string)
-                         (getenv (match-string 2 string))
-                         (match-string 4 string))))
+			 (getenv (match-string 2 string))
+			 (match-string 4 string))))
   string)
 
 (defun smarty-insert-string-or-file (string)
   "Insert STRING or file contents if STRING is an existing file name."
   (unless (equal string "")
     (let ((file-name
-           (progn (string-match "^\\([^\n]+\\)" string)
-                  (smarty-resolve-env-variable (match-string 1 string)))))
+	   (progn (string-match "^\\([^\n]+\\)" string)
+		  (smarty-resolve-env-variable (match-string 1 string)))))
       (if (file-exists-p file-name)
-           (forward-char (cadr (insert-file-contents file-name)))
-        (insert string)))))
+	   (forward-char (cadr (insert-file-contents file-name)))
+	(insert string)))))
 
 (defun smarty-template-insert-date ()
   "Insert date in appropriate format."
@@ -2637,8 +2680,8 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (unless (equal smarty-file-header "")
     (let (pos)
       (save-excursion
-        (smarty-insert-string-or-file smarty-file-header)
-        (setq pos (point-marker)))
+	(smarty-insert-string-or-file smarty-file-header)
+	(setq pos (point-marker)))
       (smarty-template-replace-header-keywords
        (point-min-marker) pos file-title))))
 
@@ -2648,10 +2691,10 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (unless (equal smarty-file-footer "")
     (let (pos)
       (save-excursion
-        (setq pos (point-marker))
-        (smarty-insert-string-or-file smarty-file-footer)
-        (unless (= (preceding-char) ?\n)
-          (insert "\n")))
+	(setq pos (point-marker))
+	(smarty-insert-string-or-file smarty-file-footer)
+	(unless (= (preceding-char) ?\n)
+	  (insert "\n")))
       (smarty-template-replace-header-keywords pos (point-max-marker)))))
 
 (defun smarty-template-replace-header-keywords (beg end &optional file-title is-model)
@@ -2661,42 +2704,42 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
      (save-excursion
        (goto-char beg)
        (while (search-forward "<filename>" end t)
-         (replace-match (buffer-name) t t))
+	 (replace-match (buffer-name) t t))
        (goto-char beg)
        (while (search-forward "<copyright>" end t)
-         (replace-match smarty-copyright-string t t))
+	 (replace-match smarty-copyright-string t t))
        (goto-char beg)
        (while (search-forward "<author>" end t)
-         (replace-match "" t t)
-         (insert (user-full-name))
-         (when user-mail-address (insert "  <" user-mail-address ">")))
+	 (replace-match "" t t)
+	 (insert (user-full-name))
+	 (when user-mail-address (insert "  <" user-mail-address ">")))
        (goto-char beg)
        (while (search-forward "<login>" end t)
-         (replace-match (user-login-name) t t))
+	 (replace-match (user-login-name) t t))
        (goto-char beg)
        (while (search-forward "<company>" end t)
-         (replace-match smarty-company-name t t))
+	 (replace-match smarty-company-name t t))
        (goto-char beg)
        ;; Replace <RCS> with $, so that RCS for the source is
        ;; not over-enthusiastic with replacements
        (while (search-forward "<RCS>" end t)
-         (replace-match "$" nil t))
+	 (replace-match "$" nil t))
        (goto-char beg)
        (while (search-forward "<date>" end t)
-         (replace-match "" t t)
-         (smarty-template-insert-date))
+	 (replace-match "" t t)
+	 (smarty-template-insert-date))
        (goto-char beg)
        (while (search-forward "<year>" end t)
-         (replace-match (format-time-string "%Y" nil) t t))
+	 (replace-match (format-time-string "%Y" nil) t t))
        (goto-char beg)
        (let (string)
-         (while
-             (re-search-forward "<\\(\\(\\w\\|\\s_\\)*\\) string>" end t)
-           (setq string (read-string (concat (match-string 1) ": ")))
-           (replace-match string t t)))
+	 (while
+	     (re-search-forward "<\\(\\(\\w\\|\\s_\\)*\\) string>" end t)
+	   (setq string (read-string (concat (match-string 1) ": ")))
+	   (replace-match string t t)))
        (goto-char beg)
        (when (and (not is-model) (search-forward "<cursor>" end t))
-         (replace-match "" t t))))))
+	 (replace-match "" t t))))))
 
 (provide 'smarty-mode)
 ;;; smarty-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/related/wikipedia-mode.el b/elpa-to-submit/nxhtml/related/wikipedia-mode.el
index e5c2a6312c..49617abcea 100644
--- a/elpa-to-submit/nxhtml/related/wikipedia-mode.el
+++ b/elpa-to-submit/nxhtml/related/wikipedia-mode.el
@@ -1780,7 +1780,8 @@ does wikipedia-unfill-region."
 
 
 
-(add-hook 'outline-minor-mode-hook  'wikipedia-outline-magic-keys)
+;;(add-hook 'outline-minor-mode-hook  'wikipedia-outline-magic-keys)
+(add-hook 'wikipedia-mode-hook  'wikipedia-outline-magic-keys)
 
 (defun wikipedia-outline-magic-keys ()
   (interactive)
diff --git a/elpa-to-submit/nxhtml/tests/elunit.el b/elpa-to-submit/nxhtml/tests/elunit.el
deleted file mode 100644
index 40c60e49cc..0000000000
--- a/elpa-to-submit/nxhtml/tests/elunit.el
+++ /dev/null
@@ -1,334 +0,0 @@
-;;; elunit.el --- Emacs Lisp Unit Testing framework
-
-;; Modified by Lennart Borgman 2008-07-09 to make all global symbols
-;; use the "ert-" prefix.
-
-;; Copyright (C) 2006 - 2008 Phil Hagelberg
-
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/ElUnit
-;; Version: 1.1
-;; Created: 2006-08-17
-;; Keywords: unit test tdd
-;; EmacsWiki: ElUnit
-
-;; This file is NOT part of GNU Emacs.
-
-;; Last-Updated: Fri Nov 16 16:23:06 2007 PST
-;; By: Phil Hagelberg
-;; Update #: 1
-
-;;; License:
-
-;; This program 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 3, or (at your option)
-;; any later version.
-;;
-;; This program 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Inspired by regress.el by Wayne Mesard and Tom Breton, Test::Unit
-;; by Nathaniel Talbott, and xUnit by Kent Beck
-
-;; ElUnit exists to accomodate test-driven development of Emacs Lisp
-;; programs.  Tests are divided up into suites.  Each test makes a
-;; number of assertions to ensure that things are going according to
-;; expected.
-
-;; Tests are divided into suites for the purpose of hierarchical
-;; structure and hooks.  The hierarchy allows suites to belong to
-;; suites, in essence creating test trees.  The hooks are meant to
-;; allow for extra setup that happens once per test, for both before
-;; and after it runs.
-
-;; You may use Emacs' built-in `assert' function for checking such
-;; things, but the assertions at the bottom of this file provide much
-;; better reporting if you use them.  Using `elunit-assert-that' is
-;; preferred over built-in `assert'.
-
-;;; Usage:
-
-;; See http://www.emacswiki.org/cgi-bin/wiki/ElUnit for discussion and usage.
-;; The file `elunit-test.el' contains meta-tests that you may find helpful
-;; to refer to as samples.
-
-;; Add the lines:
-;; (make-local-variable 'after-save-hook)
-;; (add-hook 'after-save-hook (lambda () (elunit "meta-suite")))
-;; to the file containing your tests for convenient auto-running.
-
-;; Unit tests are meant to test single low-level functions. If you
-;; find yourself wanting to write higher-level tests, you may find
-;; mode-unit.el (http://www.emacswiki.org/cgi-bin/wiki/ModeUnit)
-;; useful as it is designed to help test whole Emacs modes.
-
-;; TODO:
-
-;; - allow test definitions to be nested in suites
-;; - improve readability of failure reports
-;; - store suites as a tree instead of a list?
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'compile)
-
-(defstruct elunit-test-suite name children tests setup-hooks teardown-hooks)
-(defstruct elunit-test name body file line problem message)
-
-(defface elunit-pass-face
-  `((t (:background "green")))
-  "Face for passing unit tests" :group 'elunit-faces)
-
-(defface elunit-fail-face
-  `((t (:background "red1")))
-  "Face for failed unit tests" :group 'elunit-faces)
-
-(defface elunit-error-face
-  `((t (:background "chocolate1")))
-  "Face for errored unit tests" :group 'elunit-faces)
-
-(put 'elunit-test-failed 'error-conditions '(failure))
-
-(defvar elunit-default-suite
-  "default-suite"
-  "Choice to use for default suite to run (gets updated to last suite run).")
-
-(defvar elunit-suites (list (make-test-suite :name 'default-suite))
-  "A list of every suite that's been defined.")
-
-(defvar elunit-test-count 0)
-(defvar elunit-failures nil
-  "A list of tests that have failed.")
-
-(defvar elunit-done-running-hook nil
-  "Runs when the tests are finished; passed a total test count and a failure count.")
-
-(defun elunit-clear-suites ()
-  "Reset the internal suite list."
-  (interactive)
-  (setq elunit-suites (list (make-test-suite :name 'default-suite))))
-
-(defun elunit-clear ()
-  "Clear overlays from buffer."
-  (interactive) (remove-overlays))
-
-;;; Defining tests
-
-(defmacro* elunit-defsuite (suite-name suite-ancestor &key setup-hooks teardown-hooks)
-  "Define a suite, which may be hierarchical."
-  `(let ((suite (make-test-suite :name ',suite-name
-                                 :setup-hooks ,setup-hooks :teardown-hooks ,teardown-hooks)))
-     (elunit-delete-suite ',suite-name)
-     (if ',suite-ancestor
-         (push suite (elunit-test-suite-children (elunit-get-suite ',suite-ancestor))))
-     (add-to-list 'elunit-suites suite)
-     suite))
-
-(defun elunit-get-suite (suite)
-  "Fetch a SUITE by its name."
-  (if (elunit-test-suite-p suite)
-      suite
-    (find suite elunit-suites :test (lambda (suite asuite)
-                                     (equal suite (elunit-test-suite-name asuite))))))
-
-(defun elunit-delete-suite (name)
-  "Remove a suite named NAME."
-  ;; TODO: why doesn't delete work here?
-  ;; (delete (elunit-get-suite name) elunit-suites))
-  (setq elunit-suites (remove (elunit-get-suite name) elunit-suites)))
-
-(defmacro elunit-deftest (name suite &rest body)
-  "Define a test NAME in SUITE with BODY."
-  (save-excursion
-    ;; TODO: Use backtrace info to get line number
-    (search-backward (concat "elunit-deftest " (symbol-name name)) nil t)
-    (let ((line (line-number-at-pos))
-          (file buffer-file-name)
-          (suite-sym (gensym)))
-      `(let ((,suite-sym (elunit-get-suite ',suite)))
-         ;; not a foolproof heuristic to get line number, but good enough.
-         (elunit-delete-test ',name ,suite-sym)
-         (push (make-test :name ',name :body (lambda () ,@body)
-                                       :file ,file :line ,line)
-               (elunit-test-suite-tests ,suite-sym))))))
-
-(defun elunit-get-test (name suite)
-  "Return a test given a NAME and SUITE."
-  (if (elunit-test-p name) name
-    (find name (elunit-test-suite-tests (elunit-get-suite suite))
-          :test (lambda (name test) (equal name (elunit-test-name test))))))
-
-(defun elunit-delete-test (name suite)
-  "Delete test named NAME in SUITE."
-  (let ((suite (elunit-get-suite suite)))
-    (setf (elunit-test-suite-tests suite)
-          (delete (elunit-get-test name suite) (elunit-test-suite-tests suite)))))
-
-(defun elunit-total-test-count (suite)
-  "Return the total number of tests in a SUITE."
-  (let ((suite (elunit-get-suite suite)))
-    (if suite
-        (+ (apply #'+ (elunit-total-test-count (elunit-test-suite-children suite)))
-           (length (elunit-test-suite-tests suite))))))
-
-(defun elunit-test-docstring (test)
-  "Return a TEST's docstring."
-  (if (equal (car (elunit-test-body test)) 'lambda)
-      (if (stringp (caddr (elunit-test-body test)))
-          (caddr (elunit-test-body test))
-        "")))
-
-;;; Running the tests
-
-(defun elunit (suite)
-  "Ask for a single SUITE, run all its tests, and display the results."
-  (interactive (list (completing-read
-		      (concat "Run test suite (default " elunit-default-suite "): " )
-		      (mapcar (lambda (suite) (symbol-name (elunit-test-suite-name suite)))
-			      elunit-suites) nil t nil nil elunit-default-suite)))
-  
-  (elunit-run-suite (elunit-get-suite (intern suite)))
-  (message "%d tests with %d problems." elunit-test-count (length elunit-failures)))
-
-(defun elunit-run-suite (suite)
-  "Run a SUITE's tests and children."
-  (setq elunit-default-suite (symbol-name (elunit-test-suite-name suite))
-	elunit-test-count 0
-	elunit-failures nil)
-
-  (dolist (test (reverse (elunit-test-suite-tests suite)))
-    (if (elunit-test-suite-setup-hooks suite) (apply #'funcall (elunit-test-suite-setup-hooks suite)))
-    (elunit-run-test test)
-    (if (elunit-test-suite-teardown-hooks suite) (apply #'funcall (elunit-test-suite-teardown-hooks suite))))
-  (dolist (child-suite (elunit-test-suite-children suite))
-    (elunit-run-suite child-suite))
-  (run-hook-with-args 'elunit-done-running-hook elunit-test-count (length elunit-failures)))
-
-(defun elunit-run-test (test)
-  "Run a single `TEST'."
-  (condition-case err
-      (progn
-        (incf elunit-test-count)
-        (funcall (elunit-test-body test))
-	(elunit-highlight-test test 'elunit-pass-face))
-    (failure
-     (elunit-failure test err 'elunit-fail-face))
-    (error
-     (elunit-failure test err 'elunit-error-face))))
-
-(defun elunit-failure (test err face)
-  "Record a failing TEST and store ERR info."
-  (setf (elunit-test-problem test) err
-	(elunit-test-message test) (or (cadr err) (format "%s" err)))
-  (push test elunit-failures)
-  (elunit-highlight-test test face))
-
-(defun elunit-highlight-test (test face)
-  (save-excursion
-    ;; (switch-to-buffer (file-name-nondirectory (elunit-test-file test)))
-    (goto-line (elunit-test-line test))
-    (beginning-of-line)
-    (let ((line-start (point)))
-      (end-of-line)
-      (overlay-put (make-overlay line-start (point)) 'face face))))
-
-(defun elunit-explain-problem ()
-  "Display a message explaining the problem with the test at point."
-  (interactive)
-  (save-excursion
-    (search-backward-regexp "(elunit-deftest \\([-a-z]+\\) \\([-a-z]+\\)" nil t)
-    (if (and (match-string 1) (match-string 2))
-	(elunit-test-message (elunit-get-test (intern (match-string 1))
-				       (intern (match-string 2)))))))
-
-;;; Helper functions
-
-(defmacro elunit-with-test-buffer (&rest body)
-  "Execute BODY in a test buffer named `*elunit-output*'."
-  `(save-excursion
-     (switch-to-buffer "*elunit-output*")
-     ,@body
-     (kill-buffer "*elunit-output*")))
-
-(defun elunit-fail (&rest args)
-  "Signal a test failure in a way that elunit understands.
-Takes the same ARGS as `error'."
-    (signal 'elunit-test-failed (list (apply 'format args))))
-
-(font-lock-add-keywords 'emacs-lisp-mode
-			;; Make elunit tests look like defuns.
-			'(("elunit-defsuite"   . 'font-lock-keyword-face)
-			  ("elunit-deftest"    . 'font-lock-keyword-face)
-			  ("\\<fail\\>" . 'font-lock-warning-face)))
-
-;;; General assertions
-
-;; These are preferred over stuff like (assert (equal [...] because
-;; they use the `fail' function, which reports errors nicely.
-
-(defun elunit-assert-that (actual)
-  "Fails if ACTUAL is nil."
-  (unless actual
-    (elunit-fail "%s expected to be non-nil" actual)))
-
-(defun elunit-assert-nil (actual)
-  "Fails if ACTUAL is non-nil."
-  (when actual
-    (elunit-fail "%s expected to be nil" actual)))
-
-(defun elunit-assert-equal (expected actual)
-  "Fails if EXPECTED is not equal to ACTUAL."
-  (unless (equal expected actual)
-    (elunit-fail "%s expected to be %s" actual expected)))
-
-(defun elunit-assert-not-equal (expected actual)
-  "Fails if EXPECTED is equal to ACTUAL."
-  (when (equal expected actual)
-    (elunit-fail "%s expected to not be %s" actual expected)))
-
-(defun elunit-assert-member (elt list)
-  "Fails if ELT is not a member of LIST."
-  (unless (member elt list)
-    (elunit-fail "%s expected to include %s" list elt)))
-
-(defun elunit-assert-match (regex string)
-  "Fails if REGEX does not match STRING."
-  (unless (string-match regex string)
-    (elunit-fail "%s expected to match %s" string regex)))
-
-(defmacro elunit-assert-error (&rest body)
-  "Fails if BODY does not signal an error."
-  `(condition-case err
-       (progn
-	 ,@body
-	 (elunit-fail "%s expected to signal an error" body))
-     (error t)))
-
-(defmacro elunit-assert-changed (form &rest body)
-  "Fails if FORM does not return a different value after BODY is evaled."
-  `(elunit-assert-not-equal (eval ,form)
-		     (progn
-		       ,@body
-		       (eval ,form))))
-
-(defmacro elunit-assert-not-changed (form &rest body)
-  "Fails if FORM returns a different value after BODY is evaled."
-  `(elunit-assert-equal (eval ,form)
-		     (progn
-		       ,@body
-		       (eval ,form))))
-
-(provide 'elunit)
-
-;;; elunit.el ends here
diff --git a/elpa-to-submit/nxhtml/tests/emacstest-suites.el b/elpa-to-submit/nxhtml/tests/emacstest-suites.el
index 796dffaa18..9b144f2730 100644
--- a/elpa-to-submit/nxhtml/tests/emacstest-suites.el
+++ b/elpa-to-submit/nxhtml/tests/emacstest-suites.el
@@ -53,6 +53,8 @@
   (file-name-directory (if load-file-name load-file-name buffer-file-name)))
 
 (pushnew emacstest-bin load-path)
+
+
 (require 'ert2)
 
 
diff --git a/elpa-to-submit/nxhtml/tests/ert-080729.el b/elpa-to-submit/nxhtml/tests/ert-080729.el
deleted file mode 100644
index 586f35813a..0000000000
--- a/elpa-to-submit/nxhtml/tests/ert-080729.el
+++ /dev/null
@@ -1,2095 +0,0 @@
-;;; ert.el --- Emacs Lisp Regression Testing
-
-;; Copyright (C) 2007, 2008 Christian M. Ohler
-
-;; Author: Christian M. Ohler
-;; Version: 0.2
-;; Keywords: lisp, tools
-
-;; This file is NOT part of GNU Emacs.
-
-;; This program 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 3 of the
-;; License, or (at your option) any later version.
-;;
-;; This program 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 this program.  If not, see `http://www.gnu.org/licenses/'.
-
-;;; Commentary:
-
-;; ERT is a tool for automated testing in Emacs Lisp.  Its main
-;; features are facilities for defining and running test cases and
-;; reporting the results as well as for debugging test failures
-;; interactively.
-;;
-;; The main entry points are `ert-deftest', which is similar to
-;; `defun' but defines a test, and `ert-run-tests-interactively',
-;; which runs tests and offers an interactive interface for inspecting
-;; results and debugging.  There is also `ert-run-tests-batch' for
-;; non-interactive use.
-;;
-;; The body of `ert-deftest' forms resembles a function body, but the
-;; additional operators `should', `should-not' and `should-error' are
-;; available.  `should' is similar to cl's `assert', but signals a
-;; different error when its condition is violated that is caught and
-;; processed by ERT.  In addition, it analyzes its argument form and
-;; records information that helps debugging (`assert' tries to do
-;; something similar when its second argument SHOW-ARGS is true, but
-;; `should' is more sophisticated).  For information on `should-not'
-;; and `should-error', see their docstrings.
-;;
-;; For example,
-;;
-;;     ;; Define a test named `foo'.
-;;     (ert-deftest foo ()
-;;       (should (= (+ 1 2) 4)))
-;;
-;;     ;; Run it.
-;;     (ert-run-tests-interactively 'foo)
-;;
-;; generates the following output (in addition to some statistics) in
-;; the *ert* results buffer:
-;;
-;;     F foo
-;;         (ert-test-failed
-;;          ((should
-;;            (=
-;;             (+ 1 2)
-;;             4))
-;;           :form
-;;           (= 3 4)
-;;           :value nil))
-;;
-;; This indicates that the test failed.  The `should' form that failed
-;; was (should (= (+ 1 2) 4)), because its inner form, after
-;; evaluation of its arguments, was the function call (= 3 4), which
-;; returned nil.
-;;
-;; Obviously, this is a bug in the test case, not in the functions `+'
-;; or `='.  In the results buffer, with point on the test result, the
-;; key "." can be used to jump to the definition of the test to modify
-;; it to correct the bug.  After evaluating the modified definition
-;; and switching back to the results buffer, the key "r" will re-run
-;; the test and show the new result.
-
-
-;; Test selectors
-;;
-;; Functions like `ert-run-tests-interactively' accept a test
-;; selector, which is a Lisp expression specifying a set of tests.
-;; Each test name is a selector that refers to that test, the selector
-;; `t' refers to all tests, and the selector `:failed' refers to all
-;; tests that failed; but more complex selectors are available.  Test
-;; selector syntax is similar to cl's type specifier syntax.  See the
-;; docstring of `ert-select-tests' for details.
-
-
-;; Comparison with other testing tools
-;;
-;; ERT allows test-driven development similar to *Unit frameworks for
-;; other languages.  However, two common *Unit features are notably
-;; absent from ERT: fixtures and test suites.
-;;
-;; Fixtures, as used e.g. in SUnit or JUnit, have two main purposes:
-;; Setting up (and tearing down) an environment for a set of test
-;; cases, and making that environment accessible through object
-;; attributes that can be used like local variables.
-;;
-;; While fixtures are a great syntactic simplification in other
-;; languages, they are not very useful in Lisp, where higher-order
-;; functions and `unwind-protect' are available.  One way to implement
-;; and use a fixture in ERT is
-;;
-;;    (defun my-fixture (body)
-;;      (unwind-protect
-;;          (progn ...set up...
-;;                 (funcall body))
-;;        ...tear down...))
-;;
-;;    (ert-deftest my-test ()
-;;      (my-fixture
-;;       (lambda ()
-;;         ...test code...)))
-;;
-;; (Another way would be a `with-my-fixture' macro.)  This solves the
-;; set-up and tear-down part, and additionally allows any test case to
-;; use any combination of fixtures, so it is more general than what
-;; other tools typically allow.
-;;
-;; If the test case needs access to the environment the fixture sets
-;; up, the fixture can be modified to pass arguments to the body.
-;;
-;; These are standard Lisp idioms.  Special syntax for them could be
-;; added easily enough, but would provide only a minor simplification.
-;;
-;; (Note that splitting set-up and tear-down into separate functions,
-;; like *Unit tools usually do, makes it impossible to establish
-;; dynamic `let' bindings as part of the fixture.  So, blindly
-;; imitating the way fixtures are implemented in other languages would
-;; be counter-productive in Lisp.)
-;;
-;;
-;; The purpose of test suites is to group related test cases together.
-;; The most common use of this is to run just the tests for one
-;; particular module.  Since symbol prefixes are the usual way of
-;; separating module namespaces in Emacs Lisp, test selectors already
-;; solve this by allowing regexp matching on test names; e.g., the
-;; selector "^ert-" selects ERT's self-tests.
-;;
-;; If test suites containing arbitrary sets of tests are found to be
-;; desirable, it would be easy to add a `define-test-selector'
-;; mechanism that introduces a new selector, defined in terms of
-;; existing ones; e.g.
-;;
-;;     ;; Note that `define-test-selector' does not exist yet.
-;;     (define-test-selector my-test-suite () `(member foo-test bar-test))
-;;
-;; would define a test suite named `my-test-suite' consisting of
-;; `foo-test' and `bar-test'.  See also `deftype' in Common Lisp.
-
-
-;; TODO: Add `skip' feature for tests that can't run in current environment.
-
-
-;;; Code:
-
-(require 'cl)
-(require 'ewoc)
-(require 'find-func)
-(require 'debug)
-
-(defvar ert-debug-on-error nil
-  "Non-nil means enter debugger when a test fails or terminates with an error.")
-
-
-;;; Defining and locating tests.
-
-;; The data structure that represents a test case.
-(defstruct ert-test
-  (name nil)
-  (documentation nil)
-  (body (assert nil))
-  (most-recent-result nil)
-  (expected-result-type 'ert-test-passed))
-
-(defun ert-test-boundp (symbol)
-  "Return non-nil if SYMBOL names a test."
-  (and (get symbol 'ert-test) t))
-
-(defun ert-get-test (symbol)
-  "If SYMBOL names a test, return that.  Signal an error otherwise."
-  (assert (ert-test-boundp symbol) t)
-  (get symbol 'ert-test))
-
-(defun ert-set-test (symbol definition)
-  "Make SYMBOL name the test DEFINITION, and return DEFINITION."
-  (put symbol 'ert-test definition)
-  definition)
-
-(defun ert-make-test-unbound (symbol)
-  "Make SYMBOL name no test.  Return SYMBOL."
-  (remprop symbol 'ert-test)
-  symbol)
-
-(defun ert-test-result-expected-p (test result)
-  "Return non-nil if RESULT matches the expected result type for TEST."
-  (typep result (ert-test-expected-result-type test)))
-
-(defvar ert-find-test-regexp
-  (concat "^\\s-*(ert-deftest"
-          find-function-space-re
-          "%s\\(\\s-\\|$\\)")
-  "The regexp the `find-function' mechanisms use for locating test definitions.")
-
-(eval-and-compile
-  (defun ert-parse-keys-and-body (keys-and-body)
-    "Split KEYS-AND-BODY into keyword-and-value pairs and the remaining body.
-
-KEYS-AND-BODY should have the form of a property list, with the
-exception that only keywords are permitted as keys and that the
-tail -- the body -- is a list of forms that does not start with a
-keyword.
-
-Returns a two-element list containing the keys-and-values plist
-and the body."
-    (let ((extracted-key-accu '())
-          (remaining keys-and-body))
-      (while (and (consp remaining) (keywordp (first remaining)))
-        (let ((keyword (pop remaining)))
-          (unless (consp remaining)
-            (error "Value expected after keyword %S in %S"
-                   keyword keys-and-body))
-          (when (assoc keyword extracted-key-accu)
-            (warn "Keyword %S appears more than once in %S" keyword
-                  keys-and-body))
-          (push (cons keyword (pop remaining)) extracted-key-accu)))
-      (setq extracted-key-accu (nreverse extracted-key-accu))
-      (list (loop for (key . value) in extracted-key-accu
-                  collect key
-                  collect value)
-            remaining))))
-
-;;;;###autoload
-(defmacro* ert-deftest (name () &body keys-and-body)
-  "Define NAME (a symbol) as a test.
-
-\(fn NAME () [:documentation DOCSTRING] [:expected-result TYPE] BODY...)"
-  (declare (debug (&define :name test name sexp
-                           [&optional [":documentation" stringp]]
-                           [&optional [":expected-result" sexp]]
-                           def-body)))
-  (destructuring-bind ((&key (expected-result nil expected-result-supplied-p)
-                             (documentation nil documentation-supplied-p))
-                       body)
-      (ert-parse-keys-and-body keys-and-body)
-    `(progn
-       (ert-set-test ',name
-                     (make-ert-test
-                      :name ',name
-                      :body (lambda () ,@body)
-                      ,@(when expected-result-supplied-p
-                          `(:expected-result-type ,expected-result))
-                      ,@(when documentation-supplied-p
-                          `(:documentation ,documentation))))
-       ;; This hack allows `symbol-file' to associate `ert-deftest'
-       ;; forms with files, and therefore enables `find-function' to
-       ;; work with tests.  However, it leads to warnings in
-       ;; `unload-feature', which doesn't know how to undefine tests
-       ;; and has no mechanism for extension.
-       (push '(ert-deftest . ,name) current-load-list)
-       ',name)))
-
-(defun ert-read-test-name (prompt &optional default-value history)
-  "Read the name of a test and return it as a symbol.
-Prompt with PROMPT.  By default, return DEFAULT-VALUE."
-  (when (symbolp default-value) (setq default-value (symbol-name default-value)))
-  (intern (completing-read prompt obarray #'ert-test-boundp
-                           t nil history default-value nil)))
-
-(defun ert-find-test-other-window (test-name)
-  "Find, in another window, the definition of TEST-NAME."
-  (interactive (list (ert-read-test-name "Find test definition: ")))
-  (find-function-do-it test-name 'ert-deftest 'switch-to-buffer-other-window))
-
-(defun ert-delete-test (test-name)
-  "An interactive interface to `ert-make-test-unbound'."
-  (interactive (list (let ((default (thing-at-point 'symbol)))
-                       (when default
-                         (set-text-properties 0 (length default) nil default)
-                         (when (or (string= default "nil") (intern-soft default))
-                           (setq default (intern default)))
-                         (unless (ert-test-boundp default)
-                           (setq default nil)))
-                       (completing-read (if (null default)
-                                            "Delete test: "
-                                          (format "Delete test (default %s): "
-                                                  default))
-                                        obarray #'ert-test-boundp
-                                        'really-require-match
-                                        nil nil default nil))))
-  (ert-make-test-unbound test-name))
-
-(defun ert-delete-all-tests ()
-  "Make all symbols in `obarray' name no test."
-  (interactive)
-  (when (interactive-p)
-    (unless (y-or-n-p "Delete all tests? ")
-      (error "Aborted")))
-  (mapc #'ert-delete-test (mapcar #'ert-test-name (ert-select-tests t t)))
-  t)
-
-
-;;; Test selectors.
-
-(defun ert-select-tests (selector universe)
-  "Select, from UNIVERSE, a set of tests according to SELECTOR.
-
-UNIVERSE should be a list of tests, or t, which refers to all
-tests named by symbols in `obarray'.
-
-Returns the set of tests as a list.
-
-Valid selectors:
-
-nil -- Selects the empty set.
-t -- Selects UNIVERSE.
-:new -- Selects all tests that have not been run yet.
-:failed, :passed, :error -- Select tests according to their most recent result.
-:expected, :unexpected -- Select tests according to their most recent result.
-a string -- Selects all tests that have a name that matches the string, a regexp.
-a test -- Selects that test.
-a symbol -- Selects the test that the symbol names, errors if none.
-\(member TESTS...\) -- Selects TESTS, a list of tests or symbols naming tests.
-\(eql TEST\) -- Selects TEST, a test or a symbol naming a test.
-\(and SELECTORS...\) -- Selects the tests that match all SELECTORS.
-\(or SELECTORS...\) -- Selects the tests that match any SELECTOR.
-\(not SELECTOR\) -- Selects all tests that do not match SELECTOR.
-\(satisfies PREDICATE\) -- Selects all tests that satisfy PREDICATE.
-
-Only selectors that require a superset of tests, such
-as (satisfies ...), strings, :new, etc. make use of UNIVERSE.
-Selectors that do not, such as \(member ...\), just return the
-set implied by them without checking whether it is really
-contained in UNIVERSE."
-  ;; This code needs to match the etypecase in
-  ;; `ert-insert-human-readable-selector'.
-  (etypecase selector
-    ((member nil) nil)
-    ((member t) (etypecase universe
-                  (list universe)
-                  ((member t) (ert-select-tests "" universe))))
-    ((member :new) (ert-select-tests
-                    `(satisfies ,(lambda (test)
-                                   (typep (ert-test-most-recent-result test)
-                                          'null)))
-                    universe))
-    ((member :failed) (ert-select-tests
-                       `(satisfies ,(lambda (test)
-                                      (typep (ert-test-most-recent-result test)
-                                             'ert-test-failed)))
-                       universe))
-    ((member :passed) (ert-select-tests
-                       `(satisfies ,(lambda (test)
-                                      (typep (ert-test-most-recent-result test)
-                                             'ert-test-passed)))
-                       universe))
-    ((member :error) (ert-select-tests
-                      `(satisfies ,(lambda (test)
-                                     (typep (ert-test-most-recent-result test)
-                                            'ert-test-error)))
-                      universe))
-    ((member :expected) (ert-select-tests
-                         `(satisfies
-                           ,(lambda (test)
-                              (ert-test-result-expected-p
-                               test
-                               (ert-test-most-recent-result test))))
-                         universe))
-    ((member :unexpected) (ert-select-tests `(not :expected) universe))
-    (string
-     (etypecase universe
-       ((member t) (mapcar #'ert-get-test
-                           (apropos-internal selector #'ert-test-boundp)))
-       (list (remove-if-not (lambda (test)
-                              (and (ert-test-name test)
-                                   (string-match selector (ert-test-name test))))
-                            universe))))
-    (ert-test (list selector))
-    (symbol
-     (assert (ert-test-boundp selector))
-     (list (ert-get-test selector)))
-    (cons
-     (destructuring-bind (operator &rest operands) selector
-       (ecase operator
-         (member
-          (mapcar (lambda (purported-test)
-                    (etypecase purported-test
-                      (symbol (assert (ert-test-boundp purported-test))
-                              (ert-get-test purported-test))
-                      (ert-test purported-test)))
-                  operands))
-         (eql
-          (assert (eql (length operands) 1))
-          (ert-select-tests `(member ,@operands) universe))
-         (and
-          ;; Do these definitions of AND, NOT and OR satisfy de
-          ;; Morgan's rules?  Should they?
-          (case (length operands)
-            (0 (ert-select-tests 't universe))
-            (t (ert-select-tests `(and ,@(rest operands))
-                                 (ert-select-tests (first operands) universe)))))
-         (not
-          (assert (eql (length operands) 1))
-          (set-difference (ert-select-tests 't universe)
-                          (ert-select-tests (first operands) universe)))
-         (or
-          (case (length operands)
-            (0 (ert-select-tests 'nil universe))
-            (t (union (ert-select-tests (first operands) universe)
-                      (ert-select-tests `(or ,@(rest operands)) universe)))))
-         (satisfies
-          (assert (eql (length operands) 1))
-          (remove-if-not (first operands) (ert-select-tests 't universe))))))))
-
-(defun ert-insert-human-readable-selector (selector)
-  "Insert a human-readable presentation of SELECTOR into the current buffer."
-  ;; This is needed to avoid printing the (huge) contents of the
-  ;; `backtrace' slot of the result objects in the
-  ;; `most-recent-result' slots of test case objects in (eql ...) or
-  ;; (member ...) selectors.
-  (labels ((rec (selector)
-             ;; This code needs to match the etypecase in `ert-select-tests'.
-             (etypecase selector
-               ((or (member nil t
-                            :new :failed :passed :error
-                            :expected :unexpected)
-                    string
-                    symbol)
-                selector)
-               (ert-test
-                (if (ert-test-name selector)
-                    (make-symbol (format "<%S>" (ert-test-name selector)))
-                  (make-symbol "<unnamed test>")))
-               (cons
-                (destructuring-bind (operator &rest operands) selector
-                  (ecase operator
-                    ((member eql and not or)
-                     `(,operator ,@(mapcar #'rec operands)))
-                    (satisfies
-                     selector)))))))
-    (insert (format "%S" (rec selector)))))
-
-
-;;; Running tests.
-
-(put 'ert-test-failed 'error-conditions '(error ert-test-failed))
-(put 'ert-test-failed 'error-message "Test failed")
-
-(defun ert-pass ()
-  "Terminate the current test and mark it passed.  Does not return."
-  (throw 'ert-pass nil))
-
-(defun ert-fail (data)
-  "Terminate the current test and mark it failed.  Does not return.
-DATA is displayed to the user and should state the reason of the failure."
-  (signal 'ert-test-failed (list data)))
-
-;; The data structures that represent the result of running a test.
-(defstruct ert-test-result)
-(defstruct (ert-test-passed (:include ert-test-result)))
-(defstruct (ert-test-result-with-condition (:include ert-test-result)
-                                           (:conc-name ert-test-result-))
-  (condition (assert nil))
-  (backtrace (assert nil)))
-(defstruct (ert-test-error (:include ert-test-result-with-condition)))
-(defstruct (ert-test-quit (:include ert-test-result-with-condition)))
-(defstruct (ert-test-failed (:include ert-test-result-with-condition)))
-(defstruct (ert-test-aborted-with-non-local-exit (:include ert-test-result)))
-
-
-(defun ert-record-backtrace ()
-  "Record the current backtrace (as a list) and return it."
-  ;; Since the backtrace is stored in the result object, result
-  ;; objects must only be printed with appropriate limits
-  ;; (`print-level' and `print-length') in place.  For interactive
-  ;; use, the cost of ensuring this possibly outweighs the advantage
-  ;; of storing the backtrace for
-  ;; `ert-results-pop-to-backtrace-for-test-at-point' given that we
-  ;; already have `ert-results-rerun-test-debugging-errors-at-point'.
-  ;; For batch use, however, printing the backtrace may be useful.
-  (loop
-   ;; 6 is the number of frames our own debugger adds (when
-   ;; compiled; more when interpreted).  FIXME: Need to describe a
-   ;; procedure for determining this constant.
-   for i from 6
-   for frame = (backtrace-frame i)
-   while frame
-   collect frame))
-
-;; A container for the state of the execution of a single test and
-;; environment data needed during its execution.
-(defstruct ert-test-execution-info
-  (test (assert nil))
-  (result (assert nil))
-  ;; A thunk that may be called when RESULT has been set to its final
-  ;; value and test execution should be terminated.  Should not
-  ;; return.
-  (exit-continuation (assert nil))
-  ;; The binding of `debugger' outside of the execution of the test.
-  next-debugger
-  ;; The binding of `ert-debug-on-error' that is in effect for the
-  ;; execution of the current test.  We store it to avoid being
-  ;; affected by any new bindings the test itself may establish.  (I
-  ;; don't remember whether this feature is important.)
-  ert-debug-on-error)
-
-(defun ert-run-test-debugger (info debugger-args)
-  "The function that `debugger' is bound to during the execution of tests.
-
-Records failures and errors and either terminates the test
-silently or calls the interactive debugger, as appropriate."
-  (destructuring-bind (first-debugger-arg &rest more-debugger-args) debugger-args
-    (ecase first-debugger-arg
-      ((lambda debug t exit nil)
-       (apply (ert-test-execution-info-next-debugger info) debugger-args))
-      (error
-       (let* ((condition (first more-debugger-args))
-              (type (case (car condition)
-                      ((quit) 'quit)
-                      ((ert-test-failed) 'failed)
-                      (otherwise 'error)))
-              (backtrace (ert-record-backtrace)))
-         (setf (ert-test-execution-info-result info)
-               (ecase type
-                 (quit
-                  (make-ert-test-quit :condition condition
-                                      :backtrace backtrace))
-                 (failed
-                  (make-ert-test-failed :condition condition
-                                        :backtrace backtrace))
-                 (error
-                  (make-ert-test-error :condition condition
-                                       :backtrace backtrace))))
-         ;; Work around Emacs' heuristic (in eval.c) for detecting
-         ;; errors in the debugger.
-         (incf num-nonmacro-input-events)
-         ;; FIXME: We should probably implement more fine-grained
-         ;; control a la non-t `debug-on-error' here.
-         (cond
-          ((ert-test-execution-info-ert-debug-on-error info)
-           (apply (ert-test-execution-info-next-debugger info) debugger-args))
-          (t))
-         (funcall (ert-test-execution-info-exit-continuation info)))))))
-
-(defun ert-run-test-internal (ert-test-execution-info)
-  (lexical-let ((info ert-test-execution-info))
-    (setf (ert-test-execution-info-next-debugger info) debugger
-          (ert-test-execution-info-ert-debug-on-error info) ert-debug-on-error)
-    (catch 'ert-pass
-      ;; For now, each test gets its own temp buffer and its own
-      ;; window excursion, just to be safe.  If this turns out to be
-      ;; too expensive, we can remove it.
-      (with-temp-buffer
-        (save-window-excursion
-          (let ((debugger (lambda (&rest debugger-args)
-                            (ert-run-test-debugger info debugger-args)))
-                (debug-on-error t)
-                (debug-on-quit t)
-                ;; FIXME: Do we need to store the old binding of this
-                ;; and consider it in `ert-run-test-debugger'?
-                (debug-ignored-errors nil))
-            (funcall (ert-test-body (ert-test-execution-info-test info))))))
-      (ert-pass))
-    (setf (ert-test-execution-info-result info) (make-ert-test-passed))))
-
-(defun ert-run-test (test)
-  "Run TEST.  Return the result and store it in TEST's `most-recent-result' slot."
-  (setf (ert-test-most-recent-result test) nil)
-  (block error
-    (lexical-let ((info (make-ert-test-execution-info
-                         :test test
-                         :result (make-ert-test-aborted-with-non-local-exit)
-                         :exit-continuation (lambda ()
-                                              (return-from error nil)))))
-      (unwind-protect
-          (ert-run-test-internal info)
-        (setf (ert-test-most-recent-result test)
-              (ert-test-execution-info-result info)))))
-  (ert-test-most-recent-result test))
-
-
-;;; The `should' macros.
-
-(eval-and-compile
-  (defun ert-special-operator-p (thing)
-    "Return non-nil if THING is a symbol naming a special operator."
-    (and (symbolp thing)
-         (let ((definition (indirect-function thing t)))
-           (and (subrp definition)
-                (eql (cdr (subr-arity definition)) 'unevalled)))))
-  (defun ert-expand-should (whole form env inner-expander)
-    "Helper function for the `should' macro and its variants.
-
-Analyzes FORM and produces an expression that has the same
-semantics under evaluation but records additional debugging
-information.  INNER-EXPANDER adds the actual checks specific to
-the particular variant of `should'."
-    (let ((form (macroexpand form env)))
-      ;; It's sort of a wart that `inner-expander' can't influence the
-      ;; value the expansion returns.
-      (cond
-       ((atom form)
-        (funcall inner-expander form `(list ',whole :form ',form :value ,form)))
-       ((ert-special-operator-p (car form))
-        (let ((value (gensym "value-")))
-          `(let ((,value (make-symbol "ert-form-evaluation-aborted")))
-             ,(funcall inner-expander
-                       `(setq ,value ,form)
-                       `(list ',whole :form ',form :value ,value))
-             ,value)))
-       (t
-        (let ((fn-name (car form))
-              (arg-forms (cdr form)))
-          (assert (or (symbolp fn-name)
-                      (and (consp fn-name)
-                           (eql (car fn-name) 'lambda)
-                           (listp (cdr fn-name)))))
-          (let ((fn (gensym "fn-"))
-                (args (gensym "args-"))
-                (value (gensym "value-"))
-                (default-value (gensym "ert-form-evaluation-aborted-")))
-            `(let ((,fn (function ,fn-name))
-                   (,args (list ,@arg-forms)))
-               (let ((,value ',default-value))
-                 ,(funcall inner-expander
-                           `(setq ,value (apply ,fn ,args))
-                           `(nconc (list ',whole)
-                                   (list :form `(,,fn ,@,args))
-                                   (unless (eql ,value ',default-value)
-                                     (list :value ,value))
-                                   (let ((-explainer-
-                                          (and (symbolp ',fn-name)
-                                               (get ',fn-name
-                                                    'ert-explainer))))
-                                     (when -explainer-
-                                       (list :explanation
-                                             (apply -explainer- ,args))))))
-                 ,value)))))))))
-
-(defmacro* should (form &environment env)
-  "Evaluate FORM.  If it returns nil, abort the current test as failed.
-
-Returns the value of FORM."
-  (ert-expand-should `(should ,form) form env
-                     (lambda (inner-form form-description-form)
-                       `(unless ,inner-form
-                          (ert-fail ,form-description-form)))))
-
-(defmacro* should-not (form &environment env)
-  "Evaluate FORM.  If it returns non-nil, abort the current test as failed.
-
-Returns nil."
-  (ert-expand-should `(should-not ,form) form env
-                     (lambda (inner-form form-description-form)
-                       `(unless (not ,inner-form)
-                          (ert-fail ,form-description-form)))))
-
-(defun ert-should-error-handle-error (form-description-fn
-                                      condition type exclude-subtypes test)
-  "Helper function for `should-error'.
-
-Determines whether CONDITION matches TYPE, EXCLUDE-SUBTYPES and
-TEST, and aborts the current test as failed if it doesn't."
-  (let ((signalled-conditions (get (car condition) 'error-conditions))
-        (handled-conditions (etypecase type
-                              (list type)
-                              (symbol (list type)))))
-    (assert signalled-conditions)
-    (unless (intersection signalled-conditions handled-conditions)
-      (ert-fail (append
-                 (funcall form-description-fn)
-                 (list
-                  :condition condition
-                  :fail-reason (concat "the error signalled did not"
-                                       " have the expected type")))))
-    (when exclude-subtypes
-      (unless (member (car condition) handled-conditions)
-        (ert-fail (append
-                   (funcall form-description-fn)
-                   (list
-                    :condition condition
-                    :fail-reason (concat "the error signalled was a subtype"
-                                         " of the expected type"))))))
-    (unless (funcall test condition)
-      (ert-fail (append
-                 (funcall form-description-fn)
-                 (list
-                  :condition condition
-                  :fail-reason "the error signalled did not pass the test"))))))
-
-;; FIXME: The expansion will evaluate the keyword args (if any) in
-;; nonstandard order.
-(defmacro* should-error (form &rest keys &key type exclude-subtypes test
-                              &environment env)
-  "Evaluate FORM.  Unless it signals an error, abort the current test as failed.
-
-The error signalled additionally needs to match TYPE and satisfy
-TEST.  TYPE should be a condition name or a list of condition
-names.  If EXCLUDE-SUBTYPES is nil, the error matches TYPE if one
-of its condition names is an element of TYPE.  If
-EXCLUDE-SUBTYPES is non-nil, the error matches TYPE if it is an
-element of TYPE.  TEST should be a predicate."
-  ;; Returns a gensym named `ert-form-evaluation-aborted-XXX', but
-  ;; that's a wart, so let's not document it.
-  (unless type (setq type ''error))
-  (unless test (setq test '(lambda (condition) t)))
-  (ert-expand-should
-   `(should-error ,form ,@keys)
-   form env
-   (lambda (inner-form form-description-form)
-     (let ((errorp (gensym "errorp"))
-           (form-description-fn (gensym "form-description-fn-")))
-       `(let ((,errorp nil)
-              (,form-description-fn (lambda () ,form-description-form)))
-          (condition-case -condition-
-              ,inner-form
-            ;; We can't use ,type here because we want to evaluate it.
-            (error
-             (setq ,errorp t)
-             (ert-should-error-handle-error ,form-description-fn
-                                            -condition-
-                                            ,type ,exclude-subtypes ,test)
-             ;; It would make sense to have the `should-error' form
-             ;; return the error in this case, but `ert-expand-should'
-             ;; doesn't allow that at the moment.
-             ))
-          (unless ,errorp
-            (ert-fail (append
-                       (funcall ,form-description-fn)
-                       (list
-                        :fail-reason "did not signal an error")))))))))
-
-
-;;; Explanation of `should' failures.
-
-(defun ert-proper-list-p (x)
-  "Return non-nil if X is a proper list, nil otherwise."
-  (loop
-   for firstp = t then nil
-   for fast = x then (cddr fast)
-   for slow = x then (cdr slow) do
-   (when (null fast) (return t))
-   (when (not (consp fast)) (return nil))
-   (when (null (cdr fast)) (return t))
-   (when (not (consp (cdr fast))) (return nil))
-   (when (and (not firstp) (eq fast slow)) (return nil))))
-
-(defun ert-explain-not-equal (a b)
-  "Return a programmer-readable explanation of why A and B are not `equal'.
-
-Returns nil if they are equal."
-  (if (not (equal (type-of a) (type-of b)))
-      `(different-types ,a ,b)
-    (etypecase a
-      (cons
-       (let ((a-proper-p (ert-proper-list-p a))
-             (b-proper-p (ert-proper-list-p b)))
-         (if (not (eql (not a-proper-p) (not b-proper-p)))
-             `(one-list-proper-one-improper ,a ,b)
-           (if a-proper-p
-               (if (not (equal (length a) (length b)))
-                   ;; This would be even more helpful if it showed
-                   ;; something like what `set-difference' would
-                   ;; return.
-                   `(proper-lists-of-different-length ,a ,b)
-                 (loop for i from 0
-                       for ai in a
-                       for bi in b
-                       for xi = (ert-explain-not-equal ai bi)
-                       do (when xi (return `(list-elt ,i ,xi)))))
-             (let ((car-x (ert-explain-not-equal (car a) (car b))))
-               (if car-x
-                   `(car ,car-x)
-                 (let ((cdr-x (ert-explain-not-equal (cdr a) (cdr b))))
-                   (if cdr-x
-                       `(cdr ,cdr-x))
-                   nil)))))))
-      (array (if (not (equal (length a) (length b)))
-                 `(arrays-of-different-length ,a ,b)
-               (loop for i from 0
-                     for ai across a
-                     for bi across b
-                     for xi = (ert-explain-not-equal ai bi)
-                     do (when xi (return `(array-elt ,i ,xi))))))
-      (atom (if (not (equal a b))
-                `(different-atoms ,a ,b)
-              nil)))))
-(put 'equal 'ert-explainer 'ert-explain-not-equal)
-
-
-;;; Results display.
-
-;; The data structure that contains the set of tests being executed
-;; during one particular test run, their results, the state of the
-;; execution, and some statistics.
-;;
-;; The data about results and expected results of tests may seem
-;; redundant here, since the test objects also carry such information.
-;; However, the information in the test objects may be more recent, it
-;; may correspond to a different test run.  We need the information
-;; that corresponds to this run in order to be able to update the
-;; statistics correctly when a test is re-run interactively and has a
-;; different result than before.
-(defstruct ert-stats
-  (selector (assert nil))
-  ;; The tests, in order.
-  (tests (assert nil) :type vector)
-  ;; A map of test names (or the test objects themselves for unnamed
-  ;; tests) to indices into the `tests' vector.
-  (test-map (assert nil) :type hash-table)
-  ;; The results of the tests during this run, in order.
-  (test-results (assert nil) :type vector)
-  ;; The expected result types of the tests, in order.
-  (test-results-expected (assert nil) :type vector)
-  (total (assert nil))
-  (passed-expected 0)
-  (passed-unexpected 0)
-  (failed-expected 0)
-  (failed-unexpected 0)
-  (error-expected 0)
-  (error-unexpected 0)
-  (start-time (assert nil))
-  (end-time nil)
-  (aborted-p nil)
-  (current-test nil))
-
-;; An entry in the results buffer ewoc.  There is one entry per test.
-(defstruct ert-ewoc-entry
-  (test (assert nil))
-  (result nil)
-  ;; If the result of this test was expected, its ewoc entry is hidden
-  ;; initially.
-  (hidden-p (assert nil))
-  ;; An ewoc entry may be collapsed to hide details such as the error
-  ;; condition.
-  ;;
-  ;; I'm not sure the ability to expand and collapse entries is still
-  ;; a useful feature.
-  (expanded-p t)
-  ;; By default, the ewoc entry presents the error condition with
-  ;; certain limits on how much to print (`print-level',
-  ;; `print-length').  The user can interactively switch to a set of
-  ;; higher limits.
-  (extended-printer-limits-p nil))
-
-;; Variables local to the results buffer.
-
-;; The ewoc.
-(defvar ert-results-ewoc)
-;; The stats object.
-(defvar ert-results-stats)
-;; A string with one character per test.  Each character represents
-;; the result of the corresponding test.  The string is displayed near
-;; the top of the buffer and serves as a progress bar.
-(defvar ert-results-progress-bar-string)
-;; The position where the progress bar button begins.
-(defvar ert-results-progress-bar-button-begin)
-;; The test result listener that updates the buffer when tests are run.
-(defvar ert-results-listener)
-
-;; The same as `ert-results-stats', but dynamically bound.  Used for
-;; the mode line progress indicator.
-(defvar ert-current-run-stats nil)
-
-(defun ert-format-time-iso8601 (time)
-  "Format TIME in the particular variant of ISO 8601 used for timestamps in ERT."
-  (format-time-string "%Y-%m-%d %T%z" time))
-
-(defun ert-results-update-ewoc-hf (ewoc stats)
-  "Update the header and footer of EWOC to show certain information from STATS.
-
-Also sets `ert-results-progress-bar-button-begin'."
-  (let ((run-count (+ (ert-stats-passed-expected stats)
-                      (ert-stats-passed-unexpected stats)
-                      (ert-stats-failed-expected stats)
-                      (ert-stats-failed-unexpected stats)
-                      (ert-stats-error-expected stats)
-                      (ert-stats-error-unexpected stats)))
-        (results-buffer (current-buffer)))
-    (ewoc-set-hf
-     ewoc
-     ;; header
-     (with-temp-buffer
-       (insert "Selector: ")
-       (ert-insert-human-readable-selector (ert-stats-selector stats))
-       (insert "\n")
-       (insert
-        (format (concat "Passed: %s (%s unexpected)\n"
-                        "Failed: %s (%s unexpected)\n"
-                        "Error:  %s (%s unexpected)\n"
-                        "Total:  %s/%s\n\n")
-                (+ (ert-stats-passed-expected stats)
-                   (ert-stats-passed-unexpected stats))
-                (ert-stats-passed-unexpected stats)
-                (+ (ert-stats-failed-expected stats)
-                   (ert-stats-failed-unexpected stats))
-                (ert-stats-failed-unexpected stats)
-                (+ (ert-stats-error-expected stats)
-                   (ert-stats-error-unexpected stats))
-                (ert-stats-error-unexpected stats)
-                run-count
-                (ert-stats-total stats)))
-       (insert
-        (format "Started at:   %s\n"
-                (ert-format-time-iso8601 (ert-stats-start-time stats))))
-       ;; FIXME: This is ugly.  Need to properly define invariants of
-       ;; the `stats' data structure.
-       (let ((state (cond ((ert-stats-aborted-p stats)
-                           'aborted)
-                          ((ert-stats-current-test stats)
-                           'running)
-                          ((ert-stats-end-time stats)
-                           'finished)
-                          (t
-                           'preparing))))
-         (ecase state
-           (preparing
-            (insert ""))
-           (aborted
-            (cond ((ert-stats-current-test stats)
-                   (insert "Aborted during test: ")
-                   (let ((test-name (ert-test-name
-                                     (ert-stats-current-test stats))))
-                     (insert-text-button (format "%S" test-name)
-                                         :type 'ert-results-test-name-button
-                                         'ert-test-name test-name)))
-                  (t
-                   (insert "Aborted."))))
-           (running
-            (assert (ert-stats-current-test stats))
-            (insert "Running test: ")
-            (let ((test-name (ert-test-name (ert-stats-current-test stats))))
-              (insert-text-button (format "%S" test-name)
-                                  :type 'ert-results-test-name-button
-                                  'ert-test-name test-name)))
-           (finished
-            (assert (not (ert-stats-current-test stats)))
-            (insert "Finished.")))
-         (insert "\n")
-         (if (ert-stats-end-time stats)
-             (insert
-              (format "%s%s\n"
-                      (if (ert-stats-aborted-p stats)
-                          "Aborted at:   "
-                        "Finished at:  ")
-                      (ert-format-time-iso8601 (ert-stats-end-time stats))))
-           (insert "\n"))
-         (insert "\n"))
-       (let ((progress-bar-string (with-current-buffer results-buffer
-                                    ert-results-progress-bar-string)))
-         (let ((progress-bar-button-begin
-                (insert-text-button (substring progress-bar-string 0 run-count)
-                                    :type 'ert-results-progress-bar-button)))
-           (with-current-buffer results-buffer
-             (set (make-local-variable 'ert-results-progress-bar-button-begin)
-                  progress-bar-button-begin)))
-         (insert (substring progress-bar-string run-count)))
-       (insert "\n\n")
-       (buffer-string))
-     ;; footer
-     ;;
-     ;; We actually want an empty footer, but that would trigger a bug
-     ;; in ewoc, sometimes clearing the entire buffer.
-     "\n")))
-
-(defun ert-results-update-stats-display (ewoc stats)
-  "Update EWOC and the mode line to show data from STATS."
-  (ert-results-update-ewoc-hf ewoc stats)
-  (force-mode-line-update)
-  (redisplay t))
-
-(defun ert-char-for-test-result (result expectedp)
-  "Return a character that represents the test result RESULT."
-  (let ((char
-         (etypecase result
-           (ert-test-passed ?.)
-           (ert-test-failed ?f)
-           (ert-test-error ?e)
-           (null ?-)
-           (ert-test-aborted-with-non-local-exit ?a))))
-    (if expectedp
-        char
-      (upcase char))))
-
-(defun ert-string-for-test-result (result expectedp)
-  "Return a string that represents the test result RESULT."
-  (etypecase result
-    (ert-test-passed "passed")
-    (ert-test-failed "failed")
-    (ert-test-error "error")
-    (null "unknown")
-    (ert-test-aborted-with-non-local-exit "aborted")))
-
-(defun ert-tests-running-mode-line-indicator ()
-  (let* ((stats ert-current-run-stats)
-         (tests-total (ert-stats-total stats))
-         (tests-completed (+ (ert-stats-passed-expected stats)
-                             (ert-stats-passed-unexpected stats)
-                             (ert-stats-failed-expected stats)
-                             (ert-stats-failed-unexpected stats)
-                             (ert-stats-error-expected stats)
-                             (ert-stats-error-unexpected stats))))
-    (if (>= tests-completed tests-total)
-        (format " ERT(%s/%s,finished)" tests-completed tests-total)
-      (format " ERT(%s/%s):%s"
-              (1+ tests-completed)
-              tests-total
-              (if (null (ert-stats-current-test stats))
-                  "?"
-                (format "%S"
-                        (ert-test-name (ert-stats-current-test stats))))))))
-
-(defun ert-pp-with-indentation-and-newline (object)
-  "Pretty-print OBJECT, indenting it to the current column of point.
-Ensures a final newline is inserted."
-  (let ((begin (point)))
-    (pp object (current-buffer))
-    (unless (bolp) (insert "\n"))
-    (save-excursion
-      (goto-char begin)
-      (indent-sexp))))
-
-(defun ert-print-test-for-ewoc (entry)
-  "The ewoc print function for ewoc test entries."
-  (let* ((test (ert-ewoc-entry-test entry))
-         (result (ert-ewoc-entry-result entry))
-         (hiddenp (ert-ewoc-entry-hidden-p entry))
-         (expandedp (ert-ewoc-entry-expanded-p entry))
-         (extended-printer-limits-p (ert-ewoc-entry-extended-printer-limits-p
-                                     entry)))
-    (cond (hiddenp)
-          (t
-           (insert-text-button (format "%c"
-                                       (ert-char-for-test-result
-                                        result
-                                        (ert-test-result-expected-p test
-                                                                    result)))
-                               :type 'ert-results-expand-collapse-button)
-           (insert " ")
-           (insert-text-button (format "%S" (ert-test-name test))
-                               :type 'ert-results-test-name-button
-                               'ert-test-name (ert-test-name test))
-           (insert "\n")
-           (when (and expandedp (not (eql result 'nil)))
-             (etypecase result
-               (ert-test-passed
-                (insert "    passed\n")
-                (insert ""))
-               (ert-test-result-with-condition
-                (insert "    ")
-                (let ((print-escape-newlines t)
-                      (print-level (if extended-printer-limits-p 10 5))
-                      (print-length (if extended-printer-limits-p 100 10)))
-                  (let ((begin (point)))
-                    (ert-pp-with-indentation-and-newline
-                     (ert-test-result-condition result))
-                    (save-restriction
-                      (narrow-to-region begin (point))
-                      ;; Inhibit optimization in `debugger-make-xrefs'
-                      ;; that sometimes inserts unrelated backtrace
-                      ;; info into our buffer.
-                      (let ((debugger-previous-backtrace nil))
-                        (debugger-make-xrefs))))))
-               (ert-test-aborted-with-non-local-exit
-                (insert "    aborted\n")))
-             (insert "\n")))))
-  nil)
-
-(defun ert-setup-results-buffer (stats listener buffer-name)
-  "Set up a test results buffer."
-  (unless buffer-name (setq buffer-name "*ert*"))
-  (let ((buffer (let ((default-major-mode 'fundamental-mode))
-                  (get-buffer-create buffer-name))))
-    (with-current-buffer buffer
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (buffer-disable-undo)
-        (erase-buffer)
-        (ert-results-mode)
-        (set (make-local-variable 'ert-results-ewoc)
-             (ewoc-create 'ert-print-test-for-ewoc nil nil t))
-        (set (make-local-variable 'ert-results-stats) stats)
-        (set (make-local-variable 'ert-results-progress-bar-string)
-             (make-string (ert-stats-total stats)
-                          (ert-char-for-test-result nil t)))
-        (set (make-local-variable 'ert-results-listener) listener)
-        (ert-results-update-ewoc-hf ert-results-ewoc ert-results-stats)
-        (goto-char (1- (point-max)))
-        buffer))))
-
-(defun ert-run-or-rerun-test (stats test listener)
-  "Run the single test TEST and record the result using STATS and LISTENER."
-  (let ((ert-current-run-stats stats)
-        (pos (ert-stats-test-index stats test))
-        (results (ert-stats-test-results stats))
-        (expected (ert-stats-test-results-expected stats)))
-    ;; Adjust stats to remove previous result.
-    (if (aref expected pos)
-        (etypecase (aref results pos)
-          (ert-test-passed (decf (ert-stats-passed-expected stats)))
-          (ert-test-failed (decf (ert-stats-failed-expected stats)))
-          (ert-test-error (decf (ert-stats-error-expected stats)))
-          (null)
-          (ert-test-aborted-with-non-local-exit))
-      (etypecase (aref results pos)
-        (ert-test-passed (decf (ert-stats-passed-unexpected stats)))
-        (ert-test-failed (decf (ert-stats-failed-unexpected stats)))
-        (ert-test-error (decf (ert-stats-error-unexpected stats)))
-        (null)
-        (ert-test-aborted-with-non-local-exit)))
-    (setf (aref results pos) nil)
-    ;; Call listener after setting/before resetting
-    ;; (ert-stats-current-test stats); the listener might refresh the
-    ;; mode line display, and if the value is not set yet/any more
-    ;; during this refresh, the mode line will flicker unnecessarily.
-    (setf (ert-stats-current-test stats) test)
-    (funcall listener 'test-started stats test)
-    (setf (ert-test-most-recent-result test) nil)
-    (unwind-protect
-        (ert-run-test test)
-      (let* ((result (ert-test-most-recent-result test))
-             (expectedp (typep result (ert-test-expected-result-type test))))
-        ;; Adjust stats to add new result.
-        (if expectedp
-            (etypecase result
-              (ert-test-passed (incf (ert-stats-passed-expected stats)))
-              (ert-test-failed (incf (ert-stats-failed-expected stats)))
-              (ert-test-error (incf (ert-stats-error-expected stats)))
-              (null)
-              (ert-test-aborted-with-non-local-exit))
-          (etypecase result
-            (ert-test-passed (incf (ert-stats-passed-unexpected stats)))
-            (ert-test-failed (incf (ert-stats-failed-unexpected stats)))
-            (ert-test-error (incf (ert-stats-error-unexpected stats)))
-            (null)
-            (ert-test-aborted-with-non-local-exit)))
-        (setf (aref results pos) result
-              (aref expected pos) expectedp)
-        (funcall listener 'test-ended stats test result))
-      (setf (ert-stats-current-test stats) nil))))
-
-(defun ert-run-tests (selector listener)
-  "Run the tests specified by SELECTOR, sending progress updates to LISTENER."
-  (let* ((tests (coerce (ert-select-tests selector t) 'vector))
-         (map (let ((map (make-hash-table :size (length tests))))
-                (loop for i from 0
-                      for test across tests
-                      for key = (or (ert-test-name test) test) do
-                      (assert (not (gethash key map)))
-                      (setf (gethash key map) i))
-                map))
-         (stats (make-ert-stats :selector selector
-                                :tests tests
-                                :test-map map
-                                :test-results (make-vector (length tests) nil)
-                                :test-results-expected (make-vector
-                                                        (length tests) nil)
-                                :total (length tests)
-                                :start-time (current-time))))
-    (funcall listener 'run-started stats)
-    (let ((abortedp t))
-      (let ((ert-current-run-stats stats))
-        (force-mode-line-update)
-        (unwind-protect
-            (progn
-              (loop for test across tests do
-                    (ert-run-or-rerun-test stats test listener))
-              (setq abortedp nil))
-          (setf (ert-stats-aborted-p stats) abortedp)
-          (setf (ert-stats-end-time stats) (current-time))
-          (funcall listener 'run-ended stats abortedp)))
-      stats)))
-
-(defun ert-stats-test-index (stats test)
-  "Return the index of TEST in the run represented by STATS."
-  (gethash (or (ert-test-name test) test) (ert-stats-test-map stats)))
-
-(defvar ert-selector-history nil
-  "List of recent test selectors read from terminal.")
-
-;; Should OUTPUT-BUFFER-NAME and MESSAGE-FN really be arguments here?
-;; They are needed only for our automated self-tests at the moment.
-;; Or should there be some other mechanism?
-;;;;###autoload
-(defun ert-run-tests-interactively (selector
-                                    &optional output-buffer-name message-fn)
-  "Run the tests specified by SELECTOR and display the results in a buffer."
-  (interactive
-   (list (let ((default (if ert-selector-history
-                            (first ert-selector-history)
-                          "t")))
-           (read-from-minibuffer (if (null default)
-                                     "Run tests: "
-                                   (format "Run tests (default %s): " default))
-                                 nil nil t 'ert-selector-history
-                                 default nil))
-         nil))
-  (unless message-fn (setq message-fn 'message))
-  (lexical-let ((output-buffer-name output-buffer-name)
-                buffer
-                listener
-                (message-fn message-fn))
-    (setq listener
-          (lambda (event-type &rest event-args)
-            (ecase event-type
-              (run-started
-               (destructuring-bind (stats) event-args
-                 (setq buffer (ert-setup-results-buffer stats
-                                                        listener
-                                                        output-buffer-name))
-                 (pop-to-buffer buffer)))
-              (run-ended
-               (destructuring-bind (stats abortedp) event-args
-                 (funcall message-fn
-                          "%sRan %s tests, %s results were as expected%s"
-                          (if (not abortedp)
-                              ""
-                            "Aborted: ")
-                          (ert-stats-total stats)
-                          (+ (ert-stats-passed-expected stats)
-                             (ert-stats-failed-expected stats)
-                             (ert-stats-error-expected stats))
-                          (let ((unexpected
-                                 (+ (ert-stats-passed-unexpected stats)
-                                    (ert-stats-failed-unexpected stats)
-                                    (ert-stats-error-unexpected stats))))
-                            (if (zerop unexpected)
-                                ""
-                              (format ", %s unexpected" unexpected))))
-                 (ert-results-update-stats-display (with-current-buffer buffer
-                                                     ert-results-ewoc)
-                                                   stats)))
-              (test-started
-               (destructuring-bind (stats test) event-args
-                 (with-current-buffer buffer
-                   (let* ((ewoc ert-results-ewoc)
-                          (pos (ert-stats-test-index stats test))
-                          (node (ewoc-nth ewoc pos)))
-                     (unless node
-                       ;; FIXME: How expensive is this assertion?
-                       (assert (or (zerop pos) (ewoc-nth ewoc (1- pos)))
-                               t)
-                       (setq node (ewoc-enter-last
-                                   ewoc
-                                   (make-ert-ewoc-entry :test test
-                                                        :hidden-p t))))
-                     (setf (ert-ewoc-entry-test (ewoc-data node)) test)
-                     (setf (ert-ewoc-entry-result (ewoc-data node)) nil)
-                     (aset ert-results-progress-bar-string pos
-                           (ert-char-for-test-result nil t))
-                     (ert-results-update-stats-display ewoc stats)
-                     (ewoc-invalidate ewoc node)))))
-              (test-ended
-               (destructuring-bind (stats test result) event-args
-                 (with-current-buffer buffer
-                   (let* ((ewoc ert-results-ewoc)
-                          (pos (ert-stats-test-index stats test))
-                          (node (ewoc-nth ewoc pos)))
-                     (setf (ert-ewoc-entry-result (ewoc-data node)) result)
-                     (when (ert-ewoc-entry-hidden-p (ewoc-data node))
-                       (setf (ert-ewoc-entry-hidden-p (ewoc-data node))
-                             (ert-test-result-expected-p test result)))
-                     (aset ert-results-progress-bar-string pos
-                           (ert-char-for-test-result result
-                                                     (ert-test-result-expected-p
-                                                      test result)))
-                     (ert-results-update-stats-display ewoc stats)
-                     (ewoc-invalidate ewoc node))))))))
-    (ert-run-tests
-     selector
-     listener)))
-
-(defvar ert-batch-backtrace-right-margin 70
-  "*The maximum line length for printing backtraces in `ert-run-tests-batch'.")
-
-(defun ert-run-tests-batch (selector)
-  "Run the tests specified by SELECTOR, printing results to the terminal.
-
-Returns the stats object."
-  (ert-run-tests
-   selector
-   (lambda (event-type &rest event-args)
-     (ecase event-type
-       (run-started
-        (destructuring-bind (stats) event-args
-          (message "Running %s tests (%s)"
-                   (length (ert-stats-tests stats))
-                   (ert-format-time-iso8601 (ert-stats-start-time stats)))))
-       (run-ended
-        (destructuring-bind (stats abortedp) event-args
-          (let ((unexpected (+ (ert-stats-passed-unexpected stats)
-                               (ert-stats-failed-unexpected stats)
-                               (ert-stats-error-unexpected stats))))
-            (message "\n%sRan %s tests, %s results were as expected%s (%s)\n"
-                     (if (not abortedp)
-                         ""
-                       "Aborted: ")
-                     (ert-stats-total stats)
-                     (+ (ert-stats-passed-expected stats)
-                        (ert-stats-failed-expected stats)
-                        (ert-stats-error-expected stats))
-                     (if (zerop unexpected)
-                         ""
-                       (format ", %s unexpected" unexpected))
-                     (ert-format-time-iso8601 (ert-stats-end-time stats)))
-            (unless (zerop unexpected)
-              (message "%s unexpected results:" unexpected)
-              (loop for test across (ert-stats-tests stats)
-                    for result = (ert-test-most-recent-result test) do
-                    (when (not (ert-test-result-expected-p test result))
-                      (message "%9s  %S"
-                               (ert-string-for-test-result result nil)
-                               (ert-test-name test))))
-              (message "%s" "")))))
-       (test-started
-        )
-       (test-ended
-        (destructuring-bind (stats test result) event-args
-          (etypecase result
-            (ert-test-passed)
-            (ert-test-result-with-condition
-             (message "Test %S backtrace:" (ert-test-name test))
-             (with-temp-buffer
-               (ert-print-backtrace (ert-test-result-backtrace result))
-               (goto-char (point-min))
-               (while (not (eobp))
-                 (let ((start (point))
-                       (end (progn (end-of-line) (point))))
-                   (setq end (min end
-                                  (+ start ert-batch-backtrace-right-margin)))
-                   (message "%s" (buffer-substring-no-properties
-                                  start end)))
-                 (forward-line 1)))
-             (with-temp-buffer
-               (insert "  ")
-               (let ((print-escape-newlines t)
-                     (print-level 5)
-                     (print-length 10))
-                 (let ((begin (point)))
-                   (ert-pp-with-indentation-and-newline
-                    (ert-test-result-condition result))))
-               (goto-char (1- (point-max)))
-               (assert (looking-at "\n"))
-               (delete-char 1)
-               (message "Test %S condition:" (ert-test-name test))
-               (message "%s" (buffer-string))))
-            (ert-test-aborted-with-non-local-exit))
-          (let* ((max (prin1-to-string (length (ert-stats-tests stats))))
-                 (format-string (concat "%9s  %"
-                                        (prin1-to-string (length max))
-                                        "s/" max "  %S")))
-            (message format-string
-                     (ert-string-for-test-result result
-                                                 (ert-test-result-expected-p
-                                                  test result))
-                     (1+ (ert-stats-test-index stats test))
-                     (ert-test-name test)))))))))
-
-
-;;; Commands and button actions for the results buffer.
-
-(define-derived-mode ert-results-mode fundamental-mode "ERT-Results"
-  "Major mode for viewing results of ERT test runs.")
-
-(loop for (key binding) in
-      '(("j" ert-results-jump-between-summary-and-result)
-        ("." ert-results-find-test-at-point-other-window)
-        ("r" ert-results-rerun-test-at-point)
-        ("d" ert-results-rerun-test-at-point-debugging-errors)
-        ("b" ert-results-pop-to-backtrace-for-test-at-point)
-        ("p" ert-results-toggle-printer-limits-for-test-at-point)
-        ("D" ert-delete-test)
-        ([tab] forward-button)
-        ([backtab] backward-button)
-        )
-      do
-      (define-key ert-results-mode-map key binding))
-
-(define-button-type 'ert-results-progress-bar-button
-  'action #'ert-results-progress-bar-button-action
-  'help-echo "mouse-2, RET: Reveal test result")
-
-(define-button-type 'ert-results-test-name-button
-  'action #'ert-results-test-name-button-action
-  'help-echo "mouse-2, RET: Find test definition")
-
-(define-button-type 'ert-results-expand-collapse-button
-  'action #'ert-results-expand-collapse-button-action
-  'help-echo "mouse-2, RET: Expand/collapse test result")
-
-(defun ert-results-test-node-or-null-at-point ()
-  "If point is on a valid ewoc node, return it; return nil otherwise.
-
-To be used in the ERT results buffer."
-  (let* ((ewoc ert-results-ewoc)
-         (node (ewoc-locate ewoc)))
-    ;; `ewoc-locate' will return an arbitrary node when point is on
-    ;; header or footer, or when all nodes are invisible.  So we need
-    ;; to validate its return value here.
-    (if (and (>= (point) (ewoc-location node))
-             (not (ert-ewoc-entry-hidden-p (ewoc-data node))))
-        node
-      nil)))
-
-(defun ert-results-test-node-at-point ()
-  "If point is on a valid ewoc node, return it; signal an error otherwise.
-
-To be used in the ERT results buffer."
-  (or (ert-results-test-node-or-null-at-point)
-      (error "No test at point")))
-
-(defun ert-results-expand-collapse-button-action (button)
-  "Expand or collapse the test node BUTTON belongs to."
-  (let* ((ewoc ert-results-ewoc)
-         (node (save-excursion
-                 (goto-char (ert-button-action-position))
-                 (ert-results-test-node-at-point)))
-         (entry (ewoc-data node)))
-    (setf (ert-ewoc-entry-expanded-p entry)
-          (not (ert-ewoc-entry-expanded-p entry)))
-    (ewoc-invalidate ewoc node)))
-
-(defun ert-results-find-test-at-point-other-window ()
-  "Find the definition of the test at point in another window.
-
-To be used in the ERT results buffer."
-  (interactive)
-  (let* ((node (ert-results-test-node-at-point))
-         (entry (ewoc-data node))
-         (test (ert-ewoc-entry-test entry))
-         (name (ert-test-name test)))
-    (ert-find-test-other-window name)))
-
-(defun ert-results-test-name-button-action (button)
-  "Find the definition of the test BUTTON belongs to, in another window."
-  (let ((name (button-get button 'ert-test-name)))
-    (ert-find-test-other-window name)))
-
-(defun ert-ewoc-position (ewoc node)
-  "Return the position of NODE in EWOC, or nil if NODE is not in EWOC."
-  (loop for i from 0
-        for node-here = (ewoc-nth ewoc 0) then (ewoc-next ewoc node-here)
-        do (when (eql node node-here)
-             (return i))
-        finally (return nil)))
-
-(defun ert-results-jump-between-summary-and-result ()
-  "Jump back and forth between the test run summary and individual test results.
-
->From an ewoc node, jumps to the character that represents the
-same test in the progress bar, and vice versa.
-
-To be used in the ERT results buffer."
-  ;; Maybe this command isn't actually needed much, but if it is, it
-  ;; seems like an indication that the UI design is not optimal.  If
-  ;; jumping back and forth between a summary at the top of the buffer
-  ;; and the error log in the remainder of the buffer is useful, then
-  ;; the summary apparently needs to be easily accessible from the
-  ;; error log, and perhaps it would be better to have it in a
-  ;; separate buffer to keep it visible.
-  (interactive)
-  (let ((ewoc ert-results-ewoc)
-        (progress-bar-begin ert-results-progress-bar-button-begin))
-    (cond ((ert-results-test-node-or-null-at-point)
-           (let* ((node (ert-results-test-node-at-point))
-                  (pos (ert-ewoc-position ewoc node)))
-             (goto-char (+ progress-bar-begin pos))))
-          ((and (<= progress-bar-begin (point))
-                (< (point) (button-end (button-at progress-bar-begin))))
-           (let* ((node (ewoc-nth ewoc (- (point) progress-bar-begin)))
-                  (entry (ewoc-data node)))
-             (when (ert-ewoc-entry-hidden-p entry)
-               (setf (ert-ewoc-entry-hidden-p entry) nil)
-               (ewoc-invalidate ewoc node))
-             (ewoc-goto-node ewoc node)))
-          (t
-           (goto-char progress-bar-begin)))))
-
-(defun ert-button-action-position ()
-  "The buffer position where the last button action was triggered."
-  (cond ((integerp last-command-event)
-         (point))
-        ((eventp last-command-event)
-         (posn-point (event-start last-command-event)))
-        (t (assert nil))))
-
-(defun ert-results-progress-bar-button-action (button)
-  "Find the ewoc node that represents the same test as the character clicked on."
-  (goto-char (ert-button-action-position))
-  (ert-results-jump-between-summary-and-result))
-
-(defun ert-results-rerun-test-at-point ()
-  "Re-run the test at point.
-
-To be used in the ERT results buffer."
-  (interactive)
-  (let* ((ewoc ert-results-ewoc)
-         (node (ert-results-test-node-at-point))
-         (entry (ewoc-data node))
-         (old-test (ert-ewoc-entry-test entry))
-         (test-name (ert-test-name old-test))
-         ;; FIXME: Write a test for this lookup.
-         (test (if test-name
-                   (if (ert-test-boundp test-name)
-                       (ert-get-test test-name)
-                     (error "No such test: %S" test-name))
-                 old-test))
-         (stats ert-results-stats)
-         (pos (gethash test (ert-stats-test-map stats)))
-         (progress-message (format "Running test %S" (ert-test-name test))))
-    ;; Need to save and restore point manually here: When point is on
-    ;; the first visible ewoc entry while the header is updated, point
-    ;; moves to the top of the buffer.  This is undesirable, and a
-    ;; simple `save-excursion' doesn't prevent it.
-    (let ((point (point)))
-      (unwind-protect
-          (unwind-protect
-              (progn
-                (message "%s..." progress-message)
-                (ert-run-or-rerun-test stats test
-                                       ert-results-listener))
-            (ert-results-update-stats-display ewoc stats)
-            (message "%s...%s"
-                     progress-message
-                     (let ((result (ert-test-most-recent-result test)))
-                       (ert-string-for-test-result
-                        result (ert-test-result-expected-p test result)))))
-        (goto-char point)))))
-
-(defun ert-results-rerun-test-at-point-debugging-errors ()
-  "Re-run the test at point with `ert-debug-on-error' bound to t.
-
-To be used in the ERT results buffer."
-  (interactive)
-  (let ((ert-debug-on-error t))
-    (ert-results-rerun-test-at-point)))
-
-(defun ert-print-backtrace (backtrace)
-  "Format the backtrace BACKTRACE to the current buffer."
-  ;; This is essentially a reimplementation of Fbacktrace
-  ;; (src/eval.c), but for a saved backtrace, not the current one.
-  (let ((print-escape-newlines t)
-        (print-level 8)
-        (print-length 50))
-    (dolist (frame backtrace)
-      (ecase (first frame)
-        ((nil)
-         ;; Special operator.
-         (destructuring-bind (special-operator &rest arg-forms)
-             (cdr frame)
-           (insert
-            (format "  %S\n" (list* special-operator arg-forms)))))
-        ((t)
-         ;; Function call.
-         (destructuring-bind (fn &rest args) (cdr frame)
-           (insert (format "  %S(" fn))
-           (loop for firstp = t then nil
-                 for arg in args do
-                 (unless firstp
-                   (insert " "))
-                 (insert (format "%S" arg)))
-           (insert ")\n")))))))
-
-(defun ert-results-pop-to-backtrace-for-test-at-point ()
-  "Display the backtrace for the test at point.
-
-To be used in the ERT results buffer."
-  (interactive)
-  (let* ((node (ert-results-test-node-at-point))
-         (entry (ewoc-data node))
-         (test (ert-ewoc-entry-test entry))
-         (result (ert-ewoc-entry-result entry)))
-    (etypecase result
-      (ert-test-passed (error "Test passed, no backtrace available"))
-      (ert-test-result-with-condition
-       (let ((backtrace (ert-test-result-backtrace result))
-             (buffer
-              (let ((default-major-mode 'fundamental-mode))
-                (get-buffer-create "*ERT Backtrace*"))))
-         (pop-to-buffer buffer)
-         (setq buffer-read-only t)
-         (let ((inhibit-read-only t))
-           (erase-buffer)
-           (set-buffer-multibyte nil)
-           (setq truncate-lines t)
-           (ert-print-backtrace backtrace)
-           (debugger-make-xrefs)
-           (goto-char (point-min))))))))
-
-(defun ert-results-toggle-printer-limits-for-test-at-point ()
-  "Toggle how much of the condition to print for the test at point.
-
-To be used in the ERT results buffer."
-  (interactive)
-  (let* ((ewoc ert-results-ewoc)
-         (node (ert-results-test-node-at-point))
-         (entry (ewoc-data node)))
-    (setf (ert-ewoc-entry-extended-printer-limits-p entry)
-          (not (ert-ewoc-entry-extended-printer-limits-p entry)))
-    (ewoc-invalidate ewoc node)))
-
-(defun ert-activate-font-lock-keywords ()
-  (font-lock-add-keywords
-   nil
-   '(("(\\(\\<ert-deftest\\)\\>\\s *\\(\\sw+\\)?"
-      (1 font-lock-keyword-face nil t)
-      (2 font-lock-function-name-face nil t)))))
-
-(defun* ert-remove-from-list (list-var element &key key test)
-  "Remove ELEMENT from the value of LIST-VAR if present.
-
-This is an inverse of `add-to-list'."
-  (unless key (setq key #'identity))
-  (unless test (setq test #'equal))
-  (setf (symbol-value list-var)
-        (remove* element
-                 (symbol-value list-var)
-                 :key key
-                 :test test)))
-
-
-;;; Actions on load/unload.
-
-(add-to-list 'find-function-regexp-alist '(ert-deftest . ert-find-test-regexp))
-(add-to-list 'minor-mode-alist '(ert-current-run-stats
-                                 (:eval
-                                  (ert-tests-running-mode-line-indicator))))
-(add-to-list 'emacs-lisp-mode-hook 'ert-activate-font-lock-keywords)
-
-(defun ert-unload-function ()
-  (ert-remove-from-list 'find-function-regexp-alist 'ert-deftest :key #'car)
-  (ert-remove-from-list 'minor-mode-alist 'ert-current-run-stats :key #'car)
-  (ert-remove-from-list 'emacs-lisp-mode-hook 'ert-activate-font-lock-keywords)
-  nil)
-
-(defvar ert-unload-hook '())
-(add-hook 'ert-unload-hook 'ert-unload-function)
-
-
-;;; Self-tests.
-
-;; Test that test bodies are actually run.
-(defvar ert-test-body-was-run)
-(ert-deftest ert-test-body-runs ()
-  (setq ert-test-body-was-run t))
-
-
-;; Test that nested test bodies run.
-(ert-deftest ert-nested-test-body-runs ()
-  (lexical-let ((was-run nil))
-    (let ((test (make-ert-test :body (lambda ()
-                                       (setq was-run t)))))
-      (assert (not was-run))
-      (ert-run-test test)
-      (assert was-run))))
-
-
-;; Test that pass/fail works.
-(ert-deftest ert-test-pass ()
-  (let ((test (make-ert-test :body (lambda ()))))
-    (let ((result (ert-run-test test)))
-      (assert (typep result 'ert-test-passed)))))
-
-(ert-deftest ert-test-fail ()
-  (let ((test (make-ert-test :body (lambda () (ert-fail "failure message")))))
-    (let ((result (let ((ert-debug-on-error nil))
-                    (ert-run-test test))))
-      (assert (typep result 'ert-test-failed) t)
-      (assert (equal (ert-test-result-condition result)
-                     '(ert-test-failed "failure message"))
-              t))))
-
-(ert-deftest ert-test-fail-debug-with-condition-case ()
-  (let ((test (make-ert-test :body (lambda () (ert-fail "failure message")))))
-    (condition-case condition
-        (progn
-          (let ((ert-debug-on-error t))
-            (ert-run-test test))
-          (assert nil))
-      ((error)
-       (assert (equal condition '(ert-test-failed "failure message")) t)))))
-
-(ert-deftest ert-test-fail-debug-with-debugger-1 ()
-  (let ((test (make-ert-test :body (lambda () (ert-fail "failure message")))))
-    (let ((debugger (lambda (&rest debugger-args)
-                      (assert nil))))
-      (let ((ert-debug-on-error nil))
-        (ert-run-test test)))))
-
-(ert-deftest ert-test-fail-debug-with-debugger-2 ()
-  (let ((test (make-ert-test :body (lambda () (ert-fail "failure message")))))
-    (block nil
-      (let ((debugger (lambda (&rest debugger-args)
-                        (return-from nil nil))))
-        (let ((ert-debug-on-error t))
-          (ert-run-test test))
-        (assert nil)))))
-
-(ert-deftest ert-test-fail-debug-nested-with-debugger ()
-  (let ((test (make-ert-test :body (lambda ()
-                                     (let ((ert-debug-on-error t))
-                                       (ert-fail "failure message"))))))
-    (let ((debugger (lambda (&rest debugger-args)
-                      (assert nil nil "Assertion a"))))
-      (let ((ert-debug-on-error nil))
-        (ert-run-test test))))
-  (let ((test (make-ert-test :body (lambda ()
-                                     (let ((ert-debug-on-error nil))
-                                       (ert-fail "failure message"))))))
-    (block nil
-      (let ((debugger (lambda (&rest debugger-args)
-                        (return-from nil nil))))
-        (let ((ert-debug-on-error t))
-          (ert-run-test test))
-        (assert nil nil "Assertion b")))))
-
-(ert-deftest ert-test-error ()
-  (let ((test (make-ert-test :body (lambda () (error "error message")))))
-    (let ((result (let ((ert-debug-on-error nil))
-                    (ert-run-test test))))
-      (assert (typep result 'ert-test-error) t)
-      (assert (equal (ert-test-result-condition result)
-                     '(error "error message"))
-              t))))
-
-(ert-deftest ert-test-error-debug ()
-  (let ((test (make-ert-test :body (lambda () (error "error message")))))
-    (condition-case condition
-        (progn
-          (let ((ert-debug-on-error t))
-            (ert-run-test test))
-          (assert nil))
-      ((error)
-       (assert (equal condition '(error "error message")) t)))))
-
-
-;; Test that `should' works.
-(ert-deftest ert-test-should ()
-  (let ((test (make-ert-test :body (lambda () (should nil)))))
-    (let ((result (let ((ert-debug-on-error nil))
-                    (ert-run-test test))))
-      (assert (typep result 'ert-test-failed) t)
-      (assert (equal (ert-test-result-condition result)
-                     '(ert-test-failed ((should nil) :form nil :value nil)))
-              t)))
-  (let ((test (make-ert-test :body (lambda () (should t)))))
-    (let ((result (ert-run-test test)))
-      (assert (typep result 'ert-test-passed) t))))
-
-(ert-deftest ert-test-should-value ()
-  (should (eql (should 'foo) 'foo))
-  (should (eql (should 'bar) 'bar)))
-
-(ert-deftest ert-test-should-not ()
-  (let ((test (make-ert-test :body (lambda () (should-not t)))))
-    (let ((result (let ((ert-debug-on-error nil))
-                    (ert-run-test test))))
-      (assert (typep result 'ert-test-failed) t)
-      (assert (equal (ert-test-result-condition result)
-                     '(ert-test-failed ((should-not t) :form t :value t)))
-              t)))
-  (let ((test (make-ert-test :body (lambda () (should-not nil)))))
-    (let ((result (ert-run-test test)))
-      (assert (typep result 'ert-test-passed)))))
-
-
-(ert-deftest ert-test-should-error ()
-  ;; No error.
-  (let ((test (make-ert-test :body (lambda () (should-error (progn))))))
-    (let ((result (let ((ert-debug-on-error nil))
-                    (ert-run-test test))))
-      (should (typep result 'ert-test-failed))
-      (should (equal (ert-test-result-condition result)
-                     '(ert-test-failed
-                       ((should-error (progn))
-                        :form (progn)
-                        :value nil
-                        :fail-reason "did not signal an error"))))))
-  ;; A simple error.
-  (let ((test (make-ert-test :body (lambda () (should-error (error "foo"))))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-passed))))
-  ;; Error of unexpected type, no test.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error (error "foo")
-                                                   :type 'singularity-error)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal
-               (ert-test-result-condition result)
-               '(ert-test-failed
-                 ((should-error (error "foo") :type 'singularity-error)
-                  :form (error "foo")
-                  :condition (error "foo")
-                  :fail-reason
-                  "the error signalled did not have the expected type"))))))
-  ;; Error of the expected type, no test.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error (signal 'singularity-error
-                                                           nil)
-                                                   :type 'singularity-error)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-passed))))
-  ;; Error that fails the test, no type.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error
-                                      (error "foo")
-                                      :test (lambda (error) nil))))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal (ert-test-result-condition result)
-                     '(ert-test-failed
-                       ((should-error (error "foo") :test (lambda (error) nil))
-                        :form (error "foo")
-                        :condition (error "foo")
-                        :fail-reason
-                        "the error signalled did not pass the test"))))))
-  ;; Error that passes the test, no type.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error (error "foo")
-                                                   :test (lambda (error) t))))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-passed))))
-  ;; Error that has the expected type but fails the test.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error
-                                      (signal 'singularity-error nil)
-                                      :type 'singularity-error
-                                      :test (lambda (error) nil))))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal (ert-test-result-condition result)
-                     '(ert-test-failed
-                       ((should-error (signal 'singularity-error nil)
-                                      :type 'singularity-error
-                                      :test (lambda (error) nil))
-                        :form (signal singularity-error nil)
-                        :condition (singularity-error)
-                        :fail-reason
-                        "the error signalled did not pass the test"))))))
-  ;; Error that has the expected type and passes the test.
-  (let ((test (make-ert-test :body (lambda ()
-                                     (should-error
-                                      (signal 'singularity-error nil)
-                                      :type 'singularity-error
-                                      :test (lambda (error) t))))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-passed))))
-  )
-
-(ert-deftest ert-test-should-error-subtypes ()
-  (let ((test (make-ert-test
-               :body (lambda ()
-                       (should-error (signal 'singularity-error nil)
-                                     :type 'singularity-error
-                                     :exclude-subtypes t)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-passed))))
-  (let ((test (make-ert-test
-               :body (lambda ()
-                       (should-error (signal 'arith-error nil)
-                                     :type 'singularity-error)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal
-               (ert-test-result-condition result)
-               '(ert-test-failed
-                 ((should-error (signal 'arith-error nil)
-                                :type 'singularity-error)
-                  :form (signal arith-error nil)
-                  :condition (arith-error)
-                  :fail-reason
-                  "the error signalled did not have the expected type"))))))
-  (let ((test (make-ert-test
-               :body (lambda ()
-                       (should-error (signal 'arith-error nil)
-                                     :type 'singularity-error
-                                     :exclude-subtypes t)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal
-               (ert-test-result-condition result)
-               '(ert-test-failed
-                 ((should-error (signal 'arith-error nil)
-                                :type 'singularity-error
-                                :exclude-subtypes t)
-                  :form (signal arith-error nil)
-                  :condition (arith-error)
-                  :fail-reason
-                  "the error signalled did not have the expected type"))))))
-  (let ((test (make-ert-test
-               :body (lambda ()
-                       (should-error (signal 'singularity-error nil)
-                                     :type 'arith-error
-                                     :exclude-subtypes t)))))
-    (let ((result (ert-run-test test)))
-      (should (typep result 'ert-test-failed))
-      (should (equal
-               (ert-test-result-condition result)
-               '(ert-test-failed
-                 ((should-error (signal 'singularity-error nil)
-                                :type 'arith-error
-                                :exclude-subtypes t)
-                  :form (signal singularity-error nil)
-                  :condition (singularity-error)
-                  :fail-reason
-                  "the error signalled was a subtype of the expected type"))))))
-  )
-
-;; Test that `should' errors contain the information we expect them to.
-(defmacro ert-test-my-list (&rest args)
-  `(list ,@args))
-
-(ert-deftest ert-test-should-failure-debugging ()
-  (loop for (body expected-condition) in
-        `((,(lambda () (let ((x nil)) (should x)))
-           (ert-test-failed ((should x) :form x :value nil)))
-          (,(lambda () (let ((x t)) (should-not x)))
-           (ert-test-failed ((should-not x) :form x :value t)))
-          (,(lambda () (let ((x t)) (should (not x))))
-           (ert-test-failed ((should (not x)) :form (not t) :value nil)))
-          (,(lambda () (let ((x nil)) (should-not (not x))))
-           (ert-test-failed ((should-not (not x)) :form (not nil) :value t)))
-          (,(lambda () (let ((x t) (y nil)) (should-not (ert-test-my-list x y))))
-           (ert-test-failed
-            ((should-not (ert-test-my-list x y))
-             :form (list t nil)
-             :value (t nil))))
-          (,(lambda () (let ((x t)) (should (error "foo"))))
-           (error "foo")))
-        do
-        (let ((test (make-ert-test :body body)))
-          (condition-case actual-condition
-              (progn
-                (let ((ert-debug-on-error t))
-                  (ert-run-test test))
-                (assert nil))
-            ((error)
-             (should (equal actual-condition expected-condition)))))))
-
-
-;; Test `ert-select-tests'.
-(ert-deftest ert-test-select-regexp ()
-  (should (equal (ert-select-tests "^ert-test-select-regexp$" t)
-                 (list (ert-get-test 'ert-test-select-regexp)))))
-
-(ert-deftest ert-test-test-boundp ()
-  (should (ert-test-boundp 'ert-test-test-boundp))
-  (should-not (ert-test-boundp (make-symbol "ert-not-a-test"))))
-
-(ert-deftest ert-test-select-member ()
-  (should (equal (ert-select-tests '(member ert-test-select-member) t)
-                 (list (ert-get-test 'ert-test-select-member)))))
-
-(ert-deftest ert-test-select-test ()
-  (should (equal (ert-select-tests (ert-get-test 'ert-test-select-test) t)
-                 (list (ert-get-test 'ert-test-select-test)))))
-
-(ert-deftest ert-test-select-symbol ()
-  (should (equal (ert-select-tests 'ert-test-select-symbol t)
-                 (list (ert-get-test 'ert-test-select-symbol)))))
-
-(ert-deftest ert-test-select-and ()
-  (let ((test (make-ert-test
-               :name nil
-               :body nil
-               :most-recent-result (make-ert-test-failed
-                                    :condition nil
-                                    :backtrace nil))))
-    (should (equal (ert-select-tests `(and (member ,test) :failed) t)
-                   (list test)))))
-
-
-;; Test utility functions.
-(ert-deftest ert-proper-list-p ()
-  (should (ert-proper-list-p '()))
-  (should (ert-proper-list-p '(1)))
-  (should (ert-proper-list-p '(1 2)))
-  (should (ert-proper-list-p '(1 2 3)))
-  (should (ert-proper-list-p '(1 2 3 4)))
-  (should (not (ert-proper-list-p 'a)))
-  (should (not (ert-proper-list-p '(1 . a))))
-  (should (not (ert-proper-list-p '(1 2 . a))))
-  (should (not (ert-proper-list-p '(1 2 3 . a))))
-  (should (not (ert-proper-list-p '(1 2 3 4 . a))))
-  (let ((a (list 1)))
-    (setf (cdr (last a)) a)
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2)))
-    (setf (cdr (last a)) a)
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3)))
-    (setf (cdr (last a)) a)
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3 4)))
-    (setf (cdr (last a)) a)
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2)))
-    (setf (cdr (last a)) (cdr a))
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3)))
-    (setf (cdr (last a)) (cdr a))
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3 4)))
-    (setf (cdr (last a)) (cdr a))
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3)))
-    (setf (cdr (last a)) (cddr a))
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3 4)))
-    (setf (cdr (last a)) (cddr a))
-    (should (not (ert-proper-list-p a))))
-  (let ((a (list 1 2 3 4)))
-    (setf (cdr (last a)) (cdddr a))
-    (should (not (ert-proper-list-p a)))))
-
-(ert-deftest ert-parse-keys-and-body ()
-  (should (equal (ert-parse-keys-and-body '(foo)) '(nil (foo))))
-  (should (equal (ert-parse-keys-and-body '(:bar foo)) '((:bar foo) nil)))
-  (should (equal (ert-parse-keys-and-body '(:bar foo a (b))) '((:bar foo) (a (b)))))
-  (should (equal (ert-parse-keys-and-body '(:bar foo :a (b))) '((:bar foo :a (b)) nil)))
-  (should (equal (ert-parse-keys-and-body '(bar foo :a (b))) '(nil (bar foo :a (b)))))
-  (should-error (ert-parse-keys-and-body '(:bar foo :a))))
-
-
-
-;; Test `ert-run-tests'.
-(ert-deftest ert-test-run-tests ()
-  (let ((passing-test (make-ert-test :name 'passing-test
-                                     :body (lambda () (ert-pass))))
-        (failing-test (make-ert-test :name 'failing-test
-                                     :body (lambda () (ert-fail
-                                                       "failure message"))))
-        )
-    (let ((ert-debug-on-error nil))
-      (let* ((buffer-name (generate-new-buffer-name " *ert-test-run-tests*"))
-             (messages nil)
-             (mock-message-fn
-              (lambda (format-string &rest args)
-                (push (apply #'format format-string args) messages))))
-        (save-window-excursion
-          (unwind-protect
-              (let ((case-fold-search nil))
-                (ert-run-tests-interactively
-                 `(member ,passing-test ,failing-test) buffer-name
-                 mock-message-fn)
-                (should (equal messages `(,(concat
-                                            "Ran 2 tests, 1 results were "
-                                            "as expected, 1 unexpected"))))
-                (with-current-buffer buffer-name
-                  (goto-char (point-min))
-                  (should (equal
-                           (buffer-substring (point-min)
-                                             (save-excursion
-                                               (forward-line 5)
-                                               (point)))
-                           (concat
-                            "Selector: (member <passing-test> <failing-test>)\n"
-                            "Passed: 1 (0 unexpected)\n"
-                            "Failed: 1 (1 unexpected)\n"
-                            "Error:  0 (0 unexpected)\n"
-                            "Total:  2/2\n")))))
-            (when (get-buffer buffer-name)
-              (kill-buffer buffer-name))))))))
-
-(ert-deftest ert-test-special-operator-p ()
-  (should (ert-special-operator-p 'if))
-  (should-not (ert-special-operator-p 'car))
-  (should-not (ert-special-operator-p 'ert-special-operator-p))
-  (let ((b (gensym)))
-    (should-not (ert-special-operator-p b))
-    (fset b 'if)
-    (should (ert-special-operator-p b))))
-
-;; Run tests and make sure they actually ran.
-(let ((window-configuration (current-window-configuration)))
-  (let ((ert-test-body-was-run nil))
-    ;; The buffer name chosen here should not compete with the default
-    ;; results buffer name for completion in `switch-to-buffer'.
-    (let ((stats (ert-run-tests-interactively "^ert-" " *ert self-tests*")))
-      (assert ert-test-body-was-run)
-      (when (zerop (+ (ert-stats-passed-unexpected stats)
-                      (ert-stats-failed-unexpected stats)
-                      (ert-stats-error-unexpected stats)))
-        ;; Hide results window only when everything went well.
-        (set-window-configuration window-configuration)))))
-
-(provide 'ert)
-
-;;; ert.el ends here
diff --git a/elpa-to-submit/nxhtml/tests/ert.el b/elpa-to-submit/nxhtml/tests/ert.el
index a91127a142..4d4f3efc4c 100644
--- a/elpa-to-submit/nxhtml/tests/ert.el
+++ b/elpa-to-submit/nxhtml/tests/ert.el
@@ -396,6 +396,7 @@ See also
 ;; `ert-search-after'. Probably this means adding something more to
 ;; the returned result.
 
+(defvar ert-messages-mark)
 (defun ert-get-messages (regexp)
   "Search *Messages* buffer for regular expression REGEXP.
 This should be used within `ert-deftest'.  Search begins where
@@ -404,12 +405,13 @@ the buffer ended when test started.
 See also:
  `ert-get-warnings'
  `ert-search-after'"
-  (ert-search-after messages-mark regexp))
+  (ert-search-after ert-messages-mark regexp))
 
+(defvar ert-warnings-mark)
 (defun ert-get-warnings (regexp)
   "Search *Warnings* buffer for regular expression REGEXP.
 See `ert-get-messages' for more information."
-  (ert-search-after messages-mark regexp))
+  (ert-search-after ert-warnings-mark regexp))
 
 
 ;;; Test selectors.
@@ -672,8 +674,8 @@ silently or calls the interactive debugger, as appropriate."
                 ;; FIXME: Do we need to store the old binding of this
                 ;; and consider it in `ert-run-test-debugger'?
                 (debug-ignored-errors nil)
-                (messages-mark (ert-end-of-messages))
-                (warnings-mark (ert-end-of-warnings)))
+                (ert-messages-mark (ert-end-of-messages))
+                (ert-warnings-mark (ert-end-of-warnings)))
             (funcall (ert-test-body (ert-test-execution-info-test info))))))
       (ert-pass))
     (setf (ert-test-execution-info-result info) (make-ert-test-passed)))
@@ -1324,22 +1326,22 @@ Ensures a final newline is inserted."
 (defun ert-read-test-selector ()
   "Read a regexp for test selection from minibuffer.
 The user can use TAB to see which tests match."
-  (let ((all-tests
-         (mapcar (lambda (rec) (format "%s" (elt rec 1)))
-                 (ert-select-tests "" t))
-         ;;'("ert-group1-1" "ert-group1-2" "ert-other")
-         )
-        regexp
-        ret
-        (get-completions
-         (lambda ()
-           (let* ((ret (save-match-data
-                         (mapcar (lambda (alt)
-                                   (when (string-match regexp alt)
-                                     alt))
-                                 all-tests))))
-             (setq ret (delq nil ret))
-             ret))))
+  (let* ((all-tests
+          (mapcar (lambda (rec) (format "%s" (elt rec 1)))
+                  (ert-select-tests "" t))
+          ;;'("ert-group1-1" "ert-group1-2" "ert-other")
+          )
+         regexp
+         ret
+         (get-completions
+          (lambda ()
+            (let* ((ret (save-match-data
+                          (mapcar (lambda (alt)
+                                    (when (string-match regexp alt)
+                                      alt))
+                                  all-tests))))
+              (setq ret (delq nil ret))
+              ret))))
     (setq all-tests (append all-tests
                             '(":new"
                               ":failed" ":passed" ":error"
@@ -2397,18 +2399,19 @@ This is an inverse of `add-to-list'."
     (loop for x in '(0 1 2 3 4 5 6 t) do
           (ert-should (equal (c x) (lisp x))))))
 
-;; Run tests and make sure they actually ran.
-(let ((window-configuration (current-window-configuration)))
-  (let ((ert-test-body-was-run nil))
-    ;; The buffer name chosen here should not compete with the default
-    ;; results buffer name for completion in `switch-to-buffer'.
-    (let ((stats (ert-run-tests-interactively "^ert-" " *ert self-tests*")))
-      (assert ert-test-body-was-run)
-      (when (zerop (+ (ert-stats-passed-unexpected stats)
-                      (ert-stats-failed-unexpected stats)
-                      (ert-stats-error-unexpected stats)))
-        ;; Hide results window only when everything went well.
-        (set-window-configuration window-configuration)))))
+(defun ert-run-self-tests ()
+  ;; Run tests and make sure they actually ran.
+  (let ((window-configuration (current-window-configuration)))
+    (let ((ert-test-body-was-run nil))
+      ;; The buffer name chosen here should not compete with the default
+      ;; results buffer name for completion in `switch-to-buffer'.
+      (let ((stats (ert-run-tests-interactively "^ert-" " *ert self-tests*")))
+        (assert ert-test-body-was-run)
+        (when (zerop (+ (ert-stats-passed-unexpected stats)
+                        (ert-stats-failed-unexpected stats)
+                        (ert-stats-error-unexpected stats)))
+          ;; Hide results window only when everything went well.
+          (set-window-configuration window-configuration))))))
 
 (provide 'ert)
 
diff --git a/elpa-to-submit/nxhtml/tests/ert2.el b/elpa-to-submit/nxhtml/tests/ert2.el
index e50bed335d..f1132ca1f1 100644
--- a/elpa-to-submit/nxhtml/tests/ert2.el
+++ b/elpa-to-submit/nxhtml/tests/ert2.el
@@ -3,14 +3,14 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-09-02T11:46:03+0200 Tue
 ;; Version:
-;; Last-Updated:
+;; Last-Updated: 2009-01-06 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   None
+;;   Cannot open load file: ert2.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -46,11 +46,20 @@
 
 (let* ((this-dir
         (file-name-directory (if load-file-name load-file-name buffer-file-name)))
-       (load-path (copy-list load-path)))
+       ;;(load-path (copy-list load-path)))
+       (load-path (copy-sequence load-path)))
   (add-to-list 'load-path this-dir)
   (require 'ert))
 
 
+(defvar ert-temp-test-buffer-test nil)
+(make-variable-buffer-local 'ert-temp-test-buffer-test)
+(put 'ert-temp-test-buffer-test 'permanent-local t)
+
+(defvar ert-temp-test-buffer-file nil)
+(make-variable-buffer-local 'ert-temp-test-buffer-file)
+(put 'ert-temp-test-buffer-file 'permanent-local t)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Test buffers
 
@@ -104,12 +113,6 @@
   "Helpers for those buffers ..."
   )
 (put 'ert-temp-test-buffer-minor-mode 'permanent-local t)
-(defvar ert-temp-test-buffer-test nil)
-(make-variable-buffer-local 'ert-temp-test-buffer-test)
-(put 'ert-temp-test-buffer-test 'permanent-local t)
-(defvar ert-temp-test-buffer-file nil)
-(make-variable-buffer-local 'ert-temp-test-buffer-file)
-(put 'ert-temp-test-buffer-file 'permanent-local t)
 
 ;; Fix-me: doc
 (defvar ert-test-files-root nil)
@@ -190,10 +193,12 @@ Return the value of calling the command, ie
 
 Run the hook `ert-simulate-command-post-hook' at the very end."
 
+  (message "command=%s" command)
   (ert-should (listp command))
   (ert-should (commandp (car command)))
   (ert-should (not unread-command-events))
-  (let (return-value)
+  (let (return-value
+        (font-lock-mode t))
     ;; For the order of things here see command_loop_1 in keyboard.c
     ;;
     ;; The command loop will reset the command related variables so
@@ -207,6 +212,7 @@ Run the hook `ert-simulate-command-post-hook' at the very end."
                            this-original-command))
     (run-hooks 'pre-command-hook)
     (setq return-value (apply (car command) (cdr command))) ;; <-----
+    (message "post-command-hook=%s" post-command-hook)
     (run-hooks 'post-command-hook)
     (when deferred-action-list
       (run-hooks 'deferred_action_function))
@@ -214,10 +220,15 @@ Run the hook `ert-simulate-command-post-hook' at the very end."
     (setq last-repeatable-command real-last-command)
     (setq last-command this-command)
     (when (and deactivate-mark transient-mark-mode) (deactivate-mark))
+    ;;(message "ert-simulate-command.before idle-timers, point=%s" (point))
     (when run-idle-timers
-      (dolist (timer (copy-list timer-idle-list))
-        (timer-event-handler timer))
+      ;;(dolist (timer (copy-list timer-idle-list))
+      (dolist (timer (copy-sequence timer-idle-list))
+        (timer-event-handler timer)
+        ;;(message "   after timer=%s, point=%s" timer (point))
+        )
       (redisplay t))
+    ;;(message "ert-simulate-command.after  idle-timers, point=%s" (point))
     (when ert-simulate-command-delay
       ;; Show user
       ;;(message "After M-x %s" command)
diff --git a/elpa-to-submit/nxhtml/tests/hfy-test.el b/elpa-to-submit/nxhtml/tests/hfy-test.el
new file mode 100644
index 0000000000..4592d7b77a
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/hfy-test.el
@@ -0,0 +1,102 @@
+;;; hfy-test.el --- Test for htmlfontify + hfyview
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2008-10-17 Fri
+;; Version:
+;; Last-Updated:
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+(require 'winsav)
+(require 'emacsw32 nil t)
+(require 'grep)
+
+(defun hfy-test-setup-frame ()
+  (find-library "htmlfontify")
+  (occur "hfy-tmpfont-stack")
+  (unless grep-template (grep-compute-defaults))
+  (lgrep "hfy-tmpfont-stack" "*.el" ".")
+  (list-faces-display)
+  (list-colors-display)
+  (describe-function 'describe-function)
+  (delete-other-windows)
+
+  (split-window-vertically)
+  (split-window-vertically)
+  (balance-windows)
+  (split-window-vertically)
+  (balance-windows)
+  (split-window-vertically)
+  (balance-windows)
+
+  ;;(winsav-upper-left-window)
+  (frame-first-window)
+  (split-window-horizontally)
+  ;;(winsav-upper-left-window)
+  (frame-first-window)
+  (switch-to-buffer "*scratch*")
+
+  (select-window (next-window))
+  (switch-to-buffer "*Help*")
+
+  (select-window (next-window))
+  (switch-to-buffer "*Faces*")
+  (split-window-horizontally)
+
+  (select-window (next-window))
+  (switch-to-buffer "*Colors*")
+
+  (select-window (next-window))
+  (when (fboundp 'emacsw32-show-custstart)
+    (emacsw32-show-custstart))
+
+  (select-window (next-window))
+  (info)
+
+  (select-window (next-window))
+  (split-window-horizontally)
+  (switch-to-buffer "*grep*")
+
+  (select-window (next-window))
+  (switch-to-buffer "*Occur*")
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; hfy-test.el ends here
diff --git a/elpa-to-submit/nxhtml/tests/in/3-heights.html b/elpa-to-submit/nxhtml/tests/in/3-heights.html
new file mode 100644
index 0000000000..339b5c28ee
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/3-heights.html
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>patika</title>
+<meta name="generator" content="emacs 23.0.60.1; htmlfontify 0.20" />
+<style type="text/css"><!-- 
+body { font-family: Courier New;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: #f5deb3;  background: #2f4f4f;  font-size: 10pt;  text-decoration: none; }
+span.default   { font-family: Courier New;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: #f5deb3;  background: #2f4f4f;  font-size: 10pt;  text-decoration: none; }
+span.default a { font-family: Courier New;  font-stretch: normal;  font-weight: 500;  font-style: normal;  color: #f5deb3;  background: #2f4f4f;  font-size: 10pt;  text-decoration: underline; }
+span.default-0004   { text-decoration: none; }
+span.default-0004 a { text-decoration: underline; }
+span.default-0002   { text-decoration: none; }
+span.default-0002 a { text-decoration: underline; }
+ --></style>
+
+  </head>
+  <body>
+
+    <script type="text/javascript">
+      // <![CDATA[
+
+function getObj(name) {
+    if (document.getElementById) {
+        this.obj = document.getElementById(name);
+        this.style = document.getElementById(name).style;
+    }
+}
+function hfy_toggle_display(name) {
+    var x = new getObj("hfy_invis_" + name);
+    var flag = x.style.display == 'inline';
+    x.style.display = (flag) ? 'none' : 'inline'
+}
+
+      // ]]>
+    </script>
+
+<pre>ajsha a<span class="default-0002">hsahs</span>jha<span class="default-0004">j sah</span>sja </pre>
+
+ </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/400415-index.phtml b/elpa-to-submit/nxhtml/tests/in/400415-index.phtml
new file mode 100644
index 0000000000..de950e7eb2
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/400415-index.phtml
@@ -0,0 +1,43 @@
+<h2>CLEO Memorandum Assignment #1. What&apos;s Next?</h2>
+<table cellpadding="0" cellspacing="0">
+	<thead>
+		<tr>
+			<th class="first author">Activity</th>
+<!--			<th class="time">Progress</th> -->
+		</tr>
+	</thead>
+
+	<tbody>
+		<?php
+		$AM = $this->activity_model; 
+		foreach ($this->focus_transitions as $tran => $satisfied) {
+			$props = $AM->getTransitionProps($tran);
+			$url_params = $props['url_params'];
+			$link_text = $props['link_text'];
+			if (null !== $url_params and null !== $link_text) {
+				// TODO Add $sat class to <td>, style accordingly.
+		?>
+			<tr>
+				<td class="first author"><a href="<?= 
+					$this->url($url_params) ?>"><?= $link_text ?></a></td>
+<!--				<td><?=
+				// TODO $props['allotted']
+				$satisfied ? '&#x2714;' : '&nbsp;'
+				?></td> -->
+			</tr>
+		<?php }} ?>
+	</tbody>
+</table>
+<!--
+<?php
+print_r($this->acts);
+print_r($this->states);
+print_r($this->payload);
+print_r($this->activity_model);
+?>
+-->
+<?php
+$foo = <<<MY_FOO
+I am a heredoc
+MY_FOO;
+?>
diff --git a/elpa-to-submit/nxhtml/tests/in/bastien-test.mm b/elpa-to-submit/nxhtml/tests/in/bastien-test.mm
new file mode 100644
index 0000000000..1494a6235e
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bastien-test.mm
@@ -0,0 +1,38 @@
+<map version="0.9.0">
+<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
+<node BACKGROUND_COLOR="#00bfff" CREATED="1248161883687" ID="ID_4621171" MODIFIED="1248162997000" TEXT="test.org">
+<richcontent TYPE="NOTE"><html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      --org-mode: WHOLE FILE
+    </p>
+  </body>
+</html>
+</richcontent>
+<node CREATED="1248161883687" MODIFIED="1248161883687" POSITION="left" TEXT="Bonjour">
+<node CREATED="1248161883687" MODIFIED="1248161883687" TEXT="Ceci est un test">
+<node BACKGROUND_COLOR="#eeee00" CREATED="1248161883687" MODIFIED="1248161883687" STYLE="bubble">
+<richcontent TYPE="NODE"><html>
+<head>
+<style type="text/css">
+<!--
+p { margin-top: 0 }
+-->
+</style>
+</head>
+<body>
+<p><br/> lkxjdflkdsz _lskfdsdf_ alskdjf<br/></p>
+</body>
+</html></richcontent>
+<richcontent TYPE="NOTE"><html><head/><body><p>-- This is more about "Ceci est un test" --</p></body></html></richcontent>
+</node>
+</node>
+</node>
+<node CREATED="1248161883687" HGAP="-88" ID="ID_901848166" MODIFIED="1248162974171" POSITION="right" TEXT="Rebonjour" VSHIFT="76">
+<node CREATED="1248161883687" HGAP="85" ID="ID_1570634894" MODIFIED="1248162978203" TEXT="Ceci est un autre test" VSHIFT="-109"/>
+</node>
+</node>
+</map>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-290364.php b/elpa-to-submit/nxhtml/tests/in/bug-290364.php
new file mode 100644
index 0000000000..190b230d25
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-290364.php
@@ -0,0 +1,66 @@
+<?php
+include 'HTML/QuickForm.php';
+
+echo '<script type="text/javascript" src="library/javascript/prototype.js" language="javascript"></script>';
+echo '<script type="text/javascript" src="library/javascript/scriptaculous.js" language="javascript"></script>';
+echo '<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>';
+
+
+
+echo '      <img src="test.jpg" alt="Test image" id="testImage" width="500" height="333" />';
+       
+echo '          <script type="text/javascript" language="javascript">';
+
+echo '      function onEndCrop( coords, dimensions ) {';
+// echo '          $( "x1" ).value = coords.x1;';
+// echo '          $( "y1" ).value = coords.y1;';
+// echo '          $( "x2" ).value = coords.x2;';
+// echo '          $( "y2" ).value = coords.y2;';
+// echo '          $( "width" ).value = dimensions.width;';
+// echo '          $( "height" ).value = dimensions.height;';
+// echo 'console.log(coords.x1);';
+// echo 'console.log(coords.x2);';
+// echo ' style = clip:rect( + coords.x1 + "px " + coords.y1 + "px " + coords.x2 + "px " + coords.y2 + "px)\n"';
+?> 
+style = "clip:rect(0px 130px 130px 0px)";
+$("hidden_0").value = new Array (coords.x1, coords.x2, coords.y1, coords.y2);
+$("testImage").writeAttribute("style=" style);
+}
+function js_init () {
+  Event.observe( "button_0", "click", function() {    } );
+  //  $("file_0").writeAttribute("src", "")
+  
+  new Cropper.Img("testImage", {minWidth: 220,previewWrap: "previewWrap", onEndCrop: onEndCrop });
+}
+
+
+
+Event.observe( window, "load", function() {
+    js_init ();
+  } );
+?>
+echo '      </script>';
+
+echo '<h1> Cropper votre image v0.1</h1>';
+
+$label = 'file_default';
+
+$form = new HTML_QuickForm ('cropper_form', "", "img-cropped.php", '', 'enctype=multipart/form-data');
+
+$form->addElement ('file', 'file_0', $label);
+$form->addElement ('hidden', 'hidden_0');
+$form->addElement ('button', 'button_0');
+$form->updateElementAttr(array('button_0'), array ('id' => 'button_0'));
+$form->addElement ('submit', 'submit_0', 'Envoyer!');
+$form->updateElementAttr(array('file_0'), array ('id' => 'file_0'));
+$form->updateElementAttr(array('hidden_0'), array ('id' => 'hidden_0'));
+echo $form->toHtml ();
+
+if (isset ($_POST['file_0'])):
+$image = $_POST['file_0'];
+tmpfile ($image);
+echo $_POST['file_0'];
+endif;
+echo sys_get_temp_dir ();
+var_dump ($_POST);
+?>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-300946-index.html b/elpa-to-submit/nxhtml/tests/in/bug-300946-index.html
new file mode 100644
index 0000000000..a90814a2c0
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-300946-index.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+<head>
+<meta http-equiv="expires" content="Monday, February 2nd, 2004 7:51:17pm">
+<title>The ACSys Group Home Page</title>
+</head>
+  <frameset rows="113,*" framespacing="0" frameborder="0">
+
+    <frame name="logo" target="logo" src="logo.htm" marginwidth="4" marginheight="0">
+
+    <frameset cols="17%,*" framespacing="0" frameborder="0">
+      <frame name="menu" target="content" src="menu.htm" marginwidth="4" marginheight="0">
+      <frame name="content" target="_self" src="mission.htm" marginwidth="0" marginheight="0">
+    </frameset>
+          
+    <noframes>
+      <body>
+        <p>This page uses frames, but your browser doesn't support them.</p>
+      </body>
+    </noframes>
+
+  </frameset>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-311640-index.html b/elpa-to-submit/nxhtml/tests/in/bug-311640-index.html
new file mode 100644
index 0000000000..64bb09b729
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-311640-index.html
@@ -0,0 +1,24 @@
+<script type="text/javascript">
+  // Set this to the URL you used to fetch recommendations, whether you
+  // fetched them on the client or the server.
+  var request_url = '%(json_url)s';
+
+  // This function is used track click-throughs by fetching a web
+  // beacon.n
+  function trackClickThrough(elem) {
+  var img = new Image();
+  img.src = '%(beacon_url)s' +
+  '?request_url=' + escape(request_url) +
+  '&click_through_url=' + escape(elem.href);
+  return true;
+  }
+</script>
+
+<p>
+  <!--
+      Imagine this is one of the recommendations that was returned.
+      Just add an onclick handler that calls trackClickThrough.
+  -->
+  <a href="http://www.google.com"
+     onclick="return trackClickThrough(this);">Click me!</a>
+</p>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-311641.php b/elpa-to-submit/nxhtml/tests/in/bug-311641.php
new file mode 100644
index 0000000000..96109ba212
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-311641.php
@@ -0,0 +1,7 @@
+<?
+
+try {
+} catch (PDOException $e) {
+  }
+
+?>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-373106-flipbook.html b/elpa-to-submit/nxhtml/tests/in/bug-373106-flipbook.html
new file mode 100644
index 0000000000..658d391c90
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-373106-flipbook.html
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC
+    "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <title>Flipbook (draft)</title>
+    <style type="text/css">
+      body {
+	  background-color: black;
+	  color: white;
+      }
+
+      .ui-effects-transfer {
+	  border: 2px dotted gray;
+      }
+    </style>
+    <script type="text/javascript" src="jquery.js"></script>    
+    <script type="text/javascript" src="jquery-ui.js"></script>
+    <script type="text/javascript" src="jquery.event.special.gesture.js"></script>    
+    <script type="text/javascript" src="jquery.gestureable.js"></script>    
+    <script type="text/javascript">
+      /* Code to do some fancy book-like effects
+       */
+
+       /* a closure-based class */
+       var ImageManager = function (images) {
+	   var self = this;
+	   var currentPage = 0;
+
+	   self.getCurrentPages = function () {
+	       return [images[currentPage], 
+		       images[currentPage+1]];
+	   };
+
+	   self.turnNext = function () {
+	       currentPage += 2;
+	       return self.getCurrentPages();
+	   };
+
+	   self.turnPrevious = function () {
+	       currentPage -= 2;
+	       return self.getCurrentPages();
+	   };
+       };
+
+       function style_element(element) {
+	  element.css('background-color', 'black');
+          element.css('width', '900px');
+	  element.css('height', '650px');
+	  element.css('border', '2px dashed white');
+      }
+
+      function small_gesture(event) {
+	  /* called in mousedown of small images */
+	  var container = $(event.target).closest('div');
+	  var manager = container.data('manager');
+	  var large = $(event.target).
+	      attr('src').
+	      replace(/small/, 'large');
+
+	  switch (event.gesture) {
+	  case 'U':
+	  case 'D':
+	      container.data('left').hide();
+	      container.data('right').hide();
+	      container.data('spacer').hide();
+	      container.data('zoomed').attr('src', large).show('clip');
+	      break;
+	  case 'L':
+	      var images = manager.turnPrevious();
+	      container.data('left').attr('src', images[0] + '_small.jpg');
+	      container.data('right').attr('src', images[1] + '_small.jpg');
+	      break;
+	  case 'R':
+	      var images = manager.turnNext();
+	      container.data('left').attr('src', images[0] + '_small.jpg');
+	      container.data('right').attr('src', images[1] + '_small.jpg');
+	      break;
+	  }
+      }
+
+      function large_gesture(event) {
+	  var container = $(event.target).closest('div');
+	  switch (event.gesture) {
+	  case 'U':
+	  case 'D':
+	      $(event.target).hide();
+	      container.data('spacer').show();
+	      container.data('left').show();
+	      container.data('right').show();
+	  }
+      }
+
+      function disable_scroll(event) {
+	  /* Simply disables the dragging of elements */
+	  return false;
+      }
+
+      function flipbook(element, images) {
+	  var manager = new ImageManager(images);
+	  element.data('manager', manager);
+
+	  // apply the style
+	  style_element(element);
+
+	  // create a spacer div and attach it
+	  var spacer = $('<div class="spacer"></div>');
+	  spacer.css('height', '162px');
+	  element.data('spacer', spacer);
+	  element.append(spacer);
+
+	  var zoomed = $('<img />');
+	  zoomed.gestureable();
+	  zoomed.mouseup(large_gesture).
+	  mousedown(disable_scroll).
+	  hide();
+
+	  element.data('zoomed', zoomed);
+	  element.append(zoomed);
+
+	  // create the images
+	  var currentImages = manager.getCurrentPages();
+	  var left = $('<img src="' + currentImages[0] + '_small.jpg" />');
+	  var right = $('<img src="' + currentImages[1] + '_small.jpg" />');
+	  element.data('left', left);
+	  element.data('right', right);
+
+	  $([left, right]).each(function (key, value) {
+	      // enable gestures
+	      value.gestureable();
+	      value.mouseup(small_gesture);
+	      value.mousedown(disable_scroll);
+	      // add to the display
+	      element.append(value);
+	  });
+      }
+
+      $(document).ready(function () {
+	  flipbook($('#flipbook'),
+		   ['image_01', 'image_02', 'image_03', 'image_04',
+		    'image_05', 'image_06', 'image_07', 'image_08',
+		    'image_09', 'image_10', 'image_11', 'image_12',
+		    'image_13', 'image_14', 'image_15']);
+	});
+    </script>
+  </head>
+  <body>
+    <div id="flipbook"></div>
+    <p>Usage: gesture left/right to change images, up/down to zoom in/out</p>
+    <p>The flipbook uses a number of libs:</p>
+    <p>
+      <ul>
+	<li>jQuery</li>
+	<li>jQuery UI</li>
+	<li>jQuery Special Event Gestures</li>
+      </ul>
+    </p>
+  </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.el b/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.el
new file mode 100644
index 0000000000..84d9f4f56f
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.el
@@ -0,0 +1,23 @@
+;; 3. Add a new c-indentation-style:
+
+(defconst drupal
+  '((c-basic-offset . 2)
+    (c-offsets-alist . ((arglist-close . c-lineup-close-paren)
+                        (case-label . +)
+                        (arglist-intro . +)
+                        (arglist-cont-nonempty . c-lineup-math))))
+  "My Drupal Programming style")
+
+(c-add-style "drupal" drupal)
+
+;; 4. Open file test.php, attached.
+
+;; 5. Run `c-set-style' and select "drupal"
+
+;; 6. Select the whole buffer and press "C-M-\" (or any other indentation command,
+;;    for that matter) and watch as the array elements are lined up with "array(",
+;;    whereas they should be indented by 2.
+
+;; 7. Run M-x php-mode and c-set-style to drupal
+
+;; 8. Try indenting again to see that indentation now works properly.
diff --git a/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.php b/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.php
new file mode 100644
index 0000000000..c9e450c3e4
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug-381191-dh-test.php
@@ -0,0 +1,6 @@
+<?php
+$a = array(
+  'foo' => 'bar',
+  'gaz' => 'gazonk',
+);
+?>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug271497.el b/elpa-to-submit/nxhtml/tests/in/bug271497.el
index b1199119ed..7abe02e799 100644
--- a/elpa-to-submit/nxhtml/tests/in/bug271497.el
+++ b/elpa-to-submit/nxhtml/tests/in/bug271497.el
@@ -2,11 +2,13 @@
 (require 'ada-mode)
 (require 'mumamo)
 
-(defun mumamo-chunk-embjava (pos min max)
- "Find JAVA_ON ... JAVA_OFF, return range and java-mode."
-(mumamo-quick-static-chunk pos min max "JAVA_ON" "JAVA_OFF" nil 'java-mode nil))
+(eval-and-compile
+  (defun mumamo-chunk-embjava (pos min max)
+    "Find JAVA_ON ... JAVA_OFF, return range and java-mode."
+    (mumamo-quick-static-chunk pos min max "JAVA_ON" "JAVA_OFF" nil 'java-mode nil))
+  )
 
 (define-mumamo-multi-major-mode bug271497-mumamo
-"docstring"
-("ADA Mode" ada-mode
-(mumamo-chunk-embjava)))
+  "docstring"
+  ("ADA Mode" ada-mode
+   (mumamo-chunk-embjava)))
diff --git a/elpa-to-submit/nxhtml/tests/in/bug290364-messages.txt b/elpa-to-submit/nxhtml/tests/in/bug290364-messages.txt
new file mode 100644
index 0000000000..4aaae9a0e5
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug290364-messages.txt
@@ -0,0 +1,97 @@
+("/usr/bin/emacs22-gtk")
+Loading 00debian-vars...
+No /etc/mailname. Reverting to default...
+Loading 00debian-vars...done
+Loading /etc/emacs/site-start.d/20apel.el (source)...done
+Loading /etc/emacs/site-start.d/50cedet-common.el (source)...
+Loading advice...done
+Loading /etc/emacs/site-start.d/50cedet-common.el (source)...done
+Loading /etc/emacs/site-start.d/50css-mode.el (source)...done
+Loading /etc/emacs/site-start.d/50devhelp.el (source)...done
+Loading /etc/emacs/site-start.d/50dictionaries-common.el (source)...
+Loading debian-ispell...
+Loading /var/cache/dictionaries-common/emacsen-ispell-default.el (source)...done
+Loading debian-ispell...done
+Loading /var/cache/dictionaries-common/emacsen-ispell-dicts.el (source)...done
+Loading /etc/emacs/site-start.d/50dictionaries-common.el (source)...done
+Loading /etc/emacs/site-start.d/50eieio.el (source)...done
+Loading /etc/emacs/site-start.d/50eldav.el (source)...done
+Loading /etc/emacs/site-start.d/50elserv.el (source)...done
+Loading /etc/emacs/site-start.d/50emacs-extra.el (source)...done
+Loading /etc/emacs/site-start.d/50emacs-goodies-el.el (source)...done
+Loading /etc/emacs/site-start.d/50erc.el (source)...
+Loading erc-auto...done
+Loading /etc/emacs/site-start.d/50erc.el (source)...done
+Loading /etc/emacs/site-start.d/50flim.el (source)...done
+Loading /etc/emacs/site-start.d/50gettext.el (source)...done
+Loading /etc/emacs/site-start.d/50html-helper-mode.el (source)...done
+Loading /etc/emacs/site-start.d/50mmm-mode.el (source)...done
+Loading /etc/emacs/site-start.d/50php-elisp.el (source)...done
+Loading /etc/emacs/site-start.d/50php-mode.el (source)...done
+Loading /etc/emacs22/site-start.d/50psgml-init.el (source)...done
+Loading /etc/emacs/site-start.d/50psvn.el (source)...done
+Loading /etc/emacs/site-start.d/50tramp.el (source)...done
+Loading /etc/emacs/site-start.d/50w3m-el.el (source)...done
+Loading /etc/emacs/site-start.d/51ede.el (source)...done
+Loading /etc/emacs/site-start.d/51speedbar.el (source)...done
+Loading /etc/emacs/site-start.d/52semantic.el (source)...done
+Loading /etc/emacs/site-start.d/53cedet-contrib.el (source)...done
+Loading /etc/emacs/site-start.d/53cogre.el (source)...done
+Loading /etc/emacs/site-start.d/55ecb.el (source)...
+"/usr/share/emacs22/site-lisp/cedet-common/" added to `load-path'
+Setting up cedet...done
+Setting up cogre...done
+Setting up ede...
+Loading ede...
+Loading ede-speedbar...done
+Loading ede...done
+Setting up ede...done
+Setting up eieio...done
+Setting up semantic...
+Loading derived...done
+Setting up semantic...done
+Setting up speedbar...done
+Setting up cedet-contrib...done
+Loading /etc/emacs/site-start.d/55ecb.el (source)...done
+Loading /etc/emacs22/site-start.d/60nxml-mode.el (source)...
+Loading /usr/share/emacs22/site-lisp/nxml-mode/rng-auto.el (source)...done
+Loading /etc/emacs22/site-start.d/60nxml-mode.el (source)...done
+Loading /etc/emacs/site-start.d/60wysihtml-el.el (source)...done
+Loading /home/guillaume/elisp/nxhtml/autostart.el (source)...
+Nxml/Nxhtml Autostart.el loading ...
+Loading edmacro...done
+Loading easy-mmode...done
+Loading /home/guillaume/elisp/nxhtml/nxhtml-loaddefs.el (source)...done
+Loading /home/guillaume/elisp/nxhtml/etc/schema/schema-path-patch.el (source)...done
+xhtml-loader.rnc was ok
+(No changes need to be saved)
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml-autoload.el (source)...
+Loading /home/guillaume/elisp/nxhtml/util/majmodpri.el (source)...done
+majmodpri-sort-lists running ...
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml-autoload.el (source)...done
+Loading /home/guillaume/elisp/nxhtml/autostart.el (source)...done
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml.el (source)...
+html-site-current (information): No current site set
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml.el (source)...done
+Loading nxml-uchnm...done
+Loading rng-nxml...done
+Loading rng-cmpct...done
+Loading rng-xsd...done
+Using vacuous schema
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml-menu.el (source)...done
+Loading /home/guillaume/elisp/nxhtml/util/mlinks.el (source)...done
+Loading imenu...done
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml-mumamo.el (source)...
+Loading byte-opt...done
+Loading /home/guillaume/elisp/nxhtml/nxhtml/nxhtml-mumamo.el (source)...done
+Showing all blocks ... done
+Loading semantic-html...done
+Loading /home/guillaume/elisp/geben/geben.el (source)...done
+ispell.el is already loaded
+Using vacuous schema [4 times]
+Loading semantic-el...done
+let: Wrong type argument: stringp, nil [2 times]
+Making completion list...
+Loading eieio-opt...done
+Making completion list...
+let: Wrong type argument: stringp, nil
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug354363-index.php b/elpa-to-submit/nxhtml/tests/in/bug354363-index.php
new file mode 100644
index 0000000000..3644f5df89
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug354363-index.php
@@ -0,0 +1,38 @@
+<?php
+	define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application/'));
+set_include_path(
+		 APPLICATION_PATH . '/../library'
+		 . PATH_SEPARATOR . get_include_path()
+		 );
+
+if(true){
+	 echo 'test';
+	 }
+else
+  {
+   
+   }
+
+require_once "Zend/Loader.php";
+Zend_Loader::registerAutoload();
+
+try 
+{
+ require '../application/bootstrap.php';
+ }
+catch(Exception $exception)
+{
+ echo '<html><body><center>'
+ .    'An exception occured while bootstrapping the application.';
+ if(defined('APPLICATION_ENVIRONMENT')
+    && APPLICATION_ENVIRONMENT != 'production'
+    ) {
+       echo '<br /><br />' . $exception->getMessage() . '<br />'
+       .    '<div align="left">Stack Trace:'
+       .    '<pre>' . $exception->getTraceAsString() . '</pre></div>';
+       }
+ echo '</center><body></html>';
+ exit(1);
+ }
+
+Zend_Controller_Front::getInstance()->dispatch();
diff --git a/elpa-to-submit/nxhtml/tests/in/bug354363-test.php b/elpa-to-submit/nxhtml/tests/in/bug354363-test.php
new file mode 100644
index 0000000000..10e2c0ded9
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug354363-test.php
@@ -0,0 +1,3 @@
+<?php
+echo 'test';
+?>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug369800-load-history.txt b/elpa-to-submit/nxhtml/tests/in/bug369800-load-history.txt
new file mode 100644
index 0000000000..aad863da77
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug369800-load-history.txt
@@ -0,0 +1,9483 @@
+load-history is a variable defined in `C source code'.
+Its value is shown below.
+
+Documentation:
+Alist mapping file names to symbols and features.
+Each alist element is a list that starts with a file name,
+except for one element (optional) that starts with nil and describes
+definitions evaluated from buffers not visiting files.
+
+The file name is absolute and is the true file name (i.e. it doesn't
+contain symbolic links) of the loaded file.
+
+The remaining elements of each list are symbols defined as variables
+and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)',
+`(defun . FUNCTION)', `(autoload . SYMBOL)', `(defface . SYMBOL)'
+and `(t . SYMBOL)'.  An element `(t . SYMBOL)' precedes an entry
+`(defun . FUNCTION)', and means that SYMBOL was an autoload before
+this file redefined it as a function.
+
+During preloading, the file name recorded is relative to the main Lisp
+directory.  These file names are converted to absolute at startup.
+
+Value: 
+(("/home/hobbes/nxhtml/autostart.el" nxhtml-install-dir
+  (defun . nxhtml-custom-autoload)
+  (defun . nxhtml-list-loaded-features)
+  (provide . nxhtml-autostart))
+ ("/home/hobbes/nxhtml/nxhtml/nxhtml-autoload.el"
+  (require . majmodpri)
+  (require . moz)
+  (defun . javascript-moz-setup)
+  nxhtml-src-dir
+  (provide . nxhtml-autoload))
+ ("/home/hobbes/nxhtml/related/moz.el"
+  (require . comint)
+  (require . cc-cmds)
+  moz-minor-mode-map moz-minor-mode
+  (t . moz-minor-mode)
+  (defun . moz-minor-mode)
+  (defun . run-mozilla)
+  moz-repl-name moz-input-separator moz-repl-host moz-repl-port moz-temporary-file
+  (defun . moz-temporary-file)
+  (defun . moz-send-region)
+  (defun . moz-send-defun)
+  (defun . moz-send-defun-and-go)
+  (defun . moz-save-buffer-and-send)
+  inferior-moz-buffer
+  (defun . inferior-moz-insert-moz-repl)
+  inferior-moz-mode-map inferior-moz-mode-map inferior-moz-mode-syntax-table inferior-moz-mode-abbrev-table inferior-moz-mode-abbrev-table
+  (t . inferior-moz-mode)
+  (defun . inferior-moz-mode)
+  (defun . inferior-moz-track-repl-name)
+  (defun . inferior-moz-self-insert-or-repl-name)
+  (defun . inferior-moz-input-sender)
+  (defun . inferior-moz-switch-to-mozilla)
+  (defun . inferior-moz-process)
+  (defun . inferior-moz-start-process)
+  (provide . moz))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/cc-cmds.elc"
+  (require . cc-defs)
+  (require . cc-vars)
+  (require . cc-engine)
+  c-fix-backslashes
+  (defun . c-indent-line)
+  (defun . c-newline-and-indent)
+  (defun . c-show-syntactic-information)
+  (defun . c-syntactic-information-on-region)
+  (defun . c-update-modeline)
+  (defun . c-toggle-syntactic-indentation)
+  (defun . c-toggle-auto-newline)
+  (defun . c-toggle-auto-state)
+  (defun . c-toggle-hungry-state)
+  (defun . c-toggle-auto-hungry-state)
+  (defun . c-toggle-electric-state)
+  (defun . c-electric-backspace)
+  (defun . c-hungry-delete-backwards)
+  (defun . c-hungry-backspace)
+  (defun . c-electric-delete-forward)
+  (defun . c-hungry-delete-forward)
+  (defun . c-electric-delete)
+  (defun . c-hungry-delete)
+  (defun . c-electric-pound)
+  (defun . c-point-syntax)
+  (defun . c-brace-newlines)
+  (defun . c-try-one-liner)
+  (defun . c-electric-brace)
+  (defun . c-electric-slash)
+  (defun . c-electric-star)
+  (defun . c-electric-semi&comma)
+  (defun . c-electric-colon)
+  (defun . c-electric-lt-gt)
+  (defun . c-electric-paren)
+  (defun . c-electric-continued-statement)
+  (defun . c-forward-into-nomenclature)
+  (defun . c-backward-into-nomenclature)
+  (defun . c-scope-operator)
+  (defun . c-in-function-trailer-p)
+  (defun . c-where-wrt-brace-construct)
+  (defun . c-backward-to-nth-BOF-{)
+  (defun . c-beginning-of-defun)
+  (defun . c-forward-to-nth-EOF-})
+  (defun . c-end-of-defun)
+  (defun . c-defun-name)
+  (defun . c-declaration-limits)
+  (defun . c-mark-function)
+  (defun . c-cpp-define-name)
+  (defun . c-in-comment-line-prefix-p)
+  (defun . c-narrow-to-comment-innards)
+  (defun . c-beginning-of-sentence-in-comment)
+  (defun . c-end-of-sentence-in-comment)
+  (defun . c-beginning-of-sentence-in-string)
+  (defun . c-end-of-sentence-in-string)
+  (defun . c-ascertain-preceding-literal)
+  (defun . c-ascertain-following-literal)
+  (defun . c-after-statement-terminator-p)
+  (defun . c-back-over-illiterals)
+  (defun . c-forward-over-illiterals)
+  (defun . c-one-line-string-p)
+  (defun . c-beginning-of-statement)
+  (defun . c-end-of-statement)
+  (defun . c-calc-comment-indent)
+  (defun . c-comment-indent)
+  (defun . c-outline-level)
+  (defun . c-up-conditional)
+  (defun . c-up-conditional-with-else)
+  (defun . c-down-conditional)
+  (defun . c-down-conditional-with-else)
+  (defun . c-backward-conditional)
+  (defun . c-forward-conditional)
+  (defun . c-indent-command)
+  (defun . c-indent-exp)
+  (defun . c-indent-defun)
+  (defun . c-indent-region)
+  (defun . c-fn-region-is-active-p)
+  (defun . c-indent-line-or-region)
+  c-progress-info
+  (defun . c-progress-init)
+  (defun . c-progress-update)
+  (defun . c-progress-fini)
+  (defun . c-backslash-region)
+  (defun . c-append-backslashes-forward)
+  (defun . c-delete-backslashes-forward)
+  c-auto-fill-prefix c-lit-limits c-lit-type
+  (defun . c-guess-fill-prefix)
+  (defun . c-mask-paragraph)
+  (defun . c-fill-paragraph)
+  (defun . c-do-auto-fill)
+  (defun . c-indent-new-comment-line)
+  (defun . c-comment-line-break-function)
+  (defun . c-context-line-break)
+  (defun . c-context-open-line)
+  (provide . cc-cmds))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/cc-engine.elc"
+  (require . cc-defs)
+  (require . cc-vars)
+  (defun . c-declare-lang-variables)
+  c++-template-syntax-table c-identifier-syntax-modifications c-identifier-syntax-table c-get-state-before-change-function c-before-font-lock-function c-symbol-start c-symbol-key c-nonsymbol-chars c-opt-identifier-concat-key c-identifier-start c-identifier-key c-string-escaped-newlines c-multiline-string-start-char c-opt-cpp-prefix c-anchored-cpp-prefix c-opt-cpp-start c-opt-cpp-macro-define-start c-opt-cpp-macro-define-id c-overloadable-operators-regexp c-opt-op-identifier-prefix c-nonsymbol-token-regexp c-assignment-op-regexp c-<>-multichar-token-regexp c-<-op-cont-regexp c->-op-cont-regexp c-stmt-delim-chars c-stmt-delim-chars-with-comma c-line-comment-starter c-comment-start-regexp c-block-comment-start-regexp c-literal-start-regexp c-doc-comment-start-regexp c-syntactic-ws-start c-syntactic-ws-end c-syntactic-eol c-at-vsemi-p-fn c-vsemi-status-unknown-p-fn c-paragraph-start c-paragraph-separate c-primitive-type-key c-type-prefix-key c-opt-type-modifier-key c-opt-type-component-key c-class-key c-brace-list-key c-other-decl-block-key c-other-decl-block-key-in-symbols-alist c-decl-hangon-key c-prefix-spec-kwds-re c-specifier-key c-not-decl-init-keywords c-opt-block-decls-with-vars-key c-colon-type-list-re c-opt-<>-sexp-key c-block-stmt-1-key c-block-stmt-2-key c-opt-block-stmt-key c-simple-stmt-key c-paren-stmt-key c-opt-asm-stmt-key c-case-kwds-regexp c-label-kwds-regexp c-opt-inexpr-brace-list-key c-decl-block-key c-opt-bitfield-key c-keywords-regexp c-keywords-obarray c-regular-keywords-regexp c-primary-expr-regexp c-decl-prefix-re c-decl-start-re c-decl-prefix-or-start-re c-cast-parens c-block-prefix-charset c-type-decl-prefix-key c-type-decl-suffix-key c-after-suffixed-type-decl-key c-after-suffixed-type-maybe-decl-key c-opt-type-concat-key c-opt-type-suffix-key c-known-type-key c-special-brace-lists c-recognize-knr-p c-recognize-typeless-decls c-recognize-<>-arglists c-recognize-paren-inits c-recognize-paren-inexpr-blocks c-opt-<>-arglist-start c-opt-<>-arglist-start-in-paren c-opt-postfix-decl-spec-key c-recognize-colon-labels c-label-prefix-re c-nonlabel-token-key c-opt-extra-label-key c-opt-friend-key c-opt-method-key c-type-decl-end-used c-hungry-delete-key c-electric-flag c-auto-newline
+  (defun . c-calculate-state)
+  c-in-literal-cache c-macro-start
+  (defun . c-query-and-set-macro-start)
+  (defun . c-query-macro-start)
+  (defun . c-beginning-of-macro)
+  (defun . c-end-of-macro)
+  (defun . c-forward-over-cpp-define-id)
+  (defun . c-forward-to-cpp-define-body)
+  (defun . c-syntactic-content)
+  (defun . c-shift-line-indentation)
+  (defun . c-keyword-sym)
+  (defun . c-keyword-member)
+  c-string-syntax c-string-syntax c-string-limit-regexp c-string-limit-regexp c-ws*-string-limit-regexp c-ws*-string-limit-regexp c-parsing-error
+  (defun . c-echo-parsing-error)
+  c-literal-faces
+  (defun . c-put-c-type-property)
+  (defun . c-clear-c-type-property)
+  (defun . c-debug-add-face)
+  (defun . c-debug-remove-face)
+  (defun . c-bos-push-state)
+  (defun . c-bos-pop-state)
+  (defun . c-bos-pop-state-and-retry)
+  (defun . c-bos-save-pos)
+  (defun . c-bos-restore-pos)
+  (defun . c-bos-save-error-info)
+  (defun . c-bos-report-error)
+  (defun . c-beginning-of-statement-1)
+  (defun . c-crosses-statement-barrier-p)
+  (defun . c-at-statement-start-p)
+  (defun . c-at-expression-start-p)
+  (defun . c-forward-single-comment)
+  (defun . c-forward-comments)
+  (defun . c-backward-single-comment)
+  (defun . c-backward-comments)
+  (defun . c-debug-sws-msg)
+  (defun . c-put-is-sws)
+  (defun . c-put-in-sws)
+  (defun . c-remove-is-sws)
+  (defun . c-remove-in-sws)
+  (defun . c-remove-is-and-in-sws)
+  (defun . c-invalidate-sws-region-after)
+  (defun . c-forward-sws)
+  (defun . c-backward-sws)
+  (defun . c-partial-ws-p)
+  c-state-cache c-state-cache-start c-state-cache-good-pos
+  (defun . c-invalidate-state-cache)
+  (defun . c-get-fallback-start-pos)
+  (defun . c-parse-state)
+  c-debug-parse-state
+  (defun . c-debug-parse-state)
+  (defun . c-toggle-parse-state-debug)
+  (defun . c-whack-state-before)
+  (defun . c-whack-state-after)
+  (defun . c-most-enclosing-brace)
+  (defun . c-least-enclosing-brace)
+  (defun . c-safe-position)
+  (defun . c-beginning-of-syntax)
+  (defun . c-on-identifier)
+  (defun . c-simple-skip-symbol-backward)
+  (defun . c-beginning-of-current-token)
+  (defun . c-end-of-current-token)
+  c-jump-syntax-balanced c-jump-syntax-balanced c-jump-syntax-unbalanced c-jump-syntax-unbalanced
+  (defun . c-forward-token-2)
+  (defun . c-backward-token-2)
+  (defun . c-forward-token-1)
+  (defun . c-backward-token-1)
+  (defun . c-syntactic-re-search-forward)
+  (defun . c-syntactic-skip-backward)
+  (defun . c-slow-in-literal)
+  (defun . c-fast-in-literal)
+  (defun . c-in-literal)
+  (defun . c-literal-limits)
+  (defun . c-literal-limits-fast)
+  (defun . c-collect-line-comments)
+  (defun . c-literal-type)
+  c-find-decl-syntactic-pos c-find-decl-match-pos
+  (defun . c-invalidate-find-decl-cache)
+  (defun . c-debug-put-decl-spot-faces)
+  (defun . c-debug-remove-decl-spot-faces)
+  (defun . c-find-decl-prefix-search)
+  (defun . c-find-decl-spots)
+  c-found-types
+  (defun . c-clear-found-types)
+  (defun . c-add-type)
+  (defun . c-unfind-type)
+  (defun . c-check-type)
+  (defun . c-list-found-types)
+  (defun . c-trim-found-types)
+  (defun . c-after-change-check-<>-operators)
+  c-promote-possible-types c-parse-and-markup-<>-arglists c-restricted-<>-arglists c-record-type-identifiers c-record-ref-identifiers c-last-identifier-range
+  (defun . c-record-type-id)
+  (defun . c-record-ref-id)
+  c-record-found-types
+  (defun . c-forward-keyword-prefixed-id)
+  (defun . c-forward-id-comma-list)
+  (defun . c-forward-keyword-clause)
+  (defun . c-forward-<>-arglist)
+  (defun . c-forward-<>-arglist-recur)
+  (defun . c-backward-<>-arglist)
+  (defun . c-forward-name)
+  (defun . c-forward-type)
+  (defun . c-fdoc-shift-type-backward)
+  (defun . c-forward-decl-or-cast-1)
+  (defun . c-forward-label)
+  (defun . c-forward-objc-directive)
+  (defun . c-beginning-of-inheritance-list)
+  (defun . c-in-method-def-p)
+  (defun . c-in-gcc-asm-p)
+  (defun . c-at-toplevel-p)
+  (defun . c-just-after-func-arglist-p)
+  (defun . c-in-knr-argdecl)
+  (defun . c-skip-conditional)
+  (defun . c-after-conditional)
+  (defun . c-after-special-operator-id)
+  (defun . c-backward-to-block-anchor)
+  (defun . c-backward-to-decl-anchor)
+  (defun . c-search-decl-header-end)
+  (defun . c-beginning-of-decl-1)
+  (defun . c-end-of-decl-1)
+  (defun . c-looking-at-decl-block)
+  (defun . c-search-uplist-for-classkey)
+  (defun . c-inside-bracelist-p)
+  (defun . c-looking-at-special-brace-list)
+  (defun . c-looking-at-bos)
+  (defun . c-looking-at-inexpr-block)
+  (defun . c-looking-at-inexpr-block-backward)
+  c-auto-newline-analysis
+  (defun . c-brace-anchor-point)
+  (defun . c-add-syntax)
+  (defun . c-append-syntax)
+  (defun . c-add-stmt-syntax)
+  (defun . c-add-class-syntax)
+  (defun . c-guess-continued-construct)
+  (t . c-guess-basic-syntax)
+  (defun . c-guess-basic-syntax)
+  (defun . c-evaluate-offset)
+  (defun . c-calc-offset)
+  (defun . c-get-offset)
+  (defun . c-get-syntactic-indentation)
+  (provide . cc-engine))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/cc-vars.elc"
+  (require . cc-defs)
+  (defun . c-constant-symbol)
+  c-style-variables c-fallback-style
+  (defun . c-set-stylevar-fallback)
+  (defun . defcustom-c-stylevar)
+  (defun . c-valid-offset)
+  c-strict-syntax-p c-echo-syntactic-information-p c-report-syntactic-errors c-basic-offset c-tab-always-indent c-insert-tab-function c-syntactic-indentation c-syntactic-indentation-in-macros c-comment-only-line-offset c-indent-comment-alist c-indent-comments-syntactically-p c-block-comment-prefix c-comment-prefix-regexp c-doc-comment-style c-ignore-auto-fill c-cleanup-list c-hanging-braces-alist c-max-one-liner-length c-hanging-colons-alist c-hanging-semi&comma-criteria c-backslash-column c-backslash-max-column c-auto-align-backslashes c-backspace-function c-delete-function c-require-final-newline c-electric-pound-behavior c-special-indent-hook c-label-minimum-indentation c-progress-interval c-objc-method-arg-min-delta-to-bracket c-objc-method-arg-unfinished-offset c-objc-method-parameter-offset c-default-style c-offsets-alist c-inside-block-syms c-inside-block-syms c-style-variables-are-local-p c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook idl-mode-hook pike-mode-hook awk-mode-hook c-mode-common-hook c-initialization-hook c-enable-xemacs-performance-kludge-p c-old-style-variable-behavior
+  (defun . c-make-font-lock-extra-types-blurb)
+  c-font-lock-extra-types c++-font-lock-extra-types objc-font-lock-extra-types java-font-lock-extra-types idl-font-lock-extra-types pike-font-lock-extra-types c-file-style c-file-offsets c-indentation-style c-current-comment-prefix c-string-par-start c-string-par-separate c-sentence-end-with-esc-eol
+  (provide . cc-vars))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/cc-defs.elc"
+  (require . regexp-opt)
+  c-version c-version-sym c-version-sym c-buffer-is-cc-mode c-inside-eval-when-compile
+  (defun . cc-eval-when-compile)
+  (defun . c-point)
+  (defun . c-region-is-active-p)
+  (defun . c-set-region-active)
+  (defun . c-delete-and-extract-region)
+  (defun . c-safe)
+  (defun . c-int-to-char)
+  (defun . c-sentence-end)
+  (defun . c-default-value-sentence-end)
+  (defun . c-save-buffer-state)
+  (defun . c-tentative-buffer-changes)
+  (defun . c-tnt-chng-record-state)
+  (defun . c-tnt-chng-cleanup)
+  (defun . c-forward-syntactic-ws)
+  (defun . c-backward-syntactic-ws)
+  (defun . c-forward-sexp)
+  (defun . c-backward-sexp)
+  (defun . c-safe-scan-lists)
+  (defun . c-go-list-forward)
+  (defun . c-go-list-backward)
+  (defun . c-up-list-forward)
+  (defun . c-up-list-backward)
+  (defun . c-down-list-forward)
+  (defun . c-down-list-backward)
+  (defun . c-go-up-list-forward)
+  (defun . c-go-up-list-backward)
+  (defun . c-go-down-list-forward)
+  (defun . c-go-down-list-backward)
+  (defun . c-beginning-of-defun-1)
+  (defun . c-at-vsemi-p)
+  (defun . c-vsemi-status-unknown-p)
+  (defun . c-benign-error)
+  (defun . c-with-syntax-table)
+  (defun . c-skip-ws-forward)
+  (defun . c-skip-ws-backward)
+  c-langs-are-parametric
+  (defun . c-major-mode-is)
+  c-use-extents c-use-extents
+  (defun . c-put-char-property-fun)
+  (defun . c-put-char-property)
+  (defun . c-get-char-property)
+  (defun . c-clear-char-property-fun)
+  (defun . c-clear-char-property)
+  (defun . c-clear-char-properties)
+  (defun . c-clear-char-property-with-value-function)
+  (defun . c-clear-char-property-with-value)
+  (defun . c-put-overlay)
+  (defun . c-delete-overlay)
+  (defun . c-end-of-defun-1)
+  c-<-as-paren-syntax c-<-as-paren-syntax
+  (defun . c-mark-<-as-paren)
+  c->-as-paren-syntax c->-as-paren-syntax
+  (defun . c-mark->-as-paren)
+  (defun . c-intersect-lists)
+  (defun . c-lookup-lists)
+  (defun . c-langelem-sym)
+  (defun . c-langelem-pos)
+  (defun . c-langelem-col)
+  (defun . c-langelem-2nd-pos)
+  (defun . c-keep-region-active)
+  (defun . c-mode-symbol)
+  (defun . c-mode-var)
+  (defun . c-got-face-at)
+  (defun . c-face-name-p)
+  (defun . c-concat-separated)
+  (defun . c-make-keywords-re)
+  (defun . c-make-bare-char-alt)
+  (defun . c-regexp-opt)
+  (defun . c-regexp-opt-depth)
+  c-emacs-features c-alpha c-alpha c-alnum c-alnum c-digit c-digit c-upper c-upper c-lower c-lower
+  (defun . c-add-language)
+  c-lang-constants c-lang-const-expansion
+  (defun . c-get-current-file)
+  (defun . c-lang-defconst-eval-immediately)
+  (defun . c-lang-defconst)
+  (defun . c-define-lang-constant)
+  (defun . c-lang-const)
+  c-lang-constants-under-evaluation
+  (defun . c-get-lang-constant)
+  (defun . c-find-assignment-for-mode)
+  (defun . c-lang-major-mode-is)
+  (provide . cc-defs))
+ ("/home/hobbes/nxhtml/util/majmodpri.el" majmodpri:version majmodpri-idle-sort-timer
+  (defun . majmodpri-cancel-idle-sort)
+  (defun . majmodpri-start-idle-sort)
+  (defun . majmodpri-sort-lists-in-timer)
+  majmodpri-schwarzian-ordnum
+  (defun . majmodpri-schwarzian-in)
+  (defun . majmodpri-schwarzian-out)
+  majmodpri-no-nxml
+  (defun . majmodpri-priority)
+  (defun . majmodpri-compare-auto-modes)
+  (defun . majmodpri-sort-auto-mode-alist)
+  (defun . majmodpri-sort-magic-list)
+  (t . majmodpri-sort-lists)
+  (defun . majmodpri-sort-lists)
+  (t . majmodpri-apply)
+  (defun . majmodpri-apply)
+  (defun . majmodpri-sort-apply-to-current)
+  (t . majmodpri-apply-priorities)
+  (defun . majmodpri-apply-priorities)
+  majmodpri-mode-priorities majmodpri-lists-to-sort majmodpri-sort-after-load
+  (provide . majmodpri))
+ ("/home/hobbes/nxhtml/etc/schema/schema-path-patch.el" rncpp-this-dir
+  (defun . rncpp-get-nxml-schema-dir)
+  (defun . rncpp-patch-xhtml-loader))
+ ("/home/hobbes/nxhtml/nxhtml/nxhtml-menu.el" nxhtml-menu:version
+  (require . cl)
+  (require . cus-edit)
+  (require . dired)
+  (require . gimp)
+  (require . html-site)
+  (require . nxhtml-mode)
+  (require . css-color)
+  (require . flymake)
+  (require . flymake-php)
+  (require . flymake-js)
+  (require . udev-ecb)
+  (require . udev-cedet)
+  (require . udev-rinari)
+  (defun . nxhtml-nxhtml-in-buffer)
+  (defun . nxhtml-nxml-in-buffer)
+  (defun . nxhtml-html-in-buffer)
+  (defun . nxhtml-nxml-html-in-buffer)
+  (defun . nxhtml-this-file-can-have-toc)
+  (defun . nxhtml-buffer-possibly-local-viewable)
+  (defun . nxhtml-buffer-possibly-remote-viewable)
+  (defun . nxhtml-insert-menu-dynamically)
+  (defun . nxhtml-menu-image-file)
+  (defun . nxhtml-gimp-can-edit)
+  (t . nxhtml-edit-with-gimp)
+  (defun . nxhtml-edit-with-gimp)
+  (t . nxhtml-browse-file)
+  (defun . nxhtml-browse-file)
+  (t . nxhtml-browse-region)
+  (defun . nxhtml-browse-region)
+  nxhtml-browseable-buffer-file
+  (defun . nxhtml-save-browseable-temp-file)
+  nxhtml-minor-mode-menu-map nxhtml-minor-mode-map nxhtml-minor-mode
+  (defun . nxhtml-minor-mode)
+  nxhtml-minor-mode-modes
+  (defun . nxhtml-maybe-turn-on-minor-mode)
+  nxhtml-minor-mode-major-mode nxhtml-global-minor-mode
+  (t . nxhtml-global-minor-mode)
+  (defun . nxhtml-global-minor-mode)
+  nxhtml-global-minor-mode-buffers
+  (defun . nxhtml-global-minor-mode-enable-in-buffers)
+  (defun . nxhtml-global-minor-mode-check-buffers)
+  (defun . nxhtml-global-minor-mode-cmhh)
+  (defun . nxhtml-docfile)
+  (defun . nxhtml-docfile-url)
+  (defun . nxhtml-overview)
+  (defun . nxhtml-tutorials)
+  (defun . nxhtml-custom-valfaced)
+  (defun . nxhtml-custom-insert-nxhtml-row)
+  (defun . nxhtml-custom-h1)
+  (defun . widget-button-notify)
+  (defun . widget-insert-link)
+  (defun . widget-insert-button)
+  (defun . nxhtml-custom-url-link)
+  (defun . nxhtml-custom-describe-defun)
+  (defun . custom-set-and-prepare-save)
+  (defun . nxhtml-welcome)
+  nxhtml-skip-welcome
+  (defun . nxhtml-skip-welcome)
+  (defun . nxhtml-say-welcome-unless-skip)
+  (provide . nxhtml-menu))
+ ("/home/hobbes/nxhtml/util/udev-rinari.el" udev-rinari:version
+  (require . udev)
+  udev-rinari-dir udev-rinari-load-rinari udev-rinari-steps udev-rinari-update-buffer
+  (defun . udev-rinari-buffer-name)
+  (defun . udev-rinari-check-conflicts)
+  (defun . udev-rinari-setup-when-finished)
+  (t . udev-rinari-update)
+  (defun . udev-rinari-update)
+  udev-rinari-fetch-buffer
+  (defun . udev-rinari-fetch)
+  udev-rinari-diff-file udev-rinari-fetch-diff-buffer
+  (defun . udev-rinari-fetch-diff)
+  (defun . udev-rinari-check-diff)
+  (provide . udev-rinari))
+ ("/home/hobbes/nxhtml/util/udev-cedet.el" udev-cedet:version
+  (require . udev)
+  udev-cedet-dir
+  (defun . udev-cedet-load-cedet)
+  udev-cedet-load-cedet udev-cedet-steps
+  (defun . udev-cedet-buffer-name)
+  udev-cedet-update-buffer
+  (defun . udev-cedet-setup-when-finished)
+  (t . udev-cedet-update)
+  (defun . udev-cedet-update)
+  (defun . udev-cedet-fetch)
+  (defun . udev-cedet-cvs-dir)
+  (defun . udev-cedet-fetch-diff)
+  (defun . udev-cedet-check-diff)
+  (defun . udev-cedet-install-add-debug)
+  (defun . udev-cedet-install)
+  (provide . udev-cedet))
+ ("/home/hobbes/nxhtml/util/udev-ecb.el" udev-ecb:version
+  (require . udev)
+  udev-ecb-dir
+  (defun . udev-ecb-load-ecb)
+  udev-ecb-load-ecb udev-ecb-steps
+  (defun . udev-ecb-buffer-name)
+  udev-ecb-update-buffer
+  (defun . udev-ecb-check-cedet)
+  (defun . udev-ecb-setup-when-finished)
+  (t . udev-ecb-update)
+  (defun . udev-ecb-update)
+  (defun . udev-ecb-fetch)
+  (defun . udev-ecb-cvs-dir)
+  (defun . udev-ecb-fetch-diff)
+  (defun . udev-ecb-check-diff)
+  (defun . udev-ecb-install)
+  (provide . udev-ecb))
+ ("/home/hobbes/nxhtml/util/udev.el" udev:version
+  (require . cl)
+  (require . cus-edit)
+  udev-log-buffer udev-is-log-buffer
+  (defun . udev-check-is-log-buffer)
+  udev-this-chain udev-last-error
+  (defun . udev-set-last-error)
+  (defun . udev-chain)
+  (defun . udev-this-step)
+  (defun . udev-goto-next-step)
+  (defun . udev-num-steps)
+  (defun . udev-step-num)
+  (defun . udev-finish-function)
+  udev-control-mode-map udev-control-mode-map udev-control-mode-syntax-table udev-control-mode-abbrev-table udev-control-mode-abbrev-table
+  (defun . udev-control-mode)
+  (defun . udev-call-first-step)
+  udev-step-keymap
+  (defun . udev-step-at-point)
+  (defun . udev-rerun-this-step)
+  (defun . udev-continue-from-this-step)
+  (defun . udev-goto-this-step-source)
+  (defun . udev-call-this-step)
+  (defun . udev-call-next-step)
+  udev-orig-sentinel
+  (defun . udev-compilation-sentinel)
+  (defun . udev-set-compilation-end-message)
+  udev-continue-on-error-function
+  (defun . udev-buffer-name)
+  udev-this-dir
+  (defun . udev-batch-compile)
+  (defun . udev-fetch-cvs-diff)
+  (defun . udev-cvs-diff-continue)
+  (defun . udev-check-cvs-diff)
+  (defun . udev-send-buffer-process)
+  (provide . udev))
+ ("/home/hobbes/nxhtml/related/flymake-js.el"
+  (require . flymake)
+  flymake-allowed-js-file-name-masks flymake-js-err-line-pattern-re flymake-js-rhino-jar flymake-js-rhino-js flymake-js-engine
+  (defun . flymake-js-init)
+  (defun . flymake-js-load)
+  flymake-js-has-engine
+  (defun . flymake-js-has-engine)
+  (defun . flymake-js-turn-on)
+  flymake-js-on
+  (provide . flymake-js))
+ ("/home/hobbes/nxhtml/related/flymake-php.el"
+  (require . flymake)
+  flymake-allowed-php-file-name-masks flymake-php-err-line-pattern-re
+  (defun . flymake-php-init)
+  flymake-php-has-engine
+  (defun . flymake-php-has-engine)
+  (defun . flymake-php-turn-on)
+  flymake-php-on
+  (defun . flymake-php-load)
+  (provide . flymake-php))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/flymake.elc" flymake-is-running flymake-timer flymake-last-change-time flymake-check-start-time flymake-check-was-interrupted flymake-err-info flymake-new-err-info
+  (defun . flymake-makehash)
+  (defun . flymake-float-time)
+  (defun . flymake-replace-regexp-in-string)
+  (defun . flymake-split-string)
+  (defun . flymake-get-temp-dir)
+  (defun . flymake-line-beginning-position)
+  (defun . flymake-line-end-position)
+  (defun . flymake-posn-at-point-as-event)
+  (defun . flymake-popup-menu)
+  (defun . flymake-make-emacs-menu)
+  flymake-log-level
+  (defun . flymake-log)
+  (defun . flymake-ins-after)
+  (defun . flymake-set-at)
+  flymake-processes flymake-output-residual flymake-allowed-file-name-masks
+  (defun . flymake-get-file-name-mode-and-masks)
+  (defun . flymake-can-syntax-check-file)
+  (defun . flymake-get-init-function)
+  (defun . flymake-get-cleanup-function)
+  (defun . flymake-get-real-file-name-function)
+  flymake-find-buildfile-cache
+  (defun . flymake-get-buildfile-from-cache)
+  (defun . flymake-add-buildfile-to-cache)
+  (defun . flymake-clear-buildfile-cache)
+  (defun . flymake-find-buildfile)
+  (defun . flymake-fix-file-name)
+  (defun . flymake-same-files)
+  flymake-master-file-dirs flymake-master-file-count-limit
+  (defun . flymake-find-possible-master-files)
+  (defun . flymake-master-file-compare)
+  flymake-check-file-limit
+  (defun . flymake-check-patch-master-file-buffer)
+  (defun . flymake-replace-region)
+  (defun . flymake-read-file-to-temp-buffer)
+  (defun . flymake-copy-buffer-to-temp-buffer)
+  (defun . flymake-check-include)
+  (defun . flymake-find-buffer-for-file)
+  (defun . flymake-create-master-file)
+  (defun . flymake-save-buffer-in-file)
+  (defun . flymake-save-string-to-file)
+  (defun . flymake-read-file-to-string)
+  (defun . flymake-process-filter)
+  (defun . flymake-process-sentinel)
+  (defun . flymake-post-syntax-check)
+  (defun . flymake-parse-output-and-residual)
+  (defun . flymake-parse-residual)
+  (defun . flymake-er-make-er)
+  (defun . flymake-er-get-line)
+  (defun . flymake-er-get-line-err-info-list)
+  (defun . flymake-ler-file)
+  (defun . flymake-ler-line)
+  (defun . flymake-ler-type)
+  (defun . flymake-ler-text)
+  (defun . flymake-ler-full-file)
+  (defun . flymake-ler-p)
+  (defun . copy-flymake-ler)
+  (defun . flymake-ler-make-ler)
+  (defun . flymake-ler-set-file)
+  (defun . flymake-ler-set-full-file)
+  (defun . flymake-ler-set-line)
+  (defun . flymake-get-line-err-count)
+  (defun . flymake-get-err-count)
+  (defun . flymake-fix-line-numbers)
+  (defun . flymake-highlight-err-lines)
+  (defun . flymake-overlay-p)
+  (defun . flymake-make-overlay)
+  (defun . flymake-delete-own-overlays)
+  (defun . flymake-region-has-flymake-overlays)
+  (defface . flymake-errline)
+  (defface . flymake-warnline)
+  (defun . flymake-highlight-line)
+  (defun . flymake-parse-err-lines)
+  (defun . flymake-split-output)
+  (defun . flymake-reformat-err-line-patterns-from-compile-el)
+  (require . compile)
+  flymake-err-line-patterns
+  (defun . flymake-parse-line)
+  (defun . flymake-find-err-info)
+  (defun . flymake-line-err-info-is-less-or-equal)
+  (defun . flymake-add-line-err-info)
+  (defun . flymake-add-err-info)
+  (defun . flymake-get-project-include-dirs-imp)
+  flymake-get-project-include-dirs-function
+  (defun . flymake-get-project-include-dirs)
+  (defun . flymake-get-system-include-dirs)
+  flymake-project-include-dirs-cache
+  (defun . flymake-get-project-include-dirs-from-cache)
+  (defun . flymake-add-project-include-dirs-to-cache)
+  (defun . flymake-clear-project-include-dirs-cache)
+  (defun . flymake-get-include-dirs)
+  (defun . flymake-safe-delete-file)
+  (defun . flymake-safe-delete-directory)
+  flymake-compilation-prevents-syntax-check
+  (defun . flymake-start-syntax-check)
+  (defun . flymake-start-syntax-check-process)
+  (defun . flymake-kill-process)
+  (defun . flymake-stop-all-syntax-checks)
+  (defun . flymake-compilation-is-running)
+  (defun . flymake-compile)
+  flymake-no-changes-timeout
+  (defun . flymake-on-timer-event)
+  (defun . flymake-current-line-no)
+  (defun . flymake-count-lines)
+  (defun . flymake-display-err-menu-for-current-line)
+  (defun . flymake-make-err-menu-data)
+  (defun . flymake-goto-file-and-line)
+  flymake-mode-line flymake-mode-line-e-w flymake-mode-line-status
+  (defun . flymake-report-status)
+  (defun . flymake-display-warning)
+  flymake-gui-warnings-enabled
+  (defun . flymake-report-fatal-status)
+  flymake-start-syntax-check-on-find-file flymake-mode
+  (t . flymake-mode)
+  (defun . flymake-mode)
+  (t . flymake-mode-on)
+  (defun . flymake-mode-on)
+  (t . flymake-mode-off)
+  (defun . flymake-mode-off)
+  flymake-start-syntax-check-on-newline
+  (defun . flymake-after-change-function)
+  (defun . flymake-after-save-hook)
+  (defun . flymake-kill-buffer-hook)
+  (defun . flymake-find-file-hook)
+  (defun . flymake-get-first-err-line-no)
+  (defun . flymake-get-last-err-line-no)
+  (defun . flymake-get-next-err-line-no)
+  (defun . flymake-get-prev-err-line-no)
+  (defun . flymake-skip-whitespace)
+  (defun . flymake-goto-line)
+  (defun . flymake-goto-next-error)
+  (defun . flymake-goto-prev-error)
+  (defun . flymake-patch-err-text)
+  (defun . flymake-create-temp-inplace)
+  (defun . flymake-create-temp-with-folder-structure)
+  (defun . flymake-delete-temp-directory)
+  flymake-temp-source-file-name flymake-master-file-name flymake-temp-master-file-name flymake-base-dir
+  (defun . flymake-init-create-temp-buffer-copy)
+  (defun . flymake-simple-cleanup)
+  (defun . flymake-get-real-file-name)
+  (defun . flymake-get-full-patched-file-name)
+  (defun . flymake-get-full-nonpatched-file-name)
+  (defun . flymake-init-find-buildfile-dir)
+  (defun . flymake-init-create-temp-source-and-master-buffer-copy)
+  (defun . flymake-master-cleanup)
+  (defun . flymake-get-syntax-check-program-args)
+  (defun . flymake-get-make-cmdline)
+  (defun . flymake-get-ant-cmdline)
+  (defun . flymake-simple-make-init-impl)
+  (defun . flymake-simple-make-init)
+  (defun . flymake-master-make-init)
+  (defun . flymake-find-make-buildfile)
+  (defun . flymake-master-make-header-init)
+  (defun . flymake-simple-make-java-init)
+  (defun . flymake-simple-ant-java-init)
+  (defun . flymake-simple-java-cleanup)
+  (defun . flymake-perl-init)
+  (defun . flymake-php-init)
+  (defun . flymake-get-tex-args)
+  (defun . flymake-simple-tex-init)
+  (defun . flymake-master-tex-init)
+  (defun . flymake-get-include-dirs-dot)
+  (defun . flymake-xml-init)
+  (provide . flymake))
+ ("/home/hobbes/nxhtml/util/css-color.el" css-color:version
+  (require . cl)
+  (defun . css-color-turn-on-in-buffer)
+  css-color-mode-major-mode css-color-global-mode
+  (t . css-color-global-mode)
+  (defun . css-color-global-mode)
+  css-color-global-mode-buffers
+  (defun . css-color-global-mode-enable-in-buffers)
+  (defun . css-color-global-mode-check-buffers)
+  (defun . css-color-global-mode-cmhh)
+  css-color-hex-chars css-color-hex-re css-color-hsl-re css-color-rgb-re css-color-html-colors css-color-html-re css-color-color-re css-color-keywords css-color-mode
+  (t . css-color-mode)
+  (defun . css-color-mode)
+  (defun . css-color-font-lock-hook-fun)
+  css-color-map css-color-generic-map
+  (defun . css-color-pal-lumsig)
+  (defun . css-color-foreground-color)
+  (defun . css-color-normalize-hue)
+  (defun . css-color-within-bounds)
+  (defun . css-color-hex-to-rgb)
+  (defun . css-color-hex-to-hsv)
+  (defun . css-color-rgb-to-hex)
+  (defun . css-color-rgb-to-hsv)
+  (defun . css-color-rgb-to-hsl)
+  (defun . css-color-hsv-to-hsl)
+  (defun . css-color-hsv-to-hex)
+  (defun . css-color-hsv-to-rgb)
+  (defun . css-color-hsv-to-prop-hexstring)
+  (defun . css-color-hsl-to-rgb-fractions)
+  (defun . css-color-hsl-to-rgb)
+  (defun . css-color-hsl-to-hex)
+  (defun . css-color-hue-to-rgb)
+  (defun . css-color-parse-hsl)
+  (defun . css-color-inchue)
+  (defun . css-color-incsat)
+  (defun . css-color-incval)
+  (defun . css-color-hexval-beginning)
+  (defun . css-color-replcolor-at-p)
+  (defun . css-color-get-color-at-point)
+  (defun . css-color-adj-hue-at-p)
+  (defun . css-color-adj-saturation-at-p)
+  (defun . css-color-adj-value-at-p)
+  (defun . css-color-what-channel)
+  (defun . css-color-adjust-hex-at-p)
+  (defun . css-color-up)
+  (defun . css-color-down)
+  (defun . css-color-hue-up)
+  (defun . css-color-hue-down)
+  (defun . css-color-saturation-up)
+  (defun . css-color-saturation-down)
+  (defun . css-color-value-up)
+  (defun . css-color-value-down)
+  (defun . css-color-num-up)
+  (defun . css-color-num-down)
+  (defun . css-color-beginning-of-color)
+  (defun . css-color-end-of-color)
+  (defun . css-color-color-info)
+  css-color-type-circle
+  (defun . css-color-next-type)
+  (defun . css-color-cycle-type)
+  (defun . css-color-string-hex-to-hsl)
+  (defun . css-color-string-hsl-to-rgb)
+  (defun . css-color-string-rgb-to-name)
+  (defun . css-color-string-name-to-hex)
+  (defun . css-color-string-rgb-to-hex)
+  (defun . css-color-string-hsl-to-hex)
+  (defun . css-color-next-channel)
+  (defun . css-color-hexify-anystring)
+  (defun . css-color-toggle-percentage)
+  css-color-fg-history css-color-bg-history
+  (defun . css-color-test)
+  (defun . css-color-run-tests)
+  (provide . css-color))
+ ("/home/hobbes/nxhtml/nxhtml/nxhtml-mode.el"
+  (require . mumamo)
+  (require . cl)
+  (require . appmenu-fold)
+  (require . fold-dwim)
+  (require . typesetter)
+  (require . button)
+  (require . loadhist)
+  (require . nxml-mode)
+  (require . rngalt)
+  (require . url-parse)
+  (require . url-expand)
+  (require . popcmp)
+  (require . html-imenu)
+  (require . tidy-xhtml)
+  (require . html-quote)
+  (defun . nxhtml-version)
+  (defun . nxhtml-setup-for-fold-dwim)
+  (defun . nxhtml-outline-level)
+  (defun . nxhtml-hs-forward-element)
+  nxhtml-use-imenu nxhtml-default-encoding
+  (defun . nxhtml-insert-empty-frames-page)
+  (defun . nxhtml-insert-empty-page)
+  (defun . nxhtml-empty-page-completion)
+  nxhtml-mode-hook
+  (defun . nxhtml-help)
+  nxhtml-current-validation-header tidy-menu-symbol
+  (defun . tidy-menu-symbol)
+  (defun . nxhtml-change-mode)
+  nxhtml-heading-element-name-regexp nxhtml-mode-map nxhtml-mode-syntax-table nxhtml-mode-abbrev-table nxhtml-mode-abbrev-table
+  (t . nxhtml-mode)
+  (defun . nxhtml-mode)
+  (defun . nxhtml-quote-html)
+  nxhtml-single-tags
+  (defun . nxthml-is-single-tag)
+  nxhtml-help-attribute-name nxhtml-help-attribute-name-tag nxhtml-help-tag
+  (t . nxhtml-short-tag-help)
+  (defun . nxhtml-short-tag-help)
+  nxhtml-no-single-tags nxhtml-no-end-tags nxhtml-predicate-error
+  (defun . nxhtml-find-ids)
+  (defun . nxhtml-read-url)
+  (defun . nxhtml-read-url-type)
+  nxhtml-read-url-history nxhtml-read-web-url-history nxhtml-read-mail-url-history nxhtml-in-xml-attribute-value-regex
+  (defun . nxhtml-mailto-predicate)
+  nxhtml-image-completion-pattern
+  (defun . nxhtml-image-url-predicate)
+  nxhtml-css-completion-pattern
+  (defun . nxhtml-css-url-predicate)
+  nxhtml-script-completion-pattern
+  (defun . nxhtml-script-url-predicate)
+  (defun . nxhtml-coding-systems-complete)
+  nxhtml-in-proc-instr-back-regex nxhtml-in-proc-instr-forw-regex rngalt-in-pre-attribute-value-regex
+  (defun . nxhtml-check-where)
+  nxhtml-tag-sets nxhtml-attr-sets
+  (defun . nxhtml-complete-last-try)
+  (defun . nxhtml-img-tag-do-also)
+  (defun . nxhtml-redisplay-complete)
+  (defun . nxhtml-read-from-minibuffer)
+  (defun . nxhtml-meta-tag-do-also)
+  (defun . nxhtml-style-tag-do-also)
+  (defun . nxhtml-script-tag-do-also)
+  (defun . nxhtml-link-tag-do-also)
+  (defun . nxhtml-input-tag-do-also)
+  (defun . nxhtml-do-also-value)
+  (defun . nxhtml-form-tag-do-also)
+  nxhtml-complete-tag-do-also
+  (defun . nxhtml-complete-tag-do-also)
+  (defun . nxhtml-turn-onoff-tag-do-also)
+  nxhtml-tag-do-also
+  (defun . nxhtml-tag-do-also-toggle)
+  (defun . nxhtml-check-tag-do-also)
+  nxhtml-validation-header-mode
+  (t . nxhtml-validation-header-mode)
+  (defun . nxhtml-validation-header-mode)
+  (defun . nxhtml-can-insert-page-here)
+  (defun . nxhtml-complete-first-try)
+  (defun . nxhtml-completing-read-tag)
+  (defun . nxhtml-add-required-to-attr-set)
+  (defun . nxhtml-get-tag-specific-attr-help)
+  nxhtml-in-start-tag-regex
+  (defun . nxhtml-completing-read-attribute-name)
+  (defun . nxhtml-completing-read-attribute-value)
+  (defun . nxhtml-read-link-type)
+  (defun . nxhtml-read-link-media)
+  (defun . nxhtml-read-link-rel)
+  (defun . nxhtml-read-meta-name)
+  (defun . nxhtml-read-meta-content)
+  (defun . nxhtml-read-meta-scheme)
+  (defun . nxhtml-read-meta-http-equiv)
+  nxhtml-validation-headers nxhtml-default-validation-header
+  (defun . nxhtml-must-have-validation-headers)
+  nxhtml-set-validation-header-hist nxhtml-guess-validation-header-alist
+  (defun . nxhtml-guess-validation-header)
+  (defun . nxhtml-open-dir-saved-validation-headers)
+  (defun . nxhtml-get-saved-validation-header)
+  (defun . nxhtml-remove-saved-validation-header)
+  (defun . nxhtml-save-validation-header)
+  (defun . nxhtml-update-saved-validation-header)
+  (defun . nxhtml-get-default-validation-header)
+  (defun . nxhtml-set-validation-header)
+  (defun . nxhtml-apply-validation-header)
+  (defun . nxhtml-update-validation-header)
+  (defun . nxhtml-vhm-change-major)
+  (defun . nxhtml-recheck-validation-header)
+  (defun . nxhtml-validation-header-empty)
+  (defun . nxhtml-turn-on-validation-header-mode)
+  (defun . nxhtml-vhm-mumamo-change-major)
+  (defun . nxhtml-vhm-mumamo-after-change-major)
+  nxhtml-validation-headers-check nxhtml-validation-header-mumamo-modes
+  (defun . nxhtml-add-validation-header-if-mumamo)
+  nxhtml-validation-header-if-mumamo
+  (defun . nxhtml-validation-header-if-mumamo-toggle)
+  (defun . nxhtml-warnings-are-visible)
+  nxhtml-old-rng-error-face
+  (defun . nxhtml-toggle-visible-warnings)
+  nxml-untag-select
+  (defun . nxml-untag-element)
+  (defun . nxhtml-rollover-insert-2v)
+  (provide . nxhtml-mode))
+ ("/home/hobbes/nxhtml/nxhtml/html-quote.el" html-quote-html
+  (defun . html-quote-html-char)
+  (defun . html-quote-html-string)
+  (provide . html-quote))
+ ("/home/hobbes/nxhtml/nxhtml/tidy-xhtml.el" tidy-xhtml:version
+  (require . cl)
+  (require . ediff)
+  (require . mumamo)
+  (require . html-site)
+  (require . easymenu)
+  (require . compile)
+  (require . cus-edit)
+  (require . help-mode)
+  (defun . tidy-xemacs-p)
+  (defun . tidy-windows-p)
+  (defun . tidy-x-event-function)
+  (defun . tidy-x-event-object)
+  (defun . tidy-x-find-menu-item)
+  (defun . tidy-x-get-popup-menu-response)
+  (defun . tidy-x-make-event)
+  (defun . tidy-x-misc-user-event-p)
+  tidy-warnings tidy-errors tidy-message tidy-batch-last-file tidy-default-config-file tidy-config-file-parsed tidy-config-file tidy-shell-program tidy-temp-directory tidy-menu-lock tidy-menu-x-position tidy-debug
+  (defun . tidy-toggle-debug)
+  tidy-options-alist
+  (defun . tidy-build-options-alist)
+  tidy-xhtml-values
+  (defun . tidy-xhtml-options-ok)
+  (defun . tidy-show-xhtml-options)
+  (defun . tidy-set-xhtml-options)
+  current-menubar
+  (defun . tidy-menu-position)
+  (defun . tidy-menu-lock)
+  (defun . tidy-menu-lookup)
+  tidy-menu tidy-menu-position tidy-menu-state
+  (defun . tidy-menu-position)
+  (defun . tidy-menu-lock)
+  (defun . tidy-menu-lookup)
+  (defun . tidy-set)
+  (defun . tidy-boolean-entry)
+  (defun . tidy-list-entry)
+  (defun . tidy-set-string)
+  (defun . tidy-set-integer)
+  (defun . tidy-string-entry)
+  (defun . tidy-integer-entry)
+  (defun . tidy-exe-found)
+  tidy-top-menu tidy-newline-menu tidy-doctype-menu tidy-emacs-encoding-lbl
+  (defun . tidy-create-encoding-menu)
+  tidy-output-encoding-menu tidy-menu-symbol
+  (t . tidy-build-menu)
+  (defun . tidy-build-menu)
+  (defun . event-point)
+  (defun . tidy-describe-this-option-mouse)
+  (defun . tidy-describe-this-option)
+  (defun . tidy-quit-describe-options)
+  (defun . tidy-current-line)
+  (defun . tidy-describe-options)
+  (defun . tidy-parse-config-file)
+  (defun . tidy-save-settings)
+  tidy-markup
+  (defun . tidy-set-buffer-unmodified)
+  tidy-encodings-mime-charset-list
+  (defun . tidy-get-buffer-encoding)
+  (defun . tidy-get-tidy-encoding)
+  (defun . tidy-temp-config-file)
+  tidy-output-buf-name tidy-tidied-buffer
+  (defun . tidy-check-is-tidied)
+  tidy-control-buffer-name
+  (defun . tidy-buffer)
+  (defun . tidy-after-ediff)
+  (defun . tidy-ediff-buffers)
+  (defun . tidy-remove-ctrl-m)
+  tidy-html-files-re
+  (defun . tidy-is-html-file)
+  (defun . tidy-contains)
+  tidy-tree-files
+  (defun . tidy-tree-next)
+  (defun . tidy-tree)
+  (defun . tidy-html-site)
+  (defun . tidy-batch-sentinel)
+  (defun . tidy-batch-output-filter)
+  (defun . tidy-batch)
+  (defun . wab-compilation-button-at)
+  (defun . wab-click)
+  wab-errors-supress
+  (defun . wab-fb-errmsg)
+  (defun . wab-fb-helper)
+  wab-button-list
+  (defun . wab-fb)
+  (defun . wab-backward)
+  (defun . wab-forward)
+  wab-compilation-mode-map wab-compilation-mode-syntax-table wab-compilation-mode-abbrev-table wab-compilation-mode-abbrev-table
+  (defun . wab-compilation-mode)
+  tidy-menu-mode-map tidy-menu-mode
+  (defun . tidy-menu-mode)
+  (provide . tidy-xhtml))
+ ("/usr/share/emacs/23.0.93/lisp/ediff.elc" ediff-version ediff-date
+  (provide . ediff)
+  (require . ediff-init)
+  (require . ediff-mult)
+  ediff-use-last-dir ediff-last-dir-A ediff-last-dir-B ediff-last-dir-C ediff-last-dir-ancestor ediff-last-merge-autostore-dir
+  (defun . ediff-set-read-only-in-buf-A)
+  (defun . ediff-get-default-file-name)
+  (t . ediff-files)
+  (defun . ediff-files)
+  (t . ediff-files3)
+  (defun . ediff-files3)
+  (defun . ediff3)
+  (defun . ediff-find-file)
+  (defun . ediff-files-internal)
+  (defun . ediff)
+  (t . ediff-backup)
+  (defun . ediff-backup)
+  (t . ediff-buffers)
+  (defun . ediff-buffers)
+  (defun . ebuffers)
+  (t . ediff-buffers3)
+  (defun . ediff-buffers3)
+  (defun . ebuffers3)
+  (defun . ediff-buffers-internal)
+  (defun . ediff-get-default-directory-name)
+  (t . ediff-directories)
+  (defun . ediff-directories)
+  (defun . edirs)
+  (t . ediff-directory-revisions)
+  (defun . ediff-directory-revisions)
+  (defun . edir-revisions)
+  (t . ediff-directories3)
+  (defun . ediff-directories3)
+  (defun . edirs3)
+  (t . ediff-merge-directories)
+  (defun . ediff-merge-directories)
+  (defun . edirs-merge)
+  (t . ediff-merge-directories-with-ancestor)
+  (defun . ediff-merge-directories-with-ancestor)
+  (t . ediff-merge-directory-revisions)
+  (defun . ediff-merge-directory-revisions)
+  (defun . edir-merge-revisions)
+  (t . ediff-merge-directory-revisions-with-ancestor)
+  (defun . ediff-merge-directory-revisions-with-ancestor)
+  (defun . edir-merge-revisions-with-ancestor)
+  (defun . edirs-merge-with-ancestor)
+  (defun . ediff-directories-internal)
+  (defun . ediff-directory-revisions-internal)
+  (t . ediff-windows-wordwise)
+  (defun . ediff-windows-wordwise)
+  (t . ediff-windows-linewise)
+  (defun . ediff-windows-linewise)
+  (defun . ediff-windows)
+  (t . ediff-regions-wordwise)
+  (defun . ediff-regions-wordwise)
+  (t . ediff-regions-linewise)
+  (defun . ediff-regions-linewise)
+  (defun . ediff-regions-internal)
+  (defun . ediff-merge)
+  (defun . ediff-merge-on-startup)
+  (t . ediff-merge-files)
+  (defun . ediff-merge-files)
+  (t . ediff-merge-files-with-ancestor)
+  (defun . ediff-merge-files-with-ancestor)
+  (defun . ediff-merge-with-ancestor)
+  (t . ediff-merge-buffers)
+  (defun . ediff-merge-buffers)
+  (t . ediff-merge-buffers-with-ancestor)
+  (defun . ediff-merge-buffers-with-ancestor)
+  (t . ediff-merge-revisions)
+  (defun . ediff-merge-revisions)
+  (t . ediff-merge-revisions-with-ancestor)
+  (defun . ediff-merge-revisions-with-ancestor)
+  (t . ediff-patch-file)
+  (defun . ediff-patch-file)
+  (t . ediff-patch-buffer)
+  (defun . ediff-patch-buffer)
+  (defun . epatch)
+  (defun . epatch-buffer)
+  (t . ediff-revision)
+  (defun . ediff-revision)
+  (defun . erevision)
+  (defun . ediff-load-version-control)
+  (t . ediff-version)
+  (defun . ediff-version)
+  (t . ediff-documentation)
+  (defun . ediff-documentation)
+  (require . ediff-util))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-util.elc"
+  (provide . ediff-util)
+  ediff-after-quit-hook-internal
+  (require . ediff-init)
+  (require . ediff-help)
+  (require . ediff-mult)
+  (require . ediff-wind)
+  (require . ediff-diff)
+  (require . ediff-merg)
+  (defun . ediff-mode)
+  ediff-mode-map
+  (defun . ediff-set-keys)
+  (defun . ediff-reload-keymap)
+  (defun . ediff-setup-keymap)
+  (defun . ediff-setup)
+  (defun . ediff-setup-control-buffer)
+  (defun . ediff-arrange-autosave-in-merge-jobs)
+  (defun . ediff-update-diffs)
+  (defun . ediff-revert-buffers-then-recompute-diffs)
+  (defun . ediff-recenter)
+  (defun . ediff-recenter-one-window)
+  (defun . ediff-recenter-ancestor)
+  (defun . ediff-toggle-split)
+  (defun . ediff-toggle-hilit)
+  (defun . ediff-toggle-autorefine)
+  (defun . ediff-show-ancestor)
+  (defun . ediff-make-or-kill-fine-diffs)
+  (defun . ediff-toggle-help)
+  (defun . ediff-toggle-read-only)
+  (defun . ediff-maybe-checkout)
+  (defun . ediff-file-checked-out-p)
+  (defun . ediff-file-checked-in-p)
+  (defun . ediff-file-compressed-p)
+  (defun . ediff-swap-buffers)
+  (defun . ediff-toggle-wide-display)
+  (t . ediff-toggle-multiframe)
+  (defun . ediff-toggle-multiframe)
+  (t . ediff-toggle-use-toolbar)
+  (defun . ediff-toggle-use-toolbar)
+  (defun . ediff-kill-bottom-toolbar)
+  (defun . ediff-make-bottom-toolbar)
+  (defun . ediff-toggle-show-clashes-only)
+  (defun . ediff-toggle-skip-changed-regions)
+  (defun . ediff-toggle-narrow-region)
+  (defun . ediff-visible-region)
+  (defun . ediff-operate-on-windows)
+  (defun . ediff-scroll-vertically)
+  (defun . ediff-scroll-horizontally)
+  (defun . ediff-position-region)
+  (defun . ediff-get-lines-to-region-end)
+  (defun . ediff-get-lines-to-region-start)
+  (defun . ediff-get-region-size-coefficient)
+  (defun . ediff-next-difference)
+  (defun . ediff-previous-difference)
+  (defun . ediff-jump-to-difference)
+  (defun . ediff-jump-to-difference-at-point)
+  (defun . ediff-diff-at-point)
+  (defun . ediff-diff-to-diff)
+  (defun . ediff-copy-A-to-B)
+  (defun . ediff-copy-B-to-A)
+  (defun . ediff-copy-A-to-C)
+  (defun . ediff-copy-B-to-C)
+  (defun . ediff-copy-C-to-B)
+  (defun . ediff-copy-C-to-A)
+  (defun . ediff-copy-diff)
+  (defun . ediff-save-diff-region)
+  (defun . ediff-test-save-region)
+  (defun . ediff-pop-diff)
+  (defun . ediff-restore-diff)
+  (defun . ediff-restore-diff-in-merge-buffer)
+  (defun . ediff-toggle-regexp-match)
+  (defun . ediff-toggle-skip-similar)
+  (defun . ediff-focus-on-regexp-matches)
+  (defun . ediff-hide-regexp-matches)
+  (defun . ediff-quit)
+  (defun . ediff-really-quit)
+  (defun . ediff-good-frame-under-mouse)
+  (defun . ediff-delete-temp-files)
+  (defun . ediff-cleanup-mess)
+  (defun . ediff-janitor)
+  (defun . ediff-dispose-of-variant-according-to-user)
+  (defun . ediff-maybe-save-and-delete-merge)
+  (defun . ediff-write-merge-buffer-and-maybe-kill)
+  (defun . ediff-default-suspend-function)
+  (defun . ediff-suspend)
+  (defun . ediff-status-info)
+  (defun . ediff-select-difference)
+  (defun . ediff-unselect-difference)
+  (defun . ediff-unselect-and-select-difference)
+  (defun . ediff-highlight-diff-in-one-buffer)
+  (defun . ediff-unhighlight-diff-in-one-buffer)
+  (defun . ediff-unhighlight-diffs-totally-in-one-buffer)
+  (defun . ediff-highlight-diff)
+  (defun . ediff-unhighlight-diff)
+  (defun . ediff-unhighlight-diffs-totally)
+  (defun . ediff-read-file-name)
+  (defun . ediff-make-temp-file)
+  (defun . ediff-make-empty-tmp-file)
+  (defun . ediff-verify-file-buffer)
+  (defun . ediff-verify-file-merge-buffer)
+  (defun . ediff-filename-magic-p)
+  (defun . ediff-save-buffer)
+  (defun . ediff-clone-buffer-for-region-comparison)
+  (defun . ediff-clone-buffer-for-window-comparison)
+  (defun . ediff-clone-buffer-for-current-diff-comparison)
+  (defun . ediff-make-cloned-buffer)
+  (defun . ediff-make-indirect-buffer)
+  (defun . ediff-compute-custom-diffs-maybe)
+  (defun . ediff-show-diff-output)
+  (defun . ediff-inferior-compare-regions)
+  (defun . ediff-remove-flags-from-buffer)
+  (defun . ediff-place-flags-in-buffer)
+  (defun . ediff-place-flags-in-buffer1)
+  (defun . ediff-empty-diff-region-p)
+  (defun . ediff-whitespace-diff-region-p)
+  (defun . ediff-get-region-contents)
+  (defun . ediff-get-diff-posn)
+  (defun . ediff-restore-highlighting)
+  (defun . ediff-clear-diff-vector)
+  (defun . ediff-make-bullet-proof-overlay)
+  (defun . ediff-make-current-diff-overlay)
+  (defun . ediff-other-buffer)
+  (defun . ediff-get-selected-buffers)
+  (defun . ediff-unique-buffer-name)
+  (defun . ediff-submit-report)
+  (defun . ediff-choose-syntax-table)
+  (defun . ediff-deactivate-mark)
+  (defun . ediff-activate-mark)
+  (defun . ediff-nuke-selective-display)
+  (defun . ediff-save-variables)
+  (defun . ediff-restore-variables)
+  (defun . ediff-change-saved-variable)
+  (defun . ediff-save-protected-variables)
+  (defun . ediff-restore-protected-variables)
+  (defun . ediff-save-buffer-in-file)
+  ediff-command-begin-time
+  (defun . ediff-calc-command-time)
+  (defun . ediff-save-time)
+  (defun . ediff-profile)
+  (defun . ediff-print-diff-vector)
+  (defun . ediff-debug-info)
+  (defun . ediff-member)
+  (defun . ediff-format-bindings-of)
+  (defun . ediff-intersection)
+  (defun . ediff-union)
+  (defun . ediff-set-difference)
+  (defun . ediff-add-to-history)
+  (defun . ediff-copy-list))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-merg.elc"
+  (require . ediff-init)
+  ediff-quit-merge-hook ediff-default-variant ediff-combination-pattern ediff-show-clashes-only ediff-skip-merge-regions-that-differ-from-default
+  (defun . ediff-merge-region-is-non-clash)
+  (defun . ediff-merge-region-is-non-clash-to-skip)
+  (defun . ediff-skip-merge-region-if-changed-from-default-p)
+  (defun . ediff-get-combined-region)
+  (defun . ediff-set-state-of-all-diffs-in-all-buffers)
+  (defun . ediff-set-state-of-diff-in-all-buffers)
+  (defun . ediff-set-merge-mode)
+  (defun . ediff-do-merge)
+  (defun . ediff-re-merge)
+  (defun . ediff-shrink-window-C)
+  (defun . ediff-combine-diffs)
+  (defun . ediff-looks-like-combined-merge)
+  (defun . ediff-merge-changed-from-default-p)
+  (provide . ediff-merg))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-diff.elc"
+  (provide . ediff-diff)
+  (require . ediff-init)
+  ediff-diff-program ediff-diff3-program ediff-shell ediff-cmp-program ediff-cmp-options
+  (defun . ediff-set-diff-options)
+  ediff-diff-options ediff-ignore-case ediff-ignore-case-option ediff-ignore-case-option3 ediff-actual-diff-options ediff-custom-diff-program ediff-custom-diff-options ediff-match-diff3-line ediff-diff3-options ediff-actual-diff3-options ediff-diff3-ok-lines-regexp ediff-diff-status ediff-auto-refine ediff-ignore-similar-regions ediff-auto-refine-limit ediff-diff-ok-lines-regexp ediff-match-diff-line ediff-setup-diff-regions-function
+  (defun . ediff-setup-diff-regions)
+  (defun . ediff-make-diff2-buffer)
+  (defun . ediff-setup-fine-diff-regions)
+  (defun . ediff-prepare-error-list)
+  (defun . ediff-extract-diffs)
+  (defun . ediff-convert-diffs-to-overlays)
+  (defun . ediff-set-diff-overlays-in-one-buffer)
+  (defun . ediff-make-fine-diffs)
+  (defun . ediff-install-fine-diff-if-necessary)
+  (defun . ediff-set-fine-diff-properties)
+  (defun . ediff-set-fine-diff-properties-in-one-buffer)
+  (defun . ediff-set-fine-overlays-for-combined-merge)
+  (defun . ediff-set-fine-overlays-in-one-buffer)
+  (defun . ediff-convert-fine-diffs-to-overlays)
+  (defun . ediff-get-diff3-group)
+  (defun . ediff-extract-diffs3)
+  (defun . ediff-setup-diff-regions3)
+  (defun . ediff-exec-process)
+  (defun . ediff-process-filter)
+  (defun . ediff-process-sentinel)
+  ediff-forward-word-function ediff-whitespace ediff-word-1 ediff-word-2 ediff-word-3 ediff-word-4
+  (defun . ediff-forward-word)
+  (defun . ediff-wordify)
+  (defun . ediff-copy-to-buffer)
+  (defun . ediff-goto-word)
+  (defun . ediff-same-file-contents)
+  (defun . ediff-same-contents)
+  (defun . ediff-same-file-contents-lists)
+  (defun . ediff-delete-all-matches)
+  (defun . ediff-set-actual-diff-options)
+  (defun . ediff-toggle-ignore-case))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-wind.elc"
+  (require . ediff-init)
+  (defun . ediff-compute-toolbar-width)
+  (defun . ediff-choose-window-setup-function-automatically)
+  ediff-window-setup-function ediff-multiframe ediff-merge-window-share ediff-control-window ediff-window-A ediff-window-B ediff-window-C ediff-window-config-saved ediff-window-alist ediff-window-alist ediff-split-window-function ediff-merge-split-window-function ediff-control-frame-parameters ediff-mouse-pixel-position ediff-mouse-pixel-threshold ediff-grab-mouse ediff-control-frame-position-function ediff-control-frame-upward-shift ediff-narrow-control-frame-leftward-shift ediff-wide-control-frame-rightward-shift ediff-wide-display-p ediff-wide-display-orig-parameters ediff-wide-display-frame ediff-make-wide-display-function ediff-control-frame ediff-prefer-iconified-control-frame
+  (defun . ediff-get-window-by-clicking)
+  (defun . ediff-select-lowest-window)
+  (defun . ediff-setup-windows)
+  (defun . ediff-setup-windows-plain)
+  (defun . ediff-setup-windows-plain-merge)
+  (defun . ediff-setup-windows-plain-compare)
+  (defun . ediff-setup-windows-multiframe)
+  (defun . ediff-setup-windows-multiframe-merge)
+  (defun . ediff-setup-windows-multiframe-compare)
+  (defun . ediff-skip-unsuitable-frames)
+  (defun . ediff-frame-has-dedicated-windows)
+  (defun . ediff-window-ok-for-display)
+  (defun . ediff-setup-control-frame)
+  (defun . ediff-destroy-control-frame)
+  (defun . ediff-make-frame-position)
+  (defun . ediff-xemacs-select-frame-hook)
+  (defun . ediff-make-wide-display)
+  (defun . ediff-refresh-mode-lines)
+  (defun . ediff-refresh-control-frame)
+  (defun . ediff-make-narrow-control-buffer-id)
+  (defun . ediff-make-base-title)
+  (defun . ediff-make-wide-control-buffer-id)
+  (defun . ediff-get-visible-buffer-window)
+  (defun . ediff-keep-window-config)
+  (provide . ediff-wind))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-help.elc"
+  (require . ediff-init)
+  ediff-long-help-message-head ediff-long-help-message-tail ediff-long-help-message-compare3 ediff-long-help-message-compare2 ediff-long-help-message-narrow2 ediff-long-help-message-word-mode ediff-long-help-message-merge ediff-long-help-message ediff-brief-message-string ediff-brief-help-message ediff-brief-help-message-function ediff-long-help-message-function ediff-use-long-help-message ediff-help-message ediff-help-region-map
+  (defun . ediff-set-help-overlays)
+  (defun . ediff-help-for-quick-help)
+  (defun . ediff-help-message-line-length)
+  (defun . ediff-indent-help-message)
+  (defun . ediff-set-help-message)
+  (t . ediff-customize)
+  (defun . ediff-customize)
+  (provide . ediff-help))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-mult.elc"
+  (provide . ediff-mult)
+  (require . ediff-init)
+  ediff-meta-buffer ediff-parent-meta-buffer ediff-registry-buffer ediff-meta-buffer-brief-message ediff-meta-buffer-brief-message ediff-meta-buffer-verbose-message ediff-meta-buffer-verbose-message ediff-meta-buffer-map ediff-dir-diffs-buffer-map ediff-meta-action-function ediff-meta-redraw-function ediff-session-action-function ediff-metajob-name ediff-meta-diff-buffer ediff-recurse-to-subdirectories ediff-filtering-regexp-history ediff-default-filtering-regexp ediff-meta-list ediff-meta-session-number ediff-dir-difference-list ediff-dir-diffs-buffer ediff-session-registry ediff-meta-truncate-filenames ediff-meta-mode-hook ediff-registry-setup-hook ediff-before-session-group-setup-hooks ediff-after-session-group-setup-hook ediff-quit-session-group-hook ediff-show-registry-hook ediff-show-session-group-hook ediff-meta-buffer-keymap-setup-hook ediff-meta-patchbufer
+  (defun . ediff-get-group-buffer)
+  (defun . ediff-get-group-regexp)
+  (defun . ediff-get-group-objA)
+  (defun . ediff-get-group-objB)
+  (defun . ediff-get-group-objC)
+  (defun . ediff-get-group-merge-autostore-dir)
+  (defun . ediff-get-group-comparison-func)
+  (defun . ediff-get-session-buffer)
+  (defun . ediff-get-session-status)
+  (defun . ediff-set-session-status)
+  (defun . ediff-get-session-objA)
+  (defun . ediff-get-session-objB)
+  (defun . ediff-get-session-objC)
+  (defun . ediff-get-session-objA-name)
+  (defun . ediff-get-session-objB-name)
+  (defun . ediff-get-session-objC-name)
+  (defun . ediff-get-file-eqstatus)
+  (defun . ediff-set-file-eqstatus)
+  (defun . ediff-make-new-meta-list-element)
+  (defun . ediff-make-new-meta-list-header)
+  (defun . ediff-get-session-activity-marker)
+  (defun . ediff-meta-session-p)
+  ediff-verbose-help-enabled
+  (defun . ediff-toggle-verbose-help-meta-buffer)
+  (defun . ediff-setup-meta-map)
+  (defun . ediff-meta-mode)
+  (defun . ediff-next-meta-item)
+  (defun . ediff-next-meta-item1)
+  (defun . ediff-previous-meta-item)
+  (defun . ediff-previous-meta-item1)
+  (defun . ediff-add-slash-if-directory)
+  (defun . ediff-toggle-filename-truncation)
+  ediff-membership-code1 ediff-membership-code2 ediff-membership-code3 ediff-product-of-memcodes
+  (defun . ediff-intersect-directories)
+  (defun . ediff-get-directory-files-under-revision)
+  (defun . ediff-prepare-meta-buffer)
+  (defun . ediff-insert-session-activity-marker-in-meta-buffer)
+  (defun . ediff-insert-session-status-in-meta-buffer)
+  (defun . ediff-replace-session-activity-marker-in-meta-buffer)
+  (defun . ediff-replace-session-status-in-meta-buffer)
+  (defun . ediff-insert-session-info-in-meta-buffer)
+  (defun . ediff-redraw-directory-group-buffer)
+  (defun . ediff-update-markers-in-dir-meta-buffer)
+  (defun . ediff-update-session-marker-in-dir-meta-buffer)
+  (defun . ediff-problematic-session-p)
+  (defun . ediff-meta-insert-file-info1)
+  ediff-months
+  (defun . ediff-fill-leading-zero)
+  (defun . ediff-format-date)
+  (defun . ediff-insert-dirs-in-meta-buffer)
+  (defun . ediff-draw-dir-diffs)
+  (defun . ediff-bury-dir-diffs-buffer)
+  (defun . ediff-show-dir-diffs)
+  (defun . ediff-dir-diff-copy-file)
+  (defun . ediff-up-meta-hierarchy)
+  (defun . ediff-redraw-registry-buffer)
+  (defun . ediff-set-meta-overlay)
+  (defun . ediff-mark-for-hiding-at-pos)
+  (defun . ediff-mark-session-for-hiding)
+  (defun . ediff-mark-for-operation-at-pos)
+  (defun . ediff-mark-session-for-operation)
+  (defun . ediff-hide-marked-sessions)
+  (defun . ediff-operate-on-marked-sessions)
+  (defun . ediff-append-custom-diff)
+  (defun . ediff-collect-custom-diffs)
+  (defun . ediff-meta-show-patch)
+  (defun . ediff-filegroup-action)
+  (defun . ediff-registry-action)
+  (defun . ediff-show-meta-buffer)
+  (defun . ediff-show-current-session-meta-buffer)
+  (defun . ediff-show-meta-buff-from-registry)
+  (t . ediff-show-registry)
+  (defun . ediff-show-registry)
+  (defun . eregistry)
+  (defun . ediff-update-meta-buffer)
+  (defun . ediff-update-registry)
+  (defun . ediff-cleanup-meta-buffer)
+  (defun . ediff-safe-to-quit)
+  (defun . ediff-quit-meta-buffer)
+  (defun . ediff-dispose-of-meta-buffer)
+  (defun . ediff-get-meta-info)
+  (defun . ediff-get-meta-overlay-at-pos)
+  (defun . ediff-get-session-number-at-pos)
+  (defun . ediff-next-meta-overlay-start)
+  (defun . ediff-previous-meta-overlay-start)
+  (defun . ediff-patch-file-form-meta)
+  (defun . ediff-unmark-all-for-operation)
+  (defun . ediff-unmark-all-for-hiding)
+  (defun . ediff-meta-mark-equal-files)
+  (defun . ediff-mark-if-equal))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-init.elc" ediff-force-faces
+  (defun . ediff-device-type)
+  (defun . ediff-window-display-p)
+  (defun . ediff-has-face-support-p)
+  (defun . ediff-has-toolbar-support-p)
+  (defun . ediff-has-gutter-support-p)
+  (defun . ediff-use-toolbar-p)
+  (defun . ediff-defvar-local)
+  ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer ediff-temp-indirect-buffer ediff-buffer-alist ediff-buffer-alist
+  (defun . ediff-odd-p)
+  (defun . ediff-buffer-live-p)
+  (defun . ediff-get-buffer)
+  (defun . ediff-get-value-according-to-buffer-type)
+  (defun . ediff-char-to-buftype)
+  (defun . ediff-get-symbol-from-alist)
+  ediff-difference-vector-alist ediff-difference-vector-alist
+  (defun . ediff-get-difference)
+  (defun . ediff-no-fine-diffs-p)
+  (defun . ediff-get-diff-overlay-from-diff-record)
+  (defun . ediff-get-diff-overlay)
+  (defun . ediff-get-fine-diff-vector-from-diff-record)
+  (defun . ediff-set-fine-diff-vector)
+  (defun . ediff-get-state-of-diff)
+  (defun . ediff-set-state-of-diff)
+  (defun . ediff-get-state-of-merge)
+  (defun . ediff-set-state-of-merge)
+  (defun . ediff-get-state-of-ancestor)
+  (defun . ediff-mark-diff-as-space-only)
+  (defun . ediff-get-fine-diff-vector)
+  (defun . ediff-with-current-buffer)
+  (defun . ediff-multiframe-setup-p)
+  (defun . ediff-narrow-control-frame-p)
+  (defun . ediff-3way-comparison-job)
+  ediff-3way-comparison-job
+  (defun . ediff-merge-job)
+  ediff-merge-job
+  (defun . ediff-patch-job)
+  (defun . ediff-merge-with-ancestor-job)
+  ediff-merge-with-ancestor-job
+  (defun . ediff-3way-job)
+  ediff-3way-job
+  (defun . ediff-diff3-job)
+  ediff-diff3-job
+  (defun . ediff-windows-job)
+  ediff-windows-job
+  (defun . ediff-word-mode-job)
+  ediff-word-mode-job
+  (defun . ediff-narrow-job)
+  ediff-narrow-job
+  (defun . ediff-ancestor-metajob)
+  (defun . ediff-revision-metajob)
+  (defun . ediff-patch-metajob)
+  (defun . ediff-one-filegroup-metajob)
+  (defun . ediff-collect-diffs-metajob)
+  (defun . ediff-merge-metajob)
+  (defun . ediff-metajob3)
+  (defun . ediff-comparison-metajob3)
+  (defun . ediff-in-control-buffer-p)
+  (defun . ediff-barf-if-not-control-buffer)
+  ediff-before-setup-hook ediff-before-setup-windows-hook ediff-after-setup-windows-hook ediff-before-setup-control-frame-hook ediff-after-setup-control-frame-hook ediff-startup-hook ediff-select-hook ediff-unselect-hook ediff-prepare-buffer-hook ediff-load-hook ediff-mode-hook ediff-keymap-setup-hook ediff-display-help-hook ediff-suspend-hook ediff-quit-hook ediff-cleanup-hook ediff-KILLED-VITAL-BUFFER ediff-KILLED-VITAL-BUFFER ediff-NO-DIFFERENCES ediff-NO-DIFFERENCES ediff-BAD-DIFF-NUMBER ediff-BAD-DIFF-NUMBER ediff-BAD-INFO ediff-BAD-INFO ediff-skip-diff-region-function ediff-hide-regexp-matches-function ediff-focus-on-regexp-matches-function ediff-regexp-focus-A ediff-regexp-focus-B ediff-regexp-focus-C ediff-focus-regexp-connective ediff-regexp-hide-A ediff-regexp-hide-B ediff-regexp-hide-C ediff-hide-regexp-connective ediff-killed-diffs-alist ediff-syntax-table ediff-before-flag-bol ediff-after-flag-eol ediff-before-flag-mol ediff-after-flag-mol ediff-use-faces ediff-use-faces ediff-word-mode ediff-job-name ediff-narrow-bounds ediff-wide-bounds ediff-visible-bounds ediff-start-narrowed ediff-quit-widened ediff-keep-variants ediff-highlight-all-diffs ediff-highlight-all-diffs ediff-control-buffer-suffix ediff-control-buffer-number ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C ediff-buffer-values-orig-Ancestor ediff-buffer-values-orig-alist ediff-buffer-values-orig-alist ediff-protected-variables ediff-protected-variables ediff-difference-vector-A ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor ediff-difference-vector-alist ediff-difference-vector-alist ediff-state-of-merge ediff-current-difference ediff-number-of-differences ediff-diff-buffer ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-msg-buffer ediff-error-buffer ediff-debug-buffer ediff-this-buffer-ediff-sessions ediff-disturbed-overlays ediff-shadow-overlay-priority ediff-version-control-package ediff-coding-system-for-read ediff-coding-system-for-write
+  (defun . ediff-read-event)
+  (defun . ediff-overlayp)
+  (defun . ediff-make-overlay)
+  (defun . ediff-delete-overlay)
+  (defun . ediff-check-version)
+  (defun . ediff-color-display-p)
+  ediff-highlighting-style
+  (defun . ediff-valid-color-p)
+  (defun . ediff-get-face)
+  (defun . ediff-display-pixel-width)
+  (defun . ediff-display-pixel-height)
+  ediff-current-diff-overlay-alist ediff-current-diff-overlay-alist ediff-current-diff-face-alist ediff-current-diff-face-alist
+  (defun . ediff-set-overlay-face)
+  (defun . ediff-region-help-echo)
+  (defun . ediff-set-face-pixmap)
+  (defun . ediff-hide-face)
+  (defface . ediff-current-diff-A)
+  ediff-current-diff-face-A
+  (defface . ediff-current-diff-B)
+  ediff-current-diff-face-B
+  (defface . ediff-current-diff-C)
+  ediff-current-diff-face-C
+  (defface . ediff-current-diff-Ancestor)
+  ediff-current-diff-face-Ancestor
+  (defface . ediff-fine-diff-A)
+  ediff-fine-diff-face-A
+  (defface . ediff-fine-diff-B)
+  ediff-fine-diff-face-B
+  (defface . ediff-fine-diff-C)
+  ediff-fine-diff-face-C
+  (defface . ediff-fine-diff-Ancestor)
+  ediff-fine-diff-face-Ancestor stipple-pixmap
+  (defface . ediff-even-diff-A)
+  ediff-even-diff-face-A
+  (defface . ediff-even-diff-B)
+  ediff-even-diff-face-B
+  (defface . ediff-even-diff-C)
+  ediff-even-diff-face-C
+  (defface . ediff-even-diff-Ancestor)
+  ediff-even-diff-face-Ancestor ediff-even-diff-face-alist ediff-even-diff-face-alist
+  (defface . ediff-odd-diff-A)
+  ediff-odd-diff-face-A
+  (defface . ediff-odd-diff-B)
+  ediff-odd-diff-face-B
+  (defface . ediff-odd-diff-C)
+  ediff-odd-diff-face-C
+  (defface . ediff-odd-diff-Ancestor)
+  ediff-odd-diff-face-Ancestor ediff-odd-diff-face-alist ediff-odd-diff-face-alist ediff-fine-diff-face-alist ediff-fine-diff-face-alist ediff-current-diff-overlay-A ediff-current-diff-overlay-B ediff-current-diff-overlay-C ediff-current-diff-overlay-Ancestor
+  (defun . ediff-highest-priority)
+  ediff-toggle-read-only-function ediff-make-buffers-readonly-at-startup ediff-verbose-p ediff-autostore-merges ediff-merge-store-file ediff-merge-filename-prefix ediff-no-emacs-help-in-control-buffer ediff-temp-file-prefix ediff-temp-file-mode ediff-metachars ediff-H-glyph ediff-temp-file-A ediff-temp-file-B ediff-temp-file-C
+  (defun . ediff-file-remote-p)
+  (defun . ediff-listable-file)
+  (defun . ediff-frame-unsplittable-p)
+  (defun . ediff-get-next-window)
+  (defun . ediff-kill-buffer-carefully)
+  (defun . ediff-background-face)
+  (defun . ediff-paint-background-regions-in-one-buffer)
+  (defun . ediff-paint-background-regions)
+  (defun . ediff-clear-fine-diff-vector)
+  (defun . ediff-clear-fine-differences-in-one-buffer)
+  (defun . ediff-clear-fine-differences)
+  (defun . ediff-mouse-event-p)
+  (defun . ediff-key-press-event-p)
+  (defun . ediff-event-point)
+  (defun . ediff-event-buffer)
+  (defun . ediff-event-key)
+  (defun . ediff-frame-iconified-p)
+  (defun . ediff-window-visible-p)
+  (defun . ediff-frame-char-width)
+  (defun . ediff-reset-mouse)
+  (defun . ediff-spy-after-mouse)
+  (defun . ediff-user-grabbed-mouse)
+  (defun . ediff-frame-char-height)
+  (defun . ediff-overlay-start)
+  (defun . ediff-overlay-end)
+  (defun . ediff-empty-overlay-p)
+  (defun . ediff-overlay-buffer)
+  (defun . ediff-overlay-get)
+  (defun . ediff-move-overlay)
+  (defun . ediff-overlay-put)
+  (defun . ediff-abbreviate-file-name)
+  (defun . ediff-strip-last-dir)
+  (defun . ediff-truncate-string-left)
+  (defun . ediff-nonempty-string-p)
+  (defun . ediff-abbrev-jobname)
+  (defun . ediff-strip-mode-line-format)
+  (defun . ediff-valid-difference-p)
+  (defun . ediff-show-all-diffs)
+  (defun . ediff-message-if-verbose)
+  (defun . ediff-file-attributes)
+  (defun . ediff-file-size)
+  (defun . ediff-file-modtime)
+  (defun . ediff-convert-standard-filename)
+  (defun . ediff-with-syntax-table)
+  (provide . ediff-init))
+ ("/home/hobbes/nxhtml/nxhtml/html-imenu.el" html-imenu:version
+  (require . imenu)
+  html-imenu-title html-imenu-regexp
+  (defun . html-imenu-index)
+  (defun . html-imenu-setup)
+  (defun . html-imenu-update-menubar)
+  (defun . html-imenu-update-menubar-1)
+  (provide . html-imenu))
+ ("/usr/share/emacs/23.0.93/lisp/imenu.elc" imenu-use-markers imenu-max-item-length imenu-auto-rescan imenu-auto-rescan-maxout imenu-always-use-completion-buffer-p imenu-use-popup-menu imenu-eager-completion-buffer imenu-after-jump-hook imenu-sort-function imenu-max-items imenu-space-replacement imenu-level-separator imenu-generic-expression imenu-create-index-function imenu-prev-index-position-function imenu-extract-index-name-function imenu-name-lookup-function imenu-default-goto-function
+  (defun . imenu--subalist-p)
+  (defun . imenu-progress-message)
+  (defun . imenu-example--name-and-position)
+  (defun . imenu-example--lisp-extract-index-name)
+  (defun . imenu-example--create-lisp-index)
+  imenu-example--function-name-regexp-c
+  (defun . imenu-example--create-c-index)
+  imenu--rescan-item imenu--rescan-item imenu--index-alist imenu--last-menubar-index-alist imenu--history-list
+  (defun . imenu--sort-by-name)
+  (defun . imenu--sort-by-position)
+  (defun . imenu--relative-position)
+  (defun . imenu--split)
+  (defun . imenu--split-menu)
+  (defun . imenu--split-submenus)
+  (defun . imenu--truncate-items)
+  (defun . imenu--make-index-alist)
+  (defun . imenu--cleanup)
+  (defun . imenu--create-keymap)
+  (defun . imenu--in-alist)
+  imenu-syntax-alist
+  (defun . imenu-default-create-index-function)
+  imenu-case-fold-search
+  (defun . imenu--generic-function)
+  (defun . imenu-find-default)
+  (defun . imenu--completion-buffer)
+  (defun . imenu--mouse-menu)
+  (defun . imenu-choose-buffer-index)
+  (t . imenu-add-to-menubar)
+  (defun . imenu-add-to-menubar)
+  (t . imenu-add-menubar-index)
+  (defun . imenu-add-menubar-index)
+  imenu-buffer-menubar imenu-menubar-modified-tick
+  (defun . imenu-update-menubar)
+  (defun . imenu--menubar-select)
+  (defun . imenu-default-goto-function)
+  (t . imenu)
+  (defun . imenu)
+  (provide . imenu))
+ ("/home/hobbes/nxhtml/util/popcmp.el"
+  (require . ourcomments-util)
+  popcmp-popup-completion
+  (defun . popcmp-popup-completion-toggle)
+  popcmp-short-help-beside-alts
+  (defun . popcmp-short-help-beside-alts-toggle)
+  popcmp-group-alternatives
+  (defun . popcmp-group-alternatives-toggle)
+  (defun . popcmp-getsets)
+  (defun . popcmp-getset-alts)
+  popcmp-completing-with-help
+  (defun . popcmp-add-help)
+  (defun . popcmp-remove-help)
+  (defun . popcmp-completing-read-nopop)
+  (defun . popcmp-completing-read-pop)
+  (defun . popcmp-completing-read)
+  popcmp-mark-completing-ovl
+  (defun . popcmp-mark-completing)
+  (defun . popcmp-unmark-completing)
+  (provide . popcmp))
+ ("/home/hobbes/nxhtml/nxhtml/rngalt.el" rngalt:version
+  (require . rng-valid)
+  (require . rng-nxml)
+  rngalt-complete-first-try rngalt-complete-last-try rngalt-completing-read-tag rngalt-completing-read-attribute-name rngalt-completing-read-attribute-value
+  (defun . rngalt-finish-element)
+  (defun . rngalt-finish-element-1)
+  (defun . rngalt-complete)
+  (defun . rngalt-validate)
+  rngalt-region-ovl rngalt-region-prepared
+  (defun . rngalt-complete-tag-region-prepare)
+  (defun . rngalt-complete-tag-region-cleanup)
+  (defun . rngalt-complete-tag-region-finish)
+  (defun . rngalt-complete-tag)
+  rngalt-complete-tag-hooks
+  (defun . rngalt-complete-attribute-name)
+  (defun . rngalt-complete-attribute-value)
+  (defun . rngalt-complete-before-point)
+  (defun . rngalt-get-missing-required-attr)
+  rngalt-validation-header rngalt-current-schema-file-name rngalt-validation-header-overlay rngalt-major-mode
+  (defun . rngalt-after-change-major)
+  rngalt-validation-header-keymap
+  (defun . rngalt-update-validation-header-overlay)
+  (defun . rngalt-update-validation-header-overlay-everywhere)
+  rngalt-display-validation-header
+  (defun . rngalt-display-validation-header-toggle)
+  rngalt-minimal-validation-header
+  (defun . rngalt-minimal-validation-header-toggle)
+  (defface . rngalt-validation-header-top)
+  (defface . rngalt-validation-header-bottom)
+  (require . bytecomp)
+  (defun . advice-compilation)
+  (t . rngalt-set-validation-header)
+  (defun . rngalt-set-validation-header)
+  (defun . rngalt-reapply-validation-header)
+  (defun . rngalt-get-validation-header-buffer)
+  (defun . rngalt-get-state-after)
+  (defun . rngalt-show-validation-header)
+  (defun . rngalt-update-validation-header-buffer)
+  (provide . rngalt))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-nxml.elc"
+  (require . easymenu)
+  (require . xmltok)
+  (require . nxml-util)
+  (require . nxml-ns)
+  (require . rng-match)
+  (require . rng-util)
+  (require . rng-valid)
+  (require . nxml-mode)
+  (require . rng-loc)
+  rng-nxml-auto-validate-flag rng-preferred-prefix-alist rng-complete-end-tags-after-< rng-nxml-easy-menu
+  (t . rng-nxml-mode-init)
+  (defun . rng-nxml-mode-init)
+  rng-tag-history rng-attribute-name-history rng-attribute-value-history rng-complete-target-names rng-complete-name-attribute-flag rng-complete-extra-strings
+  (defun . rng-complete)
+  rng-in-start-tag-name-regex rng-in-start-tag-name-regex
+  (defun . rng-complete-tag)
+  rng-in-end-tag-name-regex rng-in-end-tag-name-regex
+  (defun . rng-complete-end-tag)
+  rng-in-attribute-regex rng-in-attribute-regex rng-undeclared-prefixes
+  (defun . rng-complete-attribute-name)
+  rng-in-attribute-value-regex rng-in-attribute-value-regex
+  (defun . rng-complete-attribute-value)
+  (defun . rng-possible-namespace-uris)
+  rng-qname-regexp rng-qname-regexp
+  (defun . rng-qname-p)
+  (defun . rng-expand-qname)
+  (defun . rng-start-tag-expand-recover)
+  (defun . rng-split-qname)
+  (defun . rng-in-mixed-content-p)
+  (defun . rng-set-state-after)
+  (defun . rng-adjust-state-for-attribute)
+  (defun . rng-find-undeclared-prefixes)
+  (defun . rng-prune-attribute-at)
+  (defun . rng-adjust-state-for-attribute-value)
+  (defun . rng-complete-qname-function)
+  (defun . rng-generate-qname-list)
+  (defun . rng-get-preferred-unused-prefix)
+  (defun . rng-strings-to-completion-alist)
+  (provide . rng-nxml))
+ ("/usr/share/emacs/23.0.93/lisp/loadhist.elc"
+  (defun . feature-symbols)
+  (defun . feature-file)
+  (defun . file-loadhist-lookup)
+  (defun . file-provides)
+  (defun . file-requires)
+  (defun . file-set-intersect)
+  (defun . file-dependents)
+  (defun . read-feature)
+  loadhist-hook-functions unload-feature-special-hooks unload-function-defs-list unload-hook-features-list
+  (t . unload-feature)
+  (defun . unload-feature)
+  (provide . loadhist))
+ ("/home/hobbes/nxhtml/util/appmenu-fold.el" appmenu-fold:version
+  (require . fold-dwim)
+  (require . appmenu)
+  (defun . appmenu-fold-no-hs-minor-mode)
+  (defun . appmenu-fold-no-outline-minor-mode)
+  (defun . appmenu-fold-setup)
+  (provide . appmenu-fold))
+ ("/home/hobbes/nxhtml/related/fold-dwim.el" fold-dwim:version
+  (require . outline)
+  (require . hideshow)
+  fold-dwim-outline-style-default fold-dwim-toggle-selective-display
+  (defun . fold-dwim-maybe-recenter)
+  (defun . fold-dwim-toggle-selective-display)
+  (defun . fold-dwim-hide-all)
+  (defun . fold-dwim-show-all)
+  (defun . fold-dwim-hide)
+  (defun . fold-dwim-show)
+  (defun . fold-dwim-toggle)
+  (defun . fold-dwim-auctex-env-or-macro)
+  (defun . fold-dwim-outline-invisible-p)
+  (defun . fold-dwim-outline-nested-p)
+  (provide . fold-dwim))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/hideshow.elc" hs-hide-comments-when-hiding-all hs-minor-mode-hook hs-isearch-open hs-special-modes-alist hs-hide-all-non-comment-function hs-allow-nesting hs-hide-hook hs-show-hook hs-set-up-overlay hs-minor-mode hs-minor-mode-map hs-minor-mode-menu
+  (defun . hs-minor-mode-menu)
+  hs-c-start-regexp hs-block-start-regexp hs-block-start-mdata-select hs-block-end-regexp hs-forward-sexp-func hs-adjust-block-beginning hs-headline
+  (defun . hs-discard-overlays)
+  (defun . hs-make-overlay)
+  (defun . hs-isearch-show)
+  (defun . hs-isearch-show-temporary)
+  (defun . hs-forward-sexp)
+  (defun . hs-hide-comment-region)
+  (defun . hs-hide-block-at-point)
+  (defun . hs-inside-comment-p)
+  (defun . hs-grok-mode-type)
+  (defun . hs-find-block-beginning)
+  (defun . hs-hide-level-recursive)
+  (defun . hs-life-goes-on)
+  (defun . hs-overlay-at)
+  (defun . hs-already-hidden-p)
+  (defun . hs-c-like-adjust-block-beginning)
+  (defun . hs-hide-all)
+  (defun . hs-show-all)
+  (defun . hs-hide-block)
+  (defun . hs-show-block)
+  (defun . hs-hide-level)
+  (defun . hs-toggle-hiding)
+  (defun . hs-mouse-toggle-hiding)
+  (defun . hs-hide-initial-comment-block)
+  hs-minor-mode
+  (t . hs-minor-mode)
+  (defun . hs-minor-mode)
+  (t . turn-off-hideshow)
+  (defun . turn-off-hideshow)
+  (provide . hideshow))
+ ("/usr/share/emacs/23.0.93/lisp/outline.elc" outline-regexp outline-heading-end-regexp outline-mode-prefix-map outline-mode-menu-bar-map outline-minor-mode-menu-bar-map outline-mode-map outline-font-lock-keywords
+  (defface . outline-1)
+  (defface . outline-2)
+  (defface . outline-3)
+  (defface . outline-4)
+  (defface . outline-5)
+  (defface . outline-6)
+  (defface . outline-7)
+  (defface . outline-8)
+  outline-font-lock-faces
+  (defun . outline-font-lock-face)
+  outline-view-change-hook outline-mode-hook outline-blank-line outline-mode-map outline-mode-syntax-table outline-mode-abbrev-table outline-mode-abbrev-table
+  (t . outline-mode)
+  (defun . outline-mode)
+  outline-minor-mode-prefix outline-minor-mode
+  (t . outline-minor-mode)
+  (defun . outline-minor-mode)
+  outline-minor-mode-map outline-level outline-heading-alist
+  (defun . outline-level)
+  (defun . outline-next-preface)
+  (defun . outline-next-heading)
+  (defun . outline-previous-heading)
+  (defun . outline-invisible-p)
+  (defun . outline-visible)
+  (defun . outline-back-to-heading)
+  (defun . outline-on-heading-p)
+  (defun . outline-insert-heading)
+  (defun . outline-invent-heading)
+  (defun . outline-promote)
+  (defun . outline-demote)
+  (defun . outline-head-from-level)
+  (defun . outline-map-region)
+  (defun . outline-move-subtree-up)
+  (defun . outline-move-subtree-down)
+  (defun . outline-end-of-heading)
+  (defun . outline-next-visible-heading)
+  (defun . outline-previous-visible-heading)
+  (defun . outline-mark-subtree)
+  outline-isearch-open-invisible-function
+  (defun . outline-flag-region)
+  (defun . outline-reveal-toggle-invisible)
+  (defun . outline-isearch-open-invisible)
+  (defun . hide-entry)
+  (defun . show-entry)
+  (defun . hide-body)
+  (defun . hide-region-body)
+  (defun . show-all)
+  (defun . hide-subtree)
+  (defun . hide-leaves)
+  (defun . show-subtree)
+  (defun . outline-show-heading)
+  (defun . hide-sublevels)
+  (defun . hide-other)
+  (defun . outline-toggle-children)
+  (defun . outline-flag-subtree)
+  (defun . outline-end-of-subtree)
+  (defun . show-branches)
+  (defun . show-children)
+  (defun . outline-up-heading)
+  (defun . outline-forward-same-level)
+  (defun . outline-get-next-sibling)
+  (defun . outline-backward-same-level)
+  (defun . outline-get-last-sibling)
+  (defun . outline-headers-as-kill)
+  (provide . outline)
+  (provide . noutline))
+ ("/home/hobbes/nxhtml/util/mumamo.el" mumamo:version
+  (require . cl)
+  (require . flyspell)
+  (require . mlinks)
+  (require . nxml-mode)
+  (require . rng-valid)
+  (require . sgml-mode)
+  msgtrc-buffer
+  (defun . msgtrc)
+  mumamo-message-file-buffer
+  (defun . mumamo-msgtrc-to-file)
+  (defun . mumamo-msgfntfy)
+  (defun . mumamo-msgindent)
+  mumamo-display-error-lwarn mumamo-display-error-stop
+  (defun . mumamo-message-with-face)
+  (defun . mumamo-show-report-message)
+  (defun . mumamo-display-error)
+  (defun . mumamo-debug-to-backtrace)
+  mumamo-use-condition-case mumamo-debugger
+  (defun . mumamo-condition-case)
+  mumamo-warned-once
+  (defun . mumamo-warn-once)
+  (defun . mumamo-add-help-tabs)
+  (defun . mumamo-insert-describe-button)
+  (defface . mumamo-border-face-in)
+  (defface . mumamo-border-face-out)
+  mumamo-set-major-mode-delay
+  (defface . mumamo-background-chunk-submode)
+  mumamo-background-chunk-major
+  (defface . mumamo-background-chunk-major)
+  mumamo-background-chunk-submode mumamo-background-colors
+  (defun . mumamo-background-color)
+  mumamo-chunk-coloring mumamo-submode-indent-offset mumamo-submode-indent-offset-0 mumamo-major-mode-indent-specials mumamo-check-chunk-major-same mumamo-major-modes
+  (defun . mumamo-jit-lock-function)
+  (defun . mumamo-jit-lock-register)
+  (defun . mumamo-jit-with-buffer-unmodified)
+  (defun . mumamo-with-buffer-prepared-for-jit-lock)
+  mumamo-find-chunks-timer mumamo-find-chunk-delay
+  (defun . mumamo-stop-find-chunks-timer)
+  (defun . mumamo-start-find-chunks-timer)
+  (defun . mumamo-find-chunks-in-timer)
+  mumamo-last-chunk mumamo-last-new-chunk mumamo-last-chunk-change-pos mumamo-old-chunks mumamo-find-chunk-is-active mumamo-use-new-chunks
+  (defun . mumamo-toggle-use-new-chunks)
+  mumamo-use-both-chunks
+  (defun . mumamo-toggle-use-both-chunks)
+  (defun . mumamo-make-old-chunks)
+  (defun . mumamo-make-new-chunks)
+  (defun . mumamo-toggle-and-normal-mode-and-what-at-cursor)
+  mumamo-find-chunks-level
+  (defun . mumamo-find-chunks)
+  (defun . mumamo-find-chunk-after-change)
+  (defun . mumamo-after-change)
+  (defun . mumamo-jit-lock-after-change)
+  (defun . mumamo-jit-lock-after-change-1)
+  (defun . mumamo-mark-chunk)
+  (defun . mumamo-save-buffer-state)
+  (t . mumamo-mark-for-refontification)
+  (defun . mumamo-mark-for-refontification)
+  mumamo-internal-major-modes-alist mumamo-ppss-last-chunk mumamo-ppss-last-major mumamo-major-mode-substitute
+  (defun . mumamo-get-major-mode-substitute)
+  (defun . mumamo-with-major-mode-setup)
+  (defun . mumamo-with-major-mode-fontification)
+  (defun . mumamo-with-major-mode-indentation)
+  (defun . mumamo-assert-fontified-t)
+  (defun . mumamo-do-fontify)
+  (defun . mumamo-do-unfontify)
+  (defun . mumamo-fontify-region-with)
+  (defun . mumamo-unfontify-region-with)
+  (defun . mumamo-unfontify-buffer)
+  (defun . mumamo-fontify-buffer)
+  (defun . mumamo-unfontify-chunk)
+  mumamo-just-changed-major
+  (defun . mumamo-fontify-region)
+  mumamo-dbg-pretend-fontified
+  (defun . mumamo-exc-mode)
+  (defun . mumamo-chunk-value-set-min)
+  (defun . mumamo-chunk-value-set-max)
+  (defun . mumamo-chunk-value-set-syntax-min)
+  (defun . mumamo-chunk-value-set-syntax-max)
+  (defun . mumamo-chunk-value-min)
+  (defun . mumamo-chunk-value-max)
+  (defun . mumamo-chunk-value-major)
+  (defun . mumamo-chunk-value-syntax-min)
+  (defun . mumamo-chunk-value-syntax-max)
+  (defun . mumamo-chunk-value-parseable-by)
+  (defun . mumamo-chunk-value-fw-exc-fun)
+  mumamo-chunks-to-remove
+  (defun . mumamo-flush-chunk-syntax)
+  (defun . mumamo-fontify-region-1)
+  (defun . mumamo-remove-old-overlays)
+  mumamo-known-buffer-local-fontifications mumamo-irrelevant-buffer-local-vars
+  (defun . mumamo-get-relevant-buffer-local-vars)
+  mumamo-major-modes-local-maps
+  (defun . mumamo-fetch-major-mode-setup)
+  (defun . mumamo-bad-mode)
+  (defun . mumamo-get-major-mode-setup)
+  (defun . mumamo-remove-chunk-overlays)
+  (defun . mumamo-remove-all-chunk-overlays)
+  (defun . mumamo-create-chunk-values-at)
+  (defun . mumamo-define-no-mode)
+  (defun . mumamo-major-mode-from-modespec)
+  (defun . mumamo-chunk-equal-chunk-values)
+  (defun . mumamo-create-chunk-from-chunk-values)
+  (defun . mumamo-create-chunk-at)
+  (defun . mumamo-get-existing-chunk-at)
+  (defun . mumamo-get-existing-new-chunk-at)
+  (defun . mumamo-get-chunk-save-buffer-state)
+  (defun . mumamo-chunk-major-mode)
+  (defun . mumamo-chunk-syntax-min)
+  (defun . mumamo-chunk-syntax-max)
+  (defun . mumamo-syntax-maybe-completable)
+  mumamo-current-chunk-family
+  (defun . mumamo-main-major-mode)
+  (defun . mumamo-chunk-start-fw-str)
+  (defun . mumamo-chunk-start-fw-re)
+  (defun . mumamo-chunk-start-fw-str-inc)
+  (defun . mumamo-chunk-start-bw-str)
+  (defun . mumamo-chunk-start-bw-re)
+  (defun . mumamo-chunk-start-bw-str-inc)
+  (defun . mumamo-chunk-end-fw-str)
+  (defun . mumamo-chunk-end-fw-re)
+  (defun . mumamo-chunk-end-fw-str-inc)
+  (defun . mumamo-chunk-end-bw-str)
+  (defun . mumamo-chunk-end-bw-re)
+  (defun . mumamo-chunk-end-bw-str-inc)
+  mumamo-string-syntax-table
+  (defun . mumamo-guess-in-string)
+  mumamo-find-possible-chunk-new
+  (defun . mumamo-find-possible-chunk)
+  (defun . mumamo-find-possible-chunk-new)
+  (defun . mumamo-find-possible-chunk-old)
+  (defun . temp-overlays-here)
+  (defun . temp-cursor-pos)
+  (defun . temp-test-new-create-chunk)
+  (defun . temp-create-last-chunk)
+  (defun . mumamo-delete-new-chunks)
+  (defun . mumamo-new-create-chunk)
+  (defun . mumamo-new-chunk-value-min)
+  (defun . mumamo-new-chunk-value-max)
+  (defun . mumamo-new-chunk-equal-chunk-values)
+  (defun . mumamo-find-next-chunk-values)
+  (defun . mumamo-valid-nxml-point)
+  (defun . mumamo-valid-nxml-chunk)
+  (defun . mumamo-end-chunk-is-valid)
+  (defun . mumamo-quick-static-chunk)
+  mumamo-unread-command-events-timer
+  (defun . mumamo-unread-command-events)
+  mumamo-idle-set-major-mode-timer
+  (defun . mumamotemp-pre-command)
+  (defun . mumamotemp-post-command)
+  (defun . mumamotemp-start)
+  (defun . mumamo-idle-set-major-mode)
+  (defun . mumamo-request-idle-set-major-mode)
+  mumamo-done-first-set-major mumamo-multi-major-mode mumamo-safe-commands-in-wrong-major
+  (defun . mumamo-set-major-pre-command)
+  (defun . mumamo-fetch-local-map)
+  (defun . mumamo-set-major-post-command)
+  (defun . mumamo-post-command-1)
+  (defun . mumamo-post-command)
+  mumamo-set-major-running
+  (defun . mumamo-change-major-function)
+  (defun . mumamo-derived-from-mode)
+  mumamo-test-add-hook mumamo-survive-hooks mumamo-survive
+  (defun . mumamo-make-variable-buffer-permanent)
+  mumamo-survive-done-by-me
+  (defun . mumamo-hook-p)
+  mumamo-major-mode mumamo-change-major-mode-no-nos mumamo-after-change-major-mode-no-nos mumamo-removed-from-hook
+  (defun . mumamo-remove-from-hook)
+  (defun . mumamo-addback-to-hooks)
+  (defun . mumamo-addback-to-hook)
+  mumamo-buffer-locals-dont-set
+  (defun . mumamo-save-most-buffer-locals)
+  mumamo-restore-most-buffer-locals-in-hook-major
+  (defun . mumamo-restore-most-buffer-locals-in-hook)
+  (defun . mumamo-restore-most-buffer-locals)
+  mumamo-buffer-locals-per-major
+  (defun . mumamo-get-hook-value)
+  (defun . mumamo-set-major)
+  (defun . mumamo-setup-local-fontification-vars)
+  (defun . mumamo-set-fontification-functions)
+  (defun . mumamo-initialize-state)
+  (defun . mumamo-turn-on-actions)
+  (defun . mumamo-turn-off-actions)
+  mumamo-turn-on-hook mumamo-change-major-mode-hook mumamo-after-change-major-mode-hook mumamo-defined-turn-on-functions
+  (defun . mumamo-describe-chunks)
+  (defun . mumamo-add-multi-keymap)
+  mumamo-map
+  (defun . define-mumamo-multi-major-mode)
+  (defun . mumamo-indent-line-function)
+  (defun . mumamo-indent-line-chunks)
+  (defun . mumamo-indent-line-function-1)
+  (defun . mumamo-indent-use-widen)
+  (defun . mumamo-indent-special-or-default)
+  (defun . mumamo-call-indent-line)
+  (defun . mumamo-indent-region-function)
+  (defun . mumamo-fill-forward-paragraph-function)
+  (defun . mumamo-fill-paragraph-function)
+  (defun . mumamo-forward-chunk)
+  (defun . mumamo-backward-chunk)
+  (defun . mumamo-flyspell-verify)
+  (defun . flyspell-mumamo-mode)
+  (require . bytecomp)
+  (defun . advice-compilation)
+  mumamo-syntax-chunk-at-pos
+  (defun . advice-compilation)
+  mumamo-syntax-ppss-major
+  (defun . advice-compilation)
+  rng-get-major-mode-chunk-function rng-valid-nxml-major-mode-chunk-function rng-end-major-mode-chunk-function
+  (defun . advice-compilation)
+  (defun . advice-compilation)
+  (defun . advice-compilation)
+  (provide . mumamo))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/byte-opt.elc"
+  (require . bytecomp)
+  (defun . byte-compile-log-lap-1)
+  (defun . byte-compile-log-lap)
+  (defun . byte-optimize-inline-handler)
+  (defun . byte-inline-lapcode)
+  (t . byte-compile-inline-expand)
+  (defun . byte-compile-inline-expand)
+  (t . byte-compile-unfold-lambda)
+  (defun . byte-compile-unfold-lambda)
+  (defun . byte-optimize-form-code-walker)
+  (defun . byte-optimize-all-constp)
+  (t . byte-optimize-form)
+  (defun . byte-optimize-form)
+  (defun . byte-optimize-body)
+  (defun . byte-compile-trueconstp)
+  (defun . byte-compile-nilconstp)
+  (defun . byte-optimize-associative-math)
+  (defun . byte-optimize-nonassociative-math)
+  (defun . byte-optimize-approx-equal)
+  (defun . byte-optimize-delay-constants-math)
+  (defun . byte-compile-butlast)
+  (defun . byte-optimize-plus)
+  (defun . byte-optimize-minus)
+  (defun . byte-optimize-multiply)
+  (defun . byte-optimize-divide)
+  (defun . byte-optimize-logmumble)
+  (defun . byte-optimize-binary-predicate)
+  (defun . byte-optimize-predicate)
+  (defun . byte-optimize-identity)
+  (defun . byte-optimize-quote)
+  (defun . byte-optimize-zerop)
+  (defun . byte-optimize-and)
+  (defun . byte-optimize-or)
+  (defun . byte-optimize-cond)
+  (defun . byte-optimize-if)
+  (defun . byte-optimize-while)
+  (defun . byte-optimize-funcall)
+  (defun . byte-optimize-apply)
+  (defun . byte-optimize-letX)
+  (defun . byte-optimize-nth)
+  (defun . byte-optimize-nthcdr)
+  (defun . byte-optimize-featurep)
+  (defun . byte-optimize-set)
+  (defun . byte-compile-splice-in-already-compiled-code)
+  byte-constref-ops byte-constref-ops
+  (defun . disassemble-offset)
+  (t . byte-decompile-bytecode)
+  (defun . byte-decompile-bytecode)
+  (defun . byte-decompile-bytecode-1)
+  byte-tagref-ops byte-tagref-ops byte-conditional-ops byte-conditional-ops byte-after-unbind-ops byte-compile-side-effect-and-error-free-ops byte-compile-side-effect-and-error-free-ops byte-compile-side-effect-free-ops byte-compile-side-effect-free-ops
+  (t . byte-optimize-lapcode)
+  (defun . byte-optimize-lapcode)
+  (provide . byte-opt))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/bytecomp.elc"
+  (require . backquote)
+  (defun . byte-compile-single-version)
+  (defun . byte-compile-version-cond)
+  emacs-lisp-file-regexp
+  (defun . byte-compiler-base-file-name)
+  (defun . byte-compile-dest-file)
+  (autoload . byte-compile-inline-expand)
+  (autoload . byte-optimize-form)
+  (autoload . byte-optimize-lapcode)
+  (autoload . byte-compile-unfold-lambda)
+  (autoload . byte-decompile-bytecode)
+  byte-compile-verbose byte-compile-compatibility byte-optimize byte-compile-delete-errors byte-compile-dynamic byte-compile-disable-print-circle byte-compile-dynamic-docstrings byte-optimize-log byte-compile-error-on-warn byte-compile-warning-types byte-compile-warnings
+  (t . byte-compile-warnings-safe-p)
+  (defun . byte-compile-warnings-safe-p)
+  (defun . byte-compile-warning-enabled-p)
+  (t . byte-compile-disable-warning)
+  (defun . byte-compile-disable-warning)
+  (t . byte-compile-enable-warning)
+  (defun . byte-compile-enable-warning)
+  byte-compile-interactive-only-functions byte-compile-not-obsolete-var byte-compile-generate-call-tree byte-compile-call-tree byte-compile-call-tree-sort byte-compile-debug byte-compile-constants byte-compile-variables byte-compile-bound-variables byte-compile-const-variables byte-compile-initial-macro-environment byte-compile-macro-environment byte-compile-function-environment byte-compile-unresolved-functions byte-compile-noruntime-functions byte-compile-tag-number byte-compile-output byte-compile-depth byte-compile-maxdepth byte-code-vector byte-stack+-info
+  (defun . byte-defop)
+  (defun . byte-extrude-byte-code-vectors)
+  byte-varref byte-varset byte-varbind byte-call byte-unbind byte-nth byte-nth byte-symbolp byte-symbolp byte-consp byte-consp byte-stringp byte-stringp byte-listp byte-listp byte-eq byte-eq byte-memq byte-memq byte-not byte-not byte-car byte-car byte-cdr byte-cdr byte-cons byte-cons byte-list1 byte-list1 byte-list2 byte-list2 byte-list3 byte-list3 byte-list4 byte-list4 byte-length byte-length byte-aref byte-aref byte-aset byte-aset byte-symbol-value byte-symbol-value byte-symbol-function byte-symbol-function byte-set byte-set byte-fset byte-fset byte-get byte-get byte-substring byte-substring byte-concat2 byte-concat2 byte-concat3 byte-concat3 byte-concat4 byte-concat4 byte-sub1 byte-sub1 byte-add1 byte-add1 byte-eqlsign byte-eqlsign byte-gtr byte-gtr byte-lss byte-lss byte-leq byte-leq byte-geq byte-geq byte-diff byte-diff byte-negate byte-negate byte-plus byte-plus byte-max byte-max byte-min byte-min byte-mult byte-mult byte-point byte-point byte-goto-char byte-goto-char byte-insert byte-insert byte-point-max byte-point-max byte-point-min byte-point-min byte-char-after byte-char-after byte-following-char byte-following-char byte-preceding-char byte-preceding-char byte-current-column byte-current-column byte-indent-to byte-indent-to byte-scan-buffer-OBSOLETE byte-scan-buffer-OBSOLETE byte-eolp byte-eolp byte-eobp byte-eobp byte-bolp byte-bolp byte-bobp byte-bobp byte-current-buffer byte-current-buffer byte-set-buffer byte-set-buffer byte-save-current-buffer byte-set-mark-OBSOLETE byte-set-mark-OBSOLETE byte-interactive-p byte-interactive-p byte-forward-char byte-forward-char byte-forward-word byte-forward-word byte-skip-chars-forward byte-skip-chars-forward byte-skip-chars-backward byte-skip-chars-backward byte-forward-line byte-forward-line byte-char-syntax byte-char-syntax byte-buffer-substring byte-buffer-substring byte-delete-region byte-delete-region byte-narrow-to-region byte-narrow-to-region byte-widen byte-widen byte-end-of-line byte-end-of-line byte-constant2 byte-goto byte-goto-if-nil byte-goto-if-not-nil byte-goto-if-nil-else-pop byte-goto-if-not-nil-else-pop byte-return byte-discard byte-dup byte-save-excursion byte-save-window-excursion byte-save-restriction byte-catch byte-unwind-protect byte-condition-case byte-condition-case byte-temp-output-buffer-setup byte-temp-output-buffer-setup byte-temp-output-buffer-show byte-temp-output-buffer-show byte-unbind-all byte-unbind-all byte-set-marker byte-set-marker byte-match-beginning byte-match-beginning byte-match-end byte-match-end byte-upcase byte-upcase byte-downcase byte-downcase byte-string= byte-string= byte-string< byte-string< byte-equal byte-equal byte-nthcdr byte-nthcdr byte-elt byte-elt byte-member byte-member byte-assq byte-assq byte-nreverse byte-nreverse byte-setcar byte-setcar byte-setcdr byte-setcdr byte-car-safe byte-car-safe byte-cdr-safe byte-cdr-safe byte-nconc byte-nconc byte-quo byte-quo byte-rem byte-rem byte-numberp byte-numberp byte-integerp byte-integerp byte-listN byte-listN byte-concatN byte-concatN byte-insertN byte-insertN byte-constant byte-constant-limit byte-goto-ops byte-goto-always-pop-ops byte-goto-always-pop-ops
+  (defun . byte-compile-lapcode)
+  (defun . byte-compile-eval)
+  (defun . byte-compile-eval-before-compile)
+  byte-compile-current-form byte-compile-dest-file byte-compile-current-file byte-compile-current-group byte-compile-current-buffer
+  (defun . byte-compile-log)
+  (defun . byte-compile-log-1)
+  byte-compile-read-position byte-compile-last-position
+  (defun . byte-compile-delete-first)
+  (defun . byte-compile-set-symbol-position)
+  byte-compile-last-warned-form byte-compile-last-logged-file
+  (defun . byte-compile-warning-prefix)
+  (defun . byte-compile-warning-series)
+  (defun . byte-compile-log-file)
+  (defun . byte-compile-log-warning)
+  (defun . byte-compile-warn)
+  (defun . byte-compile-warn-obsolete)
+  (defun . byte-compile-report-error)
+  (defun . byte-compile-obsolete)
+  (defun . byte-compile-fdefinition)
+  (defun . byte-compile-arglist-signature)
+  (defun . byte-compile-arglist-signatures-congruent-p)
+  (defun . byte-compile-arglist-signature-string)
+  (defun . byte-compile-callargs-warn)
+  (defun . byte-compile-format-warn)
+  (defun . byte-compile-nogroup-warn)
+  (defun . byte-compile-arglist-warn)
+  byte-compile-cl-functions
+  (defun . byte-compile-find-cl-functions)
+  (defun . byte-compile-cl-warn)
+  (defun . byte-compile-print-syms)
+  (defun . byte-compile-warn-about-unresolved-functions)
+  (defun . byte-compile-const-symbol-p)
+  (defun . byte-compile-constp)
+  (defun . byte-compile-close-variables)
+  (defun . displaying-byte-compile-warnings)
+  (t . byte-force-recompile)
+  (defun . byte-force-recompile)
+  (t . byte-recompile-directory)
+  (defun . byte-recompile-directory)
+  no-byte-compile
+  (t . byte-compile-file)
+  (defun . byte-compile-file)
+  (t . compile-defun)
+  (defun . compile-defun)
+  (defun . byte-compile-from-buffer)
+  (defun . byte-compile-fix-header)
+  (defun . byte-compile-insert-header)
+  (defun . byte-compile-output-file-form)
+  (defun . byte-compile-output-docform)
+  (defun . byte-compile-keep-pending)
+  (defun . byte-compile-flush-pending)
+  (defun . byte-compile-file-form)
+  (defun . byte-compile-file-form-defsubst)
+  (defun . byte-compile-file-form-autoload)
+  (defun . byte-compile-file-form-defvar)
+  (defun . byte-compile-file-form-define-abbrev-table)
+  (defun . byte-compile-file-form-custom-declare-variable)
+  (defun . byte-compile-file-form-require)
+  (defun . byte-compile-file-form-progn)
+  (defun . byte-compile-file-form-eval)
+  (defun . byte-compile-file-form-defun)
+  (defun . byte-compile-file-form-defmacro)
+  (defun . byte-compile-file-form-defmumble)
+  (defun . byte-compile-output-as-comment)
+  (t . byte-compile)
+  (defun . byte-compile)
+  (defun . byte-compile-sexp)
+  (defun . byte-compile-byte-code-maker)
+  (defun . byte-compile-byte-code-unmake)
+  (defun . byte-compile-check-lambda-list)
+  (defun . byte-compile-lambda)
+  (defun . byte-compile-constants-vector)
+  (defun . byte-compile-top-level)
+  (defun . byte-compile-out-toplevel)
+  (defun . byte-compile-top-level-body)
+  (defun . byte-compile-declare-function)
+  (defun . byte-compile-form)
+  (defun . byte-compile-normal-call)
+  (defun . byte-compile-variable-ref)
+  (defun . byte-compile-get-constant)
+  (defun . byte-compile-constant)
+  (defun . byte-compile-push-constant)
+  (defun . byte-defop-compiler)
+  (defun . byte-defop-compiler19)
+  (defun . byte-defop-compiler-1)
+  (defun . byte-compile-subr-wrong-args)
+  (defun . byte-compile-no-args)
+  (defun . byte-compile-one-arg)
+  (defun . byte-compile-two-args)
+  (defun . byte-compile-three-args)
+  (defun . byte-compile-zero-or-one-arg)
+  (defun . byte-compile-one-or-two-args)
+  (defun . byte-compile-two-or-three-args)
+  (defun . byte-compile-noop)
+  (defun . byte-compile-discard)
+  (defun . byte-compile-associative)
+  (defun . byte-compile-char-before)
+  (defun . byte-compile-backward-char)
+  (defun . byte-compile-backward-word)
+  (defun . byte-compile-list)
+  (defun . byte-compile-concat)
+  (defun . byte-compile-minus)
+  (defun . byte-compile-quo)
+  (defun . byte-compile-nconc)
+  (defun . byte-compile-fset)
+  (defun . byte-compile-funarg)
+  (defun . byte-compile-funarg-2)
+  (defun . byte-compile-function-form)
+  (defun . byte-compile-indent-to)
+  (defun . byte-compile-insert)
+  (defun . byte-compile-setq)
+  (defun . byte-compile-setq-default)
+  (defun . byte-compile-quote)
+  (defun . byte-compile-quote-form)
+  (defun . byte-compile-body)
+  (defun . byte-compile-body-do-effect)
+  (defun . byte-compile-form-do-effect)
+  (defun . byte-compile-progn)
+  (defun . byte-compile-prog1)
+  (defun . byte-compile-prog2)
+  (defun . byte-compile-goto-if)
+  (defun . byte-compile-find-bound-condition)
+  (defun . byte-compile-maybe-guarded)
+  (defun . byte-compile-if)
+  (defun . byte-compile-cond)
+  (defun . byte-compile-and)
+  (defun . byte-compile-and-recursion)
+  (defun . byte-compile-or)
+  (defun . byte-compile-or-recursion)
+  (defun . byte-compile-while)
+  (defun . byte-compile-funcall)
+  (defun . byte-compile-let)
+  (defun . byte-compile-let*)
+  (defun . byte-compile-negated)
+  (defun . byte-compile-negation-optimizer)
+  (defun . byte-compile-catch)
+  (defun . byte-compile-unwind-protect)
+  (defun . byte-compile-track-mouse)
+  (defun . byte-compile-condition-case)
+  (defun . byte-compile-save-excursion)
+  (defun . byte-compile-save-restriction)
+  (defun . byte-compile-save-current-buffer)
+  (defun . byte-compile-save-window-excursion)
+  (defun . byte-compile-with-output-to-temp-buffer)
+  (defun . byte-compile-defun)
+  (defun . byte-compile-defmacro)
+  (defun . byte-compile-defvar)
+  (defun . byte-compile-autoload)
+  (defun . byte-compile-lambda-form)
+  (defun . byte-compile-file-form-defalias)
+  (defun . byte-compile-defalias-warn)
+  (defun . byte-compile-no-warnings)
+  (defun . byte-compile-make-variable-buffer-local)
+  (defun . byte-compile-form-make-variable-buffer-local)
+  (defun . byte-compile-make-tag)
+  (defun . byte-compile-out-tag)
+  (defun . byte-compile-goto)
+  (defun . byte-compile-out)
+  (defun . byte-compile-annotate-call-tree)
+  (t . display-call-tree)
+  (defun . display-call-tree)
+  (t . batch-byte-compile-if-not-done)
+  (defun . batch-byte-compile-if-not-done)
+  (t . batch-byte-compile)
+  (defun . batch-byte-compile)
+  (defun . batch-byte-compile-file)
+  (t . batch-byte-recompile-directory)
+  (defun . batch-byte-recompile-directory)
+  (provide . byte-compile)
+  (provide . bytecomp)
+  (defun . byte-compile-report-ops))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/cl-macs.elc"
+  (require . cl)
+  (defun . cl-pop2)
+  (require . bytecomp)
+  cl-old-bc-file-form cl-simple-funcs cl-simple-funcs cl-safe-funcs cl-safe-funcs
+  (defun . cl-simple-expr-p)
+  (defun . cl-simple-exprs-p)
+  (defun . cl-safe-expr-p)
+  (defun . cl-const-expr-p)
+  (defun . cl-const-exprs-p)
+  (defun . cl-const-expr-val)
+  (defun . cl-expr-access-order)
+  (defun . cl-expr-contains)
+  (defun . cl-expr-contains-any)
+  (defun . cl-expr-depends-p)
+  (defun . gensym)
+  (defun . gentemp)
+  (defun . defun*)
+  (defun . defmacro*)
+  (defun . function*)
+  (defun . cl-transform-function-property)
+  lambda-list-keywords lambda-list-keywords cl-macro-environment
+  (defun . cl-transform-lambda)
+  (defun . cl-do-arglist)
+  (defun . cl-arglist-args)
+  (defun . destructuring-bind)
+  cl-not-toplevel
+  (defun . eval-when)
+  (defun . cl-compile-time-too)
+  (defun . load-time-value)
+  (defun . case)
+  (defun . ecase)
+  (defun . typecase)
+  (defun . etypecase)
+  (defun . block)
+  cl-active-block-names
+  (defun . cl-byte-compile-block)
+  (defun . cl-byte-compile-throw)
+  (defun . return)
+  (defun . return-from)
+  (defun . loop)
+  (defun . cl-parse-loop-clause)
+  (defun . cl-loop-let)
+  (defun . cl-loop-handle-accum)
+  (defun . cl-loop-build-ands)
+  (defun . do)
+  (defun . do*)
+  (defun . cl-expand-do-loop)
+  (defun . dolist)
+  (defun . dotimes)
+  (defun . do-symbols)
+  (defun . do-all-symbols)
+  (defun . psetq)
+  (defun . progv)
+  (defun . flet)
+  (defun . labels)
+  (defun . macrolet)
+  (defun . symbol-macrolet)
+  cl-closure-vars
+  (defun . lexical-let)
+  (defun . lexical-let*)
+  (defun . cl-defun-expander)
+  (defun . multiple-value-bind)
+  (defun . multiple-value-setq)
+  (defun . locally)
+  (defun . the)
+  cl-proclaim-history cl-declare-stack
+  (defun . cl-do-proclaim)
+  (defun . declare)
+  (defun . define-setf-method)
+  (defun . define-setf-expander)
+  (defun . defsetf)
+  (defun . cl-setf-make-apply)
+  (defun . get-setf-method)
+  (defun . cl-setf-do-modify)
+  (defun . cl-setf-do-store)
+  (defun . cl-setf-simple-store-p)
+  (defun . setf)
+  (defun . psetf)
+  (defun . cl-do-pop)
+  (defun . remf)
+  (defun . shiftf)
+  (defun . rotatef)
+  (defun . letf)
+  (defun . letf*)
+  (defun . callf)
+  (defun . callf2)
+  (defun . define-modify-macro)
+  (defun . defstruct)
+  (defun . cl-struct-setf-expander)
+  (defun . deftype)
+  (defun . cl-make-type-test)
+  (defun . typep)
+  (defun . check-type)
+  (defun . assert)
+  (defun . define-compiler-macro)
+  (defun . compiler-macroexpand)
+  (defun . cl-byte-compile-compiler-macro)
+  (defun . defsubst*)
+  (defun . cl-defsubst-expand))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/sgml-mode.elc" sgml-basic-offset sgml-transformation-function sgml-transformation sgml-mode-hook sgml-specials sgml-quick-keys sgml-mode-map
+  (defun . sgml-make-syntax-table)
+  sgml-mode-syntax-table sgml-tag-syntax-table sgml-name-8bit-mode sgml-char-names sgml-char-names-table sgml-validate-command sgml-saved-validate-command sgml-slash-distance sgml-namespace-re sgml-namespace-re sgml-name-re sgml-name-re sgml-tag-name-re sgml-tag-name-re sgml-attrs-re sgml-attrs-re sgml-start-tag-regex
+  (defface . sgml-namespace)
+  sgml-namespace-face sgml-font-lock-keywords-1 sgml-font-lock-keywords-1 sgml-font-lock-keywords-2 sgml-font-lock-keywords-2 sgml-font-lock-keywords sgml-font-lock-syntactic-keywords sgml-face-tag-alist sgml-tag-face-alist sgml-display-text sgml-tags-invisible sgml-tag-alist sgml-tag-help sgml-xml-mode sgml-empty-tags sgml-unclosed-tags
+  (defun . sgml-xml-guess)
+  (defun . sgml-comment-indent-new-line)
+  (defun . sgml-mode-facemenu-add-face-function)
+  (defun . sgml-fill-nobreak)
+  sgml-mode-map sgml-mode-syntax-table sgml-mode-abbrev-table sgml-mode-abbrev-table
+  (t . sgml-mode)
+  (defun . sgml-mode)
+  (defun . xml-mode)
+  (defun . sgml-comment-indent)
+  (defun . sgml-slash)
+  (defun . sgml-slash-matching)
+  (defun . sgml-name-char)
+  (defun . sgml-namify-char)
+  (defun . sgml-name-self)
+  (defun . sgml-maybe-name-self)
+  (defun . sgml-name-8bit-mode)
+  sgml-tag-last sgml-tag-history
+  (defun . sgml-tag)
+  (autoload . skeleton-read)
+  (defun . sgml-attributes)
+  (defun . sgml-auto-attributes)
+  (defun . sgml-tag-help)
+  (defun . sgml-maybe-end-tag)
+  (defun . sgml-skip-tag-backward)
+  sgml-electric-tag-pair-overlays sgml-electric-tag-pair-timer
+  (defun . sgml-electric-tag-pair-before-change-function)
+  (defun . sgml-electric-tag-pair-flush-overlays)
+  sgml-electric-tag-pair-mode
+  (defun . sgml-electric-tag-pair-mode)
+  (defun . sgml-skip-tag-forward)
+  (defun . sgml-delete-tag)
+  (defun . sgml-tags-invisible)
+  (defun . sgml-point-entered)
+  (defun . sgml-validate)
+  (defun . sgml-at-indentation-p)
+  (defun . sgml-lexical-context)
+  (defun . sgml-beginning-of-tag)
+  (defun . sgml-value)
+  (defun . sgml-quote)
+  (defun . sgml-pretty-print)
+  (defun . sgml-tag-type)
+  (defun . sgml-tag-start)
+  (defun . sgml-tag-end)
+  (defun . sgml-tag-name)
+  (defun . sgml-tag-p)
+  (defun . copy-sgml-tag)
+  (defun . make-sgml-tag)
+  (defun . sgml-make-tag)
+  (defun . sgml-parse-tag-name)
+  (defun . sgml-looking-back-at)
+  (defun . sgml-tag-text-p)
+  (defun . sgml-parse-tag-backward)
+  (defun . sgml-get-context)
+  (defun . sgml-show-context)
+  (defun . sgml-close-tag)
+  (defun . sgml-empty-tag-p)
+  (defun . sgml-unclosed-tag-p)
+  (defun . sgml-calculate-indent)
+  (defun . sgml-indent-line)
+  (defun . sgml-guess-indent)
+  (defun . sgml-parse-dtd)
+  html-mode-hook html-quick-keys html-mode-map html-face-tag-alist html-tag-face-alist html-display-text html-tag-alist html-tag-help html-mode-map html-mode-syntax-table html-mode-abbrev-table html-mode-abbrev-table
+  (t . html-mode)
+  (defun . html-mode)
+  html-imenu-regexp
+  (defun . html-imenu-index)
+  html-autoview-mode
+  (defun . html-autoview-mode)
+  (defun . html-href-anchor)
+  (defun . html-name-anchor)
+  (defun . html-headline-1)
+  (defun . html-headline-2)
+  (defun . html-headline-3)
+  (defun . html-headline-4)
+  (defun . html-headline-5)
+  (defun . html-headline-6)
+  (defun . html-horizontal-rule)
+  (defun . html-image)
+  (defun . html-line)
+  (defun . html-ordered-list)
+  (defun . html-unordered-list)
+  (defun . html-list-item)
+  (defun . html-paragraph)
+  (defun . html-checkboxes)
+  (defun . html-radio-buttons)
+  (provide . sgml-mode))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-valid.elc"
+  (require . xmltok)
+  (require . nxml-enc)
+  (require . nxml-util)
+  (require . nxml-ns)
+  (require . rng-match)
+  (require . rng-util)
+  (require . rng-loc)
+  (defface . rng-error)
+  rng-state-cache-distance rng-validate-chunk-size rng-validate-delay rng-validate-quick-delay rng-validate-timer rng-validate-quick-timer rng-error-count rng-message-overlay rng-message-overlay-inhibit-point rng-message-overlay-current rng-open-elements rng-pending-contents rng-collecting-text rng-validate-up-to-date-end rng-conditional-up-to-date-start rng-conditional-up-to-date-end rng-parsing-for-state rng-validate-mode rng-dtd
+  (t . rng-validate-mode)
+  (defun . rng-validate-mode)
+  (defun . rng-set-schema-file-and-validate)
+  (defun . rng-set-document-type-and-validate)
+  (defun . rng-auto-set-schema-and-validate)
+  (defun . rng-after-change-function)
+  (defun . rng-compute-mode-line-string)
+  (defun . rng-cancel-timers)
+  (defun . rng-kill-timers)
+  (defun . rng-activate-timers)
+  (defun . rng-validate-clear)
+  rng-validate-display-point rng-validate-display-modified-p
+  (defun . rng-validate-while-idle-continue-p)
+  (defun . rng-validate-while-idle)
+  (defun . rng-validate-quick-while-idle)
+  (defun . rng-validate-done)
+  (defun . rng-do-some-validation)
+  (defun . rng-validate-prepare)
+  (defun . rng-do-some-validation-1)
+  (defun . rng-clear-conditional-region)
+  (defun . rng-clear-cached-state)
+  (defun . rng-cache-state)
+  (defun . rng-state-matches-current)
+  (defun . rng-get-state)
+  (defun . rng-restore-state)
+  (defun . rng-set-initial-state)
+  (defun . rng-clear-overlays)
+  (defun . rng-mark-xmltok-dependent-regions)
+  (defun . rng-mark-xmltok-dependent-region)
+  (defun . rng-dependent-region-changed)
+  (defun . rng-mark-xmltok-errors)
+  (defun . rng-mark-invalid)
+  (defun . rng-mark-not-well-formed)
+  (defun . rng-mark-error)
+  (defun . rng-error-modified)
+  (defun . rng-echo-area-clear-function)
+  (defun . rng-maybe-echo-error-at-point)
+  (defun . rng-error-overlay-after)
+  (defun . rng-first-error)
+  (defun . rng-mouse-first-error)
+  (defun . rng-next-error)
+  (defun . rng-previous-error)
+  (defun . rng-next-error-1)
+  (defun . rng-previous-error-1)
+  (defun . rng-goto-error-overlay)
+  (defun . rng-error-overlay-message)
+  (defun . rng-current-message-from-error-overlay-p)
+  (defun . rng-find-next-error-overlay)
+  (defun . rng-find-previous-error-overlay)
+  (defun . rng-forward)
+  (defun . rng-process-start-tag)
+  (defun . rng-process-namespaces)
+  (defun . rng-process-tag-name)
+  (defun . rng-process-attributes)
+  (defun . rng-process-start-tag-close)
+  (defun . rng-mark-start-tag-close)
+  (defun . rng-recover-bad-element-prefix)
+  (defun . rng-recover-bad-attribute-prefix)
+  (defun . rng-recover-duplicate-attribute-name)
+  (defun . rng-recover-start-tag-open)
+  (defun . rng-recover-attribute-value)
+  (defun . rng-recover-attribute-name)
+  (defun . rng-missing-attributes-message)
+  (defun . rng-process-end-tag)
+  (defun . rng-end-element)
+  (defun . rng-missing-element-message)
+  (defun . rng-recover-mismatched-end-tag)
+  (defun . rng-mark-missing-end-tags)
+  (defun . rng-mark-mismatched-end-tag)
+  (defun . rng-push-tag)
+  (defun . rng-pop-tag)
+  (defun . rng-contents-string)
+  (defun . rng-segment-string)
+  (defun . rng-segment-blank-p)
+  (defun . rng-contents-region)
+  (defun . rng-process-text)
+  (defun . rng-process-unknown-char)
+  (defun . rng-process-unknown-entity)
+  (defun . rng-region-blank-p)
+  (defun . rng-flush-text)
+  (defun . rng-process-end-document)
+  (defun . rng-process-encoding-name)
+  (defun . rng-name-to-string)
+  (provide . rng-valid))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-loc.elc"
+  (require . nxml-util)
+  (require . nxml-parse)
+  (require . rng-parse)
+  (require . rng-uri)
+  (require . rng-util)
+  (require . xmltok)
+  rng-current-schema-file-name rng-schema-locating-files-default rng-schema-locating-file-schema-file rng-schema-locating-file-schema rng-schema-locating-files rng-schema-loader-alist rng-cached-document-element rng-document-type-history
+  (defun . rng-set-document-type)
+  (defun . rng-read-type-id)
+  (defun . rng-set-schema-file)
+  (defun . rng-set-vacuous-schema)
+  (defun . rng-set-schema-file-1)
+  (defun . rng-load-schema)
+  (defun . rng-what-schema)
+  (defun . rng-auto-set-schema)
+  (defun . rng-locate-schema-file)
+  (defun . rng-possible-type-ids)
+  (defun . rng-locate-schema-file-using)
+  (defun . rng-match-document-element-rule)
+  (defun . rng-match-namespace-rule)
+  (defun . rng-document-element)
+  (defun . rng-get-start-tag-namespace)
+  (defun . rng-match-transform-uri-rule)
+  (defun . rng-match-uri-rule)
+  (defun . rng-file-name-matches-uri-pattern-p)
+  (defun . rng-match-default-rule)
+  (defun . rng-possible-type-ids-using)
+  (defun . rng-locate-schema-file-from-type-id)
+  rng-schema-locating-file-alist
+  (defun . rng-get-parsed-schema-locating-file)
+  rng-locate-namespace-uri rng-locate-namespace-uri
+  (defun . rng-parse-schema-locating-file)
+  (defun . rng-save-schema-location)
+  (defun . rng-save-schema-location-1)
+  (provide . rng-loc))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-uri.elc"
+  (defun . rng-file-name-uri)
+  (defun . rng-uri-escape-multibyte)
+  (defun . rng-percent-encode)
+  (defun . rng-uri-file-name)
+  (defun . rng-uri-pattern-file-name-regexp)
+  (defun . rng-uri-pattern-file-name-replace-match)
+  (defun . rng-uri-file-name-1)
+  (defun . rng-uri-error)
+  (defun . rng-uri-split)
+  (defun . rng-uri-join)
+  (defun . rng-uri-resolve)
+  (defun . rng-resolve-path)
+  (defun . rng-relative-uri)
+  (defun . rng-relative-path)
+  (defun . rng-split-path)
+  (defun . rng-join-path)
+  (defun . rng-uri-unescape-multibyte)
+  (defun . rng-multibyte-percent-decode)
+  (defun . rng-uri-unescape-unibyte)
+  (defun . rng-uri-unescape-unibyte-match)
+  (defun . rng-uri-unescape-unibyte-replace)
+  (provide . rng-uri))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-parse.elc"
+  (require . nxml-parse)
+  (require . rng-match)
+  (require . rng-dt)
+  rng-parse-prev-was-start-tag
+  (defun . rng-parse-validate-file)
+  (defun . rng-parse-do-validate)
+  (defun . rng-parse-to-match-name)
+  (provide . rng-parse))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-parse.elc"
+  (require . nxml-util)
+  (require . xmltok)
+  (require . nxml-enc)
+  (require . nxml-ns)
+  nxml-parse-file-name nxml-validate-function
+  (defun . nxml-parse-file)
+  (defun . nxml-parse-find-file)
+  (defun . nxml-parse-instance)
+  (defun . nxml-parse-instance-1)
+  (defun . nxml-parse-start-tag)
+  (defun . nxml-validate-tag)
+  (defun . nxml-validate-error-position)
+  (defun . nxml-make-name)
+  (defun . nxml-current-text-string)
+  (defun . nxml-parse-error)
+  (defun . nxml-check-xmltok-errors)
+  (provide . nxml-parse))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-match.elc"
+  (require . rng-pttrn)
+  (require . rng-util)
+  (require . rng-dt)
+  rng-not-allowed-ipattern rng-empty-ipattern rng-text-ipattern rng-compile-table rng-being-compiled rng-ipattern-table rng-last-ipattern-index rng-match-state
+  (defun . rng-update-match-state)
+  (defun . rng-ipattern-defslot)
+  (defun . rng-ipattern-get-type)
+  (defun . rng-ipattern-set-type)
+  (defun . rng-ipattern-get-index)
+  (defun . rng-ipattern-set-index)
+  (defun . rng-ipattern-get-name-class)
+  (defun . rng-ipattern-set-name-class)
+  (defun . rng-ipattern-get-datatype)
+  (defun . rng-ipattern-set-datatype)
+  (defun . rng-ipattern-get-after)
+  (defun . rng-ipattern-set-after)
+  (defun . rng-ipattern-get-child)
+  (defun . rng-ipattern-set-child)
+  (defun . rng-ipattern-get-value-object)
+  (defun . rng-ipattern-set-value-object)
+  (defun . rng-ipattern-get-nullable)
+  (defun . rng-ipattern-set-nullable)
+  (defun . rng-ipattern-get-memo-text-typed)
+  (defun . rng-ipattern-set-memo-text-typed)
+  (defun . rng-ipattern-get-memo-map-start-tag-open-deriv)
+  (defun . rng-ipattern-set-memo-map-start-tag-open-deriv)
+  (defun . rng-ipattern-get-memo-map-start-attribute-deriv)
+  (defun . rng-ipattern-set-memo-map-start-attribute-deriv)
+  (defun . rng-ipattern-get-memo-start-tag-close-deriv)
+  (defun . rng-ipattern-set-memo-start-tag-close-deriv)
+  (defun . rng-ipattern-get-memo-text-only-deriv)
+  (defun . rng-ipattern-set-memo-text-only-deriv)
+  (defun . rng-ipattern-get-memo-mixed-text-deriv)
+  (defun . rng-ipattern-set-memo-mixed-text-deriv)
+  (defun . rng-ipattern-get-memo-map-data-deriv)
+  (defun . rng-ipattern-set-memo-map-data-deriv)
+  (defun . rng-ipattern-get-memo-end-tag-deriv)
+  (defun . rng-ipattern-set-memo-end-tag-deriv)
+  rng-memo-map-alist-max rng-memo-map-alist-max
+  (defun . rng-memo-map-get)
+  (defun . rng-memo-map-add)
+  (defun . rng-make-ipattern)
+  (defun . rng-ipattern-maybe-init)
+  (defun . rng-ipattern-clear)
+  (defun . rng-gen-ipattern-index)
+  (defun . rng-put-ipattern)
+  (defun . rng-get-ipattern)
+  rng-const-ipatterns rng-const-ipatterns
+  (defun . rng-intern-after)
+  (defun . rng-intern-attribute)
+  (defun . rng-intern-data)
+  (defun . rng-intern-data-except)
+  (defun . rng-intern-value)
+  (defun . rng-intern-one-or-more)
+  (defun . rng-intern-one-or-more-shortcut)
+  (defun . rng-intern-list)
+  (defun . rng-intern-group)
+  (defun . rng-intern-group-shortcut)
+  (defun . rng-normalize-group-list)
+  (defun . rng-intern-interleave)
+  (defun . rng-normalize-interleave-list)
+  (defun . rng-intern-choice)
+  (defun . rng-intern-optional)
+  (defun . rng-intern-choice1)
+  (defun . rng-intern-choice-shortcut)
+  (defun . rng-normalize-choice-list)
+  (defun . rng-compare-ipattern)
+  (defun . rng-name-class-contains)
+  (defun . rng-name-class-contains1)
+  (defun . rng-name-class-possible-names)
+  (defun . rng-ipattern-to-string)
+  (defun . rng-name-class-to-string)
+  (defun . rng-compile-maybe-init)
+  (defun . rng-compile-clear)
+  (defun . rng-compile)
+  (defun . rng-compile-not-allowed)
+  (defun . rng-compile-empty)
+  (defun . rng-compile-text)
+  (defun . rng-compile-element)
+  (defun . rng-element-get-child)
+  (defun . rng-compile-attribute)
+  (defun . rng-compile-ref)
+  (defun . rng-compile-one-or-more)
+  (defun . rng-compile-zero-or-more)
+  (defun . rng-compile-optional)
+  (defun . rng-compile-mixed)
+  (defun . rng-compile-list)
+  (defun . rng-compile-choice)
+  (defun . rng-compile-group)
+  (defun . rng-compile-interleave)
+  (defun . rng-compile-dt)
+  (defun . rng-compile-data)
+  (defun . rng-compile-data-except)
+  (defun . rng-compile-value)
+  (defun . rng-compile-name-class)
+  (defun . rng-map-element-attribute)
+  (defun . rng-find-element-content-pattern)
+  (defun . rng-search-name)
+  (defun . rng-find-name-class-uris)
+  (defun . rng-accum-namespace-uri)
+  (defun . rng-ipattern-text-typed-p)
+  (defun . rng-ipattern-compute-text-typed-p)
+  (defun . rng-start-tag-open-deriv)
+  (defun . rng-ipattern-memo-start-tag-open-deriv)
+  (defun . rng-compute-start-tag-open-deriv)
+  (defun . rng-start-attribute-deriv)
+  (defun . rng-ipattern-memo-start-attribute-deriv)
+  (defun . rng-compute-start-attribute-deriv)
+  (defun . rng-cons-group-after)
+  (defun . rng-subst-group-after)
+  (defun . rng-subst-interleave-after)
+  (defun . rng-apply-after)
+  (defun . rng-start-tag-close-deriv)
+  rng-transform-map rng-transform-map
+  (defun . rng-compute-start-tag-close-deriv)
+  (defun . rng-ignore-attributes-deriv)
+  (defun . rng-text-only-deriv)
+  (defun . rng-compute-text-only-deriv)
+  (defun . rng-mixed-text-deriv)
+  (defun . rng-compute-mixed-text-deriv)
+  (defun . rng-end-tag-deriv)
+  (defun . rng-compute-end-tag-deriv)
+  (defun . rng-data-deriv)
+  (defun . rng-namespace-context-tracer)
+  (defun . rng-namespace-context-get-no-trace)
+  rng-memo-data-deriv-max-length
+  (defun . rng-ipattern-memo-data-deriv)
+  (defun . rng-compute-data-deriv)
+  (defun . rng-transform-multi)
+  (defun . rng-transform-choice)
+  (defun . rng-transform-group)
+  (defun . rng-transform-interleave)
+  (defun . rng-transform-one-or-more)
+  (defun . rng-transform-after-child)
+  (defun . rng-transform-interleave-single)
+  (defun . rng-transform-group-nullable)
+  (defun . rng-transform-group-nullable-gen-choices)
+  (defun . rng-members-eq)
+  (defun . rng-ipattern-after)
+  (defun . rng-unknown-start-tag-open-deriv)
+  (defun . rng-ipattern-optionalize-elements)
+  (defun . rng-ipattern-empty-before-p)
+  (defun . rng-ipattern-possible-start-tags)
+  (defun . rng-ipattern-start-tag-possible-p)
+  (defun . rng-ipattern-possible-attributes)
+  (defun . rng-ipattern-possible-values)
+  (defun . rng-ipattern-required-element)
+  (defun . rng-ipattern-required-attributes)
+  (defun . rng-compile-error)
+  (defun . rng-match-state)
+  (defun . rng-set-match-state)
+  (defun . rng-match-state-equal)
+  (defun . rng-schema-changed)
+  (defun . rng-match-init-buffer)
+  (defun . rng-match-start-document)
+  (defun . rng-match-start-tag-open)
+  (defun . rng-match-attribute-name)
+  (defun . rng-match-attribute-value)
+  (defun . rng-match-element-value)
+  (defun . rng-match-start-tag-close)
+  (defun . rng-match-mixed-text)
+  (defun . rng-match-end-tag)
+  (defun . rng-match-after)
+  (defun . rng-match-out-of-context-start-tag-open)
+  (defun . rng-match-possible-namespace-uris)
+  (defun . rng-match-unknown-start-tag-open)
+  (defun . rng-match-optionalize-elements)
+  (defun . rng-match-ignore-attributes)
+  (defun . rng-match-text-typed-p)
+  (defun . rng-match-empty-content)
+  (defun . rng-match-empty-before-p)
+  (defun . rng-match-infer-start-tag-namespace)
+  (defun . rng-match-nullable-p)
+  (defun . rng-match-possible-start-tag-names)
+  (defun . rng-match-start-tag-possible-p)
+  (defun . rng-match-possible-attribute-names)
+  (defun . rng-match-possible-value-strings)
+  (defun . rng-match-required-element-name)
+  (defun . rng-match-required-attribute-names)
+  (defun . rng-match-save)
+  (defun . rng-match-with-schema)
+  (provide . rng-match))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-dt.elc"
+  (require . rng-util)
+  rng-dt-error-reporter
+  (defun . rng-dt-error)
+  rng-dt-namespace-context-getter
+  (defun . rng-dt-make-value)
+  (defun . rng-dt-builtin-compile)
+  (provide . rng-dt))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-util.elc"
+  (defun . rng-make-datatypes-uri)
+  rng-xsd-datatypes-uri rng-xsd-datatypes-uri rng-builtin-datatypes-uri rng-builtin-datatypes-uri
+  (defun . rng-uniquify-eq)
+  (defun . rng-uniquify-equal)
+  (defun . rng-blank-p)
+  (defun . rng-substq)
+  (defun . rng-complete-before-point)
+  (defun . rng-completion-exact-p)
+  (defun . rng-quote-string)
+  (defun . rng-escape-string)
+  (defun . rng-collapse-space)
+  (provide . rng-util))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/rng-pttrn.elc" rng-schema-change-hook rng-current-schema
+  (defun . rng-make-ref)
+  (defun . rng-ref-set)
+  (defun . rng-ref-get)
+  (defun . rng-make-choice)
+  (defun . rng-make-group)
+  (defun . rng-make-interleave)
+  (defun . rng-make-zero-or-more)
+  (defun . rng-make-one-or-more)
+  (defun . rng-make-optional)
+  (defun . rng-make-mixed)
+  (defun . rng-make-value)
+  (defun . rng-make-data)
+  (defun . rng-make-data-except)
+  (defun . rng-make-list)
+  (defun . rng-make-element)
+  (defun . rng-make-attribute)
+  (defun . rng-make-text)
+  (defun . rng-make-empty)
+  (defun . rng-make-not-allowed)
+  (defun . rng-make-any-name-name-class)
+  (defun . rng-make-any-name-except-name-class)
+  (defun . rng-make-ns-name-name-class)
+  (defun . rng-make-ns-name-except-name-class)
+  (defun . rng-make-name-name-class)
+  (defun . rng-make-choice-name-class)
+  rng-any-content rng-any-element
+  (defun . rng-make-name)
+  (defun . rng-make-datatype)
+  (provide . rng-pttrn))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-ns.elc"
+  (require . nxml-util)
+  nxml-ns-state nxml-ns-initial-state
+  (defun . nxml-ns-state)
+  (defun . nxml-ns-set-state)
+  (defun . nxml-ns-state-equal)
+  (defun . nxml-ns-save)
+  (defun . nxml-ns-init)
+  (defun . nxml-ns-push-state)
+  (defun . nxml-ns-pop-state)
+  (defun . nxml-ns-get-prefix)
+  (defun . nxml-ns-set-prefix)
+  (defun . nxml-ns-get-default)
+  (defun . nxml-ns-set-default)
+  (defun . nxml-ns-get-context)
+  (defun . nxml-ns-prefixes-for)
+  (defun . nxml-ns-prefix-for)
+  (defun . nxml-ns-changed-prefixes)
+  (provide . nxml-ns))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-mode.elc"
+  (require . xmltok)
+  (require . nxml-enc)
+  (require . nxml-glyph)
+  (require . nxml-util)
+  (require . nxml-rap)
+  (require . nxml-outln)
+  nxml-char-ref-display-glyph-flag nxml-mode-hook nxml-sexp-element-flag nxml-slash-auto-complete-flag nxml-child-indent nxml-attribute-indent nxml-bind-meta-tab-to-complete-flag nxml-prefer-utf-16-to-utf-8-flag nxml-prefer-utf-16-little-to-big-endian-flag nxml-default-buffer-file-coding-system nxml-auto-insert-xml-declaration-flag
+  (defface . nxml-delimited-data)
+  (defface . nxml-name)
+  (defface . nxml-ref)
+  (defface . nxml-delimiter)
+  (defface . nxml-text)
+  (defface . nxml-comment-content)
+  (defface . nxml-comment-delimiter)
+  (defface . nxml-processing-instruction-delimiter)
+  (defface . nxml-processing-instruction-target)
+  (defface . nxml-processing-instruction-content)
+  (defface . nxml-cdata-section-delimiter)
+  (defface . nxml-cdata-section-CDATA)
+  (defface . nxml-cdata-section-content)
+  (defface . nxml-char-ref-number)
+  (defface . nxml-char-ref-delimiter)
+  (defface . nxml-entity-ref-name)
+  (defface . nxml-entity-ref-delimiter)
+  (defface . nxml-tag-delimiter)
+  (defface . nxml-tag-slash)
+  (defface . nxml-element-prefix)
+  (defface . nxml-element-colon)
+  (defface . nxml-element-local-name)
+  (defface . nxml-attribute-prefix)
+  (defface . nxml-attribute-colon)
+  (defface . nxml-attribute-local-name)
+  (defface . nxml-namespace-attribute-xmlns)
+  (defface . nxml-namespace-attribute-colon)
+  (defface . nxml-namespace-attribute-prefix)
+  (defface . nxml-attribute-value)
+  (defface . nxml-attribute-value-delimiter)
+  (defface . nxml-namespace-attribute-value)
+  (defface . nxml-namespace-attribute-value-delimiter)
+  (defface . nxml-prolog-literal-delimiter)
+  (defface . nxml-prolog-literal-content)
+  (defface . nxml-prolog-keyword)
+  (defface . nxml-markup-declaration-delimiter)
+  (defface . nxml-hash)
+  (defface . nxml-glyph)
+  nxml-prolog-regions nxml-last-fontify-end nxml-degraded nxml-completion-hook nxml-in-mixed-content-hook nxml-mixed-scan-distance nxml-end-tag-indent-scan-distance nxml-char-ref-extra-display nxml-mode-map nxml-font-lock-keywords
+  (defun . nxml-set-face)
+  (t . nxml-mode)
+  (defun . nxml-mode)
+  (defun . nxml-cleanup)
+  (defun . nxml-degrade)
+  (defun . nxml-debug-region)
+  (defun . nxml-after-change)
+  (defun . nxml-after-change1)
+  (defun . nxml-insert-xml-declaration)
+  (defun . nxml-prepare-to-save)
+  (defun . nxml-select-coding-system)
+  (defun . nxml-unsuitable-coding-system-message)
+  nxml-utf-16-coding-systems nxml-utf-16-coding-systems nxml-utf-coding-systems nxml-utf-coding-systems
+  (defun . nxml-coding-system-unicode-p)
+  (defun . nxml-coding-system-name)
+  (defun . nxml-fix-encoding-declaration)
+  (defun . nxml-choose-suitable-coding-system)
+  (defun . nxml-choose-utf-coding-system)
+  (defun . nxml-choose-utf-16-coding-system)
+  (defun . nxml-coding-system-member)
+  (defun . nxml-unfontify-region)
+  (defun . nxml-extend-region)
+  (defun . nxml-extend-after-change-region)
+  (defun . nxml-extend-after-change-region1)
+  (defun . nxml-fontify-matcher)
+  (defun . nxml-fontify-prolog)
+  (defun . nxml-apply-fontify-rule)
+  (defun . nxml-fontify-attributes)
+  (defun . nxml-fontify-attribute)
+  (defun . nxml-fontify-qname)
+  (defun . nxml-electric-slash)
+  (defun . nxml-balanced-close-start-tag-block)
+  (defun . nxml-balanced-close-start-tag-inline)
+  (defun . nxml-balanced-close-start-tag)
+  (defun . nxml-finish-element)
+  nxml-last-split-position
+  (defun . nxml-split-element)
+  (defun . nxml-finish-element-1)
+  (defun . nxml-indent-line)
+  (defun . nxml-compute-indent)
+  (defun . nxml-compute-indent-from-matching-start-tag)
+  (defun . nxml-compute-indent-from-previous-line)
+  (defun . nxml-merge-indent-context-type)
+  (defun . nxml-compute-indent-in-token)
+  (defun . nxml-compute-indent-in-start-tag)
+  (defun . nxml-attribute-value-boundary)
+  (defun . nxml-compute-indent-in-delimited-token)
+  (defun . nxml-complete)
+  (defun . nxml-forward-balanced-item)
+  (defun . nxml-forward-single-balanced-item)
+  (defun . nxml-backward-single-balanced-item)
+  (defun . nxml-scan-forward-within)
+  (defun . nxml-scan-backward-within)
+  (defun . nxml-scan-forward-in-attribute-value)
+  (defun . nxml-scan-backward-in-attribute-value)
+  (defun . nxml-find-following-attribute)
+  (defun . nxml-find-preceding-attribute)
+  (defun . nxml-up-element)
+  (defun . nxml-backward-up-element)
+  (defun . nxml-down-element)
+  (defun . nxml-backward-down-element)
+  (defun . nxml-forward-element)
+  (defun . nxml-backward-element)
+  (defun . nxml-mark-token-after)
+  (defun . nxml-mark-paragraph)
+  (defun . nxml-forward-paragraph)
+  (defun . nxml-backward-paragraph)
+  (defun . nxml-forward-single-paragraph)
+  (defun . nxml-backward-single-paragraph)
+  (defun . nxml-token-contains-data-p)
+  (defun . nxml-paragraph-end-pos)
+  (defun . nxml-paragraph-start-pos)
+  (defun . nxml-token-ends-line-p)
+  (defun . nxml-token-begins-line-p)
+  (defun . nxml-in-mixed-content-p)
+  (defun . nxml-preceding-sibling-data-p)
+  (defun . nxml-following-sibling-data-p)
+  (defun . nxml-do-fill-paragraph)
+  (defun . nxml-newline-and-indent)
+  nxml-dynamic-markup-prev-pos nxml-dynamic-markup-prev-lengths nxml-dynamic-markup-prev-found-marker nxml-dynamic-markup-prev-start-tags
+  (defun . nxml-dynamic-markup-word)
+  (defun . nxml-try-copy-markup)
+  nxml-char-name-ignore-case nxml-char-name-alist nxml-char-name-table nxml-autoload-char-name-set-list
+  (defun . nxml-enable-char-name-set)
+  (defun . nxml-disable-char-name-set)
+  (defun . nxml-char-name-set-enabled-p)
+  (defun . nxml-autoload-char-name-set)
+  (defun . nxml-define-char-name-set)
+  (defun . nxml-get-char-name)
+  nxml-named-char-history
+  (defun . nxml-insert-named-char)
+  (defun . nxml-maybe-load-char-name-set)
+  (defun . nxml-toggle-char-ref-extra-display)
+  (defun . nxml-char-ref-display-extra)
+  (defun . nxml-clear-char-ref-extra-display)
+  (defun . nxml-start-delimiter-length)
+  (defun . nxml-end-delimiter-length)
+  (defun . nxml-token-type-friendly-name)
+  (provide . nxml-mode))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-outln.elc"
+  (require . xmltok)
+  (require . nxml-util)
+  (require . nxml-rap)
+  nxml-section-element-name-regexp nxml-heading-element-name-regexp nxml-outline-child-indent
+  (defface . nxml-heading)
+  (defface . nxml-outline-indicator)
+  (defface . nxml-outline-active-indicator)
+  (defface . nxml-outline-ellipsis)
+  nxml-heading-scan-distance nxml-outline-prefix-map
+  (defun . nxml-show-all)
+  (defun . nxml-hide-all-text-content)
+  (defun . nxml-show-direct-text-content)
+  (defun . nxml-show-direct-subheadings)
+  (defun . nxml-hide-direct-text-content)
+  (defun . nxml-hide-subheadings)
+  (defun . nxml-show)
+  (defun . nxml-hide-text-content)
+  (defun . nxml-show-subheadings)
+  (defun . nxml-hide-other)
+  nxml-outline-state-transform-exceptions nxml-target-section-pos nxml-depth-in-target-section nxml-outline-state-transform-alist
+  (defun . nxml-transform-buffer-outline)
+  (defun . nxml-transform-subtree-outline)
+  (defun . nxml-outline-pre-adjust-point)
+  (defun . nxml-outline-adjust-point)
+  (defun . nxml-transform-outline-state)
+  (defun . nxml-section-tag-transform-outline-state)
+  (defun . nxml-get-outline-state)
+  (defun . nxml-set-outline-state)
+  (defun . nxml-mouse-show-direct-text-content)
+  (defun . nxml-mouse-hide-direct-text-content)
+  (defun . nxml-mouse-hide-subheadings)
+  (defun . nxml-mouse-show-direct-subheadings)
+  (defun . nxml-mouse-set-point)
+  (defun . nxml-token-start-tag-p)
+  (defun . nxml-token-end-tag-p)
+  (defun . nxml-refresh-outline)
+  nxml-outline-display-section-tag-function
+  (defun . nxml-outline-display-rest)
+  nxml-highlighted-less-than nxml-highlighted-less-than nxml-highlighted-greater-than nxml-highlighted-greater-than nxml-highlighted-colon nxml-highlighted-colon nxml-highlighted-slash nxml-highlighted-slash nxml-highlighted-ellipsis nxml-highlighted-ellipsis nxml-highlighted-empty-end-tag nxml-highlighted-empty-end-tag nxml-highlighted-inactive-minus nxml-highlighted-inactive-minus nxml-highlighted-active-minus nxml-highlighted-active-minus nxml-highlighted-active-plus nxml-highlighted-active-plus
+  (defun . nxml-display-section)
+  (defun . nxml-highlighted-qname)
+  (defun . nxml-outline-display-single-line-end-tag)
+  (defun . nxml-outline-display-multi-line-end-tag)
+  nxml-outline-show-map nxml-outline-show-help nxml-outline-hiding-tag-map nxml-outline-hiding-tag-help nxml-outline-showing-tag-map nxml-outline-showing-tag-help
+  (defun . nxml-outline-set-overlay)
+  (defun . nxml-end-of-heading)
+  (defun . nxml-token-starts-line-p)
+  nxml-cached-section-tag-regexp nxml-cached-section-element-name-regexp
+  (defun . nxml-make-section-tag-regexp)
+  (defun . nxml-make-section-tag-regexp-1)
+  (defun . nxml-section-tag-forward)
+  (defun . nxml-section-tag-backward)
+  (defun . nxml-section-start-position)
+  (defun . nxml-back-to-section-start)
+  (defun . nxml-after-section-start-tag)
+  (defun . nxml-heading-start-position)
+  (defun . nxml-report-outline-error)
+  (defun . nxml-outline-error)
+  (defun . nxml-debug-overlays)
+  (provide . nxml-outln))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-rap.elc"
+  (require . xmltok)
+  (require . nxml-util)
+  nxml-prolog-end nxml-scan-end
+  (defun . nxml-get-inside)
+  (defun . nxml-clear-inside)
+  (defun . nxml-set-inside)
+  (defun . nxml-inside-end)
+  (defun . nxml-inside-start)
+  (defun . nxml-scan-after-change)
+  (defun . nxml-scan-prolog)
+  (defun . nxml-adjust-start-for-dependent-regions)
+  (defun . nxml-mark-parse-dependent-regions)
+  (defun . nxml-mark-parse-dependent-region)
+  (defun . nxml-clear-dependent-regions)
+  (defun . nxml-token-after)
+  (defun . nxml-token-before)
+  (defun . nxml-tokenize-forward)
+  (defun . nxml-move-tag-backwards)
+  (defun . nxml-move-outside-backwards)
+  (defun . nxml-ensure-scan-up-to-date)
+  (defun . nxml-scan-element-forward)
+  (defun . nxml-scan-element-backward)
+  (defun . nxml-scan-error)
+  (provide . nxml-rap))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-util.elc" nxml-debug
+  (defun . nxml-debug)
+  (defun . nxml-debug-change)
+  (defun . nxml-debug-set-inside)
+  (defun . nxml-debug-clear-inside)
+  (defun . nxml-make-namespace)
+  (defun . nxml-namespace-name)
+  nxml-xml-namespace-uri nxml-xml-namespace-uri nxml-xmlns-namespace-uri nxml-xmlns-namespace-uri
+  (defun . nxml-with-degradation-on-error)
+  (defun . nxml-with-unmodifying-text-property-changes)
+  (defun . nxml-with-invisible-motion)
+  (defun . nxml-display-file-parse-error)
+  (defun . nxml-signal-file-parse-error)
+  (provide . nxml-util))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-glyph.elc" nxml-ascii-glyph-set nxml-ascii-glyph-set nxml-latin1-glyph-set nxml-latin1-glyph-set nxml-misc-fixed-1-glyph-set nxml-misc-fixed-2-glyph-set nxml-misc-fixed-3-glyph-set nxml-wgl4-glyph-set nxml-glyph-set-hook nxml-glyph-set
+  (defun . nxml-x-set-glyph-set)
+  (defun . nxml-w32-set-glyph-set)
+  (defun . nxml-window-system-set-glyph-set)
+  (defun . nxml-terminal-set-glyph-set)
+  (t . nxml-glyph-display-string)
+  (defun . nxml-glyph-display-string)
+  (defun . nxml-glyph-set-contains-p)
+  (provide . nxml-glyph))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/nxml-enc.elc" nxml-file-name-ignore-case nxml-cached-file-name-auto-coding-regexp nxml-cached-auto-mode-alist
+  (defun . nxml-file-name-auto-coding-regexp)
+  nxml-non-xml-set-auto-coding-function
+  (defun . nxml-set-auto-coding)
+  (defun . nxml-set-xml-coding)
+  (defun . nxml-detect-coding-system)
+  (defun . nxml-mime-charset-coding-system)
+  (defun . nxml-start-auto-coding)
+  (defun . nxml-stop-auto-coding)
+  (provide . nxml-enc))
+ ("/usr/share/emacs/23.0.93/lisp/nxml/xmltok.elc" xmltok-type xmltok-start xmltok-name-colon xmltok-name-end xmltok-replacement xmltok-attributes xmltok-namespace-attributes xmltok-dtd xmltok-dependent-regions xmltok-errors
+  (defun . xmltok-save)
+  (defun . xmltok-attribute-name-start)
+  (defun . xmltok-attribute-name-colon)
+  (defun . xmltok-attribute-name-end)
+  (defun . xmltok-attribute-value-start)
+  (defun . xmltok-attribute-value-end)
+  (defun . xmltok-attribute-raw-normalized-value)
+  (defun . xmltok-attribute-refs)
+  (defun . xmltok-attribute-prefix)
+  (defun . xmltok-attribute-local-name)
+  (defun . xmltok-attribute-value)
+  (defun . xmltok-start-tag-prefix)
+  (defun . xmltok-start-tag-local-name)
+  (defun . xmltok-end-tag-prefix)
+  (defun . xmltok-end-tag-local-name)
+  (defun . xmltok-start-tag-qname)
+  (defun . xmltok-end-tag-qname)
+  (defun . xmltok-make-attribute)
+  (defun . xmltok-error-message)
+  (defun . xmltok-error-start)
+  (defun . xmltok-error-end)
+  (defun . xmltok-make-error)
+  (defun . xmltok-add-error)
+  (defun . xmltok-add-dependent)
+  (defun . xmltok-forward)
+  (defun . xmltok-forward-special)
+  xmltok-ncname-regexp xmltok-ncname-regexp
+  (defun . xmltok-scan-after-lt)
+  (defun . xmltok-scan-after-processing-instruction-open)
+  (defun . xmltok-scan-after-comment-open)
+  (defun . xmltok-scan-attributes)
+  (defun . xmltok-add-attribute)
+  (defun . xmltok-normalize-attribute)
+  (defun . xmltok-scan-after-amp)
+  xmltok-entity-error-messages xmltok-entity-error-messages
+  (defun . xmltok-handle-entity)
+  (defun . xmltok-scan-char-ref)
+  (defun . xmltok-char-number)
+  (defun . xmltok-unclosed-reparse-p)
+  (defun . xmltok-semi-closed-reparse-p)
+  (defun . xmltok-valid-char-p)
+  (defun . xmltok-unicode-to-char)
+  xmltok-contains-doctype xmltok-doctype-external-subset-flag xmltok-internal-subset-start xmltok-had-param-entity-ref xmltok-prolog-regions xmltok-standalone xmltok-markup-declaration-doctype-flag xmltok-predefined-entity-alist xmltok-predefined-entity-alist
+  (defun . xmltok-forward-prolog)
+  xmltok-bad-xml-decl-regexp xmltok-bad-xml-decl-regexp
+  (t . xmltok-get-declared-encoding-position)
+  (defun . xmltok-get-declared-encoding-position)
+  (defun . xmltok-scan-xml-declaration)
+  xmltok-markup-declaration-alist xmltok-markup-declaration-alist
+  (defun . xmltok-parse-prolog-item)
+  (defun . xmltok-parse-doctype)
+  (defun . xmltok-parse-attlist-declaration)
+  (defun . xmltok-parse-nmtoken-group)
+  (defun . xmltok-parse-element-declaration)
+  (defun . xmltok-parse-model-group)
+  (defun . xmltok-parse-model-group-member)
+  (defun . xmltok-parse-entity-declaration)
+  (defun . xmltok-define-entity)
+  (defun . xmltok-parse-entity-value)
+  (defun . xmltok-parse-notation-declaration)
+  (defun . xmltok-parse-external-id)
+  (defun . xmltok-require-next-token)
+  (defun . xmltok-require-token)
+  (defun . xmltok-current-token-string)
+  (defun . xmltok-markup-declaration-parse-error)
+  (defun . xmltok-skip-markup-declaration)
+  (defun . xmltok-prolog-region-type)
+  (defun . xmltok-next-prolog-token)
+  (defun . xmltok-scan-prolog-literal)
+  (defun . xmltok-scan-prolog-after-processing-instruction-open)
+  (defun . xmltok-parse-entities)
+  (defun . xmltok-parse-entity)
+  (defun . xmltok-parse-entity-replacement)
+  (defun . xmltok-handle-nested-entity)
+  (defun . xmltok-append-entity-def)
+  (defun . xmltok-add-prolog-region)
+  (defun . xmltok-merge-attributes)
+  (defun . xmltok-forward-test)
+  (defun . xmltok-next-prolog-token-test)
+  (provide . xmltok))
+ ("/home/hobbes/nxhtml/util/mlinks.el" mlinks:version
+  (require . cl)
+  (require . ourcomments-util)
+  (require . url-parse)
+  (require . url-expand)
+  (require . appmenu)
+  mlinks-mode-functions mlinks-mode-map
+  (defun . mlinks-want-marked-links)
+  (defun . mlinks-after-change-major-mode)
+  mlinks-hilight-this-buffer mlinks-hilight-point-ovl mlinks-hilighter-timer
+  (defun . mlinks-toggle-hilight)
+  (defun . mlinks-stop-hilighter)
+  (defun . mlinks-start-hilighter)
+  (defun . mlinks-make-point-ovl)
+  (defun . mlinks-link-at-point)
+  (defun . mlinks-hilighter)
+  mlinks-active-hilight-keymap mlinks-inactive-hilight-keymap
+  (defun . mlinks-pre-command)
+  (defun . mlinks-activate-hilight)
+  (defun . mlinks-deactivate-hilight)
+  (defun . mlinks-someactivate-hilight)
+  (defun . mlinks-backward-link)
+  (defun . mlinks-forward-link)
+  (defun . mlinks-goto)
+  (defun . mlinks-goto-other-window)
+  (defun . mlinks-goto-other-frame)
+  (defun . mlinks-goto-1)
+  (defun . mlinks-get-boolean)
+  (defun . mlinks-get-action)
+  (defun . mlinks-prev-saved-position)
+  (defun . mlinks-next-saved-position)
+  (defun . mlinks-goto-n)
+  mlinks-places-n mlinks-places mlinks-temp-buffer-where
+  (defun . mlinks-switch-to-buffer)
+  (defun . mlinks-switch-to-buffer-1)
+  (defun . mlinks-custom)
+  (defun . mlinks-appmenu)
+  (defun . mlinks-add-appmenu)
+  (defun . mlinks-remove-overlays)
+  mlinks-mode
+  (t . mlinks-mode)
+  (defun . mlinks-mode)
+  (defun . mlinks-turn-on-in-buffer)
+  mlinks-mode-major-mode mlinks-global-mode
+  (defun . mlinks-global-mode)
+  mlinks-global-mode-buffers
+  (defun . mlinks-global-mode-enable-in-buffers)
+  (defun . mlinks-global-mode-check-buffers)
+  (defun . mlinks-global-mode-cmhh)
+  mlinks-active-links
+  (defun . mlinks-active-links-toggle)
+  (defface . mlinks-link)
+  mlinks-link
+  (defun . mlinks-mark-link)
+  mlinks-mark-links-timer
+  (defun . mlinks-mark-next-link)
+  mlinks-link-update-pos-min mlinks-link-update-pos-max
+  (defun . mlinks-stop-marking-links)
+  (defun . mlinks-start-marking-links)
+  mlinks-after-change-extra
+  (defun . mlinks-after-change)
+  (defun . mlinks-html-style-goto)
+  (defun . mlinks-html-style-hili)
+  (require . rx)
+  mlinks-html-link-regex
+  (defun . mlinks-html-forward-link)
+  (defun . mlinks-html-backward-link)
+  (defun . mlinks-html-style-mode-fun)
+  (defun . mlink-check-file-to-edit)
+  (defun . mlinks-html-edit-at)
+  (defun . mlinks-html-mail-to)
+  (defun . mlinks-html-href-act-on)
+  (defun . mlinks-html-possible-href-actions)
+  (defun . mlinks-html-find-base-href)
+  (defun . mlinks-elisp-custom-goto)
+  (defun . mlinks-custom-next-mark)
+  (defun . mlinks-elisp-goto)
+  (defun . mlinks-elisp-hili)
+  (defun . mlinks-elisp-mode-fun)
+  (defun . mlinks-elisp-function)
+  (defun . mlinks-elisp-mode-symbol)
+  (defun . mlinks-elisp-mode-require)
+  (defun . mlinks-hit-test)
+  (defun . mlinks-handle-reg-fun-list)
+  (provide . mlinks))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/rx.elc" rx-constituents rx-syntax rx-categories rx-greedy-flag
+  (defun . rx-info)
+  (defun . rx-check)
+  (defun . rx-group-if)
+  (defun . rx-and)
+  (defun . rx-or)
+  (defun . rx-anything)
+  (defun . rx-any-delete-from-range)
+  (defun . rx-any-condense-range)
+  (defun . rx-check-any-string)
+  (defun . rx-check-any)
+  (defun . rx-any)
+  (defun . rx-check-not)
+  (defun . rx-not)
+  (defun . rx-not-char)
+  (defun . rx-not-syntax)
+  (defun . rx-trans-forms)
+  (defun . rx-=)
+  (defun . rx->=)
+  (defun . rx-**)
+  (defun . rx-repeat)
+  (defun . rx-submatch)
+  (defun . rx-backref)
+  (defun . rx-check-backref)
+  (defun . rx-kleene)
+  (defun . rx-atomic-p)
+  (defun . rx-syntax)
+  (defun . rx-check-category)
+  (defun . rx-category)
+  (defun . rx-eval)
+  (defun . rx-greedy)
+  (defun . rx-regexp)
+  (defun . rx-form)
+  (t . rx-to-string)
+  (defun . rx-to-string)
+  (t . rx)
+  (defun . rx)
+  (provide . rx))
+ ("/home/hobbes/nxhtml/util/appmenu.el" appmenu:version
+  (require . cl)
+  appmenu-show-help appmenu-show-point-menu appmenu-alist
+  (defun . appmenu-sort-by-priority)
+  (t . appmenu-add)
+  (defun . appmenu-add)
+  (defun . appmenu-remove)
+  (defun . appmenu-help)
+  (defun . appmenu-keymap-len)
+  appmenu-mouse-only
+  (defun . appmenu-make-menu-for-point)
+  (defun . appmenu-map)
+  (defun . appmenu-popup)
+  appmenu-mode-map appmenu-mode
+  (defun . appmenu-mode)
+  (provide . appmenu))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/flyspell.elc"
+  (require . ispell)
+  flyspell-highlight-flag flyspell-mark-duplications-flag flyspell-mark-duplications-exceptions flyspell-sort-corrections flyspell-duplicate-distance flyspell-delay flyspell-persistent-highlight flyspell-highlight-properties flyspell-default-delayed-commands flyspell-delayed-commands flyspell-default-deplacement-commands flyspell-deplacement-commands flyspell-issue-welcome-flag flyspell-issue-message-flag flyspell-incorrect-hook flyspell-default-dictionary flyspell-tex-command-regexp flyspell-check-tex-math-command flyspell-dictionaries-that-consider-dash-as-word-delimiter flyspell-abbrev-p flyspell-use-global-abbrev-table-p flyspell-mode-line-string flyspell-large-region flyspell-insert-function flyspell-before-incorrect-word-string flyspell-after-incorrect-word-string flyspell-use-meta-tab flyspell-auto-correct-binding flyspell-generic-check-word-predicate flyspell-generic-check-word-p
+  (defun . mail-mode-flyspell-verify)
+  (defun . texinfo-mode-flyspell-verify)
+  (defun . tex-mode-flyspell-verify)
+  (defun . sgml-mode-flyspell-verify)
+  flyspell-prog-text-faces
+  (defun . flyspell-generic-progmode-verify)
+  (t . flyspell-prog-mode)
+  (defun . flyspell-prog-mode)
+  flyspell-mouse-map flyspell-mode-map flyspell-consider-dash-as-word-delimiter-flag flyspell-dash-dictionary flyspell-dash-local-dictionary
+  (defface . flyspell-incorrect)
+  (defface . flyspell-duplicate)
+  flyspell-overlay flyspell-mode
+  (t . flyspell-mode)
+  (defun . flyspell-mode)
+  (t . turn-on-flyspell)
+  (defun . turn-on-flyspell)
+  (t . turn-off-flyspell)
+  (defun . turn-off-flyspell)
+  flyspell-buffers
+  (defun . flyspell-minibuffer-p)
+  flyspell-last-buffer
+  (defun . flyspell-accept-buffer-local-defs)
+  (defun . flyspell-hack-local-variables-hook)
+  (defun . flyspell-kill-ispell-hook)
+  (defun . flyspell-mode-on)
+  (defun . flyspell-delay-commands)
+  (defun . flyspell-delay-command)
+  (defun . flyspell-deplacement-commands)
+  (defun . flyspell-deplacement-command)
+  flyspell-word-cache-start flyspell-word-cache-end flyspell-word-cache-word flyspell-word-cache-result flyspell-pre-buffer flyspell-pre-point flyspell-pre-column flyspell-pre-pre-buffer flyspell-pre-pre-point flyspell-previous-command
+  (defun . flyspell-pre-command-hook)
+  (t . flyspell-mode-off)
+  (defun . flyspell-mode-off)
+  (defun . flyspell-check-pre-word-p)
+  flyspell-changes
+  (defun . flyspell-after-change-function)
+  (defun . flyspell-check-changed-word-p)
+  (defun . flyspell-check-word-p)
+  (defun . flyspell-debug-signal-no-check)
+  (defun . flyspell-debug-signal-pre-word-checked)
+  (defun . flyspell-debug-signal-word-checked)
+  (defun . flyspell-debug-signal-changed-checked)
+  (defun . flyspell-post-command-hook)
+  (defun . flyspell-notify-misspell)
+  (defun . flyspell-word-search-backward)
+  (defun . flyspell-word-search-forward)
+  (defun . flyspell-word)
+  (defun . flyspell-math-tex-command-p)
+  (defun . flyspell-tex-command-p)
+  flyspell-casechars-cache flyspell-ispell-casechars-cache
+  (defun . flyspell-get-casechars)
+  flyspell-not-casechars-cache flyspell-ispell-not-casechars-cache
+  (defun . flyspell-get-not-casechars)
+  (defun . flyspell-get-word)
+  (defun . flyspell-small-region)
+  flyspell-external-ispell-process flyspell-external-ispell-buffer flyspell-large-region-buffer flyspell-large-region-beg flyspell-large-region-end
+  (defun . flyspell-external-point-words)
+  (defun . flyspell-process-localwords)
+  (defun . flyspell-check-region-doublons)
+  (defun . flyspell-large-region)
+  (t . flyspell-region)
+  (defun . flyspell-region)
+  (t . flyspell-buffer)
+  (defun . flyspell-buffer)
+  flyspell-old-buffer-error flyspell-old-pos-error
+  (defun . flyspell-goto-next-error)
+  (defun . flyspell-overlay-p)
+  (defun . flyspell-delete-region-overlays)
+  (defun . flyspell-delete-all-overlays)
+  (defun . flyspell-unhighlight-at)
+  (defun . flyspell-properties-at-p)
+  (defun . make-flyspell-overlay)
+  (defun . flyspell-highlight-incorrect-region)
+  (defun . flyspell-highlight-duplicate-region)
+  flyspell-auto-correct-pos flyspell-auto-correct-region flyspell-auto-correct-ring flyspell-auto-correct-word
+  (defun . flyspell-check-previous-highlighted-word)
+  (defun . flyspell-display-next-corrections)
+  (defun . flyspell-abbrev-table)
+  (defun . flyspell-define-abbrev)
+  (defun . flyspell-auto-correct-word)
+  flyspell-auto-correct-previous-pos
+  (defun . flyspell-auto-correct-previous-hook)
+  (defun . flyspell-auto-correct-previous-word)
+  (defun . flyspell-correct-word)
+  (defun . flyspell-correct-word-before-point)
+  (defun . flyspell-do-correct)
+  (defun . flyspell-ajust-cursor-point)
+  (defun . flyspell-emacs-popup)
+  (defun . flyspell-xemacs-popup)
+  (defun . flyspell-maybe-correct-transposition)
+  (defun . flyspell-maybe-correct-doubling)
+  (defun . flyspell-already-abbrevp)
+  (defun . flyspell-change-abbrev)
+  (provide . flyspell))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/ispell.elc"
+  (defun . ispell-check-minver)
+  (defun . check-ispell-version)
+  ispell-highlight-p ispell-lazy-highlight ispell-highlight-face ispell-check-comments ispell-query-replace-choices ispell-skip-tib ispell-tib-ref-beginning ispell-tib-ref-end ispell-keep-choices-win ispell-choices-win-default-height ispell-program-name ispell-alternate-dictionary ispell-complete-word-dict ispell-message-dictionary-alist ispell-message-fcc-skip ispell-grep-command ispell-grep-options ispell-look-command ispell-look-p ispell-have-new-look ispell-look-options ispell-use-ptys-p ispell-following-word ispell-help-in-bufferp ispell-quietly ispell-format-word-function ispell-format-word ispell-use-framepop-p ispell-personal-dictionary ispell-silently-savep ispell-local-dictionary-overridden ispell-local-dictionary ispell-extra-args ispell-skip-html ispell-local-dictionary-alist ispell-dictionary-base-alist ispell-dictionary-alist ispell-really-aspell ispell-really-hunspell ispell-encoding8-command ispell-aspell-supports-utf8 ispell-required-version ispell-offset ispell-version ispell-version
+  (defun . ispell-check-version)
+  (defun . ispell-call-process)
+  (defun . ispell-call-process-region)
+  ispell-menu-map ispell-menu-xemacs ispell-menu-map-needed ispell-library-directory ispell-process ispell-async-processp ispell-aspell-dictionary-alist
+  (defun . ispell-find-aspell-dictionaries)
+  ispell-aspell-data-dir ispell-aspell-dict-dir
+  (defun . ispell-get-aspell-config-value)
+  (defun . ispell-aspell-find-dictionary)
+  (defun . ispell-aspell-add-aliases)
+  ispell-last-program-name ispell-initialize-spellchecker-hook
+  (defun . ispell-set-spellchecker-params)
+  (defun . ispell-valid-dictionary-list)
+  (defun . ispell-int-char)
+  ispell-current-dictionary ispell-current-personal-dictionary ispell-dictionary
+  (defun . ispell-decode-string)
+  (defun . ispell-get-decoded-string)
+  (defun . ispell-get-casechars)
+  (defun . ispell-get-not-casechars)
+  (defun . ispell-get-otherchars)
+  (defun . ispell-get-many-otherchars-p)
+  (defun . ispell-get-ispell-args)
+  (defun . ispell-get-extended-character-mode)
+  (defun . ispell-get-coding-system)
+  ispell-pdict-modified-p ispell-quit ispell-process-directory ispell-filter ispell-filter-continue ispell-output-buffer ispell-session-buffer ispell-cmd-args ispell-query-replace-marker ispell-recursive-edit-marker ispell-checking-message ispell-choices-buffer ispell-choices-buffer ispell-overlay ispell-words-keyword ispell-dictionary-keyword ispell-pdict-keyword ispell-parsing-keyword ispell-skip-region-alist ispell-tex-skip-alists ispell-html-skip-alists ispell-local-pdict ispell-buffer-local-name ispell-parser ispell-region-end ispell-check-only
+  (defun . ispell-accept-output)
+  (defun . ispell-send-replacement)
+  (defun . ispell-send-string)
+  (defun . ispell-insert-word)
+  (t . ispell-word)
+  (defun . ispell-word)
+  (defun . ispell-get-word)
+  (t . ispell-pdict-save)
+  (defun . ispell-pdict-save)
+  (defun . ispell-command-loop)
+  (defun . ispell-show-choices)
+  (t . ispell-help)
+  (defun . ispell-help)
+  (defun . lookup-words)
+  (defun . ispell-filter)
+  (defun . ispell-highlight-spelling-error-generic)
+  (defun . ispell-highlight-spelling-error-xemacs)
+  (defun . ispell-highlight-spelling-error-overlay)
+  (defun . ispell-highlight-spelling-error)
+  (defun . ispell-adjusted-window-height)
+  (defun . ispell-overlay-window)
+  (defun . ispell-parse-output)
+  (defun . ispell-process-status)
+  (defun . ispell-start-process)
+  (defun . ispell-init-process)
+  (t . ispell-kill-ispell)
+  (defun . ispell-kill-ispell)
+  (t . ispell-change-dictionary)
+  (defun . ispell-change-dictionary)
+  (defun . ispell-internal-change-dictionary)
+  (t . ispell-region)
+  (defun . ispell-region)
+  (defun . ispell-begin-skip-region-regexp)
+  (defun . ispell-begin-skip-region)
+  (defun . ispell-begin-tex-skip-regexp)
+  (defun . ispell-skip-region-list)
+  (defun . ispell-tex-arg-end)
+  (defun . ispell-ignore-fcc)
+  (defun . ispell-skip-region)
+  (defun . ispell-get-line)
+  (defun . ispell-looking-at)
+  (defun . ispell-process-line)
+  (t . ispell-comments-and-strings)
+  (defun . ispell-comments-and-strings)
+  (t . ispell-buffer)
+  (defun . ispell-buffer)
+  (t . ispell-continue)
+  (defun . ispell-continue)
+  (defun . ispell-horiz-scroll)
+  (t . ispell-complete-word)
+  (defun . ispell-complete-word)
+  (t . ispell-complete-word-interior-frag)
+  (defun . ispell-complete-word-interior-frag)
+  (t . ispell)
+  (defun . ispell)
+  ispell-minor-mode ispell-minor-keymap
+  (t . ispell-minor-mode)
+  (defun . ispell-minor-mode)
+  (defun . ispell-minor-check)
+  ispell-message-text-end
+  (defun . ispell-mime-multipartp)
+  (defun . ispell-mime-skip-part)
+  (t . ispell-message)
+  (defun . ispell-message)
+  (defun . ispell-non-empty-string)
+  (defun . ispell-accept-buffer-local-defs)
+  (defun . ispell-buffer-local-parsing)
+  (defun . ispell-buffer-local-dict)
+  (defun . ispell-buffer-local-words)
+  (defun . ispell-add-per-file-word-list)
+  (provide . ispell))
+ ("/home/hobbes/nxhtml/nxhtml/html-site.el" html-site:version
+  (require . ourcomments-util)
+  (require . cl)
+  (require . dired)
+  (require . ffip)
+  (require . grep)
+  (defun . html-site-looks-like-local-url)
+  (require . url-parse)
+  (require . url-http)
+  (defun . html-site-dir-contains)
+  (defun . html-site-lwarn)
+  (defun . html-site-chk-wtocdir)
+  (t . html-site-buffer-or-dired-file-name)
+  (defun . html-site-buffer-or-dired-file-name)
+  (t . html-site-set-site)
+  (defun . html-site-set-site)
+  (t . html-site-dired-current)
+  (defun . html-site-dired-current)
+  (t . html-site-find-file)
+  (defun . html-site-find-file)
+  (t . html-site-rgrep)
+  (defun . html-site-rgrep)
+  (t . html-site-query-replace)
+  (defun . html-site-query-replace)
+  (defun . html-site-ensure-site-defined)
+  (defun . html-site-current-ensure-site-defined)
+  (defun . html-site-remote-contains)
+  (defun . html-site-current-remote-contains)
+  (defun . html-site-ensure-file-in-site)
+  (defun . html-site-current-ensure-file-in-site)
+  (defun . html-site-ensure-buffer-in-site)
+  (defun . html-site-current-ensure-buffer-in-site)
+  (defun . html-site-site-dir)
+  (defun . html-site-current-site-dir)
+  (defun . html-site-contains)
+  (defun . html-site-current-contains)
+  (defun . html-site-page-list)
+  (defun . html-site-current-page-list)
+  (defun . html-site-frames-file)
+  (defun . html-site-current-frames-file)
+  (defun . html-site-toc-file)
+  (defun . html-site-current-toc-file)
+  (defun . html-site-merge-dir)
+  (defun . html-site-current-merge-dir)
+  (defun . html-site-merge-template)
+  (defun . html-site-current-merge-template)
+  (defun . html-site-extra-fun)
+  (defun . html-site-current-extra-fun)
+  (defun . html-site-ftp-host)
+  (defun . html-site-current-ftp-host)
+  (defun . html-site-ftp-user)
+  (defun . html-site-current-ftp-user)
+  (defun . html-site-ftp-password)
+  (defun . html-site-current-ftp-password)
+  (defun . html-site-ftp-dir)
+  (defun . html-site-current-ftp-dir)
+  (defun . html-site-ftp-wtoc-dir)
+  (defun . html-site-current-ftp-wtoc-dir)
+  (defun . html-site-web-host)
+  (defun . html-site-current-web-host)
+  (defun . html-site-web-dir)
+  (defun . html-site-current-web-dir)
+  (defun . html-site-web-wtoc-dir)
+  (defun . html-site-current-web-wtoc-dir)
+  (defun . html-site-web-full)
+  (defun . html-site-current-web-full)
+  html-site-ftp-temporary-passwords
+  (defun . html-site-get-ftp-pw)
+  (defun . html-site-path-in-mirror)
+  (defun . html-site-local-to-web)
+  (defun . html-site-current-local-to-web)
+  (defun . html-site-remote-root)
+  (defun . html-site-current-remote-root)
+  (defun . html-site-local-to-remote)
+  (defun . html-site-current-local-to-remote)
+  (defun . html-site-remote-to-local)
+  (defun . html-site-current-remote-to-local)
+  html-site-files-re
+  (defun . html-site-edit-pages-file)
+  (defun . html-site-get-sub-files)
+  (defun . html-site-file-is-local)
+  html-site-list html-site-current noshell-procbuf-name noshell-proc-name
+  (defun . noshell-procbuf-setup)
+  (defun . noshell-procbuf-teardown)
+  (defun . noshell-procbuf-run)
+  (defun . noshell-sentinel)
+  (defun . noshell-procbuf-syncrun)
+  noshell-process-mode-map noshell-process-mode-syntax-table noshell-process-mode-abbrev-table noshell-process-mode-abbrev-table
+  (defun . noshell-process-mode)
+  (defun . noshell-quit)
+  (defun . noshell-kill-subprocess)
+  (provide . html-site)
+  (require . html-upl)
+  html-site-mode-menu-map html-site-mode-map html-site-mode
+  (defun . html-site-mode)
+  html-site-mode-off-list html-site-mode-major-mode html-site-global-mode
+  (defun . html-site-global-mode)
+  html-site-global-mode-buffers
+  (defun . html-site-global-mode-enable-in-buffers)
+  (defun . html-site-global-mode-check-buffers)
+  (defun . html-site-global-mode-cmhh))
+ ("/home/hobbes/nxhtml/nxhtml/html-upl.el" html-upl:version
+  (require . html-site)
+  html-upl-dir
+  (defun . html-upl-browse-remote)
+  (defun . html-upl-browse-remote-with-toc)
+  (defun . html-upl-browse-remote-frames)
+  (defun . html-upl-upload-site-with-toc)
+  (defun . html-upl-upload-site)
+  (defun . html-upl-upload-site1)
+  (defun . html-upl-ensure-site-has-host)
+  (defun . html-upl-remote-dired)
+  (defun . html-upl-upload-file)
+  (defun . html-upl-edit-remote-file)
+  (defun . html-upl-edit-remote-file-with-toc)
+  (defun . html-upl-edit-remote-file1)
+  (defun . html-upl-ediff-file)
+  (provide . html-upl))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/derived.elc"
+  (defun . derived-mode-hook-name)
+  (defun . derived-mode-map-name)
+  (defun . derived-mode-syntax-table-name)
+  (defun . derived-mode-abbrev-table-name)
+  (t . define-derived-mode)
+  (defun . define-derived-mode)
+  (defun . derived-mode-class)
+  (defun . derived-mode-make-docstring)
+  (defun . derived-mode-setup-function-name)
+  (t . derived-mode-init-mode-variables)
+  (defun . derived-mode-init-mode-variables)
+  (defun . derived-mode-set-keymap)
+  (defun . derived-mode-set-syntax-table)
+  (defun . derived-mode-set-abbrev-table)
+  (defun . derived-mode-run-hooks)
+  (defun . derived-mode-merge-keymaps)
+  (defun . derived-mode-merge-syntax-tables)
+  (defun . derived-mode-merge-abbrev-tables)
+  (provide . derived))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-http.elc"
+  (require . url-gw)
+  (require . url-util)
+  (require . url-parse)
+  (require . url-cookie)
+  (require . mail-parse)
+  (require . url-auth)
+  (require . url)
+  (autoload . url-cache-create-filename)
+  url-http-default-port url-http-asynchronous-p
+  (defun . url-http-expand-file-name)
+  url-http-real-basic-auth-storage url-http-proxy-basic-auth-storage url-http-open-connections url-http-version url-http-attempt-keepalives
+  (defun . url-http-debug)
+  (defun . url-http-mark-connection-as-busy)
+  (defun . url-http-mark-connection-as-free)
+  (defun . url-http-find-free-connection)
+  (defun . url-http-user-agent-string)
+  (defun . url-http-create-request)
+  (defun . url-http-clean-headers)
+  (defun . url-http-handle-authentication)
+  (defun . url-http-parse-response)
+  (defun . url-http-handle-cookies)
+  (defun . url-http-parse-headers)
+  (defun . url-http-activate-callback)
+  (defun . url-http-idle-sentinel)
+  (defun . url-http-end-of-document-sentinel)
+  (defun . url-http-simple-after-change-function)
+  (defun . url-http-content-length-after-change-function)
+  (defun . url-http-chunked-encoding-after-change-function)
+  (defun . url-http-wait-for-headers-change-function)
+  (t . url-http)
+  (defun . url-http)
+  (defun . url-http-async-sentinel)
+  (defun . url-http-generic-filter)
+  (defun . url-http-symbol-value-in-buffer)
+  (defun . url-http-head)
+  (t . url-http-file-exists-p)
+  (defun . url-http-file-exists-p)
+  (defun . url-http-file-readable-p)
+  (defun . url-http-head-file-attributes)
+  (t . url-http-file-attributes)
+  (defun . url-http-file-attributes)
+  (t . url-http-options)
+  (defun . url-http-options)
+  (require . tls)
+  url-https-default-port url-https-asynchronous-p
+  (defun . url-https-expand-file-name)
+  (defun . url-https-create-secure-wrapper)
+  (t . url-https)
+  (defun . url-https)
+  (t . url-https-file-exists-p)
+  (defun . url-https-file-exists-p)
+  (t . url-https-file-readable-p)
+  (defun . url-https-file-readable-p)
+  (t . url-https-file-attributes)
+  (defun . url-https-file-attributes)
+  (provide . url-http))
+ ("/usr/share/emacs/23.0.93/lisp/net/tls.elc"
+  (autoload . format-spec)
+  (autoload . format-spec-make)
+  tls-end-of-info tls-program tls-process-connection-type tls-success tls-checktrust tls-untrusted tls-hostmismatch tls-certtool-program
+  (defun . tls-certificate-information)
+  (t . open-tls-stream)
+  (defun . open-tls-stream)
+  (provide . tls))
+ ("/usr/share/emacs/23.0.93/lisp/url/url.elc"
+  (require . mailcap)
+  (require . url-vars)
+  (require . url-cookie)
+  (require . url-history)
+  (require . url-expand)
+  (require . url-privacy)
+  (require . url-methods)
+  (require . url-proxy)
+  (require . url-parse)
+  (require . url-util)
+  url-configuration-directory
+  (t . url-do-setup)
+  (defun . url-do-setup)
+  url-redirect-buffer
+  (t . url-retrieve)
+  (defun . url-retrieve)
+  (defun . url-retrieve-internal)
+  (t . url-retrieve-synchronously)
+  (defun . url-retrieve-synchronously)
+  (defun . url-mm-callback)
+  (defun . url-mm-url)
+  url-dead-buffer-list
+  (defun . url-mark-buffer-as-dead)
+  (defun . url-gc-dead-buffers)
+  (t . url-warn)
+  (defun . url-warn)
+  (provide . url))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-proxy.elc"
+  (require . url-parse)
+  (autoload . url-warn)
+  (defun . url-default-find-proxy-for-url)
+  url-proxy-locator
+  (defun . url-find-proxy-for-url)
+  (defun . url-proxy)
+  (provide . url-proxy))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-privacy.elc"
+  (require . url-vars)
+  (defun . url-device-type)
+  (t . url-setup-privacy-info)
+  (defun . url-setup-privacy-info)
+  (provide . url-privacy))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-expand.elc"
+  (require . url-methods)
+  (require . url-util)
+  (require . url-parse)
+  (defun . url-expander-remove-relative-links)
+  (defun . url-expand-file-name)
+  (defun . url-identity-expander)
+  (t . url-default-expander)
+  (defun . url-default-expander)
+  (provide . url-expand))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-history.elc"
+  (require . url-parse)
+  (autoload . url-do-setup)
+  url-history-track url-history-file url-history-save-interval url-history-timer url-history-changed-since-last-save url-history-hash-table
+  (defun . url-history-setup-save-timer)
+  (defun . url-history-parse-history)
+  (defun . url-history-update-url)
+  (defun . url-history-save-history)
+  (defun . url-have-visited-url)
+  (defun . url-completion-function)
+  (provide . url-history))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/mailcap.elc"
+  (defun . mailcap-delete-duplicates)
+  (defun . mailcap-replace-in-string)
+  mailcap-parse-args-syntax-table mailcap-print-command mailcap-mime-data mailcap-download-directory mailcap-poor-system-types
+  (defun . mailcap-save-binary-file)
+  mailcap-maybe-eval-warning
+  (defun . mailcap-maybe-eval)
+  (defun . mailcap-replace-regexp)
+  mailcap-parsed-p
+  (defun . mailcap-parse-mailcaps)
+  (defun . mailcap-parse-mailcap)
+  (defun . mailcap-parse-mailcap-extras)
+  (defun . mailcap-mailcap-entry-passes-test)
+  (defun . mailcap-possible-viewers)
+  (defun . mailcap-unescape-mime-test)
+  mailcap-viewer-test-cache
+  (defun . mailcap-viewer-passes-test)
+  (defun . mailcap-add-mailcap-entry)
+  (defun . mailcap-add)
+  (defun . mailcap-viewer-lessp)
+  (defun . mailcap-mime-info)
+  mailcap-mime-extensions mailcap-mimetypes-parsed-p
+  (defun . mailcap-parse-mimetypes)
+  (defun . mailcap-parse-mimetype-file)
+  (defun . mailcap-extension-to-mime)
+  (defun . mailcap-command-p)
+  (defun . mailcap-mime-types)
+  (defun . mailcap-file-default-commands)
+  (provide . mailcap))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-auth.elc"
+  (require . url-vars)
+  (require . url-parse)
+  (autoload . url-warn)
+  (autoload . auth-source-user-or-password)
+  (defun . url-auth-user-prompt)
+  url-basic-auth-storage
+  (defun . url-basic-auth)
+  url-digest-auth-storage
+  (defun . url-digest-auth-create-key)
+  (defun . url-digest-auth)
+  url-registered-auth-schemes
+  (t . url-get-authentication)
+  (defun . url-get-authentication)
+  (t . url-register-auth-scheme)
+  (defun . url-register-auth-scheme)
+  (defun . url-auth-registered)
+  (provide . url-auth))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/mail-parse.elc"
+  (require . mail-prsvr)
+  (require . ietf-drums)
+  (require . rfc2231)
+  (require . rfc2047)
+  (require . rfc2045)
+  (defun . mail-header-parse-content-type)
+  (defun . mail-header-parse-content-disposition)
+  (defun . mail-content-type-get)
+  (defun . mail-header-encode-parameter)
+  (t . mail-header-remove-comments)
+  (defun . mail-header-remove-comments)
+  (t . mail-header-remove-whitespace)
+  (defun . mail-header-remove-whitespace)
+  (defun . mail-header-strip)
+  (defun . mail-header-get-comment)
+  (defun . mail-header-parse-address)
+  (defun . mail-header-parse-addresses)
+  (defun . mail-header-parse-date)
+  (defun . mail-narrow-to-head)
+  (defun . mail-quote-string)
+  (defun . mail-header-make-address)
+  (defun . mail-header-fold-field)
+  (defun . mail-header-unfold-field)
+  (defun . mail-header-narrow-to-field)
+  (defun . mail-header-field-value)
+  (defun . mail-encode-encoded-word-region)
+  (defun . mail-encode-encoded-word-buffer)
+  (defun . mail-encode-encoded-word-string)
+  (defun . mail-decode-encoded-word-region)
+  (defun . mail-decode-encoded-word-string)
+  (defun . mail-decode-encoded-address-region)
+  (defun . mail-decode-encoded-address-string)
+  (provide . mail-parse))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/rfc2231.elc"
+  (require . ietf-drums)
+  (require . rfc2047)
+  (autoload . mm-encode-body)
+  (autoload . mail-header-remove-whitespace)
+  (autoload . mail-header-remove-comments)
+  (defun . rfc2231-get-value)
+  (defun . rfc2231-parse-qp-string)
+  (defun . rfc2231-parse-string)
+  (defun . rfc2231-decode-encoded-string)
+  (defun . rfc2231-encode-string)
+  (provide . rfc2231))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/rfc2047.elc"
+  (require . qp)
+  (require . mm-util)
+  (require . ietf-drums)
+  (require . mail-prsvr)
+  (require . rfc2045)
+  (autoload . mm-body-7-or-8)
+  rfc2047-header-encoding-alist rfc2047-charset-encoding-alist rfc2047-encode-function-alist rfc2047-encode-encoded-words rfc2047-allow-irregular-q-encoded-words rfc2047-encoded-word-regexp rfc2047-encoded-word-regexp-loose
+  (defun . rfc2047-qp-or-base64)
+  (defun . rfc2047-narrow-to-field)
+  (defun . rfc2047-field-value)
+  (defun . rfc2047-quote-special-characters-in-quoted-strings)
+  rfc2047-encoding-type
+  (defun . rfc2047-encode-message-header)
+  (defun . rfc2047-encodable-p)
+  rfc2047-syntax-table rfc2047-syntax-table
+  (defun . rfc2047-encode-region)
+  (defun . rfc2047-encode-string)
+  rfc2047-encode-max-chars
+  (defun . rfc2047-encode-1)
+  (defun . rfc2047-encode)
+  (defun . rfc2047-fold-field)
+  (defun . rfc2047-fold-region)
+  (defun . rfc2047-unfold-field)
+  (defun . rfc2047-unfold-region)
+  (defun . rfc2047-b-encode-string)
+  (defun . rfc2047-q-encode-string)
+  (defun . rfc2047-encode-parameter)
+  rfc2047-quote-decoded-words-containing-tspecials rfc2047-allow-incomplete-encoded-text
+  (defun . rfc2047-strip-backslashes-in-quoted-strings)
+  (defun . rfc2047-charset-to-coding-system)
+  (defun . rfc2047-decode-encoded-words)
+  (defun . rfc2047-decode-region)
+  (defun . rfc2047-decode-address-region)
+  (defun . rfc2047-decode-string)
+  (defun . rfc2047-decode-address-string)
+  (defun . rfc2047-pad-base64)
+  (provide . rfc2047))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/rfc2045.elc"
+  (require . ietf-drums)
+  (defun . rfc2045-encode-string)
+  (provide . rfc2045))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/qp.elc"
+  (require . mm-util)
+  (t . quoted-printable-decode-region)
+  (defun . quoted-printable-decode-region)
+  (defun . quoted-printable-decode-string)
+  (defun . quoted-printable-encode-region)
+  (defun . quoted-printable-encode-string)
+  (provide . qp))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/ietf-drums.elc"
+  (require . time-date)
+  (require . mm-util)
+  ietf-drums-no-ws-ctl-token ietf-drums-text-token ietf-drums-specials-token ietf-drums-quote-token ietf-drums-wsp-token ietf-drums-fws-regexp ietf-drums-atext-token ietf-drums-dot-atext-token ietf-drums-qtext-token ietf-drums-tspecials ietf-drums-syntax-table
+  (defun . ietf-drums-token-to-list)
+  (defun . ietf-drums-init)
+  (defun . ietf-drums-remove-comments)
+  (defun . ietf-drums-remove-whitespace)
+  (defun . ietf-drums-get-comment)
+  (defun . ietf-drums-strip)
+  (defun . ietf-drums-parse-address)
+  (defun . ietf-drums-parse-addresses)
+  (defun . ietf-drums-unfold-fws)
+  (defun . ietf-drums-parse-date)
+  (defun . ietf-drums-narrow-to-header)
+  (defun . ietf-drums-quote-string)
+  (defun . ietf-drums-make-address)
+  (provide . ietf-drums))
+ ("/usr/share/emacs/23.0.93/lisp/calendar/time-date.elc"
+  (defun . with-decoded-time-value)
+  (defun . encode-time-value)
+  (autoload . parse-time-string)
+  (t . date-to-time)
+  (defun . date-to-time)
+  (t . time-to-seconds)
+  (defun . time-to-seconds)
+  (t . seconds-to-time)
+  (defun . seconds-to-time)
+  (t . time-less-p)
+  (defun . time-less-p)
+  (t . days-to-time)
+  (defun . days-to-time)
+  (t . time-since)
+  (defun . time-since)
+  (defun . subtract-time)
+  (t . time-subtract)
+  (defun . time-subtract)
+  (t . time-add)
+  (defun . time-add)
+  (t . date-to-day)
+  (defun . date-to-day)
+  (t . days-between)
+  (defun . days-between)
+  (t . date-leap-year-p)
+  (defun . date-leap-year-p)
+  (t . time-to-day-in-year)
+  (defun . time-to-day-in-year)
+  (t . time-to-days)
+  (defun . time-to-days)
+  (defun . time-to-number-of-days)
+  (t . safe-date-to-time)
+  (defun . safe-date-to-time)
+  (t . format-seconds)
+  (defun . format-seconds)
+  (provide . time-date))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-cookie.elc"
+  (require . timezone)
+  (require . url-util)
+  (require . url-parse)
+  (defun . url-cookie-tag)
+  (defun . url-cookie-name)
+  (defun . url-cookie-value)
+  (defun . url-cookie-expires)
+  (defun . url-cookie-localpart)
+  (defun . url-cookie-domain)
+  (defun . url-cookie-secure)
+  (defun . url-cookie-create)
+  url-cookie-storage url-cookie-secure-storage url-cookie-file url-cookie-confirmation url-cookie-multiple-line url-cookies-changed-since-last-save
+  (defun . url-cookie-parse-file)
+  (defun . url-cookie-clean-up)
+  (defun . url-cookie-write-file)
+  (defun . url-cookie-store)
+  (defun . url-cookie-expired-p)
+  (defun . url-cookie-retrieve)
+  (defun . url-cookie-generate-header-lines)
+  url-cookie-two-dot-domains url-cookie-trusted-urls url-cookie-untrusted-urls
+  (defun . url-cookie-host-can-set-p)
+  (defun . url-cookie-handle-set-cookie)
+  url-cookie-timer url-cookie-save-interval
+  (defun . url-cookie-setup-save-timer)
+  (provide . url-cookie))
+ ("/usr/share/emacs/23.0.93/lisp/timezone.elc" timezone-world-timezones timezone-months-assoc
+  (t . timezone-make-date-arpa-standard)
+  (defun . timezone-make-date-arpa-standard)
+  (defun . timezone-make-date-sortable)
+  (defun . timezone-make-arpa-date)
+  (defun . timezone-make-sortable-date)
+  (defun . timezone-make-time-string)
+  (t . timezone-parse-date)
+  (defun . timezone-parse-date)
+  (defun . timezone-parse-time)
+  (defun . timezone-zone-to-minute)
+  (defun . timezone-time-from-absolute)
+  (defun . timezone-time-zone-from-absolute)
+  (defun . timezone-fix-time)
+  (defun . timezone-last-day-of-month)
+  (defun . timezone-leap-year-p)
+  (defun . timezone-day-number)
+  (defun . timezone-absolute-from-gregorian)
+  (provide . timezone))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-util.elc"
+  (require . url-parse)
+  (autoload . timezone-parse-date)
+  (autoload . timezone-make-date-arpa-standard)
+  (autoload . mail-header-extract)
+  url-parse-args-syntax-table url-debug
+  (t . url-debug)
+  (defun . url-debug)
+  (t . url-parse-args)
+  (defun . url-parse-args)
+  (t . url-insert-entities-in-string)
+  (defun . url-insert-entities-in-string)
+  (t . url-normalize-url)
+  (defun . url-normalize-url)
+  (t . url-lazy-message)
+  (defun . url-lazy-message)
+  (t . url-get-normalized-date)
+  (defun . url-get-normalized-date)
+  (t . url-eat-trailing-space)
+  (defun . url-eat-trailing-space)
+  (t . url-strip-leading-spaces)
+  (defun . url-strip-leading-spaces)
+  (t . url-pretty-length)
+  (defun . url-pretty-length)
+  (t . url-display-percentage)
+  (defun . url-display-percentage)
+  (t . url-percentage)
+  (defun . url-percentage)
+  (defun . url-basepath)
+  (t . url-file-directory)
+  (defun . url-file-directory)
+  (t . url-file-nondirectory)
+  (defun . url-file-nondirectory)
+  (t . url-parse-query-string)
+  (defun . url-parse-query-string)
+  (defun . url-unhex)
+  (t . url-unhex-string)
+  (defun . url-unhex-string)
+  url-unreserved-chars
+  (t . url-hexify-string)
+  (defun . url-hexify-string)
+  (t . url-file-extension)
+  (defun . url-file-extension)
+  (t . url-truncate-url-for-viewing)
+  (defun . url-truncate-url-for-viewing)
+  (t . url-view-url)
+  (defun . url-view-url)
+  url-get-url-filename-chars
+  (defun . url-get-url-at-point)
+  (defun . url-generate-unique-filename)
+  (defun . url-extract-mime-headers)
+  (defun . url-make-private-file)
+  (provide . url-util))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-gw.elc"
+  (require . url-vars)
+  (autoload . socks-open-network-stream)
+  (autoload . open-ssl-stream)
+  (autoload . open-tls-stream)
+  url-gateway-local-host-regexp url-gateway-prompt-pattern url-gateway-rlogin-host url-gateway-rlogin-user-name url-gateway-rlogin-parameters url-gateway-telnet-host url-gateway-telnet-parameters url-gateway-telnet-login-prompt url-gateway-telnet-password-prompt url-gateway-telnet-user-name url-gateway-telnet-password url-gateway-broken-resolution url-gateway-nslookup-program
+  (t . url-gateway-nslookup-host)
+  (defun . url-gateway-nslookup-host)
+  (defun . url-wait-for-string)
+  (defun . url-open-rlogin)
+  (defun . url-open-telnet)
+  (t . url-open-stream)
+  (defun . url-open-stream)
+  (provide . url-gw))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-methods.elc"
+  (require . url-parse)
+  url-scheme-registry url-scheme-methods url-scheme-default-properties url-scheme-default-properties
+  (defun . url-scheme-default-loader)
+  (defun . url-scheme-register-proxy)
+  (t . url-scheme-get-property)
+  (defun . url-scheme-get-property)
+  (provide . url-methods))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-parse.elc"
+  (require . url-vars)
+  (autoload . url-scheme-get-property)
+  (defun . url-type)
+  (defun . url-user)
+  (defun . url-password)
+  (defun . url-host)
+  (defun . url-portspec)
+  (defun . url-filename)
+  (defun . url-target)
+  (defun . url-attributes)
+  (defun . url-fullness)
+  (defun . url-p)
+  (defun . url-parse-make-urlobj)
+  (defun . url-port)
+  (t . url-recreate-url)
+  (defun . url-recreate-url)
+  (defun . url-recreate-url-attributes)
+  (t . url-generic-parse-url)
+  (defun . url-generic-parse-url)
+  (provide . url-parse))
+ ("/usr/share/emacs/23.0.93/lisp/url/url-vars.elc"
+  (require . mm-util)
+  url-version url-current-object url-current-mime-headers url-honor-refresh-requests url-automatic-caching url-cache-expired url-bug-address url-personal-mail-address url-directory-index-file url-privacy-level url-inhibit-uncompression url-uncompressor-alist url-mail-command url-proxy-services url-standalone-mode url-mime-separator-chars url-bad-port-list url-mime-content-type-charset-regexp url-request-data url-request-extra-headers url-request-method url-mime-encoding-string
+  (defun . url-mime-charset-string)
+  url-mime-charset-string
+  (defun . url-set-mime-charset-string)
+  url-mime-language-string url-mime-accept-string url-package-version url-package-name url-system-type url-os-type url-max-password-attempts url-temporary-directory url-show-status url-using-proxy url-news-server url-nonrelative-link url-max-redirections url-confirmation-func url-gateway-method url-setup-done url-weekday-alist url-weekday-alist url-monthabbrev-alist url-monthabbrev-alist url-lazy-message-time url-extensions-header url-parse-syntax-table url-load-hook url-working-buffer url-working-buffer url-gateway-unplugged
+  (provide . url-vars))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/mm-util.elc"
+  (require . mail-prsvr)
+  (require . timer)
+  (defun . mm-coding-system-list)
+  (defun . mm-char-int)
+  (defun . mm-coding-system-equal)
+  (defun . mm-annotationp)
+  (defun . mm-set-buffer-file-coding-system)
+  (defun . mm-read-charset)
+  (defun . mm-subst-char-in-string)
+  (defun . mm-replace-in-string)
+  (defun . mm-string-as-unibyte)
+  (defun . mm-string-make-unibyte)
+  (defun . mm-string-as-multibyte)
+  (defun . mm-multibyte-string-p)
+  (defun . mm-insert-byte)
+  (defun . mm-multibyte-char-to-unibyte)
+  (defun . mm-set-buffer-multibyte)
+  (defun . mm-special-display-p)
+  (defun . mm-substring-no-properties)
+  (defun . mm-line-number-at-pos)
+  (defun . mm-decode-coding-string)
+  (defun . mm-encode-coding-string)
+  (defun . mm-decode-coding-region)
+  (defun . mm-encode-coding-region)
+  (defun . mm-string-to-multibyte)
+  (defun . mm-char-or-char-int-p)
+  (defun . mm-ucs-to-char)
+  (defun . mm-read-coding-system)
+  mm-coding-system-list
+  (defun . mm-get-coding-system-list)
+  (defun . mm-coding-system-p)
+  (defun . mm-codepage-setup)
+  mm-charset-synonym-alist mm-codepage-iso-8859-list mm-codepage-ibm-list
+  (defun . mm-setup-codepage-iso-8859)
+  (defun . mm-setup-codepage-ibm)
+  mm-charset-eval-alist
+  (defun . mm-charset-to-coding-system)
+  mm-charset-override-alist mm-binary-coding-system mm-text-coding-system mm-text-coding-system-for-write mm-auto-save-coding-system mm-universal-coding-system mm-mime-mule-charset-alist
+  (defun . mm-enrich-utf-8-by-mule-ucs)
+  mm-hack-charsets mm-iso-8859-15-compatible mm-iso-8859-x-to-15-table mm-coding-system-priorities mm-use-find-coding-systems-region
+  (defun . mm-mule-charset-to-mime-charset)
+  mm-emacs-mule
+  (defun . mm-enable-multibyte)
+  (defun . mm-disable-multibyte)
+  (defun . mm-preferred-coding-system)
+  (defun . mm-guess-charset)
+  (defun . mm-charset-after)
+  (defun . mm-mime-charset)
+  (defun . mm-delete-duplicates)
+  (defun . mm-multibyte-p)
+  (defun . mm-default-multibyte-p)
+  (defun . mm-iso-8859-x-to-15-region)
+  (defun . mm-sort-coding-systems-predicate)
+  (defun . mm-xemacs-find-mime-charset-1)
+  (defun . mm-xemacs-find-mime-charset)
+  (defun . mm-find-mime-charset-region)
+  (defun . mm-with-unibyte-buffer)
+  (defun . mm-with-multibyte-buffer)
+  (defun . mm-with-unibyte-current-buffer)
+  (defun . mm-find-charset-region)
+  (defun . mm-auto-mode-alist)
+  mm-inhibit-file-name-handlers
+  (defun . mm-insert-file-contents)
+  (defun . mm-append-to-file)
+  (defun . mm-write-region)
+  (autoload . gmm-write-region)
+  (defun . mm-make-temp-file)
+  (defun . mm-image-load-path)
+  (defun . mm-detect-coding-region)
+  (defun . mm-detect-mime-charset-region)
+  (defun . mm-coding-system-to-mime-charset)
+  (defun . mm-decompress-buffer)
+  (defun . mm-find-buffer-file-coding-system)
+  (provide . mm-util))
+ ("/usr/share/emacs/23.0.93/lisp/gnus/mail-prsvr.elc" mail-parse-charset mail-parse-mule-charset mail-parse-ignored-charsets
+  (provide . mail-prsvr))
+ ("/home/hobbes/nxhtml/util/ffip.el"
+  (require . cl)
+  ffip-project-name ffip-project-roots ffip-project-type ffip-project-file-types ffip-project-file-matcher ffip-project-files-table
+  (defun . ffip-reset-project)
+  (defun . ffip-is-current)
+  (defun . ffip-set-current-project)
+  (defun . ffip-cache-project-files)
+  (defun . ffip-file-matcher)
+  (defun . ffip-project-files)
+  (defun . ffip-project-root)
+  (defun . ffip-populate-files-table)
+  (defun . ffip-get-unique-directory-names)
+  (defun . ffip-file-is-in-project)
+  (defun . ffip-add-file-if-in-project)
+  (defun . ffip-after-save)
+  (defun . ffip-find-file-in-dirtree)
+  (defun . ffip-find-file-in-project)
+  (provide . ffip))
+ ("/home/hobbes/nxhtml/util/ourcomments-util.el" ourcomments-util:version
+  (require . apropos)
+  (require . cl)
+  (require . grep)
+  (require . ido)
+  (require . recentf)
+  (defun . point-to-coord)
+  (t . popup-menu-at-point)
+  (defun . popup-menu-at-point)
+  (t . define-toggle)
+  (defun . define-toggle)
+  (t . unfill-paragraph)
+  (defun . unfill-paragraph)
+  (t . unfill-region)
+  (defun . unfill-region)
+  (t . unfill-individual-paragraphs)
+  (defun . unfill-individual-paragraphs)
+  (defun . with-unfilling)
+  (t . major-or-multi-majorp)
+  (defun . major-or-multi-majorp)
+  (t . multi-major-modep)
+  (defun . multi-major-modep)
+  (t . major-modep)
+  (defun . major-modep)
+  (t . ourcomments-move-beginning-of-line)
+  (defun . ourcomments-move-beginning-of-line)
+  (t . ourcomments-move-end-of-line)
+  (defun . ourcomments-move-end-of-line)
+  (defun . ourcomments-find-keymap-variables)
+  (defun . key-bindings)
+  (defun . describe-keymap-placement)
+  (t . describe-key-and-map-briefly)
+  (defun . describe-key-and-map-briefly)
+  wrap-to-fill-left-marg wrap-to-fill-left-marg-use wrap-to-fill-left-marg-modes
+  (defun . wrap-to-fill-set-prefix)
+  (defun . wrap-to-fill-after-change)
+  (defun . wrap-to-fill-scroll-fun)
+  (defun . wrap-to-fill-wider)
+  (defun . wrap-to-fill-narrower)
+  wrap-to-fill-column-mode-map wrap-to-fill-column-mode
+  (t . wrap-to-fill-column-mode)
+  (defun . wrap-to-fill-column-mode)
+  (defun . wrap-to-fill-set-values)
+  (defun . wrap-to-fill-set-values-1)
+  better-bottom-angles-defaults
+  (defun . better-fringes-bottom-angles)
+  (defun . better-fringes-faces)
+  (defface . better-fringes-bitmap)
+  (defface . better-fringes-important-bitmap)
+  better-fringes-mode
+  (t . better-fringes-mode)
+  (defun . better-fringes-mode)
+  (t . find-emacs-other-file)
+  (defun . find-emacs-other-file)
+  (t . ourcomments-ediff-files)
+  (defun . ourcomments-ediff-files)
+  (defun . ourcomments-latest-changelog)
+  (defun . ourcomments-read-symbol)
+  (defun . ourcomments-command-at-point)
+  (t . describe-command)
+  (defun . describe-command)
+  (defun . buffer-narrowed-p)
+  describe-symbol-alist
+  (defun . describe-symbol-add-known)
+  (defun . property-list-keys)
+  (defun . ourcomments-symbol-type)
+  (defun . ourcomments-defstruct-p)
+  (defun . ourcomments-defstruct-slots)
+  (defun . ourcomments-defstruct-file)
+  (defun . ourcomments-member-defstruct)
+  (defun . ourcomments-custom-group-p)
+  (t . describe-custom-group)
+  (defun . describe-custom-group)
+  (t . describe-defstruct)
+  (defun . describe-defstruct)
+  (t . describe-symbol)
+  (defun . describe-symbol)
+  (defun . ourcomments-format-plist)
+  ourcomments-ido-visit-method
+  (t . ourcomments-ido-buffer-other-window)
+  (defun . ourcomments-ido-buffer-other-window)
+  (t . ourcomments-ido-buffer-other-frame)
+  (defun . ourcomments-ido-buffer-other-frame)
+  (t . ourcomments-ido-buffer-raise-frame)
+  (defun . ourcomments-ido-buffer-raise-frame)
+  (defun . ourcomments-ido-mode-advice)
+  ourcomments-ido-adviced ourcomments-ido-old-state
+  (defun . ourcomments-ido-ctrl-tab-activate)
+  ourcomments-ido-ctrl-tab
+  (defun . ourcomments-find-emacs)
+  (t . emacs)
+  (defun . emacs)
+  (t . emacs-buffer-file)
+  (defun . emacs-buffer-file)
+  (t . emacs--debug-init)
+  (defun . emacs--debug-init)
+  (t . emacs-Q)
+  (defun . emacs-Q)
+  (t . emacs-Q-nxhtml)
+  (defun . emacs-Q-nxhtml)
+  (defun . grep-get-buffer-files)
+  grep-query-replace-defaults
+  (t . grep-query-replace)
+  (defun . grep-query-replace)
+  (defun . ldir-query-replace)
+  (defun . rdir-query-replace)
+  (defun . rdir-get-files)
+  (defun . dir-replace-read-parameters)
+  replace-read-files-history
+  (defun . replace-read-files)
+  (t . info-open-file)
+  (defun . info-open-file)
+  (provide . ourcomments-util))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/advice.elc"
+  (provide . advice-preload)
+  (require . advice-preload)
+  ad-version ad-version ad-redefinition-action ad-default-compilation-action
+  (defun . ad-substitute-tree)
+  (defun . ad-copy-tree)
+  (defun . ad-dolist)
+  (defun . ad-do-return)
+  (defun . ad-save-real-definition)
+  (defun . ad-save-real-definitions)
+  ad-advised-functions
+  (defun . ad-pushnew-advised-function)
+  (defun . ad-pop-advised-function)
+  (defun . ad-do-advised-functions)
+  (defun . ad-get-advice-info)
+  (defun . ad-get-advice-info-macro)
+  (defun . ad-set-advice-info)
+  (defun . ad-copy-advice-info)
+  (defun . ad-is-advised)
+  (defun . ad-initialize-advice-info)
+  (defun . ad-get-advice-info-field)
+  (defun . ad-set-advice-info-field)
+  (defun . ad-is-active)
+  (defun . ad-make-advice)
+  (defun . ad-advice-name)
+  (defun . ad-advice-protected)
+  (defun . ad-advice-enabled)
+  (defun . ad-advice-definition)
+  (defun . ad-advice-set-enabled)
+  (defun . ad-class-p)
+  (defun . ad-name-p)
+  (defun . ad-position-p)
+  ad-advice-classes
+  (defun . ad-has-enabled-advice)
+  (defun . ad-has-redefining-advice)
+  (defun . ad-has-any-advice)
+  (defun . ad-get-enabled-advices)
+  (defun . ad-activate-internal)
+  (defun . ad-activate-internal-off)
+  ad-activate-on-top-level
+  (defun . ad-with-auto-activation-disabled)
+  (defun . ad-safe-fset)
+  (defun . ad-make-origname)
+  (defun . ad-get-orig-definition)
+  (defun . ad-set-orig-definition)
+  (defun . ad-clear-orig-definition)
+  (defun . ad-read-advised-function)
+  ad-advice-class-completion-table
+  (defun . ad-read-advice-class)
+  (defun . ad-read-advice-name)
+  (defun . ad-read-advice-specification)
+  ad-last-regexp
+  (defun . ad-read-regexp)
+  (defun . ad-find-advice)
+  (defun . ad-advice-position)
+  (defun . ad-find-some-advice)
+  (defun . ad-enable-advice-internal)
+  (t . ad-enable-advice)
+  (defun . ad-enable-advice)
+  (t . ad-disable-advice)
+  (defun . ad-disable-advice)
+  (defun . ad-enable-regexp-internal)
+  (defun . ad-enable-regexp)
+  (defun . ad-disable-regexp)
+  (defun . ad-remove-advice)
+  (t . ad-add-advice)
+  (defun . ad-add-advice)
+  (defun . ad-macrofy)
+  (defun . ad-lambdafy)
+  (defun . ad-special-form-p)
+  (defun . ad-subr-p)
+  (defun . ad-macro-p)
+  (defun . ad-lambda-p)
+  (defun . ad-advice-p)
+  (defun . ad-compiled-p)
+  (defun . ad-compiled-code)
+  (defun . ad-lambda-expression)
+  (defun . ad-arglist)
+  (defun . ad-define-subr-args)
+  (defun . ad-undefine-subr-args)
+  (defun . ad-subr-args-defined-p)
+  (defun . ad-get-subr-args)
+  (defun . ad-subr-arglist)
+  (defun . ad-docstring)
+  (defun . ad-interactive-form)
+  (defun . ad-body-forms)
+  (defun . ad-make-advised-definition-docstring)
+  (defun . ad-advised-definition-p)
+  (defun . ad-definition-type)
+  (defun . ad-has-proper-definition)
+  (defun . ad-real-definition)
+  (defun . ad-real-orig-definition)
+  (defun . ad-is-compilable)
+  (defun . ad-compile-function)
+  (defun . ad-prognify)
+  (defun . ad-parse-arglist)
+  (defun . ad-retrieve-args-form)
+  (defun . ad-arg-binding-field)
+  (defun . ad-list-access)
+  (defun . ad-element-access)
+  (defun . ad-access-argument)
+  (defun . ad-get-argument)
+  (defun . ad-set-argument)
+  (defun . ad-get-arguments)
+  (defun . ad-set-arguments)
+  (defun . ad-insert-argument-access-forms)
+  (defun . ad-map-arglists)
+  (defun . ad-make-mapped-call)
+  (defun . ad-make-single-advice-docstring)
+  (require . help-fns)
+  (defun . ad-make-advised-docstring)
+  (defun . ad-make-plain-docstring)
+  (defun . ad-make-freeze-docstring)
+  (defun . ad-advised-arglist)
+  (defun . ad-advised-interactive-form)
+  (defun . ad-make-advised-definition)
+  (defun . ad-assemble-advised-definition)
+  (defun . ad-make-hook-form)
+  (defun . ad-get-cache-definition)
+  (defun . ad-get-cache-id)
+  (defun . ad-set-cache)
+  (defun . ad-clear-cache)
+  (defun . ad-make-cache-id)
+  (defun . ad-get-cache-class-id)
+  (defun . ad-verify-cache-class-id)
+  (defun . ad-cache-id-verification-code)
+  (defun . ad-verify-cache-id)
+  (defun . ad-preactivate-advice)
+  (defun . ad-make-freeze-definition)
+  (defun . ad-should-compile)
+  (defun . ad-activate-advised-definition)
+  (defun . ad-handle-definition)
+  (t . ad-activate)
+  (defun . ad-activate)
+  (defun . ad-activate-on)
+  (defun . ad-deactivate)
+  (defun . ad-update)
+  (defun . ad-unadvise)
+  (defun . ad-recover)
+  (defun . ad-activate-regexp)
+  (defun . ad-deactivate-regexp)
+  (defun . ad-update-regexp)
+  (defun . ad-activate-all)
+  (defun . ad-deactivate-all)
+  (defun . ad-update-all)
+  (defun . ad-unadvise-all)
+  (defun . ad-recover-all)
+  ad-defadvice-flags
+  (t . defadvice)
+  (defun . defadvice)
+  (defun . ad-with-originals)
+  (defun . ad-start-advice)
+  (defun . ad-stop-advice)
+  (defun . ad-recover-normality)
+  (provide . advice))
+ ("/usr/share/emacs/23.0.93/lisp/help-fns.elc"
+  (require . help-mode)
+  (t . describe-function)
+  (defun . describe-function)
+  (defun . help-split-fundoc)
+  (defun . help-add-fundoc-usage)
+  (defun . help-function-arglist)
+  (defun . help-make-usage)
+  (t . help-C-file-name)
+  (defun . help-C-file-name)
+  (defface . help-argument-name)
+  (defun . help-default-arg-highlight)
+  (defun . help-do-arg-highlight)
+  (defun . help-highlight-arguments)
+  (t . find-lisp-object-file-name)
+  (defun . find-lisp-object-file-name)
+  (t . describe-function-1)
+  (defun . describe-function-1)
+  (t . variable-at-point)
+  (defun . variable-at-point)
+  (defun . describe-variable-custom-version-info)
+  (t . describe-variable)
+  (defun . describe-variable)
+  (t . describe-syntax)
+  (defun . describe-syntax)
+  (defun . help-describe-category-set)
+  (t . describe-categories)
+  (defun . describe-categories)
+  (provide . help-fns))
+ ("/usr/share/emacs/23.0.93/lisp/help-mode.elc"
+  (require . button)
+  (require . view)
+  help-mode-map help-mode-menu
+  (defun . help-mode-menu)
+  help-xref-stack help-xref-forward-stack help-xref-stack-item help-xref-stack-forward-item help-mode-hook
+  (defun . help-button-action)
+  (t . help-mode)
+  (defun . help-mode)
+  (t . help-mode-setup)
+  (defun . help-mode-setup)
+  (t . help-mode-finish)
+  (defun . help-mode-finish)
+  help-back-label help-forward-label help-xref-symbol-regexp help-xref-mule-regexp help-xref-info-regexp help-xref-url-regexp
+  (t . help-setup-xref)
+  (defun . help-setup-xref)
+  help-xref-following
+  (t . help-buffer)
+  (defun . help-buffer)
+  help-xref-override-view-map
+  (t . help-make-xrefs)
+  (defun . help-make-xrefs)
+  (t . help-xref-button)
+  (defun . help-xref-button)
+  (t . help-insert-xref-button)
+  (defun . help-insert-xref-button)
+  (t . help-xref-on-pp)
+  (defun . help-xref-on-pp)
+  (defun . help-xref-interned)
+  (defun . help-xref-go-back)
+  (defun . help-xref-go-forward)
+  (defun . help-go-back)
+  (defun . help-go-forward)
+  (defun . help-do-xref)
+  (defun . help-follow-mouse)
+  (defun . help-follow)
+  (defun . help-follow-symbol)
+  (defun . help-insert-string)
+  (provide . help-mode))
+ ("/usr/share/emacs/23.0.93/lisp/view.elc" view-highlight-face view-scroll-auto-exit view-try-extend-at-buffer-end view-remove-frame-by-deleting view-exits-all-viewing-windows view-inhibit-help-message view-mode view-mode-hook view-old-buffer-read-only view-page-size view-half-page-size view-last-regexp view-return-to-alist view-exit-action view-no-disable-on-exit view-overlay view-mode-map
+  (t . kill-buffer-if-not-modified)
+  (defun . kill-buffer-if-not-modified)
+  (t . view-file)
+  (defun . view-file)
+  (t . view-file-other-window)
+  (defun . view-file-other-window)
+  (t . view-file-other-frame)
+  (defun . view-file-other-frame)
+  (t . view-buffer)
+  (defun . view-buffer)
+  (t . view-buffer-other-window)
+  (defun . view-buffer-other-window)
+  (t . view-buffer-other-frame)
+  (defun . view-buffer-other-frame)
+  (t . view-mode)
+  (defun . view-mode)
+  (defun . view-mode-enable)
+  (defun . view-mode-disable)
+  (t . view-return-to-alist-update)
+  (defun . view-return-to-alist-update)
+  (t . view-mode-enter)
+  (defun . view-mode-enter)
+  (defun . view-mode-exit)
+  (defun . View-exit)
+  (t . View-exit-and-edit)
+  (defun . View-exit-and-edit)
+  (defun . View-leave)
+  (defun . View-quit)
+  (defun . View-quit-all)
+  (defun . View-kill-and-leave)
+  (defun . view-window-size)
+  (defun . view-recenter)
+  (defun . view-page-size-default)
+  (defun . view-set-half-page-size-default)
+  (defun . View-goto-percent)
+  (defun . View-goto-line)
+  (defun . View-back-to-mark)
+  (defun . view-scroll-lines)
+  (defun . view-really-at-end)
+  (defun . view-end-message)
+  (defun . View-scroll-to-buffer-end)
+  (defun . View-scroll-page-forward)
+  (defun . View-scroll-page-backward)
+  (defun . View-scroll-page-forward-set-page-size)
+  (defun . View-scroll-page-backward-set-page-size)
+  (defun . View-scroll-line-forward)
+  (defun . View-scroll-line-backward)
+  (defun . View-scroll-half-page-forward)
+  (defun . View-scroll-half-page-backward)
+  (defun . View-revert-buffer-scroll-page-forward)
+  (defun . View-search-regexp-forward)
+  (defun . View-search-regexp-backward)
+  (defun . View-search-last-regexp-forward)
+  (defun . View-search-last-regexp-backward)
+  (defun . view-search)
+  (defun . view-search-no-match-lines)
+  (provide . view))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/easy-mmode.elc"
+  (defun . easy-mmode-pretty-mode-name)
+  (defun . easy-mmode-define-minor-mode)
+  (t . define-minor-mode)
+  (defun . define-minor-mode)
+  (defun . easy-mmode-define-global-mode)
+  (defun . define-global-minor-mode)
+  (t . define-globalized-minor-mode)
+  (defun . define-globalized-minor-mode)
+  (defun . easy-mmode-set-keymap-parents)
+  (t . easy-mmode-define-keymap)
+  (defun . easy-mmode-define-keymap)
+  (t . easy-mmode-defmap)
+  (defun . easy-mmode-defmap)
+  (defun . easy-mmode-define-syntax)
+  (t . easy-mmode-defsyntax)
+  (defun . easy-mmode-defsyntax)
+  (defun . easy-mmode-define-navigation)
+  (provide . easy-mmode))
+ ("/usr/share/emacs/23.0.93/lisp/recentf.elc"
+  (require . easymenu)
+  (require . tree-widget)
+  (require . timer)
+  recentf-list
+  (defun . recentf-enabled-p)
+  recentf-max-saved-items recentf-save-file recentf-save-file-modes recentf-exclude
+  (defun . recentf-keep-default-predicate)
+  recentf-keep
+  (defun . recentf-menu-customization-changed)
+  recentf-menu-title recentf-menu-path recentf-menu-before recentf-menu-action recentf-max-menu-items recentf-menu-filter recentf-menu-open-all-flag recentf-menu-append-commands-p recentf-menu-append-commands-flag recentf-auto-cleanup recentf-initialize-file-name-history recentf-load-hook recentf-filename-handlers recentf-show-file-shortcuts-flag recentf-case-fold-search
+  (defun . recentf-string-equal)
+  (defun . recentf-string-lessp)
+  (defun . recentf-string-member)
+  (defun . recentf-trunc-list)
+  (defun . recentf-dump-variable)
+  recentf-auto-cleanup-timer
+  (defun . recentf-auto-cleanup)
+  (defun . recentf-push)
+  (defun . recentf-apply-filename-handlers)
+  (defun . recentf-expand-file-name)
+  (defun . recentf-include-p)
+  (defun . recentf-keep-p)
+  (defun . recentf-add-file)
+  (defun . recentf-remove-if-non-kept)
+  (defun . recentf-directory-compare)
+  (defun . recentf-digit-shortcut-command-name)
+  (defun . recentf-open-most-recent-file-0)
+  (defun . recentf-open-most-recent-file-9)
+  (defun . recentf-open-most-recent-file-8)
+  (defun . recentf-open-most-recent-file-7)
+  (defun . recentf-open-most-recent-file-6)
+  (defun . recentf-open-most-recent-file-5)
+  (defun . recentf-open-most-recent-file-4)
+  (defun . recentf-open-most-recent-file-3)
+  (defun . recentf-open-most-recent-file-2)
+  (defun . recentf-open-most-recent-file-1)
+  recentf--shortcuts-keymap recentf-menu-items-for-commands recentf-menu-filter-commands
+  (defun . recentf-elements)
+  (defun . recentf-make-menu-element)
+  (defun . recentf-menu-element-item)
+  (defun . recentf-menu-element-value)
+  (defun . recentf-set-menu-element-item)
+  (defun . recentf-set-menu-element-value)
+  (defun . recentf-sub-menu-element-p)
+  (defun . recentf-make-default-menu-element)
+  (defun . recentf-menu-elements)
+  (defun . recentf-apply-menu-filter)
+  (defun . recentf-make-menu-items)
+  (defun . recentf-menu-value-shortcut)
+  (defun . recentf-make-menu-item)
+  (defun . recentf-menu-bar)
+  (defun . recentf-show-menu)
+  (defun . recentf-hide-menu)
+  (defun . recentf-sort-ascending)
+  (defun . recentf-sort-descending)
+  (defun . recentf-sort-basenames-ascending)
+  (defun . recentf-sort-basenames-descending)
+  (defun . recentf-sort-directories-ascending)
+  (defun . recentf-sort-directories-descending)
+  (defun . recentf-show-basenames)
+  (defun . recentf-show-basenames-ascending)
+  (defun . recentf-show-basenames-descending)
+  (defun . recentf-relative-filter)
+  recentf-arrange-rules recentf-arrange-by-rule-others recentf-arrange-by-rules-min-items recentf-arrange-by-rule-subfilter
+  (defun . recentf-match-rule)
+  (defun . recentf-arrange-by-rule)
+  (defun . recentf-indirect-mode-rule)
+  (defun . recentf-build-mode-rules)
+  (defun . recentf-arrange-by-mode)
+  (defun . recentf-file-name-nondir)
+  (defun . recentf-dir-rule)
+  (defun . recentf-arrange-by-dir)
+  recentf-filter-changer-current recentf-filter-changer-alist
+  (defun . recentf-filter-changer-select)
+  (defun . recentf-filter-changer)
+  (defun . recentf-track-opened-file)
+  (defun . recentf-track-closed-file)
+  recentf-used-hooks
+  (defun . recentf-cancel-dialog)
+  (defun . recentf-dialog-goto-first)
+  recentf-dialog-mode-map recentf-dialog-mode-map
+  (defun . recentf-dialog-mode)
+  (defun . recentf-dialog)
+  recentf-edit-list
+  (defun . recentf-edit-list-select)
+  (defun . recentf-edit-list-validate)
+  (defun . recentf-edit-list)
+  (defun . recentf-open-files-action)
+  recentf--files-with-key
+  (defun . recentf-show-digit-shortcut-filter)
+  (defun . recentf-open-files-item)
+  (defun . recentf-open-files-items)
+  (defun . recentf-open-files)
+  (defun . recentf-open-more-files)
+  (defun . recentf-open-most-recent-file)
+  recentf-save-file-header recentf-save-file-coding-system
+  (defun . recentf-save-list)
+  (defun . recentf-load-list)
+  (defun . recentf-cleanup)
+  recentf-mode-map recentf-mode
+  (t . recentf-mode)
+  (defun . recentf-mode)
+  (provide . recentf))
+ ("/usr/share/emacs/23.0.93/lisp/tree-widget.elc"
+  (require . wid-edit)
+  tree-widget-image-enable tree-widget-themes-load-path tree-widget-themes-directory tree-widget-theme tree-widget-image-properties-emacs tree-widget-image-properties-xemacs tree-widget-space-width
+  (defun . tree-widget-use-image-p)
+  (defun . tree-widget-create-image)
+  (defun . tree-widget-image-formats)
+  tree-widget--theme
+  (defun . tree-widget-theme-name)
+  (defun . tree-widget-set-parent-theme)
+  (defun . tree-widget-set-theme)
+  (defun . tree-widget--locate-sub-directory)
+  (defun . tree-widget-themes-path)
+  tree-widget--cursors tree-widget--cursors
+  (defun . tree-widget-set-image-properties)
+  (defun . tree-widget-image-properties)
+  (defun . tree-widget-lookup-image)
+  (defun . tree-widget-find-image)
+  (defun . tree-widget-button-click)
+  tree-widget-button-keymap
+  (defun . tree-widget-p)
+  (defun . tree-widget-node)
+  (defun . tree-widget-keep)
+  (defun . tree-widget-children-value-save)
+  tree-widget-before-create-icon-functions
+  (defun . tree-widget-icon-create)
+  (defun . tree-widget-convert-widget)
+  (defun . tree-widget-value-create)
+  (defun . tree-widget-leaf-node-icon-p)
+  (defun . tree-widget-icon-action)
+  (defun . tree-widget-icon-help-echo)
+  tree-widget-after-toggle-functions
+  (defun . tree-widget-action)
+  (defun . tree-widget-help-echo)
+  (defun . tree-widget-expander-p)
+  (provide . tree-widget))
+ ("/usr/share/emacs/23.0.93/lisp/ido.elc"
+  (defun . ido-fractionp)
+  ido-mode ido-everywhere ido-case-fold ido-ignore-buffers ido-ignore-files ido-ignore-extensions ido-show-dot-for-dired ido-file-extensions-order ido-ignore-directories ido-ignore-directories-merge ido-default-file-method ido-default-buffer-method ido-enable-flex-matching ido-enable-regexp ido-enable-prefix ido-enable-dot-prefix ido-confirm-unique-completion ido-cannot-complete-command ido-record-commands ido-max-prospects ido-max-file-prompt-width ido-max-window-height ido-enable-last-directory-history ido-max-work-directory-list ido-work-directory-list-ignore-regexps ido-use-filename-at-point ido-use-url-at-point ido-enable-tramp-completion ido-record-ftp-work-directories ido-merge-ftp-work-directories ido-cache-ftp-work-directory-time ido-slow-ftp-hosts ido-slow-ftp-host-regexps ido-unc-hosts-cache ido-unc-hosts ido-downcase-unc-hosts ido-ignore-unc-host-regexps ido-cache-unc-host-shares-time ido-max-work-file-list ido-work-directory-match-only ido-auto-merge-work-directories-length ido-auto-merge-delay-time ido-auto-merge-inhibit-characters-regexp ido-merged-indicator ido-max-dir-file-cache ido-max-directory-size ido-rotate-file-list-default ido-enter-matching-directory ido-create-new-buffer ido-setup-hook ido-separator ido-decorations ido-use-faces
+  (defface . ido-first-match)
+  (defface . ido-only-match)
+  (defface . ido-subdir)
+  (defface . ido-indicator)
+  (defface . ido-incomplete-regexp)
+  ido-make-file-list-hook ido-make-dir-list-hook ido-make-buffer-list-hook ido-rewrite-file-prompt-functions ido-rewrite-file-prompt-rules ido-completion-buffer ido-completion-buffer-all-completions ido-all-frames ido-minibuffer-setup-hook ido-save-directory-list-file ido-read-file-name-as-directory-commands ido-read-file-name-non-ido ido-before-fallback-functions ido-completion-map ido-common-completion-map ido-file-completion-map ido-file-dir-completion-map ido-buffer-completion-map ido-file-history ido-buffer-history ido-last-directory-list ido-work-directory-list ido-work-file-list ido-dir-file-cache ido-ignore-item-temp-list ido-eoinput ido-common-match-string ido-rescan ido-rotate ido-text ido-text-init ido-input-stack ido-matches ido-report-no-match ido-exit ido-current-directory ido-auto-merge-timer ido-use-mycompletion-depth ido-incomplete-regexp ido-initial-position
+  (defun . ido-active)
+  ido-trace-enable
+  (defun . ido-trace)
+  (defun . ido-toggle-trace)
+  (defun . ido-local-file-exists-p)
+  (defun . ido-unc-hosts)
+  (defun . ido-unc-hosts-net-view)
+  (defun . ido-is-tramp-root)
+  (defun . ido-is-unc-root)
+  (defun . ido-is-unc-host)
+  (defun . ido-is-root-directory)
+  (defun . ido-is-ftp-directory)
+  (defun . ido-is-slow-ftp-host)
+  (defun . ido-time-stamp)
+  (defun . ido-cache-ftp-valid)
+  (defun . ido-cache-unc-valid)
+  (defun . ido-may-cache-directory)
+  (defun . ido-pp)
+  (defun . ido-save-history)
+  (defun . ido-load-history)
+  (defun . ido-wash-history)
+  (defun . ido-kill-emacs-hook)
+  ido-minor-mode-map-entry
+  (t . ido-mode)
+  (defun . ido-mode)
+  (defun . ido-everywhere)
+  (defun . ido-init-completion-maps)
+  (defun . ido-setup-completion-map)
+  (defun . ido-final-slash)
+  (defun . ido-no-final-slash)
+  (defun . ido-nonreadable-directory-p)
+  (defun . ido-directory-too-big-p)
+  (defun . ido-set-current-directory)
+  (defun . ido-set-current-home)
+  (defun . ido-record-command)
+  (defun . ido-make-prompt)
+  (defun . ido-read-internal)
+  (defun . ido-edit-input)
+  (defun . ido-buffer-internal)
+  (defun . ido-record-work-directory)
+  (defun . ido-forget-work-directory)
+  (defun . ido-record-work-file)
+  (defun . ido-expand-directory)
+  (defun . ido-file-internal)
+  (defun . ido-existing-item-p)
+  (defun . ido-set-common-completion)
+  (defun . ido-complete)
+  (defun . ido-complete-space)
+  (defun . ido-undo-merge-work-directory)
+  (defun . ido-magic-forward-char)
+  (defun . ido-magic-backward-char)
+  (defun . ido-magic-delete-char)
+  (defun . ido-toggle-case)
+  (defun . ido-toggle-regexp)
+  (defun . ido-toggle-prefix)
+  (defun . ido-toggle-ignore)
+  (defun . ido-toggle-vc)
+  (defun . ido-toggle-literal)
+  (defun . ido-reread-directory)
+  (defun . ido-exit-minibuffer)
+  (defun . ido-select-text)
+  (defun . ido-fallback-command)
+  (defun . ido-enter-find-file)
+  (defun . ido-enter-switch-buffer)
+  (defun . ido-enter-dired)
+  (defun . ido-enter-insert-buffer)
+  (defun . ido-enter-insert-file)
+  (defun . ido-up-directory)
+  (defun . ido-delete-backward-updir)
+  (defun . ido-delete-backward-word-updir)
+  (defun . ido-get-work-directory)
+  (defun . ido-prev-work-directory)
+  (defun . ido-next-work-directory)
+  (defun . ido-merge-work-directories)
+  (defun . ido-wide-find-file)
+  (defun . ido-wide-find-dir)
+  (defun . ido-wide-find-dir-or-delete-dir)
+  (defun . ido-take-first-match)
+  (defun . ido-push-dir)
+  (defun . ido-push-dir-first)
+  (defun . ido-pop-dir)
+  (defun . ido-wide-find-file-or-pop-dir)
+  (defun . ido-make-directory)
+  (defun . ido-get-work-file)
+  (defun . ido-prev-work-file)
+  (defun . ido-next-work-file)
+  (defun . ido-copy-current-file-name)
+  (defun . ido-copy-current-word)
+  (defun . ido-next-match)
+  (defun . ido-prev-match)
+  (defun . ido-next-match-dir)
+  (defun . ido-prev-match-dir)
+  (defun . ido-restrict-to-matches)
+  (defun . ido-chop)
+  (defun . ido-name)
+  (defun . ido-all-completions)
+  (defun . ido-file-lessp)
+  (defun . ido-file-extension-lessp)
+  (defun . ido-file-extension-aux)
+  (defun . ido-file-extension-order)
+  (defun . ido-sort-merged-list)
+  (defun . ido-wide-find-dirs-or-files)
+  (defun . ido-flatten-merged-list)
+  (defun . ido-make-merged-file-list-1)
+  (defun . ido-make-merged-file-list)
+  (defun . ido-make-buffer-list-1)
+  (defun . ido-make-buffer-list)
+  (defun . ido-make-choice-list)
+  (defun . ido-to-end)
+  (defun . ido-file-name-all-completions-1)
+  (defun . ido-file-name-all-completions)
+  (defun . ido-remove-cached-dir)
+  (defun . ido-make-file-list-1)
+  (defun . ido-make-file-list)
+  (defun . ido-make-dir-list-1)
+  (defun . ido-make-dir-list)
+  (defun . ido-get-buffers-in-frames)
+  (defun . ido-get-bufname)
+  (defun . ido-set-matches-1)
+  (defun . ido-set-matches)
+  (defun . ido-ignore-item-p)
+  (defun . ido-find-common-substring)
+  (defun . ido-word-matching-substring)
+  (defun . ido-makealist)
+  (defun . ido-choose-completion-string)
+  (defun . ido-completion-help)
+  (defun . ido-kill-buffer-at-head)
+  (defun . ido-delete-file-at-head)
+  (defun . ido-visit-buffer)
+  (defun . ido-buffer-window-other-frame)
+  (t . ido-switch-buffer)
+  (defun . ido-switch-buffer)
+  (t . ido-switch-buffer-other-window)
+  (defun . ido-switch-buffer-other-window)
+  (t . ido-display-buffer)
+  (defun . ido-display-buffer)
+  (t . ido-kill-buffer)
+  (defun . ido-kill-buffer)
+  (t . ido-insert-buffer)
+  (defun . ido-insert-buffer)
+  (t . ido-switch-buffer-other-frame)
+  (defun . ido-switch-buffer-other-frame)
+  (t . ido-find-file-in-dir)
+  (defun . ido-find-file-in-dir)
+  (t . ido-find-file)
+  (defun . ido-find-file)
+  (t . ido-find-file-other-window)
+  (defun . ido-find-file-other-window)
+  (t . ido-find-alternate-file)
+  (defun . ido-find-alternate-file)
+  (t . ido-find-file-read-only)
+  (defun . ido-find-file-read-only)
+  (t . ido-find-file-read-only-other-window)
+  (defun . ido-find-file-read-only-other-window)
+  (t . ido-find-file-read-only-other-frame)
+  (defun . ido-find-file-read-only-other-frame)
+  (t . ido-display-file)
+  (defun . ido-display-file)
+  (t . ido-find-file-other-frame)
+  (defun . ido-find-file-other-frame)
+  (t . ido-write-file)
+  (defun . ido-write-file)
+  (t . ido-insert-file)
+  (defun . ido-insert-file)
+  (t . ido-dired)
+  (defun . ido-dired)
+  (defun . ido-list-directory)
+  (defun . ido-initiate-auto-merge)
+  (defun . ido-exhibit)
+  (defun . ido-completions)
+  (defun . ido-minibuffer-setup)
+  (defun . ido-tidy)
+  (defun . ido-summary-buffers-to-end)
+  (t . ido-read-buffer)
+  (defun . ido-read-buffer)
+  (t . ido-read-file-name)
+  (defun . ido-read-file-name)
+  (t . ido-read-directory-name)
+  (defun . ido-read-directory-name)
+  (t . ido-completing-read)
+  (defun . ido-completing-read)
+  (defun . ido-unload-function)
+  (provide . ido))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/grep.elc"
+  (require . compile)
+  grep-window-height grep-highlight-matches grep-scroll-output grep-command grep-template grep-use-null-device grep-find-command grep-find-template grep-files-aliases grep-find-ignored-directories grep-error-screen-columns grep-setup-hook grep-mode-map grep-mode-tool-bar-map
+  (defun . kill-grep)
+  grep-last-buffer grep-regexp-alist grep-error grep-hit-face grep-error-face grep-match-face grep-context-face grep-mode-font-lock-keywords grep-program find-program xargs-program grep-find-use-xargs grep-history grep-find-history grep-regexp-history grep-files-history grep-host-defaults-alist
+  (t . grep-process-setup)
+  (defun . grep-process-setup)
+  (defun . grep-probe)
+  (t . grep-compute-defaults)
+  (defun . grep-compute-defaults)
+  (defun . grep-tag-default)
+  (defun . grep-default-command)
+  grep-mode-map grep-mode-syntax-table grep-mode-abbrev-table grep-mode-abbrev-table
+  (t . grep-mode)
+  (defun . grep-mode)
+  (t . grep)
+  (defun . grep)
+  (t . grep-find)
+  (defun . grep-find)
+  (defun . find-grep)
+  grep-expand-keywords
+  (defun . grep-expand-template)
+  (defun . grep-read-regexp)
+  (defun . grep-read-files)
+  (t . lgrep)
+  (defun . lgrep)
+  (t . rgrep)
+  (defun . rgrep)
+  (provide . grep))
+ ("/usr/share/emacs/23.0.93/lisp/progmodes/compile.elc"
+  (require . tool-bar)
+  (require . comint)
+  compilation-mode-hook compilation-start-hook compilation-window-height compilation-first-column compilation-parse-errors-filename-function compilation-process-setup-function compilation-buffer-name-function compilation-finish-function compilation-finish-functions compilation-in-progress compilation-error compilation-arguments compilation-error-regexp-alist-alist compilation-error-regexp-alist compilation-directory compilation-directory-matcher compilation-page-delimiter compilation-mode-font-lock-keywords compilation-highlight-regexp compilation-highlight-overlay compilation-error-screen-columns compilation-read-command compilation-ask-about-save compilation-search-path compile-command compilation-disable-input compilation-locs compilation-debug compilation-exit-message-function compilation-environment compile-history
+  (defface . compilation-error)
+  (defface . compilation-warning)
+  (defface . compilation-info)
+  (defface . compilation-line-number)
+  (defface . compilation-column-number)
+  compilation-message-face compilation-error-face compilation-warning-face compilation-info-face compilation-line-face compilation-column-face compilation-enter-directory-face compilation-leave-directory-face compilation-last-buffer compilation-parsing-end compilation-parse-errors-function compilation-error-list compilation-old-error-list compilation-auto-jump-to-first-error compilation-auto-jump-to-next compilation-skip-to-next-location compilation-skip-threshold compilation-skip-visited
+  (defun . compilation-face)
+  (defun . compilation-directory-properties)
+  (defun . compilation-auto-jump)
+  (defun . compilation-error-properties)
+  (defun . compilation-move-to-column)
+  (defun . compilation-internal-error-properties)
+  (defun . compilation-mode-font-lock-keywords)
+  (defun . compilation-read-command)
+  (t . compile)
+  (defun . compile)
+  (defun . recompile)
+  compilation-scroll-output
+  (defun . compilation-buffer-name)
+  (defun . compile-internal)
+  (t . compilation-start)
+  (defun . compilation-start)
+  (defun . compilation-set-window-height)
+  compilation-menu-map compilation-minor-mode-map compilation-shell-minor-mode-map compilation-button-map compilation-mode-map compilation-mode-tool-bar-map
+  (t . compilation-mode)
+  (defun . compilation-mode)
+  (defun . define-compilation-mode)
+  (defun . compilation-revert-buffer)
+  compilation-current-error compilation-messages-start compilation-turn-on-font-lock compilation-turn-on-font-lock
+  (defun . compilation-setup)
+  compilation-shell-minor-mode
+  (t . compilation-shell-minor-mode)
+  (defun . compilation-shell-minor-mode)
+  compilation-minor-mode
+  (t . compilation-minor-mode)
+  (defun . compilation-minor-mode)
+  (defun . compilation-handle-exit)
+  (defun . compilation-sentinel)
+  (defun . compilation-filter)
+  (defun . compilation-buffer-internal-p)
+  (defun . compilation-buffer-p)
+  (defun . compilation-loop)
+  (defun . compilation-next-error)
+  (defun . compilation-previous-error)
+  (defun . compilation-next-file)
+  (defun . compilation-previous-file)
+  (defun . kill-compilation)
+  (defun . compile-mouse-goto-error)
+  (defun . compile-goto-error)
+  (defun . compilation-find-buffer)
+  (t . compilation-next-error-function)
+  (defun . compilation-next-error-function)
+  compilation-gcpro
+  (defun . compilation-fake-loc)
+  compilation-context-lines
+  (defun . compilation-set-window)
+  (defun . compilation-goto-locus)
+  (defun . compilation-goto-locus-delete-o)
+  (defun . compilation-find-file)
+  (defun . compilation-get-file-structure)
+  (defun . compile-buffer-substring)
+  (defun . compilation-compat-error-properties)
+  (defun . compilation-compat-parse-errors)
+  (defun . compilation-forget-errors)
+  (provide . compile))
+ ("/usr/share/emacs/23.0.93/lisp/comint.elc"
+  (require . ring)
+  comint-prompt-regexp comint-prompt-read-only comint-delimiter-argument-list comint-input-autoexpand
+  (defface . comint-highlight-input)
+  (defface . comint-highlight-prompt)
+  comint-input-ignoredups comint-input-ring-file-name comint-scroll-to-bottom-on-input comint-move-point-for-output comint-scroll-to-bottom-on-output comint-scroll-show-maximum-output comint-buffer-maximum-size comint-input-ring-size comint-input-ring-separator comint-input-history-ignore comint-process-echoes comint-password-prompt-regexp comint-get-old-input comint-dynamic-complete-functions comint-input-filter comint-input-filter-functions comint-output-filter-functions comint-input-sender-no-newline comint-input-sender comint-eol-on-send comint-use-prompt-regexp comint-use-prompt-regexp-instead-of-fields comint-mode-hook comint-exec-hook comint-mode-map comint-ptyp comint-input-ring comint-last-input-start comint-last-input-end comint-last-output-start comint-input-ring-index comint-matching-input-from-input-string comint-save-input-ring-index comint-accum-marker comint-stored-incomplete-input comint-mode-map comint-mode-syntax-table comint-mode-abbrev-table comint-mode-abbrev-table
+  (defun . comint-mode)
+  (defun . comint-check-proc)
+  (t . make-comint-in-buffer)
+  (defun . make-comint-in-buffer)
+  (t . make-comint)
+  (defun . make-comint)
+  (t . comint-run)
+  (defun . comint-run)
+  (defun . comint-exec)
+  (defun . comint-exec-1)
+  (defun . comint-insert-input)
+  (defun . comint-read-input-ring)
+  (defun . comint-write-input-ring)
+  (defun . comint-dynamic-list-input-ring-select)
+  (defun . comint-dynamic-list-input-ring)
+  (defun . comint-regexp-arg)
+  (defun . comint-search-arg)
+  (defun . comint-restore-input)
+  (defun . comint-search-start)
+  (defun . comint-previous-input-string)
+  (defun . comint-previous-input)
+  (defun . comint-next-input)
+  (defun . comint-previous-matching-input-string)
+  (defun . comint-previous-matching-input-string-position)
+  (defun . comint-delete-input)
+  (defun . comint-previous-matching-input)
+  (defun . comint-next-matching-input)
+  (defun . comint-previous-matching-input-from-input)
+  (defun . comint-next-matching-input-from-input)
+  (defun . comint-replace-by-expanded-history)
+  (defun . comint-replace-by-expanded-history-before-point)
+  (defun . comint-magic-space)
+  (defun . comint-within-quotes)
+  (defun . comint-how-many-region)
+  (defun . comint-args)
+  (defun . comint-delim-arg)
+  (defun . comint-arguments)
+  (defun . comint-add-to-input-history)
+  (defun . comint-send-input)
+  comint-preoutput-filter-functions comint-inhibit-carriage-motion comint-last-prompt-overlay
+  (defun . comint-snapshot-last-prompt)
+  (defun . comint-carriage-motion)
+  (defun . comint-output-filter)
+  (defun . comint-preinput-scroll-to-bottom)
+  (defun . comint-postoutput-scroll-to-bottom)
+  (defun . comint-truncate-buffer)
+  (defun . comint-strip-ctrl-m)
+  (defun . shell-strip-ctrl-m)
+  (defun . comint-show-maximum-output)
+  (defun . comint-get-old-input-default)
+  (defun . comint-copy-old-input)
+  (defun . comint-skip-prompt)
+  (defun . comint-after-pmark-p)
+  (defun . comint-simple-send)
+  (defun . comint-line-beginning-position)
+  (defun . comint-bol)
+  (defun . comint-read-noecho)
+  (defun . send-invisible)
+  (defun . comint-watch-for-password-prompt)
+  (defun . comint-send-string)
+  (defun . comint-send-region)
+  (defun . comint-delete-output)
+  (defun . comint-kill-output)
+  (defun . comint-write-output)
+  (defun . comint-append-output-to-file)
+  (defun . comint-show-output)
+  (defun . comint-interrupt-subjob)
+  (defun . comint-kill-subjob)
+  (defun . comint-quit-subjob)
+  (defun . comint-stop-subjob)
+  (defun . comint-continue-subjob)
+  (defun . comint-skip-input)
+  (defun . comint-kill-input)
+  (defun . comint-delchar-or-maybe-eof)
+  (defun . comint-send-eof)
+  (defun . comint-backward-matching-input)
+  (defun . comint-forward-matching-input)
+  (defun . comint-next-prompt)
+  (defun . comint-previous-prompt)
+  comint-insert-previous-argument-last-start-pos comint-insert-previous-argument-last-index
+  (defun . comint-insert-previous-argument)
+  (defun . comint-update-fence)
+  (defun . comint-kill-whole-line)
+  (defun . comint-kill-region)
+  (defun . comint-source-default)
+  (defun . comint-check-source)
+  (defun . comint-extract-string)
+  (defun . comint-get-source)
+  (defun . comint-proc-query)
+  comint-completion-autolist comint-completion-addsuffix comint-completion-recexact comint-completion-fignore comint-file-name-prefix comint-file-name-chars comint-file-name-quote-list
+  (defun . comint-directory)
+  (defun . comint-word)
+  (defun . comint-substitute-in-file-name)
+  (defun . comint-match-partial-filename)
+  (defun . comint-quote-filename)
+  (defun . comint-unquote-filename)
+  (defun . comint-dynamic-complete)
+  (defun . comint-dynamic-complete-filename)
+  (defun . comint-dynamic-complete-as-filename)
+  (defun . comint-replace-by-expanded-filename)
+  (defun . comint-dynamic-simple-complete)
+  (defun . comint-dynamic-list-filename-completions)
+  comint-displayed-dynamic-completions comint-dynamic-list-completions-config
+  (defun . comint-dynamic-list-completions)
+  (defun . comint-get-next-from-history)
+  (defun . comint-accumulate)
+  (defun . comint-goto-process-mark)
+  (defun . comint-bol-or-process-mark)
+  (defun . comint-set-process-mark)
+  comint-redirect-verbose comint-redirect-filter-functions comint-redirect-output-buffer comint-redirect-finished-regexp comint-redirect-insert-matching-regexp comint-redirect-echo-input comint-redirect-completed comint-redirect-original-mode-line-process comint-redirect-perform-sanity-check comint-redirect-original-filter-function comint-redirect-subvert-readonly
+  (defun . comint-redirect-setup)
+  (defun . comint-redirect-cleanup)
+  (defun . comint-redirect-remove-redirection)
+  (defun . comint-redirect-filter)
+  (defun . comint-redirect-preoutput-filter)
+  (t . comint-redirect-send-command)
+  (defun . comint-redirect-send-command)
+  (t . comint-redirect-send-command-to-process)
+  (defun . comint-redirect-send-command-to-process)
+  (t . comint-redirect-results-list)
+  (defun . comint-redirect-results-list)
+  (t . comint-redirect-results-list-from-process)
+  (defun . comint-redirect-results-list-from-process)
+  (provide . comint))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/ring.elc"
+  (t . ring-p)
+  (defun . ring-p)
+  (t . make-ring)
+  (defun . make-ring)
+  (defun . ring-insert-at-beginning)
+  (defun . ring-plus1)
+  (defun . ring-minus1)
+  (defun . ring-length)
+  (defun . ring-index)
+  (defun . ring-empty-p)
+  (defun . ring-size)
+  (defun . ring-copy)
+  (defun . ring-insert)
+  (defun . ring-remove)
+  (defun . ring-ref)
+  (defun . ring-elements)
+  (defun . ring-member)
+  (defun . ring-next)
+  (defun . ring-previous)
+  (defun . ring-insert+extend)
+  (defun . ring-remove+insert+extend)
+  (defun . ring-convert-sequence-to-ring)
+  (provide . ring))
+ ("/usr/share/emacs/23.0.93/lisp/apropos.elc"
+  (require . button)
+  apropos-do-all apropos-symbol-face apropos-keybinding-face apropos-label-face apropos-property-face apropos-match-face apropos-sort-by-scores apropos-documentation-sort-by-scores apropos-mode-map apropos-mode-hook apropos-pattern apropos-pattern-quoted apropos-words apropos-all-words apropos-regexp apropos-all-words-regexp apropos-files-scanned apropos-accumulator apropos-item apropos-synonyms
+  (defun . apropos-symbol-button-display-help)
+  (defun . apropos-next-label-button)
+  (defun . apropos-words-to-regexp)
+  (t . apropos-read-pattern)
+  (defun . apropos-read-pattern)
+  (defun . apropos-parse-pattern)
+  (defun . apropos-calc-scores)
+  (defun . apropos-score-str)
+  (defun . apropos-score-doc)
+  (defun . apropos-score-symbol)
+  (defun . apropos-true-hit)
+  (defun . apropos-false-hit-symbol)
+  (defun . apropos-false-hit-str)
+  (defun . apropos-true-hit-doc)
+  apropos-mode-map apropos-mode-syntax-table apropos-mode-abbrev-table apropos-mode-abbrev-table
+  (defun . apropos-mode)
+  apropos-multi-type
+  (t . apropos-variable)
+  (defun . apropos-variable)
+  (defun . command-apropos)
+  (t . apropos-command)
+  (defun . apropos-command)
+  (t . apropos-documentation-property)
+  (defun . apropos-documentation-property)
+  (t . apropos)
+  (defun . apropos)
+  (defun . apropos-library-button)
+  (t . apropos-library)
+  (defun . apropos-library)
+  (defun . apropos-symbols-internal)
+  (t . apropos-value)
+  (defun . apropos-value)
+  (t . apropos-documentation)
+  (defun . apropos-documentation)
+  (defun . apropos-value-internal)
+  (defun . apropos-documentation-internal)
+  (defun . apropos-format-plist)
+  (defun . apropos-documentation-check-doc-file)
+  (defun . apropos-documentation-check-elc-file)
+  (defun . apropos-safe-documentation)
+  apropos-compact-layout
+  (defun . apropos-print)
+  (defun . apropos-macrop)
+  (defun . apropos-print-doc)
+  (defun . apropos-follow)
+  (defun . apropos-describe-plist)
+  (provide . apropos))
+ ("/home/hobbes/nxhtml/util/gimp.el" gimp:version
+  (require . w32-regdat)
+  (defun . gimp-get-remote-command)
+  gimp-remote-command
+  (defun . gimp-get-gimp-exe)
+  gimp-exe gimp-remote-command-list
+  (t . gimp-edit-file)
+  (defun . gimp-edit-file)
+  (t . gimp-edit-buffer)
+  (defun . gimp-edit-buffer)
+  (t . gimp-can-edit)
+  (defun . gimp-can-edit)
+  gimp-point-key-bindings
+  (defun . gimp-add-point-bindings)
+  (provide . gimp))
+ ("/usr/share/emacs/23.0.93/lisp/dired.elc" dired-listing-switches dired-subdir-switches dired-chown-program dired-use-ls-dired dired-chmod-program dired-touch-program dired-ls-F-marks-symlinks dired-trivial-filenames dired-keep-marker-rename dired-keep-marker-copy dired-keep-marker-hardlink dired-keep-marker-symlink dired-dwim-target dired-copy-preserve-time dired-free-space-program dired-free-space-args dired-load-hook dired-mode-hook dired-before-readin-hook dired-after-readin-hook dired-dnd-protocol-alist dired-marker-char dired-del-marker dired-shrink-to-fit dired-flagging-regexp dired-directory dired-actual-switches dired-re-inode-size dired-re-mark dired-re-maybe-mark dired-re-dir dired-re-sym dired-re-exe dired-re-perms dired-re-dot dired-subdir-alist dired-switches-alist dired-move-to-filename-regexp dired-subdir-regexp
+  (defface . dired-header)
+  dired-header-face
+  (defface . dired-mark)
+  dired-mark-face
+  (defface . dired-marked)
+  dired-marked-face
+  (defface . dired-flagged)
+  dired-flagged-face
+  (defface . dired-warning)
+  dired-warning-face
+  (defface . dired-perm-write)
+  dired-perm-write-face
+  (defface . dired-directory)
+  dired-directory-face
+  (defface . dired-symlink)
+  dired-symlink-face
+  (defface . dired-ignored)
+  dired-ignored-face dired-font-lock-keywords
+  (defun . dired-mark-if)
+  (defun . dired-map-over-marks)
+  (defun . dired-get-marked-files)
+  (defun . dired-read-dir-and-switches)
+  (t . dired)
+  (defun . dired)
+  (t . dired-other-window)
+  (defun . dired-other-window)
+  (t . dired-other-frame)
+  (defun . dired-other-frame)
+  (t . dired-noselect)
+  (defun . dired-noselect)
+  (defun . dired-directory-changed-p)
+  (defun . dired-buffer-stale-p)
+  (defun . dired-internal-noselect)
+  dired-buffers
+  (defun . dired-find-buffer-nocreate)
+  (defun . dired-readin)
+  (defun . dired-readin-insert)
+  (defun . dired-align-file)
+  (defun . dired-insert-directory)
+  (defun . dired-insert-set-properties)
+  (defun . dired-revert)
+  (defun . dired-remember-marks)
+  (defun . dired-mark-remembered)
+  (defun . dired-remember-hidden)
+  (defun . dired-insert-old-subdirs)
+  (defun . dired-uncache)
+  dired-mode-map
+  (t . dired-mode)
+  (defun . dired-mode)
+  (defun . dired-summary)
+  (defun . dired-undo)
+  (defun . dired-toggle-read-only)
+  (defun . dired-next-line)
+  (defun . dired-previous-line)
+  (defun . dired-next-dirline)
+  (defun . dired-prev-dirline)
+  (defun . dired-up-directory)
+  (defun . dired-get-file-for-visit)
+  (defun . dired-advertised-find-file)
+  (defun . dired-find-file)
+  (defun . dired-find-alternate-file)
+  (defun . dired-mouse-find-file-other-window)
+  (defun . dired-view-file)
+  (defun . dired-find-file-other-window)
+  (defun . dired-display-file)
+  (defun . dired-get-filename)
+  (defun . dired-string-replace-match)
+  (defun . dired-make-absolute)
+  (defun . dired-make-relative)
+  dired-permission-flags-regexp
+  (defun . dired-move-to-filename)
+  (defun . dired-move-to-end-of-filename)
+  (defun . dired-copy-filename-as-kill)
+  (defun . dired-buffers-for-dir)
+  (defun . dired-glob-regexp)
+  (defun . dired-advertise)
+  (defun . dired-unadvertise)
+  (defun . dired-in-this-tree)
+  (defun . dired-normalize-subdir)
+  (defun . dired-get-subdir)
+  (defun . dired-get-subdir-min)
+  (defun . dired-get-subdir-max)
+  (defun . dired-clear-alist)
+  (defun . dired-subdir-index)
+  (defun . dired-next-subdir)
+  (defun . dired-build-subdir-alist)
+  (defun . dired-alist-add-1)
+  (defun . dired-goto-next-nontrivial-file)
+  (defun . dired-goto-next-file)
+  (defun . dired-goto-file)
+  (defun . dired-initial-position)
+  (defun . dired-current-directory)
+  (defun . dired-subdir-max)
+  dired-recursive-deletes dired-re-no-dot
+  (defun . dired-delete-file)
+  (defun . dired-do-flagged-delete)
+  (defun . dired-do-delete)
+  dired-deletion-confirmer
+  (defun . dired-internal-do-deletions)
+  (defun . dired-fun-in-all-buffers)
+  (defun . dired-delete-entry)
+  (defun . dired-clean-up-after-deletion)
+  (defun . dired-marker-regexp)
+  (defun . dired-plural-s)
+  (defun . dired-mark-prompt)
+  (defun . dired-pop-to-buffer)
+  dired-no-confirm
+  (defun . dired-mark-pop-up)
+  (defun . dired-format-columns-of-files)
+  (defun . dired-repeat-over-lines)
+  (defun . dired-between-files)
+  (defun . dired-next-marked-file)
+  (defun . dired-prev-marked-file)
+  (defun . dired-file-marker)
+  (defun . dired-mark-files-in-region)
+  (defun . dired-mark)
+  (defun . dired-unmark)
+  (defun . dired-flag-file-deletion)
+  (defun . dired-unmark-backward)
+  (defun . dired-toggle-marks)
+  dired-regexp-history
+  (defun . dired-read-regexp)
+  (defun . dired-mark-files-regexp)
+  (defun . dired-mark-files-containing-regexp)
+  (defun . dired-flag-files-regexp)
+  (defun . dired-mark-symlinks)
+  (defun . dired-mark-directories)
+  (defun . dired-mark-executables)
+  (defun . dired-flag-auto-save-files)
+  dired-garbage-files-regexp
+  (defun . dired-flag-garbage-files)
+  (defun . dired-flag-backup-files)
+  (defun . dired-change-marks)
+  (defun . dired-unmark-all-marks)
+  (defun . dired-unmark-all-files)
+  dired-log-buffer
+  (defun . dired-why)
+  (defun . dired-log)
+  (defun . dired-log-summary)
+  dired-ls-sorting-switches dired-sort-by-date-regexp dired-sort-by-name-regexp dired-sort-inhibit
+  (defun . dired-sort-set-modeline)
+  (defun . dired-sort-toggle-or-edit)
+  (defun . dired-sort-toggle)
+  (defun . dired-replace-in-string)
+  (defun . dired-sort-other)
+  dired-subdir-alist-pre-R
+  (defun . dired-sort-R-check)
+  dired-recursive-copies
+  (defun . dired-dnd-popup-notice)
+  (defun . dired-dnd-do-ask-action)
+  (defun . dired-dnd-handle-local-file)
+  (defun . dired-dnd-handle-file)
+  (defun . dired-desktop-buffer-misc-data)
+  (defun . dired-restore-desktop-buffer)
+  (provide . dired))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/regexp-opt.elc"
+  (t . regexp-opt)
+  (defun . regexp-opt)
+  (t . regexp-opt-depth)
+  (defun . regexp-opt-depth)
+  (defun . regexp-opt-group)
+  (defun . regexp-opt-charset)
+  (provide . regexp-opt))
+ ("/usr/share/emacs/23.0.93/lisp/cus-edit.elc"
+  (require . cus-face)
+  (require . wid-edit)
+  (require . cus-load)
+  (require . cus-start)
+  custom-mode-map custom-mode-link-map custom-field-keymap
+  (defun . custom-split-regexp-maybe)
+  (defun . custom-variable-prompt)
+  (defun . custom-menu-filter)
+  custom-prefix-list custom-unlispify-menu-entries custom-unlispify-remove-prefixes
+  (defun . custom-unlispify-menu-entry)
+  custom-unlispify-tag-names
+  (defun . custom-unlispify-tag-name)
+  (defun . custom-prefix-add)
+  custom-guess-name-alist custom-guess-doc-alist
+  (defun . custom-guess-type)
+  custom-browse-sort-alphabetically custom-browse-order-groups custom-browse-only-groups custom-buffer-sort-alphabetically custom-buffer-order-groups custom-menu-sort-alphabetically custom-menu-order-groups
+  (defun . custom-sort-items)
+  custom-commands
+  (defun . Custom-help)
+  custom-reset-menu custom-options
+  (defun . custom-command-apply)
+  (defun . Custom-set)
+  (defun . Custom-save)
+  (defun . custom-reset)
+  (defun . Custom-reset-current)
+  (defun . Custom-reset-saved)
+  custom-reset-standard-variables-list custom-reset-standard-faces-list
+  (defun . custom-reset-standard-save-and-update)
+  (defun . Custom-reset-standard)
+  (defun . custom-prompt-variable)
+  (t . customize-set-value)
+  (defun . customize-set-value)
+  (t . customize-set-variable)
+  (defun . customize-set-variable)
+  (t . customize-save-variable)
+  (defun . customize-save-variable)
+  (t . customize)
+  (defun . customize)
+  (t . customize-mode)
+  (defun . customize-mode)
+  (defun . customize-read-group)
+  (t . customize-group)
+  (defun . customize-group)
+  (t . customize-group-other-window)
+  (defun . customize-group-other-window)
+  (defun . customize-variable)
+  (t . customize-option)
+  (defun . customize-option)
+  (defun . customize-variable-other-window)
+  (t . customize-option-other-window)
+  (defun . customize-option-other-window)
+  customize-changed-options-previous-release customize-package-emacs-version-alist
+  (defun . customize-changed)
+  (t . customize-changed-options)
+  (defun . customize-changed-options)
+  (defun . customize-package-emacs-version)
+  (defun . customize-version-lessp)
+  (t . customize-face)
+  (defun . customize-face)
+  (t . customize-face-other-window)
+  (defun . customize-face-other-window)
+  (defun . customize-customized)
+  (t . customize-unsaved)
+  (defun . customize-unsaved)
+  (t . customize-rogue)
+  (defun . customize-rogue)
+  (t . customize-saved)
+  (defun . customize-saved)
+  (t . customize-apropos)
+  (defun . customize-apropos)
+  (t . customize-apropos-options)
+  (defun . customize-apropos-options)
+  (t . customize-apropos-faces)
+  (defun . customize-apropos-faces)
+  (t . customize-apropos-groups)
+  (defun . customize-apropos-groups)
+  custom-buffer-style custom-buffer-done-kill custom-buffer-indent
+  (defun . custom-get-fresh-buffer)
+  (t . custom-buffer-create)
+  (defun . custom-buffer-create)
+  (t . custom-buffer-create-other-window)
+  (defun . custom-buffer-create-other-window)
+  custom-reset-button-menu custom-buffer-verbose-help
+  (defun . Custom-buffer-done)
+  custom-button custom-button-mouse custom-button-pressed custom-raised-buttons
+  (defun . custom-buffer-create-internal)
+  (t . customize-browse)
+  (defun . customize-browse)
+  (defun . custom-browse-visibility-action)
+  (defun . custom-browse-group-tag-action)
+  (defun . custom-browse-variable-tag-action)
+  (defun . custom-browse-face-tag-action)
+  custom-browse-alist custom-browse-alist
+  (defun . custom-browse-insert-prefix)
+  (defface . custom-invalid)
+  (defface . custom-rogue)
+  (defface . custom-modified)
+  (defface . custom-set)
+  (defface . custom-changed)
+  (defface . custom-themed)
+  (defface . custom-saved)
+  custom-magic-alist custom-magic-show custom-magic-show-hidden custom-magic-show-button
+  (defun . widget-magic-mouse-down-action)
+  (defun . custom-magic-value-create)
+  (defun . custom-magic-reset)
+  (defface . custom-button)
+  (defface . custom-button-mouse)
+  (defface . custom-button-unraised)
+  (defface . custom-button-pressed)
+  (defface . custom-button-pressed-unraised)
+  (defface . custom-documentation)
+  (defface . custom-state)
+  (defface . custom-link)
+  (defun . custom-convert-widget)
+  (defun . custom-notify)
+  (defun . custom-redraw)
+  (defun . custom-redraw-magic)
+  (defun . custom-show)
+  (defun . custom-load-widget)
+  (defun . custom-unloaded-symbol-p)
+  (defun . custom-unloaded-widget-p)
+  (defun . custom-toggle-hide)
+  (defun . custom-toggle-parent)
+  (defun . custom-add-see-also)
+  (defun . custom-add-parent-links)
+  (defface . custom-comment)
+  (defface . custom-comment-tag)
+  (defun . custom-comment-create)
+  (defun . custom-comment-hide)
+  (defun . custom-comment-show)
+  (defun . custom-comment-invisible-p)
+  (defface . custom-variable-tag)
+  (defface . custom-variable-button)
+  custom-variable-default-form
+  (defun . custom-variable-documentation)
+  (defun . custom-variable-type)
+  (defun . custom-variable-value-create)
+  (defun . custom-tag-action)
+  (defun . custom-tag-mouse-down-action)
+  (defun . custom-variable-state-set)
+  (defun . custom-variable-standard-value)
+  custom-variable-menu
+  (defun . custom-variable-action)
+  (defun . custom-variable-edit)
+  (defun . custom-variable-edit-lisp)
+  (defun . custom-variable-set)
+  (defun . custom-variable-mark-to-save)
+  (defun . custom-variable-state-set-and-redraw)
+  (defun . custom-variable-save)
+  (defun . custom-variable-reset-saved)
+  (defun . custom-variable-mark-to-reset-standard)
+  (defun . custom-variable-reset-standard)
+  (defun . custom-variable-backup-value)
+  (defun . custom-variable-reset-backup)
+  (defface . custom-visibility)
+  (defun . custom-face-edit-fix-value)
+  (defun . custom-face-edit-convert-widget)
+  (defun . custom-face-edit-deactivate)
+  (defun . custom-face-edit-activate)
+  (defun . custom-face-edit-delete)
+  (defun . custom-face-edit-attribute-tag)
+  (defface . custom-face-tag)
+  custom-face-default-form custom-face-all
+  (defun . custom-display-unselected-match)
+  custom-face-selected
+  (defun . custom-filter-face-spec)
+  (defun . custom-pre-filter-face-spec)
+  (defun . custom-post-filter-face-spec)
+  (defun . custom-face-value-create)
+  custom-face-menu
+  (defun . custom-face-edit-selected)
+  (defun . custom-face-edit-all)
+  (defun . custom-face-edit-lisp)
+  (defun . custom-face-state-set)
+  (defun . custom-face-action)
+  (defun . custom-face-set)
+  (defun . custom-face-mark-to-save)
+  (defun . custom-face-state-set-and-redraw)
+  (defun . custom-face-save)
+  (defun . custom-face-save-command)
+  (defun . custom-face-reset-saved)
+  (defun . custom-face-standard-value)
+  (defun . custom-face-mark-to-reset-standard)
+  (defun . custom-face-reset-standard)
+  widget-face-prompt-value-history
+  (defun . widget-face-sample-face-get)
+  (defun . widget-face-notify)
+  (defun . custom-hook-convert-widget)
+  (defun . custom-group-link-action)
+  custom-group-tag-faces
+  (defface . custom-group-tag-1)
+  (defface . custom-group-tag)
+  (defun . custom-group-sample-face-get)
+  (defun . custom-group-visibility-create)
+  (defun . custom-group-members)
+  (defun . custom-group-value-create)
+  custom-group-menu
+  (defun . custom-group-action)
+  (defun . custom-group-set)
+  (defun . custom-group-mark-to-save)
+  (defun . custom-group-state-set-and-redraw)
+  (defun . custom-group-save)
+  (defun . custom-group-reset-current)
+  (defun . custom-group-reset-saved)
+  (defun . custom-group-reset-standard)
+  (defun . custom-group-mark-to-reset-standard)
+  (defun . custom-group-state-update)
+  custom-file
+  (defun . custom-file)
+  (t . custom-save-all)
+  (defun . custom-save-all)
+  (t . customize-save-customized)
+  (defun . customize-save-customized)
+  (defun . custom-save-delete)
+  (defun . custom-save-variables)
+  (defun . custom-save-faces)
+  custom-menu-nesting
+  (defun . custom-face-menu-create)
+  (defun . custom-variable-menu-create)
+  (defun . custom-group-menu-create)
+  (t . custom-menu-create)
+  (defun . custom-menu-create)
+  (t . customize-menu-create)
+  (defun . customize-menu-create)
+  Custom-mode-menu
+  (defun . Custom-mode-menu)
+  custom-tool-bar-map
+  (defun . Custom-no-edit)
+  (defun . Custom-newline)
+  (defun . Custom-goto-parent)
+  Custom-mode-hook
+  (defun . custom-state-buffer-message)
+  Custom-mode-map Custom-mode-syntax-table Custom-mode-abbrev-table Custom-mode-abbrev-table
+  (defun . Custom-mode)
+  (defun . custom-mode)
+  custom-mode-hook
+  (provide . cus-edit))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/easymenu.elc" easy-menu-precalculate-equivalent-keybindings
+  (defun . easy-menu-intern)
+  (t . easy-menu-define)
+  (defun . easy-menu-define)
+  (defun . easy-menu-binding)
+  (t . easy-menu-do-define)
+  (defun . easy-menu-do-define)
+  (defun . easy-menu-filter-return)
+  easy-menu-avoid-duplicate-keys
+  (t . easy-menu-create-menu)
+  (defun . easy-menu-create-menu)
+  easy-menu-button-prefix easy-menu-converted-items-table
+  (defun . easy-menu-convert-item)
+  (defun . easy-menu-convert-item-1)
+  (defun . easy-menu-define-key)
+  (defun . easy-menu-name-match)
+  (defun . easy-menu-always-true-p)
+  easy-menu-item-count
+  (defun . easy-menu-make-symbol)
+  (t . easy-menu-change)
+  (defun . easy-menu-change)
+  (defun . easy-menu-remove)
+  (defun . easy-menu-add)
+  (defun . add-submenu)
+  (defun . easy-menu-add-item)
+  (defun . easy-menu-item-present-p)
+  (defun . easy-menu-remove-item)
+  (defun . easy-menu-return-item)
+  (defun . easy-menu-lookup-name)
+  (defun . easy-menu-get-map)
+  (provide . easymenu))
+ ("/usr/share/emacs/23.0.93/lisp/cus-start.elc"
+  (provide . cus-start))
+ ("/usr/share/emacs/23.0.93/lisp/cus-load.el"
+  (defun . custom-put-if-not)
+  custom-versions-load-alist
+  (provide . cus-load))
+ ("/usr/share/emacs/23.0.93/lisp/wid-edit.elc"
+  (defun . widget-event-point)
+  (defun . widget-button-release-event-p)
+  widget-documentation-face
+  (defface . widget-documentation)
+  widget-button-face
+  (defface . widget-button)
+  widget-mouse-face
+  (defface . widget-field)
+  (defface . widget-single-line-field)
+  (defun . widget-princ-to-string)
+  (defun . widget-clear-undo)
+  widget-menu-max-size widget-menu-max-shortcuts widget-menu-minibuffer-flag
+  (defun . widget-choose)
+  (defun . widget-remove-if)
+  widget-field-add-space widget-field-use-before-change
+  (defun . widget-specify-field)
+  (defun . widget-specify-secret)
+  (defun . widget-specify-button)
+  (defun . widget-mouse-help)
+  (defun . widget-specify-sample)
+  (defun . widget-specify-doc)
+  (defun . widget-specify-insert)
+  (defface . widget-inactive)
+  (defun . widget-specify-inactive)
+  (defun . widget-overlay-inactive)
+  (defun . widget-specify-active)
+  (defun . widget-type)
+  (t . widgetp)
+  (defun . widgetp)
+  (defun . widget-get-indirect)
+  (defun . widget-member)
+  (t . widget-value)
+  (defun . widget-value)
+  (defun . widget-value-set)
+  (defun . widget-default-get)
+  (defun . widget-match-inline)
+  (defun . widget-apply-action)
+  (t . widget-prompt-value)
+  (defun . widget-prompt-value)
+  (defun . widget-get-sibling)
+  (defun . widget-map-buttons)
+  widget-image-directory widget-image-enable widget-image-conversion
+  (defun . widget-image-find)
+  widget-button-pressed-face
+  (defun . widget-image-insert)
+  (defun . widget-move-and-invoke)
+  widget-button-prefix widget-button-suffix
+  (t . widget-create)
+  (defun . widget-create)
+  (defun . widget-create-child-and-convert)
+  (defun . widget-create-child)
+  (defun . widget-create-child-value)
+  (t . widget-delete)
+  (defun . widget-delete)
+  (defun . widget-copy)
+  (defun . widget-convert)
+  (t . widget-insert)
+  (defun . widget-insert)
+  (defun . widget-convert-text)
+  (defun . widget-convert-button)
+  (defun . widget-leave-text)
+  (defun . advertised-widget-backward)
+  widget-keymap widget-global-map widget-field-keymap widget-text-keymap
+  (defun . widget-field-activate)
+  (defface . widget-button-pressed)
+  widget-button-click-moves-point
+  (defun . widget-button-click)
+  (defun . widget-button-press)
+  (defun . widget-tabable-at)
+  widget-use-overlay-change
+  (defun . widget-move)
+  (defun . widget-forward)
+  (defun . widget-backward)
+  (defun . widget-beginning-of-line)
+  (defun . widget-end-of-line)
+  (defun . widget-kill-line)
+  widget-complete-field
+  (defun . widget-narrow-to-field)
+  (defun . widget-complete)
+  widget-field-new widget-field-list
+  (defun . widget-at)
+  (t . widget-setup)
+  (defun . widget-setup)
+  widget-field-last widget-field-was
+  (defun . widget-field-at)
+  (defun . widget-field-buffer)
+  (defun . widget-field-start)
+  (defun . widget-field-end)
+  (defun . widget-field-find)
+  (defun . widget-before-change)
+  (defun . widget-add-change)
+  (defun . widget-after-change)
+  (defun . widget-parent-action)
+  (defun . widget-children-value-delete)
+  (defun . widget-children-validate)
+  (defun . widget-child-value-get)
+  (defun . widget-child-value-inline)
+  (defun . widget-child-validate)
+  (defun . widget-type-value-create)
+  (defun . widget-type-default-get)
+  (defun . widget-type-match)
+  (defun . widget-types-copy)
+  (defun . widget-types-convert-widget)
+  (defun . widget-value-convert-widget)
+  (defun . widget-value-value-get)
+  (defun . widget-default-complete)
+  (defun . widget-default-create)
+  (defun . widget-default-format-handler)
+  (defun . widget-default-button-face-get)
+  (defun . widget-default-mouse-face-get)
+  (defun . widget-default-sample-face-get)
+  (defun . widget-default-delete)
+  (defun . widget-default-value-set)
+  (defun . widget-default-value-inline)
+  (defun . widget-default-default-get)
+  (defun . widget-default-menu-tag-get)
+  (defun . widget-default-active)
+  (defun . widget-default-deactivate)
+  (defun . widget-default-action)
+  (defun . widget-default-notify)
+  (defun . widget-default-prompt-value)
+  (defun . widget-docstring)
+  (defun . widget-item-value-create)
+  (defun . widget-item-match)
+  (defun . widget-item-match-inline)
+  (defun . widget-sublist)
+  (defun . widget-item-action)
+  widget-push-button-prefix widget-push-button-suffix
+  (defun . widget-push-button-value-create)
+  widget-link-prefix widget-link-suffix
+  (defun . widget-info-link-action)
+  (defun . widget-url-link-action)
+  (defun . widget-function-link-action)
+  (defun . widget-variable-link-action)
+  (defun . widget-file-link-action)
+  (defun . widget-emacs-library-link-action)
+  (defun . widget-emacs-commentary-link-action)
+  widget-field-history
+  (defun . widget-field-prompt-internal)
+  (defun . widget-field-prompt-value)
+  widget-edit-functions
+  (defun . widget-field-action)
+  (defun . widget-field-validate)
+  (defun . widget-field-value-create)
+  (defun . widget-field-value-delete)
+  (defun . widget-field-value-get)
+  (defun . widget-field-match)
+  (defun . widget-choice-value-create)
+  (defun . widget-choice-default-get)
+  widget-choice-toggle
+  (defun . widget-choice-mouse-down-action)
+  (defun . widget-choice-action)
+  (defun . widget-choice-validate)
+  (defun . widget-choice-match)
+  (defun . widget-choice-match-inline)
+  (defun . widget-toggle-value-create)
+  (defun . widget-toggle-action)
+  (defun . widget-checkbox-action)
+  (defun . widget-checklist-value-create)
+  (defun . widget-checklist-add-item)
+  (defun . widget-checklist-match)
+  (defun . widget-checklist-match-inline)
+  (defun . widget-checklist-match-find)
+  (defun . widget-checklist-match-up)
+  (defun . widget-checklist-value-get)
+  (defun . widget-checklist-validate)
+  (defun . widget-radio-button-notify)
+  (defun . widget-radio-value-create)
+  (defun . widget-radio-add-item)
+  (defun . widget-radio-value-get)
+  (defun . widget-radio-chosen)
+  (defun . widget-radio-value-inline)
+  (defun . widget-radio-value-set)
+  (defun . widget-radio-validate)
+  (defun . widget-radio-action)
+  (defun . widget-insert-button-action)
+  (defun . widget-delete-button-action)
+  (defun . widget-editable-list-format-handler)
+  (defun . widget-editable-list-value-create)
+  (defun . widget-editable-list-value-get)
+  (defun . widget-editable-list-match)
+  (defun . widget-editable-list-match-inline)
+  (defun . widget-editable-list-insert-before)
+  (defun . widget-editable-list-delete-at)
+  (defun . widget-editable-list-entry-create)
+  (defun . widget-group-value-create)
+  (defun . widget-group-default-get)
+  (defun . widget-group-match)
+  (defun . widget-group-match-inline)
+  (defun . widget-visibility-value-create)
+  (defun . widget-documentation-link-action)
+  widget-documentation-links widget-documentation-link-regexp widget-documentation-link-p widget-documentation-link-type
+  (defun . widget-documentation-link-add)
+  (defun . widget-documentation-string-value-create)
+  (defun . widget-documentation-string-action)
+  (defun . widget-add-documentation-string-button)
+  (defun . widget-const-prompt-value)
+  widget-string-prompt-value-history
+  (defun . widget-string-complete)
+  (defun . widget-regexp-match)
+  (defun . widget-regexp-validate)
+  (defun . widget-file-complete)
+  (defun . widget-file-prompt-value)
+  widget-symbol-prompt-value-history
+  (defun . widget-symbol-prompt-internal)
+  widget-function-prompt-value-history widget-variable-prompt-value-history
+  (defun . widget-coding-system-prompt-value)
+  (defun . widget-coding-system-action)
+  widget-key-sequence-prompt-value-history widget-key-sequence-default-value widget-key-sequence-map
+  (defun . widget-key-sequence-read-event)
+  (defun . widget-key-sequence-validate)
+  (defun . widget-key-sequence-value-to-internal)
+  (defun . widget-key-sequence-value-to-external)
+  (defun . widget-sexp-value-to-internal)
+  (defun . widget-sexp-validate)
+  widget-sexp-prompt-value-history
+  (defun . widget-sexp-prompt-value)
+  (defun . widget-restricted-sexp-match)
+  (defun . widget-vector-match)
+  (defun . widget-cons-match)
+  (defun . widget-plist-convert-widget)
+  (defun . widget-plist-convert-option)
+  (defun . widget-alist-convert-widget)
+  (defun . widget-alist-convert-option)
+  (defun . widget-choice-prompt-value)
+  (defun . widget-boolean-prompt-value)
+  (defun . widget-color-complete)
+  (defun . widget-color-sample-face-get)
+  (defun . widget-color-action)
+  (defun . widget-color-notify)
+  (defun . widget-echo-help)
+  (provide . wid-edit))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/cl.elc" cl-optimize-speed cl-optimize-safety custom-print-functions
+  (defun . cl-unload-function)
+  (defun . incf)
+  (defun . decf)
+  (defun . pop)
+  (defun . push)
+  (defun . pushnew)
+  (defun . cl-set-elt)
+  (defun . cl-set-nthcdr)
+  (defun . cl-set-buffer-substring)
+  (defun . cl-set-substring)
+  (defun . cl-map-extents)
+  (defun . cl-block-wrapper)
+  (defun . cl-block-throw)
+  (defun . values)
+  (defun . values-list)
+  (defun . multiple-value-list)
+  (defun . multiple-value-apply)
+  (defun . multiple-value-call)
+  (defun . nth-value)
+  cl-macro-environment cl-old-macroexpand
+  (defun . macroexpand)
+  (defun . cl-macroexpand)
+  cl-compiling-file
+  (defun . cl-compiling-file)
+  cl-proclaims-deferred
+  (defun . proclaim)
+  (defun . declaim)
+  (defun . cl-random-time)
+  *gensym-counter*
+  (defun . floatp-safe)
+  (defun . plusp)
+  (defun . minusp)
+  (defun . oddp)
+  (defun . evenp)
+  *random-state* most-positive-float most-positive-float most-negative-float most-negative-float least-positive-float least-positive-float least-negative-float least-negative-float least-positive-normalized-float least-positive-normalized-float least-negative-normalized-float least-negative-normalized-float float-epsilon float-epsilon float-negative-epsilon float-negative-epsilon
+  (defun . copy-seq)
+  (defun . mapcar*)
+  (defun . svref)
+  (defun . first)
+  (defun . second)
+  (defun . rest)
+  (defun . endp)
+  (defun . third)
+  (defun . fourth)
+  (defun . fifth)
+  (defun . sixth)
+  (defun . seventh)
+  (defun . eighth)
+  (defun . ninth)
+  (defun . tenth)
+  (defun . caaar)
+  (defun . caadr)
+  (defun . cadar)
+  (defun . caddr)
+  (defun . cdaar)
+  (defun . cdadr)
+  (defun . cddar)
+  (defun . cdddr)
+  (defun . caaaar)
+  (defun . caaadr)
+  (defun . caadar)
+  (defun . caaddr)
+  (defun . cadaar)
+  (defun . cadadr)
+  (defun . caddar)
+  (defun . cadddr)
+  (defun . cdaaar)
+  (defun . cdaadr)
+  (defun . cdadar)
+  (defun . cdaddr)
+  (defun . cddaar)
+  (defun . cddadr)
+  (defun . cdddar)
+  (defun . cddddr)
+  (defun . list*)
+  (defun . ldiff)
+  (defun . copy-list)
+  (defun . cl-maclisp-member)
+  (defun . cl-member)
+  (defun . cl-floor)
+  (defun . cl-ceiling)
+  (defun . cl-truncate)
+  (defun . cl-round)
+  (defun . cl-mod)
+  (defun . adjoin)
+  (defun . subst)
+  (defun . cl-do-subst)
+  (defun . acons)
+  (defun . pairlis)
+  (provide . cl-19)
+  (provide . cl)
+  cl-hacked-flag
+  (defun . cl-hack-byte-compiler)
+  (provide . cl))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/cl-loaddefs.el"
+  (autoload . coerce)
+  (autoload . equalp)
+  (autoload . cl-mapcar-many)
+  (autoload . map)
+  (autoload . maplist)
+  (autoload . mapl)
+  (autoload . mapcan)
+  (autoload . mapcon)
+  (autoload . some)
+  (autoload . every)
+  (autoload . notany)
+  (autoload . notevery)
+  (defun . cl-map-keymap)
+  (autoload . cl-map-keymap-recursively)
+  (autoload . cl-map-intervals)
+  (autoload . cl-map-overlays)
+  (autoload . cl-set-frame-visible-p)
+  (autoload . cl-progv-before)
+  (autoload . gcd)
+  (autoload . lcm)
+  (autoload . isqrt)
+  (autoload . floor*)
+  (autoload . ceiling*)
+  (autoload . truncate*)
+  (autoload . round*)
+  (autoload . mod*)
+  (autoload . rem*)
+  (autoload . signum)
+  (autoload . random*)
+  (autoload . make-random-state)
+  (autoload . random-state-p)
+  (autoload . cl-float-limits)
+  (autoload . subseq)
+  (autoload . concatenate)
+  (autoload . revappend)
+  (autoload . nreconc)
+  (autoload . list-length)
+  (autoload . tailp)
+  (autoload . get*)
+  (autoload . getf)
+  (autoload . cl-set-getf)
+  (autoload . cl-do-remf)
+  (autoload . cl-remprop)
+  (defun . remprop)
+  (defun . cl-gethash)
+  (defun . cl-puthash)
+  (defun . cl-remhash)
+  (defun . cl-clrhash)
+  (defun . cl-maphash)
+  (defun . cl-make-hash-table)
+  (defun . cl-hash-table-p)
+  (defun . cl-hash-table-count)
+  (autoload . cl-macroexpand-all)
+  (autoload . cl-prettyexpand)
+  (autoload . gensym)
+  (autoload . gentemp)
+  (autoload . defun*)
+  (autoload . defmacro*)
+  (autoload . function*)
+  (autoload . destructuring-bind)
+  (autoload . eval-when)
+  (autoload . load-time-value)
+  (autoload . case)
+  (autoload . ecase)
+  (autoload . typecase)
+  (autoload . etypecase)
+  (autoload . block)
+  (autoload . return)
+  (autoload . return-from)
+  (autoload . loop)
+  (autoload . do)
+  (autoload . do*)
+  (autoload . dolist)
+  (autoload . dotimes)
+  (autoload . do-symbols)
+  (autoload . do-all-symbols)
+  (autoload . psetq)
+  (autoload . progv)
+  (autoload . flet)
+  (autoload . labels)
+  (autoload . macrolet)
+  (autoload . symbol-macrolet)
+  (autoload . lexical-let)
+  (autoload . lexical-let*)
+  (autoload . multiple-value-bind)
+  (autoload . multiple-value-setq)
+  (autoload . locally)
+  (autoload . the)
+  (autoload . declare)
+  (autoload . define-setf-method)
+  (autoload . defsetf)
+  (autoload . get-setf-method)
+  (autoload . setf)
+  (autoload . psetf)
+  (autoload . cl-do-pop)
+  (autoload . remf)
+  (autoload . shiftf)
+  (autoload . rotatef)
+  (autoload . letf)
+  (autoload . letf*)
+  (autoload . callf)
+  (autoload . callf2)
+  (autoload . define-modify-macro)
+  (autoload . defstruct)
+  (autoload . cl-struct-setf-expander)
+  (autoload . typep)
+  (autoload . check-type)
+  (autoload . assert)
+  (autoload . define-compiler-macro)
+  (autoload . compiler-macroexpand)
+  (autoload . reduce)
+  (autoload . fill)
+  (autoload . replace)
+  (autoload . remove*)
+  (autoload . remove-if)
+  (autoload . remove-if-not)
+  (autoload . delete*)
+  (autoload . delete-if)
+  (autoload . delete-if-not)
+  (autoload . remove-duplicates)
+  (autoload . delete-duplicates)
+  (autoload . substitute)
+  (autoload . substitute-if)
+  (autoload . substitute-if-not)
+  (autoload . nsubstitute)
+  (autoload . nsubstitute-if)
+  (autoload . nsubstitute-if-not)
+  (autoload . find)
+  (autoload . find-if)
+  (autoload . find-if-not)
+  (autoload . position)
+  (autoload . position-if)
+  (autoload . position-if-not)
+  (autoload . count)
+  (autoload . count-if)
+  (autoload . count-if-not)
+  (autoload . mismatch)
+  (autoload . search)
+  (autoload . sort*)
+  (autoload . stable-sort)
+  (autoload . merge)
+  (autoload . member*)
+  (autoload . member-if)
+  (autoload . member-if-not)
+  (autoload . cl-adjoin)
+  (autoload . assoc*)
+  (autoload . assoc-if)
+  (autoload . assoc-if-not)
+  (autoload . rassoc*)
+  (autoload . rassoc-if)
+  (autoload . rassoc-if-not)
+  (autoload . union)
+  (autoload . nunion)
+  (autoload . intersection)
+  (autoload . nintersection)
+  (autoload . set-difference)
+  (autoload . nset-difference)
+  (autoload . set-exclusive-or)
+  (autoload . nset-exclusive-or)
+  (autoload . subsetp)
+  (autoload . subst-if)
+  (autoload . subst-if-not)
+  (autoload . nsubst)
+  (autoload . nsubst-if)
+  (autoload . nsubst-if-not)
+  (autoload . sublis)
+  (autoload . nsublis)
+  (autoload . tree-equal))
+ ("/home/hobbes/nxhtml/nxhtml-loaddefs.el"
+  (autoload . html-site-buffer-or-dired-file-name)
+  (autoload . html-site-set-site)
+  (autoload . html-site-dired-current)
+  (autoload . html-site-find-file)
+  (autoload . html-site-rgrep)
+  (autoload . html-site-query-replace)
+  (autoload . inlimg-mode)
+  (autoload . inlimg-toggle-img-display)
+  (autoload . nxhtml-report-bug)
+  (autoload . nxhtml-edit-with-gimp)
+  (autoload . nxhtml-browse-file)
+  (autoload . nxhtml-browse-region)
+  nxhtml-global-minor-mode
+  (autoload . nxhtml-global-minor-mode)
+  (autoload . nxhtml-mode)
+  (autoload . nxhtml-short-tag-help)
+  (autoload . nxhtml-validation-header-mode)
+  (autoload . nxhtml-mumamo-mode)
+  (autoload . embperl-nxhtml-mumamo-mode)
+  (autoload . django-nxhtml-mumamo-mode)
+  (autoload . genshi-nxhtml-mumamo-mode)
+  (autoload . mjt-nxhtml-mumamo-mode)
+  (autoload . smarty-nxhtml-mumamo-mode)
+  (autoload . jsp-nxhtml-mumamo-mode)
+  (autoload . eruby-nxhtml-mumamo-mode)
+  (autoload . asp-nxhtml-mumamo-mode)
+  (autoload . mako-nxhtml-mumamo-mode)
+  nxml-where-global-mode
+  (autoload . nxml-where-global-mode)
+  (autoload . rngalt-set-validation-header)
+  (autoload . tidy-build-menu)
+  (autoload . xhtml-help-show-css-ref)
+  (autoload . xhtml-help-show-tag-ref)
+  (autoload . csharp-mode)
+  (autoload . django-mode)
+  (autoload . javascript-mode)
+  (autoload . moz-minor-mode)
+  (autoload . inferior-moz-mode)
+  php-file-patterns
+  (autoload . php-mode)
+  (autoload . smarty-mode)
+  (autoload . tt-mode)
+  (autoload . wikipedia-mode)
+  (autoload . wikipedia-draft)
+  (autoload . wikipedia-draft-page)
+  (autoload . wikipedia-draft-buffer)
+  wikipedia-draft-send-archive
+  (autoload . ert-deftest)
+  (autoload . ert-run-tests-interactively)
+  (autoload . nxhtmltest-run-Q)
+  (autoload . nxhtmltest-run-indent)
+  (autoload . nxhtmltest-run)
+  (autoload . appmenu-add)
+  (autoload . as-external-for-xhtml)
+  (autoload . as-external-for-mail)
+  (autoload . as-external-for-wiki)
+  as-external-mode
+  (autoload . as-external-mode)
+  (autoload . chart-complete)
+  (autoload . chart-make-chart)
+  css-color-global-mode
+  (autoload . css-color-global-mode)
+  (autoload . css-color-mode)
+  (autoload . css-palette-mode)
+  css-palette-global-mode
+  (autoload . css-palette-global-mode)
+  (autoload . freemind-show)
+  (autoload . freemind-from-org-mode-node)
+  (autoload . freemind-from-org-mode)
+  (autoload . freemind-from-org-sparse-tree)
+  (autoload . freemind-to-org-mode)
+  (autoload . gimp-edit-file)
+  (autoload . gimp-edit-buffer)
+  (autoload . gimp-can-edit)
+  (autoload . gpl-mode)
+  (autoload . html-write-mode)
+  (autoload . htmlfontify-buffer)
+  (autoload . majmodpri-sort-lists)
+  (autoload . majmodpri-apply)
+  (autoload . majmodpri-apply-priorities)
+  (autoload . mlinks-mode)
+  (autoload . mumamo-mark-for-refontification)
+  (autoload . html-mumamo-mode)
+  (autoload . nxml-mumamo-mode)
+  (autoload . embperl-html-mumamo-mode)
+  (autoload . django-html-mumamo-mode)
+  (autoload . genshi-html-mumamo-mode)
+  (autoload . mjt-html-mumamo-mode)
+  (autoload . smarty-html-mumamo-mode)
+  (autoload . jsp-html-mumamo-mode)
+  (autoload . eruby-mumamo-mode)
+  (autoload . eruby-html-mumamo-mode)
+  (autoload . perl-mumamo-mode)
+  (autoload . cperl-mumamo-mode)
+  (autoload . metapost-mumamo-mode)
+  (autoload . laszlo-nxml-mumamo-mode)
+  (autoload . csound-sgml-mumamo-mode)
+  (autoload . noweb2-mumamo-mode)
+  (autoload . asp-html-mumamo-mode)
+  (autoload . org-mumamo-mode)
+  (autoload . mako-html-mumamo-mode)
+  (autoload . popup-menu-at-point)
+  (autoload . define-toggle)
+  (autoload . unfill-paragraph)
+  (autoload . unfill-region)
+  (autoload . unfill-individual-paragraphs)
+  (autoload . major-or-multi-majorp)
+  (autoload . multi-major-modep)
+  (autoload . major-modep)
+  (autoload . ourcomments-move-beginning-of-line)
+  (autoload . ourcomments-move-end-of-line)
+  (autoload . describe-key-and-map-briefly)
+  wrap-to-fill-left-marg wrap-to-fill-left-marg-modes
+  (autoload . wrap-to-fill-column-mode)
+  better-fringes-mode
+  (autoload . better-fringes-mode)
+  (autoload . find-emacs-other-file)
+  (autoload . ourcomments-ediff-files)
+  (autoload . describe-command)
+  (autoload . describe-custom-group)
+  (autoload . describe-defstruct)
+  (autoload . describe-symbol)
+  (autoload . ourcomments-ido-buffer-other-window)
+  (autoload . ourcomments-ido-buffer-other-frame)
+  (autoload . ourcomments-ido-buffer-raise-frame)
+  ourcomments-ido-ctrl-tab
+  (autoload . emacs)
+  (autoload . emacs-buffer-file)
+  (autoload . emacs--debug-init)
+  (autoload . emacs-Q)
+  (autoload . emacs-Q-nxhtml)
+  (autoload . grep-query-replace)
+  (autoload . info-open-file)
+  (autoload . rnc-mode)
+  (autoload . search-form)
+  sex-mode
+  (autoload . sex-mode)
+  tabkey2-mode
+  (autoload . tabkey2-mode)
+  (autoload . tyda-lookup-word)
+  (autoload . udev-cedet-update)
+  (autoload . udev-ecb-update)
+  (autoload . udev-rinari-update)
+  (autoload . viper-tutorial)
+  (autoload . winsav-put-window-tree)
+  winsav-save-mode
+  (autoload . winsav-save-mode)
+  (autoload . winsav-save-named-config)
+  (autoload . winsav-switch-config)
+  (autoload . resize-windows)
+  (autoload . winsize-balance-siblings)
+  (autoload . winsize-save-window-configuration)
+  (autoload . nxhtmlmaint-start-byte-compilation)
+  (autoload . nxhtmlmaint-byte-uncompile-all))
+ ("/usr/share/emacs/23.0.93/lisp/international/encoded-kb.elc" encoded-kbd-mode-map encoded-kbd-iso2022-esc-map encoded-kbd-iso2022-esc-dollar-map encoded-kbd-iso2022-designation-map encoded-kbd-iso2022-designations encoded-kbd-iso2022-invocations
+  (defun . encoded-kbd-last-key)
+  (defun . encoded-kbd-iso2022-designation)
+  (defun . encoded-kbd-iso2022-single-shift)
+  (defun . encoded-kbd-self-insert-iso2022-7bit)
+  (defun . encoded-kbd-self-insert-iso2022-8bit)
+  (defun . encoded-kbd-self-insert-sjis)
+  (defun . encoded-kbd-self-insert-big5)
+  (defun . encoded-kbd-self-insert-ccl)
+  (defun . encoded-kbd-decode-code-list)
+  (defun . encoded-kbd-self-insert-charset)
+  (defun . encoded-kbd-self-insert-utf-8)
+  (defun . encoded-kbd-setup-keymap)
+  (t . encoded-kbd-setup-display)
+  (defun . encoded-kbd-setup-display)
+  (provide . encoded-kb))
+ ("/usr/share/emacs/23.0.93/leim/leim-list.el"
+  (autoload . ucs-input-activate)
+  (autoload . hangul-input-method-activate))
+ ("/usr/share/emacs/23.0.93/lisp/subdirs.el")
+ ("/usr/share/emacs-snapshot/site-lisp/subdirs.el")
+ ("/usr/share/emacs/23.0.93/lisp/site-init.elc")
+ ("/usr/share/emacs/23.0.93/lisp/tooltip.elc" tooltip-mode
+  (defun . tooltip-mode)
+  tooltip-delay tooltip-short-delay tooltip-recent-seconds tooltip-hide-delay tooltip-x-offset tooltip-y-offset tooltip-frame-parameters
+  (defface . tooltip)
+  tooltip-use-echo-area tooltip-functions tooltip-hook tooltip-timeout-id tooltip-last-mouse-motion-event tooltip-hide-time
+  (defun . tooltip-event-buffer)
+  (defun . tooltip-delay)
+  (defun . tooltip-cancel-delayed-tip)
+  (defun . tooltip-start-delayed-tip)
+  (defun . tooltip-timeout)
+  (defun . tooltip-set-param)
+  (defun . tooltip-show)
+  (defun . tooltip-hide)
+  (defun . tooltip-identifier-from-point)
+  (defun . tooltip-region-active-p)
+  (defun . tooltip-expr-to-print)
+  (defun . tooltip-process-prompt-regexp)
+  (defun . tooltip-strip-prompt)
+  tooltip-help-message tooltip-previous-message
+  (defun . tooltip-show-help-non-mode)
+  (defun . tooltip-show-help)
+  (defun . tooltip-help-tips)
+  (provide . tooltip))
+ ("/usr/share/emacs/23.0.93/lisp/ediff-hook.elc" menu-bar-ediff-misc-menu menu-bar-epatch-menu menu-bar-ediff-merge-menu menu-bar-ediff-menu
+  (provide . ediff-hook))
+ ("/usr/share/emacs/23.0.93/lisp/vc-hooks.elc" vc-ignore-vc-files vc-master-templates vc-header-alist vc-ignore-dir-regexp vc-handled-backends vc-directory-exclusion-list vc-path vc-make-backup-files vc-follow-symlinks vc-display-status vc-consult-headers vc-keep-workfiles vc-mistrust-permissions
+  (defun . vc-mistrust-permissions)
+  vc-stay-local
+  (defun . vc-stay-local-p)
+  (defun . vc-mode)
+  (defun . vc-error-occurred)
+  vc-file-prop-obarray vc-touched-properties
+  (defun . vc-file-setprop)
+  (defun . vc-file-getprop)
+  (defun . vc-file-clearprops)
+  (defun . vc-make-backend-sym)
+  (defun . vc-find-backend-function)
+  (defun . vc-call-backend)
+  (defun . vc-call)
+  (defun . vc-parse-buffer)
+  (defun . vc-insert-file)
+  (defun . vc-find-root)
+  (defun . vc-registered)
+  (defun . vc-backend)
+  (defun . vc-backend-subdirectory-name)
+  (defun . vc-name)
+  (defun . vc-checkout-model)
+  (defun . vc-user-login-name)
+  (defun . vc-state)
+  (defun . vc-up-to-date-p)
+  (defun . vc-default-state-heuristic)
+  (defun . vc-workfile-unchanged-p)
+  (defun . vc-default-workfile-unchanged-p)
+  (defun . vc-working-revision)
+  (defun . vc-workfile-version)
+  (defun . vc-default-working-revision)
+  (defun . vc-default-registered)
+  (defun . vc-possible-master)
+  (defun . vc-check-master-templates)
+  (defun . vc-toggle-read-only)
+  (defun . vc-default-make-version-backups-p)
+  (defun . vc-version-backup-file-name)
+  (defun . vc-delete-automatic-version-backups)
+  (defun . vc-make-version-backup)
+  (defun . vc-before-save)
+  (defun . vc-after-save)
+  vc-menu-entry vc-mode-line-map vc-mode-line-map
+  (defun . vc-mode-line)
+  (defun . vc-default-mode-line-string)
+  (defun . vc-follow-link)
+  (defun . vc-default-find-file-hook)
+  (defun . vc-find-file-hook)
+  (defun . vc-file-not-found-hook)
+  (defun . vc-default-find-file-not-found-hook)
+  (defun . vc-kill-buffer-hook)
+  vc-prefix-map vc-menu-map
+  (defun . vc-menu-map)
+  (defun . vc-menu-map-filter)
+  (defun . vc-default-extra-menu)
+  (provide . vc-hooks))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/float-sup.elc" pi e degrees-to-radians radians-to-degrees
+  (defun . degrees-to-radians)
+  (defun . radians-to-degrees)
+  (provide . lisp-float-type))
+ ("/usr/share/emacs/23.0.93/lisp/term/x-win.elc"
+  (require . frame)
+  (require . mouse)
+  (require . scroll-bar)
+  (require . faces)
+  (require . select)
+  (require . menu-bar)
+  (require . fontset)
+  (require . x-dnd)
+  (defun . x-handle-no-bitmap-icon)
+  (defun . x-handle-parent-id)
+  (defun . x-handle-smid)
+  emacs-save-session-functions
+  (defun . emacs-session-filename)
+  (defun . emacs-session-save)
+  (defun . emacs-session-restore)
+  x-pointer-X-cursor x-pointer-X-cursor x-pointer-arrow x-pointer-arrow x-pointer-based-arrow-down x-pointer-based-arrow-down x-pointer-based-arrow-up x-pointer-based-arrow-up x-pointer-boat x-pointer-boat x-pointer-bogosity x-pointer-bogosity x-pointer-bottom-left-corner x-pointer-bottom-left-corner x-pointer-bottom-right-corner x-pointer-bottom-right-corner x-pointer-bottom-side x-pointer-bottom-side x-pointer-bottom-tee x-pointer-bottom-tee x-pointer-box-spiral x-pointer-box-spiral x-pointer-center-ptr x-pointer-center-ptr x-pointer-circle x-pointer-circle x-pointer-clock x-pointer-clock x-pointer-coffee-mug x-pointer-coffee-mug x-pointer-cross x-pointer-cross x-pointer-cross-reverse x-pointer-cross-reverse x-pointer-crosshair x-pointer-crosshair x-pointer-diamond-cross x-pointer-diamond-cross x-pointer-dot x-pointer-dot x-pointer-dotbox x-pointer-dotbox x-pointer-double-arrow x-pointer-double-arrow x-pointer-draft-large x-pointer-draft-large x-pointer-draft-small x-pointer-draft-small x-pointer-draped-box x-pointer-draped-box x-pointer-exchange x-pointer-exchange x-pointer-fleur x-pointer-fleur x-pointer-gobbler x-pointer-gobbler x-pointer-gumby x-pointer-gumby x-pointer-hand1 x-pointer-hand1 x-pointer-hand2 x-pointer-hand2 x-pointer-heart x-pointer-heart x-pointer-icon x-pointer-icon x-pointer-iron-cross x-pointer-iron-cross x-pointer-left-ptr x-pointer-left-ptr x-pointer-left-side x-pointer-left-side x-pointer-left-tee x-pointer-left-tee x-pointer-leftbutton x-pointer-leftbutton x-pointer-ll-angle x-pointer-ll-angle x-pointer-lr-angle x-pointer-lr-angle x-pointer-man x-pointer-man x-pointer-middlebutton x-pointer-middlebutton x-pointer-mouse x-pointer-mouse x-pointer-pencil x-pointer-pencil x-pointer-pirate x-pointer-pirate x-pointer-plus x-pointer-plus x-pointer-question-arrow x-pointer-question-arrow x-pointer-right-ptr x-pointer-right-ptr x-pointer-right-side x-pointer-right-side x-pointer-right-tee x-pointer-right-tee x-pointer-rightbutton x-pointer-rightbutton x-pointer-rtl-logo x-pointer-rtl-logo x-pointer-sailboat x-pointer-sailboat x-pointer-sb-down-arrow x-pointer-sb-down-arrow x-pointer-sb-h-double-arrow x-pointer-sb-h-double-arrow x-pointer-sb-left-arrow x-pointer-sb-left-arrow x-pointer-sb-right-arrow x-pointer-sb-right-arrow x-pointer-sb-up-arrow x-pointer-sb-up-arrow x-pointer-sb-v-double-arrow x-pointer-sb-v-double-arrow x-pointer-shuttle x-pointer-shuttle x-pointer-sizing x-pointer-sizing x-pointer-spider x-pointer-spider x-pointer-spraycan x-pointer-spraycan x-pointer-star x-pointer-star x-pointer-target x-pointer-target x-pointer-tcross x-pointer-tcross x-pointer-top-left-arrow x-pointer-top-left-arrow x-pointer-top-left-corner x-pointer-top-left-corner x-pointer-top-right-corner x-pointer-top-right-corner x-pointer-top-side x-pointer-top-side x-pointer-top-tee x-pointer-top-tee x-pointer-trek x-pointer-trek x-pointer-ul-angle x-pointer-ul-angle x-pointer-umbrella x-pointer-umbrella x-pointer-ur-angle x-pointer-ur-angle x-pointer-watch x-pointer-watch x-pointer-xterm x-pointer-xterm x-pointer-invisible x-pointer-invisible
+  (defun . xw-defined-colors)
+  x-alternatives-map
+  (defun . x-setup-function-keys)
+  (defun . vendor-specific-keysyms)
+  x-last-selected-text-clipboard x-last-selected-text-primary x-last-selected-text-cut x-last-selected-text-cut-encoded x-last-cut-buffer-coding x-cut-buffer-max x-select-enable-clipboard x-select-enable-primary
+  (defun . x-select-text)
+  x-select-request-type
+  (defun . x-selection-value)
+  (defun . x-cut-buffer-or-selection-value)
+  (defun . x-clipboard-yank)
+  (defun . x-menu-bar-open)
+  (defun . x-win-suspend-error)
+  x-initialized
+  (defun . x-initialize-window-system)
+  x-gtk-stock-map icon-map-list x-gtk-stock-cache x-gtk-stock-cache
+  (defun . x-gtk-map-stock)
+  (provide . x-win))
+ ("/usr/share/emacs/23.0.93/lisp/term/common-win.elc" x-command-line-resources
+  (defun . x-handle-switch)
+  (defun . x-handle-numeric-switch)
+  (defun . x-handle-initial-switch)
+  (defun . x-handle-iconic)
+  (defun . x-handle-xrm-switch)
+  (defun . x-handle-geometry)
+  (defun . x-handle-name-switch)
+  x-display-name
+  (defun . x-handle-display)
+  (defun . x-handle-args)
+  x-colors)
+ ("/usr/share/emacs/23.0.93/lisp/x-dnd.elc"
+  (require . dnd)
+  x-dnd-test-function x-dnd-types-alist x-dnd-known-types x-dnd-current-state x-dnd-empty-state
+  (defun . x-dnd-init-frame)
+  (defun . x-dnd-get-state-cons-for-frame)
+  (defun . x-dnd-get-state-for-frame)
+  (defun . x-dnd-default-test-function)
+  (defun . x-dnd-current-type)
+  (defun . x-dnd-forget-drop)
+  (defun . x-dnd-maybe-call-test-function)
+  (defun . x-dnd-save-state)
+  (defun . x-dnd-handle-moz-url)
+  (defun . x-dnd-insert-utf8-text)
+  (defun . x-dnd-insert-utf16-text)
+  (defun . x-dnd-insert-ctext)
+  (defun . x-dnd-handle-uri-list)
+  (defun . x-dnd-handle-file-name)
+  (defun . x-dnd-choose-type)
+  (defun . x-dnd-drop-data)
+  (defun . x-dnd-handle-drag-n-drop-event)
+  (defun . x-dnd-handle-old-kde)
+  x-dnd-xdnd-to-action
+  (defun . x-dnd-init-xdnd-for-frame)
+  (defun . x-dnd-get-drop-width-height)
+  (defun . x-dnd-get-drop-x-y)
+  (defun . x-dnd-handle-xdnd)
+  (defun . x-dnd-init-motif-for-frame)
+  (defun . x-dnd-get-motif-value)
+  (defun . x-dnd-motif-value-to-list)
+  x-dnd-motif-message-types x-dnd-motif-to-action
+  (defun . x-dnd-handle-motif)
+  (provide . x-dnd))
+ ("/usr/share/emacs/23.0.93/lisp/tool-bar.elc" tool-bar-mode
+  (defun . tool-bar-mode)
+  (t . toggle-tool-bar-mode-from-frame)
+  (defun . toggle-tool-bar-mode-from-frame)
+  tool-bar-map tool-bar-keymap-cache tool-bar-keymap-cache
+  (defun . tool-bar-make-keymap)
+  (defun . tool-bar-make-keymap-1)
+  (t . tool-bar-add-item)
+  (defun . tool-bar-add-item)
+  (t . tool-bar-local-item)
+  (defun . tool-bar-local-item)
+  (t . tool-bar-add-item-from-menu)
+  (defun . tool-bar-add-item-from-menu)
+  (t . tool-bar-local-item-from-menu)
+  (defun . tool-bar-local-item-from-menu)
+  (defun . tool-bar-setup)
+  (provide . tool-bar))
+ ("/usr/share/emacs/23.0.93/lisp/mwheel.elc"
+  (require . custom)
+  (require . timer)
+  (defun . mouse-wheel-change-button)
+  mouse-wheel-down-button mouse-wheel-down-event mouse-wheel-up-button mouse-wheel-up-event mouse-wheel-click-button mouse-wheel-click-event mouse-wheel-inhibit-click-time mouse-wheel-scroll-amount mouse-wheel-progressive-speed mouse-wheel-follow-mouse
+  (defun . mwheel-event-button)
+  (defun . mwheel-event-window)
+  mwheel-inhibit-click-event-timer
+  (defun . mwheel-inhibit-click-timeout)
+  (defun . mwheel-filter-click-events)
+  (defun . mwheel-scroll)
+  mouse-wheel-mode
+  (t . mouse-wheel-mode)
+  (defun . mouse-wheel-mode)
+  (t . mwheel-install)
+  (defun . mwheel-install)
+  (provide . mwheel))
+ ("/usr/share/emacs/23.0.93/lisp/dnd.elc" dnd-protocol-alist dnd-open-remote-file-function dnd-open-file-other-window
+  (defun . dnd-handle-one-url)
+  (defun . dnd-get-local-file-uri)
+  (defun . dnd-get-local-file-name)
+  (defun . dnd-open-local-file)
+  (defun . dnd-open-remote-url)
+  (defun . dnd-open-file)
+  (defun . dnd-insert-text)
+  (provide . dnd))
+ ("/usr/share/emacs/23.0.93/lisp/international/fontset.elc"
+  (defun . setup-default-fontset)
+  (defun . create-default-fontset)
+  (defun . set-font-encoding)
+  x-font-name-charset-alist xlfd-regexp-family-subnum xlfd-regexp-family-subnum xlfd-regexp-weight-subnum xlfd-regexp-weight-subnum xlfd-regexp-slant-subnum xlfd-regexp-slant-subnum xlfd-regexp-swidth-subnum xlfd-regexp-swidth-subnum xlfd-regexp-adstyle-subnum xlfd-regexp-adstyle-subnum xlfd-regexp-pixelsize-subnum xlfd-regexp-pixelsize-subnum xlfd-regexp-pointsize-subnum xlfd-regexp-pointsize-subnum xlfd-regexp-resx-subnum xlfd-regexp-resx-subnum xlfd-regexp-resy-subnum xlfd-regexp-resy-subnum xlfd-regexp-spacing-subnum xlfd-regexp-spacing-subnum xlfd-regexp-avgwidth-subnum xlfd-regexp-avgwidth-subnum xlfd-regexp-registry-subnum xlfd-regexp-registry-subnum xlfd-tight-regexp xlfd-tight-regexp xlfd-style-regexp xlfd-style-regexp xlfd-regexp-numeric-subnums xlfd-regexp-numeric-subnums
+  (defun . x-decompose-font-name)
+  (defun . x-compose-font-name)
+  (defun . x-must-resolve-font-name)
+  (defun . x-complement-fontset-spec)
+  (defun . fontset-name-p)
+  (defun . generate-fontset-menu)
+  (defun . fontset-plain-name)
+  charset-script-alist
+  (defun . create-fontset-from-fontset-spec)
+  (defun . create-fontset-from-ascii-font)
+  standard-fontset-spec
+  (defun . create-fontset-from-x-resource)
+  (provide . fontset))
+ ("/usr/share/emacs/23.0.93/lisp/image.elc" image-type-header-regexps image-type-file-name-regexps image-type-auto-detectable image-load-path
+  (defun . image-load-path-for-library)
+  (defun . image-jpeg-p)
+  (t . image-type-from-data)
+  (defun . image-type-from-data)
+  (t . image-type-from-buffer)
+  (defun . image-type-from-buffer)
+  (t . image-type-from-file-header)
+  (defun . image-type-from-file-header)
+  (t . image-type-from-file-name)
+  (defun . image-type-from-file-name)
+  (t . image-type)
+  (defun . image-type)
+  (t . image-type-available-p)
+  (defun . image-type-available-p)
+  (t . image-type-auto-detected-p)
+  (defun . image-type-auto-detected-p)
+  (t . create-image)
+  (defun . create-image)
+  (t . put-image)
+  (defun . put-image)
+  (t . insert-image)
+  (defun . insert-image)
+  (t . insert-sliced-image)
+  (defun . insert-sliced-image)
+  (t . remove-images)
+  (defun . remove-images)
+  (defun . image-search-load-path)
+  (t . find-image)
+  (defun . find-image)
+  (t . defimage)
+  (defun . defimage)
+  (provide . image))
+ ("/usr/share/emacs/23.0.93/lisp/fringe.elc"
+  (defun . fringe-bitmap-p)
+  fringe-mode-explicit
+  (defun . set-fringe-mode-1)
+  (defun . set-fringe-mode)
+  (defun . fringe-mode-initialize)
+  fringe-mode
+  (defun . fringe-query-style)
+  (defun . fringe-mode)
+  (defun . set-fringe-style)
+  (defun . fringe-columns)
+  (provide . fringe))
+ ("/usr/share/emacs/23.0.93/lisp/buff-menu.elc" Buffer-menu-use-header-line
+  (defface . buffer-menu-buffer)
+  Buffer-menu-buffer+size-width Buffer-menu-mode-width Buffer-menu-use-frame-buffer-list Buffer-menu-sort-column Buffer-menu-buffer-column Buffer-menu-buffer-column Buffer-menu-files-only Buffer-menu-mode-map Buffer-menu-mode-map Buffer-menu-mode-syntax-table Buffer-menu-mode-abbrev-table Buffer-menu-mode-abbrev-table
+  (defun . Buffer-menu-mode)
+  buffer-menu-mode-hook
+  (defun . Buffer-menu-revert-function)
+  (defun . Buffer-menu-toggle-files-only)
+  (defun . Buffer-menu-buffer)
+  (defun . buffer-menu)
+  (defun . buffer-menu-other-window)
+  (defun . Buffer-menu-no-header)
+  (defun . Buffer-menu-mark)
+  (defun . Buffer-menu-unmark)
+  (defun . Buffer-menu-backup-unmark)
+  (defun . Buffer-menu-delete)
+  (defun . Buffer-menu-delete-backwards)
+  (defun . Buffer-menu-save)
+  (defun . Buffer-menu-not-modified)
+  (defun . Buffer-menu-beginning)
+  (defun . Buffer-menu-execute)
+  (defun . Buffer-menu-select)
+  (defun . Buffer-menu-marked-buffers)
+  (defun . Buffer-menu-isearch-buffers)
+  (defun . Buffer-menu-isearch-buffers-regexp)
+  (defun . Buffer-menu-visit-tags-table)
+  (defun . Buffer-menu-1-window)
+  (defun . Buffer-menu-mouse-select)
+  (defun . Buffer-menu-this-window)
+  (defun . Buffer-menu-other-window)
+  (defun . Buffer-menu-switch-other-window)
+  (defun . Buffer-menu-2-window)
+  (defun . Buffer-menu-toggle-read-only)
+  (defun . Buffer-menu-bury)
+  (defun . Buffer-menu-view)
+  (defun . Buffer-menu-view-other-window)
+  (defun . list-buffers)
+  Buffer-menu-short-ellipsis Buffer-menu-short-ellipsis
+  (defun . Buffer-menu-buffer+size)
+  (defun . Buffer-menu-sort)
+  (defun . Buffer-menu-sort-by-column)
+  Buffer-menu-sort-button-map
+  (defun . Buffer-menu-make-sort-button)
+  (defun . list-buffers-noselect))
+ ("/usr/share/emacs/23.0.93/lisp/replace.elc" case-replace query-replace-history query-replace-defaults query-replace-interactive query-replace-from-history-variable query-replace-to-history-variable query-replace-skip-read-only query-replace-show-replacement query-replace-highlight query-replace-lazy-highlight
+  (defface . query-replace)
+  (defun . query-replace-descr)
+  (defun . query-replace-read-from)
+  (defun . query-replace-compile-replacement)
+  (defun . query-replace-read-to)
+  (defun . query-replace-read-args)
+  (defun . query-replace)
+  (defun . query-replace-regexp)
+  (defun . query-replace-regexp-eval)
+  (defun . map-query-replace-regexp)
+  (defun . replace-string)
+  (defun . replace-regexp)
+  regexp-history
+  (defun . read-regexp)
+  (defun . delete-non-matching-lines)
+  (defun . delete-matching-lines)
+  (defun . count-matches)
+  (defun . keep-lines-read-args)
+  (defun . keep-lines)
+  (defun . flush-lines)
+  (defun . how-many)
+  occur-mode-map occur-revert-arguments occur-mode-hook occur-hook occur-mode-find-occurrence-hook
+  (defun . occur-mode)
+  (defun . occur-revert-function)
+  (defun . occur-mode-find-occurrence)
+  (defun . occur-mode-mouse-goto)
+  (defun . occur-mode-goto-occurrence)
+  (defun . occur-mode-goto-occurrence-other-window)
+  (defun . occur-mode-display-occurrence)
+  (defun . occur-find-match)
+  (defun . occur-next)
+  (defun . occur-prev)
+  (defun . occur-next-error)
+  (defface . match)
+  list-matching-lines-default-context-lines
+  (defun . list-matching-lines)
+  list-matching-lines-face list-matching-lines-buffer-name-face occur-excluded-properties
+  (defun . occur-accumulate-lines)
+  (defun . occur-read-primary-args)
+  (defun . occur-rename-buffer)
+  (defun . occur)
+  (defun . multi-occur)
+  (defun . multi-occur-in-matching-buffers)
+  (defun . occur-1)
+  (defun . occur-engine-add-prefix)
+  (defun . occur-engine)
+  (defun . occur-context-lines)
+  query-replace-help query-replace-map multi-query-replace-map
+  (defun . replace-match-string-symbols)
+  (defun . replace-eval-replacement)
+  (defun . replace-quote)
+  (defun . replace-loop-through-replacements)
+  (defun . replace-match-data)
+  (defun . replace-match-maybe-edit)
+  replace-search-function replace-re-search-function
+  (defun . perform-replace)
+  replace-overlay
+  (defun . replace-highlight)
+  (defun . replace-dehighlight))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/fill.elc" fill-individual-varying-indent colon-double-space fill-paragraph-function fill-paragraph-handle-comment enable-kinsoku
+  (defun . set-fill-prefix)
+  adaptive-fill-mode adaptive-fill-regexp adaptive-fill-first-line-regexp adaptive-fill-function fill-indent-according-to-mode
+  (defun . current-fill-column)
+  (defun . canonically-space-region)
+  (defun . fill-common-string-prefix)
+  (defun . fill-match-adaptive-prefix)
+  (defun . fill-context-prefix)
+  (defun . fill-single-word-nobreak-p)
+  (defun . fill-french-nobreak-p)
+  fill-nobreak-predicate fill-nobreak-invisible
+  (defun . fill-nobreak-p)
+  fill-find-break-point-function-table fill-nospace-between-words-table
+  (defun . fill-find-break-point)
+  (defun . fill-delete-prefix)
+  (defun . fill-delete-newlines)
+  (defun . fill-move-to-break-point)
+  (defun . fill-text-properties-at)
+  (defun . fill-newline)
+  (defun . fill-indent-to-left-margin)
+  (defun . fill-region-as-paragraph)
+  (defun . skip-line-prefix)
+  (defun . fill-minibuffer-function)
+  fill-forward-paragraph-function
+  (defun . fill-forward-paragraph)
+  (defun . fill-paragraph)
+  (defun . fill-comment-paragraph)
+  (defun . fill-region)
+  default-justification
+  (defun . current-justification)
+  (defun . set-justification)
+  (defun . set-justification-none)
+  (defun . set-justification-left)
+  (defun . set-justification-right)
+  (defun . set-justification-full)
+  (defun . set-justification-center)
+  (defun . justify-current-line)
+  (defun . unjustify-current-line)
+  (defun . unjustify-region)
+  (defun . fill-nonuniform-paragraphs)
+  (defun . fill-individual-paragraphs)
+  (defun . fill-individual-paragraphs-prefix)
+  (defun . fill-individual-paragraphs-citation))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/text-mode.elc" text-mode-hook text-mode-variant text-mode-syntax-table text-mode-map text-mode-map text-mode-syntax-table text-mode-abbrev-table text-mode-abbrev-table
+  (defun . text-mode)
+  paragraph-indent-text-mode-map
+  (defun . paragraph-indent-text-mode)
+  (defun . paragraph-indent-minor-mode)
+  (defun . indented-text-mode)
+  (defun . text-mode-hook-identify)
+  (defun . toggle-text-mode-auto-fill)
+  (defun . center-paragraph)
+  (defun . center-region)
+  (defun . center-line))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/lisp-mode.elc" lisp-mode-abbrev-table lisp-mode-abbrev-table emacs-lisp-mode-syntax-table lisp-mode-syntax-table lisp-imenu-generic-expression lisp-doc-string-elt-property
+  (defun . lisp-font-lock-syntactic-face-function)
+  (defun . lisp-mode-variables)
+  (defun . lisp-outline-level)
+  lisp-mode-shared-map emacs-lisp-mode-map
+  (defun . emacs-lisp-byte-compile)
+  (defun . emacs-lisp-byte-compile-and-load)
+  emacs-lisp-mode-hook lisp-mode-hook lisp-interaction-mode-hook
+  (defun . emacs-lisp-mode)
+  lisp-mode-map
+  (defun . lisp-mode)
+  (defun . lisp-find-tag-default)
+  (defun . common-lisp-mode)
+  (defun . lisp-eval-defun)
+  lisp-interaction-mode-map lisp-interaction-mode-abbrev-table lisp-interaction-mode-map lisp-interaction-mode-syntax-table lisp-interaction-mode-abbrev-table
+  (defun . lisp-interaction-mode)
+  (defun . eval-print-last-sexp)
+  (defun . last-sexp-setup-props)
+  (defun . last-sexp-toggle-display)
+  (defun . prin1-char)
+  (defun . preceding-sexp)
+  (defun . eval-last-sexp-1)
+  (defun . eval-last-sexp-print-value)
+  eval-last-sexp-fake-value
+  (defun . eval-last-sexp)
+  (defun . eval-defun-1)
+  (defun . eval-defun-2)
+  (defun . eval-defun)
+  (defun . lisp-comment-indent)
+  (defun . lisp-mode-auto-fill)
+  lisp-indent-offset lisp-indent-function
+  (defun . lisp-indent-line)
+  (defun . calculate-lisp-indent)
+  (defun . lisp-indent-function)
+  lisp-body-indent
+  (defun . lisp-indent-specform)
+  (defun . lisp-indent-defform)
+  (defun . indent-sexp)
+  (defun . lisp-indent-region)
+  (defun . indent-pp-sexp)
+  emacs-lisp-docstring-fill-column
+  (defun . lisp-fill-paragraph)
+  (defun . indent-code-rigidly)
+  (provide . lisp-mode))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/paragraphs.elc" use-hard-newlines
+  (defun . use-hard-newlines)
+  paragraph-start paragraph-separate sentence-end-double-space sentence-end-without-period sentence-end-without-space sentence-end sentence-end-base
+  (defun . sentence-end)
+  page-delimiter paragraph-ignore-fill-prefix
+  (defun . forward-paragraph)
+  (defun . backward-paragraph)
+  (defun . mark-paragraph)
+  (defun . kill-paragraph)
+  (defun . backward-kill-paragraph)
+  (defun . transpose-paragraphs)
+  (defun . start-of-paragraph-text)
+  (defun . end-of-paragraph-text)
+  (defun . forward-sentence)
+  (defun . repunctuate-sentences)
+  (defun . backward-sentence)
+  (defun . kill-sentence)
+  (defun . backward-kill-sentence)
+  (defun . mark-end-of-sentence)
+  (defun . transpose-sentences))
+ ("/usr/share/emacs/23.0.93/lisp/register.elc" register-alist
+  (defun . get-register)
+  (defun . set-register)
+  (defun . point-to-register)
+  (defun . window-configuration-to-register)
+  (defun . frame-configuration-to-register)
+  (defun . register-to-point)
+  (defun . jump-to-register)
+  (defun . register-swap-out)
+  (defun . number-to-register)
+  (defun . increment-register)
+  (defun . view-register)
+  (defun . list-registers)
+  (defun . describe-register-1)
+  (defun . insert-register)
+  (defun . copy-to-register)
+  (defun . append-to-register)
+  (defun . prepend-to-register)
+  (defun . copy-rectangle-to-register)
+  (provide . register))
+ ("/usr/share/emacs/23.0.93/lisp/textmodes/page.elc"
+  (defun . forward-page)
+  (defun . backward-page)
+  (defun . mark-page)
+  (defun . narrow-to-page)
+  (defun . count-lines-page)
+  (defun . what-page)
+  (provide . page))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/lisp.elc" defun-prompt-regexp parens-require-spaces forward-sexp-function
+  (defun . forward-sexp)
+  (defun . backward-sexp)
+  (defun . mark-sexp)
+  (defun . forward-list)
+  (defun . backward-list)
+  (defun . down-list)
+  (defun . backward-up-list)
+  (defun . up-list)
+  (defun . kill-sexp)
+  (defun . backward-kill-sexp)
+  (defun . kill-backward-up-list)
+  beginning-of-defun-function
+  (defun . beginning-of-defun)
+  (defun . beginning-of-defun-raw)
+  end-of-defun-function
+  (defun . buffer-end)
+  (defun . end-of-defun)
+  (defun . mark-defun)
+  (defun . narrow-to-defun)
+  insert-pair-alist
+  (defun . insert-pair)
+  (defun . insert-parentheses)
+  (defun . delete-pair)
+  (defun . raise-sexp)
+  (defun . move-past-close-and-reindent)
+  (defun . check-parens)
+  (defun . field-complete)
+  (defun . lisp-complete-symbol))
+ ("/usr/share/emacs/23.0.93/lisp/paths.el"
+  (defun . prune-directory-list)
+  Info-default-directory-list news-directory news-path news-inews-program gnus-default-nntp-server gnus-nntp-service gnus-local-organization rmail-file-name rmail-spool-directory remote-shell-program term-file-prefix abbrev-file-name)
+ ("/usr/share/emacs/23.0.93/lisp/menu-bar.elc" menu-bar-help-menu menu-bar-tools-menu global-buffers-menu-map menu-bar-options-menu menu-bar-edit-menu menu-bar-file-menu menu-bar-files-menu
+  (defun . menu-find-file-existing)
+  menu-bar-last-search-type
+  (defun . nonincremental-repeat-search-forward)
+  (defun . nonincremental-repeat-search-backward)
+  (defun . nonincremental-search-forward)
+  (defun . nonincremental-search-backward)
+  (defun . nonincremental-re-search-forward)
+  (defun . nonincremental-re-search-backward)
+  menu-bar-search-menu menu-bar-i-search-menu menu-bar-replace-menu menu-bar-goto-menu
+  (defun . menu-bar-next-tag-other-window)
+  (defun . menu-bar-next-tag)
+  yank-menu
+  (defun . menu-bar-kill-ring-save)
+  (defun . clipboard-yank)
+  (defun . clipboard-kill-ring-save)
+  (defun . clipboard-kill-region)
+  (defun . menu-bar-enable-clipboard)
+  menu-bar-custom-menu
+  (defun . menu-bar-make-mm-toggle)
+  (defun . menu-bar-make-toggle)
+  (defun . menu-set-font)
+  (defun . menu-bar-options-save)
+  menu-bar-showhide-menu menu-bar-showhide-fringe-menu menu-bar-showhide-fringe-ind-menu
+  (defun . menu-bar-showhide-fringe-ind-customize)
+  (defun . menu-bar-showhide-fringe-ind-mixed)
+  (defun . menu-bar-showhide-fringe-ind-box)
+  (defun . menu-bar-showhide-fringe-ind-right)
+  (defun . menu-bar-showhide-fringe-ind-left)
+  (defun . menu-bar-showhide-fringe-ind-none)
+  (defun . toggle-indicate-empty-lines)
+  (defun . menu-bar-showhide-fringe-menu-customize)
+  (defun . menu-bar-showhide-fringe-menu-customize-reset)
+  (defun . menu-bar-showhide-fringe-menu-customize-right)
+  (defun . menu-bar-showhide-fringe-menu-customize-left)
+  (defun . menu-bar-showhide-fringe-menu-customize-disable)
+  menu-bar-showhide-scroll-bar-menu
+  (defun . menu-bar-right-scroll-bar)
+  (defun . menu-bar-left-scroll-bar)
+  (defun . menu-bar-no-scroll-bar)
+  (defun . toggle-debug-on-quit)
+  (defun . toggle-debug-on-error)
+  (defun . toggle-save-place-globally)
+  (defun . toggle-uniquify-buffer-names)
+  (defun . toggle-case-fold-search)
+  (defun . menu-bar-text-mode-auto-fill)
+  menu-bar-line-wrapping-menu
+  (defun . send-mail-item-name)
+  (defun . read-mail-item-name)
+  menu-bar-games-menu menu-bar-encryption-decryption-menu
+  (defun . menu-bar-read-mail)
+  menu-bar-describe-menu menu-bar-search-documentation-menu
+  (defun . menu-bar-read-lispref)
+  (defun . menu-bar-read-lispintro)
+  (defun . search-emacs-glossary)
+  (defun . emacs-index-search)
+  (defun . elisp-index-search)
+  (defun . debian-emacs-changelog)
+  (defun . debian-emacs-news)
+  (defun . debian-emacs-readme)
+  menu-bar-manuals-menu
+  (defun . menu-bar-help-extra-packages)
+  (defun . help-with-tutorial-spec-language)
+  (defun . menu-bar-menu-frame-live-and-visible-p)
+  (defun . menu-bar-non-minibuffer-window-p)
+  (defun . kill-this-buffer)
+  (defun . kill-this-buffer-enabled-p)
+  (defun . delete-frame-enabled-p)
+  yank-menu-length
+  (defun . menu-bar-update-yank-menu)
+  (defun . menu-bar-select-yank)
+  buffers-menu-max-size buffers-menu-buffer-name-length buffers-menu-show-directories buffers-menu-show-status list-buffers-directory
+  (defun . menu-bar-select-buffer)
+  (defun . menu-bar-select-frame)
+  (defun . menu-bar-update-buffers-1)
+  menu-bar-buffers-menu-command-entries
+  (defun . menu-bar-update-buffers)
+  menu-bar-mode
+  (defun . menu-bar-mode)
+  (defun . toggle-menu-bar-mode-from-frame)
+  (defun . menu-bar-open)
+  (provide . menu-bar))
+ ("/usr/share/emacs/23.0.93/lisp/rfn-eshadow.elc" file-name-shadow-properties-custom-type file-name-shadow-properties-custom-type file-name-shadow-properties file-name-shadow-tty-properties
+  (defface . file-name-shadow)
+  rfn-eshadow-setup-minibuffer-hook rfn-eshadow-update-overlay-hook rfn-eshadow-frobbed-minibufs
+  (defun . rfn-eshadow-setup-minibuffer)
+  (defun . rfn-eshadow-sifn-equal)
+  (defun . rfn-eshadow-update-overlay)
+  file-name-shadow-mode
+  (defun . file-name-shadow-mode)
+  (provide . rfn-eshadow))
+ ("/usr/share/emacs/23.0.93/lisp/isearch.elc" search-exit-option search-slow-window-lines search-slow-speed search-upper-case search-nonincremental-instead search-whitespace-regexp search-invisible isearch-hide-immediately isearch-resume-in-command-history isearch-mode-hook isearch-mode-end-hook isearch-mode-end-hook-quit isearch-message-function isearch-wrap-function isearch-push-state-function isearch-filter-predicate search-ring regexp-search-ring search-ring-max regexp-search-ring-max search-ring-yank-pointer regexp-search-ring-yank-pointer search-ring-update search-highlight
+  (defface . isearch)
+  isearch
+  (defface . isearch-fail)
+  isearch-lazy-highlight lazy-highlight-cleanup isearch-lazy-highlight-cleanup lazy-highlight-initial-delay isearch-lazy-highlight-initial-delay lazy-highlight-interval isearch-lazy-highlight-interval lazy-highlight-max-at-a-time isearch-lazy-highlight-max-at-a-time
+  (defface . lazy-highlight)
+  lazy-highlight-face isearch-lazy-highlight-face isearch-help-map
+  (defun . isearch-help-for-help-internal-doc)
+  (defun . isearch-help-for-help-internal)
+  (defun . isearch-help-for-help)
+  (defun . isearch-describe-bindings)
+  (defun . isearch-describe-key)
+  (defun . isearch-describe-mode)
+  (defun . isearch-mode-help)
+  isearch-mode-map minibuffer-local-isearch-map isearch-forward isearch-regexp isearch-word isearch-hidden isearch-cmds isearch-string isearch-message isearch-message-prefix-add isearch-message-suffix-add isearch-success isearch-error isearch-other-end isearch-wrapped isearch-barrier isearch-just-started isearch-start-hscroll isearch-case-fold-search isearch-last-case-fold-search isearch-original-minibuffer-message-timeout isearch-adjusted isearch-slow-terminal-mode isearch-small-window isearch-opoint isearch-window-configuration isearch-yank-flag isearch-op-fun isearch-recursive-edit isearch-nonincremental isearch-new-forward isearch-opened-overlays isearch-input-method-function isearch-input-method-local-p isearch-mode
+  (defun . isearch-forward)
+  (defun . isearch-forward-regexp)
+  (defun . isearch-forward-word)
+  (defun . isearch-backward)
+  (defun . isearch-backward-regexp)
+  (defun . isearch-mode)
+  (defun . isearch-update)
+  (defun . isearch-done)
+  (defun . isearch-update-ring)
+  (defun . isearch-string-state)
+  (defun . isearch-message-state)
+  (defun . isearch-point-state)
+  (defun . isearch-success-state)
+  (defun . isearch-forward-state)
+  (defun . isearch-other-end-state)
+  (defun . isearch-word-state)
+  (defun . isearch-error-state)
+  (defun . isearch-wrapped-state)
+  (defun . isearch-barrier-state)
+  (defun . isearch-case-fold-search-state)
+  (defun . isearch-pop-fun-state)
+  (defun . isearch-top-state)
+  (defun . isearch-pop-state)
+  (defun . isearch-push-state)
+  (defun . isearch-exit)
+  (defun . isearch-edit-string)
+  (defun . isearch-nonincremental-exit-minibuffer)
+  (defun . isearch-forward-exit-minibuffer)
+  (defun . isearch-reverse-exit-minibuffer)
+  (defun . isearch-cancel)
+  (defun . isearch-abort)
+  (defun . isearch-repeat)
+  (defun . isearch-repeat-forward)
+  (defun . isearch-repeat-backward)
+  (defun . isearch-toggle-regexp)
+  (defun . isearch-toggle-word)
+  (defun . isearch-toggle-case-fold)
+  (defun . isearch-query-replace)
+  (defun . isearch-query-replace-regexp)
+  (defun . isearch-occur)
+  (defun . isearch-highlight-regexp)
+  (defun . isearch-delete-char)
+  (defun . isearch-del-char)
+  (defun . isearch-yank-string)
+  (defun . isearch-yank-kill)
+  (defun . isearch-yank-x-selection)
+  (defun . isearch-mouse-2)
+  (defun . isearch-yank-internal)
+  (defun . isearch-yank-char-in-minibuffer)
+  (defun . isearch-yank-char)
+  (defun . isearch-yank-word-or-char)
+  (defun . isearch-yank-word)
+  (defun . isearch-yank-line)
+  (defun . isearch-search-and-update)
+  (defun . isearch-backslash)
+  (defun . isearch-fallback)
+  (defun . isearch-unread-key-sequence)
+  isearch-allow-scroll
+  (defun . isearch-string-out-of-window)
+  (defun . isearch-back-into-window)
+  (defun . isearch-reread-key-sequence-naturally)
+  (defun . isearch-lookup-scroll-key)
+  (defun . isearch-other-control-char)
+  (defun . isearch-other-meta-char)
+  (defun . isearch-quote-char)
+  (defun . isearch-return-char)
+  (defun . isearch-printing-char)
+  (defun . isearch-process-search-char)
+  (defun . isearch-process-search-string)
+  (defun . isearch-ring-adjust1)
+  (defun . isearch-ring-adjust)
+  (defun . isearch-ring-advance)
+  (defun . isearch-ring-retreat)
+  (defun . isearch-complete1)
+  (defun . isearch-complete)
+  (defun . isearch-complete-edit)
+  (defun . isearch-message)
+  (defun . isearch-message-prefix)
+  (defun . isearch-message-suffix)
+  isearch-search-fun-function
+  (defun . isearch-search-fun)
+  (defun . isearch-search-string)
+  (defun . isearch-search)
+  (defun . isearch-open-overlay-temporary)
+  (defun . isearch-open-necessary-overlays)
+  (defun . isearch-clean-overlays)
+  (defun . isearch-intersects-p)
+  (defun . isearch-close-unnecessary-overlays)
+  (defun . isearch-range-invisible)
+  (defun . isearch-filter-visible)
+  (defun . isearch-no-upper-case-p)
+  (defun . isearch-text-char-description)
+  (defun . isearch-unread)
+  isearch-overlay
+  (defun . isearch-highlight)
+  (defun . isearch-dehighlight)
+  isearch-lazy-highlight-overlays isearch-lazy-highlight-wrapped isearch-lazy-highlight-start-limit isearch-lazy-highlight-end-limit isearch-lazy-highlight-start isearch-lazy-highlight-end isearch-lazy-highlight-timer isearch-lazy-highlight-last-string isearch-lazy-highlight-window isearch-lazy-highlight-window-start isearch-lazy-highlight-window-end isearch-lazy-highlight-case-fold-search isearch-lazy-highlight-regexp isearch-lazy-highlight-space-regexp
+  (defun . lazy-highlight-cleanup)
+  (defun . isearch-lazy-highlight-cleanup)
+  (defun . isearch-lazy-highlight-new-loop)
+  (defun . isearch-lazy-highlight-search)
+  (defun . isearch-lazy-highlight-update)
+  (defun . isearch-resume))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/timer.elc"
+  (defun . timer--triggered)
+  (defun . timer--high-seconds)
+  (defun . timer--low-seconds)
+  (defun . timer--usecs)
+  (defun . timer--repeat-delay)
+  (defun . timer--function)
+  (defun . timer--args)
+  (defun . timer--idle-delay)
+  (defun . timer-create)
+  (defun . timerp)
+  (defun . timer--time)
+  (defun . timer-set-time)
+  (defun . timer-set-idle-time)
+  (defun . timer-next-integral-multiple-of-time)
+  (defun . timer-relative-time)
+  (defun . timer--time-less-p)
+  (defun . timer-inc-time)
+  (defun . timer-set-time-with-usecs)
+  (defun . timer-set-function)
+  (defun . timer--activate)
+  (defun . timer-activate)
+  (defun . timer-activate-when-idle)
+  (defun . disable-timeout)
+  (defun . cancel-timer)
+  (defun . cancel-timer-internal)
+  (defun . cancel-function-timers)
+  timer-event-last timer-event-last-1 timer-event-last-2 timer-max-repeats
+  (defun . timer-until)
+  (defun . timer-event-handler)
+  (defun . timeout-event-p)
+  (defun . run-at-time)
+  (defun . run-with-timer)
+  (defun . add-timeout)
+  (defun . run-with-idle-timer)
+  (defun . with-timeout-handler)
+  with-timeout-timers
+  (defun . with-timeout)
+  (defun . with-timeout-suspend)
+  (defun . with-timeout-unsuspend)
+  (defun . y-or-n-p-with-timeout)
+  timer-duration-words
+  (defun . timer-duration)
+  (provide . timer))
+ ("/usr/share/emacs/23.0.93/lisp/select.elc" selection-coding-system next-selection-coding-system
+  (defun . x-selection)
+  (defun . x-get-selection)
+  (defun . x-get-clipboard)
+  (defun . x-set-selection)
+  (defun . x-valid-simple-selection-p)
+  (defun . x-get-cut-buffer)
+  (defun . x-set-cut-buffer)
+  (defun . xselect-convert-to-string)
+  (defun . xselect-convert-to-length)
+  (defun . xselect-convert-to-targets)
+  (defun . xselect-convert-to-delete)
+  (defun . xselect-convert-to-filename)
+  (defun . xselect-convert-to-charpos)
+  (defun . xselect-convert-to-lineno)
+  (defun . xselect-convert-to-colno)
+  (defun . xselect-convert-to-os)
+  (defun . xselect-convert-to-host)
+  (defun . xselect-convert-to-user)
+  (defun . xselect-convert-to-class)
+  (defun . xselect-convert-to-name)
+  (defun . xselect-convert-to-integer)
+  (defun . xselect-convert-to-atom)
+  (defun . xselect-convert-to-identity)
+  (provide . select))
+ ("/usr/share/emacs/23.0.93/lisp/scroll-bar.elc"
+  (require . mouse)
+  (defun . scroll-bar-event-ratio)
+  (defun . scroll-bar-scale)
+  (defun . scroll-bar-columns)
+  previous-scroll-bar-mode scroll-bar-mode-explicit
+  (defun . set-scroll-bar-mode-1)
+  (defun . set-scroll-bar-mode)
+  scroll-bar-mode
+  (defun . scroll-bar-mode)
+  (defun . toggle-scroll-bar)
+  (defun . toggle-horizontal-scroll-bar)
+  (defun . scroll-bar-set-window-start)
+  (defun . scroll-bar-drag-position)
+  (defun . scroll-bar-maybe-set-window-start)
+  (defun . scroll-bar-drag-1)
+  (defun . scroll-bar-drag)
+  (defun . scroll-bar-scroll-down)
+  (defun . scroll-bar-scroll-up)
+  (defun . scroll-bar-toolkit-scroll)
+  (provide . scroll-bar))
+ ("/usr/share/emacs/23.0.93/lisp/mouse.elc" mouse-yank-at-point mouse-drag-copy-region mouse-1-click-follows-link mouse-1-click-in-non-selected-windows
+  (defun . popup-menu)
+  (defun . minor-mode-menu-from-indicator)
+  (defun . mouse-minor-mode-menu)
+  (defun . mouse-menu-major-mode-map)
+  (defun . mouse-menu-non-singleton)
+  (defun . mouse-menu-bar-map)
+  (defun . mouse-major-mode-menu)
+  (defun . mouse-popup-menubar)
+  (defun . mouse-popup-menubar-stuff)
+  (defun . mouse-minibuffer-check)
+  (defun . mouse-delete-window)
+  (defun . mouse-select-window)
+  (defun . mouse-tear-off-window)
+  (defun . mouse-delete-other-windows)
+  (defun . mouse-split-window-vertically)
+  (defun . mouse-split-window-horizontally)
+  (defun . mouse-drag-window-above)
+  (defun . mouse-drag-move-window-bottom)
+  (defun . mouse-drag-move-window-top)
+  (defun . mouse-drag-mode-line-1)
+  (defun . mouse-drag-mode-line)
+  (defun . mouse-drag-header-line)
+  (defun . mouse-drag-vertical-line-rightward-window)
+  (defun . mouse-drag-vertical-line)
+  (defun . mouse-set-point)
+  mouse-last-region-beg mouse-last-region-end mouse-last-region-tick
+  (defun . mouse-region-match)
+  (defun . mouse-set-region)
+  (defun . mouse-set-region-1)
+  mouse-scroll-delay mouse-scroll-min-lines
+  (defun . mouse-scroll-subr)
+  mouse-drag-overlay mouse-drag-overlay mouse-selection-click-count mouse-selection-click-count-buffer
+  (defun . mouse-drag-region)
+  (defun . mouse-posn-property)
+  (defun . mouse-on-link-p)
+  (defun . mouse-fixup-help-message)
+  (defun . mouse-move-drag-overlay)
+  (defun . mouse-drag-track)
+  (defun . mouse-skip-word)
+  (defun . mouse-start-end)
+  (defun . mouse-set-mark-fast)
+  (defun . mouse-undouble-last-event)
+  mouse-region-delete-keys
+  (defun . mouse-show-mark)
+  (defun . mouse-set-mark)
+  (defun . mouse-kill)
+  (defun . mouse-yank-at-click)
+  (defun . mouse-yank-primary)
+  (defun . mouse-kill-ring-save)
+  mouse-save-then-kill-posn
+  (defun . mouse-save-then-kill-delete-region)
+  (defun . mouse-save-then-kill)
+  mouse-secondary-overlay mouse-secondary-click-count mouse-secondary-start
+  (defun . mouse-start-secondary)
+  (defun . mouse-set-secondary)
+  (defun . mouse-drag-secondary)
+  (defun . mouse-yank-secondary)
+  (defun . mouse-kill-secondary)
+  (defun . mouse-secondary-save-then-kill)
+  mouse-buffer-menu-maxlen mouse-buffer-menu-mode-mult mouse-buffer-menu-mode-groups
+  (defun . mouse-buffer-menu)
+  (defun . mouse-buffer-menu-alist)
+  (defun . mouse-buffer-menu-split)
+  (defun . mouse-choose-completion)
+  (defun . font-menu-add-default)
+  x-fixed-font-alist
+  (defun . mouse-select-font)
+  (defun . mouse-set-font)
+  mouse-appearance-menu-map
+  (defun . mouse-appearance-menu)
+  (provide . mouse)
+  (defun . mldrag-drag-mode-line)
+  (defun . mldrag-drag-vertical-line)
+  (provide . mldrag))
+ ("/usr/share/emacs/23.0.93/lisp/jit-lock.elc" jit-lock-chunk-size jit-lock-stealth-time jit-lock-stealth-nice jit-lock-stealth-load jit-lock-stealth-verbose jit-lock-defer-contextually jit-lock-contextually jit-lock-context-time jit-lock-defer-time jit-lock-mode jit-lock-functions jit-lock-context-unfontify-pos jit-lock-stealth-timer jit-lock-stealth-repeat-timer jit-lock-context-timer jit-lock-defer-timer jit-lock-defer-buffers jit-lock-stealth-buffers
+  (defun . jit-lock-mode)
+  (defun . jit-lock-register)
+  (defun . jit-lock-unregister)
+  (defun . jit-lock-refontify)
+  (defun . jit-lock-function)
+  (defun . jit-lock-fontify-now)
+  (defun . jit-lock-force-redisplay)
+  (defun . jit-lock-stealth-chunk-start)
+  (defun . jit-lock-stealth-fontify)
+  (defun . jit-lock-deferred-fontify)
+  (defun . jit-lock-context-fontify)
+  jit-lock-after-change-extend-region-functions
+  (defun . jit-lock-after-change)
+  (provide . jit-lock))
+ ("/usr/share/emacs/23.0.93/lisp/font-lock.elc"
+  (require . syntax)
+  font-lock-maximum-size font-lock-maximum-decoration font-lock-verbose font-lock-comment-face font-lock-comment-delimiter-face font-lock-string-face font-lock-doc-face font-lock-keyword-face font-lock-builtin-face font-lock-function-name-face font-lock-variable-name-face font-lock-type-face font-lock-constant-face font-lock-warning-face font-lock-negation-char-face font-lock-preprocessor-face font-lock-reference-face font-lock-keywords font-lock-keywords-alist font-lock-removed-keywords-alist font-lock-keywords-only font-lock-keywords-case-fold-search font-lock-syntactically-fontified font-lock-syntactic-face-function font-lock-syntactic-keywords font-lock-syntax-table font-lock-beginning-of-syntax-function font-lock-mark-block-function font-lock-fontify-buffer-function font-lock-unfontify-buffer-function font-lock-fontify-region-function font-lock-unfontify-region-function font-lock-inhibit-thing-lock font-lock-multiline font-lock-fontified
+  (defun . font-lock-mode-internal)
+  (defun . font-lock-add-keywords)
+  (defun . font-lock-update-removed-keyword-alist)
+  (defun . font-lock-remove-keywords)
+  font-lock-support-mode
+  (defun . font-lock-turn-on-thing-lock)
+  (defun . font-lock-turn-off-thing-lock)
+  (defun . font-lock-after-fontify-buffer)
+  (defun . font-lock-after-unfontify-buffer)
+  font-lock-extend-after-change-region-function
+  (defun . font-lock-fontify-buffer)
+  (defun . font-lock-unfontify-buffer)
+  (defun . font-lock-fontify-region)
+  (defun . font-lock-unfontify-region)
+  (defun . font-lock-default-fontify-buffer)
+  (defun . font-lock-default-unfontify-buffer)
+  font-lock-dont-widen font-lock-extend-region-functions
+  (defun . font-lock-extend-region-multiline)
+  (defun . font-lock-extend-region-wholelines)
+  (defun . font-lock-default-fontify-region)
+  font-lock-extra-managed-props
+  (defun . font-lock-default-unfontify-region)
+  (defun . font-lock-after-change-function)
+  (defun . font-lock-extend-jit-lock-region-after-change)
+  (defun . font-lock-fontify-block)
+  (defun . font-lock-prepend-text-property)
+  (defun . font-lock-append-text-property)
+  (defun . font-lock-fillin-text-property)
+  (defun . font-lock-apply-syntactic-highlight)
+  (defun . font-lock-fontify-syntactic-anchored-keywords)
+  (defun . font-lock-fontify-syntactic-keywords-region)
+  font-lock-comment-start-skip font-lock-comment-end-skip
+  (defun . font-lock-fontify-syntactically-region)
+  (defun . font-lock-apply-highlight)
+  (defun . font-lock-fontify-anchored-keywords)
+  (defun . font-lock-fontify-keywords-region)
+  (defun . font-lock-compile-keywords)
+  (defun . font-lock-compile-keyword)
+  (defun . font-lock-eval-keywords)
+  (defun . font-lock-value-in-major-mode)
+  (defun . font-lock-choose-keywords)
+  font-lock-set-defaults
+  (defun . font-lock-set-defaults)
+  (defface . font-lock-comment-face)
+  (defface . font-lock-comment-delimiter-face)
+  (defface . font-lock-string-face)
+  (defface . font-lock-doc-face)
+  (defface . font-lock-keyword-face)
+  (defface . font-lock-builtin-face)
+  (defface . font-lock-function-name-face)
+  (defface . font-lock-variable-name-face)
+  (defface . font-lock-type-face)
+  (defface . font-lock-constant-face)
+  (defface . font-lock-warning-face)
+  (defface . font-lock-negation-char-face)
+  (defface . font-lock-preprocessor-face)
+  (defface . font-lock-regexp-grouping-backslash)
+  (defface . font-lock-regexp-grouping-construct)
+  (defun . font-lock-match-c-style-declaration-item-and-skip-to-next)
+  cpp-font-lock-keywords-source-directives cpp-font-lock-keywords-source-depth cpp-font-lock-keywords lisp-font-lock-keywords-1 lisp-font-lock-keywords-2 lisp-font-lock-keywords
+  (provide . font-lock))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/syntax.elc"
+  (defun . syntax-ppss-depth)
+  (defun . syntax-ppss-toplevel-pos)
+  (defun . syntax-ppss-context)
+  syntax-ppss-max-span syntax-begin-function syntax-ppss-cache syntax-ppss-last
+  (defun . syntax-ppss-after-change-function)
+  (defun . syntax-ppss-flush-cache)
+  syntax-ppss-stats
+  (defun . syntax-ppss-stats)
+  (defun . syntax-ppss)
+  (defun . syntax-ppss-debug)
+  (provide . syntax))
+ ("/usr/share/emacs/23.0.93/lisp/facemenu.elc" facemenu-keybindings facemenu-new-faces-at-end facemenu-unlisted-faces facemenu-listed-faces facemenu-face-menu
+  (defun . facemenu-face-menu)
+  facemenu-foreground-menu
+  (defun . facemenu-foreground-menu)
+  facemenu-background-menu
+  (defun . facemenu-background-menu)
+  (defun . facemenu-enable-faces-p)
+  facemenu-special-menu
+  (defun . facemenu-special-menu)
+  facemenu-justification-menu
+  (defun . facemenu-justification-menu)
+  facemenu-indentation-menu
+  (defun . facemenu-indentation-menu)
+  facemenu-menu
+  (defun . facemenu-menu)
+  facemenu-keymap
+  (defun . facemenu-keymap)
+  facemenu-add-face-function facemenu-end-add-face facemenu-remove-face-function facemenu-color-alist
+  (defun . facemenu-update)
+  (defun . facemenu-set-face)
+  (defun . facemenu-set-foreground)
+  (defun . facemenu-set-background)
+  (defun . facemenu-set-face-from-menu)
+  (defun . facemenu-set-invisible)
+  (defun . facemenu-set-intangible)
+  (defun . facemenu-set-read-only)
+  (defun . facemenu-remove-face-props)
+  (defun . facemenu-remove-all)
+  (defun . facemenu-remove-special)
+  (defun . facemenu-read-color)
+  (defun . list-colors-display)
+  (defun . list-colors-print)
+  (defun . list-colors-duplicates)
+  (defun . facemenu-color-equal)
+  (defun . facemenu-add-face)
+  (defun . facemenu-active-faces)
+  (defun . facemenu-add-new-face)
+  (defun . facemenu-add-new-color)
+  (defun . facemenu-complete-face-list)
+  (defun . facemenu-iterate)
+  (provide . facemenu))
+ ("/usr/share/emacs/23.0.93/lisp/font-core.elc" font-lock-defaults font-lock-defaults-alist font-lock-function font-lock-mode
+  (defun . font-lock-mode)
+  (defun . font-lock-change-mode)
+  (defun . font-lock-defontify)
+  (defun . font-lock-default-function)
+  (defun . turn-on-font-lock)
+  font-lock-global-modes
+  (defun . turn-on-font-lock-if-desired)
+  font-lock-mode-major-mode global-font-lock-mode
+  (defun . global-font-lock-mode)
+  global-font-lock-mode-buffers
+  (defun . global-font-lock-mode-enable-in-buffers)
+  (defun . global-font-lock-mode-check-buffers)
+  (defun . global-font-lock-mode-cmhh)
+  (provide . font-core))
+ ("/usr/share/emacs/23.0.93/lisp/term/tty-colors.elc" color-name-rgb-alist tty-standard-colors tty-color-mode-alist tty-defined-color-alist
+  (defun . tty-color-alist)
+  (defun . tty-modify-color-alist)
+  (defun . tty-register-default-colors)
+  (defun . tty-color-canonicalize)
+  (defun . tty-color-define)
+  (defun . tty-color-clear)
+  (defun . tty-color-off-gray-diag)
+  (defun . tty-color-approximate)
+  (defun . tty-color-standard-values)
+  (defun . tty-color-translate)
+  (defun . tty-color-by-index)
+  (defun . tty-color-values)
+  (defun . tty-color-desc)
+  (defun . tty-color-gray-shades))
+ ("/usr/share/emacs/23.0.93/lisp/frame.elc" frame-creation-function-alist window-system-default-frame-alist initial-frame-alist minibuffer-frame-alist pop-up-frame-alist pop-up-frame-function special-display-frame-alist
+  (defun . special-display-popup-frame)
+  (defun . handle-delete-frame)
+  frame-initial-frame frame-initial-geometry-arguments
+  (defun . frame-initialize)
+  frame-notice-user-settings
+  (defun . frame-notice-user-settings)
+  (defun . make-initial-minibuffer-frame)
+  (defun . modify-all-frames-parameters)
+  (defun . get-other-frame)
+  (defun . next-multiframe-window)
+  (defun . previous-multiframe-window)
+  (defun . make-frame-on-display)
+  (defun . close-display-connection)
+  (defun . make-frame-command)
+  before-make-frame-hook after-make-frame-functions after-setting-font-hook
+  (defun . new-frame)
+  frame-inherited-parameters
+  (defun . make-frame)
+  (defun . filtered-frame-list)
+  (defun . minibuffer-frame-list)
+  (defun . get-device-terminal)
+  (defun . frames-on-display-list)
+  (defun . framep-on-display)
+  (defun . frame-remove-geometry-params)
+  (defun . select-frame-set-input-focus)
+  (defun . other-frame)
+  (defun . iconify-or-deiconify-frame)
+  (defun . suspend-frame)
+  (defun . make-frame-names-alist)
+  frame-name-history
+  (defun . select-frame-by-name)
+  (defun . current-frame-configuration)
+  (defun . set-frame-configuration)
+  (defun . frame-height)
+  (defun . frame-width)
+  (defun . set-default-font)
+  (defun . set-frame-font)
+  (defun . set-frame-parameter)
+  (defun . set-background-color)
+  (defun . set-foreground-color)
+  (defun . set-cursor-color)
+  (defun . set-mouse-color)
+  (defun . set-border-color)
+  (defun . auto-raise-mode)
+  (defun . auto-lower-mode)
+  (defun . set-frame-name)
+  (defun . frame-current-scroll-bars)
+  (defun . selected-terminal)
+  (defun . display-mouse-p)
+  (defun . display-popup-menus-p)
+  (defun . display-graphic-p)
+  (defun . display-images-p)
+  (defun . display-multi-frame-p)
+  (defun . display-multi-font-p)
+  (defun . display-selections-p)
+  (defun . display-screens)
+  (defun . display-pixel-height)
+  (defun . display-pixel-width)
+  display-mm-dimensions-alist
+  (defun . display-mm-height)
+  (defun . display-mm-width)
+  (defun . display-backing-store)
+  (defun . display-save-under)
+  (defun . display-planes)
+  (defun . display-color-cells)
+  (defun . display-visual-class)
+  (defun . frame-geom-value-cons)
+  (defun . frame-geom-spec-cons)
+  (defun . screen-height)
+  (defun . screen-width)
+  (defun . set-screen-width)
+  (defun . set-screen-height)
+  (defun . delete-other-frames)
+  delete-frame-hook show-trailing-whitespace auto-hscroll-mode automatic-hscrolling blink-cursor-delay blink-cursor-interval blink-cursor-idle-timer blink-cursor-timer
+  (defun . blink-cursor-start)
+  (defun . blink-cursor-timer-function)
+  (defun . blink-cursor-end)
+  blink-cursor-mode
+  (defun . blink-cursor-mode)
+  blink-cursor display-hourglass hourglass-delay cursor-in-non-selected-windows
+  (provide . frame))
+ ("/usr/share/emacs/23.0.93/lisp/window.elc" window-size-fixed
+  (defun . save-selected-window)
+  (defun . window-body-height)
+  (defun . one-window-p)
+  (defun . window-current-scroll-bars)
+  (defun . walk-windows)
+  (defun . get-window-with-predicate)
+  (defun . some-window)
+  (defun . get-buffer-window-list)
+  (defun . minibuffer-window-active-p)
+  (defun . count-windows)
+  (defun . bw-get-tree)
+  (defun . bw-get-tree-1)
+  (defun . bw-find-tree-sub)
+  (defun . bw-find-tree-sub-1)
+  (defun . bw-l)
+  (defun . bw-t)
+  (defun . bw-r)
+  (defun . bw-b)
+  (defun . bw-dir)
+  (defun . bw-eqdir)
+  (defun . bw-refresh-edges)
+  (defun . balance-windows)
+  (defun . bw-adjust-window)
+  (defun . bw-balance-sub)
+  (defun . window-fixed-size-p)
+  window-area-factor
+  (defun . balance-windows-area)
+  display-buffer-function special-display-buffer-names special-display-regexps
+  (defun . special-display-p)
+  special-display-function same-window-buffer-names same-window-regexps
+  (defun . same-window-p)
+  pop-up-frames display-buffer-reuse-frames pop-up-windows split-height-threshold split-width-threshold split-window-preferred-function
+  (defun . window--splittable-p)
+  (defun . window--try-to-split-window)
+  (defun . window--frame-usable-p)
+  even-window-heights
+  (defun . window--even-window-heights)
+  (defun . window--display-buffer-1)
+  (defun . window--display-buffer-2)
+  (defun . display-buffer)
+  (defun . pop-to-buffer)
+  split-window-keep-point
+  (defun . split-window-vertically)
+  (defun . split-window-save-restore-data)
+  (defun . split-window-horizontally)
+  (defun . set-window-text-height)
+  (defun . enlarge-window-horizontally)
+  (defun . shrink-window-horizontally)
+  (defun . window-buffer-height)
+  (defun . count-screen-lines)
+  (defun . fit-window-to-buffer)
+  (defun . window-safely-shrinkable-p)
+  (defun . shrink-window-if-larger-than-buffer)
+  (defun . kill-buffer-and-window)
+  (defun . quit-window)
+  recenter-last-op
+  (defun . recenter-top-bottom)
+  mouse-autoselect-window-timer mouse-autoselect-window-position mouse-autoselect-window-window mouse-autoselect-window-state
+  (defun . mouse-autoselect-window-cancel)
+  (defun . mouse-autoselect-window-start)
+  (defun . mouse-autoselect-window-select)
+  (defun . handle-select-window)
+  (defun . delete-other-windows-vertically)
+  (defun . truncated-partial-width-window-p))
+ ("/usr/share/emacs/23.0.93/lisp/indent.elc" standard-indent indent-line-function tab-always-indent
+  (defun . indent-according-to-mode)
+  (defun . indent-for-tab-command)
+  (defun . insert-tab)
+  (defun . indent-rigidly)
+  (defun . indent-line-to)
+  (defun . current-left-margin)
+  (defun . move-to-left-margin)
+  (defun . indent-to-left-margin)
+  (defun . delete-to-left-margin)
+  (defun . set-left-margin)
+  (defun . set-right-margin)
+  (defun . alter-text-property)
+  (defun . increase-left-margin)
+  (defun . decrease-left-margin)
+  (defun . increase-right-margin)
+  (defun . decrease-right-margin)
+  (defun . beginning-of-line-text)
+  indent-region-function
+  (defun . indent-region)
+  (defun . indent-relative-maybe)
+  (defun . indent-relative)
+  tab-stop-list edit-tab-stops-map edit-tab-stops-buffer
+  (defun . edit-tab-stops)
+  (defun . edit-tab-stops-note-changes)
+  (defun . tab-to-tab-stop)
+  (defun . move-to-tab-stop))
+ ("/usr/share/emacs/23.0.93/lisp/language/cham.el"
+  (provide . cham))
+ ("/usr/share/emacs/23.0.93/lisp/language/burmese.el")
+ ("/usr/share/emacs/23.0.93/lisp/language/khmer.el")
+ ("/usr/share/emacs/23.0.93/lisp/language/georgian.el"
+  (provide . georgian))
+ ("/usr/share/emacs/23.0.93/lisp/language/utf-8-lang.el"
+  (provide . utf-8-lang))
+ ("/usr/share/emacs/23.0.93/lisp/language/misc-lang.el"
+  (provide . misc-lang))
+ ("/usr/share/emacs/23.0.93/lisp/language/vietnamese.elc"
+  (provide . vietnamese))
+ ("/usr/share/emacs/23.0.93/lisp/language/tibetan.elc" tibetan-composable-pattern tibetan-consonant-transcription-alist tibetan-consonant-transcription-alist tibetan-vowel-transcription-alist tibetan-vowel-transcription-alist tibetan-modifier-transcription-alist tibetan-modifier-transcription-alist tibetan-precomposed-transcription-alist tibetan-precomposed-transcription-alist tibetan-subjoined-transcription-alist tibetan-subjoined-transcription-alist tibetan-base-to-subjoined-alist tibetan-base-to-subjoined-alist tibetan-composite-vowel-alist tibetan-composite-vowel-alist tibetan-precomposition-rule-alist tibetan-precomposition-rule-alist tibetan-regexp tibetan-precomposed-regexp tibetan-precomposition-rule-regexp tibetan-decomposed tibetan-decomposed-temp
+  (provide . tibetan))
+ ("/usr/share/emacs/23.0.93/lisp/language/thai.el"
+  (provide . thai))
+ ("/usr/share/emacs/23.0.93/lisp/language/tai-viet.el"
+  (provide . tai-viet))
+ ("/usr/share/emacs/23.0.93/lisp/language/lao.el"
+  (provide . lao))
+ ("/usr/share/emacs/23.0.93/lisp/language/korean.el"
+  (provide . korean))
+ ("/usr/share/emacs/23.0.93/lisp/language/japanese.el"
+  (defun . compose-gstring-for-variation-glyph)
+  (provide . japanese))
+ ("/usr/share/emacs/23.0.93/lisp/international/eucjp-ms.el")
+ ("/usr/share/emacs/23.0.93/lisp/international/cp51932.el")
+ ("/usr/share/emacs/23.0.93/lisp/language/hebrew.el"
+  (provide . hebrew))
+ ("/usr/share/emacs/23.0.93/lisp/language/greek.el"
+  (provide . greek))
+ ("/usr/share/emacs/23.0.93/lisp/language/romanian.el"
+  (provide . romanian))
+ ("/usr/share/emacs/23.0.93/lisp/language/slovak.el"
+  (provide . slovak))
+ ("/usr/share/emacs/23.0.93/lisp/language/czech.el"
+  (provide . czech))
+ ("/usr/share/emacs/23.0.93/lisp/language/european.elc"
+  (defun . turkish-case-conversion-enable)
+  (defun . turkish-case-conversion-disable)
+  (provide . european))
+ ("/usr/share/emacs/23.0.93/lisp/language/ethiopic.elc" ccl-encode-ethio-font ccl-encode-ethio-font
+  (provide . ethiopic))
+ ("/usr/share/emacs/23.0.93/lisp/language/english.el")
+ ("/usr/share/emacs/23.0.93/lisp/language/sinhala.el")
+ ("/usr/share/emacs/23.0.93/lisp/language/indian.elc" devanagari-composable-pattern tamil-composable-pattern kannada-composable-pattern malayalam-composable-pattern
+  (provide . indian))
+ ("/usr/share/emacs/23.0.93/lisp/language/cyrillic.elc"
+  (provide . cyrillic))
+ ("/usr/share/emacs/23.0.93/lisp/language/chinese.elc"
+  (provide . chinese))
+ ("/usr/share/emacs/23.0.93/lisp/international/charprop.el")
+ ("/usr/share/emacs/23.0.93/lisp/composite.elc" reference-point-alist
+  (t . encode-composition-rule)
+  (defun . encode-composition-rule)
+  (defun . decode-composition-rule)
+  (defun . encode-composition-components)
+  (defun . decode-composition-components)
+  (defun . compose-region)
+  (defun . decompose-region)
+  (defun . compose-string)
+  (defun . decompose-string)
+  (defun . compose-chars)
+  (defun . find-composition)
+  (defun . compose-chars-after)
+  (defun . compose-last-chars)
+  (defun . lgstring-header)
+  (defun . lgstring-set-header)
+  (defun . lgstring-font)
+  (defun . lgstring-char)
+  (defun . lgstring-char-len)
+  (defun . lgstring-shaped-p)
+  (defun . lgstring-set-id)
+  (defun . lgstring-glyph)
+  (defun . lgstring-glyph-len)
+  (defun . lgstring-set-glyph)
+  (defun . lglyph-from)
+  (defun . lglyph-to)
+  (defun . lglyph-char)
+  (defun . lglyph-code)
+  (defun . lglyph-width)
+  (defun . lglyph-lbearing)
+  (defun . lglyph-rbearing)
+  (defun . lglyph-ascent)
+  (defun . lglyph-descent)
+  (defun . lglyph-adjustment)
+  (defun . lglyph-set-from-to)
+  (defun . lglyph-set-char)
+  (defun . lglyph-set-code)
+  (defun . lglyph-set-width)
+  (defun . lglyph-set-adjustment)
+  (defun . lglyph-copy)
+  (defun . lgstring-insert-glyph)
+  (defun . compose-glyph-string)
+  (defun . compose-glyph-string-relative)
+  (defun . compose-gstring-for-graphic)
+  (defun . compose-gstring-for-terminal)
+  (defun . auto-compose-chars)
+  auto-composition-mode
+  (t . auto-composition-mode)
+  (defun . auto-composition-mode)
+  (defun . turn-on-auto-composition-if-enabled)
+  auto-composition-mode-major-mode global-auto-composition-mode
+  (t . global-auto-composition-mode)
+  (defun . global-auto-composition-mode)
+  global-auto-composition-mode-buffers
+  (defun . global-auto-composition-mode-enable-in-buffers)
+  (defun . global-auto-composition-mode-check-buffers)
+  (defun . global-auto-composition-mode-cmhh)
+  (defun . toggle-auto-composition)
+  (defun . decompose-composite-char))
+ ("/usr/share/emacs/23.0.93/lisp/international/characters.elc" cjk-char-width-table
+  (defun . use-cjk-char-width-table)
+  (defun . use-default-char-width-table)
+  (defun . build-unicode-category-table))
+ ("/usr/share/emacs/23.0.93/lisp/case-table.elc"
+  (defun . describe-buffer-case-table)
+  (defun . get-upcase-table)
+  (defun . copy-case-table)
+  (defun . set-case-syntax-delims)
+  (defun . set-case-syntax-pair)
+  (defun . set-upcase-syntax)
+  (defun . set-downcase-syntax)
+  (defun . set-case-syntax)
+  (provide . case-table))
+ ("/usr/share/emacs/23.0.93/lisp/international/mule-cmds.elc" mule-keymap mule-menu-keymap describe-language-environment-map setup-language-environment-map set-coding-system-map help-xref-mule-regexp-template help-xref-mule-regexp-template
+  (defun . coding-system-change-eol-conversion)
+  (defun . coding-system-change-text-conversion)
+  (defun . canonicalize-coding-system-name)
+  (defun . coding-system-from-name)
+  (defun . toggle-enable-multibyte-characters)
+  (defun . view-hello-file)
+  (defun . universal-coding-system-argument)
+  (defun . set-default-coding-systems)
+  (defun . prefer-coding-system)
+  sort-coding-systems-predicate
+  (defun . sort-coding-systems)
+  (defun . find-coding-systems-region)
+  (defun . find-coding-systems-string)
+  (defun . find-coding-systems-for-charsets)
+  (defun . find-multibyte-characters)
+  (defun . search-unencodable-char)
+  last-coding-system-specified select-safe-coding-system-accept-default-p
+  (defun . select-safe-coding-system-interactively)
+  (defun . select-safe-coding-system)
+  (defun . select-message-coding-system)
+  language-info-alist
+  (defun . get-language-info)
+  (defun . set-language-info)
+  (defun . set-language-info-internal)
+  (defun . set-language-info-alist)
+  (defun . read-language-name)
+  leim-list-file-name leim-list-header leim-list-entry-regexp update-leim-list-functions
+  (defun . update-leim-list-file)
+  current-input-method current-input-method-title default-input-method input-method-history inactivate-current-input-method-function describe-current-input-method-function input-method-alist
+  (defun . register-input-method)
+  (defun . read-input-method-name)
+  (defun . activate-input-method)
+  (defun . inactivate-input-method)
+  (defun . set-input-method)
+  toggle-input-method-active
+  (defun . toggle-input-method)
+  (defun . describe-input-method)
+  (defun . describe-current-input-method)
+  (defun . read-multilingual-string)
+  input-method-verbose-flag input-method-highlight-flag input-method-activate-hook input-method-inactivate-hook input-method-after-insert-chunk-hook input-method-exit-on-first-char input-method-use-echo-area input-method-exit-on-invalid-key set-language-environment-hook exit-language-environment-hook
+  (defun . setup-specified-language-environment)
+  current-language-environment
+  (defun . reset-language-environment)
+  (defun . set-display-table-and-terminal-coding-system)
+  (defun . set-language-environment)
+  language-info-custom-alist
+  (defun . standard-display-european-internal)
+  (defun . set-language-environment-coding-systems)
+  (defun . set-language-environment-input-method)
+  (defun . set-language-environment-nonascii-translation)
+  (defun . set-language-environment-charset)
+  (defun . set-language-environment-unibyte)
+  (defun . princ-list)
+  (defun . describe-specified-language-support)
+  (defun . describe-language-environment)
+  locale-translation-file-name locale-language-names locale-charset-language-names locale-preferred-coding-systems
+  (defun . locale-name-match)
+  (defun . locale-charset-match-p)
+  locale-charset-alist
+  (defun . locale-charset-to-coding-system)
+  (defun . locale-translate)
+  (defun . set-locale-environment)
+  char-code-property-alist
+  (defun . define-char-code-property)
+  char-code-property-table
+  (defun . get-char-code-property)
+  (defun . put-char-code-property)
+  (defun . char-code-property-description)
+  iso-2022-control-alist
+  (defun . encoded-string-description)
+  (defun . encode-coding-char)
+  unify-8859-on-encoding-mode
+  (defun . unify-8859-on-encoding-mode)
+  unify-8859-on-decoding-mode
+  (defun . unify-8859-on-decoding-mode)
+  nonascii-insert-offset nonascii-translation-table ucs-names
+  (defun . ucs-names)
+  ucs-completions
+  (defun . read-char-by-name)
+  (defun . ucs-insert))
+ ("/usr/share/emacs/23.0.93/lisp/epa-hook.elc"
+  (defun . epa-file--file-name-regexp-set)
+  epa-file-name-regexp epa-file-inhibit-auto-save epa-file-encrypt-to epa-file-handler epa-file-auto-mode-alist-entry
+  (defun . epa-file-name-regexp-update)
+  (defun . epa-file-find-file-hook)
+  auto-encryption-mode
+  (defun . auto-encryption-mode)
+  (provide . epa-hook))
+ ("/usr/share/emacs/23.0.93/lisp/jka-cmpr-hook.elc" jka-compr-added-to-file-coding-system-alist jka-compr-file-name-handler-entry jka-compr-compression-info-list--internal jka-compr-mode-alist-additions--internal jka-compr-load-suffixes--internal
+  (defun . jka-compr-build-file-regexp)
+  (defun . jka-compr-info-regexp)
+  (defun . jka-compr-info-compress-message)
+  (defun . jka-compr-info-compress-program)
+  (defun . jka-compr-info-compress-args)
+  (defun . jka-compr-info-uncompress-message)
+  (defun . jka-compr-info-uncompress-program)
+  (defun . jka-compr-info-uncompress-args)
+  (defun . jka-compr-info-can-append)
+  (defun . jka-compr-info-strip-extension)
+  (defun . jka-compr-info-file-magic-bytes)
+  (defun . jka-compr-get-compression-info)
+  (defun . jka-compr-install)
+  (defun . jka-compr-installed-p)
+  (defun . jka-compr-update)
+  (defun . jka-compr-set)
+  jka-compr-compression-info-list jka-compr-mode-alist-additions jka-compr-load-suffixes auto-compression-mode
+  (defun . auto-compression-mode)
+  (defun . with-auto-compression-mode)
+  (provide . jka-cmpr-hook))
+ ("/usr/share/emacs/23.0.93/lisp/help.elc" help-window help-window-point-marker help-map help-button-cache
+  (defun . help-quit)
+  help-return-method
+  (defun . print-help-return-message)
+  (defun . help)
+  (defun . help-for-help)
+  (defun . help-for-help-internal-doc)
+  (defun . help-for-help-internal)
+  (defun . function-called-at-point)
+  (defun . view-help-file)
+  (defun . describe-distribution)
+  (defun . describe-copying)
+  (defun . describe-gnu-project)
+  (defun . describe-project)
+  (defun . describe-no-warranty)
+  (defun . describe-prefix-bindings)
+  (defun . view-emacs-news)
+  (defun . view-emacs-todo)
+  (defun . view-todo)
+  (defun . view-echo-area-messages)
+  (defun . view-order-manuals)
+  (defun . view-emacs-FAQ)
+  (defun . view-emacs-problems)
+  (defun . view-emacs-debugging)
+  (defun . view-external-packages)
+  (defun . view-lossage)
+  (defun . describe-bindings)
+  (defun . describe-bindings-internal)
+  (defun . where-is)
+  (defun . help-key-description)
+  (defun . describe-key-briefly)
+  (defun . describe-key)
+  (defun . describe-mode)
+  (defun . describe-minor-mode)
+  (defun . describe-minor-mode-completion-table-for-symbol)
+  (defun . describe-minor-mode-from-symbol)
+  (defun . describe-minor-mode-completion-table-for-indicator)
+  (defun . describe-minor-mode-from-indicator)
+  (defun . lookup-minor-mode-from-indicator)
+  temp-buffer-max-height temp-buffer-resize-mode
+  (defun . temp-buffer-resize-mode)
+  (defun . resize-temp-buffer-window)
+  help-window-select
+  (defun . help-window-display-message)
+  (defun . help-window-setup-finish)
+  (defun . help-window-setup)
+  (defun . with-help-window)
+  (provide . help))
+ ("/usr/share/emacs/23.0.93/lisp/simple.elc" idle-update-delay
+  (defun . get-next-valid-buffer)
+  (defun . last-buffer)
+  (defun . next-buffer)
+  (defun . previous-buffer)
+  (defface . next-error)
+  next-error-highlight next-error-highlight-no-select next-error-recenter next-error-hook next-error-highlight-timer next-error-overlay-arrow-position next-error-last-buffer next-error-function
+  (defun . next-error-buffer-p)
+  (defun . next-error-find-buffer)
+  (defun . next-error)
+  (defun . next-error-internal)
+  (defun . goto-next-locus)
+  (defun . next-match)
+  (defun . previous-error)
+  (defun . first-error)
+  (defun . next-error-no-select)
+  (defun . previous-error-no-select)
+  next-error-follow-last-line next-error-follow-minor-mode
+  (defun . next-error-follow-minor-mode)
+  (defun . next-error-follow-mode-post-command-hook)
+  (defun . fundamental-mode)
+  special-mode-map special-mode-map special-mode-syntax-table special-mode-abbrev-table special-mode-abbrev-table
+  (defun . special-mode)
+  hard-newline
+  (defun . newline)
+  (defun . set-hard-newline-properties)
+  (defun . open-line)
+  (defun . split-line)
+  (defun . delete-indentation)
+  (defun . join-line)
+  (defun . delete-blank-lines)
+  (defun . delete-trailing-whitespace)
+  (defun . newline-and-indent)
+  (defun . reindent-then-newline-and-indent)
+  (defun . quoted-insert)
+  (defun . forward-to-indentation)
+  (defun . backward-to-indentation)
+  (defun . back-to-indentation)
+  (defun . fixup-whitespace)
+  (defun . delete-horizontal-space)
+  (defun . just-one-space)
+  (defun . beginning-of-buffer)
+  (defun . end-of-buffer)
+  (defun . mark-whole-buffer)
+  (defun . goto-line)
+  (defun . count-lines-region)
+  (defun . what-line)
+  (defun . count-lines)
+  (defun . line-number-at-pos)
+  (defun . what-cursor-position)
+  read-expression-history minibuffer-completing-symbol minibuffer-default eval-expression-print-level eval-expression-print-length eval-expression-debug-on-error
+  (defun . eval-expression-print-format)
+  (defun . eval-expression)
+  (defun . edit-and-eval-command)
+  (defun . repeat-complex-command)
+  minibuffer-history minibuffer-history-sexp-flag minibuffer-history-search-history minibuffer-text-before-history
+  (defun . minibuffer-history-initialize)
+  (defun . minibuffer-avoid-prompt)
+  minibuffer-history-case-insensitive-variables
+  (defun . previous-matching-history-element)
+  (defun . next-matching-history-element)
+  minibuffer-temporary-goal-position minibuffer-default-add-function minibuffer-default-add-done
+  (defun . minibuffer-default-add-completions)
+  (defun . goto-history-element)
+  (defun . next-history-element)
+  (defun . previous-history-element)
+  (defun . next-complete-history-element)
+  (defun . previous-complete-history-element)
+  (defun . minibuffer-prompt-width)
+  (defun . minibuffer-history-isearch-setup)
+  (defun . minibuffer-history-isearch-end)
+  (defun . minibuffer-history-isearch-search)
+  (defun . minibuffer-history-isearch-message)
+  (defun . minibuffer-history-isearch-wrap)
+  (defun . minibuffer-history-isearch-push-state)
+  (defun . minibuffer-history-isearch-pop-state)
+  (defun . advertised-undo)
+  undo-equiv-table undo-in-region undo-no-redo pending-undo-list
+  (defun . undo)
+  (defun . buffer-disable-undo)
+  (defun . undo-only)
+  undo-in-progress
+  (defun . undo-more)
+  (defun . undo-copy-list)
+  (defun . undo-copy-list-1)
+  (defun . undo-start)
+  (defun . undo-make-selective-list)
+  (defun . undo-elt-in-region)
+  (defun . undo-elt-crosses-region)
+  (defun . undo-delta)
+  undo-ask-before-discard undo-extra-outer-limit
+  (defun . undo-outer-limit-truncate)
+  shell-command-history shell-command-switch shell-command-default-error-buffer
+  (defun . minibuffer-default-add-shell-commands)
+  (defun . minibuffer-complete-shell-command)
+  minibuffer-local-shell-command-map
+  (defun . read-shell-command)
+  (defun . shell-command)
+  (defun . display-message-or-buffer)
+  (defun . shell-command-sentinel)
+  (defun . shell-command-on-region)
+  (defun . shell-command-to-string)
+  (defun . process-file)
+  (defun . start-file-process)
+  universal-argument-map universal-argument-num-events overriding-map-is-bound saved-overriding-map
+  (defun . ensure-overriding-map-is-bound)
+  (defun . restore-overriding-map)
+  (defun . universal-argument)
+  (defun . universal-argument-more)
+  (defun . negative-argument)
+  (defun . digit-argument)
+  (defun . universal-argument-minus)
+  (defun . universal-argument-other-key)
+  buffer-substring-filters
+  (defun . filter-buffer-substring)
+  interprogram-cut-function interprogram-paste-function kill-ring kill-ring-max kill-ring-yank-pointer
+  (defun . kill-new)
+  (defun . kill-append)
+  yank-pop-change-selection
+  (defun . current-kill)
+  kill-read-only-ok
+  (defun . kill-region)
+  (defun . copy-region-as-kill)
+  (defun . kill-ring-save)
+  (defun . append-next-kill)
+  yank-excluded-properties yank-window-start yank-undo-function
+  (defun . yank-pop)
+  (defun . yank)
+  (defun . rotate-yank-pointer)
+  (defun . kill-forward-chars)
+  (defun . kill-backward-chars)
+  backward-delete-char-untabify-method
+  (defun . backward-delete-char-untabify)
+  (defun . zap-to-char)
+  kill-whole-line
+  (defun . kill-line)
+  (defun . kill-whole-line)
+  (defun . forward-visible-line)
+  (defun . end-of-visible-line)
+  (defun . insert-buffer)
+  (defun . append-to-buffer)
+  (defun . prepend-to-buffer)
+  (defun . copy-to-buffer)
+  activate-mark-hook deactivate-mark-hook
+  (defun . mark)
+  (defun . deactivate-mark)
+  (defun . activate-mark)
+  select-active-regions
+  (defun . set-mark)
+  use-empty-active-region
+  (defun . use-region-p)
+  (defun . region-active-p)
+  mark-ring mark-ring-max global-mark-ring global-mark-ring-max
+  (defun . pop-to-mark-command)
+  (defun . push-mark-command)
+  set-mark-command-repeat-pop set-mark-default-inactive
+  (defun . set-mark-command)
+  (defun . push-mark)
+  (defun . pop-mark)
+  (defun . exchange-dot-and-mark)
+  (defun . exchange-point-and-mark)
+  shift-select-mode
+  (defun . handle-shift-selection)
+  transient-mark-mode
+  (defun . transient-mark-mode)
+  transient-mark-mode widen-automatically
+  (defun . pop-global-mark)
+  next-line-add-newlines
+  (defun . next-line)
+  (defun . previous-line)
+  track-eol goal-column temporary-goal-column line-move-ignore-invisible line-move-visual
+  (defun . line-move-partial)
+  (defun . line-move)
+  (defun . line-move-visual)
+  (defun . line-move-1)
+  (defun . line-move-finish)
+  (defun . line-move-to-column)
+  (defun . move-end-of-line)
+  (defun . move-beginning-of-line)
+  (defun . set-goal-column)
+  (defun . end-of-visual-line)
+  (defun . beginning-of-visual-line)
+  (defun . kill-visual-line)
+  (defun . next-logical-line)
+  (defun . previous-logical-line)
+  visual-line-mode-map visual-line-fringe-indicators visual-line--saved-state visual-line-mode
+  (defun . visual-line-mode)
+  (defun . turn-on-visual-line-mode)
+  visual-line-mode-major-mode global-visual-line-mode
+  (defun . global-visual-line-mode)
+  global-visual-line-mode-buffers
+  (defun . global-visual-line-mode-enable-in-buffers)
+  (defun . global-visual-line-mode-check-buffers)
+  (defun . global-visual-line-mode-cmhh)
+  (defun . scroll-other-window-down)
+  (defun . beginning-of-buffer-other-window)
+  (defun . end-of-buffer-other-window)
+  (defun . transpose-chars)
+  (defun . transpose-words)
+  (defun . transpose-sexps)
+  (defun . transpose-lines)
+  (defun . transpose-subr)
+  (defun . transpose-subr-1)
+  (defun . backward-word)
+  (defun . mark-word)
+  (defun . kill-word)
+  (defun . backward-kill-word)
+  (defun . current-word)
+  fill-prefix auto-fill-inhibit-regexp
+  (defun . do-auto-fill)
+  comment-line-break-function
+  (defun . default-indent-new-line)
+  normal-auto-fill-function
+  (defun . auto-fill-mode)
+  (defun . auto-fill-function)
+  (defun . turn-on-auto-fill)
+  (defun . turn-off-auto-fill)
+  (defun . set-fill-column)
+  (defun . set-selective-display)
+  indicate-unused-lines
+  (defun . toggle-truncate-lines)
+  (defun . toggle-word-wrap)
+  overwrite-mode-textual overwrite-mode-binary
+  (defun . overwrite-mode)
+  (defun . binary-overwrite-mode)
+  line-number-mode
+  (defun . line-number-mode)
+  column-number-mode
+  (defun . column-number-mode)
+  size-indication-mode
+  (defun . size-indication-mode)
+  blink-matching-paren blink-matching-paren-on-screen blink-matching-paren-distance blink-matching-delay blink-matching-paren-dont-ignore-comments
+  (defun . blink-matching-open)
+  (defun . keyboard-quit)
+  buffer-quit-function
+  (defun . keyboard-escape-quit)
+  (defun . play-sound-file)
+  read-mail-command mail-user-agent
+  (defun . rfc822-goto-eoh)
+  (defun . sendmail-user-agent-compose)
+  (defun . compose-mail)
+  (defun . compose-mail-other-window)
+  (defun . compose-mail-other-frame)
+  set-variable-value-history
+  (defun . set-variable)
+  completion-list-mode-map completion-reference-buffer completion-no-auto-exit completion-base-size
+  (defun . delete-completion-window)
+  (defun . previous-completion)
+  (defun . next-completion)
+  (defun . choose-completion)
+  (defun . choose-completion-delete-max-match)
+  choose-completion-string-functions
+  (defun . choose-completion-string)
+  completion-list-mode-map completion-list-mode-syntax-table completion-list-mode-abbrev-table completion-list-mode-abbrev-table
+  (defun . completion-list-mode)
+  (defun . completion-list-mode-finish)
+  completion-show-help completion-root-regexp
+  (defun . completion-setup-function)
+  (defun . switch-to-completions)
+  (defun . event-apply-alt-modifier)
+  (defun . event-apply-super-modifier)
+  (defun . event-apply-hyper-modifier)
+  (defun . event-apply-shift-modifier)
+  (defun . event-apply-control-modifier)
+  (defun . event-apply-meta-modifier)
+  (defun . event-apply-modifier)
+  clone-buffer-hook clone-indirect-buffer-hook
+  (defun . clone-process)
+  (defun . clone-buffer)
+  (defun . clone-indirect-buffer)
+  (defun . clone-indirect-buffer-other-window)
+  normal-erase-is-backspace
+  (defun . normal-erase-is-backspace-setup-frame)
+  (defun . normal-erase-is-backspace-mode)
+  vis-mode-saved-buffer-invisibility-spec visible-mode
+  (defun . visible-mode)
+  (defun . apply-partially)
+  bad-packages-alist
+  (defun . bad-package-check)
+  (provide . simple))
+ ("/usr/share/emacs/23.0.93/lisp/abbrev.elc" only-global-abbrevs abbrev-mode
+  (defun . abbrev-mode)
+  abbrev-mode edit-abbrevs-map
+  (defun . kill-all-abbrevs)
+  (defun . copy-abbrev-table)
+  (defun . insert-abbrevs)
+  (defun . list-abbrevs)
+  (defun . abbrev-table-name)
+  (defun . prepare-abbrev-list-buffer)
+  (defun . edit-abbrevs-mode)
+  (defun . edit-abbrevs)
+  (defun . edit-abbrevs-redefine)
+  (defun . define-abbrevs)
+  (defun . read-abbrev-file)
+  (defun . quietly-read-abbrev-file)
+  (defun . write-abbrev-file)
+  (defun . add-mode-abbrev)
+  (defun . add-global-abbrev)
+  (defun . add-abbrev)
+  (defun . inverse-add-mode-abbrev)
+  (defun . inverse-add-global-abbrev)
+  (defun . inverse-add-abbrev)
+  (defun . abbrev-prefix-mark)
+  (defun . expand-region-abbrevs)
+  (defun . abbrev-table-get)
+  (defun . abbrev-table-put)
+  (defun . abbrev-get)
+  (defun . abbrev-put)
+  (defun . abbrev-with-wrapper-hook)
+  abbrev-table-name-list
+  (defun . make-abbrev-table)
+  (defun . abbrev-table-p)
+  global-abbrev-table abbrev-minor-mode-table-alist fundamental-mode-abbrev-table abbrevs-changed abbrev-all-caps abbrev-start-location abbrev-start-location-buffer last-abbrev last-abbrev-text last-abbrev-location pre-abbrev-expand-hook
+  (defun . clear-abbrev-table)
+  (defun . define-abbrev)
+  (defun . abbrev--check-chars)
+  (defun . define-global-abbrev)
+  (defun . define-mode-abbrev)
+  (defun . abbrev--active-tables)
+  (defun . abbrev-symbol)
+  (defun . abbrev-expansion)
+  (defun . abbrev--before-point)
+  (defun . abbrev-insert)
+  abbrev-expand-functions
+  (defun . expand-abbrev)
+  (defun . unexpand-abbrev)
+  (defun . abbrev--write)
+  (defun . abbrev--describe)
+  (defun . insert-abbrev-table-description)
+  (defun . define-abbrev-table)
+  (defun . abbrev-table-menu)
+  (provide . abbrev))
+ ("/usr/share/emacs/23.0.93/lisp/loaddefs.el" add-log-current-defun-function add-log-full-name add-log-mailing-address add-log-lisp-like-modes add-log-c-like-modes add-log-tex-like-modes ad-redefinition-action ad-default-compilation-action
+  (defun . outlinify-sticky)
+  (defun . ange-ftp-re-read-dir)
+  (defun . command-apropos)
+  autoarg-mode autoarg-kp-mode auto-insert-mode global-auto-revert-mode mouse-avoidance-mode display-battery-mode binhex-begin-line bookmark-map
+  (defun . bookmark-locate)
+  (defun . list-bookmarks)
+  (defun . edit-bookmarks)
+  menu-bar-bookmark-map
+  (defun . menu-bar-bookmark-map)
+  browse-url-browser-function browse-url-firefox-program browse-url-galeon-program
+  (defun . list-yahrzeit-dates)
+  calc-settings-file c-mode-syntax-table c++-mode-syntax-table objc-mode-syntax-table java-mode-syntax-table idl-mode-syntax-table pike-mode-syntax-table custom-print-functions comint-output-filter-functions comint-use-prompt-regexp-instead-of-fields comint-file-name-prefix compilation-mode-hook compilation-start-hook compilation-window-height compilation-process-setup-function compilation-buffer-name-function compilation-finish-function compilation-finish-functions compilation-ask-about-save compilation-search-path compile-command compilation-disable-input partial-completion-mode dynamic-completion-mode global-auto-composition-mode crisp-mode
+  (defun . brief-mode)
+  cua-mode custom-browse-sort-alphabetically custom-buffer-sort-alphabetically custom-menu-sort-alphabetically
+  (defun . customize-variable)
+  (defun . customize-variable-other-window)
+  customize-package-emacs-version-alist
+  (defun . customize-changed)
+  custom-file global-cwarn-mode
+  (defun . pending-delete-mode)
+  delete-selection-mode desktop-save-mode desktop-locals-to-save desktop-save-buffer desktop-buffer-mode-handlers desktop-minor-mode-handlers diff-switches diff-command dired-listing-switches dired-chown-program dired-ls-F-marks-symlinks dired-trivial-filenames dired-keep-marker-rename dired-keep-marker-copy dired-keep-marker-hardlink dired-keep-marker-symlink dired-dwim-target dired-copy-preserve-time dired-directory dnd-protocol-alist
+  (defun . zone-mode)
+  (defun . easy-mmode-define-minor-mode)
+  (defun . easy-mmode-define-global-mode)
+  (defun . define-global-minor-mode)
+  (defun . ebnf-despool)
+  edebug-all-defs edebug-all-forms
+  (defun . edebug-defun)
+  (defun . ediff3)
+  (defun . ediff)
+  (defun . ebuffers)
+  (defun . ebuffers3)
+  (defun . edirs)
+  (defun . edir-revisions)
+  (defun . edirs3)
+  (defun . edirs-merge)
+  (defun . edir-merge-revisions)
+  (defun . edir-merge-revisions-with-ancestor)
+  (defun . edirs-merge-with-ancestor)
+  (defun . ediff-merge)
+  (defun . ediff-merge-with-ancestor)
+  (defun . epatch)
+  (defun . epatch-buffer)
+  (defun . erevision)
+  menu-bar-ediff-misc-menu menu-bar-epatch-menu menu-bar-ediff-merge-menu menu-bar-ediff-menu
+  (defun . eregistry)
+  edmacro-eight-bits eldoc-minor-mode-string eldoc-documentation-function menu-bar-emerge-menu epa-global-mail-mode
+  (defun . epg-import-keys-from-server)
+  (defun . erc-select)
+  erc-ctcp-query-DCC-hook erc-track-minor-mode
+  (defun . eshell-report-bug)
+  tags-file-name tags-case-fold-search tags-table-list tags-compression-info-list tags-add-tables find-tag-hook find-tag-default-function eudc-tools-menu
+  (defun . ffap)
+  find-ls-option find-ls-subdir-switches find-grep-options find-name-arg ff-special-constructs
+  (defun . ff-find-related-file)
+  flyspell-mode
+  (defun . gdba)
+  gdb-enable-debug generic-mode-list
+  (defun . gnus-batch-kill)
+  (defun . gnus-set-sorted-intersection)
+  (defun . goto-address-at-mouse)
+  grep-window-height grep-command grep-find-command grep-setup-hook grep-regexp-alist grep-program find-program xargs-program grep-find-use-xargs grep-history grep-find-history
+  (defun . find-grep)
+  help-at-pt-display-when-idle three-step-help global-hi-lock-mode
+  (defun . highlight-lines-matching-regexp)
+  (defun . highlight-regexp)
+  (defun . highlight-phrase)
+  (defun . unhighlight-regexp)
+  hs-special-modes-alist global-highlight-changes-mode hippie-expand-try-functions-list hippie-expand-verbose hippie-expand-dabbrev-skip-space hippie-expand-dabbrev-as-symbol hippie-expand-no-restriction hippie-expand-max-buffers hippie-expand-ignore-buffers hippie-expand-only-buffers global-hl-line-mode holiday-general-holidays general-holidays holiday-oriental-holidays oriental-holidays holiday-local-holidays local-holidays holiday-other-holidays other-holidays hebrew-holidays-1 hebrew-holidays-2 hebrew-holidays-3 hebrew-holidays-4 holiday-hebrew-holidays hebrew-holidays holiday-christian-holidays christian-holidays holiday-islamic-holidays islamic-holidays holiday-bahai-holidays bahai-holidays holiday-solar-holidays solar-holidays
+  (defun . holiday-list)
+  icomplete-mode ido-mode
+  (defun . image-dired)
+  (defun . tumme)
+  image-file-name-extensions image-file-name-regexps auto-image-file-mode imenu-sort-function imenu-generic-expression imenu-create-index-function imenu-prev-index-position-function imenu-extract-index-name-function imenu-name-lookup-function imenu-default-goto-function inferior-lisp-filter-regexp inferior-lisp-program inferior-lisp-load-command inferior-lisp-prompt inferior-lisp-mode-hook
+  (defun . run-lisp)
+  Info-split-threshold ispell-personal-dictionary ispell-menu-map ispell-menu-xemacs ispell-menu-map-needed ispell-skip-region-alist ispell-tex-skip-alists ispell-html-skip-alists iswitchb-mode jka-compr-inhibit keypad-setup keypad-numlock-setup keypad-shifted-setup keypad-numlock-shifted-setup kkc-after-update-conversion-functions default-korean-keyboard
+  (defun . landmark-repeat)
+  (defun . landmark)
+  latex-inputenc-coding-alist latin1-display latin1-display-ucs-per-lynx ledit-save-files ledit-go-to-lisp-string ledit-go-to-liszt-string linum-format global-linum-mode locate-ls-subdir-switches lpr-windows-system lpr-lp-system printer-name lpr-switches lpr-command ls-lisp-support-shell-wildcards
+  (defun . phases-of-moon)
+  mail-hist-keep-history mail-use-rfc822 mail-abbrevs-mode mail-complete-style
+  (defun . manual-entry)
+  minibuffer-depth-indicate-mode minibuffer-electric-default-mode multi-isearch-next-buffer-function multi-isearch-next-buffer-current-function multi-isearch-current-buffer mouse-sel-mode msb-mode
+  (defun . string-to-list)
+  (defun . string-to-vector)
+  (defun . nested-alist-p)
+  mouse-wheel-mode
+  (defun . ipconfig)
+  (defun . indent-for-comment)
+  (defun . set-comment-column)
+  (defun . kill-comment)
+  (defun . indent-new-comment-line)
+  comment-use-syntax comment-column comment-start comment-start-skip comment-end-skip comment-end comment-indent-function comment-insert-comment-function comment-style comment-padding comment-multi-line comment-auto-fill-only-comments disabled-command-function disabled-command-hook
+  (defun . run-octave)
+  (defun . org-publish-project)
+  show-paren-mode pc-selection-mode
+  (defun . pcomplete/gdb)
+  (defun . pcomplete/pushd)
+  (defun . pcomplete/time)
+  cvs-dired-action cvs-dired-use-hook
+  (defun . cvs-dired-noselect)
+  cvs-global-menu
+  (defun . edit-picture)
+  (defun . run-prolog)
+  bdf-directory-list ps-page-dimensions-database ps-paper-type ps-print-color-p quickurl-reread-hook-postfix
+  (defun . irc)
+  rcirc-track-minor-mode
+  (defun . regexp-builder)
+  recentf-mode
+  (defun . close-rectangle)
+  (defun . replace-rectangle)
+  global-reveal-mode rmail-dont-reply-to-names rmail-default-dont-reply-to-names rmail-ignored-headers rmail-displayed-headers rmail-retry-ignored-headers rmail-highlighted-headers rmail-primary-inbox-list rmail-secondary-file-directory rmail-secondary-file-regexp rmail-mode-hook rmail-show-message-hook rmail-file-coding-system rmail-insert-mime-forwarded-message-function rmail-user-mail-address-regexp savehist-mode scroll-all-mode mail-from-style mail-specify-envelope-from mail-self-blind mail-interactive send-mail-function mail-header-separator mail-archive-file-name mail-default-reply-to mail-alias-file mail-personal-alias-file mail-setup-hook mail-aliases mail-yank-prefix mail-indentation-spaces mail-citation-hook mail-citation-prefix-regexp mail-signature mail-signature-file mail-default-directory mail-default-headers mail-bury-selects-summary mail-send-nonascii mail-mailing-lists sendmail-coding-system default-sendmail-coding-system server-mode
+  (defun . xml-mode)
+  (defun . shell-script-mode)
+  shell-dumb-shell-regexp skeleton-filter-function
+  (defun . speedbar)
+  strokes-mode
+  (defun . t-mouse-mode)
+  gpm-mouse-mode table-cell-map-hook table-load-hook table-point-entered-cell-hook table-point-left-cell-hook tex-shell-file-name tex-directory tex-first-line-header-regexp tex-main-file tex-offer-save tex-run-command latex-run-command slitex-run-command tex-start-options tex-start-commands latex-block-names tex-bibtex-command tex-dvi-print-command tex-alt-dvi-print-command tex-dvi-view-command tex-show-queue-command tex-default-mode tex-open-quote tex-close-quote
+  (defun . TeX-mode)
+  (defun . plain-TeX-mode)
+  (defun . LaTeX-mode)
+  texinfo-open-quote texinfo-close-quote
+  (defun . thumbs)
+  display-time-day-and-date display-time-mode
+  (defun . subtract-time)
+  tpu-edt-mode
+  (defun . tpu-edt)
+  trace-buffer tramp-mode tramp-syntax tramp-file-name-regexp-unified tramp-file-name-regexp-separate tramp-file-name-regexp-url tramp-file-name-regexp tramp-root-regexp tramp-completion-file-name-regexp-unified tramp-completion-file-name-regexp-separate tramp-completion-file-name-regexp-url tramp-completion-file-name-regexp tramp-completion-file-name-handler-alist
+  (defun . tramp-run-real-handler)
+  (defun . tramp-completion-run-real-handler)
+  (defun . tramp-completion-file-name-handler)
+  (defun . tramp-register-file-name-handler)
+  (defun . tramp-register-completion-file-name-handler)
+  type-break-mode type-break-interval type-break-good-rest-interval type-break-good-break-interval type-break-keystroke-threshold url-handler-mode
+  (defun . url-http-file-readable-p)
+  url-https-default-port url-https-asynchronous-p
+  (defun . url-https-expand-file-name)
+  (defun . url-rlogin)
+  (defun . url-telnet)
+  (defun . url-tn3270)
+  url-debug
+  (defun . url-basepath)
+  vc-checkout-hook vc-checkin-hook vc-before-checkin-hook
+  (defun . vc-resolve-conflicts)
+  (defun . vc-revert-buffer)
+  (defun . vc-arch-registered)
+  vc-bzr-admin-dirname vc-bzr-admin-checkout-format-file
+  (defun . vc-bzr-registered)
+  (defun . vc-cvs-registered)
+  (defun . vc-git-registered)
+  (defun . vc-hg-registered)
+  vc-mtn-admin-dir vc-mtn-admin-format
+  (defun . vc-mtn-registered)
+  vc-rcs-master-templates
+  (defun . vc-rcs-registered)
+  vc-sccs-master-templates
+  (defun . vc-sccs-registered)
+  (defun . vc-sccs-search-project-dir)
+  (defun . vc-svn-registered)
+  view-remove-frame-by-deleting view-mode warning-prefix-function warning-series warning-fill-prefix warning-type-format
+  (defun . which-func-mode)
+  which-function-mode global-whitespace-mode global-whitespace-newline-mode widget-keymap winner-mode woman-locale xterm-mouse-mode
+  (provide . loaddefs))
+ ("/usr/share/emacs/23.0.93/lisp/startup.elc" command-line-processed initial-buffer-choice inhibit-startup-screen inhibit-splash-screen inhibit-startup-message startup-screen-inhibit-startup-screen inhibit-startup-echo-area-message inhibit-default-init inhibit-startup-buffer-menu command-switch-alist command-line-args-left argv command-line-functions command-line-default-directory command-line-x-option-alist command-line-ns-option-alist before-init-hook after-init-hook emacs-startup-hook term-setup-hook inhibit-startup-hooks keyboard-type window-setup-hook initial-major-mode init-file-user site-run-file mail-host-address user-mail-address auto-save-list-file-prefix emacs-quick-startup emacs-basic-display init-file-debug init-file-had-error normal-top-level-add-subdirs-inode-list debian-emacs-flavor no-blinking-cursor pure-space-overflow pure-space-overflow-message tutorial-directory
+  (defun . normal-top-level-add-subdirs-to-load-path)
+  (defun . normal-top-level-add-to-load-path)
+  (defun . normal-top-level)
+  (defun . precompute-menubar-bindings)
+  tty-long-option-alist tty-long-option-alist tool-bar-images-pixel-height tool-bar-originally-present handle-args-function-alist window-system-initialization-alist
+  (defun . tty-handle-args)
+  (defun . command-line)
+  initial-scratch-message fancy-startup-text fancy-about-text fancy-splash-image splash-screen-keymap
+  (defun . fancy-splash-insert)
+  (defun . fancy-splash-head)
+  (defun . fancy-startup-tail)
+  (defun . exit-splash-screen)
+  (defun . fancy-startup-screen)
+  (defun . fancy-about-screen)
+  (defun . fancy-splash-frame)
+  (defun . use-fancy-splash-screens-p)
+  (defun . normal-splash-screen)
+  (defun . normal-mouse-startup-screen)
+  (defun . normal-no-mouse-startup-screen)
+  (defun . normal-about-screen)
+  (defun . startup-echo-area-message)
+  (defun . display-startup-echo-area-message)
+  (defun . display-startup-screen)
+  (defun . display-about-screen)
+  (defun . about-emacs)
+  (defun . display-splash-screen)
+  (defun . command-line-1)
+  (defun . command-line-normalize-file-name))
+ ("/usr/share/emacs/23.0.93/lisp/button.elc"
+  (defface . button)
+  button-map button-buffer-map
+  (defun . button-category-symbol)
+  (defun . define-button-type)
+  (defun . button-type-put)
+  (defun . button-type-get)
+  (defun . button-type-subtype-p)
+  (defun . button-start)
+  (defun . button-end)
+  (defun . button-get)
+  (defun . button-put)
+  (defun . button-activate)
+  (defun . button-label)
+  (defun . button-type)
+  (defun . button-has-type-p)
+  (defun . make-button)
+  (defun . insert-button)
+  (defun . make-text-button)
+  (defun . insert-text-button)
+  (defun . button-at)
+  (defun . next-button)
+  (defun . previous-button)
+  (defun . push-button)
+  (defun . forward-button)
+  (defun . backward-button)
+  (provide . button))
+ ("/usr/share/emacs/23.0.93/lisp/minibuffer.elc"
+  (defun . completion-boundaries)
+  (defun . completion--some)
+  (defun . complete-with-action)
+  (defun . completion-table-dynamic)
+  (defun . lazy-completion-table)
+  (defun . completion-table-with-context)
+  (defun . completion-table-with-terminator)
+  (defun . completion-table-with-predicate)
+  (defun . completion-table-in-turn)
+  (defun . complete-in-turn)
+  (defun . dynamic-completion-table)
+  (defun . minibuffer-message)
+  (defun . minibuffer-completion-contents)
+  (defun . delete-minibuffer-contents)
+  completion-auto-help completion-styles-alist completion-styles
+  (defun . completion-try-completion)
+  (defun . completion-all-completions)
+  (defun . minibuffer--bitset)
+  (defun . completion--do-completion)
+  (defun . minibuffer-complete)
+  completion-all-sorted-completions
+  (defun . completion--flush-all-sorted-completions)
+  (defun . completion-all-sorted-completions)
+  (defun . minibuffer-force-complete)
+  minibuffer-confirm-exit-commands
+  (defun . minibuffer-complete-and-exit)
+  (defun . completion--try-word-completion)
+  (defun . minibuffer-complete-word)
+  (defun . completion--insert-strings)
+  completion-common-substring completion-setup-hook
+  (defface . completions-first-difference)
+  (defface . completions-common-part)
+  (defun . completion-hilit-commonality)
+  (defun . display-completion-list)
+  (defun . minibuffer-completion-help)
+  (defun . exit-minibuffer)
+  (defun . self-insert-and-exit)
+  minibuffer-local-must-match-filename-map
+  (defun . minibuffer--double-dollars)
+  (defun . completion--make-envvar-table)
+  completion--embedded-envvar-re completion--embedded-envvar-re
+  (defun . completion--embedded-envvar-table)
+  (defun . completion--file-name-table)
+  (defun . read-file-name-internal)
+  read-file-name-function read-file-name-predicate read-file-name-completion-ignore-case insert-default-directory
+  (defun . read-file-name)
+  (defun . internal-complete-buffer-except)
+  (defun . completion-emacs21-try-completion)
+  (defun . completion-emacs21-all-completions)
+  (defun . completion-emacs22-try-completion)
+  (defun . completion-emacs22-all-completions)
+  (defun . completion--merge-suffix)
+  (defun . completion-basic-try-completion)
+  (defun . completion-basic-all-completions)
+  completion-pcm--delim-wild-regex
+  (defun . completion-pcm--prepare-delim-re)
+  completion-pcm-word-delimiters
+  (defun . completion-pcm--pattern-trivial-p)
+  (defun . completion-pcm--string->pattern)
+  (defun . completion-pcm--pattern->regex)
+  (defun . completion-pcm--all-completions)
+  (defun . completion-pcm--hilit-commonality)
+  (defun . completion-pcm--find-all-completions)
+  (defun . completion-pcm-all-completions)
+  (defun . completion-pcm--merge-completions)
+  (defun . completion-pcm--pattern->string)
+  (defun . completion-pcm--filename-try-filter)
+  (defun . completion-pcm--merge-try)
+  (defun . completion-pcm-try-completion)
+  (provide . minibuffer))
+ ("/usr/share/emacs/23.0.93/lisp/faces.elc" face-name-history face-font-selection-order face-font-family-alternatives face-font-registry-alternatives
+  (defun . face-list)
+  (defun . make-face)
+  (defun . make-empty-face)
+  (defun . copy-face)
+  (defun . internal-find-face)
+  (defun . internal-get-face)
+  (defun . facep)
+  (defun . check-face)
+  (defun . face-id)
+  (defun . face-equal)
+  (defun . face-differs-from-default-p)
+  (defun . face-nontrivial-p)
+  face-x-resources
+  (defun . set-face-attribute-from-resource)
+  (defun . set-face-attributes-from-resources)
+  (defun . make-face-x-resource-internal)
+  (defun . face-name)
+  (defun . face-all-attributes)
+  (defun . face-attribute)
+  (defun . face-attribute-merged-with)
+  (defun . face-attribute-specified-or)
+  (defun . face-foreground)
+  (defun . face-background)
+  (defun . face-stipple)
+  (defun . face-background-pixmap)
+  (defun . face-underline-p)
+  (defun . face-inverse-video-p)
+  (defun . face-bold-p)
+  (defun . face-italic-p)
+  (defun . face-documentation)
+  (defun . set-face-documentation)
+  (defun . face-doc-string)
+  (defun . set-face-doc-string)
+  (defun . set-face-attribute)
+  (defun . make-face-bold)
+  (defun . make-face-unbold)
+  (defun . make-face-italic)
+  (defun . make-face-unitalic)
+  (defun . make-face-bold-italic)
+  (defun . set-face-font)
+  (defun . set-face-background)
+  (defun . set-face-foreground)
+  (defun . set-face-stipple)
+  (defun . set-face-underline-p)
+  (defun . set-face-underline)
+  (defun . set-face-inverse-video-p)
+  (defun . set-face-bold-p)
+  (defun . set-face-italic-p)
+  (defun . set-face-background-pixmap)
+  (defun . invert-face)
+  (defun . read-face-name)
+  (defun . face-valid-attribute-values)
+  face-attribute-name-alist
+  (defun . face-descriptive-attribute-name)
+  (defun . face-read-string)
+  (defun . face-read-integer)
+  (defun . read-face-attribute)
+  (defun . read-face-font)
+  (defun . read-all-face-attributes)
+  (defun . modify-face)
+  (defun . read-face-and-attribute)
+  list-faces-sample-text
+  (defun . list-faces-display)
+  (defun . describe-face)
+  (defun . face-attr-construct)
+  (defun . face-spec-set-match-display)
+  (defun . face-spec-choose)
+  (defun . face-spec-reset-face)
+  (defun . face-spec-set)
+  (defun . face-spec-recalc)
+  (defun . face-spec-set-2)
+  (defun . face-attr-match-p)
+  (defun . face-spec-match-p)
+  (defun . face-default-spec)
+  (defun . face-user-default-spec)
+  (defun . defined-colors)
+  (defun . x-defined-colors)
+  (defun . color-defined-p)
+  (defun . x-color-defined-p)
+  (defun . color-values)
+  (defun . x-color-values)
+  (defun . display-color-p)
+  (defun . x-display-color-p)
+  (defun . display-grayscale-p)
+  (defun . read-color)
+  (defun . face-at-point)
+  (defun . foreground-color-at-point)
+  (defun . background-color-at-point)
+  frame-background-mode inhibit-frame-set-background-mode
+  (defun . frame-set-background-mode)
+  (defun . x-handle-named-frame-geometry)
+  (defun . x-handle-reverse-video)
+  (defun . x-create-frame-with-faces)
+  (defun . face-set-after-frame-default)
+  (defun . tty-handle-reverse-video)
+  (defun . tty-create-frame-with-faces)
+  (defun . tty-find-type)
+  (defun . tty-run-terminal-initialization)
+  (defun . tty-set-up-initial-frame-faces)
+  (defun . frame-update-faces)
+  (defun . frame-update-face-colors)
+  (defface . default)
+  (defface . bold)
+  (defface . italic)
+  (defface . bold-italic)
+  (defface . underline)
+  (defface . fixed-pitch)
+  (defface . variable-pitch)
+  (defface . shadow)
+  (defface . link)
+  (defface . link-visited)
+  (defface . highlight)
+  (defface . region)
+  (defface . secondary-selection)
+  (defface . trailing-whitespace)
+  (defface . escape-glyph)
+  (defface . nobreak-space)
+  (defface . mode-line)
+  (defface . mode-line-inactive)
+  (defface . mode-line-highlight)
+  (defface . mode-line-emphasis)
+  (defface . mode-line-buffer-id)
+  (defface . header-line)
+  (defface . vertical-border)
+  (defface . minibuffer-prompt)
+  (defface . fringe)
+  (defface . scroll-bar)
+  (defface . border)
+  (defface . cursor)
+  (defface . mouse)
+  (defface . tool-bar)
+  (defface . menu)
+  x-font-regexp x-font-regexp-head x-font-regexp-weight x-font-regexp-slant x-font-regexp-weight-subnum x-font-regexp-weight-subnum x-font-regexp-slant-subnum x-font-regexp-slant-subnum x-font-regexp-swidth-subnum x-font-regexp-swidth-subnum x-font-regexp-adstyle-subnum x-font-regexp-adstyle-subnum
+  (defun . x-resolve-font-name)
+  (defun . x-frob-font-weight)
+  (defun . x-frob-font-slant)
+  (defun . internal-frob-font-weight)
+  (defun . internal-frob-font-slant)
+  (defun . x-make-font-bold)
+  (defun . x-make-font-demibold)
+  (defun . x-make-font-unbold)
+  (defun . x-make-font-italic)
+  (defun . x-make-font-oblique)
+  (defun . x-make-font-unitalic)
+  (defun . x-make-font-bold-italic)
+  (provide . faces))
+ ("/usr/share/emacs/23.0.93/lisp/cus-face.elc"
+  (defun . custom-facep)
+  (defun . custom-declare-face)
+  custom-face-attributes
+  (defun . custom-face-attributes-get)
+  (defun . custom-set-faces)
+  (defun . custom-theme-set-faces)
+  (defun . custom-theme-reset-faces)
+  (defun . custom-reset-faces)
+  (provide . cus-face))
+ ("/usr/share/emacs/23.0.93/lisp/files.elc" delete-auto-save-files directory-abbrev-alist make-backup-files backup-inhibited backup-by-copying backup-by-copying-when-linked backup-by-copying-when-mismatch backup-by-copying-when-privileged-mismatch backup-enable-predicate buffer-offer-save find-file-existing-other-name find-file-visit-truename revert-without-query buffer-file-number buffer-file-numbers-unique buffer-file-read-only temporary-file-directory small-temporary-file-directory null-device file-name-invalid-regexp file-precious-flag break-hardlink-on-save version-control dired-kept-versions delete-old-versions kept-old-versions kept-new-versions require-final-newline mode-require-final-newline auto-save-default auto-save-file-name-transforms save-abbrevs find-file-run-dired find-directory-functions find-file-not-found-functions find-file-not-found-hooks find-file-hooks find-file-hook write-file-functions write-file-hooks local-write-file-hooks write-contents-functions write-contents-hooks enable-local-variables local-enable-local-variables enable-local-eval view-read-only file-name-history
+  (defun . ange-ftp-completion-hook-function)
+  (defun . convert-standard-filename)
+  (defun . read-directory-name)
+  (defun . pwd)
+  cd-path
+  (defun . parse-colon-path)
+  (defun . cd-absolute)
+  (defun . cd)
+  (defun . load-file)
+  (defun . locate-file)
+  (defun . locate-file-completion-table)
+  (defun . locate-file-completion)
+  locate-dominating-stop-dir-regexp
+  (defun . locate-dominating-file)
+  (defun . executable-find)
+  (defun . load-library)
+  (defun . file-remote-p)
+  (defun . file-local-copy)
+  (defun . file-truename)
+  (defun . file-chase-links)
+  (defun . make-temp-file)
+  (defun . recode-file-name)
+  confirm-nonexistent-file-or-buffer
+  (defun . confirm-nonexistent-file-or-buffer)
+  (defun . read-buffer-to-switch)
+  (defun . switch-to-buffer-other-window)
+  (defun . switch-to-buffer-other-frame)
+  (defun . display-buffer-other-frame)
+  find-file-default
+  (defun . minibuffer-with-setup-hook)
+  (defun . find-file-read-args)
+  (defun . find-file)
+  (defun . find-file-other-window)
+  (defun . find-file-other-frame)
+  (defun . find-file-existing)
+  (defun . find-file-read-only)
+  (defun . find-file-read-only-other-window)
+  (defun . find-file-read-only-other-frame)
+  (defun . find-alternate-file-other-window)
+  (defun . find-alternate-file)
+  (defun . create-file-buffer)
+  (defun . generate-new-buffer)
+  automount-dir-prefix abbreviated-home-dir
+  (defun . abbreviate-file-name)
+  find-file-not-true-dirname-list
+  (defun . find-buffer-visiting)
+  find-file-wildcards find-file-suppress-same-file-warnings large-file-warning-threshold
+  (defun . abort-if-file-too-large)
+  (defun . find-file-noselect)
+  (defun . find-file-noselect-1)
+  (defun . insert-file-contents-literally)
+  (defun . insert-file-1)
+  (defun . insert-file-literally)
+  find-file-literally
+  (defun . find-file-literally)
+  after-find-file-from-revert-buffer
+  (defun . after-find-file)
+  (defun . report-errors)
+  (defun . normal-mode)
+  auto-mode-case-fold auto-mode-alist
+  (defun . conf-mode-maybe)
+  interpreter-mode-alist inhibit-first-line-modes-regexps inhibit-first-line-modes-suffixes auto-mode-interpreter-regexp magic-mode-alist magic-fallback-mode-alist magic-mode-regexp-match-limit
+  (defun . set-auto-mode)
+  (defun . set-auto-mode-0)
+  (defun . set-auto-mode-1)
+  ignored-local-variables hack-local-variables-hook safe-local-variable-values safe-local-eval-forms file-local-variables-alist before-hack-local-variables-hook
+  (defun . hack-local-variables-confirm)
+  (defun . hack-local-variables-prop-line)
+  (defun . hack-local-variables-filter)
+  (defun . hack-local-variables)
+  (defun . safe-local-variable-p)
+  (defun . risky-local-variable-p)
+  (defun . hack-one-local-variable-quotep)
+  (defun . hack-one-local-variable-constantp)
+  (defun . hack-one-local-variable-eval-safep)
+  (defun . hack-one-local-variable)
+  dir-locals-class-alist dir-locals-directory-cache
+  (defun . dir-locals-get-class-variables)
+  (defun . dir-locals-collect-mode-variables)
+  (defun . dir-locals-collect-variables)
+  (defun . dir-locals-set-directory-class)
+  (defun . dir-locals-set-class-variables)
+  dir-locals-file
+  (defun . dir-locals-find-file)
+  (defun . dir-locals-read-from-file)
+  (defun . hack-dir-local-variables)
+  change-major-mode-with-file-name
+  (defun . set-visited-file-name)
+  (defun . write-file)
+  (defun . backup-buffer)
+  (defun . backup-buffer-copy)
+  (defun . file-name-sans-versions)
+  (defun . file-ownership-preserved-p)
+  (defun . file-name-sans-extension)
+  (defun . file-name-extension)
+  make-backup-file-name-function backup-directory-alist
+  (defun . normal-backup-enable-predicate)
+  (defun . make-backup-file-name)
+  (defun . make-backup-file-name-1)
+  (defun . backup-file-name-p)
+  (defun . backup-extract-version)
+  (defun . find-backup-file-name)
+  (defun . file-nlinks)
+  (defun . file-relative-name)
+  (defun . save-buffer)
+  (defun . delete-auto-save-file-if-necessary)
+  auto-save-hook before-save-hook after-save-hook save-buffer-coding-system
+  (defun . basic-save-buffer)
+  (defun . basic-save-buffer-1)
+  (defun . basic-save-buffer-2)
+  (defun . diff-buffer-with-file)
+  save-some-buffers-action-alist buffer-save-without-query
+  (defun . save-some-buffers)
+  (defun . not-modified)
+  (defun . toggle-read-only)
+  (defun . insert-file)
+  (defun . append-to-file)
+  (defun . file-newest-backup)
+  (defun . rename-uniquely)
+  (defun . make-directory)
+  revert-buffer-function revert-buffer-insert-file-contents-function buffer-stale-function before-revert-hook after-revert-hook
+  (defun . revert-buffer)
+  (defun . recover-this-file)
+  (defun . recover-file)
+  (defun . recover-session)
+  (defun . recover-session-finish)
+  (defun . kill-buffer-ask)
+  (defun . kill-some-buffers)
+  (defun . kill-matching-buffers)
+  (defun . auto-save-mode)
+  (defun . rename-auto-save-file)
+  (defun . make-auto-save-file-name)
+  (defun . auto-save-file-name-p)
+  (defun . wildcard-to-regexp)
+  list-directory-brief-switches list-directory-verbose-switches
+  (defun . file-expand-wildcards)
+  (defun . list-directory)
+  (defun . shell-quote-wildcard-pattern)
+  insert-directory-program directory-free-space-program directory-free-space-args
+  (defun . get-free-disk-space)
+  directory-listing-before-filename-regexp insert-directory-ls-version
+  (defun . insert-directory)
+  (defun . insert-directory-adj-pos)
+  (defun . insert-directory-safely)
+  kill-emacs-query-functions confirm-kill-emacs
+  (defun . save-buffers-kill-emacs)
+  (defun . save-buffers-kill-terminal)
+  (defun . file-name-non-special)
+  (defun . file-modes-char-to-who)
+  (defun . file-modes-char-to-right)
+  (defun . file-modes-rights-to-number)
+  (defun . file-modes-symbolic-to-number)
+  (defun . read-file-modes)
+  trash-directory
+  (defun . move-file-to-trash))
+ ("/usr/share/emacs/23.0.93/lisp/bindings.elc"
+  (defun . make-mode-line-mouse-map)
+  (defun . mode-line-toggle-read-only)
+  (defun . mode-line-toggle-modified)
+  (defun . mode-line-widen)
+  (defun . mode-line-abbrev-mode)
+  (defun . mode-line-auto-fill-mode)
+  mode-line-input-method-map mode-line-coding-system-map
+  (defun . mode-line-change-eol)
+  mode-line-eol-desc-cache
+  (defun . mode-line-eol-desc)
+  mode-line-client mode-line-mule-info
+  (defun . mode-line-frame-control)
+  mode-line-frame-identification mode-line-process mode-line-modified mode-line-remote mode-line-position mode-line-modes mode-line-mode-menu mode-line-major-mode-keymap mode-line-minor-mode-keymap mode-line-column-line-number-mode-map mode-line-buffer-identification-keymap
+  (defun . propertized-buffer-identification)
+  mode-line-buffer-identification
+  (defun . unbury-buffer)
+  (defun . mode-line-unbury-buffer)
+  (defun . mode-line-bury-buffer)
+  (defun . mode-line-other-buffer)
+  (defun . mode-line-next-buffer)
+  (defun . mode-line-previous-buffer)
+  (defun . bound-and-true-p)
+  (defun . mode-line-minor-mode-help)
+  minor-mode-alist
+  (provide . base64)
+  (provide . md5)
+  (provide . overlay)
+  (provide . text-properties)
+  (defun . complete-symbol)
+  narrow-map goto-map search-map
+  (defun . mode-specific-command-prefix)
+  mode-specific-map ctl-x-r-map abbrev-map)
+ ("/usr/share/emacs/23.0.93/lisp/format.elc" format-alist
+  (defun . format-encode-run-method)
+  (defun . format-decode-run-method)
+  (defun . format-annotate-function)
+  (defun . format-decode)
+  (defun . format-decode-buffer)
+  (defun . format-decode-region)
+  (defun . format-encode-buffer)
+  (defun . format-encode-region)
+  (defun . format-write-file)
+  (defun . format-find-file)
+  (defun . format-insert-file)
+  (defun . format-read)
+  (defun . format-replace-strings)
+  (defun . format-delq-cons)
+  (defun . format-make-relatively-unique)
+  (defun . format-common-tail)
+  (defun . format-proper-list-p)
+  (defun . format-reorder)
+  (defun . format-deannotate-region)
+  (defun . format-subtract-regions)
+  (defun . format-property-increment-region)
+  (defun . format-insert-annotations)
+  (defun . format-annotate-value)
+  (defun . format-annotate-region)
+  (defun . format-annotate-location)
+  (defun . format-annotate-single-property-change)
+  (defun . format-annotate-atomic-property-change)
+  (provide . format))
+ ("/usr/share/emacs/23.0.93/lisp/env.elc" read-envvar-name-history
+  (defun . read-envvar-name)
+  setenv-history
+  (defun . substitute-env-vars)
+  (defun . setenv-internal)
+  (defun . setenv)
+  (defun . getenv)
+  (provide . env))
+ ("/usr/share/emacs/23.0.93/lisp/international/mule-conf.el"
+  (defun . define-iso-single-byte-charset)
+  (provide . code-pages))
+ ("/usr/share/emacs/23.0.93/lisp/international/mule.elc" mule-version mule-version-date private-char-area-1-min private-char-area-1-max private-char-area-2-min private-char-area-2-max emacs-mule-charset-table
+  (defun . convert-define-charset-argument)
+  (defun . define-charset)
+  (defun . load-with-code-conversion)
+  (defun . charset-info)
+  (defun . charset-id)
+  (defun . charset-bytes)
+  (defun . get-charset-property)
+  (defun . put-charset-property)
+  (defun . charset-description)
+  (defun . charset-dimension)
+  (defun . charset-chars)
+  (defun . charset-iso-final-char)
+  (defun . charset-short-name)
+  (defun . charset-long-name)
+  (defun . charset-list)
+  (defun . char-valid-p)
+  (defun . generic-char-p)
+  (defun . make-char-internal)
+  ascii-case-table coding-system-iso-2022-flags
+  (defun . define-coding-system)
+  (defun . coding-system-doc-string)
+  (defun . coding-system-mnemonic)
+  (defun . coding-system-type)
+  (defun . coding-system-charset-list)
+  (defun . coding-system-category)
+  (defun . coding-system-get)
+  (defun . coding-system-eol-type-mnemonic)
+  (defun . coding-system-lessp)
+  (defun . coding-system-equal)
+  (defun . add-to-coding-system-list)
+  (defun . coding-system-list)
+  char-coding-system-table
+  (defun . transform-make-coding-system-args)
+  (defun . make-coding-system)
+  (defun . merge-coding-systems)
+  (defun . autoload-coding-system)
+  buffer-file-coding-system-explicit
+  (defun . set-buffer-file-coding-system)
+  (defun . revert-buffer-with-coding-system)
+  (defun . set-file-name-coding-system)
+  default-terminal-coding-system
+  (defun . set-terminal-coding-system)
+  default-keyboard-coding-system
+  (defun . set-keyboard-coding-system)
+  keyboard-coding-system
+  (defun . set-buffer-process-coding-system)
+  (defun . set-clipboard-coding-system)
+  (defun . set-selection-coding-system)
+  last-next-selection-coding-system
+  (defun . set-next-selection-coding-system)
+  (defun . set-coding-priority)
+  ctext-non-standard-encodings-alist ctext-non-standard-encodings ctext-non-standard-encodings-regexp
+  (defun . ctext-post-read-conversion)
+  (defun . ctext-non-standard-encodings-table)
+  (defun . ctext-pre-write-conversion)
+  auto-coding-alist auto-coding-regexp-alist
+  (defun . auto-coding-regexp-alist-lookup)
+  auto-coding-functions set-auto-coding-for-load
+  (defun . auto-coding-alist-lookup)
+  (defun . find-auto-coding)
+  (defun . set-auto-coding)
+  (defun . after-insert-file-set-coding)
+  (defun . find-new-buffer-file-coding-system)
+  (defun . modify-coding-system-alist)
+  (defun . decode-coding-inserted-region)
+  (defun . recode-region)
+  (defun . make-translation-table)
+  (defun . make-translation-table-from-vector)
+  (defun . make-translation-table-from-alist)
+  (defun . define-translation-table)
+  (defun . translate-region)
+  (defun . with-category-table)
+  (defun . define-translation-hash-table)
+  (defun . sgml-xml-auto-coding-function)
+  (defun . sgml-html-meta-auto-coding-function)
+  (defun . xml-find-file-coding-system)
+  (provide . mule))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/map-ynp.elc"
+  (defun . map-y-or-n-p))
+ ("/usr/share/emacs/23.0.93/lisp/custom.elc"
+  (require . widget)
+  custom-define-hook custom-dont-initialize custom-current-group-alist
+  (defun . custom-initialize-default)
+  (defun . custom-initialize-set)
+  (defun . custom-initialize-safe-set)
+  (defun . custom-initialize-safe-default)
+  (defun . custom-initialize-reset)
+  (defun . custom-initialize-changed)
+  (defun . custom-declare-variable)
+  (defun . defcustom)
+  (defun . defface)
+  (defun . custom-current-group)
+  (defun . custom-declare-group)
+  (defun . defgroup)
+  (defun . custom-add-to-group)
+  (defun . custom-group-of-mode)
+  (defun . custom-handle-all-keywords)
+  (defun . custom-handle-keyword)
+  (defun . custom-add-dependencies)
+  (defun . custom-add-option)
+  (defun . custom-add-frequent-value)
+  (defun . custom-add-link)
+  (defun . custom-add-version)
+  (defun . custom-add-package-version)
+  (defun . custom-add-load)
+  (defun . custom-autoload)
+  (defun . custom-variable-p)
+  (defun . custom-note-var-changed)
+  custom-load-recursion
+  (defun . custom-load-symbol)
+  custom-local-buffer
+  (defun . custom-set-default)
+  (defun . custom-set-minor-mode)
+  (defun . custom-quote)
+  (defun . customize-mark-to-save)
+  (defun . customize-mark-as-set)
+  (defun . custom-reevaluate-setting)
+  custom-known-themes
+  (defun . custom-theme-p)
+  (defun . custom-check-theme)
+  (defun . custom-push-theme)
+  (defun . custom-set-variables)
+  (defun . custom-theme-set-variables)
+  (defun . deftheme)
+  (defun . custom-declare-theme)
+  (defun . custom-make-theme-feature)
+  custom-theme-directory
+  (defun . provide-theme)
+  (defun . load-theme)
+  custom-enabling-themes
+  (defun . enable-theme)
+  custom-enabled-themes
+  (defun . custom-theme-enabled-p)
+  (defun . disable-theme)
+  (defun . custom-variable-theme-value)
+  (defun . custom-theme-recalc-variable)
+  (defun . custom-theme-recalc-face)
+  (defun . custom-theme-reset-variables)
+  (defun . custom-reset-variables)
+  read-quoted-char-radix
+  (provide . custom))
+ ("/usr/share/emacs/23.0.93/lisp/widget.elc"
+  (defun . define-widget-keywords)
+  (defun . define-widget)
+  (defun . widget-plist-member)
+  (provide . widget))
+ ("/usr/share/emacs/23.0.93/lisp/version.el" emacs-copyright emacs-version emacs-major-version emacs-minor-version emacs-build-time emacs-build-system
+  (defun . emacs-version)
+  (defun . version))
+ ("/usr/share/emacs/23.0.93/lisp/subr.elc" custom-declare-variable-list
+  (defun . custom-declare-variable-early)
+  (defun . declare-function)
+  (defun . not)
+  (defun . noreturn)
+  (defun . 1value)
+  (defun . def-edebug-spec)
+  (defun . lambda)
+  (defun . push)
+  (defun . pop)
+  (defun . when)
+  (defun . unless)
+  --dolist-tail--
+  (defun . dolist)
+  --dotimes-limit--
+  (defun . dotimes)
+  (defun . declare)
+  (defun . ignore-errors)
+  (defun . ignore)
+  (defun . error)
+  (defun . frame-configuration-p)
+  (defun . functionp)
+  (defun . caar)
+  (defun . cadr)
+  (defun . cdar)
+  (defun . cddr)
+  (defun . last)
+  (defun . butlast)
+  (defun . nbutlast)
+  (defun . delete-dups)
+  (defun . number-sequence)
+  (defun . copy-tree)
+  (defun . assoc-default)
+  (defun . assoc-ignore-case)
+  (defun . assoc-ignore-representation)
+  (defun . member-ignore-case)
+  (defun . assq-delete-all)
+  (defun . rassq-delete-all)
+  (defun . remove)
+  (defun . remq)
+  (defun . kbd)
+  (defun . undefined)
+  (defun . suppress-keymap)
+  (defun . define-key-after)
+  (defun . map-keymap-sorted)
+  (defun . keymap-canonicalize)
+  (defun . keyboard-translate)
+  (defun . global-set-key)
+  (defun . local-set-key)
+  (defun . global-unset-key)
+  (defun . local-unset-key)
+  key-substitution-in-progress
+  (defun . substitute-key-definition)
+  (defun . substitute-key-definition-key)
+  global-map esc-map ctl-x-map ctl-x-4-map
+  (defun . ctl-x-4-prefix)
+  ctl-x-5-map
+  (defun . ctl-x-5-prefix)
+  listify-key-sequence-1 listify-key-sequence-1
+  (defun . listify-key-sequence)
+  (defun . eventp)
+  (defun . event-modifiers)
+  (defun . event-basic-type)
+  (defun . mouse-movement-p)
+  (defun . mouse-event-p)
+  (defun . event-start)
+  (defun . event-end)
+  (defun . event-click-count)
+  (defun . posn-window)
+  (defun . posn-area)
+  (defun . posn-point)
+  (defun . posn-set-point)
+  (defun . posn-x-y)
+  (defun . posn-col-row)
+  (defun . posn-actual-col-row)
+  (defun . posn-timestamp)
+  (defun . posn-string)
+  (defun . posn-image)
+  (defun . posn-object)
+  (defun . posn-object-x-y)
+  (defun . posn-object-width-height)
+  (defun . window-dot)
+  (defun . set-window-dot)
+  (defun . read-input)
+  (defun . show-buffer)
+  (defun . eval-current-buffer)
+  (defun . string-to-int)
+  (defun . insert-string)
+  (defun . makehash)
+  (defun . baud-rate)
+  (defun . focus-frame)
+  (defun . unfocus-frame)
+  executing-macro x-lost-selection-hooks x-sent-selection-hooks messages-buffer-max-lines last-input-char last-command-char
+  (defun . send-string)
+  (defun . send-region)
+  (defun . string=)
+  (defun . string<)
+  (defun . move-marker)
+  (defun . rplaca)
+  (defun . rplacd)
+  (defun . beep)
+  (defun . indent-to-column)
+  (defun . backward-delete-char)
+  (defun . search-forward-regexp)
+  (defun . search-backward-regexp)
+  (defun . int-to-string)
+  (defun . store-match-data)
+  (defun . chmod)
+  (defun . mkdir)
+  (defun . point-at-eol)
+  (defun . point-at-bol)
+  (defun . user-original-login-name)
+  (defun . make-local-hook)
+  (defun . add-hook)
+  (defun . remove-hook)
+  (defun . add-to-list)
+  (defun . add-to-ordered-list)
+  (defun . add-to-history)
+  delay-mode-hooks delayed-mode-hooks after-change-major-mode-hook
+  (defun . run-mode-hooks)
+  (defun . delay-mode-hooks)
+  (defun . derived-mode-p)
+  minor-mode-list
+  (defun . add-minor-mode)
+  (defun . symbol-file)
+  (defun . locate-library)
+  (defun . eval-at-startup)
+  (defun . load-history-regexp)
+  (defun . load-history-filename-element)
+  (defun . eval-after-load)
+  (defun . do-after-load-evaluation)
+  (defun . eval-next-after-load)
+  (defun . process-lines)
+  (defun . open-network-stream)
+  (defun . process-kill-without-query)
+  (defun . process-get)
+  (defun . process-put)
+  read-quoted-char-radix
+  (defun . read-quoted-char)
+  (defun . read-passwd)
+  (defun . read-number)
+  (defun . sit-for)
+  (defun . atomic-change-group)
+  (defun . prepare-change-group)
+  (defun . activate-change-group)
+  (defun . accept-change-group)
+  (defun . cancel-change-group)
+  (defun . redraw-modeline)
+  (defun . force-mode-line-update)
+  (defun . momentary-string-display)
+  (defun . copy-overlay)
+  (defun . remove-overlays)
+  suspend-hook suspend-resume-hook temp-buffer-show-hook temp-buffer-setup-hook buffer-file-type user-emacs-directory
+  (defun . locate-user-emacs-file)
+  (defun . find-tag-default)
+  (defun . play-sound)
+  (defun . shell-quote-argument)
+  (defun . string-or-null-p)
+  (defun . booleanp)
+  (defun . field-at-pos)
+  (defun . remove-yank-excluded-properties)
+  (defun . insert-for-yank)
+  (defun . insert-for-yank-1)
+  (defun . insert-buffer-substring-no-properties)
+  (defun . insert-buffer-substring-as-yank)
+  (defun . start-process-shell-command)
+  (defun . start-file-process-shell-command)
+  (defun . call-process-shell-command)
+  (defun . process-file-shell-command)
+  (defun . with-current-buffer)
+  (defun . with-selected-window)
+  (defun . with-selected-frame)
+  (defun . with-temp-file)
+  (defun . with-temp-message)
+  (defun . with-temp-buffer)
+  (defun . with-output-to-string)
+  (defun . with-local-quit)
+  (defun . while-no-input)
+  (defun . condition-case-no-debug)
+  (defun . with-demoted-errors)
+  (defun . combine-after-change-calls)
+  (defun . with-case-table)
+  (defun . save-match-data)
+  (defun . match-string)
+  (defun . match-string-no-properties)
+  (defun . match-substitute-replacement)
+  (defun . looking-back)
+  (defun . looking-at-p)
+  (defun . string-match-p)
+  (defun . subregexp-context-p)
+  split-string-default-separators
+  (defun . split-string)
+  (defun . combine-and-quote-strings)
+  (defun . split-string-and-unquote)
+  (defun . subst-char-in-string)
+  (defun . replace-regexp-in-string)
+  (defun . add-to-invisibility-spec)
+  (defun . remove-from-invisibility-spec)
+  (defun . with-syntax-table)
+  (defun . make-syntax-table)
+  (defun . syntax-after)
+  (defun . syntax-class)
+  (defun . text-clone-maintain)
+  (defun . text-clone-create)
+  (defun . define-mail-user-agent)
+  (defun . progress-reporter-update)
+  (defun . make-progress-reporter)
+  (defun . progress-reporter-force-update)
+  (defun . progress-reporter-do-update)
+  (defun . progress-reporter-done)
+  (defun . dotimes-with-progress-reporter)
+  version-separator version-regexp-alist
+  (defun . version-to-list)
+  (defun . version-list-<)
+  (defun . version-list-=)
+  (defun . version-list-<=)
+  (defun . version-list-not-zero)
+  (defun . version<)
+  (defun . version<=)
+  (defun . version=))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/backquote.elc"
+  (provide . backquote)
+  (defun . backquote-list*-function)
+  (defun . backquote-list*-macro)
+  (defun . backquote-list*)
+  backquote-backquote-symbol backquote-unquote-symbol backquote-splice-symbol
+  (defun . backquote)
+  (defun . \`)
+  (defun . backquote-delay-process)
+  (defun . backquote-process)
+  (defun . backquote-listify))
+ ("/usr/share/emacs/23.0.93/lisp/emacs-lisp/byte-run.elc"
+  (defun . macro-declaration-function)
+  (defun . defsubst)
+  (defun . make-obsolete)
+  (defun . define-obsolete-function-alias)
+  (defun . make-obsolete-variable)
+  (defun . define-obsolete-variable-alias)
+  (defun . dont-compile)
+  (defun . eval-when-compile)
+  (defun . eval-and-compile)
+  (defun . with-no-warnings)))
diff --git a/elpa-to-submit/nxhtml/tests/in/bug370417.php b/elpa-to-submit/nxhtml/tests/in/bug370417.php
new file mode 100644
index 0000000000..b73534de20
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug370417.php
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <p>
+      <?php
+        echo "foo";
+echo "bar";
+      ?>
+    </p>
+  </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug381979-2-bad-traceb.txt b/elpa-to-submit/nxhtml/tests/in/bug381979-2-bad-traceb.txt
new file mode 100644
index 0000000000..514b00aad6
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug381979-2-bad-traceb.txt
@@ -0,0 +1,24 @@
+Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p nil)
+  <(1 nil)
+  (and mumamo-last-new-chunk first-check-from (< first-check-from (overlay-end mumamo-last-new-chunk)))
+  (if (and mumamo-last-new-chunk first-check-from (< first-check-from ...)) (progn (setq mumamo-last-new-chunk ...)))
+  (when (and mumamo-last-new-chunk first-check-from (< first-check-from ...)) (setq mumamo-last-new-chunk (overlay-get mumamo-last-new-chunk ...)))
+  (progn (setq mumamo-last-new-chunk (overlay-get new-chunk-at-change-min ...)) (when (and mumamo-last-new-chunk first-check-from ...) (setq mumamo-last-new-chunk ...)))
+  (if new-chunk-at-change-min (progn (setq mumamo-last-new-chunk ...) (when ... ...)))
+  (when new-chunk-at-change-min (setq mumamo-last-new-chunk (overlay-get new-chunk-at-change-min ...)) (when (and mumamo-last-new-chunk first-check-from ...) (setq mumamo-last-new-chunk ...)))
+  (progn (when new-chunk-at-change-min (setq mumamo-last-new-chunk ...) (when ... ...)))
+  (if (mumamo-make-new-chunks) (progn (when new-chunk-at-change-min ... ...)))
+  (when (mumamo-make-new-chunks) (when new-chunk-at-change-min (setq mumamo-last-new-chunk ...) (when ... ...)))
+  (progn (when (mumamo-make-new-chunks) (when new-chunk-at-change-min ... ...)) (setq mumamo-last-chunk-change-pos nil))
+  (if mumamo-last-chunk-change-pos (progn (when ... ...) (setq mumamo-last-chunk-change-pos nil)))
+  (when mumamo-last-chunk-change-pos (when (mumamo-make-new-chunks) (when new-chunk-at-change-min ... ...)) (setq mumamo-last-chunk-change-pos nil))
+  (let* ((change-min ...) (change-max ...) (new-chunk-at-change-min ...) (new-chunk-at-change-min-start ...) (this-new-syntax-min-max ...) (this-new-syntax-min ...) (in-new-min-border ...) (here ...) (first-check-from ...)) (when mumamo-last-chunk-change-pos (when ... ...) (setq mumamo-last-chunk-change-pos nil)) (let* (... ... ... ... narpos this-new-values this-new-chunk prev-new-chunk first-change-pos interrupted ... ... ... ... ...) (when ... ...) (unless this-new-chunk ...) (setq mumamo-find-chunks-level ...) (when this-new-chunk ... ...) (when end-param ...)))
+  (save-restriction (widen) (let* (... ... ... ... ... ... ... ... ...) (when mumamo-last-chunk-change-pos ... ...) (let* ... ... ... ... ... ...)))
+  mumamo-find-chunks(1 "mumamo-set-major-post-command")
+  (let* ((ovl ...) (major ...) (in-pre-hook ...)) (if (not major) (lwarn ... :error "major=%s" major) (unless ... ...)))
+  mumamo-set-major-post-command()
+  (if font-lock-mode (mumamo-set-major-post-command))
+  mumamo-post-command-1()
+  eval((mumamo-post-command-1))
+  eval-expression((mumamo-post-command-1) nil)
+  call-interactively(eval-expression nil nil)
diff --git a/elpa-to-submit/nxhtml/tests/in/bug381979-2.php b/elpa-to-submit/nxhtml/tests/in/bug381979-2.php
new file mode 100644
index 0000000000..fc543c5de4
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug381979-2.php
@@ -0,0 +1,6 @@
+<?php
+$a = array(
+ 'foo' => 'bar',
+ 'gaz' => 'gazonk',
+);
+?>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug381979-svnlib.inc b/elpa-to-submit/nxhtml/tests/in/bug381979-svnlib.inc
new file mode 100644
index 0000000000..6fc755bccd
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug381979-svnlib.inc
@@ -0,0 +1,744 @@
+<?php
+// $Id$
+/**
+ * @file
+ * A few generic functions for interfacing with Subversion via command line.
+ * The API of these functions has been inspired by the SVN PECL extension
+ * (http://www.php.net/manual/en/ref.svn.php), but works differently in places.
+ * On the one hand, this is due to the incompleteness of the functions in here,
+ * and on the other hand there are a few artificial restrictions and
+ * complications in the PECL extension's API that we can really do without.
+ *
+ * @note
+ *    These functions can be run *without* Drupal.
+ *
+ * Copyright 2008 by Jakob Petsovits ("jpetso", http://drupal.org/user/56020)
+ * Copyright 2006-2008 by Gavin Mogan ("halkeye", http://drupal.org/user/56779)
+ */
+
+// file_directory_temp() is normally provided by Drupal, but as this file is
+// supposed to be independent from Drupal code, here's a fallback definition.
+if (!function_exists('file_directory_temp')) {
+  /**
+  * Determine the default temporary directory.
+  *
+  * @return A string containing a temp directory.
+  */
+  function file_directory_temp() {
+    return sys_get_temp_dir();
+  }
+}
+
+/**
+ * If subsequent function calls from this file act on a private repository
+ * that requires authentication, this function will store username and password
+ * for the duration of the current process (in a static variable, that is).
+ * Other functions in this file make use of this login information.
+ */
+function svnlib_set_authentication_info($username, $password) {
+  _svnlib_authentication_info(
+    array('username' => $username, 'password' => $password)
+  );
+}
+
+/**
+ * Unset any username and password that was previously passed
+ * to subversion_set_authentication_info(), so that subsequent repository
+ * access will happen anonymously again.
+ */
+function svnlib_unset_authentication_info() {
+  _svnlib_authentication_info(FALSE);
+}
+
+/**
+ * Append the option for our custom config dir to a $cmd array,
+ * and also username and password if those have been set before.
+ */
+function _svnlib_add_common_options(&$cmd) {
+  $auth_info = _svnlib_authentication_info();
+  if (isset($auth_info)) {
+    $cmd = array_merge($cmd, array(
+      '--username', escapeshellarg($auth_info['username']),
+      '--password', escapeshellarg($auth_info['password']),
+    ));
+  }
+  $cmd[] = '--config-dir '. escapeshellarg(dirname(__FILE__) .'/configdir');
+}
+
+/**
+ * Write or retrieve the authentication info state, stored in a static variable.
+ *
+ * @param $info
+ *   NULL to retrieve the info, FALSE to unset it, or an array with array keys
+ *   'username' and 'password' to remember it for later retrieval.
+ */
+function _svnlib_authentication_info($info = NULL) {
+  static $auth_info = NULL;
+
+  if (!isset($info)) {
+    return $auth_info;
+  }
+  else {
+    $auth_info = ($info === FALSE) ? NULL : $info;
+    return $auth_info;
+  }
+}
+
+/**
+ * By default, Subversion will be invoked with the 'svn' binary which is
+ * alright as long as the binary is in the PATH. If it's not, you can call
+ * this function to set a different path to the binary (which will be used
+ * until this process finishes, or until a new path is set).
+ */
+function svnlib_set_svn_binary($svn_binary) {
+  _svnlib_svn_binary($svn_binary);
+}
+
+/**
+ * Write or retrieve the path of the svn binary, stored in a static variable.
+ *
+ * @param $svn_binary
+ *   NULL to retrieve the info, or the path to the binary to remember it
+ *   for later retrieval.
+ */
+function _svnlib_svn_binary($svn_binary = NULL) {
+  static $binary = 'svn';
+
+  if (!isset($svn_binary)) {
+    return $binary;
+  }
+  $binary = $svn_binary;
+  return $binary;
+}
+
+/**
+ * Retrieve the version of the svn binary, and return an array with the keys
+ * 'major', 'minor' and 'patch', each containing the integer for the respective
+ * part of the version number. If invoking the SVN executable fails, an empty
+ * array is returned.
+ */
+function svnlib_version() {
+  static $version;
+
+  if (isset($version)) {
+    return $version;
+  }
+  $return_code = 0;
+  exec(_svnlib_svn_binary() .' --version', $output, $return_code);
+
+  if ($return_code != 0) {
+    $version = array();
+    return $version;
+  }
+  $line = reset($output); // The first line contains the version number.
+
+  if (!preg_match('/\b([\d]+)\.([\d]+)(?:\.([\d]+))?/', $line, $matches)) {
+    $version = array();
+    return $version;
+  }
+  $version = array(
+    'major' => (int) $matches[1],
+    'minor' => (int) $matches[2],
+    'patch' => empty($matches[3]) ? 0 : (int) $matches[3],
+  );
+  return $version;
+}
+
+/**
+ * Append an appropriate output pipe to a $cmd array, which causes STDERR
+ * to be written to a random file.
+ *
+ * @return
+ *   An array with the temporary files that will be created when $cmd
+ *   is executed. In its current form, the return array only contains
+ *   the filename for STDERR output as 'stderr' array element.
+ */
+function _svnlib_add_output_pipes(&$cmd) {
+  $tempdir = file_directory_temp();
+  $tempfiles = array(
+    'stderr' => $tempdir .'/drupal_versioncontrol_svn.stderr.'. mt_rand() .'.txt',
+  );
+  $cmd[] = '2> '. $tempfiles['stderr'];
+  return $tempfiles;
+}
+
+/**
+ * Delete temporary files that have been created by a command which included
+ * output pipes from _svnlib_add_output_pipes().
+ */
+function _svnlib_delete_temporary_files($tempfiles) {
+  @unlink($tempfiles['stderr']);
+}
+
+/**
+ * Read the STDERR output for a command that was executed.
+ * The output must have been written to a temporary file which was given
+ * by _svnlib_add_output_pipes(). The temporary file is deleted after it
+ * has been read. After calling the function, the error message can be
+ * retrieved by calling svnlib_last_error_message() or discarded by calling
+ * svnlib_unset_error_message().
+ */
+function _svnlib_set_error_message($tempfiles) {
+  _svnlib_error_message(file_get_contents($tempfiles['stderr']));
+  @unlink($tempfiles['stderr']);
+}
+
+/**
+ * Retrieve the STDERR output from the last invocation of 'svn' that exited
+ * with a non-zero status code. After fetching the error message, it will be
+ * unset again until a subsequent 'svn' invocation fails as well. If no message
+ * is set, this function returns NULL.
+ *
+ * For better security, it is advisable to run the returned error message
+ * through check_plain() or similar string checker functions.
+ */
+function svnlib_last_error_message() {
+  $message = _svnlib_error_message();
+  _svnlib_error_message(FALSE);
+  return $message;
+}
+
+/**
+ * Write or retrieve an error message, stored in a static variable.
+ *
+ * @param $info
+ *   NULL to retrieve the message, FALSE to unset it, or a string containing
+ *   the new message to remember it for later retrieval.
+ */
+function _svnlib_error_message($message = NULL) {
+  static $error_message = NULL;
+
+  if (!isset($message)) {
+    return $error_message;
+  }
+  else {
+    $error_message = ($message === FALSE) ? NULL : $message;
+    return $error_message;
+  }
+}
+
+/**
+ * Return commit log messages of a repository URL. This function is equivalent
+ * to 'svn log -v -r $revision_range $repository_url'.
+ *
+ * @param $repository_url
+ *   The URL of the repository (e.g. 'file:///svnroot/my-repo') or an item
+ *   inside that repository (e.g. 'file:///svnroot/my-repo/subdir/hello.php').
+ * @param $revision_range
+ *   The revision specification that will be passed to 'svn log' as the
+ *   '-r' parameter. Examples: '35' for a specific revision, 'HEAD:35' for all
+ *   revisions since (and including) r35, or the default parameter 'HEAD:1'
+ *   for all revisions of the given URL. If you specify the more recent
+ *   revision first (e.g. 'HEAD:1') then it will also be first in the
+ *   result array, whereas if you specify the older revision first ('1:HEAD')
+ *   then you'll get a result array with an ascending sort, the most
+ *   recent revision being the last array element.
+ * @param $url_revision
+ *   The revision of the URL that should be listed.
+ *   This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *   For example, if a file was deleted in revision 36, you need to pass '35'
+ *   as parameter to get its log, otherwise Subversion won't find the file.
+ *
+ * @return
+ *   An array of detailed information about the revisions that exist
+ *   in the given URL at the specified revision or revision range.
+ *   Each revision detail array has the revision number as array key.
+ *   If the 'svn log' invocation exited with an error, this function
+ *   returns NULL and the error message can be retrieved by calling
+ *   svnlib_last_error_message().
+ */
+function svnlib_log($repository_url, $revision_range = 'HEAD:1', $url_revision = 'HEAD') {
+  $cmd = array(
+    escapeshellarg(escapeshellcmd(_svnlib_svn_binary())),
+    'log',
+    '-r', $revision_range,
+    '--non-interactive',
+    '--xml',
+    '-v',
+  );
+  _svnlib_add_common_options($cmd);
+  $cmd[] = escapeshellarg($repository_url .'@'. $url_revision);
+  $tempfiles = _svnlib_add_output_pipes($cmd);
+
+  $return_code = 0;
+  exec(implode(' ', $cmd), $output, $return_code);
+  if ($return_code != 0) {
+    _svnlib_set_error_message($tempfiles);
+    return NULL; // no such revision(s) found
+  }
+  $log = implode("\n", $output);
+  _svnlib_delete_temporary_files($tempfiles);
+
+  return _svnlib_parse_log($log);
+}
+
+/*
+ * Parse the output of 'svn log' into an array of log entries.
+ * The output looks something like this (0 to N possible "logentry" elements):
+<?xml version="1.0"?>
+<log>
+  <logentry revision="272">
+    <author>jpetso</author>
+    <date>2007-04-12T15:01:00.247137Z</date>
+    <paths>
+      <path action="M">/trunk/lila/kde/scalable/apps/ktorrent.svg</path>
+      <path action="A">/trunk/lila/kde/scalable/devices/laptop.svg</path>
+      <path copyfrom-path="/trunk/lila/kde/scalable/devices/pda_black.svg"
+            copyfrom-rev="270"
+            action="A">/trunk/lila/kde/scalable/devices/pda_blue.svg</path>
+      <path action="R">/trunk/lila/kde/scalable/devices/ipod_unmount.svg</path>
+      <path action="D">/trunk/lila/kde/ChangeLog</path>
+    </paths>
+    <msg>New laptop icon from the GNOME set, more moderate
+    colors in ktorrent.svg, and bits of devices stuff.
+    </msg>
+  </logentry>
+</log>
+*/
+function _svnlib_parse_log($log) {
+  $revisions = array();
+  $xml = new SimpleXMLElement($log);
+
+  foreach ($xml->logentry as $logentry) {
+    $revision = array();
+    $revision['rev'] = intval((string) $logentry['revision']);
+    $revision['author'] = (string) $logentry->author;
+    $revision['msg'] = rtrim((string) $logentry->msg); // no trailing linebreaks
+    $revision['time_t'] = strtotime((string) $logentry->date);
+    $paths = array();
+
+    foreach ($logentry->paths->path as $logpath) {
+      $path = array(
+        'path' => (string) $logpath,
+        'action' => (string) $logpath['action'],
+      );
+      if (!empty($logpath['copyfrom-path'])) {
+        $path['copyfrom'] = array(
+          'path' => (string) $logpath['copyfrom-path'],
+          'rev' => (string) $logpath['copyfrom-rev'],
+        );
+      }
+      $paths[$path['path']] = $path;
+    }
+    $revision['paths'] = $paths;
+    $revisions[$revision['rev']] = $revision;
+  }
+  return $revisions;
+}
+
+/**
+ * Return the contents of a directory (specified as repository URL,
+ * optionally at a certain revision) as an array of items. This function
+ * is equivalent to 'svn ls $repository_url@$revision'.
+ *
+ * @param $repository_url
+ *   The URL of the repository (e.g. 'file:///svnroot/my-repo') or an item
+ *   inside that repository (e.g. 'file:///svnroot/my-repo/subdir').
+ * @param $url_revision
+ *   The revision of the URL that should be listed.
+ *   This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *   For example, if a file was deleted in revision 36, you need to pass '35'
+ *   as parameter to get its listing, otherwise Subversion won't find the file.
+ * @param $recursive
+ *   FALSE to retrieve just the direct child items of the current directory,
+ *   or TRUE to descend into each subdirectory and retrieve all descendant
+ *   items recursively. If $recursive is true then each directory item
+ *   in the result array will have an additional array element 'children'
+ *   which contains the list entries below this directory, as array keys
+ *   in the result array.
+ *
+ *   If @p $repository_url refers to a file then the @p $recursive parameter
+ *   has no effect on the 'svn ls' output and, by consequence, on the
+ *   return value.
+ *
+ * @return
+ *   A array of items. If @p $repository_url refers to a file then the array
+ *   contains a single entry with this file, whereas if @p $repository_url
+ *   refers to a directory then the array contains all items inside this
+ *   directory (but not the directory itself).
+ *   If the 'svn ls' invocation exited with an error, this function
+ *   returns NULL and the error message can be retrieved by calling
+ *   svnlib_last_error_message().
+ */
+function svnlib_ls($repository_url, $url_revision = 'HEAD', $recursive = FALSE) {
+  $cmd = array(
+    escapeshellarg(escapeshellcmd(_svnlib_svn_binary())),
+    'ls',
+    '--non-interactive',
+    '--xml',
+  );
+  if ($recursive) {
+    $cmd[] = '-R';
+  }
+  _svnlib_add_common_options($cmd);
+  $cmd[] = escapeshellarg($repository_url .'@'. $url_revision);
+  $tempfiles = _svnlib_add_output_pipes($cmd);
+
+  $return_code = 0;
+  exec(implode(' ', $cmd), $output, $return_code);
+  if ($return_code != 0) {
+    _svnlib_set_error_message($tempfiles);
+    return NULL; // no such item or revision found
+  }
+  $lists = implode("\n", $output);
+  _svnlib_delete_temporary_files($tempfiles);
+
+  return _svnlib_parse_ls($lists, $recursive);
+}
+
+/*
+ * Parse the output of 'svn ls' into an array of item entries.
+ * The output looks something like this (0 to N possible "entry" elements):
+<?xml version="1.0"?>
+<lists>
+  <list path="file:///home/jakob/repos/svn/lila-theme/tags/svg-utils-0-1/utils/svg-utils/svgcolor-xml">
+  <entry kind="dir">
+    <name>lila</name>
+    <commit revision="257">
+      <author>jpetso</author>
+      <date>2006-11-29T01:27:47.192716Z</date>
+    </commit>
+  </entry>
+  <entry kind="file">
+    <name>lila/lila-blue.xml</name>
+    <size>918</size>
+    <commit revision="9">
+      <author>dgt84</author>
+      <date>2004-05-04T21:32:13.000000Z</date>
+    </commit>
+  </entry>
+  </list>
+</lists>
+*/
+function _svnlib_parse_ls($lists, $recursive) {
+  $items = array();
+  $current_item_stack = array(); // will help us determine hierarchical structures
+  $xml = new SimpleXMLElement($lists);
+
+  foreach ($xml->list->entry as $entry) {
+    $item = array();
+    $item['created_rev'] = intval((string) $entry->commit['revision']);
+    $item['last_author'] = (string) $entry->commit->author;
+    $item['time_t'] = strtotime((string) $entry->commit->date);
+    $relative_path = (string) $entry->name;
+    $item['name'] = basename($relative_path);
+    $item['type'] = (string) $entry['kind'];
+
+    if ($item['type'] == 'file') {
+      $item['size'] = intval((string) $entry->size);
+    }
+
+    // When listing recursively, we want to capture the item hierarchy.
+    if ($recursive) {
+      if ($item['type'] == 'dir') {
+        $item['children'] = array();
+      }
+      if (strpos($relative_path, '/') !== FALSE) { // don't regard top-level items
+        $parent_path = dirname($relative_path);
+        if (isset($items[$parent_path]) && !in_array($relative_path, $items[$parent_path]['children'])) {
+          $items[$parent_path]['children'][] = $relative_path;
+        }
+      }
+    }
+    $items[$relative_path] = $item;
+  }
+  return $items;
+}
+
+/**
+ * Returns detail information about a directory or file item in the repository.
+ * In most cases, svnlib_info() is the better svnlib_ls(), as it retrieves not
+ * only item names but also repository root and the path of each item
+ * inside the repository.
+ *
+ * You can also use svnlib_info() to retrieve a former item path if the item
+ * has been moved or copied: just pass the current URL and revision together
+ * with a past or future revision number as @p $target_revision, and you get
+ * the path of the item at that time.
+ *
+ * This function is equivalent to
+ * 'svn info -r $target_revision $repository_url@$url_revision'.
+ *
+ * @param $repository_urls
+ *   The URL of the item (e.g. 'file:///svnroot/my-repo/subdir/hello.php')
+ *   or the repository itself (e.g. 'file:///svnroot/my-repo'), as string.
+ *   Alternatively, you can also pass an array of multiple URLs.
+ * @param $url_revision
+ *   The revision of the URL that should be listed.
+ *   This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *   For example, if a file was deleted in revision 36, you need to pass '35'
+ *   as parameter to get its info, otherwise Subversion won't find the file.
+ *   In case multiple URLs are passed, this revision applies to each of them.
+ * @param $depth
+ *   Specifies if info for descendant items should be retrieved as well, and
+ *   if so, which of those. The default 'empty' will not retrieve any children,
+ *   'files' will retrieve all immediate file children, 'immediates' will
+ *   retrieve file and directory children, and 'infinity' will retrieve all
+ *   descendant items there are, recursively. If $depth is 'infinity' then each
+ *   directory item in the result array will have an additional array element
+ *   named 'children' which contains the paths below this directory, the paths
+ *   corresponding to array keys in the result array.
+ *
+ *   If @p $repository_url refers to a file then the @p $depth parameter
+ *   has no effect on the 'svn info' output and, by consequence, on the
+ *   return value.
+ *
+ * @param $target_revision
+ *   The revision specification that will be passed to 'svn info' as the
+ *   '-r' parameter. This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *   This is handy to track item copies and renames, see the general function
+ *   description on how to do that. If you leave this at NULL, the info will be
+ *   retrieved at the state of the $url_revision.
+ *
+ * @return
+ *   A array of items that contain information about the items that correspond
+ *   the specified URL(s). If @p $repository_url refers to a directory and
+ *   @p $depth is 'infinity', the array also includes information about all
+ *   descendants of the items that correspond to the specified URL(s).
+ *   If the 'svn info' invocation exited with an error, this function
+ *   returns NULL and the error message can be retrieved by calling
+ *   svnlib_last_error_message().
+ */
+function svnlib_info($repository_urls, $url_revision = 'HEAD', $depth = 'empty', $target_revision = NULL) {
+  if (!is_array($repository_urls)) { // it's a single URL as a string!
+    $repository_urls = array($repository_urls);
+  }
+
+  $cmd = array(
+    escapeshellarg(escapeshellcmd(_svnlib_svn_binary())),
+    'info',
+    '--non-interactive',
+    '--xml',
+  );
+
+  if ($depth == 'infinity') {
+    $cmd[] = '-R'; // "--depth infinity" is not in 1.4, but '-R' (recursive) is
+  }
+  elseif ($depth != 'empty') {
+    $version = svnlib_version();
+    if ($version['major'] >= 1 && $version['minor'] >= 5) {
+      $cmd[] = '--depth '. $depth;
+    }
+    else { // 1.4 and earlier compatibility workaround
+      foreach ($repository_urls as $repository_url) {
+        // Make sure the item is a directory, otherwise it has no children
+        // anyways (and the relative path fetched by ls will lead to incorrect
+        // results as it duplicates the basename that is already in the URL).
+        $repository_url_items = svnlib_info($repository_url, $url_revision, 'empty', $target_revision);
+        $repository_url_item = reset($repository_url_items);
+        if ($repository_url_item['type'] != 'dir') {
+          continue;
+        }
+        // Fetch child items with svn ls, that's what 1.4 can actually do.
+        $items = svnlib_ls($repository_url, $url_revision);
+        foreach ($items as $relative_path => $item) {
+          if ($depth == 'files' && $item['type'] = 'dir') {
+            continue; // 'immediates' fetches all children, 'files' only files
+          }
+          $repository_urls[] = $repository_url .'/'. $relative_path;
+        }
+      }
+    }
+  }
+  // else {
+  //   "--depth empty" is the default, leave it out for svn <= 1.4 compatibility
+  // }
+
+  if (isset($target_revision)) {
+    $cmd[] = '-r';
+    $cmd[] = $target_revision;
+  }
+  _svnlib_add_common_options($cmd);
+  foreach ($repository_urls as $repository_url) {
+    $cmd[] = escapeshellarg($repository_url .'@'. $url_revision);
+  }
+  $tempfiles = _svnlib_add_output_pipes($cmd);
+
+  $return_code = 0;
+  exec(implode(' ', $cmd), $output, $return_code);
+  if ($return_code != 0) {
+    _svnlib_set_error_message($tempfiles);
+    return NULL; // no such item or revision found
+  }
+  $info = implode("\n", $output);
+  _svnlib_delete_temporary_files($tempfiles);
+
+  $recursive = ($depth == 'infinity');
+  return _svnlib_parse_info($info, $recursive);
+}
+
+/*
+ * Parse the output of 'svn info' into an array of item entries.
+ * The output looks something like this (same URL as in the 'svn ls' example,
+ * also 0 to N possible "entry" elements):
+<?xml version="1.0"?>
+<info>
+  <entry kind="dir" path="svgcolor-xml" revision="275">
+    <url>file:///home/jakob/repos/svn/lila-theme/tags/svg-utils-0-1/utils/svg-utils/svgcolor-xml</url>
+    <repository>
+      <root>file:///home/jakob/repos/svn/lila-theme</root>
+      <uuid>fd53868f-e4f1-0310-84ca-8663aff3ef64</uuid>
+    </repository>
+    <commit revision="257">
+      <author>jpetso</author>
+      <date>2006-11-29T01:27:47.192716Z</date>
+    </commit>
+  </entry>
+  <entry kind="dir" path="lila" revision="275">
+    <url>file:///home/jakob/repos/svn/lila-theme/tags/svg-utils-0-1/utils/svg-utils/svgcolor-xml/lila</url>
+    <repository>
+      <root>file:///home/jakob/repos/svn/lila-theme</root>
+      <uuid>fd53868f-e4f1-0310-84ca-8663aff3ef64</uuid>
+    </repository>
+    <commit revision="257">
+      <author>jpetso</author>
+      <date>2006-11-29T01:27:47.192716Z</date>
+    </commit>
+  </entry>
+  <entry kind="file" path="lila/lila-blue.xml" revision="275">
+    <url>file:///home/jakob/repos/svn/lila-theme/tags/svg-utils-0-1/utils/svg-utils/svgcolor-xml/lila/lila-blue.xml</url>
+    <repository>
+      <root>file:///home/jakob/repos/svn/lila-theme</root>
+      <uuid>fd53868f-e4f1-0310-84ca-8663aff3ef64</uuid>
+    </repository>
+    <commit revision="9">
+      <author>dgt84</author>
+      <date>2004-05-04T21:32:13.000000Z</date>
+    </commit>
+  </entry>
+</info>
+*/
+function _svnlib_parse_info($info, $recursive) {
+  $items = array();
+  $xml = new SimpleXMLElement($info);
+
+  foreach ($xml->entry as $entry) {
+    $item = array();
+    $item['url'] = (string) $entry->url;
+    $item['repository_root'] = (string) $entry->repository->root;
+    $item['repository_uuid'] = (string) $entry->repository->uuid;
+
+    if ($item['url'] == $item['repository_root']) {
+      $item['path'] = '/';
+    }
+    else {
+      $item['path'] = substr($item['url'], strlen($item['repository_root']));
+    }
+
+    if (isset($items[$item['path']])) {
+      // Duplicate item, we had this one before already. Nevertheless, we can
+      // perhaps make use of it in order to enhance the hierarchical structure.
+      $item = $items[$item['path']];
+    }
+    else {
+      $item['type'] = (string) $entry['kind'];
+      $relative_path = (string) $entry['path'];
+      $item['rev'] = intval((string) $entry['revision']); // current state of the item
+      $item['created_rev'] = intval((string) $entry->commit['revision']); // last edit
+      $item['last_author'] = (string) $entry->commit->author;
+      $item['time_t'] = strtotime((string) $entry->commit->date);
+
+      if ($recursive && $item['type'] == 'dir') {
+        $item['children'] = array();
+      }
+    }
+
+    // For "--depth infinity", provide the caller with further hierarchy info.
+    if ($recursive && $item['path'] != '/') {
+      $parent_path = dirname($item['path']);
+      if (isset($items[$parent_path]) && !in_array($item['path'], $items[$parent_path]['children'])) {
+        $items[$parent_path]['children'][] = $item['path'];
+      }
+    }
+    $items[$item['path']] = $item;
+  }
+  return $items;
+}
+
+
+/**
+ * Copy the contents of a file in a repository to a given destination.
+ * This function is equivalent to
+ * 'svn cat $repository_url@$url_revision > $destination'.
+ *
+ * @param $destination
+ *   The path of the file that should afterwards contain the file contents.
+ * @param $repository_url
+ *   The URL of the file, e.g. 'file:///svnroot/my-repo/subdir/hello.php'.
+ * @param $url_revision
+ *   The revision of the URL that should be queried for the property.
+ *   This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *
+ * @return
+ *   TRUE if the file was created successfully. If the 'svn cat' invocation
+ *   exited with an error, this function returns FALSE and the error message
+ *   can be retrieved by calling svnlib_last_error_message().
+ */
+function svnlib_cat($destination, $repository_url, $url_revision = 'HEAD') {
+  $cmd = array(
+    escapeshellarg(escapeshellcmd(_svnlib_svn_binary())),
+    'cat',
+    '--non-interactive',
+  );
+  _svnlib_add_common_options($cmd);
+  $cmd[] = escapeshellarg($repository_url .'@'. $url_revision);
+  $cmd[] = '> '. $destination;
+  $tempfiles = _svnlib_add_output_pipes($cmd);
+
+  $return_code = 0;
+  exec(implode(' ', $cmd), $output, $return_code);
+  if ($return_code != 0) {
+    @unlink($destination);
+    _svnlib_set_error_message($tempfiles);
+    return FALSE; // no such item or revision found
+  }
+  _svnlib_delete_temporary_files($tempfiles);
+  return TRUE;
+}
+
+/**
+ * Return a specific SVN property of the given file or directory in the
+ * repository. This function is equivalent to
+ * 'svn propget $property_name $repository_url@$url_revision'.
+ *
+ * @param $property_name
+ *   The name of the property, e.g. 'svn:mime-type' or 'svn:executable'.
+ * @param $repository_url
+ *   The URL of the item (e.g. 'file:///svnroot/my-repo/subdir/hello.php')
+ *   or the repository itself (e.g. 'file:///svnroot/my-repo'), as string.
+ * @param $url_revision
+ *   The revision of the URL that should be queried for the property.
+ *   This needs to be a single revision, e.g. '35' or 'HEAD'.
+ *
+ * @return
+ *   A string containing the specified property for the item in the given
+ *   revision, an empty string if this property is not set. If the
+ *   'svn propget' invocation exited with an error, this function
+ *   returns NULL and the error message can be retrieved by calling
+ *   svnlib_last_error_message().
+ */
+function svnlib_propget($property_name, $repository_url, $url_revision = 'HEAD') {
+  $cmd = array(
+    escapeshellarg(escapeshellcmd(_svnlib_svn_binary())),
+    'propget',
+    $property_name,
+    '--non-interactive',
+  );
+  _svnlib_add_common_options($cmd);
+  $cmd[] = escapeshellarg($repository_url .'@'. $url_revision);
+  $tempfiles = _svnlib_add_output_pipes($cmd);
+
+  $return_code = 0;
+  exec(implode(' ', $cmd), $output, $return_code);
+  if ($return_code != 0) {
+    _svnlib_set_error_message($tempfiles);
+    return NULL; // no such item or revision found
+  }
+  $property = trim(implode('', $output));
+  _svnlib_delete_temporary_files($tempfiles);
+
+  if (empty($property)) {
+    return '';
+  }
+  return $property;
+}
diff --git a/elpa-to-submit/nxhtml/tests/in/bug384115-bt2.txt b/elpa-to-submit/nxhtml/tests/in/bug384115-bt2.txt
new file mode 100644
index 0000000000..0fc787d330
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug384115-bt2.txt
@@ -0,0 +1,11 @@
+Debugger entered--Lisp error: (file-error "Cannot open load file" "../../../../../../elisp/package.d/nxhtml/nxhtml/nxhtml-menu")
+  (nxhtml-global-minor-mode 1)
+  (let* ((util-dir ...) (related-dir ...) (nxhtml-dir ...)) (add-to-list (quote load-path) nxhtml-dir) (add-to-list (quote load-path) related-dir) (add-to-list (quote load-path) util-dir) (add-to-list (quote load-path) nxhtml-install-dir) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (load (expand-file-name "nxhtml-loaddefs" nxhtml-install-dir)) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (nxhtml-global-minor-mode 1) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (when (fboundp ...) (load ...) (rncpp-patch-xhtml-loader)) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (load (expand-file-name "nxhtml/nxhtml-autoload" nxhtml-install-dir)))
+  (if (featurep (quote nxhtml-autostart)) nil (provide (quote nxhtml-autostart)) (if (< emacs-major-version 23) (load ...) (let ... ...)) (let* (... ... ...) (add-to-list ... nxhtml-dir) (add-to-list ... related-dir) (add-to-list ... util-dir) (add-to-list ... nxhtml-install-dir) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (load ...) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (nxhtml-global-minor-mode 1) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (when ... ... ...) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (load ...)) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (nxhtml-list-loaded-features) (message "Nxml/Nxhtml Autostart.el loaded in %.1f seconds" (- ... nxhtml-load-time-start)))
+  (unless (featurep (quote nxhtml-autostart)) (provide (quote nxhtml-autostart)) (if (< emacs-major-version 23) (load ...) (let ... ...)) (let* (... ... ...) (add-to-list ... nxhtml-dir) (add-to-list ... related-dir) (add-to-list ... util-dir) (add-to-list ... nxhtml-install-dir) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (load ...) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (nxhtml-global-minor-mode 1) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (when ... ... ...) (message "... nXhtml loading %.1f seconds elapsed ..." ...) (load ...)) (message "... nXhtml loading %.1f seconds elapsed ..." (- ... nxhtml-load-time-start)) (nxhtml-list-loaded-features) (message "Nxml/Nxhtml Autostart.el loaded in %.1f seconds" (- ... nxhtml-load-time-start)))
+  eval-buffer(#<buffer  *load*> nil "/Users/dave/elisp/package.d/nxhtml/autostart.el" nil t)  ; Reading at buffer position 7076
+  load-with-code-conversion("/Users/dave/elisp/package.d/nxhtml/autostart.el" "/Users/dave/elisp/package.d/nxhtml/autostart.el" nil t)
+  load("/Users/dave/elisp/package.d/nxhtml/autostart.el" nil t)
+  command-line-1(("-l" "/Users/dave/elisp/package.d/nxhtml/nxhtmlmaint.el" "-l" "/Users/dave/elisp/package.d/nxhtml/autostart.el" "-f" "nxhtmlmaint-byte-compile-all"))
+  command-line()
+  normal-top-level()
diff --git a/elpa-to-submit/nxhtml/tests/in/bug388729-messages.txt b/elpa-to-submit/nxhtml/tests/in/bug388729-messages.txt
new file mode 100644
index 0000000000..4075487a31
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug388729-messages.txt
@@ -0,0 +1,292 @@
+("/Applications/Emacs.app/Contents/MacOS/Emacs" "-Q" "--debug-init" "--load" "/Users/isho/.emacs.d/nxhtml/autostart.el")
+For information about GNU Emacs and the GNU system, type C-h C-a.
+Nxml/Nxhtml Autostart.el loading ...
+Loading /Users/isho/.emacs.d/nxhtml/autostart22.el (source)...
+Loading /Applications/Emacs.app/Contents/Resources/site-lisp/nxml-mode/rng-auto.el (source)...done
+Loading /Users/isho/.emacs.d/nxhtml/autostart22.el (source)...done
+... nXhtml loading 0.1 seconds elapsed ...
+Loading /Users/isho/.emacs.d/nxhtml/nxhtml-loaddefs.el (source)...done
+... nXhtml loading 0.1 seconds elapsed ...
+Loading /Users/isho/.emacs.d/nxhtml/nxhtml/nxhtml-menu.el (source)...
+Loading regexp-opt...done
+Loading easy-mmode...done
+Loading advice...done
+after advising ido
+Loading cl-macs...done
+Loading url-methods...done
+html-site-current (information): No current site set
+Loading derived...done
+Loading byte-opt...done
+
+Finished loading /Users/isho/.emacs.d/nxhtml/util/mumamo.el
+
+Loading /Users/isho/.emacs.d/nxhtml/nxhtml/nxhtml-menu.el (source)...done
+... nXhtml loading 1.3 seconds elapsed ...
+Loading /Users/isho/.emacs.d/nxhtml/etc/schema/schema-path-patch.el (source)...done
+xhtml-loader.rnc was ok
+(No changes need to be saved)
+... nXhtml loading 1.4 seconds elapsed ...
+Loading /Users/isho/.emacs.d/nxhtml/nxhtml/nxhtml-autoload.el (source)...
+nxhtml-autoload starting ... (hm, should maybe be renamed ...)
+majmodpri-apply-priorities running...
+majmodpri-sort-lists running ... (done)
+majmodpri-apply-priorities: No file buffers to change modes in
+majmodpri-apply-priorities running ... (done)
+majmodpri-sort-lists running ... (done)
+nxhtml-autoload finished
+majmodpri-sort-lists running ... (done)
+Loading /Users/isho/.emacs.d/nxhtml/nxhtml/nxhtml-autoload.el (source)...done
+... nXhtml loading 1.7 seconds elapsed ...
+=== Loaded at nxhtml/autostart.el end:
+(feature 'html-imenu)=t
+(feature 'html-quote)=t
+(feature 'html-site)=t
+(feature 'html-upl)=t
+(feature 'mumamo)=t
+(feature 'nxhtml-menu)=t
+(feature 'nxhtml-mode)=t
+(feature 'rngalt)=t
+(feature 'tidy-xhtml)=t
+Nxml/Nxhtml Autostart.el loaded in 1.9 seconds
+nxhtml_test.php has auto save data; consider M-x recover-this-file
+Loading /Users/isho/.emacs.d/nxhtml/util/mumamo-fun.el (source)...done
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-get-chunk-save-buffer-state, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=nil
+MU:(find-next-chunk-values nil nil nil)
+MU:find-next-chunk-values:here a, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:(when (>= 45 1)
+MU:find-next-chunk-values:here d, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:curr-chunk-funs=(mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=)
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-xml-pi pos=1, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-xml-pi, r=(5 nil php-mode (10 nil) nil mumamo-search-fw-exc-end-xml-pi mumamo-find-borders-xml-pi)
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-style pos=1, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-style, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-script pos=1, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-script, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-style= pos=1, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-style=, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-onjs= pos=1, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-onjs=, r=nil
+MU:find-next-chunk-values:here A, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:here B, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:here E
+MU:find-next-chunk-values:curr-is-closed=t
+MU:find-next-chunk-values=> current=(1 5 html-mode 10 nil nil (mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=) nil t), next=(php-mode mumamo-search-fw-exc-end-xml-pi mumamo-find-borders-xml-pi none 1)
+MU:find-chunks:mumamo-old-tail=nil, major=nil, mumamo-last-chunk=nil
+MU:
+--------------------
+MU:
+--------------------
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-turn-on-actions, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=4, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=nil from mumamo-turn-on-actions, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:(find-next-chunk-values #<overlay from 1 to 5 in nxhtml_test.php> nil nil)
+MU:find-next-chunk-values:here a, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:(when (>= 45 6)
+MU:find-next-chunk-values:Calling (curr-end-fun=mumamo-search-fw-exc-end-xml-pi 4 45)=>44
+MU:find-next-chunk-values:here c, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:here c2, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:before end-in-code: 5 mumamo-search-fw-exc-end-xml-pi php-mode
+Loading /Users/isho/.emacs.d/nxhtml/related/php-mode.el (source)...
+majmodpri-sort-lists running ... (done)
+Loading /Users/isho/.emacs.d/nxhtml/related/php-mode.el (source)...done
+MU:
+--------------------
+MU:find-next-chunk-values:curr-end-fun-end after end-in-code=44
+MU:find-next-chunk-values:here d, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:curr-chunk-funs=nil
+MU:find-next-chunk-values:here A, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:here B, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:here C, curr-min=5, after-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-next-chunk-values:here D
+MU:find-next-chunk-values:here E
+MU:find-next-chunk-values:curr-is-closed=t
+MU:find-next-chunk-values=> current=(5 44 php-mode nil nil nil nil #<overlay from 1 to 5 in nxhtml_test.php> t), next=(nil nil nil nil -1)
+MU:find-chunks:mumamo-old-tail=nil, major=nil, mumamo-last-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:(find-next-chunk-values #<overlay from 5 to 44 in nxhtml_test.php> nil nil)
+MU:find-next-chunk-values:here a, curr-min=44, after-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-next-chunk-values:(when (>= 45 45)
+MU:find-next-chunk-values:here d, curr-min=44, after-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-next-chunk-values:curr-chunk-funs=(mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=)
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-xml-pi pos=45, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-xml-pi, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-style pos=45, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-style, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-script pos=45, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-script, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-style= pos=45, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-style=, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-onjs= pos=45, max=45
+MU:find-next-chunk-values:fn=mumamo-chunk-onjs=, r=nil
+MU:find-next-chunk-values:here A, curr-min=44, after-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-next-chunk-values:here B, curr-min=44, after-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-next-chunk-values:here C, curr-min=44, after-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-next-chunk-values:here D
+MU:find-next-chunk-values:here E
+MU:find-next-chunk-values:curr-is-closed=nil
+MU:find-next-chunk-values=> current=(44 nil html-mode nil nil nil (mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=) #<overlay from 5 to 44 in nxhtml_test.php> nil), next=(nil nil nil nil 1)
+MU:find-chunks:mumamo-old-tail=nil, major=nil, mumamo-last-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-fontify-region-1, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-fontify-region-1 2, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from syntax-ppss, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-fontify-region-1 2, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 5 to 44 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=10 from syntax-ppss, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=10, ok-pos=45, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=10, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 5 to 44 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=44 from mumamo-fontify-region-1 2, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=44, ok-pos=45, this-new-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=44, this-new-chunk=#<overlay from 44 to 45 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 44 to 45 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=2 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=2, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=2, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=3 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=3, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=3, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=4 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=4, ok-pos=45, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=4, this-new-chunk=#<overlay from 1 to 5 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 5 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 5 to 44 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-idle-set-major-mode, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 5 to 44 in nxhtml_test.php>, point-max=45, last=#<overlay from 44 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 5 to 44 in nxhtml_test.php>
+MU:c-after-change: major-mode=php-mode c-nonsymbol-token-regexp=!=\|##\|%\(?::%:\|[:=]\)\|&[&=]\|\*[/=]\|\+[+=]\|-[=>-]\|\.\.\.\|/[*/=]\|:[:>]\|<\(?:<=\|[:<=]\)\|==\|>\(?:>=\|[=>]\)\|\?\?\(?:!\?\?!\|=\?\?=\|[!()=-]\)\|\^=\||[=|]\|[]!#%&(-,./:-?[{-~^-]
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from syntax-ppss-flush-cache, level=0
+MU:find-chunks:first-check-from=4, chunk-at-change-min=#<overlay from 5 to 5 in nxhtml_test.php>
+MU:find-chunks:at start mumamo-old-tail=#<overlay from 1 to 5 in nxhtml_test.php>, mumamo-last-chunk=nil
+MU:(find-next-chunk-values nil 4 nil)
+MU:find-next-chunk-values:here a, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:(when (>= 6 1)
+MU:find-next-chunk-values:here d, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:curr-chunk-funs=(mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=)
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-xml-pi pos=1, max=6
+MU:find-next-chunk-values:fn=mumamo-chunk-xml-pi, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-style pos=1, max=6
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-style, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-inlined-script pos=1, max=6
+MU:find-next-chunk-values:fn=mumamo-chunk-inlined-script, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-style= pos=1, max=6
+MU:find-next-chunk-values:fn=mumamo-chunk-style=, r=nil
+MU:find-next-chunk-values:before (r (funcall fn pos pos max)), fn=mumamo-chunk-onjs= pos=1, max=6
+MU:find-next-chunk-values:fn=mumamo-chunk-onjs=, r=nil
+MU:find-next-chunk-values:here A, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:here B, curr-min=1, after-chunk=nil
+MU:find-next-chunk-values:here E
+MU:find-next-chunk-values:curr-is-closed=nil
+MU:find-next-chunk-values=> current=(1 nil html-mode nil nil nil (mumamo-chunk-xml-pi mumamo-chunk-inlined-style mumamo-chunk-inlined-script mumamo-chunk-style= mumamo-chunk-onjs=) nil nil), next=(nil nil nil nil 1)
+MU:find-chunks:mumamo-old-tail=#<overlay from 1 to 5 in nxhtml_test.php>, major=html-mode, mumamo-last-chunk=nil
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-set-major-post-command, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=6, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-fontify-region-1, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=6, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from mumamo-fontify-region-1 2, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=6, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=1 from syntax-ppss, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:using old at end=1, ok-pos=6, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=1, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-idle-set-major-mode, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=6, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 6 in nxhtml_test.php>, point-max=6, last=#<overlay from 1 to 6 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 6 in nxhtml_test.php>
+Mark set
+MU:c-after-change: major-mode=html-mode c-nonsymbol-token-regexp=nil
+Loading debug...done
+Entering debugger...
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-fontify-region-1, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>, point-max=45, last=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 45 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from mumamo-fontify-region-1 2, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>, point-max=45, last=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 45 in nxhtml_test.php>
+MU:!!!!!!!!!!!!!!!!!!!find-chunks end=5 from syntax-ppss, level=0
+MU:find-chunks:first-check-from=nil, chunk-at-change-min=nil
+MU:find-chunks:at start mumamo-old-tail=nil, mumamo-last-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:using old at end=5, ok-pos=45, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks:Exit.end-param=5, this-new-chunk=#<overlay from 1 to 45 in nxhtml_test.php>, point-max=45, last=#<overlay from 1 to 45 in nxhtml_test.php>
+MU:find-chunks=>#<overlay from 1 to 45 in nxhtml_test.php>
+Quit
+File `/Users/isho/Desktop/backtrace.txt' exists; overwrite? (y or n) 
+Wrote /Users/isho/Desktop/backtrace.txt
+File `~/Desktop/messages.txt' exists; overwrite? (y or n) 
diff --git a/elpa-to-submit/nxhtml/tests/in/bug388729-nxhtml_test.php b/elpa-to-submit/nxhtml/tests/in/bug388729-nxhtml_test.php
new file mode 100644
index 0000000000..5b049b976d
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug388729-nxhtml_test.php
@@ -0,0 +1,2 @@
+
+<?php echo "this could be anything"; ?>
diff --git a/elpa-to-submit/nxhtml/tests/in/bug393137-new.html.erb b/elpa-to-submit/nxhtml/tests/in/bug393137-new.html.erb
new file mode 100644
index 0000000000..555196bf4c
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug393137-new.html.erb
@@ -0,0 +1,19 @@
+<h1>New post</h1>
+
+<% form_for(@post) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit 'Create' %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', posts_path %>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/bug400415-foo.php b/elpa-to-submit/nxhtml/tests/in/bug400415-foo.php
new file mode 100644
index 0000000000..465e4b0ecd
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug400415-foo.php
@@ -0,0 +1,9 @@
+<?php
+
+class Foo {
+  public function foo() {
+    $foo = <<<EOT_SQL;
+    I am a heredoc
+EOT_SQL
+  }
+}
diff --git a/elpa-to-submit/nxhtml/tests/in/bug400415-foo2.php b/elpa-to-submit/nxhtml/tests/in/bug400415-foo2.php
new file mode 100644
index 0000000000..465e4b0ecd
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/bug400415-foo2.php
@@ -0,0 +1,9 @@
+<?php
+
+class Foo {
+  public function foo() {
+    $foo = <<<EOT_SQL;
+    I am a heredoc
+EOT_SQL
+  }
+}
diff --git a/elpa-to-submit/nxhtml/tests/in/chunks-in-chunks1.php b/elpa-to-submit/nxhtml/tests/in/chunks-in-chunks1.php
new file mode 100644
index 0000000000..007bc6692f
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/chunks-in-chunks1.php
@@ -0,0 +1,19 @@
+$a = <<<EOTHTML
+
+<p>stuff</p>
+
+EOTHTML;
+
+
+$b = <<<EOT
+
+    <h2><a href="/">stuff</a></h2>
+
+EOT;
+
+$c = <<<EOT
+
+<button onclick="a()">test</button>
+
+
+EOT;
diff --git a/elpa-to-submit/nxhtml/tests/in/heredoc.php b/elpa-to-submit/nxhtml/tests/in/heredoc.php
new file mode 100644
index 0000000000..07f5059eb6
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/heredoc.php
@@ -0,0 +1,61 @@
+
+<?php
+
+/* Testing fill paragraph and friends, fill me fill me fill me fill me
+   fill me fill me fill me fill me fill me fill me fill me fill me
+   fill me fill me
+
+   However coloring it differently than the top level (or level 1) php
+   chunks may help detect nesting errors.  */
+
+$name       = "Joe Smith";
+$occupation = "Programmer";
+echo <<<EOF
+
+ This is a heredoc text-mode section.
+ For more information talk to $name, your local $occupation.
+
+EOF;
+
+$toprint = <<< HTMLEOF
+<!-- heredoc html-mode section -->
+<style type="text/css">
+.bugfix { color: red; }
+</style>
+
+<script type="text/javascript" language="javascript">
+
+ function onEndCrop( coords, dimensions ) {
+     alert("Test");
+ }
+</script>
+
+
+<a href="javascript:void window.open('');" title="Something">
+  <img   src="/administrator/images/imprimir.png"
+  style="color:red;"
+  border="0"
+  alt="<?php echo _CMN_PDF;?>"
+  onmouseover="this.src='images/imprimir_on.png';swap('imprimir',1);"
+  onmouseout="this.src='images/imprimir.png'; swap('imprimir',0);"
+  class="bot" id="imprimir"/>
+  </a>
+
+<?php
+
+/* This inner php chunk is not useful (except for presentation of
+   MuMaMo chunk dividing capabilities and deficiences...), since php
+   normally seems to run only one pass...
+
+   However coloring it differently than the top level (or level 1) php
+   chunks may help detect nesting errors.  */
+
+echo <<<ONEMORELEVEL
+Just for testing the chunk background color...
+ONEMORELEVEL;
+?>
+
+HTMLEOF;
+echo strtolower($toprint);
+
+?>
diff --git a/elpa-to-submit/nxhtml/tests/in/heredoc.pl b/elpa-to-submit/nxhtml/tests/in/heredoc.pl
new file mode 100644
index 0000000000..86203575dc
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/heredoc.pl
@@ -0,0 +1,11 @@
+$text = 'Text from a Perl string.';
+print <<HTML; 
+<html>
+<head>
+<title>Here-Doc Example</title>
+</head>
+<body>
+<h1>Here-Doc Example</h1>
+<p>$text</p>
+</body>
+HTML
diff --git a/elpa-to-submit/nxhtml/tests/in/heredoc.py b/elpa-to-submit/nxhtml/tests/in/heredoc.py
new file mode 100644
index 0000000000..aaa847f7bb
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/heredoc.py
@@ -0,0 +1,11 @@
+sender = 'Buffy the Vampire Slayer'
+recipient = 'Spike'
+
+print("""\
+Dear %(recipient)s,
+
+I wish you to leave Sunnydale and never return.
+
+Not Quite Love,
+%(sender)s
+""" % locals())
diff --git a/elpa-to-submit/nxhtml/tests/in/heredoc.rb b/elpa-to-submit/nxhtml/tests/in/heredoc.rb
new file mode 100644
index 0000000000..ab7b54ffb1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/heredoc.rb
@@ -0,0 +1,8 @@
+now = Time.now
+puts <<-EOF
+  It's #{now.hour} o'clock John, where are your kids?
+  EOF
+now = Time.now
+puts <<EOF 
+  It's #{now.hour} o'clock John, where are your kids?
+EOF
diff --git a/elpa-to-submit/nxhtml/tests/in/heredoc.sh b/elpa-to-submit/nxhtml/tests/in/heredoc.sh
new file mode 100644
index 0000000000..5893ac7104
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/heredoc.sh
@@ -0,0 +1,4 @@
+tr a-z A-Z <<EOF
+
+
+EOF
diff --git a/elpa-to-submit/nxhtml/tests/in/jj-081226.html b/elpa-to-submit/nxhtml/tests/in/jj-081226.html
new file mode 100644
index 0000000000..9599014fb1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/jj-081226.html
@@ -0,0 +1,26 @@
+<script type="text/javascript">
+    // <![CDATA[
+    // Set this to the URL you used to fetch recommendations, whether you
+    // fetched them on the client or the server.
+    var request_url="%(json_url)s";
+
+    // This function is used track click-throughs by fetching a web
+    // beacon
+    function trackClickThrough(elem) {
+        var img = new Image();
+        img.src = '%(beacon_url)s' +
+            '?request_url=' + escape(request_url) +
+            '&click_through_url=' + escape(elem.href);
+        return true;
+    }
+    // ]]>
+</script>
+<p>
+  <!--
+  Imagine this is one of the recommendations that was returned.
+  Just add an onclick handler that calls trackClickThrough.
+  -->
+  <a href="http://www.google.com"
+     onclick="return trackClickThrough(this);">Click me!</a>
+</p>
+
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-2j.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-2j.html
new file mode 100644
index 0000000000..6017ba3f00
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-2j.html
@@ -0,0 +1,174 @@
+{% load transdigest helpers %}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC
+    "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+        <link rel="stylesheet" type="text/css" href="{% media_url %}/homepage/css/web0.5.css" media="screen" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        {% endblock %}
+        <style type="text/css">
+
+	* {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        	{ % endblock % }
+        </style>
+	<script type="text/javascript" src="{% media_url %}/homepage/js/jquery.js"></script>
+	<script type="text/javascript" src="{% media_url %}/homepage/js/jquery.preload.js"></script>
+	<script type="text/javascript" src="{% media_url %}/homepage/js/swfobject.js"></script>
+	<script type="text/javascript">
+	function image_loaded(info) {
+		/* now we know that the image is loaded, we can add in to the
+		 * document and position it as we want */
+		// create the element, set the ID and add in to the DOM,
+		// otherwise it won't have dimensions
+		var pointer = $('<img src="' + info.image + '" />');
+		pointer.attr('id', 'pointer');
+		var frame = $('#container');
+		pointer.appendTo(frame);
+
+		// put it into the center and make top & left be in the center
+		// of the image (cool hack)
+		pointer.css({
+			position: 'absolute',
+			top: '50%',
+			left: '50%',
+			margin: (-pointer.height() / 2) + 'px 0 0 ' +
+				(-pointer.width() / 2) + 'px'
+		});
+
+		// continue with the animation now
+		play_animation();
+	}
+	
+	function prepare_animation() {
+		/* prepares animation by preloading stuff */
+		// hide all panels
+		$('a > img').css('visibility', 'hidden');
+		// create the logo - 'pointer': preload and center it
+		$.preload(['logo'], {
+			base: '{ % media_url % }/homepage/img/intro/',
+			ext: '.png',
+			onFinish: image_loaded
+		});
+	}
+	
+	function play_animation() {
+	/* plays the animations, adds callbacks */
+	var frame = $('#container');
+	var pointer = $('#pointer');
+
+	/* run the effects now: first fade in the pointer, then move it
+	 * to the edge of the frame, then fade in the panels
+	 */
+	pointer.hide().fadeIn(2000)
+	       .animate({
+			top: pointer.height() / 2 + 10,
+			left: frame.width() - pointer.width() / 2
+			}, 3000, undefined, function() {
+				var panels = $('a > img');
+				// show panels, fade them in and add callbacks
+				panels.css({ visibility: 'visible', 
+					opacity: '0'})
+				      .fadeTo(1000, 0.5)
+				      .mouseover(fade_in)
+				      .mouseout(fade_out);
+				});
+	}
+
+	function fade_in() {
+		/* fade in the panel */
+		$(this).fadeTo(300, 1);
+	}
+
+	function fade_out() {
+		/* fade out the panel */
+		$(this).fadeTo(300, 0.5);
+	}
+
+	// start JS magic when the page has loaded
+	$(document).ready(prepare_animation);
+	</script>
+
+    </head>
+
+{% block body %}
+<body>
+
+<div id="distance"></div>
+<div id="container">
+  <div id="flashcontent">
+
+    <table border="0">
+      <tr>
+        <td colspan="3"><div style="height: 63px;" /></td>
+      </tr>
+      <tr>
+        <td><a href="/junkers/"><img src="{% media_url %}/homepage/img/intro/panel_junkers.jpg" alt="junkers" width="166" height="221" /></a></td>
+        <td><a href="/zeppelin/"><img src="{% media_url %}/homepage/img/intro/panel_zeppelin.jpg" alt="zeppelin" width="168" height="221" /></a></td>
+        <td><a href="/maximilian/"><img src="{% media_url %}/homepage/img/intro/panel_maximilian.jpg" alt="maximilian" width="162" height="221" /></a></td>
+      </tr>
+      <tr>
+        <td colspan="3"><div style="height: 66px;" /></td>
+      </tr>
+    </table>
+  </div>
+
+  <script type="text/javascript">
+	// <![CDATA[
+	var so = new SWFObject("{% media_url % }/homepage/swf/intro_{ % translate "LANGUAGE_NAME" % }.swf", "intro", "500", "370", "9", "#FFF");
+	so.addParam("allowScriptAccess", "always");
+	so.write("flashcontent");
+	// ]]>
+  </script>
+
+</div>
+</div>
+
+</body>
+{% endblock %}
+
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-a-notabs.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-a-notabs.html
new file mode 100644
index 0000000000..61b64e3fa8
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-a-notabs.html
@@ -0,0 +1,57 @@
+{% load transdigest helpers %}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC
+    "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+        <link rel="stylesheet" type="text/css" href="{% media_url %}/homepage/css/web0.5.css" media="screen" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        {% endblock %}
+        <style type="text/css">
+                { block pagestyle }
+        p {
+                margin: 0;
+                padding: 0;
+        }
+        img {
+                border: 0
+        }
+
+        html, body {
+                height: 100%;
+        }
+
+        #distance {
+                width: 1px;
+                height: 50%;
+                margin-bottom: -175px;
+        }
+        #container {
+                position: relative;
+                margin: 0 auto;
+                height: 370px;
+                width: 500px;
+                background-color: #ffffff;
+        }
+        /* the horizontal bars */
+        #flashcontent * div {
+                background-color: #292926;
+        }
+
+        #pointer {
+                display: block;
+                margin: 0 auto;
+        }
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-b.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-b.html
new file mode 100644
index 0000000000..89ac466591
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-b.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC
+    "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+        <link rel="stylesheet" type="text/css" href="{% media_url %}/homepage/css/web0.5.css" media="screen" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        {% endblock %}
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-c.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-c.html
new file mode 100644
index 0000000000..f797466190
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-c.html
@@ -0,0 +1,52 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+        <link rel="stylesheet" type="text/css" href="{% media_url %}/homepage/css/web0.5.css" media="screen" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        {% endblock %}
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-d.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-d.html
new file mode 100644
index 0000000000..f40fdf6217
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-d.html
@@ -0,0 +1,51 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        {% endblock %}
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-e.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-e.html
new file mode 100644
index 0000000000..62aafe76e5
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-e.html
@@ -0,0 +1,50 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+        {% block htmlhead %}
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-f.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-f.html
new file mode 100644
index 0000000000..ac73f84b2f
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-f.html
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <title>{% block title %}{% translate "WELCOME_TO_POINTTEC" %}{% endblock %}</title>
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	html, body {
+		height: 100%;
+	}
+
+	#distance {
+		width: 1px;
+		height: 50%;
+		margin-bottom: -175px;
+	}
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-g.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-g.html
new file mode 100644
index 0000000000..9d302ce89c
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-g.html
@@ -0,0 +1,39 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	#container {
+		position: relative;
+		margin: 0 auto;
+		height: 370px;
+		width: 500px;
+		background-color: #ffffff;
+	}
+	/* the horizontal bars */
+	#flashcontent * div {
+		background-color: #292926;
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-h.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-h.html
new file mode 100644
index 0000000000..5a0a166375
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-h.html
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+	img {
+		border: 0
+	}
+
+	#pointer {
+		display: block;
+		margin: 0 auto;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-i.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-i.html
new file mode 100644
index 0000000000..66ed32f53e
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-i.html
@@ -0,0 +1,19 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-j.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-j.html
new file mode 100644
index 0000000000..e1beacd49c
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-j.html
@@ -0,0 +1,19 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+
+	p {
+		margin: 0;
+		padding: 0;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-k.html b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-k.html
new file mode 100644
index 0000000000..9dc91e1947
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing-k.html
@@ -0,0 +1,19 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head profile="http://dublincore.org/documents/dcq-html/">
+        <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+        <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+
+        <meta name="DC.title" content="Homepage of point TEC" />
+        <meta name="DC.creator" content="Marek Kubica" />
+        <meta name="DC.subject" content="Presentation of products" />
+        <meta name="DC.publisher" content="point TEC" />
+        <meta name="DC.rights" content="copyright by point TEC" />
+
+        <style type="text/css">
+        	{ xlock }
+	p {
+		margin: 0;
+		padding: 0;
+	}
+
+        </style>
diff --git a/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing.txt b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing.txt
new file mode 100644
index 0000000000..dc3a6cf0a4
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/kubica-080516-freezing.txt
@@ -0,0 +1,10 @@
+The problem seems to have to do with the { block pagestyle } thing
+below. If that is removed then the freezing does not happen.
+
+        <style type="text/css">
+        	{ block pagestyle }
+	p {
+		margin: 0;
+
+Try the files kubica-080516-freezing-i.html and dito j. The former
+freezes Emacs, but the latter does not.
diff --git a/elpa-to-submit/nxhtml/tests/in/nutshell.mako b/elpa-to-submit/nxhtml/tests/in/nutshell.mako
index a63baba23b..3c7540e7b8 100644
--- a/elpa-to-submit/nxhtml/tests/in/nutshell.mako
+++ b/elpa-to-submit/nxhtml/tests/in/nutshell.mako
@@ -1,3 +1,4 @@
+    % for row in rows:
 <%inherit file="base.html"/>
 
 <%
diff --git a/elpa-to-submit/nxhtml/tests/in/only-html.html b/elpa-to-submit/nxhtml/tests/in/only-html.html
new file mode 100644
index 0000000000..7b297dd916
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/only-html.html
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title></title>
+  </head>
+  <body>
+    For testing fontification.
+  </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/pastie-246693.txt-ruby-mode.el b/elpa-to-submit/nxhtml/tests/in/pastie-246693.txt-ruby-mode.el
deleted file mode 100644
index 793116c7de..0000000000
--- a/elpa-to-submit/nxhtml/tests/in/pastie-246693.txt-ruby-mode.el
+++ /dev/null
@@ -1,1280 +0,0 @@
-;;; ruby-mode.el --- Major mode for editing Ruby files
-
-;; Copyright (C) 1994-2008 Yukihiro Matsumoto, Nobuyoshi Nakada, and contributors
-
-;; Author: Yukihiro Matsumoto
-;; Created: Fri Feb  4 14:49:13 JST 1994
-;; Keywords: languages
-
-;; This file is not yet part of GNU Emacs.
-
-;;; Commentary:
-
-;; Provides font-locking, indentation support, and navigation for Ruby code.
-
-;;; Todo:
-
-;; set auto-mode-alist and interpreter-mode-alist with autoload?
-;; various docstrings labelled below with TODOs
-;; Taken from Ruby SVN revision 16028; need to port recent changes.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-(defconst ruby-block-beg-re
-  "class\\|module\\|def\\|if\\|unless\\|case\\|while\\|until\\|for\\|begin\\|do"
-  "Regexp to match the beginning of blocks in ruby-mode.")
-
-(defconst ruby-non-block-do-re
-  "\\(while\\|until\\|for\\|rescue\\)\\>[^_]"
-  "Regexp to match keywords that nest without blocks.")
-
-(defconst ruby-indent-beg-re
-  "\\(\\s *\\(class\\|module\\|def\\)\\)\\|if\\|unless\\|case\\|while\\|until\\|for\\|begin"
-  "Regexp to match where the indentation gets deeper.")
-
-(defconst ruby-modifier-beg-re
-  "if\\|unless\\|while\\|until"
-  "Regexp to match modifiers same as the beginning of blocks.")
-
-(defconst ruby-modifier-re
-  (concat ruby-modifier-beg-re "\\|rescue")
-  "Regexp to match modifiers.")
-
-(defconst ruby-block-mid-re
-  "then\\|else\\|elsif\\|when\\|rescue\\|ensure"
-  "Regexp to match where the indentation gets shallower in middle of block statements.")
-
-(defconst ruby-block-op-re
-  "and\\|or\\|not"
-  "Regexp to match boolean keywords.")
-
-(defconst ruby-block-hanging-re
-  (concat ruby-modifier-beg-re "\\|" ruby-block-op-re)
-  "Regexp to match keywords that begin a new indentation level.")
-
-(defconst ruby-block-end-re "\\<end\\>"
-  "Regexp to match closing of a block.")
-
-(defconst ruby-here-doc-beg-re
-  "<<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)"
-  "Regexp to match heredocs.")
-
-(defun ruby-here-doc-end-match ()
-  "Return a regexp to find the end of the last matched heredoc."
-  (concat "^"
-	  (if (match-string 1) "[ \t]*" nil)
-	  (regexp-quote
-	   (or (match-string 3)
-	       (match-string 4)
-	       (match-string 5)))))
-
-(defconst ruby-delimiter
-  (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
-	  ruby-block-beg-re
-	  "\\)\\>\\|" ruby-block-end-re
-	  "\\|^=begin\\|" ruby-here-doc-beg-re)
-  "Regexp to match things that indicate a new area of code.")
-
-(defconst ruby-negative
-  (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
-	  ruby-block-end-re "\\|}\\|\\]\\)")
-  "Regexp to match where the indentation gets shallower.")
-
-(defconst ruby-operator-re "[-,.+*/%&|^~=<>:]"
-  "Regexp to match operators.")
-
-(defconst ruby-symbol-chars "a-zA-Z0-9_"
-  "List of characters that symbol names may contain.")
-(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]")
-  "Regexp to match symbols.")
-
-(defvar ruby-mode-abbrev-table nil
-  "Abbrev table in use in ruby-mode buffers.")
-
-(define-abbrev-table 'ruby-mode-abbrev-table ())
-
-(defvar ruby-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "{" 'ruby-electric-brace)
-    (define-key map "}" 'ruby-electric-brace)
-    (define-key map "\M-\C-a" 'ruby-beginning-of-defun)
-    (define-key map "\M-\C-e" 'ruby-end-of-defun)
-    (define-key map "\M-\C-b" 'ruby-backward-sexp)
-    (define-key map "\M-\C-f" 'ruby-forward-sexp)
-    (define-key map "\M-\C-p" 'ruby-beginning-of-block)
-    (define-key map "\M-\C-n" 'ruby-end-of-block)
-    (define-key map "\M-\C-h" 'ruby-mark-defun)
-    (define-key map "\M-\C-q" 'ruby-indent-exp)
-    (define-key map "\t" 'ruby-indent-line)
-    (define-key map "\C-c\C-e" 'ruby-insert-end)
-    (define-key map "\C-j" 'ruby-reindent-then-newline-and-indent)
-    (define-key map "\C-m" 'newline)
-    map)
-  "Keymap used in ruby-mode.")
-
-(defvar ruby-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?\' "\"" table)
-    (modify-syntax-entry ?\" "\"" table)
-    (modify-syntax-entry ?\` "\"" table)
-    (modify-syntax-entry ?# "<" table)
-    (modify-syntax-entry ?\n ">" table)
-    (modify-syntax-entry ?\\ "\\" table)
-    (modify-syntax-entry ?$ "." table)
-    (modify-syntax-entry ?? "_" table)
-    (modify-syntax-entry ?_ "_" table)
-    (modify-syntax-entry ?< "." table)
-    (modify-syntax-entry ?> "." table)
-    (modify-syntax-entry ?& "." table)
-    (modify-syntax-entry ?| "." table)
-    (modify-syntax-entry ?% "." table)
-    (modify-syntax-entry ?= "." table)
-    (modify-syntax-entry ?/ "." table)
-    (modify-syntax-entry ?+ "." table)
-    (modify-syntax-entry ?* "." table)
-    (modify-syntax-entry ?- "." table)
-    (modify-syntax-entry ?\; "." table)
-    (modify-syntax-entry ?\( "()" table)
-    (modify-syntax-entry ?\) ")(" table)
-    (modify-syntax-entry ?\{ "(}" table)
-    (modify-syntax-entry ?\} "){" table)
-    (modify-syntax-entry ?\[ "(]" table)
-    (modify-syntax-entry ?\] ")[" table)
-    table)
-  "Syntax table to use in ruby-mode.")
-
-(defcustom ruby-indent-tabs-mode nil
-  "*Indentation can insert tabs in ruby mode if this is non-nil."
-  :type 'boolean :group 'ruby)
-
-(defcustom ruby-indent-level 2
-  "*Indentation of ruby statements."
-  :type 'integer :group 'ruby)
-
-(defcustom ruby-comment-column 32
-  "*Indentation column of comments."
-  :type 'integer :group 'ruby)
-
-(defcustom ruby-deep-arglist t
-  "*Deep indent lists in parenthesis when non-nil.
-Also ignores spaces after parenthesis when 'space."
-  :group 'ruby)
-
-(defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t)
-  "*Deep indent lists in parenthesis when non-nil. t means continuous line.
-Also ignores spaces after parenthesis when 'space."
-  :group 'ruby)
-
-(defcustom ruby-deep-indent-paren-style 'space
-  "Default deep indent style."
-  :options '(t nil space) :group 'ruby)
-
-(defcustom ruby-encoding-map '((shift_jis . cp932) (shift-jis . cp932))
-  "Alist to map encoding name from emacs to ruby."
-  :group 'ruby)
-
-(defcustom ruby-use-encoding-map t
-  "*Use `ruby-encoding-map' to set encoding magic comment if this is non-nil."
-  :type 'boolean :group 'ruby)
-
-(defun ruby-imenu-create-index-in-block (prefix beg end)
-  "Create an imenu index of methods inside a block."
-  (let ((index-alist '()) (case-fold-search nil)
-	name next pos decl sing)
-    (goto-char beg)
-    (while (re-search-forward "^\\s *\\(\\(class\\>\\(\\s *<<\\)?\\|module\\>\\)\\s *\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\>\\s *\\([^\(\n ]+\\)\\)" end t)
-      (setq sing (match-beginning 3))
-      (setq decl (match-string 5))
-      (setq next (match-end 0))
-      (setq name (or (match-string 4) (match-string 6)))
-      (setq pos (match-beginning 0))
-      (cond
-       ((string= "alias" decl)
-	(if prefix (setq name (concat prefix name)))
-	(push (cons name pos) index-alist))
-       ((string= "def" decl)
-	(if prefix
-	    (setq name
-		  (cond
-		   ((string-match "^self\." name)
-		    (concat (substring prefix 0 -1) (substring name 4)))
-		   (t (concat prefix name)))))
-	(push (cons name pos) index-alist)
-	(ruby-accurate-end-of-block end))
-       (t
-	(if (string= "self" name)
-	    (if prefix (setq name (substring prefix 0 -1)))
-	  (if prefix (setq name (concat (substring prefix 0 -1) "::" name)))
-	  (push (cons name pos) index-alist))
-	(ruby-accurate-end-of-block end)
-	(setq beg (point))
-	(setq index-alist
-	      (nconc (ruby-imenu-create-index-in-block
-		      (concat name (if sing "." "#"))
-		      next beg) index-alist))
-	(goto-char beg))))
-    index-alist))
-
-(defun ruby-imenu-create-index ()
-  "Create an imenu index of all methods in the buffer."
-  (nreverse (ruby-imenu-create-index-in-block nil (point-min) nil)))
-
-(defun ruby-accurate-end-of-block (&optional end)
-  ;; TODO: doc
-  (let (state
-	(end (or end (point-max))))
-    (while (and (setq state (apply 'ruby-parse-partial end state))
-		(>= (nth 2 state) 0) (< (point) end)))))
-
-(defun ruby-mode-variables ()
-  "Set up initial local variables for ruby-mode."
-  (set-syntax-table ruby-mode-syntax-table)
-  (setq local-abbrev-table ruby-mode-abbrev-table)
-  (setq indent-tabs-mode ruby-indent-tabs-mode)
-  (set (make-local-variable 'indent-line-function) 'ruby-indent-line)
-  (set (make-local-variable 'require-final-newline) t)
-  (set (make-variable-buffer-local 'comment-start) "# ")
-  (set (make-variable-buffer-local 'comment-end) "")
-  (set (make-variable-buffer-local 'comment-column) ruby-comment-column)
-  (set (make-variable-buffer-local 'comment-start-skip) "#+ *")
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-  (set (make-local-variable 'paragraph-start) (concat "$\\|" page-delimiter))
-  (set (make-local-variable 'paragraph-separate) paragraph-start)
-  (set (make-local-variable 'paragraph-ignore-fill-prefix) t))
-
-
-(defun ruby-mode-set-encoding ()
-  "Insert a magic comment header indicating the proper encoding if necessary."
-  (save-excursion
-    (widen)
-    (goto-char (point-min))
-    (when (re-search-forward "[^\0-\177]" nil t)
-      (goto-char (point-min))
-      (let ((coding-system
-	     (or coding-system-for-write
-		 buffer-file-coding-system)))
-	(if coding-system
-	    (setq coding-system
-		  (or (coding-system-get coding-system 'mime-charset)
-		      (coding-system-change-eol-conversion coding-system nil))))
-	(setq coding-system
-	      (if coding-system
-		  (symbol-name
-		   (or (and ruby-use-encoding-map
-			    (cdr (assq coding-system ruby-encoding-map)))
-		       coding-system))
-		"ascii-8bit"))
-	(if (looking-at "^#![^\n]*ruby") (beginning-of-line 2))
-	(cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
-	       (unless (string= (match-string 2) coding-system)
-		 (goto-char (match-beginning 2))
-		 (delete-region (point) (match-end 2))
-		 (and (looking-at "-\*-")
-		      (let ((n (skip-chars-backward " ")))
-			(cond ((= n 0) (insert "  ") (backward-char))
-			      ((= n -1) (insert " "))
-			      ((forward-char)))))
-		 (insert coding-system)))
-	      ((looking-at "\\s *#.*coding\\s *[:=]"))
-	      (t (insert "# -*- coding: " coding-system " -*-\n")))))))
-
-;;;###autoload
-(defun ruby-mode ()
-  "Major mode for editing ruby scripts.
-\\[ruby-indent-line] properly indents subexpressions of multi-line
-class, module, def, if, while, for, do, and case statements, taking
-nesting into account.
-
-The variable ruby-indent-level controls the amount of indentation.
-\\{ruby-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map ruby-mode-map)
-  (setq mode-name "Ruby")
-  (setq major-mode 'ruby-mode)
-
-  (ruby-mode-variables)
-
-  (set (make-local-variable 'imenu-create-index-function)
-       'ruby-imenu-create-index)
-  (set (make-local-variable 'add-log-current-defun-function)
-       'ruby-add-log-current-method)
-
-  (make-local-variable 'before-save-hook)
-  (add-hook 'before-save-hook 'ruby-mode-set-encoding)
-
-  (set (make-local-variable 'font-lock-defaults)
-       '((ruby-font-lock-keywords) nil nil))
-  (set (make-local-variable 'font-lock-keywords)
-       ruby-font-lock-keywords)
-  (set (make-local-variable 'font-lock-syntax-table)
-       ruby-font-lock-syntax-table)
-  (set (make-local-variable 'font-lock-syntactic-keywords)
-       ruby-font-lock-syntactic-keywords)
-
-  (run-hooks 'ruby-mode-hook))
-
-(defun ruby-current-indentation ()
-  "Return the indentation level of current line."
-  (save-excursion
-    (beginning-of-line)
-    (back-to-indentation)
-    (current-column)))
-
-(defun ruby-indent-line (&optional flag)
-  "Correctly indent the current line."
-  (interactive)
-  (ruby-indent-to (ruby-calculate-indent)))
-
-(defun ruby-indent-command ()
-  (interactive)
-  (ruby-indent-line t))
-
-(defun ruby-indent-to (x)
-  ;; TODO: doc
-  ;; This function makes no sense. Should it just use save-excursion instead?
-  (if x
-      (let (shift top beg)
-	(if (< x 0) (error "invalid nest"))
-	(setq shift (current-column))
-	(beginning-of-line)
-	(setq beg (point))
-	(back-to-indentation)
-	(setq top (current-column))
-	(skip-chars-backward " \t")
-	(if (>= shift top) (setq shift (- shift top))
-	  (setq shift 0))
-	(if (and (bolp)
-		 (= x top))
-	    (move-to-column (+ x shift))
-	  (move-to-column top)
-	  (delete-region beg (point))
-	  (beginning-of-line)
-	  (indent-to x)
-	  (move-to-column (+ x shift))))))
-
-(defun ruby-special-char-p (&optional pnt)
-  ;; TODO: doc
-  (setq pnt (or pnt (point)))
-  (let ((c (char-before pnt)) (b (and (< (point-min) pnt) (char-before (1- pnt)))))
-    (cond ((or (eq c ??) (eq c ?$)))
-	  ((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
-	  ((eq c ?\\) (eq b ??)))))
-
-(defun ruby-expr-beg (&optional option)
-  ;; TODO: doc
-  (save-excursion
-    (store-match-data nil)
-    (let ((space (skip-chars-backward " \t"))
-	  (start (point)))
-      (cond
-       ((bolp) t)
-       ((progn
-	  (forward-char -1)
-	  (and (looking-at "\\?")
-	       (or (eq (char-syntax (char-before (point))) ?w)
-		   (ruby-special-char-p))))
-	nil)
-       ((and (eq option 'heredoc) (< space 0)) t)
-       ((or (looking-at ruby-operator-re)
-	    (looking-at "[\\[({,;]")
-	    (and (looking-at "[!?]")
-		 (or (not (eq option 'modifier))
-		     (bolp)
-		     (save-excursion (forward-char -1) (looking-at "\\Sw$"))))
-	    (and (looking-at ruby-symbol-re)
-		 (skip-chars-backward ruby-symbol-chars)
-		 (cond
-		  ((or (looking-at (concat "\\<\\(" ruby-block-beg-re
-					   "|" ruby-block-op-re
-					   "|" ruby-block-mid-re "\\)\\>")))
-		   (goto-char (match-end 0))
-		   (not (looking-at "\\s_")))
-		  ((eq option 'expr-qstr)
-		   (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
-		  ((eq option 'expr-re)
-		   (looking-at "[a-zA-Z][a-zA-z0-9_]* +/[^ \t]"))
-		  (t nil)))))))))
-
-(defun ruby-forward-string (term &optional end no-error expand)
-  ;; TODO: doc
-  (let ((n 1) (c (string-to-char term))
-	(re (if expand
-		(concat "[^\\]\\(\\\\\\\\\\)*\\([" term "]\\|\\(#{\\)\\)")
-	      (concat "[^\\]\\(\\\\\\\\\\)*[" term "]"))))
-    (while (and (re-search-forward re end no-error)
-		(if (match-beginning 3)
-		    (ruby-forward-string "}{" end no-error nil)
-		  (> (setq n (if (eq (char-before (point)) c)
-				 (1- n) (1+ n))) 0)))
-      (forward-char -1))
-    (cond ((zerop n))
-	  (no-error nil)
-	  ((error "unterminated string")))))
-
-(defun ruby-deep-indent-paren-p (c)
-  ;; TODO: doc
-  (cond ((listp ruby-deep-indent-paren)
-	 (let ((deep (assoc c ruby-deep-indent-paren)))
-	   (cond (deep
-		  (or (cdr deep) ruby-deep-indent-paren-style))
-		 ((memq c ruby-deep-indent-paren)
-		  ruby-deep-indent-paren-style))))
-	((eq c ruby-deep-indent-paren) ruby-deep-indent-paren-style)
-	((eq c ?\( ) ruby-deep-arglist)))
-
-(defun ruby-parse-partial (&optional end in-string nest depth pcol indent)
-  ;; TODO: doc throughout function
-  (or depth (setq depth 0))
-  (or indent (setq indent 0))
-  (when (re-search-forward ruby-delimiter end 'move)
-    (let ((pnt (point)) w re expand)
-      (goto-char (match-beginning 0))
-      (cond
-       ((and (memq (char-before) '(?@ ?$)) (looking-at "\\sw"))
-	(goto-char pnt))
-       ((looking-at "[\"`]")		;skip string
-	(cond
-	 ((and (not (eobp))
-	       (ruby-forward-string (buffer-substring (point) (1+ (point))) end t t))
-	  nil)
-	 (t
-	  (setq in-string (point))
-	  (goto-char end))))
-       ((looking-at "'")
-	(cond
-	 ((and (not (eobp))
-	       (re-search-forward "[^\\]\\(\\\\\\\\\\)*'" end t))
-	  nil)
-	 (t
-	  (setq in-string (point))
-	  (goto-char end))))
-       ((looking-at "/=") 
-	(goto-char pnt))
-       ((looking-at "/")
-	(cond
-	 ((and (not (eobp)) (ruby-expr-beg 'expr-re))
-	  (if (ruby-forward-string "/" end t t)
-	      nil
-	    (setq in-string (point))
-	    (goto-char end)))
-	 (t
-	  (goto-char pnt))))
-       ((looking-at "%")
-	(cond
-	 ((and (not (eobp))
-	       (ruby-expr-beg 'expr-qstr)
-	       (not (looking-at "%="))
-	       (looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
-	  (goto-char (match-beginning 1))
-	  (setq expand (not (memq (char-before) '(?q ?w))))
-	  (setq w (match-string 1))
-	  (cond
-	   ((string= w "[") (setq re "]["))
-	   ((string= w "{") (setq re "}{"))
-	   ((string= w "(") (setq re ")("))
-	   ((string= w "<") (setq re "><"))
-	   ((and expand (string= w "\\"))
-	    (setq w (concat "\\" w))))
-	  (unless (cond (re (ruby-forward-string re end t expand))
-			(expand (ruby-forward-string w end t t))
-			(t (re-search-forward
-			    (if (string= w "\\")
-				"\\\\[^\\]*\\\\"
-			      (concat "[^\\]\\(\\\\\\\\\\)*" w))
-			    end t)))
-	    (setq in-string (point))
-	    (goto-char end)))
-	 (t
-	  (goto-char pnt))))
-       ((looking-at "\\?")		;skip ?char
-	(cond
-	 ((and (ruby-expr-beg)
-	       (looking-at "?\\(\\\\C-\\|\\\\M-\\)*\\\\?."))
-	  (goto-char (match-end 0)))
-	 (t
-	  (goto-char pnt))))
-       ((looking-at "\\$")		;skip $char
-	(goto-char pnt)
-	(forward-char 1))
-       ((looking-at "#")		;skip comment
-	(forward-line 1)
-	(goto-char (point)))
-       ((looking-at "[\\[{(]")
-	(let ((deep (ruby-deep-indent-paren-p (char-after))))
-	  (if (and deep (or (not (eq (char-after) ?\{)) (ruby-expr-beg)))
-	      (progn
-		(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
-		     (setq pnt (1- (match-end 0))))
-		(setq nest (cons (cons (char-after (point)) pnt) nest))
-		(setq pcol (cons (cons pnt depth) pcol))
-		(setq depth 0))
-	    (setq nest (cons (cons (char-after (point)) pnt) nest))
-	    (setq depth (1+ depth))))
-	(goto-char pnt))
-       ((looking-at "[])}]")
-	(if (ruby-deep-indent-paren-p (matching-paren (char-after)))
-	    (setq depth (cdr (car pcol)) pcol (cdr pcol))
-	  (setq depth (1- depth)))
-	(setq nest (cdr nest))
-	(goto-char pnt))
-       ((looking-at ruby-block-end-re)
-	(if (or (and (not (bolp))
-		     (progn
-		       (forward-char -1)
-		       (setq w (char-after (point)))
-		       (or (eq ?_ w)
-			   (eq ?. w))))
-		(progn
-		  (goto-char pnt)
-		  (setq w (char-after (point)))
-		  (or (eq ?_ w)
-		      (eq ?! w)
-		      (eq ?? w))))
-	    nil
-	  (setq nest (cdr nest))
-	  (setq depth (1- depth)))
-	(goto-char pnt))
-       ((looking-at "def\\s +[^(\n;]*")
-	(if (or (bolp)
-		(progn
-		  (forward-char -1)
-		  (not (eq ?_ (char-after (point))))))
-	    (progn
-	      (setq nest (cons (cons nil pnt) nest))
-	      (setq depth (1+ depth))))
-	(goto-char (match-end 0)))
-       ((looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
-	(and
-	 (save-match-data
-	   (or (not (looking-at "do\\>[^_]"))
-	       (save-excursion
-		 (back-to-indentation)
-		 (not (looking-at ruby-non-block-do-re)))))
-	 (or (bolp)
-	     (progn
-	       (forward-char -1)
-	       (setq w (char-after (point)))
-	       (not (or (eq ?_ w)
-			(eq ?. w)))))
-	 (goto-char pnt)
-	 (setq w (char-after (point)))
-	 (not (eq ?_ w))
-	 (not (eq ?! w))
-	 (not (eq ?? w))
-	 (skip-chars-forward " \t")
-	 (goto-char (match-beginning 0))
-	 (or (not (looking-at ruby-modifier-re))
-	     (ruby-expr-beg 'modifier))
-	 (goto-char pnt)
-	 (setq nest (cons (cons nil pnt) nest))
-	 (setq depth (1+ depth)))
-	(goto-char pnt))
-       ((looking-at ":\\(['\"]\\)")
-	(goto-char (match-beginning 1))
-	(ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end))
-       ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)")
-	(goto-char (match-end 0)))
-       ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
-	(goto-char (match-end 0)))
-       ((or (looking-at "\\.\\.\\.?")
-	    (looking-at "\\.[0-9]+")
-	    (looking-at "\\.[a-zA-Z_0-9]+")
-	    (looking-at "\\."))
-	(goto-char (match-end 0)))
-       ((looking-at "^=begin")
-	(if (re-search-forward "^=end" end t)
-	    (forward-line 1)
-	  (setq in-string (match-end 0))
-	  (goto-char end)))
-       ((looking-at "<<")
-	(cond
-	 ((and (ruby-expr-beg 'heredoc)
-	       (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
-	  (setq re (regexp-quote (or (match-string 4) (match-string 2))))
-	  (if (match-beginning 1) (setq re (concat "\\s *" re)))
-	  (let* ((id-end (goto-char (match-end 0)))
-		 (line-end-position (save-excursion (end-of-line) (point)))
-		 (state (list in-string nest depth pcol indent)))
-	    ;; parse the rest of the line
-	    (while (and (> line-end-position (point))
-			(setq state (apply 'ruby-parse-partial
-					   line-end-position state))))
-	    (setq in-string (car state)
-		  nest (nth 1 state)
-		  depth (nth 2 state)
-		  pcol (nth 3 state)
-		  indent (nth 4 state))
-	    ;; skip heredoc section
-	    (if (re-search-forward (concat "^" re "$") end 'move)
-		(forward-line 1)
-	      (setq in-string id-end)
-	      (goto-char end))))
-	 (t
-	  (goto-char pnt))))
-       ((looking-at "^__END__$")
-	(goto-char pnt))
-       ((looking-at ruby-here-doc-beg-re)
-	(if (re-search-forward (ruby-here-doc-end-match)
-			       indent-point t)
-	    (forward-line 1)
-	  (setq in-string (match-end 0))
-	  (goto-char indent-point)))
-       (t
-	(error (format "bad string %s"
-		       (buffer-substring (point) pnt)))))))
-  (list in-string nest depth pcol))
-
-(defun ruby-parse-region (start end)
-  ;; TODO: doc
-  (let (state)
-    (save-excursion
-      (if start
-	  (goto-char start)
-	(ruby-beginning-of-indent))
-      (save-restriction
-	(narrow-to-region (point) end)
-	(while (and (> end (point))
-		    (setq state (apply 'ruby-parse-partial end state))))))
-    (list (nth 0 state)			; in-string
-	  (car (nth 1 state))		; nest
-	  (nth 2 state)			; depth
-	  (car (car (nth 3 state))))))	; pcol
-					;(car (nth 5 state))		; indent
-	  
-
-(defun ruby-indent-size (pos nest)
-  ;; TODO: doc
-  (+ pos (* (or nest 1) ruby-indent-level)))
-
-(defun ruby-calculate-indent (&optional parse-start)
-  ;; TODO: doc throughout function
-  (save-excursion
-    (beginning-of-line)
-    (let ((indent-point (point))
-	  (case-fold-search nil)
-	  state bol eol begin op-end
-	  (paren (progn (skip-syntax-forward " ")
-			(and (char-after) (matching-paren (char-after)))))
-	  (indent 0))
-      (if parse-start
-	  (goto-char parse-start)
-	(ruby-beginning-of-indent)
-	(setq parse-start (point)))
-      (back-to-indentation)
-      (setq indent (current-column))
-      (setq state (ruby-parse-region parse-start indent-point))
-      (cond
-       ((nth 0 state)			; within string
-	(setq indent nil))		;  do nothing
-       ((car (nth 1 state))		; in paren
-	(goto-char (setq begin (cdr (nth 1 state))))
-	(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
-	  (if deep
-	      (cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
-		     (skip-syntax-backward " ")
-		     (setq indent (1- (current-column))))
-		    ((let ((s (ruby-parse-region (point) indent-point)))
-		       (and (nth 2 s) (> (nth 2 s) 0)
-			    (or (goto-char (cdr (nth 1 s))) t)))
-		     (forward-word -1)
-		     (setq indent (ruby-indent-size (current-column) (nth 2 state))))
-		    (t
-		     (setq indent (current-column))
-		     (cond ((eq deep 'space))
-			   (paren (setq indent (1- indent)))
-			   (t (setq indent (ruby-indent-size (1- indent) 1))))))
-	    (if (nth 3 state) (goto-char (nth 3 state))
-	      (goto-char parse-start) (back-to-indentation))
-	    (setq indent (ruby-indent-size (current-column) (nth 2 state))))
-	  (and (eq (car (nth 1 state)) paren)
-	       (ruby-deep-indent-paren-p (matching-paren paren))
-	       (search-backward (char-to-string paren))
-	       (setq indent (current-column)))))
-       ((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
-	(if (null (cdr (nth 1 state)))
-	    (error "invalid nest"))
-	(goto-char (cdr (nth 1 state)))
-	(forward-word -1)		; skip back a keyword
-	(setq begin (point))
-	(cond
-	 ((looking-at "do\\>[^_]")	; iter block is a special case
-	  (if (nth 3 state) (goto-char (nth 3 state))
-	    (goto-char parse-start) (back-to-indentation))
-	  (setq indent (ruby-indent-size (current-column) (nth 2 state))))
-	 (t
-	  (setq indent (+ (current-column) ruby-indent-level)))))
-       ((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
-	(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
-      (when indent
-	(goto-char indent-point)
-	(end-of-line)
-	(setq eol (point))
-	(beginning-of-line)
-	(cond
-	 ((and (not (ruby-deep-indent-paren-p paren))
-	       (re-search-forward ruby-negative eol t))
-	  (and (not (eq ?_ (char-after (match-end 0))))
-	       (setq indent (- indent ruby-indent-level))))
-	 ((and
-	   (save-excursion
-	     (beginning-of-line)
-	     (not (bobp)))
-	   (or (ruby-deep-indent-paren-p t)
-	       (null (car (nth 1 state)))))
-	  ;; goto beginning of non-empty no-comment line
-	  (let (end done)
-	    (while (not done)
-	      (skip-chars-backward " \t\n")
-	      (setq end (point))
-	      (beginning-of-line)
-	      (if (re-search-forward "^\\s *#" end t)
-		  (beginning-of-line)
-		(setq done t))))
-	  (setq bol (point))
-	  (end-of-line)
-	  ;; skip the comment at the end
-	  (skip-chars-backward " \t")
-	  (let (end (pos (point)))
-	    (beginning-of-line)
-	    (while (and (re-search-forward "#" pos t)
-			(setq end (1- (point)))
-			(or (ruby-special-char-p end)
-			    (and (setq state (ruby-parse-region parse-start end))
-				 (nth 0 state))))
-	      (setq end nil))
-	    (goto-char (or end pos))
-	    (skip-chars-backward " \t")
-	    (setq begin (if (and end (nth 0 state)) pos (cdr (nth 1 state))))
-	    (setq state (ruby-parse-region parse-start (point))))
-	  (or (bobp) (forward-char -1))
-	  (and
-	   (or (and (looking-at ruby-symbol-re)
-		    (skip-chars-backward ruby-symbol-chars)
-		    (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
-		    (not (eq (point) (nth 3 state)))
-		    (save-excursion
-		      (goto-char (match-end 0))
-		      (not (looking-at "[a-z_]"))))
-	       (and (looking-at ruby-operator-re)
-		    (not (ruby-special-char-p))
-		    ;; operator at the end of line
-		    (let ((c (char-after (point))))
-		      (and
-;;; 		       (or (null begin)
-;;; 			   (save-excursion
-;;; 			     (goto-char begin)
-;;; 			     (skip-chars-forward " \t")
-;;; 			     (not (or (eolp) (looking-at "#")
-;;; 				      (and (eq (car (nth 1 state)) ?{)
-;;; 					   (looking-at "|"))))))
-		       (or (not (eq ?/ c))
-			   (null (nth 0 (ruby-parse-region (or begin parse-start) (point)))))
-		       (or (not (eq ?| (char-after (point))))
-			   (save-excursion
-			     (or (eolp) (forward-char -1))
-			     (cond
-			      ((search-backward "|" nil t)
-			       (skip-chars-backward " \t\n")
-			       (and (not (eolp))
-				    (progn
-				      (forward-char -1)
-				      (not (looking-at "{")))
-				    (progn
-				      (forward-word -1)
-				      (not (looking-at "do\\>[^_]")))))
-			      (t t))))
-		       (not (eq ?, c))
-		       (setq op-end t)))))
-	   (setq indent
-		 (cond
-		  ((and
-		    (null op-end)
-		    (not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
-		    (eq (ruby-deep-indent-paren-p t) 'space)
-		    (not (bobp)))
-		   (widen)
-		   (goto-char (or begin parse-start))
-		   (skip-syntax-forward " ")
-		   (current-column))
-		  ((car (nth 1 state)) indent)
-		  (t
-		   (+ indent ruby-indent-level))))))))
-      (goto-char indent-point)
-      (beginning-of-line)
-      (skip-syntax-forward " ")
-      (if (looking-at "\\.[^.]")
-	  (+ indent ruby-indent-level)
-	indent))))
-
-(defun ruby-electric-brace (arg)
-  ;; TODO: doc
-  (interactive "P")
-  (insert-char last-command-char 1)
-  (ruby-indent-line t)
-  (delete-char -1)
-  (self-insert-command (prefix-numeric-value arg)))
-
-(eval-when-compile
-  (defmacro defun-region-command (func args &rest body)
-    ;; TODO: doc
-    (let ((intr (car body)))
-      (when (featurep 'xemacs)
-	(if (stringp intr) (setq intr (cadr body)))
-	(and (eq (car intr) 'interactive)
-	     (setq intr (cdr intr))
-	     (setcar intr (concat "_" (car intr)))))
-      (cons 'defun (cons func (cons args body))))))
-
-(defun-region-command ruby-beginning-of-defun (&optional arg)
-  "Move backward to next beginning-of-defun.
-With argument, do this that many times.
-Returns t unless search stops due to end of buffer."
-  (interactive "p")
-  (and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\b")
-			   nil 'move (or arg 1))
-       (progn (beginning-of-line) t)))
-
-(defun ruby-beginning-of-indent ()
-  ;; TODO: doc
-  (and (re-search-backward (concat "^\\(" ruby-indent-beg-re "\\)\\b")
-			   nil 'move)
-       (progn
-	 (beginning-of-line)
-	 t)))
-
-(defun-region-command ruby-end-of-defun (&optional arg)
-  "Move forward to next end of defun.
-An end of a defun is found by moving forward from the beginning of one."
-  (interactive "p")
-  (and (re-search-forward (concat "^\\(" ruby-block-end-re "\\)\\($\\|\\b[^_]\\)")
-			  nil 'move (or arg 1))
-       (progn (beginning-of-line) t))
-  (forward-line 1))
-
-(defun ruby-move-to-block (n)
-  ;; TODO: doc
-  (let (start pos done down)
-    (setq start (ruby-calculate-indent))
-    (setq down (looking-at (if (< n 0) ruby-block-end-re
-			     (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
-    (while (and (not done) (not (if (< n 0) (bobp) (eobp))))
-      (forward-line n)
-      (cond
-       ((looking-at "^\\s *$"))
-       ((looking-at "^\\s *#"))
-       ((and (> n 0) (looking-at "^=begin\\>"))
-	(re-search-forward "^=end\\>"))
-       ((and (< n 0) (looking-at "^=end\\>"))
-	(re-search-backward "^=begin\\>"))
-       (t
-	(setq pos (current-indentation))
-	(cond
-	 ((< start pos)
-	  (setq down t))
-	 ((and down (= pos start))
-	  (setq done t))
-	 ((> start pos)
-	  (setq done t)))))
-      (if done
-	  (save-excursion
-	    (back-to-indentation)
-	    (if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
-		(setq done nil))))))
-  (back-to-indentation))
-
-(defun-region-command ruby-beginning-of-block (&optional arg)
-  "Move backward to next beginning-of-block"
-  (interactive "p")
-  (ruby-move-to-block (- (or arg 1))))
-
-(defun-region-command ruby-end-of-block (&optional arg)
-  "Move forward to next beginning-of-block"
-  (interactive "p")
-  (ruby-move-to-block (or arg 1)))
-
-(defun-region-command ruby-forward-sexp (&optional cnt)
-  ;; TODO: doc
-  (interactive "p")
-  (if (and (numberp cnt) (< cnt 0))
-      (ruby-backward-sexp (- cnt))
-    (let ((i (or cnt 1)))
-      (condition-case nil
-	  (while (> i 0)
-	    (skip-syntax-forward " ")
-	    (cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ")
-		   (goto-char (match-end 0)))
-		  ((progn
-		     (skip-chars-forward ",.:;|&^~=!?\\+\\-\\*")
-		     (looking-at "\\s("))
-		   (goto-char (scan-sexps (point) 1)))
-		  ((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
-			(not (eq (char-before (point)) ?.))
-			(not (eq (char-before (point)) ?:)))
-		   (ruby-end-of-block)
-		   (forward-word 1))
-		  ((looking-at "\\(\\$\\|@@?\\)?\\sw")
-		   (while (progn
-			    (while (progn (forward-word 1) (looking-at "_")))
-			    (cond ((looking-at "::") (forward-char 2) t)
-				  ((> (skip-chars-forward ".") 0))
-				  ((looking-at "\\?\\|!\\(=[~=>]\\|[^~=]\\)")
-				   (forward-char 1) nil)))))
-		  ((let (state expr)
-		     (while
-			 (progn
-			   (setq expr (or expr (ruby-expr-beg)
-					  (looking-at "%\\sw?\\Sw\\|[\"'`/]")))
-			   (nth 1 (setq state (apply 'ruby-parse-partial nil state))))
-		       (setq expr t)
-		       (skip-chars-forward "<"))
-		     (not expr))))
-	    (setq i (1- i)))
-	((error) (forward-word 1)))
-      i)))
-
-(defun-region-command ruby-backward-sexp (&optional cnt)
-  ;; TODO: doc
-  (interactive "p")
-  (if (and (numberp cnt) (< cnt 0))
-      (ruby-forward-sexp (- cnt))
-    (let ((i (or cnt 1)))
-      (condition-case nil
-	  (while (> i 0)
-	    (skip-chars-backward " \t\n,.:;|&^~=!?\\+\\-\\*")
-	    (forward-char -1)
-	    (cond ((looking-at "\\s)")
-		   (goto-char (scan-sexps (1+ (point)) -1))
-		   (case (char-before)
-		     (?% (forward-char -1))
-		     ('(?q ?Q ?w ?W ?r ?x)
-		      (if (eq (char-before (1- (point))) ?%) (forward-char -2))))
-		   nil)
-		  ((looking-at "\\s\"\\|\\\\\\S_")
-		   (let ((c (char-to-string (char-before (match-end 0)))))
-		     (while (and (search-backward c)
-				 (oddp (skip-chars-backward "\\"))))) ;; TODO: remove call to CL function oddp
-		   nil)
-		  ((looking-at "\\s.\\|\\s\\")
-		   (if (ruby-special-char-p) (forward-char -1)))
-		  ((looking-at "\\s(") nil)
-		  (t
-		   (forward-char 1)
-		   (while (progn (forward-word -1)
-				 (case (char-before)
-				   (?_ t)
-				   (?. (forward-char -1) t)
-				   ((?$ ?@)
-				    (forward-char -1)
-				    (and (eq (char-before) (char-after)) (forward-char -1)))
-				   (?:
-				    (forward-char -1)
-				    (eq (char-before) :)))))
-		   (if (looking-at ruby-block-end-re)
-		       (ruby-beginning-of-block))
-		   nil))
-	    (setq i (1- i)))
-	((error)))
-      i)))
-
-(defun ruby-reindent-then-newline-and-indent ()
-  ;; TODO: doc
-  (interactive "*")
-  (newline)
-  (save-excursion
-    (end-of-line 0)
-    (indent-according-to-mode)
-    (delete-region (point) (progn (skip-chars-backward " \t") (point))))
-  (indent-according-to-mode))
-
-(defalias 'ruby-encomment-region 'comment-region)
-
-(defun ruby-decomment-region (beg end)
-  "Remove comment markers from the region."
-  (interactive "r")
-  (save-excursion
-    (goto-char beg)
-    (while (re-search-forward "^\\([ \t]*\\)#" end t)
-      (replace-match "\\1" nil nil)
-      (save-excursion
-	(ruby-indent-line)))))
-
-(defun ruby-insert-end ()
-  "Insert \"end\" at point and reindent current line."
-  (interactive)
-  (insert "end")
-  (ruby-indent-line t)
-  (end-of-line))
-
-(defun ruby-mark-defun ()
-  "Put mark at end of this Ruby function, point at beginning."
-  (interactive)
-  (push-mark (point))
-  (ruby-end-of-defun)
-  (push-mark (point) nil t)
-  (ruby-beginning-of-defun)
-  (re-search-backward "^\n" (- (point) 1) t))
-
-(defun ruby-indent-exp (&optional shutup-p)
-  "Indent each line in the balanced expression following point syntactically.
-If optional SHUTUP-P is non-nil, no errors are signalled if no
-balanced expression is found."
-  (interactive "*P")
-  (let ((here (point-marker)) start top column (nest t))
-    (set-marker-insertion-type here t)
-    (unwind-protect
-	(progn
-	  (beginning-of-line)
-	  (setq start (point) top (current-indentation))
-	  (while (and (not (eobp))
-		      (progn
-			(setq column (ruby-calculate-indent start))
-			(cond ((> column top)
-			       (setq nest t))
-			      ((and (= column top) nest)
-			       (setq nest nil) t))))
-	    (ruby-indent-to column)
-	    (beginning-of-line 2)))
-      (goto-char here)
-      (set-marker here nil))))
-
-(defun ruby-add-log-current-method ()
-  "Return current method string."
-  (condition-case nil
-      (save-excursion
-	(let (mname mlist (indent 0))
-	  ;; get current method (or class/module)
-	  (if (re-search-backward
-	       (concat "^[ \t]*\\(def\\|class\\|module\\)[ \t]+"
-		       "\\("
-		       ;; \\. and :: for class method
-		       "\\([A-Za-z_]" ruby-symbol-re "*\\|\\.\\|::" "\\)" 
-		       "+\\)")
-	       nil t)
-	      (progn
-		(setq mname (match-string 2))
-		(unless (string-equal "def" (match-string 1))
-		  (setq mlist (list mname) mname nil))
-		(goto-char (match-beginning 1))
-		(setq indent (current-column))
-		(beginning-of-line)))
-	  ;; nest class/module
-	  (while (and (> indent 0)
-		      (re-search-backward
-		       (concat
-			"^[ \t]*\\(class\\|module\\)[ \t]+"
-			"\\([A-Z]" ruby-symbol-re "*\\)")
-		       nil t))
-	    (goto-char (match-beginning 1))
-	    (if (< (current-column) indent)
-		(progn
-		  (setq mlist (cons (match-string 2) mlist))
-		  (setq indent (current-column))
-		  (beginning-of-line))))
-	  (when mname
-	    (let ((mn (split-string mname "\\.\\|::")))
-	      (if (cdr mn)
-		  (progn
-		    (cond
-		     ((string-equal "" (car mn))
-		      (setq mn (cdr mn) mlist nil))
-		     ((string-equal "self" (car mn))
-		      (setq mn (cdr mn)))
-		     ((let ((ml (nreverse mlist)))
-			(while ml
-			  (if (string-equal (car ml) (car mn))
-			      (setq mlist (nreverse (cdr ml)) ml nil))
-			  (or (setq ml (cdr ml)) (nreverse mlist))))))
-		    (if mlist
-			(setcdr (last mlist) mn)
-		      (setq mlist mn))
-		    (setq mn (last mn 2))
-		    (setq mname (concat "." (cadr mn)))
-		    (setcdr mn nil))
-		(setq mname (concat "#" mname)))))
-	  ;; generate string
-	  (if (consp mlist)
-	      (setq mlist (mapconcat (function identity) mlist "::")))
-	  (if mname
-	      (if mlist (concat mlist mname) mname)
-	    mlist)))))
-
-(defconst ruby-font-lock-syntactic-keywords
-  ;; TODO: doc
-  '(;; #{ }, #$hoge, #@foo are not comments
-    ("\\(#\\)[{$@]" 1 (1 . nil))
-    ;; the last $', $", $` in the respective string is not variable
-    ;; the last ?', ?", ?` in the respective string is not ascii code
-    ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
-     (2 (7 . nil))
-     (4 (7 . nil)))
-    ;; $' $" $` .... are variables
-    ;; ?' ?" ?` are ascii codes
-    ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
-    ;; regexps
-    ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
-     (4 (7 . ?/))
-     (6 (7 . ?/)))
-    ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
-    ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
-
-(if (featurep 'xemacs)
-    (put 'ruby-mode 'font-lock-defaults
-	 '((ruby-font-lock-keywords)
-	   nil nil nil
-	   beginning-of-line
-	   (font-lock-syntactic-keywords
-	    . ruby-font-lock-syntactic-keywords))))
-
-(defun ruby-font-lock-docs (limit)
-  ;; TODO: doc
-  (if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)
-      (let (beg)
-	(beginning-of-line)
-	(setq beg (point))
-	(forward-line 1)
-	(if (re-search-forward "^=end\\(\\s \\|$\\)" limit t)
-	    (progn
-	      (set-match-data (list beg (point)))
-	      t)))))
-
-(defun ruby-font-lock-maybe-docs (limit)
-  ;; TODO: doc
-  (let (beg)
-    (save-excursion
-      (if (and (re-search-backward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
-	       (string= (match-string 1) "begin"))
-	  (progn
-	    (beginning-of-line)
-	    (setq beg (point)))))
-    (if (and beg (and (re-search-forward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
-		      (string= (match-string 1) "end")))
-	(progn
-	  (set-match-data (list beg (point)))
-	  t)
-      nil)))
-
-(defvar ruby-font-lock-syntax-table
-  ;; TODO: doc
-  (let* ((tbl (copy-syntax-table ruby-mode-syntax-table)))
-    (modify-syntax-entry ?_ "w" tbl)
-    tbl))
-
-(defun ruby-font-lock-here-docs (limit)
-  ;; TODO: doc
-  (if (re-search-forward ruby-here-doc-beg-re limit t)
-      (let (beg)
-	(beginning-of-line)
-	(forward-line)
-	(setq beg (point))
-	(if (re-search-forward (ruby-here-doc-end-match) nil t)
-	    (progn
-	      (set-match-data (list beg (point)))
-	      t)))))
-
-(defun ruby-font-lock-maybe-here-docs (limit)
-  ;; TODO: doc
-  (let (beg)
-    (save-excursion
-      (if (re-search-backward ruby-here-doc-beg-re nil t)
-	  (progn
-	    (beginning-of-line)
-	    (forward-line)
-	    (setq beg (point)))))
-    (if (and beg
-	     (let ((end-match (ruby-here-doc-end-match)))
-	       (and (not (re-search-backward end-match beg t))
-		    (re-search-forward end-match nil t))))
-	(progn
-	  (set-match-data (list beg (point)))
-	  t)
-      nil)))
-
-(defvar ruby-font-lock-keywords
-  (list
-   ;; functions
-   '("^\\s *def\\s +\\([^( \t\n]+\\)"
-     1 font-lock-function-name-face)
-   ;; keywords
-   (cons (concat
-	  "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|\\("
-	  (mapconcat
-	   'identity
-	   '("alias_method"
-	     "alias"
-	     "and"
-	     "begin"
-	     "break"
-	     "case"
-	     "catch"
-	     "class"
-	     "def"
-	     "do"
-	     "elsif"
-	     "else"
-	     "fail"
-	     "ensure"
-	     "for"
-	     "end"
-	     "if"
-	     "in"
-	     "module_function"
-	     "module"
-	     "next"
-	     "not"
-	     "or"
-	     "raise"
-	     "redo"
-	     "rescue"
-	     "retry"
-	     "return"
-	     "then"
-	     "throw"
-	     "super"
-	     "unless"
-	     "undef"
-	     "until"
-	     "when"
-	     "while"
-	     "yield")
-	   "\\|")
-	  "\\)\\>\\)")
-	 2)
-   ;; variables
-   '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
-     2 font-lock-variable-name-face)
-   ;; variables
-   '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
-     1 font-lock-variable-name-face)
-   '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
-     0 font-lock-variable-name-face)
-   ;; embedded document
-   '(ruby-font-lock-docs
-     0 font-lock-comment-face t)
-   '(ruby-font-lock-maybe-docs
-     0 font-lock-comment-face t)
-   ;; "here" document
-   '(ruby-font-lock-here-docs
-     0 font-lock-string-face t)
-   '(ruby-font-lock-maybe-here-docs
-     0 font-lock-string-face t)
-   `(,ruby-here-doc-beg-re
-     0 font-lock-string-face t)
-   ;; general delimited string
-   '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
-     (2 font-lock-string-face))
-   ;; constants
-   '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
-     2 font-lock-type-face)
-   ;; symbols
-   '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
-     2 font-lock-reference-face)
-   ;; expression expansion
-   '("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)"
-     0 font-lock-variable-name-face t))
-  "*Additional expressions to highlight in ruby mode.")
-
-(provide 'ruby-mode)
-;;; ruby-mode.el ends here
diff --git a/elpa-to-submit/nxhtml/tests/in/question49234.sh b/elpa-to-submit/nxhtml/tests/in/question49234.sh
new file mode 100644
index 0000000000..3596046935
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/question49234.sh
@@ -0,0 +1,41 @@
+#!/bin/ksh
+. /bin/shared/.mkt.cfg
+
+
+STORE_TMP=/tmp/stores.txt
+cd /spool/xml
+
+rm -f $STORE_TMP
+
+bteq << EOF
+.SESSIONS 1
+.LOGON $UserId,$Password;
+
+.EXPORT DATA FILE "$STORE_TMP"
+select division_id,store_id,
+trim(store)||' '||trim(store_addr_line2_txt)||', '||
+trim(store_city)
+from stores
+where status_id='A'
+ and division_id in (517,1920,2445)
+order by division_id,store_city,store_id;
+
+.EXIT 0
+EOF
+
+perl <<EOF > $1
+print qq(<?xml version="1.0" encoding="utf-8"?>\n<stores>);
+open IN, '<$STORE_TMP';
+while (read IN,\$info, 12) {
+ my (\$div, \$s) = unpack 'x2 i i', \$info;  # read binary nums
+ \$_ = <IN>;   # Read store name
+ chop;     # Remove newline
+ s/(\w+)/\u\L\$1/g; # Title case
+ s/&/&amp;/g;  # Fix ampersands
+ s/"/&quot;/g; # Fix quotes
+ printf qq(<s d="%02d" i="%d" n="%s"/>\n),\$div,\$s,\$_;
+}
+print "</stores>";
+EOF
+
+rm $STORE_TMP
diff --git a/elpa-to-submit/nxhtml/tests/in/rr-090524-header.php b/elpa-to-submit/nxhtml/tests/in/rr-090524-header.php
new file mode 100644
index 0000000000..e966036399
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/rr-090524-header.php
@@ -0,0 +1,76 @@
+<?php require_once("utils.php");?>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+            "http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<?php
+   if ($_SESSION["CurrentLanguage"]==0){
+     $_SESSION["CurrentLanguage"]=$Default_Lang;
+   }
+?>
+
+  <head>
+    
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+
+    <style type="text/css">@import url(calendar-win2k-1.css);</style>
+    <script type="text/javascript" src="jscalendar-1.0/calendar.js"></script>
+    <script type="text/javascript" src="jscalendar-1.0/lang/calendar-en.js"></script>
+    <script type="text/javascript" src="jscalendar-1.0/calendar-setup.js"></script>
+    
+    <link type="text/css" href="stylesheet.css" rel="stylesheet" title="Style Sheet" >
+    <style type="text/css"><?php echoMessage("admin.css.source");?> </style>
+
+    <link type="text/css" href="custom.css" rel="stylesheet" title="Style Sheet">
+    <link type="text/css" href="local.css" rel="stylesheet" title="Style Sheet">
+
+    <link type="text/css" href="print.css" rel="stylesheet" media="print">
+    
+    <meta name="keywords" content='<?php echoMessage("header.keywords");?>'>
+    <meta name="description" content='<?php echoMessage("header.description");?>'>
+
+    <title><?php echoMessage("website.title")?></title>
+    
+    
+  </head>
+  
+  <body  class="body">
+    <div class="wc">
+      <table class="language">
+<tr>
+  <td>
+    <?php generateLanguageForm(true);?>
+  </td>
+  <td><a  href="cyclelanguage"><img class="languageflag" src="flags/<?php echo getCurrentLanguage();?>" alt="<?php echoMessage("language.selectnext");?>" title="<?php echoMessage("language.selectnext");?>"></a></td>
+</tr>
+      </table>
+      
+      <?php include("navigation.php");?> 
+  <div class="ical">
+    <?php  echoMessage("index.ical");?>
+  </div>
+
+    <div class="wb">
+
+      <?php 
+
+	if(adminMode()){
+	  echo '<div class="admincontrolcontainer clearfix">';
+	  createNavigationLinks("navlinks",1);
+	  echo '<div class="clear"></div>';
+	  echo '</div>';
+	}
+	
+	if(isDemo()){
+	  echo '<div class="demomode">';
+	  echoMessage("admin.demo");
+	  echo "</div>";
+	}
+
+      ?>
+      
+      <?php include("previews.php");?>
+      
+      <div class="centercontainer clearfix">
diff --git a/elpa-to-submit/nxhtml/tests/in/rr-address-090304.php b/elpa-to-submit/nxhtml/tests/in/rr-address-090304.php
new file mode 100644
index 0000000000..34cbe259d5
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/rr-address-090304.php
@@ -0,0 +1,4 @@
+<div class="addresscontainer" title="Hot Love Fan Mail"> 
+
+<a target="_self" href="/Site/Content/Exhibitors/exhibitors-welcome.aspx"><img height="100" border="0" width="170" vspace="7" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image21','','/site/images/intro_button_exhib_over.jpg',1)" id="Image21" name="Image21" alt="Exhibitors button" src="http://www.farnborough.com/site/images/intro_button_exhib_static.jpg"/></a>  
+</div>
\ No newline at end of file
diff --git a/elpa-to-submit/nxhtml/tests/in/rr-address-nxhtml.err b/elpa-to-submit/nxhtml/tests/in/rr-address-nxhtml.err
new file mode 100644
index 0000000000..f06b0a05ec
Binary files /dev/null and b/elpa-to-submit/nxhtml/tests/in/rr-address-nxhtml.err differ
diff --git a/elpa-to-submit/nxhtml/tests/in/temp3.html b/elpa-to-submit/nxhtml/tests/in/temp3.html
new file mode 100644
index 0000000000..276b754db8
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/temp3.html
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+          "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>News and Notes about nXhtml</title>
+    <link href="wd/grapes/nxhtml-grapes.css" rel="StyleSheet" type="text/css" />
+<style type="text/css">
+#nxhtml-home a {
+    /* Image */
+    display: block;
+    background: transparent url("img/getitbuttons.png") 0 0 no-repeat;
+    overflow: hidden;
+    width: 200px;
+    xheight: 35px;
+    /* Text placement and size, etc */
+    text-align: center;
+    padding-top: 11px;
+    font-size: 12px;
+    padding-bottom: 9px;
+    text-decoration: none;
+    white-space: nowrap;
+    margin: 0;
+    border: none;
+}
+#nxhtml-home a:hover {
+    background-position: 0 -35px;
+    color: yellow;
+}
+
+</style>
+  </head>
+  <body>
+    <div id="container">
+
+      <div id="rgtcol">
+        <p id="nxhtml-home"><a href='nxhtml.html'>To nXhtml main page</a></p>
+
+        <h1>News and Notes about nXhtml</h1>
+
+        <dl>
+
+          <dt id="hadron-bugs" style="margin-top:1em;">Thanks for testing!</dt>
+          <dd>
diff --git a/elpa-to-submit/nxhtml/tests/in/wiki-080708-ind-problem.rhtml b/elpa-to-submit/nxhtml/tests/in/wiki-080708-ind-problem.rhtml
index a75331a451..d51d116674 100644
--- a/elpa-to-submit/nxhtml/tests/in/wiki-080708-ind-problem.rhtml
+++ b/elpa-to-submit/nxhtml/tests/in/wiki-080708-ind-problem.rhtml
@@ -1,5 +1,5 @@
 <%= t("Hola") %>
-  <%= link_to name, target %>
+  <%= ink_to name, target %>
     <% if quiero do %>
       <%= do_something_nifty(with_me) %>
         <% end %>
diff --git a/elpa-to-submit/nxhtml/tests/in/wiki-090804-js.html b/elpa-to-submit/nxhtml/tests/in/wiki-090804-js.html
new file mode 100644
index 0000000000..2762ed954d
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/wiki-090804-js.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title></title>
+  </head>
+  <body>
+
+    <script type="text/javascript">
+      // <![CDATA[
+      Some code to see if we can find the problem
+      // ]]>
+</script>
+
+<?php
+  $htmlstuff = <<<EOTHTML
+
+     <p>some stuff</p>
+     <p>some other stuff</p>
+
+    <script type="text/javascript">
+      // <![CDATA[
+      Some code to see if we can find the problem
+      // ]]>
+</script>
+
+EOTHTML;
+
+?>
+  </body>
+</html>
diff --git a/elpa-to-submit/nxhtml/tests/in/zn-090529-doxysample.php b/elpa-to-submit/nxhtml/tests/in/zn-090529-doxysample.php
new file mode 100644
index 0000000000..3eddd90db3
--- /dev/null
+++ b/elpa-to-submit/nxhtml/tests/in/zn-090529-doxysample.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @file   doxysample.php
+ * @author Zoltán Nagy <abesto0@gmail.com>
+ * @date   Fri May 29 15:28:06 2009
+ *
+ * @brief  Example file commented with Doxygen (via doxymacs)
+ *
+ * Longer description of what this file is
+ * Possibly multiline
+ */
+
+
+/**
+ * Echos the parameter
+ *
+ * @param text Text to echo
+ *
+ * @return EOL message
+ */
+function say($text)
+{
+  echo $text;
+  return "I spoketh.";
+}
+?>
+
+<div>
+This is HTML, so the following has no special meaning:
+/**
+ * Fake comment
+ *
+ * @param whatever Foo
+ *
+ * @return bar
+ */
+</div>
diff --git a/elpa-to-submit/nxhtml/util/mumamo-test.el b/elpa-to-submit/nxhtml/tests/mumamo-test.el
similarity index 68%
rename from elpa-to-submit/nxhtml/util/mumamo-test.el
rename to elpa-to-submit/nxhtml/tests/mumamo-test.el
index 60337341a6..198e242d7e 100644
--- a/elpa-to-submit/nxhtml/util/mumamo-test.el
+++ b/elpa-to-submit/nxhtml/tests/mumamo-test.el
@@ -25,6 +25,10 @@
 ;;
 ;;; Code:
 
+;;(eval-when-compile (require 'mumamo))
+(require 'mumamo)
+(require 'whelp)
+
 ;;;;;;; TESTS, run in fundamental-mode buffer
 
 (defvar mumamo-test-mode-keymap
@@ -35,6 +39,9 @@
     (define-key map [f3] 'mumamo-test-create-chunk-at-point)
     map))
 
+(defvar mumamo-test-current-chunk-family nil)
+(make-variable-buffer-local 'mumamo-test-current-chunk-family)
+
 (define-minor-mode mumamo-test-mode
   "For testing creating mumamo-mode chunks.
 When this mode is on the following keys are defined:
@@ -56,29 +63,27 @@ When this mode is on the following keys are defined:
   )
 
 (defun mumamo-test-tell-bindings ()
-  (let ((s "mumamo-test-mode is on, use F3/shift-F3 for simple testing"))
-    (put-text-property 0 (length s)
-                       'face 'font-lock-warning-face
-                       s)
-    (message "%s" s)))
+  (save-match-data ;; runs in timer
+    (let ((s "mumamo-test-mode is on, use F3/shift-F3 for simple testing"))
+      (put-text-property 0 (length s)
+                         'face 'font-lock-warning-face
+                         s)
+      (message "%s" s))))
 
 ;;(mumamo-test-mode 1)
 
 
-(defun mumamo-test-fontify-buffer ()
-  (interactive)
-  (unless mumamo-current-chunk-family
-    (mumamo-select-chunk-family))
-  (when mumamo-mode
-    (mumamo-mode 0))
-  (save-excursion
-    (mumamo-remove-all-chunk-overlays)
-    (mumamo-save-buffer-state nil
-      (put-text-property (point-min) (point-max) 'face nil))
-    (mumamo-fontify-buffer)))
-
-(defvar mumamo-test-current-chunk-family nil)
-(make-variable-buffer-local 'mumamo-test-current-chunk-family)
+;; (defun mumamo-test-fontify-buffer ()
+;;   (interactive)
+;;   (unless mumamo-current-chunk-family
+;;     (mumamo-select-chunk-family))
+;;   ;;(when mumamo-mode (mumamo-mode 0))
+;;   (when mumamo-multi-major-mode (mumamo-turn-off-actions))
+;;   (save-excursion
+;;     (mumamo-remove-all-chunk-overlays)
+;;     (mumamo-save-buffer-state nil
+;;       (put-text-property (point-min) (point-max) 'face nil))
+;;     (mumamo-fontify-buffer)))
 
 (defun mumamo-test-create-chunk-at-point ()
   (interactive)
@@ -94,15 +99,18 @@ When this mode is on the following keys are defined:
            chunk
            chunk2)
       (mumamo-save-buffer-state nil
-        (setq chunk (mumamo-create-chunk-at here)))
-      (setq chunk2 (mumamo-get-chunk-at here))
+        ;;(setq chunk (mumamo-create-chunk-at here)))
+        (setq chunk (mumamo-find-chunks here "test1")))
+      ;;(setq chunk2 (mumamo-get-chunk-at here))
+      (setq chunk2 (mumamo-find-chunks here "set chunk2"))
       ;;(message "mumamo-test-create-chunk-at-point.chunk 1=%s" chunk)
       ;;(lwarn 'test-create-chunk-at :warning "chunk=%s, chunk2=%s" chunk chunk2)
       ;;(when (overlay-buffer chunk)
         (assert (eq chunk chunk2))
         ;;)
       ;;(message "mumamo-test-create-chunk-at-point.chunk 2=%s" chunk)
-      (syntax-ppss-flush-cache (1- (overlay-start chunk)))
+      ;;(syntax-ppss-flush-cache (1- (overlay-start chunk)))
+      (syntax-ppss-flush-cache (overlay-start chunk))
       (let ((start (overlay-start chunk))
             (end   (overlay-end chunk)))
         ;;(setq syntax-ppss-last (cons 319 (parse-partial-sexp 1 1)))
@@ -114,7 +122,9 @@ When this mode is on the following keys are defined:
       ;;(message "mumamo-test-create-chunk-at-point.chunk 4=%s" chunk)
       chunk
       ;;(message "test 2.debugger=%s" debugger)
-      (mumamo-get-chunk-at here))))
+      ;;(mumamo-get-chunk-at here)
+      (mumamo-find-chunks here "return value")
+      )))
 
 (defun mumamo-test-create-chunks-at-all-points ()
   (interactive)
@@ -122,7 +132,8 @@ When this mode is on the following keys are defined:
   (let (last-ovl
         this-ovl)
     (while (< (point) (point-max))
-      (setq this-ovl (mumamo-test-create-chunk-at-point))
+      ;;(setq this-ovl (mumamo-test-create-chunk-at-point))
+      (setq this-ovl (mumamo-find-chunks (point) "test loop"))
       ;;(message "this-ovl=%s" this-ovl)
       (sit-for 0.01)
       ;;(sit-for 0)
@@ -146,45 +157,56 @@ When this mode is on the following keys are defined:
     (mumamo-fontify-region (point-min) (point-max) t)))
 
 ;; Fix-me: can't byte compile:
-(defun mumamo-test-easy-make ()
-  (interactive)
-  (let ((start-str "--Start Submode:")
-        (end-str "--End Submode--")
-        (start-reg nil))
-    (setq start-reg (rx
-                     (eval start-str)
-                     (0+ space)
-                     (submatch
-                      (0+ (any "a-z-")))
-                     (0+ space)
-                     "--"
-                     ))
-    (mumamo-easy-make-chunk-fun testchunk
-      start-str
-      start-reg
-      end-str))
-  (setq mumamo-current-chunk-family
-        (list "testing"
-              'text-mode
-              (list
-               'testchunk
-               ))))
+;; (defun mumamo-test-easy-make ()
+;;   (interactive)
+;;   (let ((start-str "--Start Submode:")
+;;         (end-str "--End Submode--")
+;;         (start-reg nil))
+;;     (setq start-reg
+;;           ;; (rx
+;;           ;;  (eval start-str)
+;;           ;;  (0+ space)
+;;           ;;  (submatch
+;;           ;;   (0+ (any "a-z-")))
+;;           ;;  (0+ space)
+;;           ;;  "--"
+;;           ;;  )
+;;           (rx-to-string
+;;            `(and
+;;              ,start-str
+;;              (0+ space)
+;;              (submatch
+;;               (0+ (any "a-z-")))
+;;              (0+ space)
+;;              "--"
+;;              ))
+;;           )
+;;     (mumamo-easy-make-chunk-fun testchunk
+;;       start-str
+;;       start-reg
+;;       end-str))
+;;   (setq mumamo-current-chunk-family
+;;         (list "testing"
+;;               'text-mode
+;;               (list
+;;                'testchunk
+;;                ))))
 
-(defun mumamo-test-emb-perl ()
-  (interactive)
-  (let ((start-str "[-")
-        (end-str "-]")
-        (start-reg nil))
-    (mumamo-easy-make-chunk-fun testchunk-ep
-      start-str
-      start-reg
-      end-str))
-  (setq mumamo-current-chunk-family
-        (list "emb perl test"
-              'perl-mode
-              (list
-               'testchunk-ep
-               ))))
+;; (defun mumamo-test-emb-perl ()
+;;   (interactive)
+;;   (let ((start-str "[-")
+;;         (end-str "-]")
+;;         (start-reg nil))
+;;     (mumamo-easy-make-chunk-fun testchunk-ep
+;;       start-str
+;;       start-reg
+;;       end-str))
+;;   (setq mumamo-current-chunk-family
+;;         (list "emb perl test"
+;;               'perl-mode
+;;               (list
+;;                'testchunk-ep
+;;                ))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -227,17 +249,17 @@ When this mode is on the following keys are defined:
 ;;                (dbg-ret (mapconcat 'identity (nthcdr 6 debugger-lines) "\n")))
 ;;           (concat errmsg "\n" dbg-ret))))))
 
-(defun mumamo-test3-debug()
-  (interactive)
-  (message "%s"
-           (mumamo-get-backtrace
-            (mumamo-test-major-mode-init 'php-mode))))
+;; (defun mumamo-test3-debug()
+;;   (interactive)
+;;   (message "%s"
+;;            (mumamo-get-backtrace
+;;             (mumamo-test-major-mode-init 'php-mode))))
 
-(defun mumamo-test2-debug()
-  (interactive)
-  (mumamo-condition-case var
-                         (mumamo-test-major-mode-init 'php-mode)
-                         handlers))
+;; (defun mumamo-test2-debug()
+;;   (interactive)
+;;   (mumamo-condition-case var
+;;                          (mumamo-test-major-mode-init 'php-mode)
+;;                          handlers))
 
 (defun mumamo-test-debug()
   (interactive)
@@ -274,7 +296,7 @@ Send the traceback you get, if any, together with the message in
 the message buffer when reporting the error."
   (interactive "CMajor mode: ")
   (with-temp-buffer
-    (setq mumamo-explicitly-turned-on-off t)
+    ;;(setq mumamo-explicitly-turned-on-off t)
     (setq debug-on-error t)
     (funcall major)))
 
diff --git a/elpa-to-submit/nxhtml/tests/nxhtmltest-Q.el b/elpa-to-submit/nxhtml/tests/nxhtmltest-Q.el
index 7b51f8e91e..665281f3eb 100644
--- a/elpa-to-submit/nxhtml/tests/nxhtmltest-Q.el
+++ b/elpa-to-submit/nxhtml/tests/nxhtmltest-Q.el
@@ -44,9 +44,17 @@
 ;;
 ;;; Code:
 
+(require 'cl)
+(require 'ourcomments-util)
 
-(defvar nxhtmltest-bin-Q
-  (file-name-directory (if load-file-name load-file-name buffer-file-name)))
+(eval-and-compile
+  (defvar nxhtmltest-bin-Q
+    (file-name-directory (or load-file-name
+                             (when 'bytecomp-filename bytecomp-filename)
+                             buffer-file-name)))
+
+  (add-to-list 'load-path nxhtmltest-bin-Q)
+  (require 'nxhtmltest-helpers))
 
 ;;;###autoload
 (defun nxhtmltest-run-Q ()
diff --git a/elpa-to-submit/nxhtml/tests/nxhtmltest-helpers.el b/elpa-to-submit/nxhtml/tests/nxhtmltest-helpers.el
index 6122b168fc..7916359535 100644
--- a/elpa-to-submit/nxhtml/tests/nxhtmltest-helpers.el
+++ b/elpa-to-submit/nxhtml/tests/nxhtmltest-helpers.el
@@ -44,17 +44,15 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'ert2)
 
 (defun nxhtmltest-mumamo-error-messages ()
-  (ert-get-messages "^MuMaMo error"))
+  (ert-get-messages "^MU:MuMaMo error"))
 
 (defun nxhtmltest-should-no-mumamo-errors ()
   (ert-should (not (nxhtmltest-mumamo-error-messages))))
 
-(defun nxhtmltest-mumamo-error-messages ()
-  (ert-get-messages "^MuMaMo error"))
-
 (defun nxhtmltest-should-no-nxml-errors ()
   (ert-should (not (ert-get-messages "Internal nXML mode error"))))
 
@@ -103,10 +101,14 @@
 
 (defun nxhtmltest-fontify-as-usual (seconds prompt-mark)
   (font-lock-mode 1)
-  (font-lock-wait (nxhtmltest-be-really-idle seconds prompt-mark)))
+  ;; This does not work now since I deleted the function below:
+  (error "font-lock-wait not defined")
+  ;;(font-lock-wait (nxhtmltest-be-really-idle seconds prompt-mark))
+  )
 
 (defun nxhtmltest-fontify-w-timers-handlers ()
-    (dolist (timer (copy-list timer-idle-list))
+    ;;(dolist (timer (copy-list timer-idle-list))
+    (dolist (timer (copy-sequence timer-idle-list))
       (timer-event-handler timer))
     (redisplay t))
 
diff --git a/elpa-to-submit/nxhtml/tests/nxhtmltest-suites.el b/elpa-to-submit/nxhtml/tests/nxhtmltest-suites.el
index af73f54f9d..9a9db12169 100644
--- a/elpa-to-submit/nxhtml/tests/nxhtmltest-suites.el
+++ b/elpa-to-submit/nxhtml/tests/nxhtmltest-suites.el
@@ -42,7 +42,14 @@
 ;;
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+;;(eval-when-compile (require 'cl))
+(require 'cl)
+(require 'mumamo)
+(require 'nxhtml)
+(require 'nxhtml-mumamo)
+(when (fboundp 'nxml-mode)
+  (require 'rng-valid)
+  (require 'rngalt))
 
 (setq debug-on-error t)
 
@@ -67,11 +74,11 @@
   (when (file-directory-p distr-in)
     (setq nxhtmltest-files-root distr-in)))
 
-(setq nxhtmltest-update-method
-      ;;'font-lock-wait
-      'font-lock-run-timers
-      ;;'font-lock-fontify-buffer
-      )
+;; (setq nxhtmltest-update-method
+;;       ;;'font-lock-wait
+;;       'font-lock-run-timers
+;;       ;;'font-lock-fontify-buffer
+;;       )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Define tests using ert.el
@@ -80,7 +87,7 @@
   "Test for bug 300946 in Launchpad.
 See URL `https://bugs.launchpad.net/nxhtml/+bug/300946'.  This is
 a test for the file attached by Chris on 2008-12-02."
-  (ert-with-temp-buffer-include-file "bug-290364.php"
+  (ert-with-temp-buffer-include-file "bug-300946-index.html"
     (add-hook 'ert-simulate-command-post-hook
               'nxhtmltest-should-no-mumamo-errors
               nil t)
@@ -89,8 +96,8 @@ a test for the file attached by Chris on 2008-12-02."
     ))
 
 (ert-deftest nxhtml-ert-indent-bug290364 ()
-  "Test for bug 271497 in Launchpad.
-See URL `https://bugs.launchpad.net/nxhtml/+bug/271497'.
+  "Test for bug 290364 in Launchpad.
+See URL `https://bugs.launchpad.net/nxhtml/+bug/290364'.
 
 Note: If this test fails Emacs loops.  Therefore the whole test
 is included in a when clause so you can avoid it easily."
@@ -106,6 +113,7 @@ is included in a when clause so you can avoid it easily."
 
 (ert-deftest nxhtml-ert-indent-bug271497 ()
   "Test for bug 271497 in Launchpad.
+This is a bug in Emacs 22. It should work in Emacs 23 though.
 See URL `https://bugs.launchpad.net/nxhtml/+bug/271497'."
   (ert-with-temp-buffer-include-file "bug271497.txt"
     (add-hook 'ert-simulate-command-post-hook
@@ -113,17 +121,34 @@ See URL `https://bugs.launchpad.net/nxhtml/+bug/271497'."
               nil t)
     (load-file (ert-get-test-file-name "bug271497.el"))
     (ert-simulate-command '(bug271497-mumamo) t)
-    (font-lock-mode 1)
+    ;;(font-lock-mode 1)
+    (nxhtmltest-fontify-default-way 2 "trans")
     (ert-simulate-command '(goto-char 42) t)
+    (message "after goto-char 42")
     (let ((ac42 after-change-functions)
           ac88)
       (ert-simulate-command '(goto-char 88) t)
+      (message "after goto-char 88")
       (setq ac88 after-change-functions)
       (ert-should (not (equal ac88 ac42))))))
 
 (ert-deftest nxhtml-ert-indent-question43320 ()
   "Test for question 43320 in Launchpad.
-See URL `https://answers.launchpad.net/nxhtml/+question/43320'."
+See URL `https://answers.launchpad.net/nxhtml/+question/43320'.
+
+Note: This fails in Emacs 22, but should work in Emacs 23."
+;; I did see some problem here:
+
+;; - nXhtml 081222 + unpatched Emacs 081219 => ok
+;; - nXhtml 081222 + unpatched Emacs 081124 => ok
+;; - nXhtml 081222 + patched Emacs 081219 => ok
+
+;; - nXhtml 081222 + patched Emacs 081124 => ok, but it fails if I
+;;   use `nxhtmltest-run-Q'! I e, it fails if the autostart.el from
+;;   the nxhtml dir in 081222 is used - but not if the copy in
+;;   c:/EmacsW32 is used??? Which turned out to be if the old
+;;   php-mode was used ...
+
   (ert-with-temp-buffer-include-file "question43320.html"
     (add-hook 'ert-simulate-command-post-hook
               'nxhtmltest-should-no-mumamo-errors
@@ -145,7 +170,9 @@ See URL `https://answers.launchpad.net/nxhtml/+question/43320'."
     (goto-line 22)  (ert-should (= 6 (current-indentation)))
     (goto-line 25)  (ert-should (= 4 (current-indentation)))
     (goto-line 8) (indent-line-to 0)
+    ;;(message "before indent-for-tab-command")
     (ert-simulate-command '(indent-for-tab-command) t)
+    ;;(message "after indent-for-tab-command")
     (ert-should (= 8 (current-indentation)))
     ;;
     (set (make-local-variable 'mumamo-submode-indent-offset-0) 0)
@@ -180,9 +207,9 @@ See URL `https://answers.launchpad.net/nxhtml/+question/43320'."
 
 (ert-deftest nxhtml-ert-xhtml-1.0-transitional ()
   "Test XHTML 1.0 Transitional with `nxhtml-mumamo-mode'.
-This test should fail because there is currently no rng schema
-for transitional. The schema for strict is used instead and the
-file is invalid then."
+NOTICE: This test SHOULD FAIL because there is currently no rng
+schema for transitional. The schema for strict is used instead
+and the file is invalid then."
   (ert-with-temp-buffer-include-file "lg-080813-label.html"
     (nxhtml-mumamo-mode)
     (nxhtmltest-fontify-default-way 2 "trans")
@@ -193,11 +220,12 @@ file is invalid then."
 ;;;     (ert-should
 ;;;      (not (eq (get-char-property 398 'category)
 ;;;               'rng-error)))
-    (ert-should
-     (= 0 rng-error-count))
     (ert-should
      (eq (get-text-property 398 'face)
-         'font-lock-function-name-face))))
+         'font-lock-function-name-face))
+    (ert-should-not
+     (= 0 rng-error-count))
+    ))
 
 (ert-deftest nxhtml-ert-genshi-valid-in-genshi ()
   (ert-with-temp-buffer-include-file "genshi-auto-mode.html"
@@ -208,7 +236,8 @@ file is invalid then."
     (ert-should (eq font-lock-mode t))
     (ert-should (eq major-mode 'nxhtml-genshi-mode))
     (ert-should
-     (eq mumamo-multi-major-mode 'genshi-nxhtml-mumamo-mode))
+     (memq mumamo-multi-major-mode '(genshi-nxhtml-mumamo-mode
+                                     genshi-html-mumamo-mode)))
     (nxhtmltest-fontify-default-way 2 "sheit")
     (rng-validate-mode 1)
     (rngalt-validate)
@@ -244,7 +273,8 @@ file is invalid then."
     (nxhtmltest-should-no-mumamo-errors)
     (ert-should
      (with-current-buffer buf1
-       (eq mumamo-multi-major-mode 'genshi-nxhtml-mumamo-mode)))
+       (memq mumamo-multi-major-mode '(genshi-nxhtml-mumamo-mode
+                                       genshi-html-mumamo-mode))))
     (kill-buffer buf1)))
 
 (ert-deftest nxhtml-ert-genshi-auto-mode ()
@@ -260,7 +290,8 @@ file is invalid then."
     (nxhtmltest-should-no-mumamo-errors)
     (ert-should
      (with-current-buffer buf1
-       (eq mumamo-multi-major-mode 'genshi-nxhtml-mumamo-mode)))
+       (memq mumamo-multi-major-mode '(genshi-nxhtml-mumamo-mode
+                                       genshi-html-mumamo-mode))))
     (kill-buffer buf1)))
 
 (ert-deftest nxhtml-ert-opened-modified ()
@@ -297,6 +328,7 @@ file is invalid then."
     (nxhtmltest-fontify-default-way 2 "hili")
     (goto-char 44)
     (nxhtmltest-should-no-mumamo-errors)
+    (message "face at 44=%s" (get-text-property 44 'face))
     (ert-should
      (eq (get-text-property 44 'face)
          'font-lock-function-name-face))))
@@ -319,6 +351,12 @@ file is invalid then."
       (ert-should (= (current-indentation) 0)))))
 
 (ert-deftest nxhtml-ert-indent-wiki-080708-ind-problem-a ()
+  "From a report on EmacsWiki.
+NOTICE: This SHOULD FAIL. There is currently no support for the
+kind of indentation needed here.
+
+Notice 2: For some reason I sometimes get the error overlayp, nil
+here."
   (ert-with-temp-buffer-include-file "wiki-080708-ind-problem.rhtml"
     (require 'ruby-mode nil t)
     (if (not (featurep 'ruby-mode))
@@ -333,7 +371,7 @@ file is invalid then."
       (goto-line 3)
       ;; Test
       (nxhtmltest-should-no-mumamo-errors)
-      (ert-should (= (current-indentation) 2)))))
+      (ert-should-not (= (current-indentation) 2)))))
 
 (ert-deftest nxhtml-ert-sheit-2007-12-26 ()
   (ert-with-temp-buffer-include-file "sheit-2007-12-26.php"
diff --git a/elpa-to-submit/nxhtml/util/appmenu-fold.el b/elpa-to-submit/nxhtml/util/appmenu-fold.el
index ade4a6ae7f..8ca3811a1b 100644
--- a/elpa-to-submit/nxhtml/util/appmenu-fold.el
+++ b/elpa-to-submit/nxhtml/util/appmenu-fold.el
@@ -49,6 +49,7 @@
 ;;; Code:
 
 (require 'fold-dwim nil t)
+(eval-when-compile (require 'appmenu))
 
 (when (featurep 'fold-dwim)
 
diff --git a/elpa-to-submit/nxhtml/util/appmenu.el b/elpa-to-submit/nxhtml/util/appmenu.el
index 6b528ebf83..d3b019a89b 100644
--- a/elpa-to-submit/nxhtml/util/appmenu.el
+++ b/elpa-to-submit/nxhtml/util/appmenu.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008 by Lennart Borgman
 
-;; Author:  Lennart Borgman <lennart DOT borgman DOT 073 AT student DOT lu DOT se>
+;; Author:  Lennart Borgman <lennart DOT borgman AT gmail DOT com>
 ;; Created: Thu Jan 05 14:00:26 2006
 (defconst appmenu:version "0.62") ;; Version:
 ;; Last-Updated: 2008-06-15T17:54:40+0200 Sun
@@ -78,7 +78,7 @@ The entries in this list are lists:
 
    \(ID PRIORITY TEST TITLE DEFINITION)
 
-ID is a uniqure identity.
+ID is a unique identity.
 
 PRIORITY is a number or a variable whose value is a number
 telling where to put this entry when showing the menu.
@@ -106,6 +106,7 @@ For an example of use see mlinks.el.")
                   (when (symbolp priB) (setq priB (symbol-value priB)))
                   (< priA priB))))))
 
+;;;###autoload
 (defun appmenu-add (id priority test title definition)
   "Add entry to `appmenu-alist'.
 Add an entry to this list with ID, PRIORITY, TEST, TITLE and
@@ -134,42 +135,59 @@ DEFINITION as explained there."
     ml))
 
 (defvar appmenu-mouse-only
-  '(flyspell-correct-word))
+  '((flyspell-correct-word appmenu-flyspell-correct-word-before-point)))
+
+(defun appmenu-flyspell-correct-word-before-point ()
+  "Pop up a menu of possible corrections for misspelled word before point.
+Special version for AppMenu."
+  (interactive)
+  (flyspell-correct-word-before-point))
+
+(defcustom appmenu-at-any-point '(ispell-word)
+  "Commands that may work at any point in a buffer.
+Some important but not too often used commands that may be useful
+for most points in a buffer."
+  :group 'appmenu)
 
 (defun appmenu-make-menu-for-point ()
-  "Construct a menu based on point keymap."
+  "Construct a menu based on point.
+This includes some known commands for point and keymap at
+point."
   (let ((point-map (get-char-property (point) 'keymap))
-        funs
+        (funs appmenu-at-any-point)
         (map (make-sparse-keymap "At point"))
         (num 0)
         last-prefix
         this-prefix)
+    ;; Known for any point
     (when point-map
       (let ((map-fun (lambda (key fun)
                        (if (keymapp fun)
                            (map-keymap map-fun fun)
                          (when (and (symbolp fun)
-                                    (fboundp fun)
-                                    (not (memq fun appmenu-mouse-only)))
-                           (add-to-list 'funs fun))))))
-        (map-keymap map-fun point-map))
-      (dolist (fun funs)
-        (let ((desc (when fun (documentation fun))))
-          (when desc
-            (setq desc (car (split-string desc "[\n]")))
-            ;;(lwarn t :warning "pk: %s, %s" fun desc)
-            (setq this-prefix
-                  (car (split-string (symbol-name fun) "[-]")))
-            (when (and last-prefix
-                       (not (string= last-prefix this-prefix)))
-              (define-key map
-                (vector (intern (format "appmenu-point-div-%s" num)))
-                (list 'menu-item "--")))
-            (setq last-prefix this-prefix)
-            (setq num (1+ num))
+                                    (fboundp fun))
+                           (let ((mouse-only (assq fun appmenu-mouse-only)))
+                             (when mouse-only
+                               (setq fun (cadr mouse-only)))
+                             (add-to-list 'funs fun)))))))
+        (map-keymap map-fun point-map)))
+    (dolist (fun funs)
+      (let ((desc (when fun (documentation fun))))
+        (when desc
+          (setq desc (car (split-string desc "[\n]")))
+          ;;(lwarn t :warning "pk: %s, %s" fun desc)
+          (setq this-prefix
+                (car (split-string (symbol-name fun) "[-]")))
+          (when (and last-prefix
+                     (not (string= last-prefix this-prefix)))
             (define-key map
-              (vector (intern (format "appmenu-point-%s" num)))
-              (list 'menu-item desc fun))))))
+              (vector (intern (format "appmenu-point-div-%s" num)))
+              (list 'menu-item "--")))
+          (setq last-prefix this-prefix)
+          (setq num (1+ num))
+          (define-key map
+            (vector (intern (format "appmenu-point-%s" num)))
+            (list 'menu-item desc fun)))))
     (when (> num 0) map)))
 
 (defun appmenu-map ()
diff --git a/elpa-to-submit/nxhtml/util/as-external.el b/elpa-to-submit/nxhtml/util/as-external.el
index 25ba48768a..7777d4ce37 100644
--- a/elpa-to-submit/nxhtml/util/as-external.el
+++ b/elpa-to-submit/nxhtml/util/as-external.el
@@ -3,14 +3,14 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: Mon Jun 25 19:02:49 2007
 (defconst as-external:version "0.6") ;;Version:
-;; Last-Updated: 2008-09-30T11:44:43+0200 Tue
+;; Last-Updated: 2009-08-04 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `server'.
+;;   None
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -61,7 +61,16 @@
 ;;
 ;;; Code:
 
-(require 'server)
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'html-write))
+(eval-when-compile (require 'mumamo))
+(eval-when-compile (require 'ourcomments-util))
+(eval-when-compile
+  (when (featurep 'nxml-mode)
+    (require 'nxhtml)
+    (require 'nxhtml-mumamo)))
+(eval-when-compile (require 'wikipedia-mode))
+(eval-when-compile (require 'server))
 
 (defgroup as-external nil
   "Settings related to Emacs as external editor."
@@ -146,11 +155,13 @@ blog.  Therefore turn on these:
 Also bypass the question for line end conversion when using
 emacsw32-eol."
   (interactive)
-  (if (not (fboundp 'nxhtml-mumamo-mode))
+  ;;(if (not (fboundp 'nxhtml-mumamo-mode))
+  (if (not (fboundp 'nxhtml-mode))
       (as-external-fall-back "Can't find nXhtml")
-    (nxhtml-mumamo-mode)
+    ;;(nxhtml-mumamo-mode)
+    (nxhtml-mode)
     (nxhtml-validation-header-mode 1)
-    (mumamo-post-command)
+    ;;(mumamo-post-command)
     (set (make-local-variable 'wrap-to-fill-left-marg-modes)
          '(nxhtml-mode fundamental-mode))
     (wrap-to-fill-column-mode 1)
@@ -220,11 +231,14 @@ See also `as-external-mode'."
 
 ;;;###autoload
 (define-minor-mode as-external-mode
-  "If non-nil check for if Emacs is used as external editor.
-When Emacs is used as an external editor for example to edit text
-areas on a web page viewed with Firefox this library tries to
-help to setup the buffer in a useful way. It may for example set
-major and minor modes for the buffer.
+  "If non-nil check if Emacs is called as external editor.
+When Emacs is called as an external editor for example to edit
+text areas on a web page viewed with Firefox this library tries
+to help to setup the buffer in a useful way. It may for example
+set major and minor modes for the buffer.
+
+This can for example be useful when blogging or writing comments
+on blogs.
 
 See `as-external-alist' for more information."
   :global t
@@ -235,6 +249,7 @@ See `as-external-alist' for more information."
           as-external-its-all-text-regexp
           (cons as-external-its-all-text-coding
                 as-external-its-all-text-coding))))
+    ;;(message "as-external-mode=%s" as-external-mode)
     (if as-external-mode
         (progn
           (add-to-list 'file-coding-system-alist coding-entry)
diff --git a/elpa-to-submit/nxhtml/util/bw-rnc-load/mjt.rnc b/elpa-to-submit/nxhtml/util/bw-rnc-load/mjt.rnc
deleted file mode 100644
index b37f01adf8..0000000000
--- a/elpa-to-submit/nxhtml/util/bw-rnc-load/mjt.rnc
+++ /dev/null
@@ -1,74 +0,0 @@
-include "xhtml-loader.rnc"
-
-MjtAll.attrib =
-  attribute mjt.def { Text.datatype }?,
-  attribute mjt.when { Text.datatype }?,
-  attribute mjt.otherwise { Text.datatype }?,
-  attribute mjt.for { Text.datatype }?,
-  attribute mjt.if { Text.datatype }?,
-  attribute mjt.elif { Text.datatype }?,
-  attribute mjt.else { Text.datatype }?,
-  attribute mjt.script { Text.datatype }?,
-  attribute mjt.choose { Text.datatype }?,
-  attribute mjt.replace { Text.datatype }?,
-  attribute mjt.content { Text.datatype }?,
-  attribute mjt.strip { Text.datatype }?,
-  attribute mjt.src { Text.datatype }?,
-  attribute mjt.style { Text.datatype }?,
-  attribute mjt.class { Text.datatype }?,
-  attribute mjt.id { Text.datatype }?,
-  attribute mjt.attrs { Text.datatype }?,
-  attribute mjt.task { Text.datatype }?
-
-
-a.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?
-area.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?
-form.attlist &=
-  attribute mjt.onreset { Script.datatype }?,
-  attribute mjt.onsubmit { Script.datatype }?
-body.attlist &=
-  attribute mjt.onload { Script.datatype }?,
-  attribute mjt.onunload { Script.datatype }?
-label.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?
-input.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onchange { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?,
-  attribute mjt.onselect { Script.datatype }?
-select.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onchange { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?
-textarea.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onchange { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?,
-  attribute mjt.onselect { Script.datatype }?
-button.attlist &=
-  attribute mjt.onblur { Script.datatype }?,
-  attribute mjt.onfocus { Script.datatype }?
-
-MjtEvents.attrib =
-  attribute mjt.onclick { Script.datatype }?,
-  attribute mjt.ondblclick { Script.datatype }?,
-  attribute mjt.onmousedown { Script.datatype }?,
-  attribute mjt.onmouseup { Script.datatype }?,
-  attribute mjt.onmouseover { Script.datatype }?,
-  attribute mjt.onmousemove { Script.datatype }?,
-  attribute mjt.onmouseout { Script.datatype }?,
-  attribute mjt.onkeypress { Script.datatype }?,
-  attribute mjt.onkeydown { Script.datatype }?,
-  attribute mjt.onkeyup { Script.datatype }?
-
-
-Common.attrib &= MjtAll.attrib
-CommonIdRequired.attrib &= MjtAll.attrib
-
-Common.attrib &= MjtEvents.attrib
-CommonIdRequired.attrib &= MjtEvents.attrib
diff --git a/elpa-to-submit/nxhtml/util/bw-rnc-load/qtmstr-xhtml.rnc b/elpa-to-submit/nxhtml/util/bw-rnc-load/qtmstr-xhtml.rnc
deleted file mode 100644
index 61ab89eec5..0000000000
--- a/elpa-to-submit/nxhtml/util/bw-rnc-load/qtmstr-xhtml.rnc
+++ /dev/null
@@ -1,58 +0,0 @@
-namespace py = "http://genshi.edgewall.org/"
-namespace xi = "http://www.w3.org/2001/XInclude"
-
-include "genshi.rnc"
-include "xinclude.rnc"
-include "xhtml-loader.rnc"
-
-start |= head|body|p|\div|h1|h2|h3|h4|h5|h6|hr|pre|dl|ol|ul|table|form
-
-Common.attrib &= genshi.attrib
-head.attlist  &= genshi.attrib
-html.attlist  &= genshi.attrib
-
-Head.class = base | isindex | link | meta | script | title | style |
-             if-head | for-head | def-head | with-head
-
-Head.model = Head.class*
-
-head.content &= Head.model*
-
-if-inline   = element py:if   { genshi.if.attlist, Inline.model }
-if-block    = element py:if   { genshi.if.attlist, Block.model }
-if-head     = element py:if   { genshi.if.attlist, Head.model }
-for-inline  = element py:for  { genshi.for.attlist, Inline.model }
-for-block   = element py:for  { genshi.for.attlist, Block.model }
-for-head    = element py:for  { genshi.for.attlist, Head.model }
-def-inline  = element py:def  { genshi.def.attlist, Inline.model }
-def-block   = element py:def  { genshi.def.attlist, Block.model }
-def-head    = element py:def  { genshi.def.attlist, Head.model }
-with-inline = element py:with { genshi.with.attlist, Inline.model }
-with-block  = element py:with { genshi.with.attlist, Block.model }
-with-head   = element py:with { genshi.with.attlist, Head.model }
-
-Inline.class |= if-inline | for-inline | def-inline | with-inline
-Block.class  |= if-block | for-block | def-block | with-block
-
-xi-inline = element xi:include {
-                xinclude.include.attlist,
-                element xi:fallback { genshi.attrib,
-                    (xi-inline | Inline.model)*
-                }?
-            }
-
-xi-block  = element xi:include { xinclude.include.attlist,
-                element xi:fallback { genshi.attrib,
-                    (xi-block | Block.model)*
-                }?
-            }
-
-xi-head   = element xi:include { xinclude.include.attlist,
-                element xi:fallback { genshi.attrib,
-                    (xi-head | Head.model)*
-                }?
-            }
-
-Inline.class |= xi-inline
-Block.class  |= xi-block
-Head.class   |= xi-head
diff --git a/elpa-to-submit/nxhtml/util/bw-rnc-load/schema-find.el b/elpa-to-submit/nxhtml/util/bw-rnc-load/schema-find.el
deleted file mode 100644
index 8fe12b3482..0000000000
--- a/elpa-to-submit/nxhtml/util/bw-rnc-load/schema-find.el
+++ /dev/null
@@ -1,18 +0,0 @@
-
-(defun find-nxml (lst)
-   (if (null lst)
-       nil
-     (if (string-match "nxml" (car lst))
-         (car lst)
-       (find-nxml (cdr lst)))))
-find-nxml
-
-
-(defun check-loader ()
-  (let ((loader-path "./emacs/site-lisp/nxhtml/etc/schema/xhtml-loader.rnc"))
-    (if (file-exists-p loader-path)
-        nil
-      (progn (find-file loader-path)
-             (insert (concat "include \"" (find-nxml load-path) "/../../etc/schema/xhtml.rnc\""))
-             (save-buffer)
-             (kill-this-buffer)))))
diff --git a/elpa-to-submit/nxhtml/util/bw-rnc-load/xinclude.rnc b/elpa-to-submit/nxhtml/util/bw-rnc-load/xinclude.rnc
deleted file mode 100644
index c45cf0ca81..0000000000
--- a/elpa-to-submit/nxhtml/util/bw-rnc-load/xinclude.rnc
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace xi = "http://www.w3.org/2001/XInclude"
-namespace local = ""
-
-xinclude.include.attlist =
-    attribute href     { xsd:anyURI }?,
-    attribute parse    { xsd:string }?,
-    attribute xpointer { xsd:string }?,
-    attribute encoding { xsd:string }?,
-    attribute accept   { xsd:string }?,
-    attribute accept-language { xsd:string }?
-
diff --git a/elpa-to-submit/nxhtml/util/chart.el b/elpa-to-submit/nxhtml/util/chart.el
index 5d0107beec..110da361b0 100644
--- a/elpa-to-submit/nxhtml/util/chart.el
+++ b/elpa-to-submit/nxhtml/util/chart.el
@@ -1,8 +1,8 @@
 ;;; chart.el --- Google charts (and maybe other)
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-04-06T15:09:33+0200 Sun
-;; Version:
+;; Created: 2008-04-06 Sun
+(defconst chart:version "0.2") ;; Version:
 ;; Last-Updated:
 ;; URL:
 ;; Keywords:
@@ -73,6 +73,85 @@
             (symbol-name (car rec)))
           chart-types))
 
+(defvar chart-mode-keywords-and-states
+  '(("Output-file:" (accept file-name))
+    ("Size:" (accept number))
+    ("Data:" (accept number))
+    ("Type:" (accept chart-type))
+    ))
+
+(defvar chart-mode-keywords
+  (mapcar (lambda (rec)
+            (car rec))
+          chart-mode-keywords-and-states))
+
+;; Fix-me: I started to implement a parser, but I think I will drop it
+;; and wait for Semantic to be easily available instead. Or just use
+;; Calc/Org Tables.
+
+(defvar chart-intermediate-states
+  '((end-or-label (or end-of-file label))
+    ))
+
+(defvar chart-extra-keywords-and-states
+  '(
+    ;;("Provider:")
+    ("Colors:")
+    ("Solid-fill:")
+    ("Linear-gradient:")
+    ("Linear-stripes:")
+    ("Chart-title:" (and string end-or-label))
+    ("Legends:" (accept string))
+    ("Axis-types:")
+    ("Axis-labels:")
+    ("Axis-ranges:")
+    ("Axis-styles:")
+    ("Bar-thickness:")
+    ("Bar-chart-zero-line:")
+    ("Bar-chart-zero-line-2:")
+    ("Line-styles-1:")
+    ("Line-styles-2:")
+    ("Grid-lines:")
+    ("Shape-markers:")
+    ("Range-markers:")
+    ))
+
+(defvar chart-extra-keywords
+  (mapcar (lambda (rec)
+            (car rec))
+          chart-extra-keywords-and-states))
+
+(defvar chart-raw-keywords-and-states
+  '(
+    ("Google-chart-raw:" (accept string))
+    ))
+
+(defvar chart-raw-keywords
+  (mapcar (lambda (rec)
+            (car rec))
+          chart-raw-keywords-and-states))
+
+(defvar chart-mode-keywords-re (regexp-opt chart-mode-keywords))
+(defvar chart-extra-keywords-re (regexp-opt chart-extra-keywords))
+(defvar chart-types-keywords-re (regexp-opt chart-types-keywords))
+(defvar chart-raw-keywords-re (regexp-opt chart-raw-keywords))
+
+(defvar chart-font-lock-keywords
+  `((,chart-mode-keywords-re . font-lock-keyword-face)
+    (,chart-extra-keywords-re . font-lock-variable-name-face)
+    (,chart-types-keywords-re . font-lock-function-name-face)
+    (,chart-raw-keywords-re . font-lock-preprocessor-face)
+    ))
+
+(defvar chart-font-lock-defaults
+  '(chart-font-lock-keywords nil t))
+
+(defvar chart-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\n ">   " table)
+    (modify-syntax-entry ?\; "<   " table)
+    table))
+
 (defun chart-create (provider out-file size data type
                               title legends &optional extras)
   "Create a chart image.
@@ -181,7 +260,8 @@ be a list
   (list COLOR START-INDEX END-INDEX)
 
 "
-  (interactive)
+  (message "(chart-create %s %s %s %s %s %s %s" provider out-file size data type
+                              title legends)
   (unless (symbolp type)
     (error "Argument TYPE should be a symbol"))
   (unless (assoc type chart-types)
@@ -217,19 +297,20 @@ be a list
                               (number-to-string num)
                             (concat str "," (number-to-string num)))))
                   str))
-               (rec-scale (cdr rec))
+               (rec-scale (cadr rec))
                (rec-min  (car rec-scale))
                (rec-max  (cdr rec-scale))
                (scale-str (when rec-scale (format "%s,%s" rec-min rec-max)))
                )
           (if (not numbers)
-            (progn
-              (setq numbers (concat "&chd=t:" number-str))
-              (when scale-str
-                (setq scales (concat "&chds=" scale-str))))
-          (setq numbers (concat numbers "|" number-str)))
-          (when scale-str
-            (setq scales (concat scales "," scale-str)))))
+              (progn
+                (setq numbers (concat "&chd=t:" number-str))
+                (when (or scale-str
+                          (memq g-type '(p p3 gom)))
+                  (setq scales (concat "&chds=" scale-str))))
+            (setq numbers (concat numbers "|" number-str))
+            (when scale-str
+              (setq scales (concat scales "," scale-str))))))
       (setq url (concat url numbers))
       (when scales (setq url (concat url scales)))
       ;; fix-me: encode the url
@@ -239,7 +320,7 @@ be a list
               (arg (if (memq g-type '(p p3 gom))
                        "&chl="
                      "&chdl=")))
-        (setq url (concat url arg url-legends))))
+          (setq url (concat url arg url-legends))))
       (dolist (extra extras)
         (let ((extra-type (car extra))
               (extra-value (cdr extra)))
@@ -266,7 +347,12 @@ be a list
                   (buffer-substring-no-properties (point) (point-max))
                 (view-buffer-other-window (current-buffer))
                 (error "Bad content"))))
-      (let* ((fname (expand-file-name out-file))
+      (let* ((is-html (string-match-p "</body></html>" content))
+             (fname (progn
+                      (when is-html
+                        (setq out-file (concat (file-name-sans-extension out-file) ".html")))
+                      (expand-file-name out-file)
+                      ))
              (do-it (or (not (file-exists-p fname))
                         (y-or-n-p
                          (concat "File " fname " exists. Replace it? "))))
@@ -276,64 +362,23 @@ be a list
           (when buf (kill-buffer buf))
           (with-temp-file fname
             (insert content))
-          (view-file-other-window fname)
+          (if (not is-html)
+              (view-file-other-window fname)
+            (chart-show-last-error-file fname))
           (select-window this-window)))))
    (t (error "Unknown provider: %s" provider)))
   )
 
-(defvar chart-mode-keywords
-  '("Output-file:"
-    ;;"Provider:"
-    "Size:" "Data:" "Type:")
-  )
-
-(defvar chart-extra-keywords
-  '(
-    "Colors:"
-    "Solid-fill:"
-    "Linear-gradient:"
-    "Linear-stripes:"
-    "Chart-title:"
-    "Legends:"
-    "Axis-types:"
-    "Axis-labels:"
-    "Axis-ranges:"
-    "Axis-styles:"
-    "Bar-thickness:"
-    "Bar-chart-zero-line:"
-    "Bar-chart-zero-line-2:"
-    "Line-styles-1:"
-    "Line-styles-2:"
-    "Grid-lines:"
-    "Shape-markers:"
-    "Range-markers:"
-    ))
-
-(defvar chart-raw-keywords
-  '(
-    "Google-chart-raw:"
-    ))
-
-(defvar chart-mode-keywords-re (regexp-opt chart-mode-keywords))
-(defvar chart-extra-keywords-re (regexp-opt chart-extra-keywords))
-(defvar chart-types-keywords-re (regexp-opt chart-types-keywords))
-(defvar chart-raw-keywords-re (regexp-opt chart-raw-keywords))
-
-(defvar chart-font-lock-keywords
-  `((,chart-mode-keywords-re . font-lock-keyword-face)
-    (,chart-extra-keywords-re . font-lock-variable-name-face)
-    (,chart-types-keywords-re . font-lock-function-name-face)
-    (,chart-raw-keywords-re . font-lock-preprocessor-face)
-    ))
-
-(defvar chart-font-lock-defaults
-  '(chart-font-lock-keywords nil t))
-
-(defvar chart-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?\n ">   " table)
-    (modify-syntax-entry ?\; "<   " table)
-    table))
+(defun chart-show-last-error-file (fname)
+  (interactive)
+  (with-output-to-temp-buffer (help-buffer)
+    (help-setup-xref (list #'chart-show-last-error-file fname) (interactive-p))
+    (with-current-buffer (help-buffer)
+      (insert "Error, see ")
+      (insert-text-button "result error page"
+                          'action
+                          `(lambda (btn)
+                             (browse-url ,fname))))))
 
 (defvar chart-mode-map
   (let ((map (make-sparse-keymap)))
@@ -353,6 +398,7 @@ be a list
                         collection)))))
     collection))
 
+;;;###autoload
 (defun chart-complete ()
   (interactive)
   (let* ((here (point))
@@ -372,16 +418,17 @@ be a list
          res)
     (when state
       (cond
-       ((equal state '(accept number))
-        (setq res nil)
-        (setq msg (propertize "Needs a number here!"
-                              'face 'secondary-selection)))
-       ((equal state 'need-label)
+       ((or (= (current-column) 0)
+            (equal state 'need-label))
         (setq collection (append (chart-missing-keywords)
                                  chart-extra-keywords
                                  chart-raw-keywords
                                  nil))
         (setq prompt "Label: "))
+       ((equal state '(accept number))
+        (setq res nil)
+        (setq msg (propertize "Needs a number here!"
+                              'face 'secondary-selection)))
        ((equal state '(accept chart-type))
         (setq collection chart-types-keywords)
         (setq prompt "Chart type: "))
@@ -410,6 +457,7 @@ be a list
          par-provider
          par-size
          par-data par-data-temp
+         par-data-min par-data-max
          par-type
          par-title
          par-legends
@@ -419,183 +467,198 @@ be a list
          pos-state
          (state 'need-label)
          (problems
-         (catch 'problems
-             (save-restriction
-               (widen)
-               (if want-pos-state
-                   (unless (re-search-backward chart-mode-keywords-re nil t)
-                     (goto-char (point-min)))
-                 (goto-char (point-min)))
-               (let (this-keyword
-                     this-start
-                     this-end
-                     params
-                     token
-                     token-pos
-                     next-token
-                     found-labels
-                     current-label)
-                 (while (or token
-                            (progn
-                              (setq pos-state state)
-                              (setq token-before-pos (point))
-                              (condition-case err
-                                  (setq token (read (current-buffer)))
-                                (error
-                                 (if (eq (car err) 'end-of-file)
-                                     (unless (eq state 'need-label)
-                                       (throw 'problems (format "Unexpected end, state=%s" state)))
-                                   (throw 'problems
-                                          (error-message-string err)))))))
-                   (message "token=%s, label=%s, state=%s" token current-label state)
-                   (when (and want-pos-state
-                              (>= (point) want-pos-state))
-                     (when (= (point) want-pos-state)
-                       ;; right after item
-                       (setq pos-state nil))
-                     (goto-char here)
-                     (throw 'pos-state pos-state))
-                   (cond ;; state
-                    ;; Label
-                    ((eq state 'need-label)
-                      (unless (symbolp token)
-                       (throw 'problems (format "Expected label, got %s" token)))
-                      (unless (member (symbol-name token)
-                                      (append chart-mode-keywords
-                                              chart-extra-keywords
-                                              chart-raw-keywords
-                                              nil))
-                        (throw 'problems (format "Unknown label %s" token)))
-                      (when (member (symbol-name token) found-labels)
-                        (throw 'problems (format "Label %s defined twice" token)))
-                      (setq current-label token)
-                      (setq found-labels (cons current-label found-labels))
-                      (setq token nil)
-                      ;;(setq state 'need-value)
-                      (case current-label
-                        ('Output-file:
-                         (setq state '(accept file-name)))
-                        ('Size:
-                         (setq state '(accept number)))
-                        ('Data:
-                         (setq state '(accept number)))
-                        ('Type:
-                         (setq state '(accept chart-type)))
-                        ('Chart-title:
-                         (setq state '(accept string)))
-                        ('Legends:
-                         (setq state '(accept string)))
-                        ('Google-chart-raw:
-                         (setq state '(accept string)))
-                        ))
-                    ;;;; Values
-                    ;; Alt
-                    ((equal state '(accept '| symbol))
-                     (if (eq '| token)
-                         (case current-label
-                           ('Legends:
-                            (setq token nil)
-                            (setq state '(accept string)))
-                           (t (error "internal error, current-label=%s, state=%s" current-label state)))
-                       (if (symbolp token)
+          (catch 'problems
+            (save-restriction
+              ;;(widen)
+              (if want-pos-state
+                  (unless (re-search-backward chart-mode-keywords-re nil t)
+                    (goto-char (point-min)))
+                (goto-char (point-min)))
+              (let (this-keyword
+                    this-start
+                    this-end
+                    params
+                    token
+                    token-pos
+                    next-token
+                    found-labels
+                    current-label)
+                (while (or token
                            (progn
-                             ;;(setq token nil)
-                             (setq state 'need-label))
-                         (throw 'problems (format "Expected | or label, got %s" token)))))
-                    ;; Strings
-                    ((equal state '(accept string))
-                     (unless (stringp token)
-                       (throw 'problems "Expected string"))
-                     (case current-label
-                       ('Chart-title:
-                        (setq par-title token)
-                        (setq token nil)
-                        (setq state 'need-label))
-                       ('Legends:
-                        (setq par-legends (reverse (cons token par-legends)))
-                        (setq token nil)
-                        (setq state '(accept '| symbol)))
-                       ('Google-chart-raw:
-                        (setq par-google-raw token)
-                        (setq token nil)
-                        (setq state '(accept '| symbol)))
-                       (t (error "internal error, current-label=%s, state=%s" current-label state))))
-                    ;; Output file
-                    ((equal state '(accept file-name))
-                     (unless (stringp token)
-                       (throw 'problems "Expected file name string"))
-                     (assert (eq current-label 'Output-file:))
-                     (setq par-output-file token)
-                     (setq token nil)
-                     (setq state 'need-label))
-                    ;; Numbers
-                    ((equal state '(accept number))
-                     (unless (numberp token)
-                       (throw 'problems "Expected number"))
-                     (case current-label
-                       ('Size:
-                        (if (not par-size)
-                            (progn
-                              (setq par-size token)
-                              (setq token nil)
-                              (setq state '(accept number 'x 'X)))
-                          (setq par-size (cons par-size token))
-                          (setq token nil)
-                          (setq state 'need-label)))
-                       ('Data:
-                        ;;(assert (not par-data-temp))
-                        (setq par-data-temp (cons token par-data-temp))
-                        (setq token nil)
-                        (setq state '(accept number ', '| symbol))
-                        )
-                       (t (error "internal error, state=%s, current-label=%s" state current-label)))
-                     )
-                    ;; Numbers or |
-                    ((equal state '(accept number ', '| symbol))
-                     (if (numberp token)
-                         (progn
-                           (setq par-data-temp (cons token par-data-temp))
-                           (setq token nil))
-                       (if (eq ', token)
+                             (setq pos-state state)
+                             (setq token-before-pos (point))
+                             (condition-case err
+                                 (setq token (read (current-buffer)))
+                               (error
+                                (if (eq (car err) 'end-of-file)
+                                    (unless (or (eq state 'need-label)
+                                                (member '(quote |) state))
+                                      (throw 'problems (format "Unexpected end, state=%s" state)))
+                                  (throw 'problems
+                                         (error-message-string err)))))))
+                  (message "token=%s, label=%s, state=%s" token current-label state)
+                  (when (and want-pos-state
+                             (>= (point) want-pos-state))
+                    (when (= (point) want-pos-state)
+                      ;; right after item
+                      (setq pos-state nil))
+                    (goto-char here)
+                    (throw 'pos-state pos-state))
+                  (when (and (listp state) (memq 'number state))
+                    (unless (numberp token)
+                      (save-match-data
+                        (let ((token-str (format "%s" token)))
+                          (setq token-str (replace-regexp-in-string "\\([0-9]\\),\\([0-9]\\)" "\\1\\2" token-str))
+                          (when (string-match-p "^[0-9]+$" token-str)
+                            (setq token (string-to-number token-str)))))))
+                  (cond ;; state
+                   ;; Label
+                   ((eq state 'need-label)
+                    (unless (symbolp token)
+                      (throw 'problems (format "Expected label, got %s" token)))
+                    (unless (member (symbol-name token)
+                                    (append chart-mode-keywords
+                                            chart-extra-keywords
+                                            chart-raw-keywords
+                                            nil))
+                      (throw 'problems (format "Unknown label %s" token)))
+                    (when (member (symbol-name token) found-labels)
+                      (throw 'problems (format "Label %s defined twice" token)))
+                    (setq current-label token)
+                    (setq found-labels (cons current-label found-labels))
+                    (setq token nil)
+                    ;;(setq state 'need-value)
+                    (case current-label
+                      ('Output-file:
+                       (setq state '(accept file-name)))
+                      ('Size:
+                       (setq state '(accept number)))
+                      ('Data:
+                       (setq state '(accept number)))
+                      ('Type:
+                       (setq state '(accept chart-type)))
+                      ('Chart-title:
+                       (setq state '(accept string)))
+                      ('Legends:
+                       (setq state '(accept string)))
+                      ('Google-chart-raw:
+                       (setq state '(accept string)))
+                      ))
+                    ;;;; Values
+                   ;; Alt
+                   ((equal state '(accept '| symbol))
+                    (if (eq '| token)
+                        (case current-label
+                          ('Legends:
                            (setq token nil)
-                         (if (or (eq '| token)
-                                 (symbolp token))
-                             (progn
-                               (unless par-data-temp
-                                 (throw 'problems "Empty data set"))
-                               (setq par-data (cons (list (reverse par-data-temp)) par-data))
-                               (setq par-data-temp nil)
-                               (if (not (eq '| token))
-                                   (setq state 'need-label)
-                                 (setq state '(accept number))
-                                 (setq token nil)))
-                           (throw 'problems "Expected | or EOF")
-                           ))))
-                    ;; Numbers or x/X
-                    ((equal state '(accept number 'x 'X))
-                     (assert (eq current-label 'Size:))
-                     (let ((is-n (numberp token))
-                           (is-x (memq token '(x X))))
-                       (unless (or is-n is-x)
-                         (throw 'problems "Expected X or number"))
-                       (if is-x
+                           (setq state '(accept string)))
+                          (t (error "internal error, current-label=%s, state=%s" current-label state)))
+                      (if (symbolp token)
+                          (progn
+                            ;;(setq token nil)
+                            (setq state 'need-label))
+                        (throw 'problems (format "Expected | or label, got %s" token)))))
+                   ;; Strings
+                   ((equal state '(accept string))
+                    (unless (stringp token)
+                      (throw 'problems "Expected string"))
+                    (case current-label
+                      ('Chart-title:
+                       (setq par-title token)
+                       (setq token nil)
+                       (setq state 'need-label))
+                      ('Legends:
+                       (setq par-legends (cons token par-legends))
+                       (setq token nil)
+                       (setq state '(accept '| symbol)))
+                      ('Google-chart-raw:
+                       (setq par-google-raw token)
+                       (setq token nil)
+                       (setq state 'need-label))
+                      (t (error "internal error, current-label=%s, state=%s" current-label state))))
+                   ;; Output file
+                   ((equal state '(accept file-name))
+                    (unless (stringp token)
+                      (throw 'problems "Expected file name string"))
+                    (assert (eq current-label 'Output-file:))
+                    (setq par-output-file token)
+                    (setq token nil)
+                    (setq state 'need-label))
+                   ;; Numbers
+                   ((equal state '(accept number))
+                    (unless (numberp token)
+                      (throw 'problems "Expected number"))
+                    (case current-label
+                      ('Size:
+                       (if (not par-size)
                            (progn
+                             (setq par-size token)
                              (setq token nil)
-                             (setq state '(accept number)))
+                             (setq state '(accept number 'x 'X)))
                          (setq par-size (cons par-size token))
                          (setq token nil)
-                         (setq state 'need-label))))
-                    ;; Chart type
-                    ((equal state '(accept chart-type))
-                     (setq par-type token)
-                     (unless (assoc par-type chart-types)
-                       (throw 'problems (format "Unknown chart type: %s" par-type)))
-                     (setq token nil)
-                     (setq state 'need-label))
-                    (t (error "internal error, state=%s" state))))))
-           ;; fix-me here
-
-           nil)))
+                         (setq state 'need-label)))
+                      ('Data:
+                       ;;(assert (not par-data-temp))
+                       (setq par-data-temp (cons token par-data-temp))
+                       (setq par-data-min token)
+                       (setq par-data-max token)
+                       (setq token nil)
+                       (setq state '(accept number ', '| symbol))
+                       )
+                      (t (error "internal error, state=%s, current-label=%s" state current-label)))
+                    )
+                   ;; Numbers or |
+                   ((equal state '(accept number ', '| symbol))
+                    (if (numberp token)
+                        (progn
+                          (setq par-data-min (if par-data-min (min par-data-min token) token))
+                          (setq par-data-max (if par-data-max (max par-data-max token) token))
+                          (setq par-data-temp (cons token par-data-temp))
+                          (message "par-data-min/max=%s/%s, token=%s -- %s" par-data-min par-data-max token par-data-temp)
+                          (setq token nil))
+                      (if (eq ', token)
+                          (setq token nil)
+                        (if (or (eq '| token)
+                                (symbolp token))
+                            (progn
+                              (unless par-data-temp
+                                (throw 'problems "Empty data set"))
+                              (setq par-data (cons (list (reverse par-data-temp) (cons par-data-min par-data-max)) par-data))
+                              (setq par-data-temp nil)
+                              (setq par-data-min nil)
+                              (setq par-data-max nil)
+                              (if (not (eq '| token))
+                                  (setq state 'need-label)
+                                (setq state '(accept number))
+                                (setq token nil)))
+                          (throw 'problems "Expected | or EOF")
+                          ))))
+                   ;; Numbers or x/X
+                   ((equal state '(accept number 'x 'X))
+                    (assert (eq current-label 'Size:))
+                    (let ((is-n (numberp token))
+                          (is-x (memq token '(x X))))
+                      (unless (or is-n is-x)
+                        (throw 'problems "Expected X or number"))
+                      (if is-x
+                          (progn
+                            (setq token nil)
+                            (setq state '(accept number)))
+                        (setq par-size (cons par-size token))
+                        (setq token nil)
+                        (setq state 'need-label))))
+                   ;; Chart type
+                   ((equal state '(accept chart-type))
+                    (setq par-type token)
+                    (unless (assoc par-type chart-types)
+                      (throw 'problems (format "Unknown chart type: %s" par-type)))
+                    (setq token nil)
+                    (setq state 'need-label))
+                   (t (error "internal error, state=%s" state))))))
+            ;; fix-me here
+
+            nil)))
     (when want-pos-state
       (goto-char here)
       (throw 'pos-state state))
@@ -611,10 +674,12 @@ be a list
                          (nth 0 problems)
                        token-before-pos)))
           (goto-char where)
-          (message msg))
+          (skip-chars-forward " \t")
+          (error msg))
       (goto-char here)
       ;;(defun chart-create (out-file provider size data type &rest extras)
       (setq par-provider 'google)
+      (setq par-legends (nreverse par-legends))
       (let ((extras nil))
         (when par-google-raw
           (setq extras (cons (cons 'GOOGLE-RAW par-google-raw) extras)))
@@ -622,12 +687,131 @@ be a list
                       par-data par-type par-title par-legends extras))
       nil)))
 
+;;;###autoload
 (defun chart-make-chart ()
+  "Try to make a new chart.
+If region is active then make a new chart from data in the
+selected region.
+
+Else if current buffer is in `chart-mode' then do it from the
+chart specifications in this buffer.  Otherwise create a new
+buffer and initialize it with `chart-mode'.
+
+If the chart specifications are complete enough to make a chart
+then do it and show the resulting chart image.  If not then tell
+user what is missing.
+
+NOTE: This is beta, no alpha code. It is not ready.
+
+Below are some examples.  To test them mark an example and do
+
+  M-x chart-make-chart
+
+* Example, simple x-y chart:
+
+  Output-file: \"~/temp-chart.png\"
+  Size: 200 200
+  Data: 3 8 5 | 10 20 30
+  Type: line-chart-xy
+
+* Example, pie:
+
+  Output-file: \"~/temp-depression.png\"
+  Size: 400 200
+  Data:
+  2,160,000
+  3,110,000
+  1,510,000
+  73,600
+  775,000
+  726,000
+  8,180,000
+  419,000
+  Type: pie-3-dimensional
+  Chart-title: \"Depression hits on Google\"
+  Legends:
+  \"SSRI\"
+  | \"Psychotherapy\"
+  | \"CBT\"
+  | \"IPT\"
+  | \"Psychoanalysis\"
+  | \"Mindfulness\"
+  | \"Meditation\"
+  | \"Exercise\"
+
+
+* Example, pie:
+
+  Output-file: \"~/temp-panic.png\"
+  Size: 400 200
+  Data:
+  979,000
+  969,000
+  500,000
+  71,900
+  193,000
+  154,000
+  2,500,000
+  9,310,000
+  Type: pie-3-dimensional
+  Chart-title: \"Depression hits on Google\"
+  Legends:
+  \"SSRI\"
+  | \"Psychotherapy\"
+  | \"CBT\"
+  | \"IPT\"
+  | \"Psychoanalysis\"
+  | \"Mindfulness\"
+  | \"Meditation\"
+  | \"Exercise\"
+
+
+* Example using raw:
+
+  Output-file: \"~/temp-chart-slipsen-kostar.png\"
+  Size: 400 130
+  Data: 300 1000 30000
+  Type: bar-chart-horizontal
+  Chart-title: \"Vad killen i slips tjänar jämfört med dig och mig\"
+  Google-chart-raw: \"&chds=0,30000&chco=00cd00|ff4500|483d8b&chxt=y,x&chxl=0:|Killen+i+slips|Partiledarna|Du+och+jag&chf=bg,s,ffd700\"
+
+
+"
   (interactive)
+  (if mark-active
+      (let* ((rb (region-beginning))
+             (re (region-end))
+             (data (buffer-substring-no-properties rb re))
+             (buf (generate-new-buffer "*Chart from region*")))
+        (switch-to-buffer buf)
+        (insert data)
+        (chart-mode))
+    (unless (eq major-mode 'chart-mode)
+      (switch-to-buffer (generate-new-buffer "*Chart*"))
+      (chart-mode)))
   (chart-get-state nil))
 
+;; (defun chart-from-region (min max)
+;;   "Try to make a new chart from data in selected region.
+;; See `chart-mode' for examples you can test with this function."
+;;   (interactive "r")
+;;   (unless mark-active (error "No region selected"))
+;;   (let* ((rb (region-beginning))
+;;          (re (region-end))
+;;          (data (buffer-substring-no-properties rb re))
+;;          (buf (generate-new-buffer "*Chart from region*")))
+;;     (switch-to-buffer buf)
+;;     (insert data)
+;;     (chart-mode)
+;;     (chart-get-state nil)))
+
 (define-derived-mode chart-mode fundamental-mode "Chart"
-  "Mode for specifying charts."
+  "Mode for specifying charts.
+\\{chart-mode-map}
+
+To make a chart see `chart-make-chart'.
+
+"
   (set (make-local-variable 'font-lock-defaults) chart-font-lock-defaults)
   (set (make-local-variable 'comment-start) ";")
   ;; Look within the line for a ; following an even number of backslashes
@@ -642,17 +826,18 @@ be a list
   (set (make-local-variable 'comment-use-global-state) t)
   (set-syntax-table chart-mode-syntax-table)
   (when (looking-at (rx buffer-start (0+ whitespace) buffer-end))
-    (insert ";; Type C-c C-c to make a chart\n"))
+    (insert ";; Type C-c C-c to make a chart, M-Tab to complete\n"))
   (let ((missing (chart-missing-keywords)))
     (when missing
       (save-excursion
         (goto-char (point-max))
         (dolist (miss missing)
-          (insert "\n\n" miss))))))
+          (insert "\n" miss " "))))))
 
 ;; Tests
-;;(chart-create 'google "temp.png" '(200 . 150) '(((90 70) . nil)) 'p3 '(colors "FFFFFF" "00FF00"))
+;;(chart-create 'google "temp.png" '(200 . 150) '(((90 70) . nil)) 'pie-3-dimensional "test title" nil '((colors "FFFFFF" "00FF00")))
 
+;; Fix-me
 (add-to-list 'auto-mode-alist '("\\.mx-chart\\'" . chart-mode))
 
 (provide 'chart)
diff --git a/elpa-to-submit/nxhtml/util/color-test-sent.el b/elpa-to-submit/nxhtml/util/color-test-sent.el
deleted file mode 100644
index b8142afd7f..0000000000
--- a/elpa-to-submit/nxhtml/util/color-test-sent.el
+++ /dev/null
@@ -1,149 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; For wid-edit.el
-
-(defun widget-color-validate (widget)
-  (let ((value (widget-value widget)))
-    (unless
-        ;; Drews suggestion is to use display-color-p instead, but
-        ;; unfortunately this does not match #rgb:
-        ;;(display-color-p value)
-        (color-defined-p value)
-      (widget-put widget :error (format "Invalid color: %S" value))
-      widget)))
-
-(defun widget-color-match (widget value)
-  (and (stringp value)
-       (color-defined-p value)))
-
-(define-widget 'color 'string
-  "Choose a color (with sample)."
-  :format "%{%t%}: %v (%{sample%})\n"
-  :size 30
-  :tag "Color"
-  :match 'widget-color-match
-  :validate 'widget-color-validate
-  :value "black"
-  :complete 'widget-color-complete
-  :sample-face-get 'widget-color-sample-face-get
-  :notify 'widget-color-notify
-  :action 'widget-color-action)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; For custom.el
-
-;; Borrowed from `set-variable'. It might be useful in
-;; `custom-variable-type':
-(defun custom-get-type (variable)
-  "Get the :type declaration used when creating custom VARIABLE."
-  (and (custom-variable-p variable)
-       (not (get variable 'custom-type))
-       (custom-load-symbol variable))
-  (get variable 'custom-type))
-
-;; external values = those stored in the variables
-;; internal values = those shown in "buffer widgets"
-
-;; This function tests the same way `set-variable' does it.  However
-;; `set-variable' also does (require 'cus-edit), shouldn't that be
-;; (require 'wid-edit)?
-(defun custom-type-value-p (value custom-type)
-  "Return non-nil if VALUE matches CUSTOM-TYPE.
-CUSTOM-TYPE could be anything that can be used for the :type
-keyword in `defcustom'.
-
-See `custom-get-type' for how to get CUSTOM-TYPE from a
-custom variable."
-  (require 'wid-edit) ;; for widget-convert, but why is not that in widget.el?
-  (let* ((widget (widget-convert custom-type)))
-    (widget-apply widget :match value)))
-
-         ;;(match-fun (widget-get widget :match))
-         ;;(valid-fun (widget-get widget :validate))
-;;     (if nil ;(listp custom-type)
-;;         ;; Fix-me: Some type of conversion of the list must be
-;;         ;; done. And it actually looks like :validate must be
-;;         ;; used. Otherwise the children here get called with the
-;;         ;; :match and that does nothing for simple type. (What is
-;;         ;; match actually useful for??)
-;;         (progn
-;;           (widget-apply widget :match value)
-;;           )
-;;       (let ((int-val (widget-apply widget :value-to-internal value)))
-;;         (widget-put widget :value int-val)
-;;         (with-current-buffer (get-buffer-create "temp dummy")
-;;           (lwarn t :warning "result=%s" (widget-choice-value-create widget)))
-;;         ;;(null (widget-apply widget :validate))
-;;         ))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Tests
-
-;; (custom-type-value-p "something" 'color)
-;; (custom-type-value-p "#f" 'color)
-;; (custom-type-value-p "#fff" 'color)
-;; (custom-type-value-p "red" 'color)
-;; (custom-get-type 'test-color)
-;; (setq test-color "bla")
-;; (setq test-color "black")
-
-(defcustom test-color "red"
-  "color test"
-  :type 'color)
-
-;; (customize-option 'test-color)
-;; (custom-get-type 'test-more)
-;; (custom-type-value-p "something" (custom-get-type 'test-more))
-;; (custom-type-value-p "some[" (custom-get-type 'test-more))
-;; (custom-type-value-p 10 (custom-get-type 'test-more))
-;; (custom-type-value-p 1.0 (custom-get-type 'test-more))
-(defcustom test-more "b["
-  "choice and regexp text"
-  :type '(choice (integer)
-                 (regexp)))
-
-
-;; (custom-get-type 'ks-test7)
-;; (custom-type-value-p ks-test7 'key-sequence)
-
-
-(defcustom ks-test7
-  [(control ?a) ?2]
-  ""
-  :type 'key-sequence
-  )
-
-(defcustom ks-test8
-  [(control ?a) ?2]
-  "testing internal/external with a choice"
-  :type '(choice (key-sequence)
-                 (color))
-  )
-;; (customize-option 'ks-test8)
-;; (custom-get-type 'ks-test8)
-;; (setq ks-test8 [(control ?a) ?2])
-;; (setq ks-test8 "reda")
-;; (setq ks-test8 8)
-;; (custom-type-value-p ks-test8 'key-sequence)
-;; (custom-type-value-p ks-test8 (custom-get-type 'ks-test8))
-
-
-;; (insert (format "%S" (symbol-plist 'ks-test8)))
-;; (standard-value ([(control 97) 50])
-;;                 variable-documentation "testing internal/external with a choice"
-;;                 custom-type (choice (key-sequence) (color))
-;;                 custom-requests nil
-;;                 backup-value (8)
-;;                 variable-comment nil
-;;                 customized-value nil
-;;                 customized-variable-comment nil)
-
-(defun test8 ()
-  (let ((widget (widget-convert (custom-get-type 'ks-test8))))
-    (widget-choice-match widget ks-test8)
-    (widget-choice-match widget 8)
-    (widget-apply widget :match 8)
-    (widget-apply widget :match ks-test8)
-    ))
-;; (test8)
diff --git a/elpa-to-submit/nxhtml/util/color-test.el b/elpa-to-submit/nxhtml/util/color-test.el
deleted file mode 100644
index 47b9c8056c..0000000000
--- a/elpa-to-submit/nxhtml/util/color-test.el
+++ /dev/null
@@ -1,154 +0,0 @@
-
-(defun color-digits-p (color)
-  (save-match-data
-    (string-match (rx bos
-                      "#"
-                      (1+ (repeat 3 3 hex-digit))
-                      eos)
-                  color)))
-
-(defun widget-color-validate (widget)
-  (let ((value (widget-value widget)))
-    (unless (color-defined-p value)
-      (widget-put widget :error (format "Invalid color: %S" value))
-      widget)))
-
-(define-widget 'color 'editable-field
-  "Choose a color (with sample)."
-  :format "%{%t%}: %v (%{sample%})\n"
-  :size 30
-  :tag "Color"
-  :validate 'widget-color-validate
-  :value "black"
-  :complete 'widget-color-complete
-  :sample-face-get 'widget-color-sample-face-get
-  :notify 'widget-color-notify
-  :action 'widget-color-action)
-
-(defun custom-type-is-super (super-type base-type)
-  (unless (get super-type 'widget-type) (error "Not a widget type: %s" super-type))
-  (unless (get base-type 'widget-type) (error "Not a widget type: %s" base-type))
-  (let ((found nil)
-        (type super-type))
-    (while (and (not found) type)
-      (setq found (eq type base-type))
-      (unless found
-        (setq type (car (get type 'widget-type)))))
-    found))
-;; (custom-type-simple-is-super 'color 'string)
-;; (custom-type-simple-is-super 'color 'editable-field)
-
-(defun custom-type-symbol-p (symbol custom-type)
-  "Return t if value of SYMBOL should fit CUSTOM-TYPE."
-  (let ((found nil)
-        (type (get symbol 'custom-type)))
-    ;; Fix-me: How should different things that are not directly
-    ;; value-related be handled?
-    (while (and (not found) type)
-      (setq found (equal type custom-type))
-      (unless nil ;found
-        (if (symbolp type)
-            (setq found (custom-type-simple-is-super type custom-type))
-          (unless (symbolp custom-type)
-            (let ((symbol-comp-type (car type))
-                  (symbol-childs (cdr type))
-                  (custom-comp-type (car custom-type))
-                  (custom-childs (cdr custom-type)))
-              (setq found
-                    (and (eq symbol-comp-type custom-comp-type)
-                         (let ((ok t))
-                           (while (and ok symbol-childs custom-childs)
-                             (setq ok (custom-type-symbol-p (caar symbol-childs) (caar custom-childs)))
-                             (setq symbol-childs (cdr symbol-childs))
-                             (setq custom-childs (cdr custom-childs)))
-                           ok)))
-            )))))
-    found))
-
-;; (custom-type-p 'test-color 'color)
-;; (custom-type-symbol-p 'bar (get 'bar 'custom-type))
-;; (custom-type-value-p bar (get 'bar 'custom-type))
-;; (custom-type-value-p "b" (get 'bar 'custom-type))
-;; (custom-type-value-p 10 (get 'bar 'custom-type))
-;; (custom-type-value-p 'b (get 'bar 'custom-type))
-
-;;(insert (format "%S" (symbol-plist 'bar)))
-;;(standard-value ("b") variable-documentation "yyyyyyy" custom-type (choice (integer :tag "WWWWWWWWW") (string :tag "ZZZZZZZZZZZZZ")) custom-requests nil)
-
-;; (custom-get-type 'bar)
-;; (defvar bar-var 'bar)
-;; (custom-get-type bar-var)
-;; (custom-get-type 'bar-var)
-;; (custom-variable-p bar)
-;; (custom-variable-type 'bar)
-;; (custom-variable-type bar-var)
-;; (custom-variable-type 'bar-var)
-
-;; Borrowed from `set-variable'. It might be useful in
-;; `custom-variable-type':
-(defun custom-get-type (variable)
-  "Get the :type declaration from custom VARIABLE."
-  (and (custom-variable-p variable)
-       (not (get variable 'custom-type))
-       (custom-load-symbol variable))
-  (get variable 'custom-type))
-
-;; This function tests the same way as `set-variable' does and could
-;; be used there. However `set-variable' does (require 'cus-edit),
-;; shouldn't that be (require 'wid-edit)?
-(defun custom-type-value-p (value custom-type)
-  "Return non-nil if VALUE matches CUSTOM-TYPE.
-CUSTOM-TYPE could be anything that can be used for the :type
-keyword in `defcustom'.
-
-See `custom-get-type' for how to get CUSTOM-TYPE form a
-custom variable."
-  (require 'wid-edit)
-  (let ((widget (widget-convert custom-type)))
-    (widget-apply widget :match value)))
-
-(defun custom-type-p (val-or-sym custom-type)
-  "Return non-nil if VAL-OR-SYM fits CUSTOM-TYPE.
-VAL-OR-SYM may be either a variable or a symbol. If it is a
-variable then return non-nil if the value fits custom type
-CUSTOM-TYPE.
-
-If it is a symbol then return non-nil if the values this symbol's
-variable can have fits CUSTOM-TYPE."
-  (if (symbolp val-or-sym)
-      (custom-type-symbol-p val-or-sym custom-type)
-    (custom-type-value-p val-or-sym custom-type)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Tests
-
-;; (custom-type-p 'test-color 'color)
-;; (custom-type-p 'test-color 'edit)
-;; (custom-type-p 'test-color 'editable-field)
-;; (custom-type-p test-color 'color)
-;; (get 'test-color 'custom-type)
-;; (setq test-color "bla")
-;; (setq test-color "black")
-
-(defcustom test-color "black"
-  "color test"
-  :type 'color)
-
-(defun max-color-length()
-  (let ((len 0)
-        (longest ""))
-    (mapc (lambda (color)
-            (when (< len (length color))
-              (setq len (length color))
-              (setq longest color)))
-          x-colors)
-    (cons len longest)))
-;; (max-color-length)
-
-(defcustom bar "b[" "yyyyyyy"
-  :type '(choice (integer :tag "WWWWWWWWW")
-                 (regexp :tag "ZZZZZZZZZZZZZ")))
-
-;; (custom-type-symbol-p 'bar (get 'bar 'custom-type))
-
-
diff --git a/elpa-to-submit/nxhtml/util/company-mode/README.txt b/elpa-to-submit/nxhtml/util/company-mode/README.txt
new file mode 100644
index 0000000000..af3d7f5f51
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/README.txt
@@ -0,0 +1 @@
+This is a temporary copy for my changes of company-mode.
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-abbrev.el b/elpa-to-submit/nxhtml/util/company-mode/company-abbrev.el
new file mode 100644
index 0000000000..89d87a6eab
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-abbrev.el
@@ -0,0 +1,43 @@
+;;; company-abbrev.el --- a company-mode completion back-end for abbrev
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+(require 'abbrev)
+
+(defun company-abbrev-insert (match)
+  "Replace MATCH with the expanded abbrev."
+  (expand-abbrev))
+
+;;;###autoload
+(defun company-abbrev (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for abbrev."
+  (interactive (list 'interactive))
+  (case command
+        ('interactive (company-begin-backend 'company-abbrev
+                                             'company-abbrev-insert))
+        ('prefix (company-grab-symbol))
+        ('candidates (nconc
+                      (delete "" (all-completions arg global-abbrev-table))
+                      (delete "" (all-completions arg local-abbrev-table))))
+        ('meta (abbrev-expansion arg))
+        ('require-match t)))
+
+(provide 'company-abbrev)
+;;; company-abbrev.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-autoloads.el b/elpa-to-submit/nxhtml/util/company-mode/company-autoloads.el
new file mode 100644
index 0000000000..b9f4010727
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-autoloads.el
@@ -0,0 +1,229 @@
+;;; company-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (company-mode) "company" "company.el" (19036 64075))
+;;; Generated autoloads from company.el
+
+(autoload 'company-mode "company" "\
+\"complete anything\"; in in-buffer completion framework.
+Completion starts automatically, depending on the values
+`company-idle-delay' and `company-minimum-prefix-length'.
+
+Completion can be controlled with the commands:
+`company-complete-common', `company-complete-selection', `company-complete',
+`company-select-next', `company-select-previous'.  If these commands are
+called before `company-idle-delay', completion will also start.
+
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.  These can be used while completion is
+inactive, as well.
+
+The completion data is retrieved using `company-backends' and displayed using
+`company-frontends'.  If you want to start a specific back-end, call it
+interactively or use `company-begin-backend'.
+
+regular keymap (`company-mode-map'):
+
+\\{company-mode-map}
+keymap during active completions (`company-active-map'):
+
+\\{company-active-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-abbrev) "company-abbrev" "company-abbrev.el"
+;;;;;;  (19036 64074))
+;;; Generated autoloads from company-abbrev.el
+
+(autoload 'company-abbrev "company-abbrev" "\
+A `company-mode' completion back-end for abbrev.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-css) "company-css" "company-css.el" (19036
+;;;;;;  64074))
+;;; Generated autoloads from company-css.el
+
+(autoload 'company-css "company-css" "\
+A `company-mode' completion back-end for `css-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-dabbrev) "company-dabbrev" "company-dabbrev.el"
+;;;;;;  (19036 64074))
+;;; Generated autoloads from company-dabbrev.el
+
+(autoload 'company-dabbrev "company-dabbrev" "\
+A dabbrev-like `company-mode' completion back-end.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-dabbrev-code) "company-dabbrev-code" "company-dabbrev-code.el"
+;;;;;;  (19036 64074))
+;;; Generated autoloads from company-dabbrev-code.el
+
+(autoload 'company-dabbrev-code "company-dabbrev-code" "\
+A dabbrev-like `company-mode' back-end for code.
+The back-end looks for all symbols in the current buffer that aren't in
+comments or strings.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-elisp) "company-elisp" "company-elisp.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-elisp.el
+
+(autoload 'company-elisp "company-elisp" "\
+A `company-mode' completion back-end for `emacs-lisp-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-etags) "company-etags" "company-etags.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-etags.el
+
+(autoload 'company-etags "company-etags" "\
+A `company-mode' completion back-end for etags.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-files) "company-files" "company-files.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-files.el
+
+(autoload 'company-files "company-files" "\
+a `company-mode' completion back-end existing file names.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-gtags) "company-gtags" "company-gtags.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-gtags.el
+
+(autoload 'company-gtags "company-gtags" "\
+A `company-mode' completion back-end for GNU Global.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-ispell) "company-ispell" "company-ispell.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-ispell.el
+
+(autoload 'company-ispell "company-ispell" "\
+A `company-mode' completion back-end using ispell.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-keywords) "company-keywords" "company-keywords.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-keywords.el
+
+(autoload 'company-keywords "company-keywords" "\
+A `company-mode' back-end for programming language keywords.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-nxml) "company-nxml" "company-nxml.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-nxml.el
+
+(autoload 'company-nxml "company-nxml" "\
+A `company-mode' completion back-end for `nxml-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-oddmuse) "company-oddmuse" "company-oddmuse.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-oddmuse.el
+
+(autoload 'company-oddmuse "company-oddmuse" "\
+A `company-mode' completion back-end for `oddmuse-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-pysmell) "company-pysmell" "company-pysmell.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-pysmell.el
+
+(autoload 'company-pysmell "company-pysmell" "\
+A `company-mode' completion back-end for pysmell.
+This requires pysmell.el and pymacs.el.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-semantic) "company-semantic" "company-semantic.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-semantic.el
+
+(autoload 'company-semantic "company-semantic" "\
+A `company-mode' completion back-end using CEDET Semantic.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-tempo) "company-tempo" "company-tempo.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-tempo.el
+
+(autoload 'company-tempo "company-tempo" "\
+A `company-mode' completion back-end for tempo.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads (company-xcode) "company-xcode" "company-xcode.el"
+;;;;;;  (19036 64075))
+;;; Generated autoloads from company-xcode.el
+
+(autoload 'company-xcode "company-xcode" "\
+A `company-mode' completion back-end for Xcode projects.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("company-eclim.el" "company-pkg.el" "company-ropemacs.el")
+;;;;;;  (19036 64075 906000))
+
+;;;***
+
+(provide 'company-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; company-autoloads.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-css.el b/elpa-to-submit/nxhtml/util/company-mode/company-css.el
new file mode 100644
index 0000000000..cff27ab7e1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-css.el
@@ -0,0 +1,355 @@
+;;; company-css.el --- a company-mode completion back-end for css-mode
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defconst company-css-property-alist
+  ;; see http://www.w3.org/TR/CSS21/propidx.html
+  '(("azimuth" angle "left-side" "far-left" "left" "center-left" "center"
+     "center-right" "right" "far-right" "right-side" "behind" "leftwards"
+     "rightwards")
+    ("background" background-color background-image background-repeat
+     background-attachment background-position)
+    ("background-attachment" "scroll" "fixed")
+    ("background-color" color "transparent")
+    ("background-image" uri "none")
+    ("background-position" percentage length "left" "center" "right" percentage
+     length "top" "center" "bottom" "left" "center" "right" "top" "center"
+     "bottom")
+    ("background-repeat" "repeat" "repeat-x" "repeat-y" "no-repeat")
+    ("border" border-width border-style border-color)
+    ("border-bottom" border)
+    ("border-bottom-color" border-color)
+    ("border-bottom-style" border-style)
+    ("border-bottom-width" border-width)
+    ("border-collapse" "collapse" "separate")
+    ("border-color" color "transparent")
+    ("border-left" border)
+    ("border-left-color" border-color)
+    ("border-left-style" border-style)
+    ("border-left-width" border-width)
+    ("border-right" border)
+    ("border-right-color" border-color)
+    ("border-right-style" border-style)
+    ("border-right-width" border-width)
+    ("border-spacing" length length)
+    ("border-style" border-style)
+    ("border-top" border)
+    ("border-top-color" border-color)
+    ("border-top-style" border-style)
+    ("border-top-width" border-width)
+    ("border-width" border-width)
+    ("bottom" length percentage "auto")
+    ("caption-side" "top" "bottom")
+    ("clear" "none" "left" "right" "both")
+    ("clip" shape "auto")
+    ("color" color)
+    ("content" "normal" "none" string uri counter "attr()" "open-quote"
+     "close-quote" "no-open-quote" "no-close-quote")
+    ("counter-increment" identifier integer "none")
+    ("counter-reset" identifier integer "none")
+    ("cue" cue-before cue-after)
+    ("cue-after" uri "none")
+    ("cue-before" uri "none")
+    ("cursor" uri "*" "auto" "crosshair" "default" "pointer" "move" "e-resize"
+     "ne-resize" "nw-resize" "n-resize" "se-resize" "sw-resize" "s-resize"
+     "w-resize" "text" "wait" "help" "progress")
+    ("direction" "ltr" "rtl")
+    ("display" "inline" "block" "list-item" "run-in" "inline-block" "table"
+     "inline-table" "table-row-group" "table-header-group" "table-footer-group"
+     "table-row" "table-column-group" "table-column" "table-cell"
+     "table-caption" "none")
+    ("elevation" angle "below" "level" "above" "higher" "lower")
+    ("empty-cells" "show" "hide")
+    ("float" "left" "right" "none")
+    ("font" font-style font-variant font-weight font-size "/" line-height
+     font-family "caption" "icon" "menu" "message-box" "small-caption"
+     "status-bar")
+    ("font-family" family-name generic-family)
+    ("font-size" absolute-size relative-size length percentage)
+    ("font-style" "normal" "italic" "oblique")
+    ("font-variant" "normal" "small-caps")
+    ("font-weight" "normal" "bold" "bolder" "lighter" "100" "200" "300" "400"
+     "500" "600" "700" "800" "900")
+    ("height" length percentage "auto")
+    ("left" length percentage "auto")
+    ("letter-spacing" "normal" length)
+    ("line-height" "normal" number length percentage)
+    ("list-style" list-style-type list-style-position list-style-image)
+    ("list-style-image" uri "none")
+    ("list-style-position" "inside" "outside")
+    ("list-style-type" "disc" "circle" "square" "decimal" "decimal-leading-zero"
+     "lower-roman" "upper-roman" "lower-greek" "lower-latin" "upper-latin"
+     "armenian" "georgian" "lower-alpha" "upper-alpha" "none")
+    ("margin" margin-width)
+    ("margin-bottom" margin-width)
+    ("margin-left" margin-width)
+    ("margin-right" margin-width)
+    ("margin-top" margin-width)
+    ("max-height" length percentage "none")
+    ("max-width" length percentage "none")
+    ("min-height" length percentage)
+    ("min-width" length percentage)
+    ("orphans" integer)
+    ("outline" outline-color outline-style outline-width)
+    ("outline-color" color "invert")
+    ("outline-style" border-style)
+    ("outline-width" border-width)
+    ("overflow" "visible" "hidden" "scroll" "auto")
+    ("padding" padding-width)
+    ("padding-bottom" padding-width)
+    ("padding-left" padding-width)
+    ("padding-right" padding-width)
+    ("padding-top" padding-width)
+    ("page-break-after" "auto" "always" "avoid" "left" "right")
+    ("page-break-before" "auto" "always" "avoid" "left" "right")
+    ("page-break-inside" "avoid" "auto")
+    ("pause" time percentage)
+    ("pause-after" time percentage)
+    ("pause-before" time percentage)
+    ("pitch" frequency "x-low" "low" "medium" "high" "x-high")
+    ("pitch-range" number)
+    ("play-during" uri "mix" "repeat" "auto" "none")
+    ("position" "static" "relative" "absolute" "fixed")
+    ("quotes" string string "none")
+    ("richness" number)
+    ("right" length percentage "auto")
+    ("speak" "normal" "none" "spell-out")
+    ("speak-header" "once" "always")
+    ("speak-numeral" "digits" "continuous")
+    ("speak-punctuation" "code" "none")
+    ("speech-rate" number "x-slow" "slow" "medium" "fast" "x-fast" "faster"
+     "slower")
+    ("stress" number)
+    ("table-layout" "auto" "fixed")
+    ("text-align" "left" "right" "center" "justify")
+    ("text-decoration" "none" "underline" "overline" "line-through" "blink")
+    ("text-indent" length percentage)
+    ("text-transform" "capitalize" "uppercase" "lowercase" "none")
+    ("top" length percentage "auto")
+    ("unicode-bidi" "normal" "embed" "bidi-override")
+    ("vertical-align" "baseline" "sub" "super" "top" "text-top" "middle"
+     "bottom" "text-bottom" percentage length)
+    ("visibility" "visible" "hidden" "collapse")
+    ("voice-family" specific-voice generic-voice "*" specific-voice
+     generic-voice)
+    ("volume" number percentage "silent" "x-soft" "soft" "medium" "loud"
+     "x-loud")
+    ("white-space" "normal" "pre" "nowrap" "pre-wrap" "pre-line")
+    ("widows" integer)
+    ("width" length percentage "auto")
+    ("word-spacing" "normal" length)
+    ("z-index" "auto" integer))
+  "A list of CSS properties and their possible values.")
+
+(defconst company-css-value-classes
+  '((absolute-size "xx-small" "x-small" "small" "medium" "large" "x-large"
+                   "xx-large")
+    (border-style "none" "hidden" "dotted" "dashed" "solid" "double" "groove"
+                  "ridge" "inset" "outset")
+    (color "aqua" "black" "blue" "fuchsia" "gray" "green" "lime" "maroon" "navy"
+           "olive" "orange" "purple" "red" "silver" "teal" "white" "yellow")
+    (counter "counter(,)")
+    (family-name "Courier" "Helvetica" "Times")
+    (generic-family "serif" "sans-serif" "cursive" "fantasy" "monospace")
+    (generic-voice "male" "female" "child")
+    (margin-width "auto") ;; length percentage
+    (relative-size "larger" "smaller")
+    (shape "rect(,,,)")
+    (uri "url()"))
+  "A list of CSS property value classes and their contents.")
+;; missing, because not completable
+;; <angle><frequency><identifier><integer><length><number><padding-width>
+;; <percentage><specific-voice><string><time><uri>
+
+
+;; 18.2 System Colors
+;;
+;; Note. The System Colors are deprecated in the CSS3 Color Module
+;; [CSS3COLOR].
+;;
+;; In addition to being able to assign pre-defined color values to
+;; text, backgrounds, etc., CSS2 introduced a set of named color
+;; values that allows authors to specify colors in a manner that
+;; integrates them into the operating system's graphic environment.
+;;
+;; For systems that do not have a corresponding value, the specified
+;; value should be mapped to the nearest system value, or to a default
+;; color.
+;;
+;; The following lists additional values for color-related CSS
+;; properties and their general meaning. Any color property (e.g.,
+;; 'color' or 'background-color') can take one of the following
+;; names. Although these are case-insensitive, it is recommended that
+;; the mixed capitalization shown below be used, to make the names
+;; more legible.
+
+(defconst company-css-system-colors
+  '((ActiveBorder "Active window border")
+    (ActiveCaption "Active window caption")
+    (AppWorkspace "Background color of multiple document interface")
+    (Background "Desktop background")
+    (ButtonFace "Face color for three-dimensional display elements")
+    (ButtonHighlight "Highlight color for three-dimensional display elements (for edges facing away from the light source)")
+    (ButtonShadow "Shadow color for three-dimensional display elements")
+    (ButtonText "Text on push buttons")
+    (CaptionText "Text in caption, size box, and scrollbar arrow box")
+    (GrayText "Grayed (disabled) text. This color is set to #000 if the current display driver does not support a solid gray color")
+    (Highlight "Item(s) selected in a control")
+    (HighlightText "Text of item(s) selected in a control")
+    (InactiveBorder "Inactive window border")
+    (InactiveCaption "Inactive window caption")
+    (InactiveCaptionText "Color of text in an inactive caption")
+    (InfoBackground "Background color for tooltip controls")
+    (InfoText "Text color for tooltip controls")
+    (Menu "Menu background")
+    (MenuText "Text in menus")
+    (Scrollbar "Scroll bar gray area")
+    (ThreeDDarkShadow "Dark shadow for three-dimensional display elements")
+    (ThreeDFace "Face color for three-dimensional display elements")
+    (ThreeDHighlight "Highlight color for three-dimensional display elements")
+    (ThreeDLightShadow "Light color for three-dimensional display elements (for edges facing the light source)")
+    (ThreeDShadow "Dark shadow for three-dimensional display elements")
+    (Window "Window background")
+    (WindowFrame "Window frame")
+    (WindowText "Text in windows"))
+  "CSS2 system colors.
+Note. The System Colors are deprecated in the CSS3 Color Module.")
+
+
+
+(defconst company-css-html-tags
+  '("a" "abbr" "acronym" "address" "applet" "area" "b" "base" "basefont" "bdo"
+    "big" "blockquote" "body" "br" "button" "caption" "center" "cite" "code"
+    "col" "colgroup" "dd" "del" "dfn" "dir" "div" "dl" "dt" "em" "fieldset"
+    "font" "form" "frame" "frameset" "h1" "h2" "h3" "h4" "h5" "h6" "head" "hr"
+    "html" "i" "iframe" "img" "input" "ins" "isindex" "kbd" "label" "legend"
+    "li" "link" "map" "menu" "meta" "noframes" "noscript" "object" "ol"
+    "optgroup" "option" "p" "param" "pre" "q" "s" "samp" "script" "select"
+    "small" "span" "strike" "strong" "style" "sub" "sup" "table" "tbody" "td"
+    "textarea" "tfoot" "th" "thead" "title" "tr" "tt" "u" "ul" "var")
+  "A list of HTML tags for use in CSS completion.")
+
+(defconst company-css-pseudo-classes
+  '("active" "after" "before" "first" "first-child" "first-letter" "first-line"
+    "focus" "hover" "lang" "left" "link" "right" "visited")
+  "Identifiers for CSS pseudo-elements and pseudo-classes.")
+
+(defconst company-css-property-cache (make-hash-table :size 115 :test 'equal))
+
+(defun company-css-property-values (attribute)
+  "Access the `company-css-property-alist' cached and flattened."
+  (or (gethash attribute company-css-property-cache)
+      (let (results)
+        (dolist (value (cdr (assoc attribute company-css-property-alist)))
+          (if (symbolp value)
+              (dolist (child (or (cdr (assoc value company-css-value-classes))
+                                 (company-css-property-values
+                                  (symbol-name value))))
+                (add-to-list 'results child))
+            (add-to-list 'results value)))
+        (setq results (sort results 'string<))
+        (puthash attribute results company-css-property-cache)
+        results)))
+
+;;; bracket detection
+
+(defconst company-css-braces-syntax-table
+  (let ((table (make-syntax-table)))
+    (setf (aref table ?{) '(4 . 125))
+    (setf (aref table ?}) '(5 . 123))
+    table)
+  "A syntax table giving { and } paren syntax.")
+
+(defun company-css-inside-braces-p ()
+  "Return non-nil, if point is within matched { and }."
+  (ignore-errors
+    (with-syntax-table company-css-braces-syntax-table
+      (let ((parse-sexp-ignore-comments t))
+        (scan-lists (point) -1 1)))))
+
+;;; tags
+(defconst company-css-tag-regexp
+  (concat "\\(?:\\`\\|}\\|\*/\\|);\\)[[:space:]]*"
+          ;; multiple
+          "\\(?:"
+          ;; previous tags:
+          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
+          ;; space or selectors
+          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
+          "\\)*"
+          "\\(\\(?:#\\|\\_<[[:alpha:]]\\)\\(?:[[:alnum:]-#]*\\_>\\)?\\_>\\|\\)"
+          "\\=")
+  "A regular expression matching CSS tags")
+
+;;; pseudo id
+(defconst company-css-pseudo-regexp
+  (concat "\\(?:\\`\\|}\\|\*/\\)[[:space:]]*"
+          ;; multiple
+          "\\(?:"
+          ;; previous tags:
+          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
+          ;; space or delimiters
+          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
+          "\\)*"
+          "\\(?:\\(?:\\#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\):"
+          "\\([[:alpha:]-]+\\_>\\|\\)\\_>\\=")
+  "A regular expression matching CSS pseudo classes")
+
+;;; properties
+
+(defun company-css-grab-property ()
+  "Return the CSS property before point, if any.
+Returns \"\" if no property found, but feasible at this position."
+  (when (company-css-inside-braces-p)
+    (company-grab-symbol)))
+
+;;; values
+(defconst company-css-property-value-regexp
+  "\\_<\\([[:alpha:]-]+\\):\\(?:[^};]*[[:space:]]+\\)?\\([^};]*\\_>\\|\\)\\="
+  "A regular expression matching CSS tags")
+
+;;;###autoload
+(defun company-css (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for `css-mode'."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-css))
+    ('prefix (and (eq major-mode 'css-mode)
+                  (or (company-grab company-css-tag-regexp 1)
+                      (company-grab company-css-pseudo-regexp 1)
+                      (company-grab company-css-property-value-regexp 2)
+                      (company-css-grab-property))))
+    ('candidates
+     (cond
+      ((company-grab company-css-tag-regexp 1)
+       (all-completions arg company-css-html-tags))
+      ((company-grab company-css-pseudo-regexp 1)
+       (all-completions arg company-css-pseudo-classes))
+      ((company-grab company-css-property-value-regexp 2)
+       (all-completions arg
+                        (company-css-property-values
+                         (company-grab company-css-property-value-regexp 1))))
+      ((company-css-grab-property)
+       (all-completions arg company-css-property-alist))))
+    ('sorted t)))
+
+(provide 'company-css)
+;;; company-css.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev-code.el b/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev-code.el
new file mode 100644
index 0000000000..d34047d6e1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev-code.el
@@ -0,0 +1,81 @@
+;;; company-dabbrev-code.el --- a dabbrev-like company-mode back-end for code
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(require 'company-dabbrev)
+(eval-when-compile (require 'cl))
+
+(defcustom company-dabbrev-code-modes
+  '(asm-mode batch-file-mode c++-mode c-mode cperl-mode csharp-mode css-mode
+    emacs-lisp-mode erlang-mode espresso-mode f90-mode fortran-mode
+    haskell-mode java-mode javascript-mode jde-mode js2-mode lisp-mode
+    lua-mode objc-mode perl-mode php-mode python-mode ruby-mode scheme-mode
+    shell-script-mode)
+  "*Modes that use `company-dabbrev-code'.
+In all these modes `company-dabbrev-code' will complete only symbols, not text
+in comments or strings.  In other modes `company-dabbrev-code' will pass control
+to other back-ends \(e.g. `company-dabbrev'\).
+Value t means complete in all modes."
+  :group 'company
+  :type '(choice (repeat (symbol :tag "Major mode"))
+                 (const tag "All modes" t)))
+
+(defcustom company-dabbrev-code-other-buffers t
+  "*Determines whether `company-dabbrev-code' should search other buffers.
+If 'all, search all other buffers.  If t, search buffers with the same
+major-mode.
+See also `company-dabbrev-code-time-limit'."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "Same major mode" t)
+                 (const :tag "All" all)))
+
+(defcustom company-dabbrev-code-time-limit .5
+  "*Determines how long `company-dabbrev-code' should look for matches."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (number :tag "Seconds")))
+
+(defsubst company-dabbrev-code--make-regexp (prefix)
+  (concat "\\_<" (if (equal prefix "")
+                     "\\([a-zA-Z]\\|\\s_\\)"
+                   (regexp-quote prefix))
+          "\\(\\sw\\|\\s_\\)*\\_>"))
+
+;;;###autoload
+(defun company-dabbrev-code (command &optional arg &rest ignored)
+  "A dabbrev-like `company-mode' back-end for code.
+The back-end looks for all symbols in the current buffer that aren't in
+comments or strings."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-dabbrev-code))
+    ('prefix (and (or (eq t company-dabbrev-code-modes)
+                      (apply 'derived-mode-p company-dabbrev-code-modes))
+                  (not (company-in-string-or-comment))
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates (let ((completion-ignore-case nil))
+                   (company-dabbrev--search
+                    (company-dabbrev-code--make-regexp arg)
+                    company-dabbrev-code-time-limit
+                    company-dabbrev-code-other-buffers t)))
+    ('duplicates t)))
+
+(provide 'company-dabbrev-code)
+;;; company-dabbrev-code.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev.el b/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev.el
new file mode 100644
index 0000000000..c7e0fbaccc
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-dabbrev.el
@@ -0,0 +1,118 @@
+;;; company-dabbrev.el --- a dabbrev-like company-mode completion back-end
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defcustom company-dabbrev-other-buffers 'all
+  "*Determines whether `company-dabbrev' should search other buffers.
+If 'all, search all other buffers.  If t, search buffers with the same
+major-mode.
+See also `company-dabbrev-time-limit'."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "Same major mode" t)
+                 (const :tag "All" all)))
+
+(defcustom company-dabbrev-time-limit .5
+  "*Determines how many seconds `company-dabbrev' should look for matches."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (number :tag "Seconds")))
+
+(defcustom company-dabbrev-char-regexp "\\sw"
+  "*A regular expression matching the characters `company-dabbrev' looks for."
+  :group 'company
+  :type 'regexp)
+
+(defmacro company-dabrev--time-limit-while (test start limit &rest body)
+  (declare (indent 3) (debug t))
+  `(let ((company-time-limit-while-counter 0))
+     (catch 'done
+       (while ,test
+         ,@body
+         (and ,limit
+              (eq (incf company-time-limit-while-counter) 25)
+              (setq company-time-limit-while-counter 0)
+              (> (float-time (time-since ,start)) ,limit)
+              (throw 'done 'company-time-out))))))
+
+(defsubst company-dabbrev--make-regexp (prefix)
+  (concat "\\<" (if (equal prefix "")
+              company-dabbrev-char-regexp
+            (regexp-quote prefix))
+          "\\(" company-dabbrev-char-regexp "\\)*\\>"))
+
+(defun company-dabbrev--search-buffer (regexp pos symbols start limit
+                                       ignore-comments)
+  (save-excursion
+    (let (match)
+      (goto-char (if pos (1- pos) (point-min)))
+      ;; search before pos
+      (company-dabrev--time-limit-while (re-search-backward regexp nil t)
+          start limit
+        (setq match (match-string-no-properties 0))
+        (if (and ignore-comments (company-in-string-or-comment))
+            (re-search-backward "\\s<\\|\\s!\\|\\s\"\\|\\s|" nil t)
+          (push match symbols)))
+      (goto-char (or pos (point-min)))
+      ;; search after pos
+      (company-dabrev--time-limit-while (re-search-forward regexp nil t)
+          start limit
+        (setq match (match-string-no-properties 0))
+        (if (and ignore-comments (company-in-string-or-comment))
+            (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)
+          (push match symbols)))
+      symbols)))
+
+(defun company-dabbrev--search (regexp &optional limit other-buffers
+                                ignore-comments)
+  (let* ((start (current-time))
+         (symbols (company-dabbrev--search-buffer regexp (point) nil start limit
+                                                  ignore-comments)))
+    (when other-buffers
+      (dolist (buffer (delq (current-buffer) (buffer-list)))
+        (and (or (eq other-buffers 'all)
+                 (eq (buffer-local-value 'major-mode buffer) major-mode))
+             (with-current-buffer buffer
+               (setq symbols
+                     (company-dabbrev--search-buffer regexp nil symbols start
+                                                     limit ignore-comments))))
+        (and limit
+             (> (float-time (time-since start)) limit)
+             (return))))
+    symbols))
+
+;;;###autoload
+(defun company-dabbrev (command &optional arg &rest ignored)
+  "A dabbrev-like `company-mode' completion back-end."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-dabbrev))
+    ('prefix (company-grab-word))
+    ('candidates
+     (mapcar 'downcase
+             (company-dabbrev--search (company-dabbrev--make-regexp arg)
+                                      company-dabbrev-time-limit
+                                      company-dabbrev-other-buffers)))
+    ('ignore-case t)
+    ('duplicates t)))
+
+(provide 'company-dabbrev)
+;;; company-dabbrev.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-eclim.el b/elpa-to-submit/nxhtml/util/company-mode/company-eclim.el
new file mode 100644
index 0000000000..fe41239979
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-eclim.el
@@ -0,0 +1,138 @@
+;;; company-eclim.el --- a company-mode completion back-end for eclim.
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defun company-eclim-executable-find ()
+  (let (file)
+    (dolist (eclipse-root '("/Applications/eclipse" "/usr/lib/eclipse"
+                            "/usr/local/lib/eclipse"))
+      (and (file-exists-p (setq file (expand-file-name "plugins" eclipse-root)))
+           (setq file (car (last (directory-files file t "^org.eclim_"))))
+           (file-exists-p (setq file (expand-file-name "bin/eclim" file)))
+           (return file)))))
+
+(defcustom company-eclim-executable
+  (or (executable-find "eclim") (company-eclim-executable-find))
+  "*Location of eclim executable"
+  :group 'company
+  :type 'file)
+
+(defcustom company-eclim-auto-save nil
+  "*Determines whether to save the buffer when retrieving completions.
+eclim can only complete correctly when the buffer has been saved."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On" t)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-eclim--project-dir 'unknown)
+(make-variable-buffer-local 'company-eclim--project-dir)
+
+(defvar company-eclim--project-name 'unknown)
+(make-variable-buffer-local 'company-eclim--project-name)
+
+(defvar company-eclim--doc nil)
+(make-variable-buffer-local 'company-eclim--doc)
+
+(defun company-eclim--buffer-lines ()
+  (goto-char (point-max))
+  (let (lines)
+    (while (= 0 (forward-line -1))
+      (push (buffer-substring-no-properties (point-at-bol) (point-at-eol))
+            lines))
+    lines))
+
+(defun company-eclim--call-process (&rest args)
+  (let ((coding-system-for-read 'utf-8)
+        res)
+    (with-temp-buffer
+      (if (= 0 (setq res (apply 'call-process company-eclim-executable nil t nil
+                                "-command" args)))
+          (company-eclim--buffer-lines)
+        (message "Company-eclim command failed with error %d:\n%s" res
+                 (buffer-substring (point-min) (point-max)))
+        nil))))
+
+(defun company-eclim--project-list ()
+  (mapcar (lambda (line) (nreverse (split-string line " *- *" nil)))
+          (company-eclim--call-process "project_list")))
+
+(defun company-eclim--project-dir ()
+  (if (eq company-eclim--project-dir 'unknown)
+      (setq company-eclim--project-dir
+            (directory-file-name
+             (expand-file-name
+              (company-locate-dominating-file buffer-file-name ".project"))))
+    company-eclim--project-dir))
+
+(defun company-eclim--project-name ()
+  (if (eq company-eclim--project-name 'unknown)
+      (setq company-eclim--project-name
+            (car (cddr (assoc (company-eclim--project-dir)
+                              (company-eclim--project-list)))))
+    company-eclim--project-name))
+
+(defun company-eclim--candidates (prefix)
+  (interactive "d")
+  (let ((project-file (file-relative-name buffer-file-name
+                                          (company-eclim--project-dir)))
+        (project-name (company-eclim--project-name)))
+    (when company-eclim-auto-save
+      (save-buffer)
+      ;; FIXME: Sometimes this isn't finished when we complete.
+      (company-eclim--call-process "java_src_update"
+                                  "-p" (company-eclim--project-name)
+                                  "-f" project-file))
+    (setq company-eclim--doc
+          (mapcar (lambda (line)
+                    (cdr (split-string line "|" nil)))
+                  (company-eclim--call-process
+                   "java_complete" "-p" (company-eclim--project-name)
+                   "-f" project-file
+                   "-o" (number-to-string (1- (point)))
+                   "-e" "utf-8"
+                   "-l" "standard"))))
+  (let ((completion-ignore-case nil))
+    (all-completions prefix (mapcar 'car company-eclim--doc))))
+
+(defun company-eclim (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for eclim.
+eclim provides access to Eclipse Java IDE features for other editors.
+
+Completions only work correctly when the buffer has been saved.
+`company-eclim-auto-save' determines whether to do this automatically."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-eclim))
+    ('prefix (and (derived-mode-p 'java-mode 'jde-mode)
+                  buffer-file-name
+                  company-eclim-executable
+                  (company-eclim--project-name)
+                  (not (company-in-string-or-comment))
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates (company-eclim--candidates arg))
+    ('meta (cadr (assoc arg company-eclim--doc)))
+    ;; because "" doesn't return everything
+    ('no-cache (equal arg ""))))
+
+(provide 'company-eclim)
+;;; company-eclim.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-elisp.el b/elpa-to-submit/nxhtml/util/company-mode/company-elisp.el
new file mode 100644
index 0000000000..316ddf2898
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-elisp.el
@@ -0,0 +1,128 @@
+;;; company-elisp.el --- a company-mode completion back-end for emacs-lisp-mode
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+(require 'help-mode)
+
+(defcustom company-elisp-detect-function-context t
+  "*If enabled, offer lisp functions only in appropriate contexts.
+Functions are offered for completion only after ' and \(."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On" t)))
+
+(defun company-grab-lisp-symbol ()
+  (let ((prefix (company-grab-symbol)))
+    (if prefix
+        (unless (and (company-in-string-or-comment)
+                     (/= (char-before (- (point) (length prefix))) ?`))
+          prefix)
+      'stop)))
+
+(defun company-elisp-predicate (symbol)
+  (or (boundp symbol)
+      (fboundp symbol)))
+
+(defvar company-elisp-parse-limit 30)
+(defvar company-elisp-parse-depth 100)
+
+(defvar company-elisp-binding-regexp
+  (concat "([ \t\n]*\\_<" (regexp-opt '("let" "defun" "defmacro" "defsubst"
+                                        "lambda" "lexical-let" "flet" "labels"))
+          "\\*?")
+  "Regular expression matching sexps containing variable bindings.")
+
+(defvar company-elisp-binding-regexp-1
+  (concat "([ \t\n]*\\_<" (regexp-opt '("dolist" "dotimes")))
+  "Regular expression matching sexps containing one variable binding.")
+
+(defun company-elisp-parse-local (prefix vars)
+  (let ((regexp (concat "[ \t\n]*\\(\\_<" (regexp-quote prefix)
+                        "\\(?:\\sw\\|\\s_\\)*\\_>\\)"))
+        (pos (point)))
+    (ignore-errors
+      (save-excursion
+        (dotimes (i company-elisp-parse-depth)
+          (up-list -1)
+          (save-excursion
+            (cond
+             ((looking-at company-elisp-binding-regexp)
+              (down-list 2)
+              (ignore-errors
+                (dotimes (i company-elisp-parse-limit)
+                  (save-excursion
+                    (when (looking-at "[ \t\n]*(")
+                      (down-list 1))
+                    (and (looking-at regexp)
+                         ;; Don't add incomplete text as candidate.
+                         (not (eq (match-end 0) pos))
+                         (add-to-list 'vars (match-string-no-properties 1))))
+                  (forward-sexp))))
+             ((looking-at company-elisp-binding-regexp-1)
+              (down-list 2)
+              (and (looking-at regexp)
+                   ;; Don't add incomplete text as candidate.
+                   (not (eq (match-end 0) pos))
+                   (add-to-list 'vars (match-string-no-properties 1)))))))))
+    vars))
+
+(defun company-elisp-candidates (prefix)
+  (let* ((completion-ignore-case nil)
+         (before (char-before (- (point) (length prefix))))
+         (predicate (if (and company-elisp-detect-function-context
+                             (not (eq before ?')))
+                        (if (eq before ?\()
+                            'fboundp
+                          'boundp)
+                      'company-elisp-predicate))
+         (candidates (all-completions prefix obarray predicate)))
+    (company-elisp-parse-local prefix candidates)))
+
+(defun company-elisp-doc (symbol)
+  (let* ((symbol (intern symbol))
+         (doc (if (fboundp symbol)
+                  (documentation symbol t)
+                (documentation-property symbol 'variable-documentation t))))
+    (and (stringp doc)
+         (string-match ".*$" doc)
+         (match-string 0 doc))))
+
+;;;###autoload
+(defun company-elisp (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for `emacs-lisp-mode'."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-elisp))
+    ('prefix (and (eq (derived-mode-p 'emacs-lisp-mode) 'emacs-lisp-mode)
+                  (company-grab-lisp-symbol)))
+    ('candidates (company-elisp-candidates arg))
+    ('meta (company-elisp-doc arg))
+    ('doc-buffer (let ((symbol (intern arg)))
+                   (save-window-excursion
+                     (when (or (ignore-errors (describe-function symbol))
+                               (ignore-errors (describe-variable symbol)))
+                       (help-buffer)))))
+    ('location (let ((sym (intern arg)))
+                 (or (ignore-errors (find-definition-noselect sym nil))
+                     (ignore-errors (find-definition-noselect sym 'defvar))
+                     (ignore-errors (find-definition-noselect sym t)))))))
+
+(provide 'company-elisp)
+;;; company-elisp.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-etags.el b/elpa-to-submit/nxhtml/util/company-mode/company-etags.el
new file mode 100644
index 0000000000..6a514b02f4
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-etags.el
@@ -0,0 +1,75 @@
+;;; company-etags.el --- a company-mode completion back-end for etags
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'etags))
+(eval-when-compile (require 'cl))
+
+(defcustom company-etags-use-main-table-list t
+  "*Always search `tags-table-list' if set.
+If this is disabled, `company-etags' will try to find the one table for each
+buffer automatically."
+  :group 'company-mode
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "on" t)))
+
+(defvar company-etags-modes '(c-mode objc-mode c++-mode java-mode jde-mode
+                              pascal-mode perl-mode python-mode))
+
+(defvar company-etags-buffer-table 'unknown)
+(make-variable-buffer-local 'company-etags-buffer-table)
+
+(defun company-etags-find-table ()
+  (let ((file (company-locate-dominating-file (or buffer-file-name
+                                                  default-directory)
+                                              "TAGS")))
+    (when file
+      (list (expand-file-name file)))))
+
+(defun company-etags-buffer-table ()
+  (or (and company-etags-use-main-table-list tags-table-list)
+      (if (eq company-etags-buffer-table 'unknown)
+          (setq company-etags-buffer-table (company-etags-find-table))
+        company-etags-buffer-table)))
+
+;;;###autoload
+(defun company-etags (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for etags."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-etags))
+    ('prefix (and (memq major-mode company-etags-modes)
+                  (not (company-in-string-or-comment))
+                  (require 'etags nil t)
+                  (company-etags-buffer-table)
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates (let ((tags-table-list (company-etags-buffer-table))
+                       (completion-ignore-case nil))
+                   (and (or tags-file-name tags-table-list)
+                        (fboundp 'tags-completion-table)
+                        tags-table-list
+                        (all-completions arg (tags-completion-table)))))
+    ('location (let ((tags-table-list (company-etags-buffer-table)))
+                 (when (fboundp 'find-tag-noselect)
+                   (let ((buffer (find-tag-noselect arg)))
+                     (cons buffer (with-current-buffer buffer (point)))))))
+    ('sorted t)))
+
+(provide 'company-etags)
+;;; company-etags.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-files.el b/elpa-to-submit/nxhtml/util/company-mode/company-files.el
new file mode 100644
index 0000000000..93d71137fa
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-files.el
@@ -0,0 +1,80 @@
+;;; company-files.el --- a company-mode completion back-end for file names
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defun company-files-directory-files (dir prefix)
+  (ignore-errors
+    (if (equal prefix "")
+        (directory-files dir nil "\\`[^.]\\|\\`.[^.]")
+      (file-name-all-completions prefix dir))))
+
+(defvar company-files-regexps
+  (let ((begin (if (eq system-type 'windows-nt)
+                   "[a-z][A-Z]\\"
+                 "~?/")))
+    (list (concat "\"\\(" begin "[^\"\n]*\\)")
+          (concat "\'\\(" begin "[^\'\n]*\\)")
+          (concat "\\(?:[ \t]\\|^\\)\\(" begin "[^ \t\n]*\\)"))))
+
+(defun company-files-grab-existing-name ()
+  ;; Grab file names with spaces, only when they include quotes.
+  (let (file dir)
+    (and (dolist (regexp company-files-regexps)
+           (when (setq file (company-grab-line regexp 1))
+             (return file)))
+         (setq dir (file-name-directory file))
+         (not (string-match "//" dir))
+         (file-exists-p dir)
+         (file-name-all-completions (file-name-nondirectory file) dir)
+         file)))
+
+(defvar company-files-completion-cache nil)
+
+(defun company-files-complete (prefix)
+  (let* ((dir (file-name-directory prefix))
+         (file (file-name-nondirectory prefix))
+         candidates)
+    (unless (equal dir (car company-files-completion-cache))
+      (dolist (file (company-files-directory-files dir file))
+        (setq file (concat dir file))
+        (push file candidates)
+        (when (file-directory-p file)
+          ;; Add one level of children.
+          (dolist (child (company-files-directory-files file ""))
+            (push (concat file child) candidates))))
+      (setq company-files-completion-cache (cons dir (nreverse candidates))))
+    (cdr company-files-completion-cache)))
+
+;;;###autoload
+(defun company-files (command &optional arg &rest ignored)
+  "a `company-mode' completion back-end existing file names."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-files))
+    ('prefix (company-files-grab-existing-name))
+    ('candidates (company-files-complete arg))
+    ('location (cons (dired-noselect
+                      (file-name-directory (directory-file-name arg))) 1))
+    ('sorted t)
+    ('no-cache t)))
+
+(provide 'company-files)
+;;; company-files.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-gtags.el b/elpa-to-submit/nxhtml/util/company-mode/company-gtags.el
new file mode 100644
index 0000000000..aa1b31203c
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-gtags.el
@@ -0,0 +1,79 @@
+;;; company-gtags.el --- a company-mode completion back-end for GNU Global
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defcustom company-gtags-executable
+  (executable-find "global")
+  "*Location of GNU global executable"
+  :type 'string
+  :group 'company)
+
+(define-obsolete-variable-alias
+  'company-gtags-gnu-global-program-name
+  'company-gtags-executable)
+
+(defvar company-gtags--tags-available-p 'unknown)
+(make-variable-buffer-local 'company-gtags--tags-available-p)
+
+(defvar company-gtags-modes '(c-mode c++-mode jde-mode java-mode php-mode))
+
+(defun company-gtags--tags-available-p ()
+  (if (eq company-gtags--tags-available-p 'unknown)
+      (setq company-gtags--tags-available-p
+            (company-locate-dominating-file buffer-file-name "GTAGS"))
+    company-gtags--tags-available-p))
+
+(defun company-gtags-fetch-tags (prefix)
+  (with-temp-buffer
+    (let (tags)
+      (when (= 0 (call-process company-gtags-executable nil
+                               (list (current-buffer) nil) nil "-c" prefix))
+        (goto-char (point-min))
+        (split-string (buffer-string) "\n" t)))))
+
+(defun company-gtags-location (tag)
+  (with-temp-buffer
+    (when (= 0 (call-process company-gtags-executable nil
+                             (list (current-buffer) nil) nil "-x" tag))
+        (goto-char (point-min))
+        (when (looking-at (concat (regexp-quote tag)
+                                  "[ \t]+\\([[:digit:]]+\\)"
+                                  "[ \t]+\\([^ \t]+\\)"))
+          (cons (expand-file-name (match-string 2))
+                (string-to-number (match-string 1)))))))
+
+;;;###autoload
+(defun company-gtags (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for GNU Global."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-gtags))
+    ('prefix (and company-gtags-executable
+                  (memq major-mode company-gtags-modes)
+                  (not (company-in-string-or-comment))
+                  (company-gtags--tags-available-p)
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates (company-gtags-fetch-tags arg))
+    ('sorted t)
+    ('location (company-gtags-location arg))))
+
+(provide 'company-gtags)
+;;; company-gtags.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-ispell.el b/elpa-to-submit/nxhtml/util/company-mode/company-ispell.el
new file mode 100644
index 0000000000..6b304585e1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-ispell.el
@@ -0,0 +1,58 @@
+;;; company-ispell.el --- a company-mode completion back-end using ispell
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(require 'ispell)
+(eval-when-compile (require 'cl))
+
+(defcustom company-ispell-dictionary nil
+  "*Dictionary to use for `company-ispell'.
+If nil, use `ispell-complete-word-dict'."
+  :group 'company
+  :type '(choice (const :tag "default (nil)" nil)
+                 (file :tag "dictionary" t)))
+
+(defvar company-ispell-available 'unknown)
+
+(defun company-ispell-available ()
+  (when (eq company-ispell-available 'unknown)
+    (condition-case err
+        (progn
+          (lookup-words "WHATEVER")
+          (setq company-ispell-available t))
+      (error
+       (message "Company: ispell-look-command not found")
+       (setq company-ispell-available nil))))
+  company-ispell-available)
+
+;;;###autoload
+(defun company-ispell (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end using ispell."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-ispell))
+    ('prefix (when (company-ispell-available)
+               (company-grab-word)))
+    ('candidates (lookup-words arg (or company-ispell-dictionary
+                                       ispell-complete-word-dict)))
+    ('sorted t)
+    ('ignore-case t)))
+
+(provide 'company-ispell)
+;;; company-ispell.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-keywords.el b/elpa-to-submit/nxhtml/util/company-mode/company-keywords.el
new file mode 100644
index 0000000000..a42f6410ea
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-keywords.el
@@ -0,0 +1,229 @@
+;;; company-keywords.el --- a company back-end for programming language keywords
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defun company-keywords-upper-lower (&rest lst)
+  ;; Upcase order is different for _.
+  (nconc (sort (mapcar 'upcase lst) 'string<) lst))
+
+(defvar company-keywords-alist
+  ;; Please contribute corrections or additions.
+  `((c++-mode
+     "asm" "auto" "bool" "break" "case" "catch" "char" "class" "const"
+     "const_cast" "continue" "default" "delete" "do" "double" "dynamic_cast"
+     "else" "enum" "explicit" "export" "extern" "false" "float" "for" "friend"
+     "goto" "if" "inline" "int" "long" "mutable" "namespace" "new"
+     "operator" "private" "protected" "public" "register" "reinterpret_cast"
+     "return" "short" "signed" "sizeof" "static" "static_cast" "struct" "switch"
+     "template" "this" "throw" "true" "try" "typedef" "typeid" "typename"
+     "union" "unsigned" "using" "virtual" "void" "volatile" "wchar_t" "while")
+    (c-mode
+     "auto" "break" "case" "char" "const" "continue" "default" "do"
+     "double" "else" "enum" "extern" "float" "for" "goto" "if" "int" "long"
+     "register" "return" "short" "signed" "sizeof" "static" "struct"
+     "switch" "typedef" "union" "unsigned" "void" "volatile" "while")
+    (csharp-mode
+     "abstract" "add" "alias" "as" "base" "bool" "break" "byte" "case"
+     "catch" "char" "checked" "class" "const" "continue" "decimal" "default"
+     "delegate" "do" "double" "else" "enum" "event" "explicit" "extern"
+     "false" "finally" "fixed" "float" "for" "foreach" "get" "global" "goto"
+     "if" "implicit" "in" "int" "interface" "internal" "is" "lock" "long"
+     "namespace" "new" "null" "object" "operator" "out" "override" "params"
+     "partial" "private" "protected" "public" "readonly" "ref" "remove"
+     "return" "sbyte" "sealed" "set" "short" "sizeof" "stackalloc" "static"
+     "string" "struct" "switch" "this" "throw" "true" "try" "typeof" "uint"
+     "ulong" "unchecked" "unsafe" "ushort" "using" "value" "var" "virtual"
+     "void" "volatile" "where" "while" "yield")
+    (d-mode
+     ;; from http://www.digitalmars.com/d/2.0/lex.html
+     "abstract" "alias" "align" "asm"
+     "assert" "auto" "body" "bool" "break" "byte" "case" "cast" "catch"
+     "cdouble" "cent" "cfloat" "char" "class" "const" "continue" "creal"
+     "dchar" "debug" "default" "delegate" "delete" "deprecated" "do"
+     "double" "else" "enum" "export" "extern" "false" "final" "finally"
+     "float" "for" "foreach" "foreach_reverse" "function" "goto" "idouble"
+     "if" "ifloat" "import" "in" "inout" "int" "interface" "invariant"
+     "ireal" "is" "lazy" "long" "macro" "mixin" "module" "new" "nothrow"
+     "null" "out" "override" "package" "pragma" "private" "protected"
+     "public" "pure" "real" "ref" "return" "scope" "short" "static" "struct"
+     "super" "switch" "synchronized" "template" "this" "throw" "true" "try"
+     "typedef" "typeid" "typeof" "ubyte" "ucent" "uint" "ulong" "union"
+     "unittest" "ushort" "version" "void" "volatile" "wchar" "while" "with")
+    (f90-mode .
+     ;; from f90.el
+     ;; ".AND." ".GE." ".GT." ".LT." ".LE." ".NE." ".OR." ".TRUE." ".FALSE."
+     ,(company-keywords-upper-lower
+      "abs" "abstract" "achar" "acos" "adjustl" "adjustr" "aimag" "aint"
+      "align" "all" "all_prefix" "all_scatter" "all_suffix" "allocatable"
+      "allocate" "allocated" "and" "anint" "any" "any_prefix" "any_scatter"
+      "any_suffix" "asin" "assign" "assignment" "associate" "associated"
+      "asynchronous" "atan" "atan2" "backspace" "bind" "bit_size" "block"
+      "btest" "c_alert" "c_associated" "c_backspace" "c_bool"
+      "c_carriage_return" "c_char" "c_double" "c_double_complex" "c_f_pointer"
+      "c_f_procpointer" "c_float" "c_float_complex" "c_form_feed" "c_funloc"
+      "c_funptr" "c_horizontal_tab" "c_int" "c_int16_t" "c_int32_t" "c_int64_t"
+      "c_int8_t" "c_int_fast16_t" "c_int_fast32_t" "c_int_fast64_t"
+      "c_int_fast8_t" "c_int_least16_t" "c_int_least32_t" "c_int_least64_t"
+      "c_int_least8_t" "c_intmax_t" "c_intptr_t" "c_loc" "c_long"
+      "c_long_double" "c_long_double_complex" "c_long_long" "c_new_line"
+      "c_null_char" "c_null_funptr" "c_null_ptr" "c_ptr" "c_short"
+      "c_signed_char" "c_size_t" "c_vertical_tab" "call" "case" "ceiling"
+      "char" "character" "character_storage_size" "class" "close" "cmplx"
+      "command_argument_count" "common" "complex" "conjg" "contains" "continue"
+      "copy_prefix" "copy_scatter" "copy_suffix" "cos" "cosh" "count"
+      "count_prefix" "count_scatter" "count_suffix" "cpu_time" "cshift"
+      "cycle" "cyclic" "data" "date_and_time" "dble" "deallocate" "deferred"
+      "digits" "dim" "dimension" "distribute" "do" "dot_product" "double"
+      "dprod" "dynamic" "elemental" "else" "elseif" "elsewhere" "end" "enddo"
+      "endfile" "endif" "entry" "enum" "enumerator" "eoshift" "epsilon" "eq"
+      "equivalence" "eqv" "error_unit" "exit" "exp" "exponent" "extends"
+      "extends_type_of" "external" "extrinsic" "false" "file_storage_size"
+      "final" "floor" "flush" "forall" "format" "fraction" "function" "ge"
+      "generic" "get_command" "get_command_argument" "get_environment_variable"
+      "goto" "grade_down" "grade_up" "gt" "hpf_alignment" "hpf_distribution"
+      "hpf_template" "huge" "iachar" "iall" "iall_prefix" "iall_scatter"
+      "iall_suffix" "iand" "iany" "iany_prefix" "iany_scatter" "iany_suffix"
+      "ibclr" "ibits" "ibset" "ichar" "ieee_arithmetic" "ieee_exceptions"
+      "ieee_features" "ieee_get_underflow_mode" "ieee_set_underflow_mode"
+      "ieee_support_underflow_control" "ieor" "if" "ilen" "implicit"
+      "import" "include" "independent" "index" "inherit" "input_unit"
+      "inquire" "int" "integer" "intent" "interface" "intrinsic" "ior"
+      "iostat_end" "iostat_eor" "iparity" "iparity_prefix" "iparity_scatter"
+      "iparity_suffix" "ishft" "ishftc" "iso_c_binding" "iso_fortran_env"
+      "kind" "lbound" "le" "leadz" "len" "len_trim" "lge" "lgt" "lle" "llt"
+      "log" "log10" "logical" "lt" "matmul" "max" "maxexponent" "maxloc"
+      "maxval" "maxval_prefix" "maxval_scatter" "maxval_suffix" "merge"
+      "min" "minexponent" "minloc" "minval" "minval_prefix" "minval_scatter"
+      "minval_suffix" "mod" "module" "modulo" "move_alloc" "mvbits" "namelist"
+      "ne" "nearest" "neqv" "new" "new_line" "nint" "non_intrinsic"
+      "non_overridable" "none" "nopass" "not" "null" "nullify"
+      "number_of_processors" "numeric_storage_size" "only" "onto" "open"
+      "operator" "optional" "or" "output_unit" "pack" "parameter" "parity"
+      "parity_prefix" "parity_scatter" "parity_suffix" "pass" "pause"
+      "pointer" "popcnt" "poppar" "precision" "present" "print" "private"
+      "procedure" "processors" "processors_shape" "product" "product_prefix"
+      "product_scatter" "product_suffix" "program" "protected" "public"
+      "pure" "radix" "random_number" "random_seed" "range" "read" "real"
+      "realign" "recursive" "redistribute" "repeat" "reshape" "result"
+      "return" "rewind" "rrspacing" "same_type_as" "save" "scale" "scan"
+      "select" "selected_char_kind" "selected_int_kind" "selected_real_kind"
+      "sequence" "set_exponent" "shape" "sign" "sin" "sinh" "size" "spacing"
+      "spread" "sqrt" "stop" "subroutine" "sum" "sum_prefix" "sum_scatter"
+      "sum_suffix" "system_clock" "tan" "tanh" "target" "template" "then"
+      "tiny" "transfer" "transpose" "trim" "true" "type" "ubound" "unpack"
+      "use" "value" "verify" "volatile" "wait" "where" "while" "with" "write"))
+    (java-mode
+     "abstract" "assert" "boolean" "break" "byte" "case" "catch" "char" "class"
+     "continue" "default" "do" "double" "else" "enum" "extends" "final"
+     "finally" "float" "for" "if" "implements" "import" "instanceof" "int"
+     "interface" "long" "native" "new" "package" "private" "protected" "public"
+     "return" "short" "static" "strictfp" "super" "switch" "synchronized"
+     "this" "throw" "throws" "transient" "try" "void" "volatile" "while")
+    (javascript-mode
+     "break" "catch" "const" "continue" "delete" "do" "else" "export" "for"
+     "function" "if" "import" "in" "instanceOf" "label" "let" "new" "return"
+     "switch" "this" "throw" "try" "typeof" "var" "void" "while" "with" "yield")
+    (objc-mode
+     "@catch" "@class" "@encode" "@end" "@finally" "@implementation"
+     "@interface" "@private" "@protected" "@protocol" "@public"
+     "@selector" "@synchronized" "@throw" "@try" "alloc" "autorelease"
+     "bycopy" "byref" "in" "inout" "oneway" "out" "release" "retain")
+    (perl-mode
+     ;; from cperl.el
+     "AUTOLOAD" "BEGIN" "CHECK" "CORE" "DESTROY" "END" "INIT" "__END__"
+     "__FILE__" "__LINE__" "abs" "accept" "alarm" "and" "atan2" "bind"
+     "binmode" "bless" "caller" "chdir" "chmod" "chomp" "chop" "chown" "chr"
+     "chroot" "close" "closedir" "cmp" "connect" "continue" "cos"
+     "crypt" "dbmclose" "dbmopen" "defined" "delete" "die" "do" "dump" "each"
+     "else" "elsif" "endgrent" "endhostent" "endnetent" "endprotoent"
+     "endpwent" "endservent" "eof" "eq" "eval" "exec" "exists" "exit" "exp"
+     "fcntl" "fileno" "flock" "for" "foreach" "fork" "format" "formline"
+     "ge" "getc" "getgrent" "getgrgid" "getgrnam" "gethostbyaddr"
+     "gethostbyname" "gethostent" "getlogin" "getnetbyaddr" "getnetbyname"
+     "getnetent" "getpeername" "getpgrp" "getppid" "getpriority"
+     "getprotobyname" "getprotobynumber" "getprotoent" "getpwent" "getpwnam"
+     "getpwuid" "getservbyname" "getservbyport" "getservent" "getsockname"
+     "getsockopt" "glob" "gmtime" "goto" "grep" "gt" "hex" "if" "index" "int"
+     "ioctl" "join" "keys" "kill" "last" "lc" "lcfirst" "le" "length"
+     "link" "listen" "local" "localtime" "lock" "log" "lstat" "lt" "map"
+     "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "my" "ne" "next" "no"
+     "not" "oct" "open" "opendir" "or" "ord" "our" "pack" "package" "pipe"
+     "pop" "pos" "print" "printf" "push" "q" "qq" "quotemeta" "qw" "qx"
+     "rand" "read" "readdir" "readline" "readlink" "readpipe" "recv" "redo"
+     "ref" "rename" "require" "reset" "return" "reverse" "rewinddir" "rindex"
+     "rmdir" "scalar" "seek" "seekdir" "select" "semctl" "semget" "semop"
+     "send" "setgrent" "sethostent" "setnetent" "setpgrp" "setpriority"
+     "setprotoent" "setpwent" "setservent" "setsockopt" "shift" "shmctl"
+     "shmget" "shmread" "shmwrite" "shutdown" "sin" "sleep" "socket"
+     "socketpair" "sort" "splice" "split" "sprintf" "sqrt" "srand" "stat"
+     "study" "sub" "substr" "symlink" "syscall" "sysopen" "sysread" "system"
+     "syswrite" "tell" "telldir" "tie" "time" "times" "tr" "truncate" "uc"
+     "ucfirst" "umask" "undef" "unless" "unlink" "unpack" "unshift" "untie"
+     "until" "use" "utime" "values" "vec" "wait" "waitpid"
+     "wantarray" "warn" "while" "write" "x" "xor" "y")
+    (php-mode
+     "__CLASS__" "__DIR__" "__FILE__" "__FUNCTION__" "__LINE__" "__METHOD__"
+     "__NAMESPACE__" "_once" "abstract" "and" "array" "as" "break" "case"
+     "catch" "cfunction" "class" "clone" "const" "continue" "declare"
+     "default" "die" "do" "echo" "else" "elseif" "empty" "enddeclare"
+     "endfor" "endforeach" "endif" "endswitch" "endwhile" "eval" "exception"
+     "exit" "extends" "final" "for" "foreach" "function" "global"
+     "goto" "if" "implements" "include" "instanceof" "interface"
+     "isset" "list" "namespace" "new" "old_function" "or" "php_user_filter"
+     "print" "private" "protected" "public" "require" "require_once" "return"
+     "static" "switch" "this" "throw" "try" "unset" "use" "var" "while" "xor")
+    (python-mode
+     "and" "assert" "break" "class" "continue" "def" "del" "elif" "else"
+     "except" "exec" "finally" "for" "from" "global" "if" "import" "in" "is"
+     "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "yield")
+    (ruby-mode
+     "BEGIN" "END" "alias" "and"  "begin" "break" "case" "class" "def" "defined"
+     "do" "else" "elsif"  "end" "ensure" "false" "for" "if" "in" "module"
+     "next" "nil" "not" "or" "redo" "rescue" "retry" "return" "self" "super"
+     "then" "true" "undef" "unless" "until" "when" "while" "yield")
+    ;; aliases
+    (js2-mode . javascript-mode)
+    (espresso-mode . javascript-mode)
+    (cperl-mode . perl-mode)
+    (jde-mode . java-mode))
+  "*Alist mapping major-modes to sorted keywords for `company-keywords'.")
+
+;;;###autoload
+(defun company-keywords (command &optional arg &rest ignored)
+  "A `company-mode' back-end for programming language keywords."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-))
+    ('prefix (and (assq major-mode company-keywords-alist)
+                  (not (company-in-string-or-comment))
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates
+     (let ((completion-ignore-case nil)
+           (symbols (cdr (assq major-mode company-keywords-alist))))
+       (all-completions arg (if (consp symbols)
+                                symbols
+                              (cdr (assq symbols company-keywords-alist))))))
+    ('sorted t)))
+
+(provide 'company-keywords)
+;;; company-keywords.el ends here
+
+
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-nograb.el b/elpa-to-submit/nxhtml/util/company-mode/company-nograb.el
new file mode 100644
index 0000000000..cb988e3638
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-nograb.el
@@ -0,0 +1,372 @@
+;;; company-nograb.el --- Company menu without any word matching in buffer
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-07-18 Sat
+;; Version:
+;; Last-Updated:
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defvar company-nograb-old-blink-cursor nil)
+
+(defvar company-nograb-overlay nil)
+(make-variable-buffer-local 'company-nograb-overlay)
+
+(defvar company-nograb-overlay-field nil)
+(make-variable-buffer-local 'company-nograb-overlay-field)
+
+(defconst company-nograb-result nil)
+
+(defconst company-nograb-menu-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-g" 'company-abort)
+    (define-key map "\r"          'company-complete-selection)
+    (define-key map [remap next-line]     'company-nograb-select-next)
+    (define-key map [remap previous-line] 'company-nograb-select-previous)
+    map))
+
+(defconst company-nograb-field-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-g" 'company-abort)
+    (define-key map "\r"          'company-complete-selection)
+    (define-key map [remap self-insert-command]           'company-nograb-to-ghost)
+    (define-key map [remap forward-char]                  'company-nograb-to-ghost)
+    (define-key map [remap backward-char]                 'company-nograb-to-ghost)
+    (define-key map [remap move-beginning-of-line]        'company-nograb-to-ghost)
+    (define-key map [remap move-end-of-line]              'company-nograb-to-ghost)
+    (define-key map [remap move-beginning-of-line]        'company-nograb-to-ghost)
+    (define-key map [remap move-end-of-line]              'company-nograb-to-ghost)
+    (define-key map [remap ourcomments-move-beginning-of-line] 'company-nograb-to-ghost)
+    (define-key map [remap ourcomments-move-end-of-line]       'company-nograb-to-ghost)
+
+    ;;(define-key map [remap backward-delete-char-untabify] 'company-nograb-to-ghost)
+    ;;
+    ;; Fix-me: For read-only buffers this is needed, I have no idea why:
+    (define-key map "\d"        'company-nograb-to-ghost-bs-del)
+    (define-key map [backspace] 'company-nograb-to-ghost-bs-del)
+
+    (define-key map [remap next-line]     'company-nograb-select-next)
+    (define-key map [remap previous-line] 'company-nograb-select-previous)
+    (define-key map "\t"    'company-complete-common)
+    (define-key map [(tab)] 'company-complete-common)
+    (set-keymap-parent map global-map)
+    map))
+
+(defconst company-nograb-host nil)
+(make-variable-buffer-local 'company-nograb-host)
+
+(defconst company-nograb-ghost nil)
+(make-variable-buffer-local 'company-nograb-ghost)
+
+(defconst company-nograb-field-len 5)
+(make-variable-buffer-local 'company-nograb-field-len)
+
+(defconst company-nograb-field-len-default 5)
+(make-variable-buffer-local 'company-nograb-field-len-default)
+
+(defconst company-nograb-field-pos 1)
+(make-variable-buffer-local 'company-nograb-field-pos)
+
+(defvar company-nograb-candidates nil)
+(make-variable-buffer-local 'company-nograb-candidates)
+
+(defvar company-nograb-overlay-before nil)
+(defvar company-nograb-overlay-keymap nil)
+(defvar company-nograb-overlay-after  nil)
+
+(defvar company-nograb-menu-label-overlay nil)
+(make-variable-buffer-local 'company-nograb-menu-label-overlay)
+
+(defvar company-nograb-menu-label nil)
+(make-variable-buffer-local 'company-nograb-menu-label)
+
+(defvar company-nograb-point nil)
+(make-variable-buffer-local 'company-nograb-point)
+
+(defun company-nograb-select-next ()
+  (interactive)
+  (company-select-next)
+  ;;(company-nograb-select-to-field)
+  )
+(defun company-nograb-select-previous ()
+  (interactive)
+  (company-select-previous)
+  ;;(company-nograb-select-to-field)
+  )
+(defun company-nograb-RET-action ()
+  (interactive)
+  (if (= 1 num-cand)
+      (company-complete-selection)
+    (company-nograb-select-to-field)))
+
+(defun company-nograb-select-to-field ()
+  (interactive)
+  (let ((sel (nth company-selection company-candidates)))
+    (with-current-buffer company-nograb-ghost
+      (erase-buffer)
+      (insert sel)
+      (company-nograb-update-field)
+      ;;(goto-char 1) (insert " ")
+      )))
+
+(defface company-nograb-field
+  '((default :box t :inherit company-tooltip))
+  "Face for popup messages."
+  :group 'tabkey2)
+
+(defun company-nograb-to-ghost (&optional command)
+  (interactive)
+  (let ((ghost-win (get-buffer-window company-nograb-ghost)))
+    (save-window-excursion
+      (if ghost-win
+          (select-window ghost-win)
+        (switch-to-buffer company-nograb-ghost))
+      (goto-char (company-nograb-grab-word-pos))
+      (message "ghost:this-original-command=%s, cb=%s" this-original-command (current-buffer))
+      (call-interactively (or command this-original-command))
+      (company-nograb-grab-word-pos-set (point)))
+    (when ghost-win (with-selected-window ghost-win (goto-char (company-nograb-grab-word-pos)))))
+  (company-nograb-update-field))
+
+(defun company-nograb-to-ghost-bs-del ()
+    (interactive)
+    (company-nograb-to-ghost 'backward-delete-char))
+
+(defun company-nograb-grab-word ()
+  (with-current-buffer company-nograb-ghost
+    ;;(message "nograb word:`%s'" (buffer-string))
+    (buffer-string)))
+
+(defun company-nograb-grab-word-pos ()
+  (with-current-buffer (or company-nograb-host (current-buffer))
+    company-nograb-field-pos))
+
+(defun company-nograb-grab-word-pos-set (pos)
+  (with-current-buffer (or company-nograb-host (current-buffer))
+    (setq company-nograb-field-pos pos)))
+
+(defun company-nograb-update-field ()
+  (let* ((maxlen company-nograb-field-len)
+         (current (company-nograb-grab-word))
+         (pos     (company-nograb-grab-word-pos))
+         (curlen (length current))
+         (trail-len (max 1 (- maxlen curlen)))
+         (trail  (make-string trail-len ?\ ))
+         (face 'company-nograb-field)
+         (txt (propertize (concat current trail) 'face face)))
+    (setq company-nograb-field-len (max company-nograb-field-len
+                                        (- (length txt) 1)))
+    (put-text-property (1- pos) pos 'face `(,face :underline t) txt)
+    (overlay-put company-nograb-overlay-field 'after-string txt)))
+
+(defvar company-nograb-state-is-saved nil)
+(make-variable-buffer-local 'company-nograb-state-is-saved)
+
+(defun company-nograb-save-state ()
+  (unless company-nograb-state-is-saved
+    (setq company-nograb-state-is-saved t)
+    (setq company-nograb-old-blink-cursor blink-cursor-mode)))
+
+(defun company-nograb-reset-state ()
+  (when company-nograb-state-is-saved
+    (setq company-nograb-state-is-saved nil)
+    (blink-cursor-mode (if company-nograb-old-blink-cursor 1 -1))))
+
+(defun company-nograb-common-setup (candidates finish-function)
+  (unless candidates (error "company-nograb-common-setup: candidates is nil"))
+  (unless finish-function (error "company-nograb-common-setup: finish-function is nil"))
+  (company-nograb-save-state)
+  (blink-cursor-mode -1)
+  (setq company-nograb-point (point))
+  (setq company-nograb-candidates candidates)
+  (setq company-nograb-finish-fun finish-function)
+  (add-hook 'post-command-hook 'company-nograb-post-command nil t)
+  (add-hook 'company-completion-finished-hook 'company-nograb-get-result nil t)
+  (add-hook 'company-completion-cancelled-hook 'company-nograb-cleanup nil t))
+
+(defun company-nograb-field-setup (label candidates finish-function)
+  (company-nograb-cleanup)
+  (company-nograb-common-setup candidates finish-function)
+  (setq company-nograb-candidates (copy-sequence candidates))
+  (setq company-nograb-finish-fun finish-function)
+  (setq company-nograb-field-len company-nograb-field-len-default)
+  (let* ((end (min (line-end-position) (+ company-nograb-field-len 1 (point))))
+         (ovl (make-overlay (point) end))
+         (ovl-field (make-overlay (+ 1 (point)) end)))
+    (overlay-put ovl 'keymap company-nograb-field-map)
+    (overlay-put ovl       'priority 100)
+    (overlay-put ovl-field 'priority 101)
+    (overlay-put ovl-field 'invisible t)
+    (setq company-nograb-ghost (generate-new-buffer "company-nograb"))
+    (company-nograb-grab-word-pos-set 1)
+    (let ((this-buffer (current-buffer)))
+      (with-current-buffer company-nograb-ghost
+        (setq company-nograb-host this-buffer)))
+    (setq company-nograb-overlay-field ovl-field)
+    (setq company-nograb-overlay ovl)
+    (company-nograb-update-field)
+    ))
+
+(defun company-nograb-cleanup (&optional ign)
+  (company-nograb-reset-state)
+  (remove-hook 'company-completion-finished-hook 'company-nograb-get-result t)
+  (remove-hook 'company-completion-cancelled-hook 'company-nograb-cleanup t)
+  (setq company-nograb-finish-fun nil)
+  (remove-hook 'post-command-hook 'company-nograb-post-command t)
+  (setq company-nograb-point nil)
+  (when (overlayp company-nograb-overlay)
+    (delete-overlay company-nograb-overlay)
+    (setq company-nograb-overlay nil))
+  (when (overlayp company-nograb-overlay-field)
+    (delete-overlay company-nograb-overlay-field)
+    (setq company-nograb-overlay-field))
+  ;;(setq company-nograb-menu-label nil)
+  (when company-nograb-menu-label-overlay
+    (delete-overlay company-nograb-menu-label-overlay)
+    (setq company-nograb-menu-label-overlay))
+  (when company-nograb-ghost
+    (kill-buffer company-nograb-ghost)
+    (setq company-nograb-ghost)))
+
+(defvar company-nograb-finish-fun nil)
+(make-variable-buffer-local 'company-nograb-finish-fun)
+
+(defun company-nograb-get-result (result)
+  (setq company-nograb-result result)
+  (funcall company-nograb-finish-fun result)
+  (company-nograb-cleanup))
+
+(defun company-nograb-field-backend (command &optional arg &rest ignored)
+  "A completion back-end using a field for user input.
+Nothing is changed in the current buffer."
+  (case command
+    ('start (if (not (and company-nograb-candidates company-nograb-finish-fun))
+                (error "Call company-nograb-field instead")
+              (company-begin-backend 'company-nograb-field-backend)))
+    ('prefix (company-nograb-grab-word))
+    ('candidates company-nograb-candidates)
+    ('ignore-case t)
+    ('require-match t)
+    ('sorted nil)
+    ('no-insert t)
+    ('duplicates t)))
+
+(defun company-nograb-field (label candidates finish-function)
+  "Display a field tighed to a menu at point.
+Display string LABEL at point and start a menu backend using
+CANDIDATES as choices.  When the backend finishes remove LABEL.
+If the user made a choice then call FINISH-FUNCTION with the
+choice as a parameter."
+  (company-nograb-field-setup label candidates finish-function)
+  (company-nograb-field-backend 'start))
+
+
+
+(defun company-nograb-menu-setup (label candidates finish-function)
+  (company-nograb-cleanup)
+  (company-nograb-common-setup candidates finish-function)
+  (let* ((lbl (concat " " label " "))
+         (len (length lbl))
+         ;; Fix-me: needs two overlays to fix this better and end of line.
+         (beg (min (- (line-end-position) 1)
+                   (1+ (point))))
+         (end (min (- (line-end-position) 0)
+                   (+ beg len)))
+         (ovl (make-overlay beg end)))
+    ;;(apply 'message "b/e=%s/%s, p=%s le=%s" (mapcar (lambda (v) (- v (line-beginning-position))) (list beg end (point) (line-end-position))))
+    (overlay-put ovl 'after-string (propertize lbl 'face 'menu))
+    (overlay-put ovl 'face 'secondary-selection)
+    (overlay-put ovl 'invisible t)
+    (setq company-nograb-menu-label-overlay ovl))
+  (let ((ovl (make-overlay (point) (1+ (point)))))
+    (overlay-put ovl 'keymap company-nograb-menu-map)
+    (setq company-nograb-overlay ovl)))
+
+(defun company-nograb-post-command ()
+  (unless (= (point) company-nograb-point)
+    (company-nograb-cleanup)
+    (company-abort)))
+
+(defun company-nograb-menu-backend (command &optional arg &rest ignored)
+  "A completion back-end using just a menu for user input.
+Nothing is changed in the current buffer."
+  (case command
+    ('start (company-begin-backend 'company-nograb-menu-backend))
+    ('prefix (concat ""))
+    ('candidates company-nograb-candidates)
+    ('ignore-case t)
+    ('require-match t)
+    ('sorted nil)
+    ('no-insert t)
+    ('duplicates t)))
+
+(defun company-nograb-menu (label candidates finish-function)
+  "Display a menu at point.
+Display string LABEL at point and start a menu backend using
+CANDIDATES as choices.  When the backend finishes remove LABEL.
+If the user made a choice then call FINISH-FUNCTION with the
+choice as a parameter."
+  (company-nograb-menu-setup label candidates finish-function)
+  (company-nograb-menu-backend 'start))
+
+
+
+(defun my-nograb-field ()
+  "Test of field backend."
+  (interactive)
+  (company-nograb-field "My field label" '("some" "things" "that" "sometimes" "fits")
+                              (lambda (res) (message "res=%s" res))))
+
+(defun my-nograb-menu ()
+  "Test of menu backend."
+  (interactive)
+  (company-nograb-menu "My menu label" '("some" "things" "that" "sometimes" "fits")
+                        (lambda (res) (message "res=%s" res))))
+
+;;;###autoload
+(defun company-choose (candidates)
+  (setq company-nograb-candidates candidates))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; company-nograb.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-nxml.el b/elpa-to-submit/nxhtml/util/company-mode/company-nxml.el
new file mode 100644
index 0000000000..9af2bb8a13
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-nxml.el
@@ -0,0 +1,127 @@
+;;; company-nxml.el --- a company-mode completion back-end for nxml-mode
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(require 'nxml-mode)
+(require 'rng-nxml)
+(eval-when-compile (require 'cl))
+
+(defconst company-nxml-token-regexp
+  "\\(?:[_[:alpha:]][-._[:alnum:]]*\\_>\\)")
+
+(defvar company-nxml-in-attribute-value-regexp
+  (replace-regexp-in-string "w" company-nxml-token-regexp
+   "<w\\(?::w\\)?\
+\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
+[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
+[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
+\\(\"\\([^\"]*\\>\\)\\|'\\([^']*\\>\\)\\)\\="
+   t t))
+
+(defvar company-nxml-in-tag-name-regexp
+  (replace-regexp-in-string "w" company-nxml-token-regexp
+                            "<\\(/?w\\(?::w?\\)?\\)?\\=" t t))
+
+(defun company-nxml-all-completions (prefix alist)
+  (let ((candidates (mapcar 'cdr alist))
+        (case-fold-search nil)
+        filtered)
+    (when (cdar rng-open-elements)
+      (push (concat "/" (cdar rng-open-elements)) candidates))
+    (setq candidates (sort (all-completions prefix candidates) 'string<))
+    (while candidates
+      (unless (equal (car candidates) (car filtered))
+        (push (car candidates) filtered))
+      (pop candidates))
+    (nreverse filtered)))
+
+(defmacro company-nxml-prepared (&rest body)
+  (declare (indent 0) (debug t))
+  `(let ((lt-pos (save-excursion (search-backward "<" nil t)))
+         xmltok-dtd)
+     (when (and lt-pos (= (rng-set-state-after lt-pos) lt-pos))
+       ,@body)))
+
+(defun company-nxml-tag (command &optional arg &rest ignored)
+  (case command
+    ;;('prefix (and (eq major-mode 'nxml-mode)
+    ('prefix (and (derived-mode-p 'nxml-mode)
+                  rng-validate-mode
+                  (company-grab company-nxml-in-tag-name-regexp 1)))
+    ('candidates (company-nxml-prepared
+                   (company-nxml-all-completions arg
+                    (rng-match-possible-start-tag-names))))
+    ('sorted t)))
+
+(defun company-nxml-attribute (command &optional arg &rest ignored)
+  (case command
+    ;;('prefix (and (eq major-mode 'nxml-mode)
+    ('prefix (and (derived-mode-p 'nxml-mode)
+                  rng-validate-mode
+                  (memq (char-after) '(?\  ?\t ?\n)) ;; outside word
+                  (company-grab rng-in-attribute-regex 1)))
+    ('candidates (company-nxml-prepared
+                   (and (rng-adjust-state-for-attribute
+                         lt-pos (- (point) (length arg)))
+                        (company-nxml-all-completions arg
+                         (rng-match-possible-attribute-names)))))
+    ('sorted t)))
+
+(defun company-nxml-attribute-value (command &optional arg &rest ignored)
+  (case command
+    ('prefix (and (eq major-mode 'nxml-mode)
+                  rng-validate-mode
+                  (and (memq (char-after) '(?' ?\" ?\  ?\t ?\n)) ;; outside word
+                       (looking-back company-nxml-in-attribute-value-regexp)
+                       (or (match-string-no-properties 4)
+                           (match-string-no-properties 5)
+                           ""))))
+    ('candidates (company-nxml-prepared
+                   (let (attr-start attr-end colon)
+                     (and (looking-back rng-in-attribute-value-regex lt-pos)
+                          (setq colon (match-beginning 2)
+                                attr-start (match-beginning 1)
+                                attr-end (match-end 1))
+                          (rng-adjust-state-for-attribute lt-pos attr-start)
+                          (rng-adjust-state-for-attribute-value
+                           attr-start colon attr-end)
+                          (all-completions arg
+                           (rng-match-possible-value-strings))))))))
+
+;;;###autoload
+(defun company-nxml (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for `nxml-mode'."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-nxml))
+    ('prefix (or (company-nxml-tag 'prefix)
+                 (company-nxml-attribute 'prefix)
+                 (company-nxml-attribute-value 'prefix)))
+    ('candidates (cond
+                  ((company-nxml-tag 'prefix)
+                   (company-nxml-tag 'candidates arg))
+                  ((company-nxml-attribute 'prefix)
+                   (company-nxml-attribute 'candidates arg))
+                  ((company-nxml-attribute-value 'prefix)
+                   (sort (company-nxml-attribute-value 'candidates arg)
+                         'string<))))
+    ('sorted t)))
+
+(provide 'company-nxml)
+;;; company-nxml.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-oddmuse.el b/elpa-to-submit/nxhtml/util/company-mode/company-oddmuse.el
new file mode 100644
index 0000000000..7c0f3fc5a1
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-oddmuse.el
@@ -0,0 +1,49 @@
+;;; company-oddmuse.el --- a company-mode completion back-end for oddmuse-mode
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when 'compile (require 'yaooddmuse nil t))
+(eval-when 'compile (require 'oddmuse nil t))
+(eval-when-compile (require 'cl))
+
+(defvar company-oddmuse-link-regexp
+  "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")
+
+(defun company-oddmuse-get-page-table ()
+  (case major-mode
+    ('yaoddmuse-mode (with-no-warnings
+                       (yaoddmuse-get-pagename-table yaoddmuse-wikiname)))
+    ('oddmuse-mode (with-no-warnings
+                     (oddmuse-make-completion-table oddmuse-wiki)))))
+
+;;;###autoload
+(defun company-oddmuse (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for `oddmuse-mode'."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-oddmuse))
+    ('prefix (let ((case-fold-search nil))
+               (and (memq major-mode '(oddmuse-mode yaoddmuse-mode))
+                    (looking-back company-oddmuse-link-regexp (point-at-bol))
+                    (or (match-string 1)
+                        (match-string 2)))))
+    ('candidates (all-completions arg (company-oddmuse-get-page-table)))))
+
+(provide 'company-oddmuse)
+;;; company-oddmuse.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-pkg.el b/elpa-to-submit/nxhtml/util/company-mode/company-pkg.el
new file mode 100644
index 0000000000..0dde723a7a
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-pkg.el
@@ -0,0 +1 @@
+(define-package "company" "0.4.3" "extensible inline text completion mechanism")
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-predictive.el b/elpa-to-submit/nxhtml/util/company-mode/company-predictive.el
new file mode 100644
index 0000000000..2ad57f3f71
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-predictive.el
@@ -0,0 +1,82 @@
+;;; company-predictive.el --- Use company-mode for predictive(-mode)
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-07-16 Thu
+;; Version:
+;; Last-Updated:
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(require 'predictive nil t)
+(load "dict-english") ;; fix-me
+
+;(syntax-table-p company-predictive-syntax-table)
+(defvar company-predictive-syntax-table
+  (let ((tbl (copy-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\- "w" tbl)
+    tbl)
+  "Make character `-' have syntax word.")
+
+;; (string (with-syntax-table company-predictive-syntax-table (char-syntax ?-)))
+;; (string (char-syntax ?-))
+(defun company-predictive-grab-word ()
+  (with-syntax-table company-predictive-syntax-table
+    (company-grab-word)))
+
+;;;###autoload
+(defun company-predictive (command &optional arg &rest ignored)
+  "A predictive-like `company-mode' completion back-end."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-predictive))
+    ('prefix (company-predictive-grab-word))
+    ('candidates (predictive-complete arg))
+    ('ignore-case t)
+    ('sorted nil)
+    ('duplicates t)))
+
+
+(provide 'company-predictive)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; company-predictive.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-pysmell.el b/elpa-to-submit/nxhtml/util/company-mode/company-pysmell.el
new file mode 100644
index 0000000000..795aa70162
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-pysmell.el
@@ -0,0 +1,59 @@
+;;; company-pysmell.el --- a company-mode completion back-end for pysmell.el
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(eval-when-compile (require 'cl))
+(require 'pysmell nil t)
+
+(defvar company-pysmell--available-p 'unknown)
+(make-variable-buffer-local 'company-pysmell--available-p)
+
+(defun company-pysmell--available-p ()
+  (if (eq company-pysmell--available-p 'unknown)
+      (setq company-pysmell--available-p
+            (company-locate-dominating-file buffer-file-name "PYSMELLTAGS"))
+    company-pysmell--available-p))
+
+(defun company-pysmell--grab-symbol ()
+  (let ((symbol (company-grab-symbol)))
+    (when symbol
+      (cons symbol
+            (save-excursion
+              (let ((pos (point)))
+                (goto-char (- (point) (length symbol)))
+                (while (eq (char-before) ?.)
+                  (goto-char (1- (point)))
+                  (skip-syntax-backward "w_"))
+                (- pos (point))))))))
+
+;;;###autoload
+(defun company-pysmell (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for pysmell.
+This requires pysmell.el and pymacs.el."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-pysmell))
+    ('prefix (and (derived-mode-p 'python-mode)
+                  buffer-file-name
+                  (not (company-in-string-or-comment))
+                  (company-pysmell--available-p)
+                  (company-pysmell--grab-symbol)))
+    ('candidates (delete "" (pysmell-get-all-completions)))))
+
+(provide 'company-pysmell)
+;;; company-pysmell.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-ropemacs.el b/elpa-to-submit/nxhtml/util/company-mode/company-ropemacs.el
new file mode 100644
index 0000000000..a330068940
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-ropemacs.el
@@ -0,0 +1,53 @@
+;;; company-pysmell.el --- a company-mode completion back-end for pysmell.el
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(eval-when-compile (require 'cl))
+(require 'pymacs nil t)
+
+(unless (fboundp 'rope-completions)
+  (pymacs-load "ropemacs" "rope-"))
+
+(unless (fboundp 'rope-completions)
+  (error "rope-completions not found, try development version of ropemacs"))
+
+(defun company-ropemacs--grab-symbol ()
+  (let ((symbol (company-grab-symbol)))
+    (when symbol
+      (cons symbol
+            (save-excursion
+              (let ((pos (point)))
+                (goto-char (- (point) (length symbol)))
+                (while (eq (char-before) ?.)
+                  (goto-char (1- (point)))
+                  (skip-syntax-backward "w_"))
+                (- pos (point))))))))
+
+(defun company-ropemacs (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for ropemacs."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-ropemacs))
+    ('prefix (and (derived-mode-p 'python-mode)
+                  (not (company-in-string-or-comment))
+                  (company-pysmell--grab-symbol)))
+    ('candidates (mapcar (lambda (element) (concat arg element))
+                         (rope-completions)))))
+
+(provide 'company-ropemacs)
+;;; company-ropemacs.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-semantic.el b/elpa-to-submit/nxhtml/util/company-mode/company-semantic.el
new file mode 100644
index 0000000000..a076f5e6bc
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-semantic.el
@@ -0,0 +1,112 @@
+;;; company-semantic.el --- a company-mode back-end using CEDET Semantic
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(require 'semantic-iai nil t)
+(eval-when-compile (require 'cl))
+
+(defcustom company-semantic-metadata-function 'company-semantic-summary-and-doc
+  "*The function turning a semantic tag into doc information."
+  :group 'company
+  :type 'function)
+
+(defvar company-semantic-modes '(c-mode c++-mode jde-mode java-mode))
+
+(defun company-semantic-doc-or-summary (tag)
+  (or (semantic-documentation-for-tag tag)
+      (funcall semantic-idle-summary-function tag nil t)))
+
+(defun company-semantic-summary-and-doc (tag)
+  (let ((doc (semantic-documentation-for-tag tag))
+        (summary (funcall semantic-idle-summary-function tag nil t)))
+    (and (stringp doc)
+         (string-match "\n*\\(.*\\)$" doc)
+         (setq doc (match-string 1 doc)))
+    (concat (funcall semantic-idle-summary-function tag nil t)
+            (when doc
+                  (if (< (+ (length doc) (length summary) 4) (window-width))
+                      " -- "
+                    "\n"))
+            doc)))
+
+(defun company-semantic-doc-buffer (tag)
+  (let ((doc (semantic-documentation-for-tag tag)))
+    (when doc
+      (with-current-buffer (company-doc-buffer)
+        (insert (funcall semantic-idle-summary-function tag nil t)
+                "\n"
+                doc)
+        (current-buffer)))))
+
+(defsubst company-semantic-completions (prefix)
+  (ignore-errors
+    (let ((completion-ignore-case nil)
+          (context (semantic-analyze-current-context)))
+      (all-completions prefix (semantic-ia-get-completions context (point))))))
+
+(defun company-semantic-completions-raw (prefix)
+  (let (candidates)
+    (dolist (tag (semantic-analyze-find-tags-by-prefix prefix))
+      (unless (eq (semantic-tag-class tag) 'include)
+        (push (semantic-tag-name tag) candidates)))
+    (delete "" candidates)))
+
+(defun company-semantic--pre-prefix-length (prefix-length)
+  "Sum up the length of all chained symbols before POS.
+Symbols are chained by \".\" or \"->\"."
+  (save-excursion
+    (let ((pos (point)))
+      (goto-char (- (point) prefix-length))
+      (while (looking-back "->\\|\\.")
+        (goto-char (match-beginning 0))
+        (skip-syntax-backward "w_"))
+      (- pos (point)))))
+
+(defun company-semantic--grab ()
+  "Grab the semantic prefix, but return everything before -> or . as length."
+  (let ((symbol (company-grab-symbol)))
+    (when symbol
+      (cons symbol (company-semantic--pre-prefix-length (length symbol))))))
+
+;;;###autoload
+(defun company-semantic (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end using CEDET Semantic."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-semantic))
+    ('prefix (and (memq major-mode company-semantic-modes)
+                  (semantic-active-p)
+                  (not (company-in-string-or-comment))
+                  (or (company-semantic--grab) 'stop)))
+    ('candidates (if (and (equal arg "")
+                          (not (looking-back "->\\|\\.")))
+                     (company-semantic-completions-raw arg)
+                   (company-semantic-completions arg)))
+    ('meta (funcall company-semantic-metadata-function
+                    (semantic-analyze-find-tag arg)))
+    ('doc-buffer (company-semantic-doc-buffer (semantic-analyze-find-tag arg)))
+    ;; because "" is an empty context and doesn't return local variables
+    ('no-cache (equal arg ""))
+    ('location (let ((tag (semantic-analyze-find-tag arg)))
+                 (when (buffer-live-p (semantic-tag-buffer tag))
+                   (cons (semantic-tag-buffer tag)
+                         (semantic-tag-start tag)))))))
+
+(provide 'company-semantic)
+;;; company-semantic.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-start.el b/elpa-to-submit/nxhtml/util/company-mode/company-start.el
new file mode 100644
index 0000000000..d0a151633f
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-start.el
@@ -0,0 +1,40 @@
+;;; company-start.el --- Load Company Mode autoloads and set load-path
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-07-16 Thu
+;; Version:
+;; Last-Updated:
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(let* ((this-dir (file-name-directory (or load-file-name
+                                          (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                          buffer-file-name)))
+       (auto-file (expand-file-name "company-autoloads" this-dir)))
+  (add-to-list 'load-path this-dir)
+  (load auto-file))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; company-start.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-tempo.el b/elpa-to-submit/nxhtml/util/company-mode/company-tempo.el
new file mode 100644
index 0000000000..28d267303d
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-tempo.el
@@ -0,0 +1,55 @@
+;;; company-tempo.el --- a company-mode completion back-end for tempo
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+(require 'tempo)
+
+(defsubst company-tempo-lookup (match)
+  (cdr (assoc match (tempo-build-collection))))
+
+(defun company-tempo-insert (match)
+  "Replace MATCH with the expanded tempo template."
+  (search-backward match)
+  (goto-char (match-beginning 0))
+  (replace-match "")
+  (call-interactively (company-tempo-lookup match)))
+
+(defsubst company-tempo-meta (match)
+  (let ((templ (company-tempo-lookup match))
+        doc)
+    (and templ
+         (setq doc (documentation templ t))
+         (car (split-string doc "\n" t)))))
+
+;;;###autoload
+(defun company-tempo (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for tempo."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-tempo
+                                         'company-tempo-insert))
+    ('prefix (or (car (tempo-find-match-string tempo-match-finder)) ""))
+    ('candidates (all-completions arg (tempo-build-collection)))
+    ('meta (company-tempo-meta arg))
+    ('require-match t)
+    ('sorted t)))
+
+(provide 'company-tempo)
+;;; company-tempo.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company-xcode.el b/elpa-to-submit/nxhtml/util/company-mode/company-xcode.el
new file mode 100644
index 0000000000..12a6d76d62
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company-xcode.el
@@ -0,0 +1,114 @@
+;;; company-xcode.el --- a company-mode completion back-end for Xcode projects
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; This file is part of company 0.4.3.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(eval-when-compile (require 'cl))
+
+(defcustom company-xcode-xcodeindex-executable (executable-find "xcodeindex")
+  "*Location of xcodeindex executable"
+  :group 'company-xcode
+  :type 'file)
+
+(defvar company-xcode-tags nil)
+
+(defun company-xcode-reset ()
+  "Reset the cached tags."
+  (interactive)
+  (setq company-xcode-tags nil))
+
+(defcustom company-xcode-types
+  '("Class" "Constant" "Enum" "Macro" "Modeled Class" "Structure"
+    "Type" "Union" "Function")
+  "*The types of symbols offered by `company-xcode'
+No context-enabled completion is available.  Types like methods will be
+offered regardless of whether the class supports them.  The defaults should be
+valid in most contexts."
+  :set (lambda (variable value)
+         (set variable value)
+         (company-xcode-reset))
+  :group 'company-xcode
+  :type '(set (const "Category") (const "Class") (const "Class Method")
+              (const "Class Variable") (const "Constant") (const "Enum")
+              (const "Field") (const "Instance Method")
+              (const "Instance Variable") (const "Macro")
+              (const "Modeled Class") (const "Modeled Method")
+              (const "Modeled Property") (const "Property") (const "Protocol")
+              (const "Structure") (const "Type") (const "Union")
+              (const "Variable") (const "Function")))
+
+(defvar company-xcode-project 'unknown)
+(make-variable-buffer-local 'company-xcode-project)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-xcode-fetch (project-bundle)
+  (setq project-bundle (directory-file-name project-bundle))
+  (message "Retrieving dump from %s..." project-bundle)
+  (with-temp-buffer
+    (let ((default-directory (file-name-directory project-bundle)))
+      (call-process company-xcode-xcodeindex-executable nil (current-buffer)
+                    nil "dump" "-project"
+                    (file-name-nondirectory project-bundle) "-quiet")
+      (goto-char (point-min))
+      (let ((regexp (concat "^\\([^\t\n]*\\)\t[^\t\n]*\t"
+                            (regexp-opt company-xcode-types)
+                            "\t[^\t\n]*\t[^\t\n]*"))
+            candidates)
+        (while (re-search-forward regexp nil t)
+          (add-to-list 'candidates (match-string 1)))
+        (message "Retrieving dump from %s...done" project-bundle)
+        candidates))))
+
+(defun company-xcode-find-project ()
+  (let ((dir (if buffer-file-name
+                 (file-name-directory buffer-file-name)
+               (expand-file-name default-directory)))
+        (prev-dir nil)
+        file)
+    (while (not (or file (equal dir prev-dir)))
+      (setq file (car (directory-files dir t ".xcodeproj\\'" t))
+            prev-dir dir
+            dir (file-name-directory (directory-file-name dir))))
+    file))
+
+(defun company-xcode-tags ()
+  (when (eq company-xcode-project 'unknown)
+    (setq company-xcode-project (company-xcode-find-project)))
+  (when company-xcode-project
+    (cdr (or (assoc company-xcode-project company-xcode-tags)
+             (car (push (cons company-xcode-project
+                              (company-xcode-fetch company-xcode-project))
+                        company-xcode-tags))))))
+;;;###autoload
+(defun company-xcode (command &optional arg &rest ignored)
+  "A `company-mode' completion back-end for Xcode projects."
+  (interactive (list 'interactive))
+  (case command
+    ('interactive (company-begin-backend 'company-xcode))
+    ('prefix (and company-xcode-xcodeindex-executable
+                  (company-xcode-tags)
+                  (not (company-in-string-or-comment))
+                  (or (company-grab-symbol) 'stop)))
+    ('candidates (let ((completion-ignore-case nil))
+                   (company-xcode-tags)
+                   (all-completions arg (company-xcode-tags))))))
+
+
+(provide 'company-xcode)
+;;; company-xcode.el ends here
diff --git a/elpa-to-submit/nxhtml/util/company-mode/company.el b/elpa-to-submit/nxhtml/util/company-mode/company.el
new file mode 100644
index 0000000000..44967fd855
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/company-mode/company.el
@@ -0,0 +1,2212 @@
+;;; company.el --- extensible inline text completion mechanism
+;;
+;; Copyright (C) 2009 Nikolaj Schumacher
+;;
+;; Author: Nikolaj Schumacher <bugs * nschum de>
+;; Version: 0.4.3
+;; Keywords: abbrev, convenience, matchis
+;; URL: http://nschum.de/src/emacs/company/
+;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x
+;;
+;; This file is NOT part of GNU Emacs.
+;;
+;; This program 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
+;; of the License, or (at your option) any later version.
+;;
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;;; Commentary:
+;;
+;; Company is a modular completion mechanism.  Modules for retrieving completion
+;; candidates are called back-ends, modules for displaying them are front-ends.
+;;
+;; Company comes with many back-ends, e.g. `company-elisp'.  These are
+;; distributed in individual files and can be used individually.
+;;
+;; Place company.el and the back-ends you want to use in a directory and add the
+;; following to your .emacs:
+;; (add-to-list 'load-path "/path/to/company")
+;; (autoload 'company-mode "company" nil t)
+;;
+;; Enable company-mode with M-x company-mode.  For further information look at
+;; the documentation for `company-mode' (C-h f company-mode RET)
+;;
+;; If you want to start a specific back-end, call it interactively or use
+;; `company-begin-backend'.  For example:
+;; M-x company-abbrev will prompt for and insert an abbrev.
+;;
+;; To write your own back-end, look at the documentation for `company-backends'.
+;; Here is a simple example completing "foo":
+;;
+;; (defun company-my-backend (command &optional arg &rest ignored)
+;;   (case command
+;;     ('prefix (when (looking-back "foo\\>")
+;;                (match-string 0)))
+;;     ('candidates (list "foobar" "foobaz" "foobarbaz"))
+;;     ('meta (format "This value is named %s" arg))))
+;;
+;; Sometimes it is a good idea to mix two back-ends together, for example to
+;; enrich gtags with dabbrev-code results (to emulate local variables):
+;; To do this, add a list with the merged back-ends as an element in
+;; company-backends.
+;;
+;; Known Issues:
+;; When point is at the very end of the buffer, the pseudo-tooltip appears very
+;; wrong, unless company is allowed to temporarily insert a fake newline.
+;; This behavior is enabled by `company-end-of-buffer-workaround'.
+;;
+;;; Change Log:
+;;
+;; 2009-05-07 (0.4.3)
+;;    Added `company-other-backend'.
+;;    Idle completion no longer interrupts multi-key command input.
+;;    Added `company-ropemacs' and `company-pysmell' back-ends.
+;;
+;; 2009-04-25 (0.4.2)
+;;    In C modes . and -> now count towards `company-minimum-prefix-length'.
+;;    Reverted default front-end back to `company-preview-if-just-one-frontend'.
+;;    The pseudo tooltip will no longer be clipped at the right window edge.
+;;    Added `company-tooltip-minimum'.
+;;    Windows compatibility fixes.
+;;
+;; 2009-04-19 (0.4.1)
+;;    Added `global-company-mode'.
+;;    Performance enhancements.
+;;    Added `company-eclim' back-end.
+;;    Added safer workaround for Emacs `posn-col-row' bug.
+;;
+;; 2009-04-18 (0.4)
+;;    Automatic completion is now aborted if the prefix gets too short.
+;;    Added option `company-dabbrev-time-limit'.
+;;    `company-backends' now supports merging back-ends.
+;;    Added back-end `company-dabbrev-code' for generic code.
+;;    Fixed `company-begin-with'.
+;;
+;; 2009-04-15 (0.3.1)
+;;    Added 'stop prefix to prevent dabbrev from completing inside of symbols.
+;;    Fixed issues with tabbar-mode and line-spacing.
+;;    Performance enhancements.
+;;
+;; 2009-04-12 (0.3)
+;;    Added `company-begin-commands' option.
+;;    Added abbrev, tempo and Xcode back-ends.
+;;    Back-ends are now interactive.  You can start them with M-x backend-name.
+;;    Added `company-begin-with' for starting company from elisp-code.
+;;    Added hooks.
+;;    Added `company-require-match' and `company-auto-complete' options.
+;;
+;; 2009-04-05 (0.2.1)
+;;    Improved Emacs Lisp back-end behavior for local variables.
+;;    Added `company-elisp-detect-function-context' option.
+;;    The mouse can now be used for selection.
+;;
+;; 2009-03-22 (0.2)
+;;    Added `company-show-location'.
+;;    Added etags back-end.
+;;    Added work-around for end-of-buffer bug.
+;;    Added `company-filter-candidates'.
+;;    More local Lisp variables are now included in the candidates.
+;;
+;; 2009-03-21 (0.1.5)
+;;    Fixed elisp documentation buffer always showing the same doc.
+;;    Added `company-echo-strip-common-frontend'.
+;;    Added `company-show-numbers' option and M-0 ... M-9 default bindings.
+;;    Don't hide the echo message if it isn't shown.
+;;
+;; 2009-03-20 (0.1)
+;;    Initial release.
+;;
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+(add-to-list 'debug-ignored-errors "^.* frontend cannot be used twice$")
+(add-to-list 'debug-ignored-errors "^Echo area cannot be used twice$")
+(add-to-list 'debug-ignored-errors "^No \\(document\\|loc\\)ation available$")
+(add-to-list 'debug-ignored-errors "^Company not ")
+(add-to-list 'debug-ignored-errors "^No candidate number ")
+(add-to-list 'debug-ignored-errors "^Cannot complete at point$")
+(add-to-list 'debug-ignored-errors "^No other back-end$")
+
+(defgroup company nil
+  "Extensible inline text completion mechanism"
+  :group 'abbrev
+  :group 'convenience
+  :group 'maching)
+
+(defface company-tooltip
+  '((t :background "yellow"
+       :foreground "black"))
+  "*Face used for the tool tip."
+  :group 'company)
+
+(defface company-tooltip-selection
+  '((default :inherit company-tooltip)
+    (((class color) (min-colors 88)) (:background "orange1"))
+    (t (:background "green")))
+  "*Face used for the selection in the tool tip."
+  :group 'company)
+
+(defface company-tooltip-mouse
+  '((default :inherit highlight))
+  "*Face used for the tool tip item under the mouse."
+  :group 'company)
+
+(defface company-tooltip-common
+  '((t :inherit company-tooltip
+       :foreground "red"))
+  "*Face used for the common completion in the tool tip."
+  :group 'company)
+
+(defface company-tooltip-common-selection
+  '((t :inherit company-tooltip-selection
+       :foreground "red"))
+  "*Face used for the selected common completion in the tool tip."
+  :group 'company)
+
+(defface company-preview
+  '((t :background "blue4"
+       :foreground "wheat"))
+  "*Face used for the completion preview."
+  :group 'company)
+
+(defface company-preview-common
+  '((t :inherit company-preview
+       :foreground "red"))
+  "*Face used for the common part of the completion preview."
+  :group 'company)
+
+(defface company-preview-search
+  '((t :inherit company-preview
+       :background "blue1"))
+  "*Face used for the search string in the completion preview."
+  :group 'company)
+
+(defface company-echo nil
+  "*Face used for completions in the echo area."
+  :group 'company)
+
+(defface company-echo-common
+  '((((background dark)) (:foreground "firebrick1"))
+    (((background light)) (:background "firebrick4")))
+  "*Face used for the common part of completions in the echo area."
+  :group 'company)
+
+(defun company-frontends-set (variable value)
+  ;; uniquify
+  (let ((remainder value))
+    (setcdr remainder (delq (car remainder) (cdr remainder))))
+  (and (memq 'company-pseudo-tooltip-unless-just-one-frontend value)
+       (memq 'company-pseudo-tooltip-frontend value)
+       (error "Pseudo tooltip frontend cannot be used twice"))
+  (and (memq 'company-preview-if-just-one-frontend value)
+       (memq 'company-preview-frontend value)
+       (error "Preview frontend cannot be used twice"))
+  (and (memq 'company-echo value)
+       (memq 'company-echo-metadata-frontend value)
+       (error "Echo area cannot be used twice"))
+  ;; preview must come last
+  (dolist (f '(company-preview-if-just-one-frontend company-preview-frontend))
+    (when (memq f value)
+      (setq value (append (delq f value) (list f)))))
+  (set variable value))
+
+(defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
+                               company-preview-if-just-one-frontend
+                               company-echo-metadata-frontend)
+  "*The list of active front-ends (visualizations).
+Each front-end is a function that takes one argument.  It is called with
+one of the following arguments:
+
+'show: When the visualization should start.
+
+'hide: When the visualization should end.
+
+'update: When the data has been updated.
+
+'pre-command: Before every command that is executed while the
+visualization is active.
+
+'post-command: After every command that is executed while the
+visualization is active.
+
+The visualized data is stored in `company-prefix', `company-candidates',
+`company-common', `company-selection', `company-point' and
+`company-search-string'."
+  :set 'company-frontends-set
+  :group 'company
+  :type '(repeat (choice (const :tag "echo" company-echo-frontend)
+                         (const :tag "echo, strip common"
+                                company-echo-strip-common-frontend)
+                         (const :tag "show echo meta-data in echo"
+                                company-echo-metadata-frontend)
+                         (const :tag "pseudo tooltip"
+                                company-pseudo-tooltip-frontend)
+                         (const :tag "pseudo tooltip, multiple only"
+                                company-pseudo-tooltip-unless-just-one-frontend)
+                         (const :tag "preview" company-preview-frontend)
+                         (const :tag "preview, unique only"
+                                company-preview-if-just-one-frontend)
+                         (function :tag "custom function" nil))))
+
+(defcustom company-tooltip-limit 10
+  "*The maximum number of candidates in the tool tip"
+  :group 'company
+  :type 'integer)
+
+(defcustom company-tooltip-minimum 6
+  "*The minimum height of the tool tip.
+If this many lines are not available, prefer to display the tooltip above."
+  :group 'company
+  :type 'integer)
+
+(defvar company-safe-backends
+  '((company-abbrev . "Abbrev")
+    (company-css . "CSS")
+    (company-dabbrev . "dabbrev for plain text")
+    (company-dabbrev-code . "dabbrev for code")
+    (company-eclim . "eclim (an Eclipse interace)")
+    (company-elisp . "Emacs Lisp")
+    (company-etags . "etags")
+    (company-files . "Files")
+    (company-gtags . "GNU Global")
+    (company-ispell . "ispell")
+    (company-keywords . "Programming language keywords")
+    (company-nxml . "nxml")
+    (company-oddmuse . "Oddmuse")
+    (company-predictive . "Predictive Word Completion")
+    (company-pysmell . "PySmell")
+    (company-ropemacs . "ropemacs")
+    (company-semantic . "CEDET Semantic")
+    (company-tempo . "Tempo templates")
+    (company-xcode . "Xcode")))
+(put 'company-safe-backends 'risky-local-variable t)
+
+(defun company-safe-backends-p (backends)
+  (and (consp backends)
+       (not (dolist (backend backends)
+              (unless (if (consp backend)
+                          (company-safe-backends-p backend)
+                        (assq backend company-safe-backends))
+                (return t))))))
+
+(defcustom company-backends '(company-elisp company-nxml company-css
+                              company-eclim company-semantic company-xcode
+                              company-ropemacs
+                              (company-gtags company-etags company-dabbrev-code
+                               company-pysmell company-keywords)
+                              company-oddmuse company-files company-dabbrev)
+  "*The list of active back-ends (completion engines).
+Each list elements can itself be a list of back-ends.  In that case their
+completions are merged.  Otherwise only the first matching back-end returns
+results.
+
+`company-begin-backend' can be used to start a specific back-end,
+`company-other-backend' will skip to the next matching back-end in the list.
+
+Each back-end is a function that takes a variable number of arguments.
+The first argument is the command requested from the back-end.  It is one
+of the following:
+
+'prefix: The back-end should return the text to be completed.  It must be
+text immediately before `point'.  Returning nil passes control to the next
+back-end.  The function should return 'stop if it should complete but cannot
+\(e.g. if it is in the middle of a string\).  If the returned value is only
+part of the prefix (e.g. the part after \"->\" in C), the back-end may return a
+cons of prefix and prefix length, which is then used in the
+`company-minimum-prefix-length' test.
+
+'candidates: The second argument is the prefix to be completed.  The
+return value should be a list of candidates that start with the prefix.
+
+Optional commands:
+
+'sorted: The back-end may return t here to indicate that the candidates
+are sorted and will not need to be sorted again.
+
+'duplicates: If non-nil, company will take care of removing duplicates
+from the list.
+
+'no-cache: Usually company doesn't ask for candidates again as completion
+progresses, unless the back-end returns t for this command.  The second
+argument is the latest prefix.
+
+'meta: The second argument is a completion candidate.  The back-end should
+return a (short) documentation string for it.
+
+'doc-buffer: The second argument is a completion candidate.  The back-end should
+create a buffer (preferably with `company-doc-buffer'), fill it with
+documentation and return it.
+
+'location: The second argument is a completion candidate.  The back-end can
+return the cons of buffer and buffer location, or of file and line
+number where the completion candidate was defined.
+
+'require-match: If this value is t, the user is not allowed to enter anything
+not offering as a candidate.  Use with care!  The default value nil gives the
+user that choice with `company-require-match'.  Return value 'never overrides
+that option the other way around.
+
+The back-end should return nil for all commands it does not support or
+does not know about.  It should also be callable interactively and use
+`company-begin-backend' to start itself in that case."
+  :group 'company
+  :type `(repeat
+          (choice
+           :tag "Back-end"
+           ,@(mapcar (lambda (b) `(const :tag ,(cdr b) ,(car b)))
+                     company-safe-backends)
+           (symbol :tag "User defined")
+           (repeat :tag "Merged Back-ends"
+                   (choice :tag "Back-end"
+                           ,@(mapcar (lambda (b)
+                                       `(const :tag ,(cdr b) ,(car b)))
+                                     company-safe-backends)
+                           (symbol :tag "User defined"))))))
+
+(defcustom company-major-modes-default-backends
+  '(
+    (css-mode         1     nil)
+    (org-mode         nil   (company-predictive company-dabbrev))
+    (text-mode        5     (company-predictive company-dabbrev))
+    (fundamental-mode 5     (company-predictive company-dabbrev))
+    )
+  "Specified default backends for major modes."
+  :type '(repeat (list (symbol :tag "Major mode")
+                       (choice (const   :tag "Prefix length before auto-show: Use default" nil)
+                               (integer :tag "Prefix length before auto-show"))
+                       (choice (symbol :tag "Company mode backend")
+                               (repeat (symbol :tag "Company mode backend")))))
+  :group 'company)
+
+;; (company-set-major-mode-backend)
+(defun company-set-major-mode-backend ()
+  "Set default `company-backend' in buffer according to major mode.
+See `company-major-modes-default-backends' for mapping between
+major modes and default backends."
+  (when (and (boundp 'company-backends)
+             (not buffer-read-only))
+    (let ((matching-backend (catch 'backend-rec
+                              (dolist (rec company-major-modes-default-backends)
+                                (when (derived-mode-p (nth 0 rec))
+                                  (throw 'backend-rec rec)))))
+          backend min-len)
+      (when matching-backend
+        (setq min-len         (nth 1 matching-backend))
+        (setq backend         (nth 2 matching-backend))
+        (when min-len
+          (set (make-local-variable 'company-minimum-prefix-length) min-len))
+        (when backend (setq company-backend backend)) ;; buffer local by default
+        company-backend))))
+
+(put 'company-backends 'safe-local-variable 'company-safe-backends-p)
+
+(defcustom company-completion-started-hook nil
+  "*Hook run when company starts completing.
+The hook is called with one argument that is non-nil if the completion was
+started manually."
+  :group 'company
+  :type 'hook)
+
+(defcustom company-completion-cancelled-hook nil
+  "*Hook run when company cancels completing.
+The hook is called with one argument that is non-nil if the completion was
+aborted manually."
+  :group 'company
+  :type 'hook)
+
+(defcustom company-completion-finished-hook nil
+  "*Hook run when company successfully completes.
+The hook is called with the selected candidate as an argument."
+  :group 'company
+  :type 'hook)
+
+(defcustom company-minimum-prefix-length 3
+  "*The minimum prefix length for automatic completion."
+  :group 'company
+  :type '(integer :tag "prefix length"))
+
+(defcustom company-require-match 'company-explicit-action-p
+  "*If enabled, disallow non-matching input.
+This can be a function do determine if a match is required.
+
+This can be overridden by the back-end, if it returns t or 'never to
+'require-match.  `company-auto-complete' also takes precedence over this."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (function :tag "Predicate function")
+                 (const :tag "On, if user interaction took place"
+                        'company-explicit-action-p)
+                 (const :tag "On" t)))
+
+(defcustom company-auto-complete 'company-explicit-action-p
+  "Determines when to auto-complete.
+If this is enabled, all characters from `company-auto-complete-chars' complete
+the selected completion.  This can also be a function."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (function :tag "Predicate function")
+                 (const :tag "On, if user interaction took place"
+                        'company-explicit-action-p)
+                 (const :tag "On" t)))
+
+(defcustom company-auto-complete-chars '(?\  ?\( ?\) ?. ?\" ?$ ?\' ?< ?| ?!)
+  "Determines which characters trigger an automatic completion.
+See `company-auto-complete'.  If this is a string, each string character causes
+completion.  If it is a list of syntax description characters (see
+`modify-syntax-entry'), all characters with that syntax auto-complete.
+
+This can also be a function, which is called with the new input and should
+return non-nil if company should auto-complete.
+
+A character that is part of a valid candidate never starts auto-completion."
+  :group 'company
+  :type '(choice (string :tag "Characters")
+                 (set :tag "Syntax"
+                      (const :tag "Whitespace" ?\ )
+                      (const :tag "Symbol" ?_)
+                      (const :tag "Opening parentheses" ?\()
+                      (const :tag "Closing parentheses" ?\))
+                      (const :tag "Word constituent" ?w)
+                      (const :tag "Punctuation." ?.)
+                      (const :tag "String quote." ?\")
+                      (const :tag "Paired delimiter." ?$)
+                      (const :tag "Expression quote or prefix operator." ?\')
+                      (const :tag "Comment starter." ?<)
+                      (const :tag "Comment ender." ?>)
+                      (const :tag "Character-quote." ?/)
+                      (const :tag "Generic string fence." ?|)
+                      (const :tag "Generic comment fence." ?!))
+                 (function :tag "Predicate function")))
+
+;;(setq company-idle-delay 7)
+(defcustom company-idle-delay .7
+  "*The idle delay in seconds until automatic completions starts.
+A value of nil means never complete automatically, t means complete
+immediately when a prefix of `company-minimum-prefix-length' is reached."
+  :group 'company
+  :type '(choice (const :tag "never (nil)" nil)
+                 (const :tag "immediate (t)" t)
+                 (number :tag "seconds")))
+
+(defcustom company-begin-commands t
+  "*A list of commands following which company will start completing.
+If this is t, it will complete after any command.  See `company-idle-delay'.
+
+Alternatively any command with a non-nil 'company-begin property is treated as
+if it was on this list."
+  :group 'company
+  :type '(choice (const :tag "Any command" t)
+                 (const :tag "Self insert command" '(self-insert-command))
+                 (repeat :tag "Commands" function)))
+
+(defcustom company-show-numbers nil
+  "*If enabled, show quick-access numbers for the first ten candidates."
+  :group 'company
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "on" t)))
+
+;;(defvar company-end-of-buffer-workaround t
+(defvar company-end-of-buffer-workaround t
+  "*Work around a visualization bug when completing at the end of the buffer.
+The work-around consists of adding a newline.")
+
+;;; mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-mode-map (make-sparse-keymap)
+  "Keymap used by `company-mode'.")
+
+(defvar company-ESC-count 0)
+(defun company-ESC ()
+  (interactive)
+  (if (and (boundp 'viper-current-state)
+           (not (eq 'vi-state viper-current-state)))
+      (progn
+        (message "viper-current-state=%s, doing viper ESC + company abort" viper-current-state)
+        (viper-intercept-ESC-key)
+        (company-abort))
+    (if (not (eq last-command this-command))
+        (setq company-ESC-count 1)
+      (if (= 1 company-ESC-count)
+          (incf company-ESC-count)
+        (company-abort)))))
+
+(defvar company-active-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "\e"     'company-ESC)
+    (define-key keymap [escape] 'company-ESC)
+    ;;(define-key keymap "\e\e\e" 'company-abort)
+
+    (define-key keymap "\C-g"         'company-abort)
+    (define-key keymap [(control ?g)] 'company-abort)
+
+    (define-key keymap [(down)]    'company-select-next)
+    (define-key keymap [(up)]      'company-select-previous)
+    ;;(define-key keymap [(meta) ?n] 'company-select-next)
+    ;;(define-key keymap [(meta) ?p] 'company-select-previous)
+    (define-key keymap [remap previous-line]  'company-select-previous)
+    (define-key keymap [remap next-line]      'company-select-next)
+
+    (define-key keymap [mouse-1] 'company-complete-mouse)
+    (define-key keymap [mouse-3] 'company-select-mouse)
+
+    (define-key keymap [down-mouse-1] 'ignore)
+    (define-key keymap [down-mouse-3] 'ignore)
+    (define-key keymap [up-mouse-1] 'ignore)
+    (define-key keymap [up-mouse-3] 'ignore)
+
+    (define-key keymap [(control return)]   'company-complete-selection)
+    ;;(define-key keymap [remap forward-word] 'company-complete-selection)
+    ;;(define-key keymap [remap forward-char] 'company-complete-selection)
+
+    (define-key keymap "\t"               'company-complete-common)
+    (define-key keymap [(tab)]            'company-complete-common)
+    (define-key keymap [(shift return)]   'company-complete-common)
+
+    ;; Using f1 for help is terrible since that is a key you might use
+    ;; often for the normal help.  However S-f1 should be ok - and
+    ;; should maybe be made some kind of standard in Emacs?
+    (define-key keymap [(shift f1)] 'company-show-doc-buffer)
+    (define-key keymap "\C-w" 'company-show-location)
+    (define-key keymap "\C-s" 'company-search-candidates)
+    (define-key keymap [(control) (meta) ?s] 'company-filter-candidates)
+    (dotimes (i 10)
+      ;;(define-key keymap (vector (+ (aref (kbd "M-0") 0) i))
+      ;;     `(lambda () (interactive) (company-complete-number ,i))))
+      `(define-key keymap (vector '(control) (+ ?0 ,i)) (company-complete-number 0)))
+
+    keymap)
+  "Keymap that is enabled during an active completion.")
+
+(defvar company--disabled-backends nil)
+
+(defun company-init-backend (backend)
+  (and (symbolp backend)
+       (not (fboundp backend))
+       (ignore-errors (require backend nil t)))
+
+  (if (or (symbolp backend)
+          (functionp backend))
+      (if (ignore-errors (funcall backend 'init) t)
+          (put backend 'company-init t)
+        (put backend 'company-init 'failed)
+        (unless (memq backend company--disabled-backends)
+          (message "Company back-end '%s' could not be initialized"
+                   backend)
+          (push backend company--disabled-backends))
+        nil)
+    (mapc 'company-init-backend backend)))
+
+(defvar company-default-lighter " company")
+
+(defvar company-lighter company-default-lighter)
+(make-variable-buffer-local 'company-lighter)
+
+;;;###autoload
+(define-minor-mode company-mode
+  "\"complete anything\"; in in-buffer completion framework.
+Completion starts automatically, depending on the values
+`company-idle-delay' and `company-minimum-prefix-length'.
+
+Completion can be controlled with the commands:
+`company-complete-common', `company-complete-selection', `company-complete',
+`company-select-next', `company-select-previous'.  If these commands are
+called before `company-idle-delay', completion will also start.
+
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.  These can be used while completion is
+inactive, as well.
+
+The completion data is retrieved using `company-backends' and displayed using
+`company-frontends'.  If you want to start a specific back-end, call it
+interactively or use `company-begin-backend'.
+
+regular keymap (`company-mode-map'):
+
+\\{company-mode-map}
+keymap during active completions (`company-active-map'):
+
+\\{company-active-map}"
+  nil company-lighter company-mode-map
+  (if company-mode
+      (progn
+        (add-hook 'pre-command-hook 'company-pre-command nil t)
+        (add-hook 'post-command-hook 'company-post-command nil t)
+        (mapc 'company-init-backend company-backends))
+    (remove-hook 'pre-command-hook 'company-pre-command t)
+    (remove-hook 'post-command-hook 'company-post-command t)
+    (company-cancel)
+    (kill-local-variable 'company-point)))
+
+(defcustom company-major-modes '(css-mode emacs-lisp-mode nxml-mode)
+  "Modes in which `global-company-mode' turn on `company-mode'."
+  :type '(repeat (command :tag "Major mode"))
+  :group 'company)
+
+;;;###autoload
+(define-globalized-minor-mode global-company-mode company-mode
+  (lambda ()
+    (when (catch 'cm
+            (dolist (mode company-major-modes)
+              (when (derived-mode-p mode)
+                (throw 'cm t))))
+      (company-mode 1))))
+
+(defsubst company-assert-enabled ()
+  (unless company-mode
+    (company-uninstall-map)
+    (error "Company not enabled")))
+
+;;; keymaps ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-overriding-keymap-bound nil)
+(make-variable-buffer-local 'company-overriding-keymap-bound)
+
+(defvar company-old-keymap nil)
+(make-variable-buffer-local 'company-old-keymap)
+
+(defvar company-my-keymap nil)
+(make-variable-buffer-local 'company-my-keymap)
+
+(defsubst company-enable-overriding-keymap (keymap)
+  (setq company-my-keymap keymap)
+  (when company-overriding-keymap-bound
+    (company-uninstall-map)))
+
+;; Fix-me: using `overriding-terminal-local-map' here causes a lot of
+;; problem when exiting from completion since then global-map is used
+;; for all exiting key sequences.  It is better to use
+;; `emulation-mode-map-alists' and put `company-my-keymap' first
+;; there.
+;;
+(defvar company--emul-keymap-alist nil)
+(defvar company-menu-is-shown t)
+(defun company-install-map ()
+  (unless (or company-overriding-keymap-bound
+              (null company-my-keymap))
+    ;; Fix-me, this is just a workaround: Users probably expect this:
+    ;; (define-key company-my-keymap (kbd "\r") (key-binding "\r"))
+    ;; (define-key company-my-keymap (kbd "\n") (key-binding "\n"))
+    (setq company-menu-is-shown t)
+    (setq company--emul-keymap-alist (list (cons 'company-menu-is-shown
+                                                 company-my-keymap)))
+    (setq emulation-mode-map-alists (delq 'company--emul-keymap-alist
+                                          emulation-mode-map-alists))
+    (add-to-list 'emulation-mode-map-alists 'company--emul-keymap-alist)
+    ;;(message "cim:emulation-mode-map-alists=%s" emulation-mode-map-alists)
+    (setq company-overriding-keymap-bound t)
+    ;; (setq company-old-keymap overriding-terminal-local-map
+    ;;       overriding-terminal-local-map company-my-keymap
+    ;;       company-overriding-keymap-bound t)
+    ))
+
+(defun company-uninstall-map ()
+  (setq company-menu-is-shown nil)
+  (setq emulation-mode-map-alists (delq 'company--emul-keymap-alist
+                                        emulation-mode-map-alists))
+  (setq company-overriding-keymap-bound nil)
+  ;; (when (eq overriding-terminal-local-map company-my-keymap)
+  ;;   (setq overriding-terminal-local-map company-old-keymap
+  ;;         company-overriding-keymap-bound nil))
+  )
+
+;; Hack:
+;; Emacs calculates the active keymaps before reading the event.  That means we
+;; cannot change the keymap from a timer.  So we send a bogus command.
+(defun company-ignore ()
+  (interactive)
+  (setq this-command last-command))
+
+(global-set-key '[31415926] 'company-ignore)
+
+(defun company-input-noop ()
+  (push 31415926 unread-command-events))
+
+;; Hack:
+;; posn-col-row is incorrect in older Emacsen when line-spacing is set
+(defun company--col-row (&optional pos)
+  (let ((posn (posn-at-point pos)))
+    (cons (car (posn-col-row posn)) (cdr (posn-actual-col-row posn)))))
+
+(defsubst company--column (&optional pos)
+  (car (posn-col-row (posn-at-point pos))))
+
+(defsubst company--row (&optional pos)
+  ;; posn-at-point might return nil in a small window like the
+  ;; minbuffer window, not sure why.  It can also return nil if pos is
+  ;; nil.  Seems like an Emacs bug. /LB
+  (cdr (posn-actual-col-row (or (posn-at-point pos)
+                                (with-selected-window (selected-window)
+                                  (message "trying hard to get posn-at-point")
+                                  (posn-at-point (if pos 1 (point))))))))
+
+;;; backends ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-grab (regexp &optional expression limit)
+  (when (looking-back regexp limit)
+    (or (match-string-no-properties (or expression 0)) "")))
+
+(defun company-grab-line (regexp &optional expression)
+  (company-grab regexp expression (point-at-bol)))
+
+;; Fix-me: Why are not `buffer-substring-no-properties' used here?
+(defun company-grab-symbol ()
+  (if (looking-at "\\_>")
+      (buffer-substring-no-properties (point) (save-excursion (skip-syntax-backward "w_")
+                                                              (point)))
+    (unless (and (char-after) (memq (char-syntax (char-after)) '(?w ?_)))
+      "")))
+
+;; Fix-me: Why are not `buffer-substring-no-properties' used here?
+(defun company-grab-word ()
+  (if (looking-at "\\>")
+      (buffer-substring (point) (save-excursion (skip-syntax-backward "w")
+                                                (point)))
+    (unless (and (char-after) (eq (char-syntax (char-after)) ?w))
+      "")))
+
+(defun company-in-string-or-comment ()
+  (let ((ppss (syntax-ppss)))
+    (or (car (setq ppss (nthcdr 3 ppss)))
+        (car (setq ppss (cdr ppss)))
+        (nth 3 ppss))))
+
+(if (fboundp 'locate-dominating-file)
+    (defalias 'company-locate-dominating-file 'locate-dominating-file)
+  (defun company-locate-dominating-file (file name)
+    (catch 'root
+      (let ((dir (file-name-directory file))
+            (prev-dir nil))
+        (while (not (equal dir prev-dir))
+          (when (file-exists-p (expand-file-name name dir))
+            (throw 'root dir))
+          (setq prev-dir dir
+                dir (file-name-directory (directory-file-name dir))))))))
+
+(defun company-call-backend (&rest args)
+  (if (functionp company-backend)
+      (apply company-backend args)
+    (apply 'company--multi-backend-adapter company-backend args)))
+
+(defun company--multi-backend-adapter (backends command &rest args)
+  (case command
+    ('candidates
+     (apply 'append (mapcar (lambda (backend) (apply backend command args))
+                            backends)))
+    ('sorted nil)
+    ('duplicates t)
+    (otherwise
+     (let (value)
+       (dolist (backend backends)
+         (when (setq value (apply backend command args))
+           (return value)))))))
+
+;;; completion mechanism ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-backend nil)
+(make-variable-buffer-local 'company-backend)
+
+(defvar company-prefix nil)
+(make-variable-buffer-local 'company-prefix)
+
+(defvar company-candidates nil)
+(make-variable-buffer-local 'company-candidates)
+
+(defvar company-candidates-length nil)
+(make-variable-buffer-local 'company-candidates-length)
+
+(defvar company-candidates-cache nil)
+(make-variable-buffer-local 'company-candidates-cache)
+
+(defvar company-candidates-predicate nil)
+(make-variable-buffer-local 'company-candidates-predicate)
+
+(defvar company-common nil)
+(make-variable-buffer-local 'company-common)
+
+(defvar company-selection 0)
+(make-variable-buffer-local 'company-selection)
+
+(defvar company-selection-changed nil)
+(make-variable-buffer-local 'company-selection-changed)
+
+(defvar company--explicit-action nil
+  "Non-nil, if explicit completion took place.")
+(make-variable-buffer-local 'company--explicit-action)
+
+(defvar company--point-max nil)
+(make-variable-buffer-local 'company--point-max)
+
+(defvar company-point nil)
+(make-variable-buffer-local 'company-point)
+
+(defvar company-timer nil)
+
+(defvar company-added-newline nil)
+(make-variable-buffer-local 'company-added-newline)
+
+(defsubst company-strip-prefix (str)
+  (substring str (length company-prefix)))
+
+(defun company-explicit-action-p ()
+  "Return whether explicit completion action was taken by the user."
+  (or company--explicit-action
+      company-selection-changed))
+
+(defsubst company-reformat (candidate)
+  ;; company-ispell needs this, because the results are always lower-case
+  ;; It's mory efficient to fix it only when they are displayed.
+  (concat company-prefix (substring candidate (length company-prefix))))
+
+(defun company--should-complete ()
+  (and (not (or buffer-read-only overriding-terminal-local-map
+                overriding-local-map))
+       ;; Check if in the middle of entering a key combination.
+       (or (equal (this-command-keys-vector) [])
+           (not (keymapp (key-binding (this-command-keys-vector)))))
+       (eq company-idle-delay t)
+       (or (eq t company-begin-commands)
+           (memq this-command company-begin-commands)
+           (and (symbolp this-command) (get this-command 'company-begin)))
+       (not (and transient-mark-mode mark-active))))
+
+(defsubst company-call-frontends (command)
+  (dolist (frontend company-frontends)
+    ;;(message "frontend=%s, %s" frontend command)
+    (condition-case err
+        (funcall frontend command)
+      (error (error "Company: Front-end %s error \"%s\" on command %s"
+                    frontend (error-message-string err) command)))))
+
+(defsubst company-set-selection (selection &optional force-update)
+  (setq selection (max 0 (min (1- company-candidates-length) selection)))
+  (when (or force-update (not (equal selection company-selection)))
+    (setq company-selection selection
+          company-selection-changed t)
+    (company-call-frontends 'update)))
+
+(defun company-apply-predicate (candidates predicate)
+  (let (new)
+    (dolist (c candidates)
+      (when (funcall predicate c)
+        (push c new)))
+    (nreverse new)))
+
+(defun company-update-candidates (candidates)
+  (setq company-candidates-length (length candidates))
+  (if (> company-selection 0)
+      ;; Try to restore the selection
+      (let ((selected (nth company-selection company-candidates)))
+        (setq company-selection 0
+              company-candidates candidates)
+        (when selected
+          (while (and candidates (string< (pop candidates) selected))
+            (incf company-selection))
+          (unless candidates
+            ;; Make sure selection isn't out of bounds.
+            (setq company-selection (min (1- company-candidates-length)
+                                         company-selection)))))
+    (setq company-selection 0
+          company-candidates candidates))
+  ;; Save in cache:
+  ;;(push (cons company-prefix company-candidates) company-candidates-cache)
+  (add-to-list 'company-candidates-cache (cons company-prefix
+                                               (if (listp company-candidates)
+                                                   company-candidates
+                                                 (list company-candidates))))
+  ;;(message ";; Save in cache:company-candidate-cache=%S" company-candidates-cache)
+  ;; Calculate common.
+  (let ((completion-ignore-case (company-call-backend 'ignore-case)))
+    (setq company-common (try-completion company-prefix company-candidates)))
+  ;;(message ";; Calculate common. company-common=%s" company-common)
+  (when (eq company-common t)
+    (if (company-call-backend 'no-insert)
+        (setq company-common company-prefix)
+      (setq company-candidates nil))))
+
+(defun company-calculate-candidates (prefix)
+  (let ((candidates (cdr (assoc prefix company-candidates-cache))))
+    (or candidates
+        (when company-candidates-cache
+          (let ((len (length prefix))
+                (completion-ignore-case (company-call-backend 'ignore-case))
+                prev)
+            (dotimes (i (1+ len))
+              (when (setq prev (cdr (assoc (substring prefix 0 (- len i))
+                                           company-candidates-cache)))
+                (setq candidates (all-completions prefix prev))
+                (return t)))))
+        ;; no cache match, call back-end
+        (progn
+          (setq candidates (company-call-backend 'candidates prefix))
+          (when company-candidates-predicate
+            (setq candidates
+                  (company-apply-predicate candidates
+                                           company-candidates-predicate)))
+          (unless (company-call-backend 'sorted)
+            (setq candidates (sort candidates 'string<)))
+          (when (company-call-backend 'duplicates)
+            ;; strip duplicates
+            (let ((c2 candidates))
+              (while c2
+                (setcdr c2 (progn (while (equal (pop c2) (car c2)))
+                                  c2)))))))
+    (if (or (cdr candidates)
+            (not (equal (car candidates) prefix))
+            (company-call-backend 'no-insert)
+            )
+        ;; Don't start when already completed and unique.
+        (progn
+          ;;(message ";; Don't start when already completed and unique. candidates=%s" candidates)
+          candidates)
+      ;; Not the right place? maybe when setting?
+      (and company-candidates t))))
+
+(defun company-idle-begin (buf win tick pos)
+  (and (or (not (boundp 'viper-current-state))
+           (not (eq 'vi-state viper-current-state)))
+       company-mode
+       (eq buf (current-buffer))
+       (eq win (selected-window))
+       (eq tick (buffer-chars-modified-tick))
+       (eq pos (point))
+       (not company-candidates)
+       (not (equal (point) company-point))
+       (let ((company-idle-delay t)
+             (company-begin-commands t))
+         (company-begin)
+         (when company-candidates
+           (company-input-noop)
+           (company-post-command)))))
+
+(defun company-auto-begin ()
+  (company-assert-enabled)
+  (and company-mode
+       (not company-candidates)
+       (let ((company-idle-delay t)
+             (company-minimum-prefix-length 0)
+             (company-begin-commands t))
+         (company-begin)))
+  ;; Return non-nil if active.
+  company-candidates)
+
+(defun company-manual-begin ()
+  (interactive)
+  (setq company--explicit-action t)
+  (company-auto-begin))
+
+(defun company-other-backend (&optional backward)
+  (interactive (list current-prefix-arg))
+  (company-assert-enabled)
+  (if company-backend
+      (let* ((after (cdr (member company-backend company-backends)))
+             (before (cdr (member company-backend (reverse company-backends))))
+             (next (if backward
+                       (append before (reverse after))
+                     (append after (reverse before)))))
+        (message "company-cancel in company-other-backend")
+        (company-cancel)
+        (dolist (backend next)
+          (when (ignore-errors (company-begin-backend backend))
+            (return t))))
+    (company-manual-begin))
+  (unless company-candidates
+    (error "No other back-end")))
+
+(defun company-require-match-p ()
+  (let ((backend-value (company-call-backend 'require-match)))
+    (or (eq backend-value t)
+        (and (if (functionp company-require-match)
+                 (funcall company-require-match)
+               (eq company-require-match t))
+             (not (eq backend-value 'never))))))
+
+(defun company-punctuation-p (input)
+  "Return non-nil, if input starts with punctuation or parentheses."
+  (memq (char-syntax (string-to-char input)) '(?. ?\( ?\))))
+
+(defun company-auto-complete-p (input)
+  "Return non-nil, if input starts with punctuation or parentheses."
+  (and (if (functionp company-auto-complete)
+           (funcall company-auto-complete)
+         company-auto-complete)
+       (if (functionp company-auto-complete-chars)
+           (funcall company-auto-complete-chars input)
+         (if (consp company-auto-complete-chars)
+             (memq (char-syntax (string-to-char input))
+                   company-auto-complete-chars)
+           (string-match (substring input 0 1) company-auto-complete-chars)))))
+
+;; Fix-me: Why are not `buffer-substring-no-properties' used here?
+(defun company--incremental-p ()
+  (message "company--incremental-p")
+  (and (> (point) company-point)
+       (> (point-max) company--point-max)
+       (not (eq this-command 'backward-delete-char-untabify))
+       (equal (company-buffer-substring-visible-bug3875 (- company-point (length company-prefix))
+                                                        company-point)
+              company-prefix)))
+
+(defsubst company--string-incremental-p (old-prefix new-prefix)
+  (and (> (length new-prefix) (length old-prefix))
+       (equal old-prefix (substring new-prefix 0 (length old-prefix)))))
+
+;; Fix-me: Why are not `buffer-substring-no-properties' used here?
+(defun company--continue-failed (new-prefix)
+  ;;(message "company--continue-failed %s" new-prefix)
+  (if (company-call-backend 'no-insert)
+      (progn
+        (message "%s" (propertize "No match" 'face 'highlight))
+        (company-echo-show-soon "") ;; fix-me
+        (setq company-prefix new-prefix)
+        (company-update-candidates nil)
+        company-candidates
+        )
+  (when (company--incremental-p)
+    (let ((input (buffer-substring-no-properties (point) company-point)))
+      (message "input=%s, grab=%s" input (company-call-backend 'prefix))
+      (cond
+       ((company-auto-complete-p input)
+        ;; auto-complete
+        (save-excursion
+          (goto-char company-point)
+          (company-complete-selection)
+          nil))
+       ((and (company--string-incremental-p company-prefix new-prefix)
+             (company-require-match-p))
+        ;; wrong incremental input, but required match
+        (backward-delete-char (length input))
+        (ding)
+        (message "Matching input is required")
+        company-candidates)
+       ((equal company-prefix (car company-candidates))
+        ;; last input was actually success
+        (message "company-cancel ;; last input was actually success")
+        (company-cancel company-prefix)
+        nil))))))
+
+(defun company--good-prefix-p (prefix)
+  (and (or (company-explicit-action-p)
+           (>= (or (cdr-safe prefix) (length prefix))
+               company-minimum-prefix-length))
+       (stringp (or (car-safe prefix) prefix))))
+
+(defun company--continue ()
+  (when (company-call-backend 'no-cache company-prefix)
+    ;; Don't complete existing candidates, fetch new ones.
+    (setq company-candidates-cache nil))
+  (let* ((new-prefix (company-call-backend 'prefix))
+         (c (when (and (company--good-prefix-p new-prefix)
+                       (setq new-prefix (or (car-safe new-prefix) new-prefix))
+                       ;;(not (company-call-backend 'no-insert))
+                       (or (company-call-backend 'no-insert)
+                           (= (- (point) (length new-prefix))
+                              (- company-point (length company-prefix)))))
+              (setq new-prefix (or (car-safe new-prefix) new-prefix))
+              (company-calculate-candidates new-prefix))))
+    ;;(message "c=%S" c)
+    (or (cond
+         ((and (eq c t)
+               (not (company-call-backend 'no-insert)))
+          ;; t means complete/unique.
+          ;;(message "company-cancel ;; t means complete/unique.")
+          (company-cancel new-prefix)
+          nil)
+         ((consp c)
+          ;; incremental match
+          (setq company-prefix new-prefix)
+          ;;(message ";; incremental match company-prefix => %S" company-prefix)
+          (company-update-candidates c)
+          c)
+         (t (company--continue-failed new-prefix)))
+         (unless (company-call-backend 'no-insert)
+           ;;(progn (message "company-cancel continue") nil)
+           (company-cancel)))))
+
+(defun company--begin-new ()
+  (let (prefix c)
+    (dolist (backend (if company-backend
+                         ;; prefer manual override
+                         (list company-backend)
+                       company-backends))
+      (setq prefix
+            (if (or (symbolp backend)
+                    (functionp backend))
+                (when (or (not (symbolp backend))
+                          (eq t (get backend 'company-init))
+                          (unless (get backend 'company-init)
+                            (company-init-backend backend)))
+                  (funcall backend 'prefix))
+              (company--multi-backend-adapter backend 'prefix)))
+      (when prefix
+        (when (company--good-prefix-p prefix)
+          (setq prefix (or (car-safe prefix) prefix)
+                company-backend backend
+                c (company-calculate-candidates prefix))
+          ;; t means complete/unique.  We don't start, so no hooks.
+          (when (consp c)
+            (setq company-prefix prefix)
+            ;;(message "company--begin-new company-prefix => %S" prefix)
+            (when (symbolp backend)
+              (setq company-lighter (concat " " (symbol-name backend))))
+            (company-update-candidates c)
+            (run-hook-with-args 'company-completion-started-hook
+                                (company-explicit-action-p))
+            (company-call-frontends 'show)))
+        (return c)))))
+
+(defun company-begin ()
+  (setq company-candidates
+        (or (and (or company-candidates
+                     (company-call-backend 'no-insert)
+                     )
+                 (company--continue))
+            (and (company--should-complete) (company--begin-new))))
+  ;;(message "company-begin cc=%s" company-candidates)
+  (when company-candidates
+    (when (and company-end-of-buffer-workaround (eobp))
+      (save-excursion (insert "\n"))
+      (setq company-added-newline (buffer-chars-modified-tick)))
+    ;;(message "company-begin")
+    (setq company-point (point)
+          company--point-max (point-max))
+    (company-enable-overriding-keymap company-active-map)
+    (company-call-frontends 'update)))
+
+(defun company-cancel (&optional result)
+  (and company-added-newline
+       (> (point-max) (point-min))
+       (let ((tick (buffer-chars-modified-tick)))
+         (delete-region (1- (point-max)) (point-max))
+         (equal tick company-added-newline))
+       ;; Only set unmodified when tick remained the same since insert.
+       (set-buffer-modified-p nil))
+  (when company-prefix
+    (if (stringp result)
+        (run-hook-with-args 'company-completion-finished-hook result)
+      (run-hook-with-args 'company-completion-cancelled-hook result)))
+  (setq company-added-newline nil
+        company-backend nil
+        company-prefix nil
+        company-candidates nil
+        company-candidates-length nil
+        company-candidates-cache nil
+        company-candidates-predicate nil
+        company-common nil
+        company-selection 0
+        company-selection-changed nil
+        company--explicit-action nil
+        company-lighter company-default-lighter
+        company--point-max nil
+        company-point nil)
+  (when company-timer
+    (cancel-timer company-timer))
+  (company-search-mode 0)
+  (company-call-frontends 'hide)
+  (company-enable-overriding-keymap nil))
+
+(defun company-abort ()
+  (interactive)
+  (company-cancel t)
+  ;; Don't start again, unless started manually.
+  (setq company-point (point)))
+
+(defun company-finish (result)
+  (unless (company-call-backend 'no-insert)
+    (insert (company-strip-prefix result)))
+  ;;(message "company-cancel finish")
+  (company-cancel result)
+  ;; Don't start again, unless started manually.
+  (setq company-point (point)))
+
+(defsubst company-keep (command)
+  (and (symbolp command) (get command 'company-keep)))
+
+(defun company-pre-command ()
+  (unless (company-keep this-command)
+    (condition-case err
+        (when company-candidates
+          (company-call-frontends 'pre-command))
+      (error (message "Company: An error occurred in pre-command")
+             (message "%s" (error-message-string err))
+             (company-cancel))))
+  (when company-timer
+    (cancel-timer company-timer)
+    (setq company-timer nil))
+  (company-uninstall-map))
+
+(defun company-post-command ()
+  (unless (company-keep this-command)
+    (condition-case err
+        (progn
+          (unless (and (equal (point) company-point)
+                       (not (company-call-backend 'no-insert)))
+            (company-begin))
+          (if company-candidates
+              (company-call-frontends 'post-command)
+            (and (numberp company-idle-delay)
+                 (or (eq t company-begin-commands)
+                     (memq this-command company-begin-commands))
+                 ;; Fix-me: maybe allow completion popup in minibuffer
+                 ;; too, but in that case RET must still exit
+                 ;; minibuffer even if a menu is shown! Otherwise it
+                 ;; will get very frustrating. A new line is added to
+                 ;; the minibuffer result.
+                 (not (eq (selected-window) (active-minibuffer-window)))
+                 (setq company-timer
+                       (run-with-timer company-idle-delay nil
+                                       'company-idle-begin
+                                       (current-buffer) (selected-window)
+                                       (buffer-chars-modified-tick) (point))))))
+      (error (message "Company: An error occurred in post-command")
+             (message "%s" (error-message-string err))
+             (company-cancel))))
+  (company-install-map))
+
+;;; search ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-search-string nil)
+(make-variable-buffer-local 'company-search-string)
+
+(defvar company-search-lighter " Search: \"\"")
+(make-variable-buffer-local 'company-search-lighter)
+
+(defvar company-search-old-map nil)
+(make-variable-buffer-local 'company-search-old-map)
+
+(defvar company-search-old-selection 0)
+(make-variable-buffer-local 'company-search-old-selection)
+
+(defun company-search (text lines)
+  (let ((quoted (regexp-quote text))
+        (i 0))
+    (dolist (line lines)
+      (when (string-match quoted line (length company-prefix))
+        (return i))
+      (incf i))))
+
+(defun company-search-printing-char ()
+  (interactive)
+  (company-search-assert-enabled)
+  (setq company-search-string
+        (concat (or company-search-string "") (string last-command-event))
+        company-search-lighter (concat " Search: \"" company-search-string
+                                        "\""))
+  (let ((pos (company-search company-search-string
+                              (nthcdr company-selection company-candidates))))
+    (if (null pos)
+        (ding)
+      (company-set-selection (+ company-selection pos) t))))
+
+(defun company-search-repeat-forward ()
+  "Repeat the incremental search in completion candidates forward."
+  (interactive)
+  (company-search-assert-enabled)
+  (let ((pos (company-search company-search-string
+                              (cdr (nthcdr company-selection
+                                           company-candidates)))))
+    (if (null pos)
+        (ding)
+      (company-set-selection (+ company-selection pos 1) t))))
+
+(defun company-search-repeat-backward ()
+  "Repeat the incremental search in completion candidates backwards."
+  (interactive)
+  (company-search-assert-enabled)
+  (let ((pos (company-search company-search-string
+                              (nthcdr (- company-candidates-length
+                                         company-selection)
+                                      (reverse company-candidates)))))
+    (if (null pos)
+        (ding)
+      (company-set-selection (- company-selection pos 1) t))))
+
+(defun company-create-match-predicate ()
+  (setq company-candidates-predicate
+        `(lambda (candidate)
+           ,(if company-candidates-predicate
+                `(and (string-match ,company-search-string candidate)
+                      (funcall ,company-candidates-predicate
+                               candidate))
+              `(string-match ,company-search-string candidate))))
+  (company-update-candidates
+   (company-apply-predicate company-candidates company-candidates-predicate))
+  ;; Invalidate cache.
+  (setq company-candidates-cache (cons company-prefix company-candidates)))
+
+(defun company-filter-printing-char ()
+  (interactive)
+  (company-search-assert-enabled)
+  (company-search-printing-char)
+  (company-create-match-predicate)
+  (company-call-frontends 'update))
+
+(defun company-search-kill-others ()
+  "Limit the completion candidates to the ones matching the search string."
+  (interactive)
+  (company-search-assert-enabled)
+  (company-create-match-predicate)
+  (company-search-mode 0)
+  (company-call-frontends 'update))
+
+(defun company-search-abort ()
+  "Abort searching the completion candidates."
+  (interactive)
+  (company-search-assert-enabled)
+  (company-set-selection company-search-old-selection t)
+  (company-search-mode 0))
+
+(defun company-search-other-char ()
+  (interactive)
+  (company-search-assert-enabled)
+  (company-search-mode 0)
+  (when last-input-event
+    (clear-this-command-keys t)
+    (setq unread-command-events (list last-input-event))))
+
+(defvar company-search-map
+  (let ((i 0)
+        (keymap (make-keymap)))
+    (if (fboundp 'max-char)
+        (set-char-table-range (nth 1 keymap) (cons #x100 (max-char))
+                              'company-search-printing-char)
+      (with-no-warnings
+        ;; obselete in Emacs 23
+        (let ((l (generic-character-list))
+              (table (nth 1 keymap)))
+          (while l
+            (set-char-table-default table (car l) 'company-search-printing-char)
+            (setq l (cdr l))))))
+    (define-key keymap [t] 'company-search-other-char)
+    (while (< i ?\s)
+      (define-key keymap (make-string 1 i) 'company-search-other-char)
+      (incf i))
+    (while (< i 256)
+      (define-key keymap (vector i) 'company-search-printing-char)
+      (incf i))
+    (let ((meta-map (make-sparse-keymap)))
+      (define-key keymap (char-to-string meta-prefix-char) meta-map)
+      (define-key keymap [escape] meta-map))
+    (define-key keymap (vector meta-prefix-char t) 'company-search-other-char)
+    (define-key keymap "\e\e\e" 'company-search-other-char)
+    (define-key keymap  [escape escape escape] 'company-search-other-char)
+
+    (define-key keymap "\C-g" 'company-search-abort)
+    (define-key keymap "\C-s" 'company-search-repeat-forward)
+    (define-key keymap "\C-r" 'company-search-repeat-backward)
+    (define-key keymap "\C-o" 'company-search-kill-others)
+    keymap)
+  "Keymap used for incrementally searching the completion candidates.")
+
+(define-minor-mode company-search-mode
+  "Search mode for completion candidates.
+Don't start this directly, use `company-search-candidates' or
+`company-filter-candidates'."
+  nil company-search-lighter nil
+  (if company-search-mode
+      (if (company-manual-begin)
+          (progn
+            (setq company-search-old-selection company-selection)
+            (company-call-frontends 'update))
+        (setq company-search-mode nil))
+    (kill-local-variable 'company-search-string)
+    (kill-local-variable 'company-search-lighter)
+    (kill-local-variable 'company-search-old-selection)
+    (company-enable-overriding-keymap company-active-map)))
+
+(defsubst company-search-assert-enabled ()
+  (company-assert-enabled)
+  (unless company-search-mode
+    (company-uninstall-map)
+    (error "Company not in search mode")))
+
+(defun company-search-candidates ()
+  "Start searching the completion candidates incrementally.
+
+\\<company-search-map>Search can be controlled with the commands:
+- `company-search-repeat-forward' (\\[company-search-repeat-forward])
+- `company-search-repeat-backward' (\\[company-search-repeat-backward])
+- `company-search-abort' (\\[company-search-abort])
+
+Regular characters are appended to the search string.
+
+The command `company-search-kill-others' (\\[company-search-kill-others]) uses
+ the search string to limit the completion candidates."
+  (interactive)
+  (company-search-mode 1)
+  (company-enable-overriding-keymap company-search-map))
+
+(defvar company-filter-map
+  (let ((keymap (make-keymap)))
+    (define-key keymap [remap company-search-printing-char]
+      'company-filter-printing-char)
+    (set-keymap-parent keymap company-search-map)
+    keymap)
+  "Keymap used for incrementally searching the completion candidates.")
+
+(defun company-filter-candidates ()
+  "Start filtering the completion candidates incrementally.
+This works the same way as `company-search-candidates' immediately
+followed by `company-search-kill-others' after each input."
+  (interactive)
+  (company-search-mode 1)
+  (company-enable-overriding-keymap company-filter-map))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-select-next ()
+  "Select the next candidate in the list."
+  (interactive)
+  (when (company-manual-begin)
+    (company-set-selection (1+ company-selection))))
+
+(defun company-select-previous ()
+  "Select the previous candidate in the list."
+  (interactive)
+  (when (company-manual-begin)
+    (company-set-selection (1- company-selection))))
+
+(defun company-select-mouse (event)
+  "Select the candidate picked by the mouse."
+  (interactive "e")
+  (when (nth 4 (event-start event))
+    (company-set-selection (- (cdr (posn-actual-col-row (event-start event)))
+                              (company--row)
+                              1))
+    t))
+
+(defun company-complete-mouse (event)
+  "Complete the candidate picked by the mouse."
+  (interactive "e")
+  (when (company-select-mouse event)
+    (company-complete-selection)))
+
+(defun company-complete-selection ()
+  "Complete the selected candidate."
+  (interactive)
+  (when (company-manual-begin)
+    (company-finish (nth company-selection company-candidates))))
+
+(defun company-complete-common ()
+  "Complete the common part of all candidates."
+  (interactive)
+  (when (company-manual-begin)
+    (if (and (not (cdr company-candidates))
+             (equal company-common (car company-candidates)))
+        (company-complete-selection)
+      (insert (company-strip-prefix company-common)))))
+
+(defun company-complete ()
+  "Complete the common part of all candidates or the current selection.
+The first time this is called, the common part is completed, the second time, or
+when the selection has been changed, the selected candidate is completed."
+  (interactive)
+  (when (company-manual-begin)
+    (if (or company-selection-changed
+            (eq last-command 'company-complete-common))
+        (progn
+          (message "(call-interactively 'company-complete-selection)")
+          (call-interactively 'company-complete-selection))
+      (message "(call-interactively 'company-complete-common)")
+      (call-interactively 'company-complete-common)
+      (setq this-command 'company-complete-common))))
+
+(defun company-complete-number (n)
+  "Complete the Nth candidate.
+To show the number next to the candidates in some back-ends, enable
+`company-show-numbers'."
+  (when (company-manual-begin)
+    (and (< n 1) (> n company-candidates-length)
+         (error "No candidate number %d" n))
+    (decf n)
+    (company-finish (nth n company-candidates))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defconst company-space-strings-limit 100)
+
+(defconst company-space-strings
+  (let (lst)
+    (dotimes (i company-space-strings-limit)
+      (push (make-string (- company-space-strings-limit 1 i) ?\  ) lst))
+    (apply 'vector lst)))
+
+(defsubst company-space-string (len)
+  (if (< len company-space-strings-limit)
+      (aref company-space-strings len)
+    (make-string len ?\ )))
+
+(defsubst company-safe-substring (str from &optional to)
+  (let ((len (length str)))
+    (if (> from len)
+        ""
+      (if (and to (> to len))
+          (concat (substring str from)
+                  (company-space-string (- to len)))
+        (substring str from to)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-last-metadata nil)
+(make-variable-buffer-local 'company-last-metadata)
+
+(defun company-fetch-metadata ()
+  (let ((selected (nth company-selection company-candidates)))
+    (unless (equal selected (car company-last-metadata))
+      (setq company-last-metadata
+            (cons selected (company-call-backend 'meta selected))))
+    (cdr company-last-metadata)))
+
+(defun company-doc-buffer (&optional string)
+  (with-current-buffer (get-buffer-create "*Company meta-data*")
+    (erase-buffer)
+    (current-buffer)))
+
+(defmacro company--electric-do (&rest body)
+  (declare (indent 0) (debug t))
+  `(when (company-manual-begin)
+     (save-window-excursion
+       (let ((height (window-height))
+             (row (company--row)))
+         ,@body
+         (and (< (window-height) height)
+              (< (- (window-height) row 2) company-tooltip-limit)
+              (recenter (- (window-height) row 2)))
+         (while (eq 'scroll-other-window
+                    (key-binding (vector (list (read-event)))))
+           (call-interactively 'scroll-other-window))
+         (when last-input-event
+           (clear-this-command-keys t)
+           (setq unread-command-events (list last-input-event)))))))
+
+(defun company-show-doc-buffer ()
+  "Temporarily show a buffer with the complete documentation for the selection."
+  (interactive)
+  (company--electric-do
+    (let ((selected (nth company-selection company-candidates)))
+      (display-buffer (or (company-call-backend 'doc-buffer selected)
+                          (error "No documentation available")) t))))
+(put 'company-show-doc-buffer 'company-keep t)
+
+(defun company-show-location ()
+  "Temporarily display a buffer showing the selected candidate in context."
+  (interactive)
+  (company--electric-do
+    (let* ((selected (nth company-selection company-candidates))
+           (location (company-call-backend 'location selected))
+           (pos (or (cdr location) (error "No location available")))
+           (buffer (or (and (bufferp (car location)) (car location))
+                       (find-file-noselect (car location) t))))
+      (with-selected-window (display-buffer buffer t)
+        (if (bufferp (car location))
+            (goto-char pos)
+          (goto-line pos))
+        (set-window-start nil (point))))))
+(put 'company-show-location 'company-keep t)
+
+;;; package functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-callback nil)
+(make-variable-buffer-local 'company-callback)
+
+(defvar company-begin-with-marker nil)
+(make-variable-buffer-local 'company-begin-with-marker)
+
+(defun company-remove-callback (&optional ignored)
+  (remove-hook 'company-completion-finished-hook company-callback t)
+  (remove-hook 'company-completion-cancelled-hook 'company-remove-callback t)
+  (remove-hook 'company-completion-finished-hook 'company-remove-callback t)
+  (when company-begin-with-marker
+    (set-marker company-begin-with-marker nil)))
+
+(defun company-begin-backend (backend &optional callback)
+  "Start a completion at point using BACKEND."
+  (interactive (let ((val (completing-read "Company back-end: "
+                                           obarray
+                                           'functionp nil "company-")))
+                 (when val
+                   (list (intern val)))))
+  (when (setq company-callback callback)
+    (add-hook 'company-completion-finished-hook company-callback nil t))
+  (add-hook 'company-completion-cancelled-hook 'company-remove-callback nil t)
+  (add-hook 'company-completion-finished-hook 'company-remove-callback nil t)
+  (setq company-backend backend)
+  ;; Return non-nil if active.
+  (or (company-manual-begin)
+      (error "Cannot complete at point")))
+
+;; Fix-me: Why are not `buffer-substring-no-properties' used here?
+(defun company-begin-with (candidates
+                           &optional prefix-length require-match callback)
+  "Start a completion at point.
+CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length of
+the prefix that already is in the buffer before point.  It defaults to 0.
+
+CALLBACK is a function called with the selected result if the user successfully
+completes the input.
+
+Example:
+\(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
+  (setq company-begin-with-marker (copy-marker (point) t))
+  (company-begin-backend
+   `(lambda (command &optional arg &rest ignored)
+      (cond
+       ((eq command 'prefix)
+        (when (equal (point) (marker-position company-begin-with-marker))
+          (company-buffer-substring-visible-bug3875 ,(- (point) (or prefix-length 0)) (point))))
+       ((eq command 'candidates)
+        (all-completions arg ',candidates))
+       ((eq command 'require-match)
+        ,require-match)))
+   callback))
+
+;;; pseudo-tooltip ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-pseudo-tooltip-overlay nil)
+(make-variable-buffer-local 'company-pseudo-tooltip-overlay)
+
+(defvar company-tooltip-offset 0)
+(make-variable-buffer-local 'company-tooltip-offset)
+
+(defun company-pseudo-tooltip-update-offset (selection num-lines limit)
+
+  (decf limit 2)
+  (setq company-tooltip-offset
+        (max (min selection company-tooltip-offset)
+             (- selection -1 limit)))
+
+  (when (<= company-tooltip-offset 1)
+    (incf limit)
+    (setq company-tooltip-offset 0))
+
+  (when (>= company-tooltip-offset (- num-lines limit 1))
+    (incf limit)
+    (when (= selection (1- num-lines))
+      (decf company-tooltip-offset)
+      (when (<= company-tooltip-offset 1)
+        (setq company-tooltip-offset 0)
+        (incf limit))))
+
+  limit)
+
+;;; propertize
+
+(defsubst company-round-tab (arg)
+  (* (/ (+ arg tab-width) tab-width) tab-width))
+
+(defun company-untabify (str)
+  (let* ((pieces (split-string str "\t"))
+         (copy pieces))
+    (while (cdr copy)
+      (setcar copy (company-safe-substring
+                    (car copy) 0 (company-round-tab (string-width (car copy)))))
+      (pop copy))
+    (apply 'concat pieces)))
+
+(defun company-fill-propertize (line width selected)
+  (setq line (company-safe-substring line 0 width))
+  (add-text-properties 0 width '(face company-tooltip
+                                 mouse-face company-tooltip-mouse)
+                       line)
+  (add-text-properties 0 (length company-common)
+                       '(face company-tooltip-common
+                         mouse-face company-tooltip-mouse)
+                       line)
+  (when selected
+    (if (and company-search-string
+             (string-match (regexp-quote company-search-string) line
+                           (length company-prefix)))
+        (progn
+          (add-text-properties (match-beginning 0) (match-end 0)
+                               '(face company-tooltip-selection)
+                               line)
+          (when (< (match-beginning 0) (length company-common))
+            (add-text-properties (match-beginning 0) (length company-common)
+                                 '(face company-tooltip-common-selection)
+                                 line)))
+      (add-text-properties 0 width '(face company-tooltip-selection
+                                          mouse-face company-tooltip-selection)
+                           line)
+      (add-text-properties 0 (length company-common)
+                           '(face company-tooltip-common-selection
+                             mouse-face company-tooltip-selection)
+                           line)))
+  line)
+
+;;; replace
+
+;; Fix-me: invisible, Emacs bug 3874 - fix this for 'before-string and 'after-string
+(defun company-fix-bug3874 (str)
+  "Change the string STR 'invisible property so it fits `buffer-invisibility-spec'.
+This has to be fixed for before-string and after-string
+properties on \(at least) overlays.  For more information see
+Emacs bug 3874.
+
+Return the changed string.
+
+More specifically change the 'invisible property to `t' when it
+fits `buffer-invisibility-spec'."
+  (let* ((pos1 1)
+         pos2
+         (inv1 (get-char-property pos1 'invisible str))
+         inv2
+         (len-str (length str)))
+    ;;(message "3874 A inv1=%s, len str=%s" inv1 len-str)
+    ;; (setq x nil)
+    ;;(unless (and (boundp 'x) x) (setq x str))
+    (while (setq pos2 (next-single-property-change pos1 'invisible str))
+      (setq pos2 (or pos2 (length str)))
+      (put-text-property pos1 pos2 'invisible (invisible-p inv1))
+      (setq inv1 (get-char-property pos1 'invisible str))
+      (setq inv2 (get-char-property pos2 'invisible str))
+      ;;(message "3874 B inv1=%s/%s, inv2=%s/%s" pos1 inv1 pos2 inv2)
+      (setq pos1 pos2)))
+  ;;(message "3874 str=%S" str)
+  ;;(setq x3874 str)
+  str)
+
+;; Fix-me: invisible, Emacs bug nr ? - buffer-substring does not copy 'invisible property
+(defun company-buffer-substring-visible-bug3875 (beg end)
+  (let* ((pos1 beg)
+         (pos2 pos1)
+         (inv1 (get-char-property pos1 'invisible))
+         inv2
+         (visible-str ""))
+    ;;(message "3875 buffer A %s-%s inv1=%s" beg end inv1)
+
+    (while (< (incf pos2) end)
+      (setq inv2 (get-char-property pos2 'invisible))
+      (unless (eq inv1 inv2)
+        ;;(message "3875 inv1/2=%s/%s" inv1 inv2)
+        (unless (invisible-p inv1)
+          ;;(message "3875 adding %s-%s..." pos1 pos2)
+          (setq visible-str (concat visible-str (buffer-substring pos1 (1- pos2)))))
+        (setq inv1 inv2)
+        (setq pos1 pos2)))
+    (setq visible-str (concat visible-str (buffer-substring pos1 (1- pos2))))
+    (when (invisible-p inv1)
+      (let* ((len (length visible-str))
+            (p1 (- len (- pos2 pos1)))
+            (p2 len))
+      (put-text-property p1 p2 'invisible t visible-str)))
+    ;;(message "3875 x vis=%S" visible-str)
+    ;;(setq x3875 visible-str)
+    ))
+
+(defun company-buffer-lines (beg end)
+  (goto-char beg)
+  (let ((row (company--row))
+        lines)
+    (while (and (equal (move-to-window-line (incf row)) row)
+                (<= (point) end))
+      (push (company-buffer-substring-visible-bug3875 beg (min end (1- (point)))) lines)
+      (setq beg (point)))
+    (unless (eq beg end)
+      (push (company-buffer-substring-visible-bug3875 beg end) lines))
+    (nreverse lines)))
+
+(defsubst company-modify-line (old new offset)
+  (concat (company-safe-substring old 0 offset)
+          new
+          (company-safe-substring old (+ offset (length new)))))
+
+(defsubst company--length-limit (lst limit)
+  (if (nthcdr limit lst)
+      limit
+    (length lst)))
+
+(defun company--replacement-string (lines old column nl &optional align-top)
+
+  (let ((width (length (car lines))))
+    (when (> width (- (window-width) column))
+      (setq column (max 0 (- (window-width) width)))))
+
+  (let (new)
+    (when align-top
+      ;; untouched lines first
+      (dotimes (i (- (length old) (length lines)))
+        (push (pop old) new)))
+    ;; length into old lines.
+    (while old
+      (push (company-modify-line (pop old) (pop lines) column) new))
+    ;; Append whole new lines.
+    (while lines
+      (push (concat (company-space-string column) (pop lines)) new))
+    (concat (when nl "\n")
+            (mapconcat 'identity (nreverse new) "\n")
+            "\n")))
+
+(defun company--create-lines (selection limit)
+
+  (let ((len company-candidates-length)
+        (numbered 99999)
+        lines
+        width
+        lines-copy
+        previous
+        remainder
+        new)
+
+    ;; Scroll to offset.
+    (setq limit (company-pseudo-tooltip-update-offset selection len limit))
+
+    (when (> company-tooltip-offset 0)
+      (setq previous (format "...(%d)" company-tooltip-offset)))
+
+    (setq remainder (- len limit company-tooltip-offset)
+          remainder (when (> remainder 0)
+                      (setq remainder (format "...(%d)" remainder))))
+
+    (decf selection company-tooltip-offset)
+    (setq width (max (length previous) (length remainder))
+          lines (nthcdr company-tooltip-offset company-candidates)
+          len (min limit len)
+          lines-copy lines)
+
+    (dotimes (i len)
+      (setq width (max (length (pop lines-copy)) width)))
+    (setq width (min width (window-width)))
+
+    (setq lines-copy lines)
+
+    ;; number can make tooltip too long
+    (when company-show-numbers
+      (setq numbered company-tooltip-offset))
+
+    (when previous
+      (push (propertize (company-safe-substring previous 0 width)
+                        'face 'company-tooltip)
+            new))
+
+    (dotimes (i len)
+      (push (company-fill-propertize
+             (if (>= numbered 10)
+                 (company-reformat (pop lines))
+               (incf numbered)
+               (format "%s %d"
+                       (company-safe-substring (company-reformat (pop lines))
+                                               0 (- width 2))
+                       (mod numbered 10)))
+             width (equal i selection))
+            new))
+
+    (when remainder
+      (push (propertize (company-safe-substring remainder 0 width)
+                        'face 'company-tooltip)
+            new))
+    ;;(message "new=%S" new)
+    (setq lines (nreverse new))))
+
+;; show
+
+(defsubst company--window-inner-height ()
+  (let ((edges (window-inside-edges (selected-window))))
+    (- (nth 3 edges) (nth 1 edges))))
+
+(defsubst company--pseudo-tooltip-height ()
+  "Calculate the appropriate tooltip height.
+Returns a negative number if the tooltip should be displayed above point."
+  (let* ((lines (count-lines (window-start) (point-at-bol)))
+         (below (- (company--window-inner-height) 1 lines)))
+    (if (and (< below (min company-tooltip-minimum company-candidates-length))
+             (> lines below))
+        (- (max 3 (min company-tooltip-limit lines)))
+      (max 3 (min company-tooltip-limit below)))))
+
+(defun company-pseudo-tooltip-show (row column selection)
+  (company-pseudo-tooltip-hide)
+  (save-excursion
+
+    (move-to-column 0)
+
+    (let* ((height (company--pseudo-tooltip-height))
+           above)
+
+      (when (< height 0)
+        (setq row (+ row height -1)
+              above t))
+
+      (let* ((nl (< (move-to-window-line row) row))
+             (beg (point))
+             (end (save-excursion
+                    (move-to-window-line (+ row (abs height)))
+                    (point)))
+             (ov (make-overlay beg end))
+             (args (list (mapcar 'company-untabify
+                                 (company-buffer-lines beg end))
+                         column nl above)))
+
+        (setq company-pseudo-tooltip-overlay ov)
+        (overlay-put ov 'company-replacement-args args)
+        (overlay-put ov 'company-before
+                     (apply 'company--replacement-string
+                            (company--create-lines selection (abs height))
+                            args))
+
+        (overlay-put ov 'company-column column)
+        (overlay-put ov 'company-height (abs height))
+        (overlay-put ov 'window (selected-window))))))
+
+(defun company-pseudo-tooltip-show-at-point (pos)
+  (let ((col-row (company--col-row pos)))
+    (when col-row
+      (company-pseudo-tooltip-show (1+ (cdr col-row)) (car col-row)
+                                   company-selection))))
+
+(defun company-pseudo-tooltip-edit (lines selection)
+  (let ((column (overlay-get company-pseudo-tooltip-overlay 'company-column))
+        (height (overlay-get company-pseudo-tooltip-overlay 'company-height)))
+    (overlay-put company-pseudo-tooltip-overlay 'company-before
+                 (apply 'company--replacement-string
+                        (company--create-lines selection height)
+                        (overlay-get company-pseudo-tooltip-overlay
+                                     'company-replacement-args)))))
+
+(define-minor-mode company-temp-debug-mode "test"
+  :global nil
+  (if company-temp-debug-mode
+      (progn
+        ;;(setq company-end-of-buffer-workaround nil)
+        (set (make-local-variable 'company-temp-debug) t)
+        )
+    (set (make-local-variable 'company-temp-debug) nil)
+    (company-pseudo-tooltip-hide)))
+
+
+(defvar company-temp-before nil)
+(defun company-temp-debug-show-ovl ()
+  (interactive)
+  (let ((b (overlay-get company-pseudo-tooltip-overlay 'before-string)))
+    (message "before ovl=%s" b)
+    b))
+(defvar company-temp-debug nil)
+(defun company-pseudo-tooltip-hide ()
+  (if company-temp-debug
+      (progn
+        (message "leaving ovl=%s there" company-pseudo-tooltip-overlay)
+        (when company-pseudo-tooltip-overlay
+          (setq company-temp-before (overlay-get company-pseudo-tooltip-overlay 'before-string))))
+  (when company-pseudo-tooltip-overlay
+    (delete-overlay company-pseudo-tooltip-overlay)
+    (setq company-pseudo-tooltip-overlay nil)))
+  )
+
+
+(defun company-pseudo-tooltip-hide-temporarily ()
+  (unless company-temp-debug
+  (when (overlayp company-pseudo-tooltip-overlay)
+    (overlay-put company-pseudo-tooltip-overlay 'invisible nil)
+    (overlay-put company-pseudo-tooltip-overlay 'before-string nil)))
+  )
+
+(defun company-pseudo-tooltip-unhide ()
+  (when company-pseudo-tooltip-overlay
+    (overlay-put company-pseudo-tooltip-overlay 'invisible t)
+    ;;(message "before sit 5") (redisplay t) (sleep-for 2) (message "after  sit 5")
+    (overlay-put company-pseudo-tooltip-overlay 'before-string
+                 (company-fix-bug3874
+                  (overlay-get company-pseudo-tooltip-overlay 'company-before)))
+    ;;(setq x-before-string (overlay-get company-pseudo-tooltip-overlay 'before-string))
+    (overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
+
+(defun company-pseudo-tooltip-frontend (command)
+  "A `company-mode' front-end similar to a tool-tip but based on overlays."
+  (case command
+    ('pre-command (company-pseudo-tooltip-hide-temporarily))
+    ('post-command
+     (let ((old-height (if (overlayp company-pseudo-tooltip-overlay)
+                           (overlay-get company-pseudo-tooltip-overlay
+                                        'company-height)
+                         0))
+           (new-height (company--pseudo-tooltip-height)))
+       (unless (and (>= (* old-height new-height) 0)
+                    (>= (abs old-height) (abs new-height)))
+         ;; Redraw needed.
+         (company-pseudo-tooltip-show-at-point (- (point)
+                                                  (length company-prefix)))))
+     (company-pseudo-tooltip-unhide))
+    ('hide (company-pseudo-tooltip-hide)
+           (setq company-tooltip-offset 0))
+    ('update (when (overlayp company-pseudo-tooltip-overlay)
+               (company-pseudo-tooltip-edit company-candidates
+                                            company-selection)))))
+
+(defun company-pseudo-tooltip-unless-just-one-frontend (command)
+  "`company-pseudo-tooltip-frontend', but not shown for single candidates."
+  (unless nil ;;(symbolp company-candidates)
+    (unless (and (eq command 'post-command)
+                 (not (cdr company-candidates))
+                 ;;(not (company-call-backend 'no-insert))
+                 )
+      (company-pseudo-tooltip-frontend command))))
+
+;;; overlay ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-preview-overlay nil)
+(make-variable-buffer-local 'company-preview-overlay)
+
+(defun company-preview-show-at-point (pos)
+  (company-preview-hide)
+
+  (setq company-preview-overlay (make-overlay pos pos))
+
+  (let ((completion(nth company-selection company-candidates)))
+    (setq completion (propertize completion 'face 'company-preview))
+    (add-text-properties 0 (length company-common)
+                         '(face company-preview-common) completion)
+
+    ;; Add search string
+    (and company-search-string
+         (string-match (regexp-quote company-search-string) completion)
+         (add-text-properties (match-beginning 0)
+                              (match-end 0)
+                              '(face company-preview-search)
+                              completion))
+
+    (setq completion (company-strip-prefix completion))
+
+    (and (equal pos (point))
+         (not (equal completion ""))
+         (add-text-properties 0 1 '(cursor t) completion))
+
+    (overlay-put company-preview-overlay 'after-string
+                 (company-fix-bug3874 completion))
+    ;;(setq x-after-string (overlay-get company-pseudo-tooltip-overlay 'after-string))
+    (overlay-put company-preview-overlay 'window (selected-window))))
+
+(defun company-preview-hide ()
+  (when company-preview-overlay
+    (delete-overlay company-preview-overlay)
+    (setq company-preview-overlay nil)))
+
+(defun company-preview-frontend (command)
+  "A `company-mode' front-end showing the selection as if it had been inserted."
+  (if (company-call-backend 'no-insert)
+      t
+    (case command
+      ('pre-command (company-preview-hide))
+      ('post-command (company-preview-show-at-point (point)))
+      ('hide (company-preview-hide)))))
+
+(defun company-preview-if-just-one-frontend (command)
+  "`company-preview-frontend', but only shown for single candidates."
+  (unless (and (eq command 'post-command)
+               (cdr company-candidates))
+    (company-preview-frontend command)))
+
+;;; echo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-echo-last-msg nil)
+(make-variable-buffer-local 'company-echo-last-msg)
+
+(defvar company-echo-timer nil)
+
+(defvar company-echo-delay .1)
+
+(defun company-echo-show (&optional getter)
+  (when getter
+    (setq company-echo-last-msg (funcall getter)))
+  (let ((message-log-max nil))
+    (if company-echo-last-msg
+        (message "%s" company-echo-last-msg)
+      (message ""))))
+
+(defsubst company-echo-show-soon (&optional getter)
+  (when company-echo-timer
+    (cancel-timer company-echo-timer))
+  (setq company-echo-timer (run-with-timer company-echo-delay nil
+                                           'company-echo-show getter)))
+
+(defun company-echo-format ()
+
+  (let ((limit (window-width (minibuffer-window)))
+        (len -1)
+        ;; Roll to selection.
+        (candidates (nthcdr company-selection company-candidates))
+        (i (if company-show-numbers company-selection 99999))
+        comp msg)
+
+    (while candidates
+      (setq comp (company-reformat (pop candidates))
+            len (+ len 1 (length comp)))
+      (if (< i 10)
+          ;; Add number.
+          (progn
+            (setq comp (propertize (format "%d: %s" i comp)
+                                   'face 'company-echo))
+            (incf len 3)
+            (incf i)
+            (add-text-properties 3 (+ 3 (length company-common))
+                                 '(face company-echo-common) comp))
+        (setq comp (propertize comp 'face 'company-echo))
+        (add-text-properties 0 (length company-common)
+                             '(face company-echo-common) comp))
+      (if (>= len limit)
+          (setq candidates nil)
+        (push comp msg)))
+
+    (mapconcat 'identity (nreverse msg) " ")))
+
+(defun company-echo-strip-common-format ()
+
+  (let ((limit (window-width (minibuffer-window)))
+        (len (+ (length company-prefix) 2))
+        ;; Roll to selection.
+        (candidates (nthcdr company-selection company-candidates))
+        (i (if company-show-numbers company-selection 99999))
+        msg comp)
+
+    (while candidates
+      (setq comp (company-strip-prefix (pop candidates))
+            len (+ len 2 (length comp)))
+      (when (< i 10)
+        ;; Add number.
+        (setq comp (format "%s (%d)" comp i))
+        (incf len 4)
+        (incf i))
+      (if (>= len limit)
+          (setq candidates nil)
+        (push (propertize comp 'face 'company-echo) msg)))
+
+    (concat (propertize company-prefix 'face 'company-echo-common) "{"
+            (mapconcat 'identity (nreverse msg) ", ")
+            "}")))
+
+(defun company-echo-hide ()
+  (when company-echo-timer
+    (cancel-timer company-echo-timer))
+  (unless (equal company-echo-last-msg "")
+    (setq company-echo-last-msg "")
+    (company-echo-show)))
+
+(defun company-echo-frontend (command)
+  "A `company-mode' front-end showing the candidates in the echo area."
+  (case command
+    ('pre-command (company-echo-show-soon))
+    ('post-command (company-echo-show-soon 'company-echo-format))
+    ('hide (company-echo-hide))))
+
+(defun company-echo-strip-common-frontend (command)
+  "A `company-mode' front-end showing the candidates in the echo area."
+  (case command
+    ('pre-command (company-echo-show-soon))
+    ('post-command (company-echo-show-soon 'company-echo-strip-common-format))
+    ('hide (company-echo-hide))))
+
+(defun company-echo-metadata-frontend (command)
+  "A `company-mode' front-end showing the documentation in the echo area."
+  (case command
+    ('pre-command (company-echo-show-soon))
+    ('post-command (company-echo-show-soon 'company-fetch-metadata))
+    ('hide (company-echo-hide))))
+
+(provide 'company)
+;;; company.el ends here
diff --git a/elpa-to-submit/nxhtml/util/css-color.el b/elpa-to-submit/nxhtml/util/css-color.el
new file mode 100644
index 0000000000..04754ec9b7
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/css-color.el
@@ -0,0 +1,962 @@
+;;; css-color.el --- Highlight and edit CSS colors
+
+(defconst css-color:version "0.03")
+;; Copyright (C) 2008  Niels Giesen
+
+;; Author: Niels Giesen
+;; Keywords: processes, css, extensions, tools
+
+;; This program 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 3 of the License, or
+;; (at your option) any later version.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Edit css-colors in hex, rgb or hsl notation in-place, with
+;; immediate feedback by font-locking. Cycle between color-spaces.
+
+;; Usage:
+
+;; (autoload 'css-color-mode "css-color" "" t)
+;; (add-hook 'css-mode-hook 'css-color-mode-turn-on)
+
+;; Css-Css-color.el propertizes colours in a CSS stylesheet found by
+;; font-locking code with a keymap. From that keymap, you can easily
+;; adjust values such as red green and blue, hue, saturation and
+;; value, or switch between different color (space) notations.
+
+;; It supports all 'css-colors', so hex, rgb(), hsl() and even HTML
+;; color names (although I wouldn't use them myself, it is nice to be
+;; able to quickly convert those), can be used and switched between.
+
+;; The rgb() notation can be expressed either in percentages or in
+;; values between 0-255.
+
+;; You can cycle between the different formats (with SPACE), so that
+;; it is possible to edit the color in hsl mode (which is more
+;; intuitive than hsv, although hsv has its merits too), and switch
+;; back to rgb or hex if so desired.
+
+;; With point on a color, the keys - and = to are bound to the down
+;; and up functions for channels (or 'fields'). Toggling percentage
+;; in rgb() is done with the % key (not sure if that is wise
+;; though). The TAB key is bound to go to the next channel, cycling
+;; when at the end. color.el propertizes the longhand hexcolours
+;; found by the
+
+;; Caveats:
+
+;; Notation cycling can often introduce small errors inherent to
+;; switching color spaces. Currently there is no check nor a warning
+;; for that.
+
+;; ToDo:
+
+;; Try and fix those conversion inaccuracies. This cannot be done
+;; completely I guess. But maybe we can check whether this has
+;; occured, and then warn.
+
+;;; Change log:
+
+;; 2009-01-11 Lennart Borgman
+;;   - Minor code clean up.
+;; 2009-05-23 Lennart Borgman
+;;   - Let bound m1 and m2.
+
+;;; Code:
+(eval-when-compile (require 'cl))
+
+;;;###autoload
+(defgroup css-color ()
+  "Customization group for library `css-color'."
+  :group 'css
+  :group 'nxhtml)
+
+(defun css-color-turn-on-in-buffer ()
+  "Turn on `css-color-mode' in `css-mode'."
+  (when (derived-mode-p 'css-mode)
+    (css-color-mode 1)))
+
+;;;###autoload
+(define-globalized-minor-mode css-color-global-mode css-color-mode
+  css-color-turn-on-in-buffer
+  :group 'css-color)
+
+(defconst css-color-hex-chars "0123456789abcdefABCDEF"
+  "Composing chars in hexadecimal notation, save for the hash (#) sign.")
+
+(defconst css-color-hex-re
+  "#\\([a-fA-F[:digit:]]\\{6\\}\\|[a-fA-F[:digit:]]\\{3\\}\\)")
+
+(defconst css-color-hsl-re
+  "hsla?(\\([[:digit:]]\\{1,3\\}\\),[[:space:]]*\\([[:digit:]]\\{1,3\\}\\(?:\.?[[:digit:]]*\\)\\)%,[[:space:]]*\\([[:digit:]]\\{1,3\\}\\)\\(?:\.?[[:digit:]]*\\)%)")
+
+(defconst css-color-rgb-re
+  "rgba?(\\([[:digit:]]\\{1,3\\}\\(?:\.?[[:digit:]]*%\\)?\\),[[:space:]]*\\([[:digit:]]\\{1,3\\}\\(?:\.?[[:digit:]]*%\\)?\\),[[:space:]]*\\([[:digit:]]\\{1,3\\}\\(?:\.?[[:digit:]]*%\\)?\\)\\(:?,[[:space:]]*\\(0\.[0-9]+\\|1\\)\\)?)")
+
+(defconst css-color-html-colors
+  '(("AliceBlue" "#F0F8FF")
+    ("AntiqueWhite" "#FAEBD7")
+    ("Aqua" "#00FFFF")
+    ("Aquamarine" "#7FFFD4")
+    ("Azure" "#F0FFFF")
+    ("Beige" "#F5F5DC")
+    ("Bisque" "#FFE4C4")
+    ("Black" "#000000")
+    ("BlanchedAlmond" "#FFEBCD")
+    ("Blue" "#0000FF")
+    ("BlueViolet" "#8A2BE2")
+    ("Brown" "#A52A2A")
+    ("BurlyWood" "#DEB887")
+    ("CadetBlue" "#5F9EA0")
+    ("Chartreuse" "#7FFF00")
+    ("Chocolate" "#D2691E")
+    ("Coral" "#FF7F50")
+    ("CornflowerBlue" "#6495ED")
+    ("Cornsilk" "#FFF8DC")
+    ("Crimson" "#DC143C")
+    ("Cyan" "#00FFFF")
+    ("DarkBlue" "#00008B")
+    ("DarkCyan" "#008B8B")
+    ("DarkGoldenRod" "#B8860B")
+    ("DarkGray" "#A9A9A9")
+    ("DarkGrey" "#A9A9A9")
+    ("DarkGreen" "#006400")
+    ("DarkKhaki" "#BDB76B")
+    ("DarkMagenta" "#8B008B")
+    ("DarkOliveGreen" "#556B2F")
+    ("Darkorange" "#FF8C00")
+    ("DarkOrchid" "#9932CC")
+    ("DarkRed" "#8B0000")
+    ("DarkSalmon" "#E9967A")
+    ("DarkSeaGreen" "#8FBC8F")
+    ("DarkSlateBlue" "#483D8B")
+    ("DarkSlateGray" "#2F4F4F")
+    ("DarkSlateGrey" "#2F4F4F")
+    ("DarkTurquoise" "#00CED1")
+    ("DarkViolet" "#9400D3")
+    ("DeepPink" "#FF1493")
+    ("DeepSkyBlue" "#00BFFF")
+    ("DimGray" "#696969")
+    ("DimGrey" "#696969")
+    ("DodgerBlue" "#1E90FF")
+    ("FireBrick" "#B22222")
+    ("FloralWhite" "#FFFAF0")
+    ("ForestGreen" "#228B22")
+    ("Fuchsia" "#FF00FF")
+    ("Gainsboro" "#DCDCDC")
+    ("GhostWhite" "#F8F8FF")
+    ("Gold" "#FFD700")
+    ("GoldenRod" "#DAA520")
+    ("Gray" "#808080")
+    ("Grey" "#808080")
+    ("Green" "#008000")
+    ("GreenYellow" "#ADFF2F")
+    ("HoneyDew" "#F0FFF0")
+    ("HotPink" "#FF69B4")
+    ("IndianRed" "#CD5C5C")
+    ("Indigo" "#4B0082")
+    ("Ivory" "#FFFFF0")
+    ("Khaki" "#F0E68C")
+    ("Lavender" "#E6E6FA")
+    ("LavenderBlush" "#FFF0F5")
+    ("LawnGreen" "#7CFC00")
+    ("LemonChiffon" "#FFFACD")
+    ("LightBlue" "#ADD8E6")
+    ("LightCoral" "#F08080")
+    ("LightCyan" "#E0FFFF")
+    ("LightGoldenRodYellow" "#FAFAD2")
+    ("LightGray" "#D3D3D3")
+    ("LightGrey" "#D3D3D3")
+    ("LightGreen" "#90EE90")
+    ("LightPink" "#FFB6C1")
+    ("LightSalmon" "#FFA07A")
+    ("LightSeaGreen" "#20B2AA")
+    ("LightSkyBlue" "#87CEFA")
+    ("LightSlateGray" "#778899")
+    ("LightSlateGrey" "#778899")
+    ("LightSteelBlue" "#B0C4DE")
+    ("LightYellow" "#FFFFE0")
+    ("Lime" "#00FF00")
+    ("LimeGreen" "#32CD32")
+    ("Linen" "#FAF0E6")
+    ("Magenta" "#FF00FF")
+    ("Maroon" "#800000")
+    ("MediumAquaMarine" "#66CDAA")
+    ("MediumBlue" "#0000CD")
+    ("MediumOrchid" "#BA55D3")
+    ("MediumPurple" "#9370D8")
+    ("MediumSeaGreen" "#3CB371")
+    ("MediumSlateBlue" "#7B68EE")
+    ("MediumSpringGreen" "#00FA9A")
+    ("MediumTurquoise" "#48D1CC")
+    ("MediumVioletRed" "#C71585")
+    ("MidnightBlue" "#191970")
+    ("MintCream" "#F5FFFA")
+    ("MistyRose" "#FFE4E1")
+    ("Moccasin" "#FFE4B5")
+    ("NavajoWhite" "#FFDEAD")
+    ("Navy" "#000080")
+    ("OldLace" "#FDF5E6")
+    ("Olive" "#808000")
+    ("OliveDrab" "#6B8E23")
+    ("Orange" "#FFA500")
+    ("OrangeRed" "#FF4500")
+    ("Orchid" "#DA70D6")
+    ("PaleGoldenRod" "#EEE8AA")
+    ("PaleGreen" "#98FB98")
+    ("PaleTurquoise" "#AFEEEE")
+    ("PaleVioletRed" "#D87093")
+    ("PapayaWhip" "#FFEFD5")
+    ("PeachPuff" "#FFDAB9")
+    ("Peru" "#CD853F")
+    ("Pink" "#FFC0CB")
+    ("Plum" "#DDA0DD")
+    ("PowderBlue" "#B0E0E6")
+    ("Purple" "#800080")
+    ("Red" "#FF0000")
+    ("RosyBrown" "#BC8F8F")
+    ("RoyalBlue" "#4169E1")
+    ("SaddleBrown" "#8B4513")
+    ("Salmon" "#FA8072")
+    ("SandyBrown" "#F4A460")
+    ("SeaGreen" "#2E8B57")
+    ("SeaShell" "#FFF5EE")
+    ("Sienna" "#A0522D")
+    ("Silver" "#C0C0C0")
+    ("SkyBlue" "#87CEEB")
+    ("SlateBlue" "#6A5ACD")
+    ("SlateGray" "#708090")
+    ("SlateGrey" "#708090")
+    ("Snow" "#FFFAFA")
+    ("SpringGreen" "#00FF7F")
+    ("SteelBlue" "#4682B4")
+    ("Tan" "#D2B48C")
+    ("Teal" "#008080")
+    ("Thistle" "#D8BFD8")
+    ("Tomato" "#FF6347")
+    ("Turquoise" "#40E0D0")
+    ("Violet" "#EE82EE")
+    ("Wheat" "#F5DEB3")
+    ("White" "#FFFFFF")
+    ("WhiteSmoke" "#F5F5F5")
+    ("Yellow" "#FFFF00")
+    ("YellowGreen" "#9ACD32")))
+
+(defvar css-color-html-re
+  (concat "\\<\\("
+	  (funcall 'regexp-opt
+		   (mapcar 'car css-color-html-colors))
+	  "\\)\\>"))
+
+(defconst
+  css-color-color-re
+  "\\(?:#\\(?:[a-fA-F[:digit:]]\\{6\\}\\|[a-fA-F[:digit:]]\\{3\\}\\)\\|hsl(\\(?:[[:digit:]]\\{1,3\\}\\),[[:space:]]*\\(?:[[:digit:]]\\{1,3\\}\\)%,[[:space:]]*\\(?:[[:digit:]]\\{1,3\\}\\)%)\\|rgba?(\\(?:[[:digit:]]\\{1,3\\}%?\\),[[:space:]]*\\(?:[[:digit:]]\\{1,3\\}%?\\),[[:space:]]*\\(?:[[:digit:]]\\{1,3\\}%?\\)\\(?:,[[:space:]]*\\(?:0.[0-9]+\\|1\\)\\)?)\\)"
+  "Regular expression containing only shy groups matching any type of CSS color")
+
+;; (defconst css-color-color-re
+;;   (concat "\\(?1:"
+;;   (mapconcat
+;;    'identity
+;;    (list css-color-hex-re
+;; 	 css-color-hsl-re
+;; 	 css-color-rgb-re) "\\|")
+;;   "\\)"))
+
+(defvar css-color-keywords
+  `((,css-color-hex-re
+     (0
+      (progn
+	(when (= 7 (- (match-end 0)
+		      (match-beginning 0)))
+	  (put-text-property (match-beginning 0)
+			     (match-end 0)
+			     'keymap css-color-map))
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'color-type 'hex)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'rear-nonsticky t)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'face (list :background
+				       (match-string-no-properties 0)
+				       :foreground
+				       (css-color-foreground-color
+                                     (match-string-no-properties 0)))))))
+  (,css-color-html-re
+   (0
+     (let ((color
+           (css-color-string-name-to-hex (match-string-no-properties 0))))
+     (put-text-property (match-beginning 0)
+                        (match-end 0)
+                        'keymap css-color-generic-map)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'color-type 'name)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'rear-nonsticky t)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'face (list :background
+				       color
+				       :foreground
+				       (css-color-foreground-color
+					color))))))
+    (,css-color-hsl-re
+     (0
+      (let ((color (concat "#" (apply 'css-color-hsl-to-hex
+				      (mapcar 'string-to-number
+					      (list
+					       (match-string-no-properties 1)
+					       (match-string-no-properties 2)
+					       (match-string-no-properties 3)))))))
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'keymap css-color-generic-map)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'color-type 'hsl)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'rear-nonsticky t)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'face (list :background
+				       color
+				       :foreground
+				       (css-color-foreground-color
+					color))))))
+    (,css-color-rgb-re
+     (0
+      (let ((color (css-color-string-rgb-to-hex (match-string-no-properties 0))))
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'keymap css-color-generic-map)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'color-type 'rgb)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'rear-nonsticky t)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'face (list :background
+				       color
+				       :foreground
+				       (css-color-foreground-color
+					color))))))))
+;;;###autoload
+(define-minor-mode css-color-mode
+  "Show hex color literals with the given color as background.
+In this mode hexadecimal colour specifications like #3253ff are
+displayed with the specified colour as background.
+
+Certain keys are bound to special colour editing commands when
+point is at a hexadecimal colour:
+
+\\{css-color-map}"
+  :initial-value nil
+  :group 'css-color
+  (unless font-lock-defaults
+    (error "Can't use css-color-mode for this major mode"))
+  (if css-color-mode
+      (progn
+	(unless font-lock-mode (font-lock-mode 1))
+        (css-color-font-lock-hook-fun)
+        (add-hook 'font-lock-mode-hook 'css-color-font-lock-hook-fun nil t))
+    (remove-hook 'font-lock-mode-hook 'css-color-font-lock-hook-fun t)
+    (font-lock-remove-keywords nil css-color-keywords))
+  ;;(font-lock-fontify-buffer)
+  (save-restriction
+    (widen)
+    (mumamo-mark-for-refontification (point-min) (point-max))))
+
+(put 'css-color-mode 'permanent-local t)
+
+(defun css-color-font-lock-hook-fun ()
+  "Add css-color pattern to font-lock's."
+  (if font-lock-mode
+      (font-lock-add-keywords nil css-color-keywords t)
+    (css-color-mode -1)))
+
+(defvar css-color-map
+  (let ((m (make-sparse-keymap)))
+    (define-key m "=" 'css-color-up)
+    (define-key m "-" 'css-color-down)
+    (define-key m "h" 'css-color-hue-up)
+    (define-key m "H" 'css-color-hue-down)
+    (define-key m "s" 'css-color-saturation-up)
+    (define-key m "S" 'css-color-saturation-down)
+    (define-key m "v" 'css-color-value-up)
+    (define-key m "V" 'css-color-value-down)
+    (define-key m "\t" 'css-color-next-channel)
+    (define-key m " " 'css-color-cycle-type)
+    m)
+  "Mode map for `css-color-minor-mode'")
+
+(defvar css-color-generic-map
+  (let ((m (make-sparse-keymap)))
+    (define-key m "=" 'css-color-num-up)
+    (define-key m "-" 'css-color-num-down)
+    (define-key m " " 'css-color-cycle-type)
+    (define-key m "%" 'css-color-toggle-percentage)
+    (define-key m "\t" 'css-color-next-channel)
+    m)
+  "Mode map for simple numbers in `css-color-minor-mode'")
+
+(defun css-color-pal-lumsig (r g b)
+  "Return PAL luminance signal, but in range 0-255."
+  (+
+   (* 0.3 r)
+   (* 0.59 g)
+   (* 0.11 b)))
+
+(defun css-color-foreground-color (hex-color)
+  (multiple-value-bind (r g b) (css-color-hex-to-rgb hex-color)
+    (if (< (css-color-pal-lumsig r g b) 128)
+	"#fff"
+      "#000")))
+
+;; Normalizing funs
+(defun css-color-normalize-hue (h)
+  (mod (+ (mod h 360) 360) 360))
+
+(defun css-color-within-bounds (num min max)
+  (min (max min num) max))
+
+;; Source: hex
+(defun css-color-hex-to-rgb (str)
+  (cond
+   ((not (string-match "^#?[a-fA-F[:digit:]]*$" str))
+    (error "No valid hexadecimal: %s" str))
+   ((= 0 (length str))
+    nil)
+   ((= (aref str 0) 35)
+    (css-color-hex-to-rgb (substring str 1)))
+   (;;(oddp (length str))
+    (= (mod (length str) 2) 1)
+    (css-color-hex-to-rgb (mapconcat (lambda (c)
+				  (make-string 2 c))
+				(string-to-list str) "")))
+   (t (cons (string-to-number (substring str 0 2) 16)
+	    (css-color-hex-to-rgb (substring str 2))))))
+
+(defun css-color-hex-to-hsv (hex)
+  (multiple-value-bind (r g b) (css-color-hex-to-rgb hex)
+    (css-color-rgb-to-hsv r g b)))
+
+;; Source: rgb
+(defun css-color-rgb-to-hex (r g b)
+  "Return r g b as #rrggbb in hexadecimal, propertized to have
+the keymap `css-color-map'"
+   (format "%02x%02x%02x" r g b))			     ;val
+
+(defun css-color-rgb-to-hsv (r g b)
+  "Return list of (hue saturation value).
+Arguments are: R = red; G = green; B = blue.
+Measure saturation and value on a scale from 0 - 100.
+GIMP-style, that is."
+  (let* ((r (float r))
+	 (g (float g))
+	 (b (float b))
+	 (max (max r g b))
+	 (min (min r g b)))
+    (values
+	  (round
+	   (cond ((and (= r g) (= g b)) 0)
+		 ((and (= r max)
+		       (>= g b))
+		  (* 60 (/ (- g b) (- max min))))
+		 ((and (= r max)
+		       (< g b))
+		  (+ 360 (* 60 (/ (- g b) (- max min)))))
+		 ((= max g)
+		  (+ 120 (* 60 (/ (- b r) (- max min)))))
+		 ((= max b)
+		  (+ 240 (* 60 (/ (- r g) (- max min)))))))  ;hue
+	  (round (* 100 (if (= max 0) 0 (- 1 (/ min max))))) ;sat
+	  (round (/ max 2.55)))))
+
+(defun css-color-rgb-to-hsl (r g b)
+  "Return R G B (in range 0-255) converted to HSL (0-360 for hue, rest in %)"
+  (let* ((r (/ r 255.0))
+	 (g (/ g 255.0))
+	 (b (/ b 255.0))
+	 (h 0)
+	 (s 0)
+	 (l 0)
+	 (v (max r g b))
+	 (m (min r g b))
+	 (l (/ (+ m v) 2.0))
+	 (vm 0)
+	 (r2 0)
+	 (g2 0)
+	 (b2 0))
+    (multiple-value-bind (h s v)
+	(if (<= l 0)
+	    (values h s l)
+	  (setq vm (- v m)
+		s vm)
+	  (if (>= 0 s)
+	      (values h s l)
+	    (setq s (/ s (if (<= l 0.5)
+			     (+ v m)
+			   (- 2.0 v m))))
+	    (if (not (= 0 vm))
+		(setq r2 (/ (- v r) vm)
+		      g2 (/ (- v g) vm)
+		      b2 (/ (- v b) vm)))
+	    (cond ((= r v)
+		   (setq h (if (= g m)
+			       (+ 5.0 b2)
+			     (- 1.0 g2))))
+		  ((= g v)
+		   (setq h (if (= b m)
+			       (+ 1.0 r2)
+			     (- 3.0 b2))))
+		  (t
+		   (setq h (if (= r m)
+			       (+ 3.0 g2)
+			     (- 5.0 r2)))))
+	    (values (/ h 6.0) s l)))
+      (list (round(* 360 h))
+	    (* 100 s)
+	    (* 100 l)))))
+
+;; Source: hsv
+(defun css-color-hsv-to-hsl (h s v)
+  (multiple-value-bind (r g b) (css-color-hsv-to-rgb h s v)
+    (css-color-rgb-to-hsl r g b)))
+
+(defun css-color-hsv-to-hex (h s v)
+   (apply 'css-color-rgb-to-hex (css-color-hsv-to-rgb h s v)))
+
+(defun css-color-hsv-to-rgb (h s v)
+  "Convert a point in the Hue, Saturation, Value (aka Brightness)
+color space to list of normalized Red, Green, Blue values.
+
+HUE is an angle in the range of 0 degrees inclusive to 360
+exclusive.  The remainder of division by 360 is used for
+out-of-range values.
+SATURATION is in the range of 0 to 100.
+VALUE is in the range of 0 to 100.
+Returns a list of values in the range of 0 to 255.
+"
+  ;; Coerce to float and get hue into range.
+  (setq h (mod h 360.0)
+        s (/ (float s) 100)
+        v (/ (float v) 100))
+  (let* ((hi (floor h 60.0))
+         (f (- (/ h 60.0) hi))
+         (p (* v (- 1.0 s)))
+         (q (* v (- 1.0 (* f s))))
+         ;; cannot use variable t, obviously.
+         (u (* v (- 1.0 (* (- 1.0 f) s))))
+         r g b)
+    (case hi
+      (0 (setq r v g u b p))
+      (1 (setq r q g v b p))
+      (2 (setq r p g v b u))
+      (3 (setq r p g q b v))
+      (4 (setq r u g p b v))
+      (5 (setq r v g p b q)))
+    (mapcar (lambda (color) (round (* 255 color))) (list r g b))))
+
+(defun css-color-hsv-to-prop-hexstring (color-data)
+  (propertize
+   (apply 'css-color-hsv-to-hex color-data)
+   'keymap css-color-map
+   'color color-data))
+
+;; Source: hsl
+(defun css-color-hsl-to-rgb-fractions (h s l)
+  (let (m1 m2)
+    (if (<= l 0.5)
+	(setq m2 (* l (+ s 1)))
+      (setq m2 (- (+ l s) (* l s))))
+    (setq m1 (- (* l 2) m2))
+    (values (css-color-hue-to-rgb m1 m2 (+ h (/ 1 3.0)))
+	    (css-color-hue-to-rgb m1 m2 h)
+	    (css-color-hue-to-rgb m1 m2 (- h (/ 1 3.0))))))
+
+(defun css-color-hsl-to-rgb (h s l)
+  (multiple-value-bind (r g b)
+      (css-color-hsl-to-rgb-fractions
+       (/ h;; (css-color-normalize-hue h)
+	  360.0)
+       (/ s 100.0)
+       (/ l 100.0))
+    (values (css-color-within-bounds (* 256 r) 0 255)
+	    (css-color-within-bounds (* 256 g) 0 255)
+	    (css-color-within-bounds (* 256 b) 0 255))))
+
+(defun css-color-hsl-to-hex (h s l)
+  (apply 'css-color-rgb-to-hex
+	 (css-color-hsl-to-rgb h s l)))
+
+(defun css-color-hue-to-rgb (x y h)
+  (when (< h 0) (incf h))
+  (when (> h 1) (decf h))
+   (cond ((< h (/ 1 6.0))
+	  (+ x (* (- y x) h 6)))
+	 ((< h 0.5) y)
+	 ((< h (/ 2.0 3.0))
+	  (+ x (* (- y x) (- (/ 2.0 3.0) h) 6)))
+	 (t x)))
+
+(defun css-color-parse-hsl (str)
+  (string-match
+   css-color-hsl-re
+   str)
+  (mapcar 'string-to-number
+	  (list
+	   (match-string 1 str)
+	   (match-string 2 str)
+	   (match-string 3 str))))
+
+(defun css-color-inchue (color incr)
+  (multiple-value-bind (h s v) color
+    (css-color-hsv-to-prop-hexstring
+     (list (+ incr h) s v))))
+
+(defun css-color-incsat (color incr)
+  (multiple-value-bind (h s v) color
+    (css-color-hsv-to-prop-hexstring
+     (list h (css-color-within-bounds (+ incr s) 0 100) v))))
+
+(defun css-color-incval (color incr)
+  (multiple-value-bind (h s v) color
+    (css-color-hsv-to-prop-hexstring
+     (list h s (css-color-within-bounds (+ incr v) 0 100)))))
+
+(defun css-color-hexval-beginning ()
+  (skip-chars-backward css-color-hex-chars)
+  (if (= (char-after) 35)
+      (forward-char 1)))
+
+(defun css-color-replcolor-at-p (fun increment)
+  (let ((pos (point)))
+    (css-color-hexval-beginning)
+    (insert
+     (funcall fun
+	      (css-color-get-color-at-point)
+	      increment))
+    (delete-region (point) (+ (point) 6))
+    (goto-char pos)))
+
+(defun css-color-get-color-at-point ()
+  (save-excursion
+    (css-color-hexval-beginning)
+    (let ((saved-color (get-text-property (point) 'color)))
+      (or saved-color
+	  (css-color-hex-to-hsv
+	   (buffer-substring-no-properties (point) (+ (point) 6)))))))
+
+(defun css-color-adj-hue-at-p (increment)
+  (interactive "p")
+  (css-color-replcolor-at-p 'css-color-inchue increment))
+
+(defun css-color-adj-saturation-at-p (increment)
+  (interactive "p")
+  (css-color-replcolor-at-p 'css-color-incsat increment))
+
+(defun css-color-adj-value-at-p (increment)
+  (interactive "p")
+  (css-color-replcolor-at-p 'css-color-incval increment))
+
+(defun css-color-what-channel ()
+  (let ((pos (point)))
+    (prog1
+	(/ (skip-chars-backward css-color-hex-chars) -2)
+      (goto-char pos))))
+
+(defun css-color-adjust-hex-at-p (incr)
+  (interactive "p")
+  (let ((pos (point))
+	(channel (css-color-what-channel)))
+    (css-color-hexval-beginning)
+    (let ((rgb
+	   (css-color-hex-to-rgb
+	    (buffer-substring-no-properties (point)
+					    (+ 6 (point))))))
+      (setf (nth channel rgb)
+	    (css-color-within-bounds
+	     (+ incr (nth channel rgb))
+	     0 255))
+      (delete-region (point) (+ 6 (point)))
+      (insert
+       (propertize
+	(apply 'format "%02x%02x%02x" rgb)
+	'keymap css-color-map
+	'color nil
+	'rear-nonsticky t)))
+    (goto-char pos)))
+
+;; channels (r, g, b)
+(defun css-color-up (val)
+  (interactive "p")
+  (css-color-adjust-hex-at-p val))
+
+(defun css-color-down (val)
+  (interactive "p")
+  (css-color-adjust-hex-at-p (- val)))
+;; hue
+(defun css-color-hue-up (val)
+  (interactive "p")
+  (css-color-adj-hue-at-p val))
+
+(defun css-color-hue-down (val)
+  (interactive "p")
+  (css-color-adj-hue-at-p (- val)))
+;; saturation
+(defun css-color-saturation-up (val)
+  (interactive "p")
+  (css-color-adj-saturation-at-p val))
+
+(defun css-color-saturation-down (val)
+  (interactive "p")
+  (css-color-adj-saturation-at-p (- val)))
+;; value
+(defun css-color-value-up (val)
+  (interactive "p")
+  (css-color-adj-value-at-p val))
+
+(defun css-color-value-down (val)
+  (interactive "p")
+  (css-color-adj-value-at-p (- val)))
+
+(defun css-color-num-up (arg)
+  (interactive "p")
+  (save-excursion
+    (let ((digits "1234567890"))
+      (skip-chars-backward digits)
+      (when
+	  (looking-at "[[:digit:]]+")
+	(replace-match
+	 (propertize
+	  (let ((num (+ (string-to-number (match-string 0)) arg)))
+					;max = 100 when at percentage
+	    (save-match-data
+	      (cond ((looking-at "[[:digit:]]+%")
+		     (setq num (min num 100)))
+		    ((looking-back "hsla?(")
+		     (setq num (css-color-normalize-hue num)))
+		    ((memq 'color-type (text-properties-at (point)))
+		     (setq num (min num 255)))))
+	    (number-to-string num))
+	  'keymap
+	  css-color-generic-map))))))
+
+(defun css-color-num-down (arg)
+  (interactive "p")
+  (save-excursion
+    (let ((digits "1234567890"))
+      (skip-chars-backward digits)
+      (when
+	  (looking-at "[[:digit:]]+")
+	(replace-match
+	 (propertize
+	  (let ((num (- (string-to-number (match-string 0)) arg)))
+					;max = 100 when at percentage
+	    (save-match-data
+	      (cond ((looking-back "hsla?(")
+		     (setq num (css-color-normalize-hue num)))
+		    (t (setq num (max 0 num)))))
+	    (number-to-string num))
+	  'keymap css-color-generic-map))))))
+
+
+(defun css-color-beginning-of-color ()
+  "Skip to beginning of color.
+
+Return list of point and color-type."
+  (while (memq 'color-type (text-properties-at (point)))
+    (backward-char 1))
+  (forward-char 1)
+  (cons (point) (plist-get (text-properties-at (point)) 'color-type)))
+
+(defun css-color-end-of-color ()
+  "Skip to beginning of color.
+
+Return list of point and color-type."
+  (while (plist-get (text-properties-at (point)) 'color-type)
+    (forward-char 1))
+  (cons (point) (plist-get (text-properties-at (1- (point))) 'color-type)))
+
+(defun css-color-color-info ()
+  (destructuring-bind ((beg . type)
+		       (end . type))
+      (list
+       (css-color-beginning-of-color)
+       (css-color-end-of-color))
+    (list beg end type (buffer-substring-no-properties beg end))))
+
+(defconst css-color-type-circle '#1=(hex hsl rgb name . #1#))
+
+(defun css-color-next-type (sym)
+  (cadr (member sym css-color-type-circle)))
+
+(defun css-color-cycle-type ()
+  (interactive)
+  (destructuring-bind (beg end type color) (css-color-color-info)
+    (if (or (= 0 (length color)) (null type))
+	(error "Not at color"))
+    (delete-region beg end)
+    (insert
+     (propertize
+     (funcall
+      (intern-soft
+     (format "css-color-string-%s-to-%s"
+            type
+            (css-color-next-type type)))
+      color)
+   'keymap (if (eq (css-color-next-type type) 'hex)
+              css-color-map
+              css-color-generic-map)     'rear-nonsticky t))
+    (goto-char beg)))
+
+(defun css-color-string-hex-to-hsl (str)
+  (multiple-value-bind (h s l)
+      (apply 'css-color-rgb-to-hsl
+	     (css-color-hex-to-rgb str))
+    (format "hsl(%d,%d%%,%d%%)"
+	    h s l)))
+
+(defun css-color-string-hsl-to-rgb (str)
+  (multiple-value-bind (h s l)
+      (css-color-parse-hsl str)
+    (apply 'format
+	     "rgb(%d,%d,%d)"
+	     (mapcar 'round (css-color-hsl-to-rgb h s l)))))
+
+(defun css-color-string-rgb-to-name (str)
+  (let ((color (css-color-string-rgb-to-hex str)))
+    (or (car (rassoc (list (upcase color)) css-color-html-colors)) ;if name ok
+      color)))                                  ;else return hex
+ (defun css-color-string-name-to-hex (str)
+  (let ((str (downcase str)))
+    (cadr (assoc-if
+	   (lambda (a)
+	     (string=
+	      (downcase a)
+	      str))
+	   css-color-html-colors))))
+ (defun css-color-string-rgb-to-hex (str)
+ (save-match-data
+    (string-match css-color-rgb-re str)
+    (concat "#"
+	    (apply 'css-color-rgb-to-hex
+		   (mapcar
+		    ;;'string-to-number
+		    (lambda (s)
+		      (if (= (aref s (1- (length s))) ?\%)
+			  (round (* (string-to-number s) 2.55))
+			(string-to-number s)))
+		    (list
+		     (match-string-no-properties 1 str)
+		     (match-string-no-properties 2 str)
+		     (match-string-no-properties 3 str)))))))
+
+(defun css-color-string-hsl-to-hex (str)
+  (concat "#" (apply 'css-color-hsl-to-hex (css-color-parse-hsl str))))
+
+(defun css-color-next-channel ()
+  (interactive)
+  (multiple-value-bind (beg end type color)
+      (save-excursion (css-color-color-info))
+    (case type
+      ((hsl rgb)
+       (if (not (re-search-forward ",\\|(" end t))
+	   (goto-char (+ beg 4))))
+      (hex
+       (cond ((> (point) (- end 3))
+	      (goto-char (+ 1 beg)))
+	     ((= (char-after) 35)
+	      (forward-char 1))
+	     ((evenp (- (point) beg))
+	      (forward-char 1))
+	     (t (forward-char 2)))))))
+
+(defun css-color-hexify-anystring (str)
+  (cond ((string-match "^hsl" str)
+	 (css-color-string-hsl-to-hex str))
+	((string-match "^rgb" str)
+	 (css-color-string-rgb-to-hex str))
+	(t str)))
+
+(defun css-color-toggle-percentage ()
+  (interactive)
+  (let ((pos (point)))
+    (if (eq (nth 2 (save-excursion (css-color-color-info))) 'rgb)
+	(let ((chars "%1234567890."))
+	  (skip-chars-backward chars)
+	  (when
+	      (looking-at "[[:digit:]]+\\(?:\.?[[:digit:]]*%\\)?%?")
+	    (let ((s (match-string 0)))
+	      (replace-match
+	       (propertize
+		(if (= (aref s (1- (length s))) ?\%)
+		    (number-to-string (round (* (string-to-number s) 2.55)))
+		  (format "%d%%" (/ (string-to-number s) 2.55)))
+		'keymap css-color-generic-map
+		'rear-nonsticky t)))
+	    ;;(goto-char pos)
+	    ))
+      (message "No toggling at point."))))
+
+;; provide some backwards-compatibility to hexcolor.el:
+(defvar css-color-fg-history nil)
+(defvar css-color-bg-history nil)
+(defun css-color-test (fg-color bg-color)
+  "Test colors interactively.
+The colors are displayed in the echo area. You can specify the
+colors as any viable css color.  Example:
+
+  red
+  #f00
+  #0C0
+  #b0ff00
+  hsla(100, 50%, 25%)
+  rgb(255,100,120)"
+  (interactive (list (completing-read "Foreground color: "
+				      css-color-html-colors
+				      nil nil nil nil css-color-fg-history)
+		     (completing-read "Background color: "
+				      css-color-html-colors
+				      nil nil nil nil css-color-bg-history)))
+  (let* ((s (concat " Foreground: " fg-color ", Background: " bg-color " ")))
+    (put-text-property 0 (length s)
+                       'face (list
+                              :foreground (css-color-hexify-anystring fg-color)
+                              :background (css-color-hexify-anystring bg-color))
+                       s)
+    (message "Here are the colors: %s" s)))
+
+(defun css-color-run-tests ()
+  (interactive)
+  (unless
+      (progn
+	(assert
+	 (string= (css-color-string-hex-to-hsl "#ffff00") "hsl(60,100%,50%)"))
+	(assert
+	 (string= (css-color-string-rgb-to-hex "rgb(255, 50%,   0)")"#ff7f00"))
+	(assert
+	 (string= (css-color-string-hsl-to-rgb "hsl(60, 100%, 50%)") "rgb(255,255,0)"))
+	(assert
+	 (string= (css-color-string-hsl-to-hex "hsl(60, 100%, 50%)") "#ffff00")))
+    (message "All tests passed")))
+
+(provide 'css-color)
+;;; css-color.el ends here
diff --git a/elpa-to-submit/nxhtml/util/css-palette.el b/elpa-to-submit/nxhtml/util/css-palette.el
new file mode 100644
index 0000000000..a5be5ae260
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/css-palette.el
@@ -0,0 +1,472 @@
+;;; css-palette.el
+
+(defconst css-palette:version "0.02")
+;; Copyright (C) 2008 Niels Giesen
+
+;; Author: Niels Giesen <nielsforkgiesen@gmailspooncom, but please
+;; replace the kitchen utensils with a dot before hitting "Send">
+;; Keywords: processes, css, multimedia, extensions, tools
+;; Homepage: http://niels.kicks-ass.org/
+
+;; This program 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 3 of the License, or
+;; (at your option) any later version.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; css-palette defines commands to have "palettes" inside a block
+;; comment to circumvent the absence of (color or other) variable
+;; definitions in the CSS specification. It can import and export GIMP
+;; color palettes. See the documentation of `css-palette-mode'
+;; for details of usage.
+
+;;; Installation:
+
+;; Something like:
+
+;; put it in your load-path.
+
+;; (autoload 'css-palette-mode "css-palette" "" t)
+;; (add-hook 'css-mode-hook
+;; 	  (lambda ()
+;; 	    (css-palette-mode t)))
+
+;; Notes:
+
+;; css-palette depends on css-color.el to do font-locking.
+
+;; ccs-palette is orthogonal to css-mode, so it could probably be used
+;; inside other language modes, provided they support multiline block
+;; comments.
+
+;;; Change log:
+
+;; 2009-01-11 Lennart Borgman
+;;   - Minor code clean up.
+
+;;; Code:
+(require 'css-color)
+(eval-when-compile (require 'cl))		;i'm a bad bad boy...
+
+(defconst css-palette-hex-chars "0123456789abcdefABCDEF"
+  "Composing chars in hexadecimal notation, save for the hash (#) sign.")
+
+(defvar css-palette-mode-map
+  (let ((m (make-sparse-keymap)))
+    (define-key m "\C-c\C-c" 'css-palette-update-all)
+    (define-key m "\C-c\C-i" 'css-palette-insert-reference)
+    (define-key m "\C-c\C-p" 'css-palette-import-from-GIMP)
+    (define-key m "\C-c\C-f" 'css-palette-insert-files)
+    m)
+  "Mode map for `css-palette-mode'")
+
+;;;###autoload
+(define-minor-mode css-palette-mode
+  "Minor mode for palettes in CSS.
+
+The mode `css-palette-mode' acts on the first COLORS declaration in your
+  file of the form:
+
+COLORS:
+\(
+c0 \"#6f5d25\"	;tainted sand
+c1 \"#000000\"	;Black
+c2 \"#cca42b\"	;goldenslumber
+c3 \"#6889cb\"	;far off sky
+c4 \"#fff\"	;strange aeons
+)
+
+Such declarations should appear inside a block comment, in order
+  to be parsed properly by the LISP reader.
+
+Type \\[css-palette-update-all], and any occurence of
+
+  color: #f55; /*[c3]*/
+
+will be updated with
+
+  color: #6899cb; /*[c3]*/
+
+The following commands are available to insert key-value pairs
+  and palette declarations:
+  \\{css-palette-mode-map}
+
+You can extend or redefine the types of palettes by defining a
+  new palette specification of the form (PATTERN REGEXP
+  REF-FOLLOWS-VALUE), named according to the naming scheme
+  css-palette:my-type, where
+
+PATTERN is a pattern containing two (%s) format directives which
+  will be filled in with the variable and its value,
+
+REGEXP is a regular expression to match a value - variable
+  pattern,
+
+and REF-FOLLOWS-VALUE defined whether or not the reference comes
+  after the value. This allows for more flexibility.
+
+Note that, although the w3c spec at URL
+  `http://www.w3.org/TR/CSS2/syndata.html#comments' says that
+  comments \" may occur anywhere between tokens, and their
+  contents have no influence on the rendering\", Internet
+  Explorer does not think so. Better keep all your comments after
+  a \"statement\", as per the default. This means `css-palette'
+  is ill-suited for use within shorthands.
+
+See variable `css-palette:colors' for an example of a palette
+  type.
+
+The extension mechanism means that palette types can be used to
+  contain arbitrary key-value mappings.
+
+Besides the colors palette, css-palette defines the palette
+  definition variables `css-palette:colors-outside' and
+  `css-palette:files', for colors with the reference outside and
+  for file url()'s respectively.
+
+You can fine-control which palette types css-palette should look
+  at via the variable `css-palette-types'.
+
+"
+  nil
+  "-palette"
+  css-palette-mode-map
+  (css-color-mode +1))
+
+;;;###autoload
+(defgroup css-palette nil
+  "Customization group for css-palette library.
+
+See function `css-palette-mode' for documentation"
+  :group 'css-color)
+
+(defcustom css-palette:colors
+  `("%s; /*[%s]*/ "
+    ,(concat "\\("
+	     css-color-color-re
+;; 	      (mapconcat
+;; 	       'identity
+;; 	       (list css-color-hex-re
+;; 		     css-color-hsl-re
+;; 		     css-color-rgb-re) "\\|")
+	      "\\)"
+	      "[[:space:]]*;[[:space:]]*\/\\*\\[\\([^[:space:]]+\\)\\]\\*\/")
+    t)
+  "Color palette specification.
+
+See function `css-palette-mode' for documentation"
+  :group 'css-palette
+  :type '(list
+	  (string :tag "Pattern")
+	  (regexp :tag "Regexp")
+	  (boolean :tag "Reversed")))
+
+(defcustom css-palette:files
+  '("url(%s); /*[%s]*/ "
+    "url(\\([^)]+\\))[[:space:]]*;[[:space:]]*\/\\*\\[\\([^[:space:]]+\\)\\]\\*\/"
+    t)
+  "File palette specification.
+
+See function `css-palette-mode' for documentation"
+  :group 'css-palette
+  :type '(list
+	  (string :tag "Pattern")
+	  (regexp :tag "Regexp")
+	  (boolean :tag "Reversed")))
+
+(defcustom css-palette-types
+  '(colors)
+  "List of palette types to check for in buffer.
+
+See function `css-palette-mode' for documentation"
+  :group 'css-palette
+  :type '(repeat (symbol :tag "Palette type")))
+(make-variable-buffer-local 'css-palette-types)
+
+;; (defun css-palette-mode-turn-on ()
+;;   "Turn on `css-palette-mode'."
+;;   (css-palette-mode 1))
+
+;; ;;;###autoload
+;; (defcustom css-palette-mode-activate-p nil
+;; "Start `css-palette-mode' when `css-mode' is activated."
+;;   :group 'css-palette
+;;   :set (lambda (sym val)
+;;          (set-default sym val)
+;;          (if val
+;;              (add-hook 'css-mode-hook 'css-palette-mode-turn-on)
+;;            (remove-hook 'css-mode-hook 'css-palette-mode-turn-on)))
+;;   :type 'boolean)
+
+(defun css-palette-turn-on-in-buffer ()
+  "Turn on `css-palette-mode' in `css-mode'."
+  (when (derived-mode-p 'css-mode)
+    (message "turn-on-in-b:before (css-palette-mode 1) cb=%s" (current-buffer))
+    (css-palette-mode 1)
+    (message "turn-on-in-b:after (css-palette-mode 1)")
+    ))
+
+;;;###autoload
+(define-globalized-minor-mode css-palette-global-mode css-palette-mode
+  css-palette-turn-on-in-buffer
+  :group 'css-color)
+
+(defun css-palette-get (key spec)
+  (plist-get
+   (css-palette-spec-to-plist
+    (symbol-value
+     (intern-soft
+      (format "css-palette:%s" spec)))) key))
+
+(defun css-palette-spec-to-plist (palette)
+  (destructuring-bind (pattern regexp ref-follows-value) palette
+    (list :regexp regexp
+	  :pattern pattern
+	  :ref-follows-value ref-follows-value)))
+
+(defun css-palette-choose-type ()
+  (intern-soft
+   (if (null (cdr css-palette-types))
+       (car css-palette-types)
+     (completing-read "Type: "
+		      (mapcar 'symbol-name css-palette-types)))))
+
+(defun css-palette-get-declaration (type)
+  "Return `css-palette' declaration of TYPE in current buffer.
+
+If none is found, throw an error."
+  (let ((type (symbol-name type)))
+    (save-excursion
+      (goto-char (point-min))
+      (or (re-search-forward (format "%s:"
+				     (upcase type)) nil t)
+	  (error "No %s declaration found in buffer; check value of variable
+	  `css-palette-types'" type))
+      (let ((palette (read (current-buffer))))
+	;; Check (could be better..)
+	(if (not (and
+		  (listp palette)
+		  (= 0 (% (length palette) 2))))
+	    (error "Invalid %s " type))
+	palette))))
+
+(defun css-palette-update (type)
+"Update buffer references for palette of TYPE."
+  (interactive (list
+		(css-palette-choose-type)))
+  (let ((palette (css-palette-get-declaration type))
+	(regexp (css-palette-get :regexp type))
+	(ref-follows-value (css-palette-get :ref-follows-value type)))
+    (flet ((getval (key palette)
+		      (let ((value (plist-get palette (intern-soft key))))
+			(if (null value)
+			    (error
+			     "%S not specified in %S palette "
+			     key
+			     type
+			     ;;  (signal 'css-palette-not-found-error nil)
+			     )
+			  value))))
+      (save-excursion
+	(goto-char (point-min))
+	(while (re-search-forward
+		regexp
+		(point-max) t)
+	  (replace-match
+	   (getval (match-string-no-properties (if ref-follows-value 2 1)) palette)
+	   nil nil nil (if ref-follows-value 1 2))))))
+   (css-color-mode 1))
+
+(defun css-palette-update-all ()
+  "Update all references for palettes in `css-palette-types'"
+  (interactive)
+  (catch 'err
+    (mapc (lambda (type)
+	    (condition-case err
+		(css-palette-update type)
+	      (if (y-or-n-p (format "%s, skip? " err))
+		  nil)))
+	  css-palette-types)))
+
+;; Reference Insertion
+(defun css-palette-insert-reference (type)
+  "Insert `css-palette' reference of TYPE at point."
+  (interactive
+    (list (css-palette-choose-type)))
+  (let* ((palette (css-palette-get-declaration type))
+	 (ref-follows-value (css-palette-get :ref-follows-value type))
+	 (pattern (css-palette-get :pattern type))
+	 (var
+	  (completing-read (format "%s variable: "
+				   (capitalize
+				    (substring (symbol-name type)
+					       0 -1)))
+			   (loop for i on
+				 palette
+				 by 'cddr
+				 collect
+				 (css-palette-colorify
+				  (symbol-name (car i))
+				  (cadr i)))))
+	 (val  (plist-get palette (read var))))
+    (insert (apply 'format
+		   pattern
+		   (if ref-follows-value
+		       (list val var)
+		     (list var val))))
+    (css-color-mode +1)))
+
+(defun css-palette-hex-color-p (str)
+  (string-match "#\\([a-fA-F[:digit:]]\\{6\\}\\|[a-fA-F[:digit:]]\\{3\\}\\)" str))
+
+(defun css-palette-colorify (string color)
+  (let ((color (if (css-palette-hex-color-p color)
+		   color
+		 "#000")))
+  (propertize string
+	      'font-lock-face
+	      (list :background color
+		    :foreground (css-color-foreground-color color)
+		    string)
+	      'fontified t)))
+
+;; Imports
+(defun css-palette-from-existing-colors ()
+  (interactive)
+  (let ((palette)
+	(count -1))
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "#[[:digit:]a-fA-F]\\{6\\}\\>" nil t)
+	(if (not (member (match-string-no-properties 0) palette))
+	    (setq palette (append (list
+				   (match-string-no-properties 0)
+				   (intern(format "c%d" (incf count))))
+				  palette)))
+	(save-match-data (re-search-forward ";" nil t))
+	(insert (format "/*[%S]*/" (cadr (member (match-string-no-properties 0) palette))))))
+    (insert (format "COLORS:\n%S" (nreverse palette)))
+    (forward-sexp -1)
+    (forward-char 1)
+    (while
+	(not (looking-at ")"))
+      (forward-sexp 2)
+      (newline)
+      (indent-for-tab-command))))
+
+(defun css-palette-newest-GIMP-dir ()
+  "Return newest (version-wise) ~/.gimp-n.n/palettes directory on disk.
+
+Return `nil' if none such directory is found."
+  (catch 'none
+    (concat
+     (or
+      (car
+       (last
+	(directory-files "~/" t "^.gimp-[[:digit:].]\\{3,\\}")))
+      (throw 'none ()))
+   "/palettes/")))
+
+(defun css-palette-import-from-GIMP ()
+  "Import GIMP palette file as a `css-palette' palette.
+
+GIMP palettes can be made with the GIMP or on-line tools such as
+found at URL `http://colourlovers.com'."
+  (interactive)
+  (let ((file (read-file-name "File: " (css-palette-newest-GIMP-dir)))
+	(this-buffer (current-buffer))
+	(count -1))
+    (insert "\nCOLORS:\n(\n")
+    (with-temp-buffer
+      (insert-file-contents file)
+      (goto-char (point-min))
+      (while (re-search-forward
+	      (concat
+	       "^"
+	       "[[:space:]]*\\([[:digit:]]+\\)"  ;red
+	       "[[:space:]]+\\([[:digit:]]+\\)"  ;green
+	       "[[:space:]]+\\([[:digit:]]+\\)"	 ;blue
+	       "[[:space:]]+\\(.*\\)$") ;name (=> used as comment)
+	      nil t)
+	(destructuring-bind (rb re gb ge bb be nb ne &rest ignore)
+	    (cddr (match-data t))
+	  (let ((color
+		 (apply 'format "c%d \"#%02x%02x%02x\" ;%s\n"
+			(incf count)
+			(append
+			 (mapcar 'string-to-number
+				 (list
+				  (buffer-substring-no-properties rb re)
+				  (buffer-substring-no-properties gb ge)
+				  (buffer-substring-no-properties bb be)))
+			 (list (buffer-substring-no-properties nb ne))))))
+	    (save-excursion
+	      (set-buffer this-buffer)
+	      (insert color))))))
+    (insert ")")
+    (message "C-c C-c to update colors")))
+
+(defun css-palette-insert-files (dir)
+  "Insert a `css-palette' declaration for all files in DIR.
+
+Filenames are relative.
+Main use-case: an image directory."
+  (interactive "DDirectory: ")
+  (save-excursion
+    (let ((image-count -1))
+      (insert "\nFILES:\n(\n")
+      (mapc
+       (lambda (f)
+	 (insert
+	  (format "file-%d %S\n"
+		  (incf image-count)
+		  (file-relative-name
+		   f
+		   (file-name-directory (buffer-file-name))))))
+       (directory-files dir t "...+"))
+      (insert ")\n\n"))))
+
+;; Exports
+(defun css-palette-export-to-GIMP (type name columns)
+  "Export the COLORS declaration to a GIMP (.gpl) palette.
+
+See also `gpl-mode' at URL
+`http://niels.kicks-ass.org/public/elisp/gpl.el'."
+  (interactive
+   (list
+    (css-palette-choose-type)
+    (read-string "Name: ")
+    (read-number "Number of columns: " 2)))
+  (let ((palette (css-palette-get-declaration type)))
+    (find-file
+     (concat (css-palette-newest-GIMP-dir)
+	     name
+	     ".gpl"))
+    (insert
+     (format "GIMP Palette
+Name: %s
+Columns: %d
+#
+" name columns))
+    (loop for i on palette
+	  by 'cddr
+	  do
+	  (multiple-value-bind (r g b)(css-color-hex-to-rgb
+				       (css-color-hexify-anystring (cadr i)))
+	    (insert (format "%3d %3d %3d\t%s\n"
+			    r g b
+			    (car i))))))
+  (if (featurep 'gpl)
+      (gpl-mode)))
+
+(provide 'css-palette)
+;; css-palette.el ends here
diff --git a/elpa-to-submit/nxhtml/util/cus-new-user.el b/elpa-to-submit/nxhtml/util/cus-new-user.el
new file mode 100644
index 0000000000..5c15b19735
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/cus-new-user.el
@@ -0,0 +1,803 @@
+;;; cus-new-user.el --- Customize some important options
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-07-10 Fri
+;; Version: 0.2
+;; Last-Updated: 2009-07-10 Fri
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;    Customize significant options for which different user
+;;    environment expectations might dictate different defaults.
+;;
+;;    After an idea of Scot Becker on Emacs Devel.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(defvar cusnu-my-skin-widget nil)
+
+(defvar cusnu-insert-os-spec-fun nil)
+
+;;(customize-for-new-user)
+;;;###autoload
+(defun customize-for-new-user (&optional name)
+  "Show special customization page for new user.
+"
+  (interactive)
+  ;;(setq debug-on-error t)
+  ;;(setq buffer-read-only t)
+  (require 'cus-edit)
+  (let ((inhibit-read-only t)
+        fill-pos)
+    (pop-to-buffer (custom-get-fresh-buffer (or name "*Customizations for New Users*")))
+    (buffer-disable-undo)
+    (Custom-mode)
+    (erase-buffer)
+    (widget-insert (propertize "Easy Customization for New Users\n" 'face '(:weight bold :height 1.5)))
+    (setq fill-pos (point))
+    (widget-insert
+     "Below are some custom options that new users often may want to
+tweak since they may make Emacs a bit more like what they expect from
+using other software in their environment.
+
+After this, at the bottom of this page, is a tool for exporting your own specific options.
+You choose which to export, make a description and give the group of options a new and click a button.
+Then you just mail it or put it on the web for others to use.
+
+Since Emacs runs in many environment and an Emacs user may use
+several of them it is hard to decide by default what a user
+wants/expects.  Therefor you are given the possibility to easily
+do those changes here.
+
+Note that this is just a collection of normal custom options.
+There are no new options here.
+
+
+")
+    (fill-region fill-pos (point))
+
+    ;; Normal custom buffer header
+    (let ((init-file (or custom-file user-init-file)))
+      ;; Insert verbose help at the top of the custom buffer.
+      (when custom-buffer-verbose-help
+        (widget-insert "Editing a setting changes only the text in this buffer."
+                       (if init-file
+                           "
+To apply your changes, use the Save or Set buttons.
+Saving a change normally works by editing your init file."
+                         "
+Currently, these settings cannot be saved for future Emacs sessions,
+possibly because you started Emacs with `-q'.")
+                       "\nFor details, see ")
+        (widget-create 'custom-manual
+                       :tag "Saving Customizations"
+                       "(emacs)Saving Customizations")
+        (widget-insert " in the ")
+        (widget-create 'custom-manual
+                       :tag "Emacs manual"
+                       :help-echo "Read the Emacs manual."
+                       "(emacs)Top")
+        (widget-insert "."))
+      (widget-insert "\n")
+      ;; The custom command buttons are also in the toolbar, so for a
+      ;; time they were not inserted in the buffer if the toolbar was in use.
+      ;; But it can be a little confusing for the buffer layout to
+      ;; change according to whether or nor the toolbar is on, not to
+      ;; mention that a custom buffer can in theory be created in a
+      ;; frame with a toolbar, then later viewed in one without.
+      ;; So now the buttons are always inserted in the buffer.  (Bug#1326)
+;;;    (when (not (and (bound-and-true-p tool-bar-mode) (display-graphic-p)))
+      (if custom-buffer-verbose-help
+          (widget-insert "\n
+ Operate on all settings in this buffer that are not marked HIDDEN:\n"))
+      (let ((button (lambda (tag action active help icon)
+                      (widget-insert " ")
+                      (if (eval active)
+                          (widget-create 'push-button :tag tag
+                                         :help-echo help :action action))))
+            (commands custom-commands))
+        (apply button (pop commands)) ; Set for current session
+        (apply button (pop commands)) ; Save for future sessions
+        (if custom-reset-button-menu
+            (progn
+              (widget-insert " ")
+              (widget-create 'push-button
+                             :tag "Reset buffer"
+                             :help-echo "Show a menu with reset operations."
+                             :mouse-down-action 'ignore
+                             :action 'custom-reset))
+          (widget-insert "\n")
+          (apply button (pop commands)) ; Undo edits
+          (apply button (pop commands)) ; Reset to saved
+          (apply button (pop commands)) ; Erase customization
+          (widget-insert "  ")
+          (pop commands) ; Help (omitted)
+          (apply button (pop commands)))) ; Exit
+      (widget-insert "\n\n")
+
+      (widget-insert (propertize "\nThis part is for your own use\n" 'face '(:weight bold :height 1.5)))
+      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+      ;; Editor emulator level
+
+      (widget-insert "\n")
+      (setq fill-pos (point))
+      (widget-insert
+"Emacs can emulate some common editing behaviours (and some uncommon too).
+For the most common ones you can decide if you want to use them here:
+")
+      (fill-region fill-pos (point))
+      (cusnu-mark-part-desc fill-pos (point))
+
+      ;; CUA Mode
+      (cusnu-insert-options '((cua-mode custom-variable)))
+
+      ;; Viper Mode
+      (widget-insert "\n")
+      (widget-insert (propertize "Viper" 'face 'custom-variable-tag))
+      (widget-insert ":")
+      (setq fill-pos (point))
+      (widget-insert "
+   Viper is currently set up in a special way, please see the
+   command `viper-mode'.  You can use custom to set up most of
+   it.  However if you want to load Viper at startup you must
+   explicitly include \(require 'viper) in your .emacs.
+")
+      (fill-region fill-pos (point))
+
+      ;; Viper Mode
+      (backward-delete-char 1)
+      (cusnu-insert-options '((viper-mode custom-variable)))
+
+      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+      ;; OS specific
+
+      (widget-insert "\n")
+      (setq fill-pos (point))
+      (widget-insert (format "OS specific options (%s): \n" system-type))
+      (fill-region fill-pos (point))
+      (cusnu-mark-part-desc fill-pos (point))
+
+      (if cusnu-insert-os-spec-fun
+          (funcall cusnu-insert-os-spec-fun)
+       (widget-insert "No OS specific customizations.\n"))
+
+      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+      ;; Disputed settings
+
+      (widget-insert "\n")
+      (setq fill-pos (point))
+      (widget-insert
+"Some old time Emacs users want to change the options below:
+")
+      (fill-region fill-pos (point))
+      (cusnu-mark-part-desc fill-pos (point))
+
+      (cusnu-insert-options '((global-visual-line-mode custom-variable)))
+      (cusnu-insert-options '((word-wrap custom-variable)))
+      (cusnu-insert-options '((blink-cursor-mode custom-variable)))
+      (cusnu-insert-options '((tool-bar-mode custom-variable)))
+      (cusnu-insert-options '((tooltip-mode custom-variable)))
+      ;;(cusnu-insert-options '((initial-scratch-message custom-variable)))
+
+      (widget-insert "\n")
+      (widget-insert (propertize "\n\nThis part is for exporting to others\n\n" 'face '(:weight bold :height 1.5)))
+      (setq fill-pos (point))
+      (widget-insert
+"My skin options - This is for exporting custom options to other users
+\(or maybe yourself on another computer).
+This works the following way:
+
+- You add a description of your options and the options you want to export below.
+Then you click on `Export my skin options'.
+This creates a file that you can send to other Emacs users.
+They simply open that file in Emacs and follow the instructions there to test your options
+and maybe save them for later use if they like them.
+\(You can follow the instructions yourself to see how it works.)
+
+Please change the group symbol name to something specific for you.
+")
+      (fill-region fill-pos (point))
+      (cusnu-mark-part-desc fill-pos (point))
+
+      (widget-insert "\n")
+      (set (make-local-variable 'cusnu-my-skin-widget)
+           (car
+            (cusnu-insert-options '((cusnu-my-skin-options custom-variable)))))
+      (widget-insert "\n")
+      (widget-create 'push-button
+                     :tag "Export my skin options             "
+                     :action (lambda (&rest ignore)
+                               (let ((use-dialog-box nil))
+                                 (call-interactively 'cusnu-export-my-skin-options))))
+      (widget-insert "\n")
+      (widget-create 'push-button
+                     :tag "Customize my skin options          "
+                     :action (lambda (&rest ignore)
+                               (let ((use-dialog-box nil))
+                                 (call-interactively 'cusnu-customize-my-skin-options))))
+      (widget-insert "\n")
+      (widget-create 'push-button
+                     :tag "Reset those options to saved values"
+                     :action (lambda (&rest ignore)
+                               (let ((use-dialog-box nil))
+                                 (call-interactively 'cusnu-reset-my-skin-options))))
+
+      ;; Finish setup buffer
+      (mapc 'custom-magic-reset custom-options)
+      (cusnu-make-xrefs)
+      (widget-setup)
+      (buffer-enable-undo)
+      (goto-char (point-min)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Example on Emacs+Emacw32
+(eval-when-compile (require 'emacsw32 nil t))
+(when (fboundp 'emacsw32-version)
+  (defun cusnu-emacsw32-show-custstart (&rest args)
+    (emacsw32-show-custstart))
+  (setq cusnu-insert-os-spec-fun 'cusnu-insert-emacsw32-specific-part)
+  (defun cusnu-insert-emacsw32-specific-part ()
+    (cusnu-insert-options '((w32-meta-style custom-variable)))
+    (widget-insert "\n")
+    (widget-insert (propertize "EmacsW32" 'face 'custom-variable-tag))
+    (widget-insert "
+   Easy setup for Emacs+EmacsW32.")
+    (widget-insert "\n   ")
+    (widget-create 'push-button :tag "Customize EmacsW32"
+                   ;;:help-echo help
+                   :action 'cusnu-emacsw32-show-custstart)
+    (widget-insert "\n")))
+;; End example
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun cusnu-mark-part-desc (beg end)
+  (let ((ovl (make-overlay beg end)))
+    (overlay-put ovl 'face 'highlight)))
+
+(defun cusnu-make-xrefs (&optional beg end)
+  (save-restriction
+    (when (or beg end)
+      (unless beg (setq beg (point-min)))
+      (unless end (setq end (point-max)))
+      (narrow-to-region beg end))
+    (let ((here (point)))
+      (goto-char (point-min))
+      (cusnu-help-insert-xrefs 'cusnu-help-xref-button)
+      (goto-char here))))
+
+(defun widget-info-link-action (widget &optional event)
+  "Open the info node specified by WIDGET."
+  (info-other-window (widget-value widget)))
+
+(defun widget-documentation-string-value-create (widget)
+  ;; Insert documentation string.
+  (let ((doc (widget-value widget))
+	(indent (widget-get widget :indent))
+	(shown (widget-get (widget-get widget :parent) :documentation-shown))
+	(start (point)))
+    (if (string-match "\n" doc)
+	(let ((before (substring doc 0 (match-beginning 0)))
+	      (after (substring doc (match-beginning 0)))
+	      button)
+	  (when (and indent (not (zerop indent)))
+	    (insert-char ?\s indent))
+	  (insert before ?\s)
+	  (widget-documentation-link-add widget start (point))
+	  (setq button
+		(widget-create-child-and-convert
+		 widget (widget-get widget :visibility-widget)
+		 :help-echo "Show or hide rest of the documentation."
+		 :on "Hide Rest"
+		 :off "More"
+		 :always-active t
+		 :action 'widget-parent-action
+		 shown))
+	  (when shown
+	    (setq start (point))
+	    (when (and indent (not (zerop indent)))
+	      (insert-char ?\s indent))
+	    (insert after)
+	    (widget-documentation-link-add widget start (point))
+            (cusnu-make-xrefs start (point))
+            )
+	  (widget-put widget :buttons (list button)))
+      (when (and indent (not (zerop indent)))
+	(insert-char ?\s indent))
+      (insert doc)
+      (widget-documentation-link-add widget start (point))))
+  (insert ?\n))
+(defun cusnu-help-xref-button (match-number type what &rest args)
+  (let ((beg (match-beginning match-number))
+        (end (match-end match-number)))
+  (if nil
+      (let ((ovl (make-overlay beg end)))
+        (overlay-put ovl 'face 'highlight))
+    (let* ((tag (match-string match-number))
+           (value what)
+            (wid-type (cond
+                       ((eq type 'help-variable)
+                        'variable-link)
+                       ((eq type 'help-function)
+                        'function-link)
+                       ((eq type 'help-info)
+                        'custom-manual)
+                       (t nil)))
+          )
+      (when wid-type
+        (delete-region beg end)
+        (backward-char)
+        ;;(tag action active help icon)
+        (widget-create wid-type
+                       ;;tag
+                       :value value
+                       :tag tag
+                       :keymap custom-mode-link-map
+                       :follow-link 'mouse-face
+                       :button-face 'custom-link
+                       :mouse-face 'highlight
+                       :pressed-face 'highlight
+                       ;;:help-echo help
+                       )))))
+    )
+
+;; Override default ... ;-)
+(define-widget 'documentation-link 'link
+  "Link type used in documentation strings."
+  ;;:tab-order -1
+  :help-echo "Describe this symbol"
+  :button-face 'custom-link
+  :action 'widget-documentation-link-action)
+
+(defun cusnu-xref-niy (&rest ignore)
+  (message "Not implemented yet"))
+
+(defun cusnu-describe-function (wid &rest ignore)
+  (let ((fun (widget-get wid :what))
+        )
+    (describe-function fun)))
+
+(defun cusnu-help-insert-xrefs (help-xref-button)
+  ;; The following should probably be abstracted out.
+  (unwind-protect
+      (progn
+        ;; Info references
+        (save-excursion
+          (while (re-search-forward help-xref-info-regexp nil t)
+            (let ((data (match-string 2)))
+              (save-match-data
+                (unless (string-match "^([^)]+)" data)
+                  (setq data (concat "(emacs)" data))))
+              (funcall help-xref-button 2 'help-info data))))
+        ;; URLs
+        (save-excursion
+          (while (re-search-forward help-xref-url-regexp nil t)
+            (let ((data (match-string 1)))
+              (funcall help-xref-button 1 'help-url data))))
+        ;; Mule related keywords.  Do this before trying
+        ;; `help-xref-symbol-regexp' because some of Mule
+        ;; keywords have variable or function definitions.
+        (if help-xref-mule-regexp
+            (save-excursion
+              (while (re-search-forward help-xref-mule-regexp nil t)
+                (let* ((data (match-string 7))
+                       (sym (intern-soft data)))
+                  (cond
+                   ((match-string 3) ; coding system
+                    (and sym (coding-system-p sym)
+                         (funcall help-xref-button 6 'help-coding-system sym)))
+                   ((match-string 4) ; input method
+                    (and (assoc data input-method-alist)
+                         (funcall help-xref-button 7 'help-input-method data)))
+                   ((or (match-string 5) (match-string 6)) ; charset
+                    (and sym (charsetp sym)
+                         (funcall help-xref-button 7 'help-character-set sym)))
+                   ((assoc data input-method-alist)
+                    (funcall help-xref-button 7 'help-character-set data))
+                   ((and sym (coding-system-p sym))
+                    (funcall help-xref-button 7 'help-coding-system sym))
+                   ((and sym (charsetp sym))
+                    (funcall help-xref-button 7 'help-character-set sym)))))))
+        ;; Quoted symbols
+        (save-excursion
+          (while (re-search-forward help-xref-symbol-regexp nil t)
+            (let* ((data (match-string 8))
+                   (sym (intern-soft data)))
+              (if sym
+                  (cond
+                   ((match-string 3)  ; `variable' &c
+                    (and (or (boundp sym) ; `variable' doesn't ensure
+                                        ; it's actually bound
+                             (get sym 'variable-documentation))
+                         (funcall help-xref-button 8 'help-variable sym)))
+                   ((match-string 4)   ; `function' &c
+                    (and (fboundp sym) ; similarly
+                         (funcall help-xref-button 8 'help-function sym)))
+                   ((match-string 5) ; `face'
+                    (and (facep sym)
+                         (funcall help-xref-button 8 'help-face sym)))
+                   ((match-string 6)) ; nothing for `symbol'
+                   ((match-string 7)
+;;;  this used:
+;;; 			  #'(lambda (arg)
+;;; 			      (let ((location
+;;; 				     (find-function-noselect arg)))
+;;; 				(pop-to-buffer (car location))
+;;; 				(goto-char (cdr location))))
+                    (funcall help-xref-button 8 'help-function-def sym))
+                   ((and
+                     (facep sym)
+                     (save-match-data (looking-at "[ \t\n]+face\\W")))
+                    (funcall help-xref-button 8 'help-face sym))
+                   ((and (or (boundp sym)
+                             (get sym 'variable-documentation))
+                         (fboundp sym))
+                    ;; We can't intuit whether to use the
+                    ;; variable or function doc -- supply both.
+                    (funcall help-xref-button 8 'help-symbol sym))
+                   ((and
+                     (or (boundp sym)
+                         (get sym 'variable-documentation))
+                     (or
+                      (documentation-property
+                       sym 'variable-documentation)
+                      (condition-case nil
+                          (documentation-property
+                           (indirect-variable sym)
+                           'variable-documentation)
+                        (cyclic-variable-indirection nil))))
+                    (funcall help-xref-button 8 'help-variable sym))
+                   ((fboundp sym)
+                    (funcall help-xref-button 8 'help-function sym)))))))
+        ;; An obvious case of a key substitution:
+        (save-excursion
+          (while (re-search-forward
+                  ;; Assume command name is only word and symbol
+                  ;; characters to get things like `use M-x foo->bar'.
+                  ;; Command required to end with word constituent
+                  ;; to avoid `.' at end of a sentence.
+                  "\\<M-x\\s-+\\(\\sw\\(\\sw\\|\\s_\\)*\\sw\\)" nil t)
+            (let ((sym (intern-soft (match-string 1))))
+              (if (fboundp sym)
+                  (funcall help-xref-button 1 'help-function sym)))))
+        ;; Look for commands in whole keymap substitutions:
+        (save-excursion
+          ;; Make sure to find the first keymap.
+          (goto-char (point-min))
+          ;; Find a header and the column at which the command
+          ;; name will be found.
+
+          ;; If the keymap substitution isn't the last thing in
+          ;; the doc string, and if there is anything on the
+          ;; same line after it, this code won't recognize the end of it.
+          (while (re-search-forward "^key +binding\n\\(-+ +\\)-+\n\n"
+                                    nil t)
+            (let ((col (- (match-end 1) (match-beginning 1))))
+              (while
+                  (and (not (eobp))
+                       ;; Stop at a pair of blank lines.
+                       (not (looking-at "\n\\s-*\n")))
+                ;; Skip a single blank line.
+                (and (eolp) (forward-line))
+                (end-of-line)
+                (skip-chars-backward "^ \t\n")
+                (if (and (>= (current-column) col)
+                         (looking-at "\\(\\sw\\|\\s_\\)+$"))
+                    (let ((sym (intern-soft (match-string 0))))
+                      (if (fboundp sym)
+                          (funcall help-xref-button 0 'help-function sym))))
+                (forward-line))))))
+    ;;(set-syntax-table stab)
+    ))
+
+(defun cusnu-insert-options (options)
+  (widget-insert "\n")
+  (setq custom-options
+        (append
+         (if (= (length options) 1)
+             (mapcar (lambda (entry)
+                       (widget-create (nth 1 entry)
+                                      ;;:documentation-shown t
+                                      :custom-state 'unknown
+                                      :tag (custom-unlispify-tag-name
+                                            (nth 0 entry))
+                                      :value (nth 0 entry)))
+                     options)
+           (let ((count 0)
+                 (length (length options)))
+             (mapcar (lambda (entry)
+                       (prog2
+                           (message "Creating customization items ...%2d%%"
+                                    (/ (* 100.0 count) length))
+                           (widget-create (nth 1 entry)
+                                          :tag (custom-unlispify-tag-name
+                                                (nth 0 entry))
+                                          :value (nth 0 entry))
+                         (setq count (1+ count))
+                         (unless (eq (preceding-char) ?\n)
+                           (widget-insert "\n"))
+                         (widget-insert "\n")))
+                     options)))
+         custom-options))
+  (unless (eq (preceding-char) ?\n)
+    (widget-insert "\n"))
+  custom-options
+  )
+
+(defun cusnu-is-custom-obj (sym)
+  "Return non-nil if symbol SYM is customizable."
+  (or (get sym 'custom-type)
+      (get sym 'face)
+      (get sym 'custom-group)
+      ))
+
+(define-widget 'custom-symbol 'symbol
+  "A customizable symbol."
+  :prompt-match 'cusnu-is-custom-obj
+  :prompt-history 'widget-variable-prompt-value-history
+  :complete-function (lambda ()
+		       (interactive)
+		       (lisp-complete-symbol 'cusnu-is-custom-obj))
+  :tag "Custom option")
+
+(defun cusnu-set-my-skin-options (sym val)
+  (set-default sym val)
+  (let ((group (nth 0 val))
+        (doc   (nth 1 val))
+        (members (nth 2 val)))
+    (custom-declare-group group nil doc)
+    (put group 'custom-group nil)
+    (dolist (opt members)
+      (let ((type (cusnu-get-opt-main-type opt)))
+        (when type
+          (custom-add-to-group group opt type))))))
+
+(defun cusnu-get-opt-main-type (opt)
+  (when opt
+    (cond ((get opt 'face) 'custom-face)
+          ((get opt 'custom-type) 'custom-variable)
+          ((get opt 'custom-group) 'custom-group))))
+
+(defgroup all-my-loaded-skin-groups nil
+  "All your loaded skin groups."
+  :group 'environment
+  :group 'convenience)
+
+(defun cusnu-custom-group-p (symbol)
+  (and (intern-soft symbol)
+       (or (and (get symbol 'custom-loads)
+                (not (get symbol 'custom-autoload)))
+           (get symbol 'custom-group))))
+
+(defcustom cusnu-my-skin-options '(my-skin-group "My skin group.\n\n\n\n\n" nil)
+  "Your custom skin-like options.
+The purpose of this variable is to provide for easy export a
+selection of variables you choose to set to other users.
+
+To send these values to other users you export them to a file
+with `cusnu-export-my-skin-options'."
+  :type '(list (symbol :tag "My custom group symbol name (should be specific to you)")
+               (string :tag "My custom group description")
+               (repeat :tag "Add your custom options below"
+                       (custom-symbol :tag "My custom option")))
+  :set 'cusnu-set-my-skin-options
+  :group 'all-my-loaded-skin-groups)
+
+;;(cusnu-ring-bell "bell")
+(defun cusnu-ring-bell (format-string &rest args)
+  (message "%s" (propertize (apply
+                             'format format-string args) 'face 'secondary-selection))
+  (ding)
+  (throw 'bell nil))
+
+;;;###autoload
+(defun cusnu-export-my-skin-options (file)
+  "Export to file FILE custom options in `cusnu-my-skin-options'.
+The options is exported to elisp code that other users can run to
+set the options that you have added to `cusnu-my-skin-options'.
+
+For more information about this see `cusnu-export-cust-group'."
+  (interactive '(nil))
+  (catch 'bell
+    (let ((grp (nth 0 cusnu-my-skin-options))
+          buf)
+      (let ((state (plist-get (cdr cusnu-my-skin-widget) :custom-state)))
+        (case state
+          ((set saved) nil) ;;(error "test, state=%s" state))
+          (standard (cusnu-ring-bell "Please enter your options first"))
+          (t (cusnu-ring-bell "My Skin Options must be saved or set, use the State button, %s" state))))
+      (unless (nth 2 cusnu-my-skin-options)
+        (cusnu-ring-bell "You have not added any of your options"))
+      (unless file
+        (setq file (read-file-name "Save to file: ")))
+      (when (file-exists-p file)
+        (cusnu-ring-bell "File %s already exists, choose another file name" file))
+      (setq buf (find-file-other-window file))
+      (with-current-buffer buf
+        (unless (eq major-mode 'emacs-lisp-mode) (emacs-lisp-mode))
+        (unless (file-exists-p (buffer-file-name))
+          (erase-buffer)))
+      (cusnu-export-cust-group grp buf))))
+
+(defun cusnu-customize-my-skin-options ()
+  (interactive)
+  (customize-group-other-window (nth 0 cusnu-my-skin-options)))
+
+(defun cusnu-reset-my-skin-options ()
+  "Reset to my defaults for those options.
+"
+  (interactive)
+  (cusnu-reset-group-options-to-my-defaults (nth 0 cusnu-my-skin-options)))
+
+(defun cusnu-reset-group-options-to-my-defaults (group)
+  (dolist (sym-typ (get group 'custom-group))
+    (let ((symbol (nth 0 sym-typ))
+          ;;(type (cusnu-get-opt-main-type symbol))
+          (type   (nth 1 sym-typ))
+          defval)
+      (cond
+       ((eq type 'custom-variable)
+        ;; First try reset to saved.
+        (let* ((set (or (get symbol 'custom-set) 'set-default))
+               (value (get symbol 'saved-value))
+               (comment (get symbol 'saved-variable-comment)))
+          (cond ((or comment value)
+                 (put symbol 'variable-comment comment)
+                 (custom-push-theme 'theme-value symbol 'user 'set (car-safe value))
+                 (condition-case err
+                     (funcall set symbol (eval (car value)))
+                   (error (message "%s" err))))
+                ;; If symbol was not saved then reset to standard.
+                (t
+                 (unless (get symbol 'standard-value)
+                   (error "No standard setting known for %S" symbol))
+                 (put symbol 'variable-comment nil)
+                 (put symbol 'customized-value nil)
+                 (put symbol 'customized-variable-comment nil)
+                 (custom-push-theme 'theme-value symbol 'user 'reset)
+                 (custom-theme-recalc-variable symbol)
+                 (put symbol 'saved-value nil)
+                 (put symbol 'saved-variable-comment nil)
+                 ))))
+       ((eq type 'custom-face)
+        ;; First try reset to saved
+        (let* ((value (get symbol 'saved-face))
+               (comment (get symbol 'saved-face-comment)))
+          (cond ((or value comment)
+                 (put symbol 'customized-face nil)
+                 (put symbol 'customized-face-comment nil)
+                 (custom-push-theme 'theme-face symbol 'user 'set value)
+                 (face-spec-set symbol value t)
+                 (put symbol 'face-comment comment))
+                ;; If symbol was not saved then reset to standard.
+                (t
+                 (setq value (get symbol 'face-defface-spec))
+                 (unless value
+                   (error "No standard setting for this face"))
+                 (put symbol 'customized-face nil)
+                 (put symbol 'customized-face-comment nil)
+                 (custom-push-theme 'theme-face symbol 'user 'reset)
+                 (face-spec-set symbol value t)
+                 (custom-theme-recalc-face symbol)
+                 ;; Do this later.
+                 (put symbol 'saved-face nil)
+                 (put symbol 'saved-face-comment nil)
+                 ))))
+       (t (error "not iy"))))))
+
+(defun cusnu-export-cust-group (group buf)
+  "Export custom group GROUP to end of buffer BUF.
+Only the options that has been customized will be exported.
+
+The group is exported as elisp code.  Running the code will
+create a group with just those members.  After this it opens a
+customization buffer with the new group.
+
+The code will also set the options to the customized values, but
+it will not save them in the users init file.
+
+See also the comment in the exported file."
+  (let (start
+        (doc (get group 'group-documentation))
+        groups options faces
+        (members (mapcar (lambda (rec)
+                           (car rec))
+                         (get group 'custom-group))))
+    (with-current-buffer buf
+      (insert (format-time-string ";; Here is my skin custom group %Y-%m-%d.\n"))
+      (font-lock-mode 1)
+      (insert (format ";;;;;; Customization group name:  %s\n" group))
+      (insert ";;\n")
+      (let ((here (point)))
+        (insert doc "\n")
+        (comment-region here (point))
+        (fill-region here (point)))
+      (cusnu-get-options-and-faces members 'groups 'options 'faces)
+      (unless (or options faces)
+        (cusnu-ring-bell "There are no options or faces in %s customized by you" group))
+      (insert "
+;; This file defines the group and sets the options in it, but does
+;; not save the values to your init file.
+;;
+;; To set the values evaluate this file.  To do that open this file in Emacs and to
+;;
+;;   M-x eval-buffer
+;;
+;; To go back to your default evaluate next line (place point at the end and to C-x C-e):
+")
+      (insert (format ";; (cusnu-reset-group-options-to-my-defaults '%s)\n\n"  group))
+      (insert (format "(let ((grp '%s))\n" group))
+      (insert (format "  (custom-declare-group grp nil %S)\n" doc))
+      (insert "  (put grp 'custom-group nil)\n")
+      (insert (format "  (custom-add-to-group 'all-my-loaded-skin-groups '%s 'custom-group)\n" group))
+      (dolist (opt members)
+        (let ((type (cusnu-get-opt-main-type opt)))
+          (when type
+            (insert (format "  (custom-add-to-group grp '%s '%s)\n"
+                            opt type)))))
+      (insert "  (custom-set-variables\n")
+      (dolist (opt options)
+        (let ((my-val (or (get opt 'saved-value)
+                          (get opt 'customized-value))))
+          (when my-val
+            (insert (format "   '(%s %S)\n" opt (custom-quote (symbol-value opt)))))))
+      (insert "   )\n")
+      (insert "  (custom-set-faces\n")
+      (dolist (opt faces)
+        (let ((my-val (get opt 'customized-face)))
+          (when my-val
+            (insert (format "   '(%s %S)\n" opt my-val)))))
+      (insert "   ))\n")
+      (insert (format "\n(customize-group '%s)\n" group))
+      )))
+
+(defun cusnu-get-options-and-faces (members groups-par options-par faces-par)
+  (dolist (sym members)
+    (insert (format ";; sym=%s\n" sym))
+    (cond ((and (get sym 'custom-type)
+           (or (get sym 'saved-value)
+               (get sym 'customize-value)))
+           (add-to-list options-par sym))
+          ((and (get sym 'face)
+                (get sym 'customized-face))
+           (add-to-list faces-par sym))
+          ((get sym 'custom-group)
+           (unless (memq sym groups-par) ;; Don't loop
+             (cusnu-get-options-and-faces groups-par options-par faces-par)))
+          (t (insert ";; Not a custom variable or face: %s\n" sym)))))
+
+(provide 'cus-new-user)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; cus-new-user.el ends here
diff --git a/elpa-to-submit/nxhtml/util/ecb-batch-compile.el b/elpa-to-submit/nxhtml/util/ecb-batch-compile.el
index 0b55306214..58504dad52 100644
--- a/elpa-to-submit/nxhtml/util/ecb-batch-compile.el
+++ b/elpa-to-submit/nxhtml/util/ecb-batch-compile.el
@@ -54,7 +54,7 @@
 (require 'udev-cedet)
 (udev-cedet-load-cedet t)
 
-(require 'udev-ecb)
+(eval-and-compile (require 'udev-ecb))
 (udev-ecb-load-ecb)
 
 (ecb-byte-compile)
diff --git a/elpa-to-submit/nxhtml/util/elunit.el b/elpa-to-submit/nxhtml/util/elunit.el
deleted file mode 100644
index fd466269f2..0000000000
--- a/elpa-to-submit/nxhtml/util/elunit.el
+++ /dev/null
@@ -1,338 +0,0 @@
-;;; elunit.el --- Emacs Lisp Unit Testing framework
-
-;; Copyright (C) 2006 - 2007 Phil Hagelberg
-
-;; Author: Phil Hagelberg
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/ElUnit
-;; Keywords: unit test tdd
-;; EmacsWiki: ElUnit
-
-;; This file is NOT part of GNU Emacs.
-
-;; Last-Updated: Fri Nov 16 16:23:06 2007 PST
-;; By: Phil Hagelberg
-;; Update #: 1
-
-;;; License:
-
-;; This program 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 3, or (at your option)
-;; any later version.
-;;
-;; This program 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Inspired by regress.el by Wayne Mesard and Tom Breton, Test::Unit
-;; by Nathaniel Talbott, and xUnit by Kent Beck
-
-;; ElUnit exists to accomodate test-driven development of Emacs Lisp
-;; programs.  Tests are divided up into suites.  Each test makes a
-;; number of assertions to ensure that things are going according to
-;; expected.
-
-;; Tests are divided into suites for the purpose of hierarchical
-;; structure and hooks.  The hierarchy allows suites to belong to
-;; suites, in essence creating test trees.  The hooks are meant to
-;; allow for extra setup that happens once per test, for both before
-;; and after it runs.
-
-;; The file `elunit-assertions.el' provides a number of helpful
-;; assertions for ensuring that things are going properly.  You may use
-;; Emacs' built-in `assert' function for checking such things, but the
-;; assertions in that file provide much better reporting if you use
-;; them.  Using `assert-that' is preferred over built-in `assert'.
-
-;;; Todo:
-
-;;  * more helper functions, specifically for more functional-test stuff.
-
-;;; Usage:
-
-;; See http://www.emacswiki.org/cgi-bin/wiki/ElUnit for discussion and usage.
-;; The file `elunit-test.el' contains meta-tests that you may find helpful
-;; to refer to as samples.
-
-;; Add the lines:
-;; (make-local-variable 'after-save-hook)
-;; (add-hook 'after-save-hook (lambda () (elunit "meta-suite")))
-;; to the file containing your tests for convenient auto-running.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl)
-  (require 'compile))
-
-(defstruct test-suite name children tests setup-hook teardown-hook)
-(defstruct test name body file line message problem)
-
-(put 'elunit-test-failed 'error-conditions '(failure))
-
-(defvar elunit-default-suite
-  "default-suite"
-  "Choice to use for default suite to run (gets updated to last suite run).")
-
-(defvar elunit-suites (list (make-test-suite :name 'default-suite))
-  "A list of every suite that's been defined.")
-
-(defvar elunit-test-count 0)
-(defvar elunit-failures nil
-  "A list of tests that have failed.")
-
-(defvar elunit-done-running-hook nil
-  "Runs when the tests are finished; passed a total test count and a failure count.")
-
-(defun elunit-clear-suites ()
-  "Reset the internal suite list."
-  (interactive)
-  (setq elunit-suites (list (make-test-suite :name 'default-suite))))
-
-;;; Defining tests
-
-(defmacro* defsuite (suite-name suite-ancestor &key setup-hook teardown-hook)
-  "Define a suite, which may be hierarchical."
-  `(let ((suite (make-test-suite :name ',suite-name
-                                 :setup-hook ,setup-hook :teardown-hook ,teardown-hook)))
-     (elunit-delete-suite ',suite-name)
-     (if ',suite-ancestor
-         (push suite (test-suite-children (elunit-get-suite ',suite-ancestor))))
-     (add-to-list 'elunit-suites suite)))
-
-(defun elunit-get-suite (suite)
-  "Fetch a SUITE by its name."
-  (if (test-suite-p suite)
-      suite
-    (find suite elunit-suites :test (lambda (suite asuite)
-                                     (equal suite (test-suite-name asuite))))))
-
-(defun elunit-delete-suite (name)
-  "Remove a suite named `NAME'."
-  (setq elunit-suites (remove (elunit-get-suite name) elunit-suites)))
-
-(defmacro deftest (name suite &rest body)
-  "Define a test `NAME' in `SUITE' with `BODY'."
-  (save-excursion
-    (search-backward (symbol-name name) nil t)
-    (let ((line (line-number-at-pos))
-          (file buffer-file-name)
-          (suite-sym (gensym)))
-      `(let ((,suite-sym (elunit-get-suite ',suite)))
-         ;; not a foolproof heuristic to get line number, but good enough.
-         (elunit-delete-test ',name ,suite-sym)
-         (push (make-test :name ',name :body (lambda () ,@body)
-                                       :file ,file :line ,line)
-               (test-suite-tests ,suite-sym))))))
-
-(defun elunit-get-test (name suite)
-  "Return a test given a name and suite."
-  (if (test-p name) name
-    (find name (test-suite-tests (elunit-get-suite suite))
-          :test (lambda (name test) (equal name (test-name test))))))
-
-(defun elunit-delete-test (name suite)
-  "Delete a test."
-  (let ((suite (elunit-get-suite suite)))
-    (setf (test-suite-tests suite)
-          (delete (elunit-get-test name suite) (test-suite-tests suite)))))
-
-(defun elunit-total-test-count (suite)
-  "Return the total number of tests in a suite."
-  (let ((suite (elunit-get-suite suite)))
-    (if suite
-        (+ (apply #'+ (elunit-total-test-count (test-suite-children suite)))
-           (length (test-suite-tests suite))))))
-
-(defun elunit-test-docstring (test)
-  "Return a test's docstring."
-  (if (equal (car (test-body test)) 'lambda)
-      (if (stringp (caddr (test-body test)))
-          (caddr (test-body test))
-        "")))
-
-;;; Running the tests
-
-(defun elunit (suite)
-  "Ask for a single suite, run all its tests, and display the results."
-  (interactive (list (completing-read (concat "Run test suite (default " elunit-default-suite "): " )
-                                      (mapcar (lambda (suite) (symbol-name (test-suite-name suite)))
-                                              elunit-suites) nil t nil nil elunit-default-suite)))
- (setq elunit-default-suite suite)
- (setq elunit-test-count 0)
- (setq elunit-failures nil)
-
- (with-output-to-temp-buffer "*elunit*"
-   (switch-to-buffer "*elunit*")
-   (compilation-minor-mode)
-   (switch-to-buffer nil)
-
-   (princ (concat "Loaded suite: " suite "\n\n"))
-   (let ((start-time (cadr (current-time))))
-     (elunit-run-suite (elunit-get-suite (intern suite)))
-     (princ (format "\n\n%d tests with %d failures in %d seconds."
-                    elunit-test-count (length elunit-failures)
-                    (- (cadr (current-time)) start-time))))
-   (elunit-report-failures)))
-
-(defun elunit-run-suite (suite)
-  "Run a suite's tests and children."
-  (dolist (test (reverse (test-suite-tests suite)))
-    (if (test-suite-setup-hook suite) (funcall (test-suite-setup-hook suite)))
-    (elunit-run-test test)
-    (if (test-suite-teardown-hook suite) (funcall (test-suite-teardown-hook suite))))
-  (dolist (child-suite (test-suite-children suite))
-    (elunit-run-suite child-suite))
-  (run-hook-with-args 'elunit-done-running-hook elunit-test-count (length elunit-failures)))
-
-(defun elunit-run-test (test)
-  "Run a single test."
-  (condition-case err
-      (progn
-        (incf elunit-test-count)
-        (funcall (test-body test))
-        (princ "."))
-    (failure
-     (elunit-failure test err "F"))
-    (error
-     (elunit-failure test err "E"))))
-
-(defun elunit-failure (test err output)
-  "Display and store failure info."
-  (princ output)
-  (setf (test-problem test) err)
-  ;; color overlays are GNU-only IIRC
-  (unless (featurep 'xemacs)
-    (switch-to-buffer "*elunit*")
-    (overlay-put (make-overlay (point) (- (point) 1)) 'face '(foreground-color . "red"))
-    (switch-to-buffer nil))
-  (setf (test-message test) err)
-  (push test elunit-failures))
-
-(defun elunit-report-failures ()
-  "Summarize failures."
-  (let ((count 0))
-    (dolist (test elunit-failures)
-      (incf count)
-      (princ (format "\n\n%d) %s %s [%s:%s]
-            %s
-   Message: %s
-      Form: %s" count
-      (if (equal (car (test-problem test)) 'elunit-test-failed)
-          "Failure:" "  Error:")
-      (test-name test) (test-file test) (test-line test)
-      (elunit-test-docstring test) (pp-to-string (test-message test))
-      (pp-to-string (test-body test)))))))
-
-(add-to-list 'compilation-error-regexp-alist '("\\[\\([^\]]*\\):\\([0-9]+\\)\\]" 1 2))
-
-;;; Helper functions
-
-(defmacro with-test-buffer (&rest body)
-  "Execute BODY in a test buffer named `*elunit-output*'."
-  `(save-excursion
-     (switch-to-buffer "*elunit-output*")
-     ,@body
-     (kill-buffer "*elunit-output*")))
-
-(defun elunit-quiet (suite)
-  "Run a suite and display results in the minibuffer."
-  (interactive (list (completing-read (concat "Run test suite (default " elunit-default-suite "): " )
-				      (mapcar (lambda (suite) (symbol-name (test-suite-name suite)))
-					      elunit-suites) nil t nil nil elunit-default-suite)))
-  (save-window-excursion
-    (elunit suite))
-  (message "%d tests with %d failures" elunit-test-count (length elunit-failures)))
-
-;; TODO: font-lock deftest and defsuite
-;; do this too? (put 'defsuite 'lisp-indent-function 1)
-
-(defun fail (&rest args)
-  "Like `error', but reported differently."
-    (signal 'elunit-test-failed (list (apply 'format args))))
-
-;;; General assertions
-
-;; These are preferred over stuff like (assert (equal [...] because
-;; they use the `fail' function, which reports errors nicely.
-
-(defun assert-that (actual)
-  (unless actual
-    (fail "%s expected to be non-nil" actual)))
-
-(defun assert-nil (actual)
-  (when actual
-    (fail "%s expected to be nil" actual)))
-
-(defun assert-equal (expected actual)
-  (unless (equal expected actual)
-    (fail "%s expected to be %s" actual expected)))
-
-(defun assert-not-equal (expected actual)
-  (when (equal expected actual)
-    (fail "%s expected to not be %s" actual expected)))
-
-(defun assert-member (elt list)
-  (unless (member elt list)
-    (fail "%s expected to include %s" list elt)))
-
-(defun assert-match (regex string)
-  (unless (string-match regex string)
-    (fail "%s expected to match %s" string regex)))
-
-(defmacro assert-error (&rest body)
-  `(condition-case err
-       (progn
-	 ,@body
-	 (fail "%s expected to signal an error" body))
-     (error t)))
-
-(defmacro assert-changed (form &rest body)
-  `(assert-not-equal (eval ,form)
-		     (progn
-		       ,@body
-		       (eval ,form))))
-
-(defmacro assert-not-changed (form &rest body)
-  `(assert-equal (eval ,form)
-		     (progn
-		       ,@body
-		       (eval ,form))))
-
-;; Buffer-specific assertions
-
-(defun assert-in-buffer (target &optional buffer)
-  (save-window-excursion
-    (if buffer (switch-to-buffer buffer))
-    (goto-char (point-min))
-    (unless (search-forward target nil t)
-      (fail "%s expected to be found in buffer %s" target buffer))))
-
-(defun assert-background (target face &optional buffer)
-  (save-window-excursion
-    (if buffer (switch-to-buffer buffer))
-    (goto-char (point-min))
-    (unless (search-forward target nil t)
-      (fail "%s expected to be found in buffer %s" target buffer))
-    (unless (equal (face (get-text-property (point) 'background)))
-      (fail "%s expected to be displayed with face %s" target face))))
-
-(defun assert-overlay (pos)
-  (unless (overlays-at pos)
-    (fail "Expected overlay at position %d" pos)))
-
-(defun assert-no-overlay (pos)
-  (if (overlays-at pos)
-    (fail "Expected no overlay at position %d" pos)))
-
-(provide 'elunit)
-
-;;; elunit.el ends here
diff --git a/elpa-to-submit/nxhtml/util/ffip.el b/elpa-to-submit/nxhtml/util/ffip.el
index 7b8bd61439..57d821aabd 100644
--- a/elpa-to-submit/nxhtml/util/ffip.el
+++ b/elpa-to-submit/nxhtml/util/ffip.el
@@ -1,10 +1,10 @@
-;;; ffip2.el --- Find files in project
+;;; ffip.el --- Find files in project
 ;;
 ;; Authors: extracted from rinari by Phil Hagelberg and Doug Alcorn
 ;; Changed by Lennart Borgman
 ;; Created: 2008-08-14T23:46:22+0200 Thu
 ;; Version: 0.3
-;; Last-Updated:
+;; Last-Updated: 2008-12-28 Sun
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
@@ -45,14 +45,40 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Project data
 
 ;; Fix-me: Change the inner structure of ffip projects
 (defvar ffip-project-name nil "Project name.")
-(defconst ffip-project-roots nil "Project directory roots.")
+(defvar ffip-project-roots nil "Project directory roots.")
 (defvar ffip-project-type nil "Project type, `ffip-project-file-types'.")
+(defcustom ffip-project-file-types
+  (list
+    '(ruby "\\(\\.el$\\|\\.rb$\\|\\.js$\\|\\.emacs\\)")
+    (list 'nxhtml (concat
+                   (regexp-opt '(".html" ".htm" ".xhtml"
+                                 ".css"
+                                 ".js"
+                                 ".png" ".gif"
+                                 ))
+                  "\\'"))
+    )
+  "Project types and file types.
+The values in this list are used to determine if a file belongs
+to the current ffip project. Entries have the form
+
+  \(TYPE FILE-REGEXP)
+
+TYPE is the parameter set by `ffip-set-current-project'.  Files
+matching FILE-REGEXP within the project roots are members of the
+project."
+  :type '(repeat (list
+                  (symbol :tag "Type")
+                  (regexp :tag "File regexp")))
+  :group 'ffip)
+
 (defvar ffip-project-file-matcher nil "Project file matcher.")
 (defvar ffip-project-files-table nil "Project file cache.")
 
@@ -138,31 +164,6 @@ directory) and FULL-NAME is the full file name."
         (file-name-directory root)
       dir)))
 
-(defcustom ffip-project-file-types
-  (list
-    '(ruby "\\(\\.el$\\|\\.rb$\\|\\.js$\\|\\.emacs\\)")
-    (list 'nxhtml (concat
-                   (regexp-opt '(".html" ".htm" ".xhtml"
-                                 ".css"
-                                 ".js"
-                                 ".png" ".gif"
-                                 ))
-                  "\\'"))
-    )
-  "Project types and file types.
-The values in this list are used to determine if a file belongs
-to the current ffip project. Entries have the form
-
-  \(TYPE FILE-REGEXP)
-
-TYPE is the parameter set by `ffip-set-current-project'.  Files
-matching FILE-REGEXP within the project roots are members of the
-project."
-  :type '(repeat (list
-                  (symbol :tag "Type")
-                  (regexp :tag "File regexp")))
-  :group 'ffip)
-
 (defun ffip-populate-files-table (file file-regexp)
   ;;(message "ffip-populate-files-table.file=%s" file)
   (if (file-directory-p file)
diff --git a/elpa-to-submit/nxhtml/util/freemind.el b/elpa-to-submit/nxhtml/util/freemind.el
index 1f277eb3d0..38136018dd 100644
--- a/elpa-to-submit/nxhtml/util/freemind.el
+++ b/elpa-to-submit/nxhtml/util/freemind.el
@@ -1,18 +1,18 @@
 ;;; freemind.el --- Export to FreeMind
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-02-19T17:52:56+0100 Tue
-;; Version: 0.57
-;; Last-Updated: 2008-05-04T13:05:33+0200 Sun
+;; Created: 2008-02-19 Tue
+(defconst freemind:version "0.60") ;; Version:
+;; Last-Updated: 2009-08-04 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `cl', `easymenu', `font-lock', `noutline', `org', `org-compat',
-;;   `org-faces', `org-macs', `outline', `syntax', `time-date',
-;;   `xml'.
+  ;; `easymenu', `font-lock', `noutline', `org', `org-compat',
+  ;; `org-faces', `org-footnote', `org-list', `org-macs',
+  ;; `org-panel', `outline', `syntax', `time-date', `xml'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -39,6 +39,9 @@
 ;;
 ;;; Change log:
 ;;
+;; 2009-02-15: Added check for next level=current+1
+;; 2009-02-21: Fixed bug in `freemind-to-org-mode'.
+;;
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -87,6 +90,53 @@
 ;;   :type 'color
 ;;   :group 'freemind)
 
+(defvar freemind-node-style nil "Internal use.")
+
+(defcustom freemind-node-styles nil
+  "Styles to apply to node.
+NOT READY YET."
+  :type '(repeat
+          (list :tag "Node styles for file"
+                (regexp :tag "File name")
+                (repeat
+                 (list :tag "Node"
+                       (regexp :tag "Node name regexp")
+                       (set :tag "Node properties"
+                            (list :format "%v" (const :format "" node-style)
+                                  (choice :tag "Style"
+                                          :value bubble
+                                          (const bubble)
+                                          (const fork)))
+                            (list :format "%v" (const :format "" color)
+                                  (color :tag "Color" :value "red"))
+                            (list :format "%v" (const :format "" background-color)
+                                  (color :tag "Background color" :value "yellow"))
+                            (list :format "%v" (const :format "" edge-color)
+                                  (color :tag "Edge color" :value "green"))
+                            (list :format "%v" (const :format "" edge-style)
+                                  (choice :tag "Edge style" :value bezier
+                                          (const :tag "Linear" linear)
+                                          (const :tag "Bezier" bezier)
+                                          (const :tag "Sharp Linear" sharp-linear)
+                                          (const :tag "Sharp Bezier" sharp-bezier)))
+                            (list :format "%v" (const :format "" edge-width)
+                                  (choice :tag "Edge width" :value thin
+                                          (const :tag "Parent" parent)
+                                          (const :tag "Thin" thin)
+                                          (const 1)
+                                          (const 2)
+                                          (const 4)
+                                          (const 8)))
+                            (list :format "%v" (const :format "" italic)
+                                  (const :tag "Italic font" t))
+                            (list :format "%v" (const :format "" bold)
+                                  (const :tag "Bold font" t))
+                            (list :format "%v" (const :format "" font-name)
+                                  (string :tag "Font name" :value "SansSerif"))
+                            (list :format "%v" (const :format "" font-size)
+                                  (integer :tag "Font size" :value 12)))))))
+  :group 'freemind)
+
 
 ;;;###autoload
 (defun freemind-show (mm-file)
@@ -126,6 +176,7 @@
                          ((= cc ?\") "&quot;")
                          ((= cc ?\&) "&amp;")
                          ((= cc ?\<) "&lt;")
+                         ((= cc ?\>) "&gt;")
                          (t (char-to-string cc)))
                       ;; Formatting as &#number; is maybe needed
                       ;; according to a bug report from kazuo
@@ -143,6 +194,7 @@
     (setq org-str (replace-regexp-in-string "&quot;" "\"" org-str))
     (setq org-str (replace-regexp-in-string "&amp;" "&" org-str))
     (setq org-str (replace-regexp-in-string "&lt;" "<" org-str))
+    (setq org-str (replace-regexp-in-string "&gt;" ">" org-str))
     (setq org-str (replace-regexp-in-string
                "&#x\\([a-f0-9]\\{2\\}\\);"
                (lambda (m)
@@ -288,11 +340,11 @@
                         "</body>"
                         "</html>"
                         "</richcontent>\n"
-                        "</node>\n"
+                        "</node>\n" ;; ok
                         )))
       (list node-res note-res))))
 
-(defun freemind-write-node ()
+(defun freemind-write-node (this-m2 this-node-end)
   (let* (this-icons
          this-bg-color
          this-m2-escaped
@@ -335,6 +387,7 @@
       (setq this-rich-note (nth 1 node-notes)))
     (with-current-buffer mm-buffer
       (insert "<node text=\"" this-m2-escaped "\"")
+      (freemind-get-node-style this-m2)
       ;;(when (and (> current-level base-level) (> next-level current-level))
       (when (> next-level current-level)
         (unless (or this-children-visible
@@ -361,15 +414,21 @@
   (if (file-exists-p file)
       (if interactively
           (y-or-n-p (format "File %s exists, replace it? " file))
-        (error "File %s already exists" mm-file))
+        (error "File %s already exists" file))
     t))
 
+(defvar freemind-node-pattern (rx bol
+                         (submatch (1+ "*"))
+                         (1+ space)
+                         (submatch (*? nonl))
+                         eol))
+
 (defun freemind-look-for-visible-child (node-level)
   (save-excursion
     (save-match-data
       (let ((found-visible-child nil))
         (while (and (not found-visible-child)
-                    (re-search-forward node-pattern nil t))
+                    (re-search-forward freemind-node-pattern nil t))
           (let* ((m1 (match-string-no-properties 1))
                  (level (length m1)))
             (if (>= node-level level)
@@ -381,14 +440,13 @@
 
 (defun freemind-write-mm-buffer (org-buffer mm-buffer node-at-line)
   (with-current-buffer org-buffer
+    (dolist (node-style freemind-node-styles)
+      (when (string-match-p (car node-style) buffer-file-name)
+        (setq freemind-node-style (cadr node-style))))
+    ;;(message "freemind-node-style =%s" freemind-node-style)
     (save-match-data
       (let* ((drawers (copy-sequence org-drawers))
              drawers-regexp
-             (node-pattern (rx bol
-                               (submatch (1+ "*"))
-                               (1+ space)
-                               (submatch (*? nonl))
-                               eol))
              (num-top1-nodes 0)
              (num-top2-nodes 0)
              num-left-nodes
@@ -404,8 +462,8 @@
         (with-current-buffer mm-buffer
           (erase-buffer)
           (insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
-          (insert "<map version=\"0.9.Beta_15\">\n")
-          (insert "<!-- FreeMind file, see http://freemind.sourceforge.net -->\n"))
+          (insert "<map version=\"0.9.0\">\n")
+          (insert "<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->\n"))
         (save-excursion
           ;; Get special buffer vars:
           (goto-char (point-min))
@@ -429,13 +487,13 @@
               ;; Get number of top nodes and last line for this node
               (progn
                 (goto-line node-at-line)
-                (unless (looking-at node-pattern)
+                (unless (looking-at freemind-node-pattern)
                   (error "No node at line %s" node-at-line))
                 (setq node-at-line-level (length (match-string-no-properties 1)))
                 (forward-line)
                 (setq node-at-line-last
                       (catch 'last-line
-                        (while (re-search-forward node-pattern nil t)
+                        (while (re-search-forward freemind-node-pattern nil t)
                           (let* ((m1 (match-string-no-properties 1))
                                  (level (length m1)))
                             (if (<= level node-at-line-level)
@@ -450,7 +508,7 @@
 
             ;; First get number of top nodes
             (goto-char (point-min))
-            (while (re-search-forward node-pattern nil t)
+            (while (re-search-forward freemind-node-pattern nil t)
               (let* ((m1 (match-string-no-properties 1))
                      (level (length m1)))
                 (if (= level 1)
@@ -490,7 +548,7 @@
                 next-has-some-visible-child
                 next-children-visible)
             (while (and
-                    (re-search-forward node-pattern nil t)
+                    (re-search-forward freemind-node-pattern nil t)
                     (if node-at-line-last (<= (point) node-at-line-last) t)
                     )
               (let* ((next-m1 (match-string-no-properties 1))
@@ -499,6 +557,10 @@
                      )
                 (setq next-m2 (match-string-no-properties 2))
                 (setq next-level (length next-m1))
+                (when (> next-level current-level)
+                  (unless (= next-level (1+ current-level))
+                    (error "Next level step > +1 for node ending at line %s" (line-number-at-pos))
+                    ))
                 (setq next-children-visible
                       (not (eq 'outline
                                (get-char-property (line-end-position) 'invisible))))
@@ -506,11 +568,12 @@
                       (if next-children-visible t
                         (freemind-look-for-visible-child next-level)))
                 (when this-m2
-                  (freemind-write-node))
+                  (freemind-write-node this-m2 this-node-end))
                 (when (if (= num-top1-nodes 1) (> current-level base-level) t)
                   (while (>= current-level next-level)
                     (with-current-buffer mm-buffer
                       (insert "</node>\n")
+                      ;;(insert (format "</node>\ncurrent-level=%s, next-level%s\n" current-level next-level))
                       (setq current-level (1- current-level)))))
                 (setq this-node-end (1+ next-node-end))
                 (setq this-m2 next-m2)
@@ -527,7 +590,7 @@
               (setq next-node-start (if node-at-line-last
                                         (1+ node-at-line-last)
                                       (point-max)))
-              (freemind-write-node)
+              (freemind-write-node this-m2 this-node-end)
               (with-current-buffer mm-buffer (insert "</node>\n"))
               ;)
             )
@@ -541,6 +604,83 @@
             (goto-char (point-min))
             ))))))
 
+(defun freemind-get-node-style (node-name)
+  "NOT READY YET."
+  ;;<node BACKGROUND_COLOR="#eeee00" CREATED="1234668815593" MODIFIED="1234668815593" STYLE="bubble">
+  ;;<font BOLD="true" NAME="SansSerif" SIZE="12"/>
+  (let (node-styles
+        node-style)
+    (dolist (style-list freemind-node-style)
+      (let ((node-regexp (car style-list)))
+        (message "node-regexp=%s node-name=%s" node-regexp node-name)
+        (when (string-match-p node-regexp node-name)
+          ;;(setq node-style (freemind-do-apply-node-style style-list))
+          (setq node-style (cadr style-list))
+          (when node-style
+            (message "node-style=%s" node-style)
+            (setq node-styles (append node-styles node-style)))
+          )))))
+
+(defun freemind-do-apply-node-style (style-list)
+  (message "style-list=%S" style-list)
+  (let ((node-style 'fork)
+        (color "red")
+        (background-color "yellow")
+        (edge-color "green")
+        (edge-style 'bezier)
+        (edge-width 'thin)
+        (italic t)
+        (bold t)
+        (font-name "SansSerif")
+        (font-size 12))
+    (dolist (style (cadr style-list))
+      (message "    style=%s" style)
+      (let ((what (car style)))
+        (cond
+         ((eq what 'node-style)
+          (setq node-style (cadr style)))
+         ((eq what 'color)
+          (setq color (cadr style)))
+         ((eq what 'background-color)
+          (setq background-color (cadr style)))
+
+         ((eq what 'edge-color)
+          (setq edge-color (cadr style)))
+
+         ((eq what 'edge-style)
+          (setq edge-style (cadr style)))
+
+         ((eq what 'edge-width)
+          (setq edge-width (cadr style)))
+
+         ((eq what 'italic)
+          (setq italic (cadr style)))
+
+         ((eq what 'bold)
+          (setq bold (cadr style)))
+
+         ((eq what 'font-name)
+          (setq font-name (cadr style)))
+
+         ((eq what 'font-size)
+          (setq font-size (cadr style)))
+         )
+        (insert (format " style=\"%s\"" node-style))
+        (insert (format " color=\"%s\"" color))
+        (insert (format " background_color=\"%s\"" background-color))
+        (insert ">\n")
+        (insert "<edge")
+        (insert (format " color=\"%s\"" edge-color))
+        (insert (format " style=\"%s\"" edge-style))
+        (insert (format " width=\"%s\"" edge-width))
+        (insert "/>\n")
+        (insert "<font")
+        (insert (format " italic=\"%s\"" italic))
+        (insert (format " bold=\"%s\"" bold))
+        (insert (format " name=\"%s\"" font-name))
+        (insert (format " size=\"%s\"" font-size))
+        ))))
+
 ;;;###autoload
 (defun freemind-from-org-mode-node (node-line mm-file)
   "Convert node at line NODE-LINE to the FreeMind file MM-FILE."
@@ -820,7 +960,8 @@ PATH should be a list of steps, where each step has the form
            (insert (make-string (- level skip-levels) ?*) " " text "\n")
            ))))
     (dolist (child children)
-      (unless (stringp child)
+      (unless (or (null child)
+                  (stringp child))
         (freemind-node-to-org child (1+ level) skip-levels)))))
 
 ;; Fix-me: put back special things, like drawers that are stored in
@@ -848,8 +989,10 @@ PATH should be a list of steps, where each step has the form
                   0)))
           (with-current-buffer org-buffer
             (erase-buffer)
-            (freemind-node-to-org top-node 1 skip-levels))
-          (org-set-tags t t) ;; Align all tags
+            (freemind-node-to-org top-node 1 skip-levels)
+            (goto-char (point-min))
+            (org-set-tags t t) ;; Align all tags
+            )
           (switch-to-buffer-other-window org-buffer)
           )))))
 
diff --git a/elpa-to-submit/nxhtml/util/from-osxkeys.el b/elpa-to-submit/nxhtml/util/from-osxkeys.el
deleted file mode 100644
index 0fc04f9c65..0000000000
--- a/elpa-to-submit/nxhtml/util/from-osxkeys.el
+++ /dev/null
@@ -1,621 +0,0 @@
-;;; from-osxkeys.el ---
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-06-18T16:32:32+0200 Wed
-;; Version:
-;; Last-Updated:
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; This is extracted from
-;; http://article.gmane.org/gmane.emacs.devel/90861
-;; plus some additions.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-
-
-;; From: David Reitter <david.reitter <at> gmail.com>
-;; Subject: Re: longlines-mode
-;; Newsgroups: gmane.emacs.devel
-;; Date: 2008-02-29 10:47:40 GMT (15 weeks, 4 days, 20 hours and 13 minutes ago)
-
-;; On 28 Feb 2008, at 16:47, Stefan Monnier wrote:
-;; >>
-;; >> We have been using different code for these that does the right
-;; >> thing. This was necessary primarily because of variable width
-;; >> fonts. <down> is bound to visual-line-down', which moves point to
-;; >> the next visual line and to the column that is closest on the screen
-;; >> (pixel  wise), minimizing horizontal offset (in pixels). Other
-;; >> functions provided are beginning-of-visual-line',
-;; >> `end-of-visual-line', `kill-  visual-line', `kill-whole-visual-line'.
-;; >
-;; > Could you show us the corresponding code?
-
-;; The code is below. This is straight out of Aquamacs (osxkeys.el) and
-;; may or may not run as is.
-
-;; Note that `visual-line-up' and friends use two different methods to
-;; figure out the best position to move to because of a slowness with
-;; outline-(minor-)mode. One of the methods (basically binary search) is
-;; much faster when a lot of hidden text is present, but a bit slower in
-;; all other cases.
-
-;; We have `visual-line-down' bound to <down> (and so forth), with
-;; special cases for minibuffers.
-
-;; N.B. I do not take comments about non-conforming code formatting etc.
-;; at this point.
-
-(defun visual-col-at-point ()
-  (- (point)
-     (save-excursion
-       (vertical-motion 0)
-       (point))))
-;; seems slower (in situations with very long lines)
-;;(or (car (nth 6 (posn-at-point))) 0))
-
-(defun visual-pixel-col-at-point ()
-  (or
-   (car-safe (pos-visible-in-window-p (point) nil 'partial))
-   0))
-
-(defvar visual-movement-temporary-goal-column nil)
-(make-variable-buffer-local 'visual-movement-temporary-goal-column)
-
-(defvar visual-previous-scroll-margin 'none)
-(defun visual-restore-scroll-margin ()
-  (if (integerp visual-previous-scroll-margin)
-      (setq scroll-margin visual-previous-scroll-margin))
-  (remove-hook 'pre-command-hook 'visual-restore-scroll-margin))
-
-(defcustom visual-scroll-margin nil
-  "Number of lines of margin at top and bottom of a window.
-For visual scrolling with up and down keys, this value
-applies instead of `scroll-margin' if it is non-nil.
-
-The reason this variable exists is that clicks in the first and last
-line of a window will set the cursor within the standard scroll-margin,
-causing the buffer to scroll immediately. This is usually undesired.
-In this case, set `scroll-margin' to zero and `visual-scroll-margin'
-to the desired margin."
-  :group 'Aquamacs)
-
-;; (setq scroll-margin 0)
-;; (setq visual-scroll-margin 5)
-(defun visual-line-up (num-lines)
-  "Move cursor vertically up NUM-LINES lines.
-Interactively, vscroll tall lines if `auto-window-vscroll' is
-enabled.  If there is no character in the target line exactly
-over the current horizontal pixel position, the cursor is
-positioned close to the character in that line at the same position,
-or at the end of the line if it is not long enough.
-
-The command C-x C-n can be used to create
-a semipermanent goal column for this command.
-Then instead of trying to move exactly vertically (or as close as
-possible),
-this command moves to the specified goal column (or as close as
-possible).
-The goal column is stored in the variable `goal-column', which is nil
-when there is no goal column.
-
-This function differs from `previous-line' as it moves vertically
-in the visual sense. The result differs when variable-width font is
-used or when characters of non-standard width (e.g. TABs) are used.
-
-If you are thinking of using this in a Lisp program, consider using
-`forward-line' with a negative argument instead.  It is usually easier
-to use and more reliable (no dependence on goal column, etc.)."
-  (interactive "p")
-  (if (bobp) (signal 'beginning-of-buffer nil))
-  (let ((pixel-col (visual-pixel-col-at-point))
-	(visual-col (visual-col-at-point))
-	(old-point (point))
-	(end-of-old-line))
-
-    ;; temporary binding of scroll-margin
-    ;; cannot do this with a temporary let binding
-    (setq visual-previous-scroll-margin scroll-margin)
-    (if visual-scroll-margin
-	(setq scroll-margin visual-scroll-margin))
-    (add-hook 'pre-command-hook 'visual-restore-scroll-margin)
-
-    (save-excursion
-      (vertical-motion 1)	;; trying going one down, to left
-      (setq end-of-old-line (point)))
-
-    (vertical-motion 0)
-
-    (let* ((beg-of-old-line
-            ;; move right, but not further than to end of line
-	    (prog1 (point)
-	      (vertical-motion (- num-lines))))	    ;; one up again
-	   (beg-of-new-line (point))
-	   (rel-beg-of-old-line  (- beg-of-old-line (point) 1)))
-
-      ;; handle track-eol...
-      (if (and track-eol (= old-point (1- end-of-old-line))
-	       ;; Don't count beg of empty line as end of line
-	       ;; unless we just did explicit end-of-line.
-	       (or (not (= old-point beg-of-old-line))
-		   (eq last-command 'end-of-line)))
-	  (setq visual-movement-temporary-goal-column 9999))
-
-      ;; approximate positioning
-      (if (and (or goal-column visual-movement-temporary-goal-column)
-	       (memq last-command '(visual-line-up
-				    visual-line-down
-				    osxkeys-visual-line-up-in-buffers
-				    osxkeys-visual-line-down-in-buffers))
-	       (= old-point (1- end-of-old-line)))
-	  ;; jumping from end of line
-
-          (forward-char (min (or goal-column
-                                 visual-movement-temporary-goal-column)
-                             rel-beg-of-old-line))
-	;; else, do complete positioning
-	;; save original position
-	(setq visual-movement-temporary-goal-column visual-col)
-                                        ;	(forward-char (min visual-col rel-beg-of-old-line))
-
-	;; this won't work because we don't have the
-	;; absolute position, just the position within window
-	;; (let ((p (pos-visible-in-window-p old-point nil 'p))
-        ;; 	      (p2 (pos-visible-in-window-p beg-of-new-line nil 'p) ))
-        ;; 	  (print (cons (car p) (cdr p2)))
-        ;; 	  (posn-set-point (cons (car p) (cdr p2)))
-        ;; 	  )
-	(if (> (abs (- (point) beg-of-old-line)) 400)
-	    ;; aq-find-position-at-pixel-col is much faster when
-	    ;; large portions of hidden text are to be crossed.
-	    ;; this can happen in outline-(minor-)mode for instance.
-	    (goto-char (aq-find-position-at-pixel-col  pixel-col))
-	  ;; approximate positioning
-	  (forward-char (min visual-col rel-beg-of-old-line))
-	  (if (>= (visual-pixel-col-at-point) pixel-col)
-	      (progn
-		(while (and
-			(> (visual-pixel-col-at-point) pixel-col)
-			(> (point) beg-of-new-line)) ;; do not cross line
-		  (forward-char -1)))
-	    (progn
-	      (while (and
-		      (< (visual-pixel-col-at-point) pixel-col)
-		      (< (point) (1- beg-of-old-line))) ;; do not cross line
-		(forward-char +1)))))
-
-	))))
-
-(defun visual-line-down (num-lines)
-  "Move cursor vertically down NUM-LINES lines.
-Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
-If there is no character in the target line exactly under the current
-column,
-the cursor is positioned after the character in that line which spans
-this
-column, or at the end of the line if it is not long enough.
-If there is no line in the buffer after this one, behavior depends on
-the
-value of `next-line-add-newlines'.  If non-nil, it inserts a newline
-character
-to create a line, and moves the cursor to that line.  Otherwise it
-moves the
-cursor to the end of the buffer.
-
-The command C-x C-n can be used to create
-a semipermanent goal column for this command.
-Then instead of trying to move exactly vertically (or as close as
-possible),
-this command moves to the specified goal column (or as close as
-possible).
-The goal column is stored in the variable `goal-column', which is nil
-when there is no goal column.
-
-This function differs from `next-line' as it moves vertically
-in the visual sense. The result differs when variable-width font is
-used or when characters of non-standard width (e.g. TABs) are used.
-
-If you are thinking of using this in a Lisp program, consider
-using `forward-line' instead.  It is usually easier to use
-and more reliable (no dependence on goal column, etc.)."
-  (interactive "p")
-
-  (if (and next-line-add-newlines (= num-lines 1))
-      (if (save-excursion (end-of-line) (eobp))
-          ;; When adding a newline, don't expand an abbrev.
-          (let ((abbrev-mode nil))
-            (end-of-line)
-            (insert hard-newline)))
-    (if (eobp) (signal 'end-of-buffer nil)))
-  (let ((pixel-col (visual-pixel-col-at-point))
-	(visual-col (visual-col-at-point))
-	(old-point (point))
-	(beg-of-line)
-	(next-line-start)
-	(rel-next-line-start))
-
-    ;; temporary binding of scroll-margin
-    ;; cannot do this with a temporary let binding
-    (setq visual-previous-scroll-margin scroll-margin)
-    (if visual-scroll-margin
-	(setq scroll-margin visual-scroll-margin))
-    (add-hook 'pre-command-hook 'visual-restore-scroll-margin)
-
-    (vertical-motion num-lines) ;; down
-    (save-excursion
-      (setq beg-of-line (point))
-      (vertical-motion +1) ;; down
-      (setq next-line-start (point))
-      (setq rel-next-line-start  (- (point) beg-of-line 1)))
-    (unless (= beg-of-line (point-max))
-      ;; handle track-eol...
-      (if (and track-eol (= old-point (1- next-line-start))
-	       ;; Don't count beg of empty line as end of line
-	       ;; unless we just did explicit end-of-line.
-	       (or (not (= 0 visual-col))
-		   (eq last-command 'end-of-line)))
-	  (setq visual-movement-temporary-goal-column 9999))
-      ;; approximate positioning
-      (if (and (or goal-column visual-movement-temporary-goal-column)
-               (memq last-command '(visual-line-up
-                                    visual-line-down
-                                    osxkeys-visual-line-up-in-buffers
-                                    osxkeys-visual-line-down-in-buffers))
-               (= old-point (- beg-of-line 1))) ;; jumping from end of line
-
-          (forward-char (min (or goal-column
-                                 visual-movement-temporary-goal-column)
-                             rel-next-line-start))
-        ;; else, do complete positioning
-        ;; save original position
-        (setq visual-movement-temporary-goal-column visual-col)
-        ;; aq-find-position-at-pixel-col is much faster when
-        ;; large portions of hidden text are to be crossed.
-        ;; this can happen in outline-(minor-)mode for instance.
-        (if (> (abs (- old-point next-line-start)) 400)
-            (goto-char (aq-find-position-at-pixel-col  pixel-col))
-          (forward-char (min visual-col rel-next-line-start))
-          (if (> (visual-pixel-col-at-point) pixel-col)
-              (progn
-                (while (and
-                        (> (visual-pixel-col-at-point) pixel-col)
-                        (> (point) beg-of-line)) ;; do not cross line
-                  (forward-char -1)))
-            (progn
-              (while (and
-                      (< (visual-pixel-col-at-point) pixel-col)
-                      (< (point) (1- next-line-start))) ;; do not cross line
-                (forward-char +1)))))))))
-
-(defun aq-find-position-at-pixel-col  (pixel-col)
-
-  (let ((beg-of-line) (end-of-line))
-    (vertical-motion 1)	;; trying going one down, to left
-    (setq end-of-line (point))
-    (if (eq (point) (point-max)) (vertical-motion 0) (vertical-motion
-                                                      -1))
-    (setq beg-of-line (point))
-
-    (let ((op (point)))
-					; move to beg of line
-      (vertical-motion 0) ;; trying going one down, to left
-      (forward-char (/ pixel-col (frame-char-width)))
-
-      (aq-find-position-at-pixel-col-recursive
-       beg-of-line end-of-line pixel-col)
-
-      (let* ((nearest-pos (point))
-	     (smallest-distance
-	      (abs (- pixel-col (visual-pixel-col-at-point)))))
-
-	(let ((pdif (abs (- pixel-col
-			    (progn (forward-char -1)
-				   (visual-pixel-col-at-point))))))
-	  (when (< pdif smallest-distance)
-	    (setq nearest-pos (point))
-	    (setq smallest-distance pdif)))
-
-	(let ((pdif (abs (- pixel-col
-			    (progn (forward-char 2)
-				   (visual-pixel-col-at-point))))))
-	  (when (< pdif smallest-distance)
-	    (setq nearest-pos (point))
-	    (setq smallest-distance pdif)))
-	(goto-char nearest-pos))
-
-      (point))))
-
-(defun aq-find-position-at-pixel-col-recursive
-  (beg-of-line end-of-line pixel-col)
-                                        ; set it in the middle
-
-  (if (eq beg-of-line end-of-line)
-      (point)
-
-    (let ((middle (+ beg-of-line (round (/ (- end-of-line beg-of-line)
-                                           2)))))
-      (if (or
-           (eq middle (point)) ;; wouldn't change point any more
-           (eq (visual-pixel-col-at-point) pixel-col))
-          (point)
-                                        ;(incf steps)
-        (goto-char middle)
-        (if (> (visual-pixel-col-at-point) pixel-col)
-            (aq-find-position-at-pixel-col-recursive
-             beg-of-line (point) pixel-col)
-          (aq-find-position-at-pixel-col-recursive
-           (point) end-of-line pixel-col))))))
-
-
-(defun beginning-of-visual-line ()
-  (interactive)
-  (if (bobp)
-      (signal 'beginning-of-buffer nil))
-  (vertical-motion 0))
-
-(defun end-of-visual-line ()
-  (interactive)
-  (if (eobp)
-      (signal 'end-of-buffer nil))
-  (let ((end-of-line (line-end-position)))
-    (vertical-motion 1)
-    (unless (or (eobp)
-                ;;(< (point) end-of-line) ;; jumping over wrapped text
-                )
-      (backward-char 1))))
-
-;; this code based on simple.el
-(defun kill-visual-line (&optional arg)
-  "Kill the rest of the visual line; if no nonblanks there, kill thru
-newline.
-With prefix argument, kill that many lines from point.
-Negative arguments kill lines backward.
-With zero argument, kills the text before point on hthe current line.
-
-When calling from a program, nil means \"no arg\",
-a number counts as a prefix arg.
-
-To kill a whole line, when point is not at the beginning, type \
-\\[beginning-of-line] \\[kill-line] \\[kill-line].
-
-If `kill-whole-line' is non-nil, then this command kills the whole line
-including its terminating newline, when used at the beginning of a line
-with no argument.  As a consequence, you can always kill a whole line
-by typing \\[beginning-of-line] \\[kill-line].
-
-If you want to append the killed line to the last killed text,
-use \\[append-next-kill] before \\[kill-line].
-
-If the buffer is read-only, Emacs will beep and refrain from deleting
-the line, but put the line in the kill ring anyway.  This means that
-you can use this command to copy text from a read-only buffer.
-\(If the variable `kill-read-only-ok' is non-nil, then this won't
-even beep.)"
-  (interactive "P")
-  (kill-region (point)
-	       ;; It is better to move point to the other end of the kill
-	       ;; before killing.  That way, in a read-only buffer, point
-	       ;; moves across the text that is copied to the kill ring.
-	       ;; The choice has no effect on undo now that undo records
-	       ;; the value of point from before the command was run.
-	       (progn
-		 (if arg
-		     (vertical-motion (prefix-numeric-value arg))
-		   (if (eobp)
-		       (signal 'end-of-buffer nil))
-		   (let ((end
-			  (save-excursion
-			    (end-of-visual-line) (point))))
-		     (if (or (save-excursion
-			       ;; If trailing whitespace is visible,
-			       ;; don't treat it as nothing.
-			       (unless show-trailing-whitespace
-				 (skip-chars-forward " \t" end))
-			       (= (point) end))
-			     (and kill-whole-line (bolp)))
-			 (visual-line-down 1)
-		       (goto-char end))))
-		 (point))))
-
-(defun kill-whole-visual-line (&optional arg)
-  "Kill current visual line.
-With prefix arg, kill that many lines starting from the current line.
-If arg is negative, kill backward.  Also kill the preceding newline.
-\(This is meant to make \\[repeat] work well with negative arguments.\)
-If arg is zero, kill current line but exclude the trailing newline."
-  (interactive "p")
-  (if (and (> arg 0) (eobp) (save-excursion (vertical-motion 0) (eobp)))
-      (signal 'end-of-buffer nil))
-  (if (and (< arg 0) (bobp) (save-excursion (vertical-motion 1) (bobp)))
-      (signal 'beginning-of-buffer nil))
-  (unless (eq last-command 'kill-region)
-    (kill-new "")
-    (setq last-command 'kill-region))
-  (cond ((zerop arg)
-	 ;; We need to kill in two steps, because the previous command
-	 ;; could have been a kill command, in which case the text
-	 ;; before point needs to be prepended to the current kill
-	 ;; ring entry and the text after point appended.  Also, we
-	 ;; need to use save-excursion to avoid copying the same text
-	 ;; twice to the kill ring in read-only buffers.
-	 (save-excursion
-	   ;; delete in one go
-	   (kill-region (progn (vertical-motion 0) (point))
-			(progn (vertical-motion 1) (point)))
-           ))
-	((< arg 0)
-	 (save-excursion
-	   (kill-region (point) (progn (end-of-visual-line) (point))))
-	 (kill-region (point)
-		      (progn (vertical-motion (1+ arg))
-			     (unless (bobp) (backward-char))
-			     (point))))
-	(t
-	 (save-excursion
-	   (kill-region (progn (vertical-motion 0) (point))
-			(progn (vertical-motion arg) (point)))))))
-
-(defun osxkeys-visual-line-up-in-buffers ()
-  "Moves the cursor up one (visual) line.
-If the `up' key would normally be bound to something else than
-`previous-line' (as it is the case in minibuffers), the other binding
-is called."
-  (interactive)
-  (let* (osx-key-mode  ;; turn off mode temporarily
-	 (binding (key-binding [up])))
-    (if (eq binding 'previous-line)
-	(call-interactively (function visual-line-up))
-      (call-interactively binding))))
-
-(defun osxkeys-visual-line-down-in-buffers ()
-  "Moves the cursor down one (visual) line.
-If the `down' key would normally be bound to something else than
-`next-line' (as it is the case in minibuffers), the other binding
-is called."
-  (interactive)
-  (let* (osx-key-mode  ;; turn off mode temporarily
-	 (binding (key-binding [down])))
-    (if (eq binding 'next-line)
-	(call-interactively (function visual-line-down))
-      (call-interactively binding))))
-
-;; mark functions for CUA
-(dolist (cmd
-	 '( beginning-of-visual-line
-	    end-of-visual-line
-	    visual-line-down visual-line-up
-	    osxkeys-visual-line-up-in-buffers
-	    osxkeys-visual-line-down-in-buffers
-            smart-move-beginning
-            smart-move-end))
-  (put cmd 'CUA 'move))
-
-(defalias 'original-kill-line 'kill-line "test")
-
-(defun smart-move-beginning (arg)
-  (interactive "p")
-  (if (or (null arg) (/= arg 1))
-      (if visual-line-mode
-          (progn
-            (visual-line-up (1- arg))
-            (beginning-of-visual-line))
-        (call-interactively 'move-beginning-of-line arg))
-    (let ((here (point)))
-      (if visual-line-mode
-          (beginning-of-visual-line)
-        (move-beginning-of-line))
-      (when (= here (point))
-        (if (= here (line-beginning-position))
-            (skip-chars-forward " \t")
-          (backward-char 1)
-          (beginning-of-visual-line))))))
-
-(defun smart-move-end (arg)
-  (interactive "p")
-  (if (or (null arg) (/= arg 1))
-      (if visual-line-mode
-          (progn
-            (visual-line-down (1- arg))
-            (beginning-of-visual-line))
-        (call-interactively 'move-end-of-line arg))
-    (let ((here (point)))
-      (if visual-line-mode
-          (end-of-visual-line)
-        (move-end-of-line))
-      (when (= here (point))
-        (if (= here (line-end-position))
-            (skip-chars-backward " \t")
-          (forward-char 1)
-          (end-of-visual-line))))))
-
-(defvar visual-line-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [remap next-line] 'visual-line-down)
-    (define-key map [remap previous-line] 'visual-line-up)
-    (define-key map [remap kill-line] 'kill-visual-line)
-    (define-key map [(control shift ?k)] 'original-kill-line)
-    (define-key map [home] 'smart-move-beginning)
-    (define-key map [end]  'smart-move-end)
-    map))
-
-(define-minor-mode visual-line-mode
-  "Define key binding for visual line moves."
-  :keymap visual-line-map
-  :group 'convenience)
-
-(defun maybe-turn-on-visual-line-mode ()
-  (visual-line-mode 1))
-
-(define-globalized-minor-mode global-visual-line-mode
-  visual-line-mode maybe-turn-on-visual-line-mode
-  :lighter " vl")
-
-(provide 'from-osxkeys)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; from-osxkeys.el ends here
-
-;;(defalias 'original-next-line 'next-line "test")
-;;(defalias 'original-previous-line 'previous-line "test")
-;;
-;; (defun line-is-wrapped ()
-;;   (let ((here (point))
-;;         res)
-;;     (vertical-motion 0)
-;;     (setq res (/= (line-beginning-position) (point)))
-;;     (unless res
-;;       (let ((line-end-pos (line-end-position)))
-;;         (vertical-motion 1)
-;;         (setq res (/= line-end-pos (- (point) 1)))))
-;;     (goto-char here)
-;;     res))
-
-;; (defun next-wrapped-line-or-paragraph (&optional arg try-vscroll)
-;;   (interactive)
-;;   (let ((bpos (line-beginning-position)))
-;;     (visual-line-down 1)
-;;     (if (= bpos (line-beginning-position))
-;;         (next-line arg try-vscroll)
-;;       (forward-paragraph arg))))
-
-;; (defun previous-wrapped-line-or-paragraph (&optional arg try-vscroll)
-;;   (interactive)
-;;   (let ((bpos (line-beginning-position)))
-;;     (visual-line-up 1)
-;;     (if (= bpos (line-beginning-position))
-;;         (previous-line arg try-vscroll)
-;;       (backward-paragraph arg))))
-
diff --git a/elpa-to-submit/nxhtml/util/gpl.el b/elpa-to-submit/nxhtml/util/gpl.el
new file mode 100644
index 0000000000..a1095552c6
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/gpl.el
@@ -0,0 +1,213 @@
+;;; gpl.el --- Highlight and edit gpl color palettes
+
+(defconst gpl:version "0.01")
+;; Copyright (C) 2008  Niels Giesen
+
+;; Author: Niels Giesen
+;; Keywords: extensions, tools
+
+;; This program 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 3 of the License, or
+;; (at your option) any later version.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; GPL provides font-locking and has functions to edit the values
+;; of colors (hue, saturation value, red, green and blue vals)
+;; in-place in a simple, intuitive, and lightweight fashion. See the
+;; documentation of `gpl-mode'.
+
+;; The methods and keybindings used are roughly the same as in the new
+;; css-color mode. I should maybe have abstracted both color notation
+;; models better, but did not feel like it. With under 200 lines of
+;; code, it did not seem worth the effort.
+
+;; The css-color.el used is the one by Niels Giesen, at
+;; `http://niels.kicks-ass.org/public/elisp/css-color.el'.
+
+;; Installation:
+
+;; Put this file in your load-path. Put a declaration such as
+
+;; (autoload 'gpl-mode "gpl")
+;; (add-to-list 'auto-mode-alist
+;; 	     '("\\.gpl\\'" . gpl-mode))
+
+;; In your initialization file (e.g. ~/.emacs) to make sure `gpl-mode'
+;; is started anytime you open a *.gpl file, and gpl-mode is only
+;; loaded when needed.
+
+;;; Code:
+(require 'css-color)
+
+(defvar gpl-keywords
+  '(("^[[:space:]]*\\([a-fA-F[:digit:]]\\{1,3\\}\\)[[:space:]]+\\([a-fA-F[:digit:]]\\{1,3\\}\\)[[:space:]]+\\([a-fA-F[:digit:]]\\{1,3\\}\\)"
+     (0
+      (let ((color (concat "#" (apply 'css-color-rgb-to-hex
+				      (mapcar 'string-to-number
+					      (list
+					       (match-string-no-properties 1)
+					       (match-string-no-properties 2)
+					       (match-string-no-properties 3)))))))
+
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'keymap gpl-map)
+	(put-text-property (match-beginning 0)
+			   (match-end 0)
+			   'face (list :background
+				       color
+				       :foreground
+				       (css-color-foreground-color
+					color))))))))
+
+;;;###autoload
+(define-derived-mode gpl-mode fundamental-mode "GPL"
+  "Mode for font-locking and editing color palettes of the GPL format.
+
+Such palettes are used and produced by free software applications
+such as the GIMP, Inkscape, Scribus, Agave and on-line tools such
+as http://colourlovers.com.
+
+You can also use
+URL `http://niels.kicks-ass.org/public/elisp/css-palette.el' to import
+such palette into a css-file as hexadecimal color palette."
+  (setq font-lock-defaults
+	'((gpl-keywords)
+	  t)))
+
+(defvar gpl-map
+  (let ((m (make-sparse-keymap)))
+    (define-key m "=" 'gpl-up)
+    (define-key m "-" 'gpl-down)
+    (define-key m "h" 'gpl-hue-up)
+    (define-key m "H" 'gpl-hue-down)
+    (define-key m "v" 'gpl-value-up)
+    (define-key m "V" 'gpl-value-down)
+    (define-key m "s" 'gpl-saturation-up)
+    (define-key m "S" 'gpl-saturation-down)
+    m)
+  "Mode map for `gpl-mode'")
+
+(defun gpl-get-color-at-point ()
+  (or (get-text-property (point) 'color)
+      (apply 'css-color-rgb-to-hsv
+	     (gpl-get-rgb-list-at-point))))
+
+(defun gpl-get-rgb-list-at-point ()
+  (mapcar 'string-to-number
+	  (split-string
+	   (buffer-substring-no-properties
+	    (point-at-bol)
+	    (+ 11 (point-at-bol))) "[[:space:]]+" t)))
+
+(defun gpl-replcolor-at-p (fun increment)
+  (let ((pos (point)))
+    (beginning-of-line)
+    (insert
+     (funcall fun
+	      (gpl-get-color-at-point)
+	      increment))
+    (delete-region (point) (+ (point) 11))
+    (goto-char pos)))
+
+(defun gpl-hsv-to-gimp-color (h s v)
+  (propertize
+   (apply 'format "%3d %3d %3d"
+	  (css-color-hsv-to-rgb h s v))
+   'keymap gpl-map
+   'color (list h s v)))
+
+(defun gpl-what-channel ()
+  (/ (- (point) (point-at-bol)) 4))
+
+(defun gpl-adjust-channel-at-p (incr)
+  (interactive "p")
+  (let ((pos (point))
+	(channel (gpl-what-channel)))
+    (beginning-of-line)
+    (let ((rgb
+	   (gpl-get-rgb-list-at-point)))
+      (setf (nth channel rgb)
+	    (css-color-within-bounds
+	     (+ incr (nth channel rgb))
+	     0 255))
+      (delete-region (point) (+ 11 (point)))
+      (insert
+       (propertize
+	(apply 'format "%3d %3d %3d" rgb)
+	'keymap gpl-map
+	'color nil)))
+    (goto-char pos)))
+
+(defun gpl-inchue (color incr)
+  (destructuring-bind (h s v) color
+    (gpl-hsv-to-gimp-color
+     (+ incr h) s v)))
+
+(defun gpl-incsat (color incr)
+  (destructuring-bind (h s v) color
+    (gpl-hsv-to-gimp-color
+      h (css-color-within-bounds (+ incr s) 0 100) v)))
+
+(defun gpl-incval (color incr)
+  (destructuring-bind (h s v) color
+    (gpl-hsv-to-gimp-color
+     h s (css-color-within-bounds (+ incr v) 0 100))))
+
+(defun gpl-adj-hue-at-p (increment)
+  (interactive "p")
+  (gpl-replcolor-at-p 'gpl-inchue increment))
+
+(defun gpl-adj-saturation-at-p (increment)
+  (interactive "p")
+  (gpl-replcolor-at-p 'gpl-incsat increment))
+
+(defun gpl-adj-value-at-p (increment)
+  (interactive "p")
+  (gpl-replcolor-at-p 'gpl-incval increment))
+
+;; channels (r, g, b)
+(defun gpl-up (val)
+  (interactive "p")
+  (gpl-adjust-channel-at-p val))
+
+(defun gpl-down (val)
+  (interactive "p")
+  (gpl-adjust-channel-at-p (- val)))
+;; hue
+(defun gpl-hue-up (val)
+  (interactive "p")
+  (gpl-adj-hue-at-p val))
+
+(defun gpl-hue-down (val)
+  (interactive "p")
+  (gpl-adj-hue-at-p (- val)))
+;; saturation
+(defun gpl-saturation-up (val)
+  (interactive "p")
+  (gpl-adj-saturation-at-p val))
+
+(defun gpl-saturation-down (val)
+  (interactive "p")
+  (gpl-adj-saturation-at-p (- val)))
+;; value
+(defun gpl-value-up (val)
+  (interactive "p")
+  (gpl-adj-value-at-p val))
+
+(defun gpl-value-down (val)
+  (interactive "p")
+  (gpl-adj-value-at-p (- val)))
+
+(provide 'gpl)
+;;; gpl.el ends here
diff --git a/elpa-to-submit/nxhtml/util/half-qwerty.el b/elpa-to-submit/nxhtml/util/half-qwerty.el
deleted file mode 100644
index 9db90d6c17..0000000000
--- a/elpa-to-submit/nxhtml/util/half-qwerty.el
+++ /dev/null
@@ -1,193 +0,0 @@
-;;; half-qwerty.el --- Using half keyboard to type
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-09-29T19:42:09+0200 Mon
-;; Version:
-;; Last-Updated:
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Support for typing with one hand in Emacs using ideas from
-;;
-;;    http://half-qwerty.com/demo/
-;;
-;; This was written after a request from Corey Foote
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(defcustom half-qwerty-langs
-  '("SE")
-  "doc"
-  :type '(repeat (string :tag "Language"))
-  :group 'half-qwerty)
-
-(defcustom half-qwerty-hand 'left-hand
-  "doc"
-  :type '(choice (const left-hand)
-                 (const right-hand))
-  :group 'half-qwerty)
-
-(defcustom half-qwerty-keypairs
-  '(
-    ("SE"
-     (;; First row
-      (?t ?y)
-      (?r ?u)
-      (?e ?i)
-      (?w ?o)
-      (?q ?p)
-      ;; Right side leftovers in first
-      ;;([(control ?\ ) ?a ?q] ?Ã¥)
-      ;;([(control ?\ ) ?c ?c] ?:)
-      ([(control ?\ ) ?v] ?^)
-      ([(control ?\ ) ?s] ?~)
-      ([(control ?\ ) ?w] ?¨)
-
-      ;; Second row
-      (?g ?h)
-      (?f ?j)
-      (?d ?k)
-      (?s ?l)
-      (?a ?ö)
-      ;; Right side leftovers in second
-      ;;([(control ?\ ) ?a ?a] ?ä)
-      ([(control ?\ ) ?q] ?')
-      ([(control ?\ ) ?x] ?*)
-
-      ;; Third row
-      (?b ?n)
-      (?v ?m)
-      (?c ?,)
-      (?x ?.)
-      (?z ?-)
-      ;; Left side leftovers in third
-      (?< [(control ?\ ) ?y])
-      (?> [(control ?\ ) ?u])
-      (?| [(control ?\ ) ?l])
-
-      ;; Number row
-      (?6 ?7)
-      (?5 ?8)
-      (?4 ?9)
-      (?3 ?0)
-      (?2 ?+)
-      (?1 ?´)
-      ;; Number row shifted
-      (?& ?/)
-      (?% ?()
-      (?¤ ?))
-      (?# ?=)
-      (?\" ??)
-      (?! ?`)
-      ;; Number row AltGr
-      (?$ ?\])
-      (?£ ?\})
-      (?@ ?\\)
-      ;; Righ side leftovers for AltGr
-      ([(control ?\ ) ?4] ?\])
-      ([(control ?\ ) ?3] ?\})
-      )
-     )
-    )
-  ;;nil
-  "doc"
-  :type '(repeat (list string
-                       (repeat (list
-                                (choice character key-sequence)
-                                (choice character key-sequence)
-                                ))))
-  :group 'half-qwerty)
-
-(defvar half-qwerty-mode-map nil)
-
-(defvar half-qwerty-old-input-decode-map nil)
-
-(define-minor-mode half-qwerty-mode
-  "Typing with one hand.
-See URL `http://half-qwerty.com/demo/'.  Using this with Emacs
-you however do not need a special keyboard.
-Though we can not change for example SPACE+h directly.
-There is no support for pressing them simultaneously.
-
-Instead you have to type the after each other."
-  global t
-  :group 'half-qwerty
-  (if half-qwerty-mode
-      (progn
-        (setq half-qwerty-old-input-decode-map (copy-keymap input-decode-map))
-        (let ((map (copy-keymap input-decode-map))
-              ;;(defcustom half-qwerty-langs
-              (pairs (cadr (assoc "SE" half-qwerty-keypairs)))
-              (space-map (make-sparse-keymap))
-              (control-space-map (make-sparse-keymap))
-              )
-          (define-key map [?\ ] space-map)
-          (define-key space-map [(control ?\ )] control-space-map)
-          (dolist (pair pairs)
-            (let ((left  (nth 0 pair))
-                  (right (nth 1 pair))
-                  )
-              (if (eq half-qwerty-hand 'left-hand)
-                  (unless (vectorp right)
-                    (if (vectorp left)
-                        (define-key map left (vector right))
-                      (define-key space-map (vector left) (vector right))
-                      )))))
-          (setq input-decode-map (copy-keymap map))
-          ))
-    (setq input-decode-map (copy-keymap half-qwerty-old-input-decode-map))
-    ))
-
-;;(define-key input-decode-map (kbd ".") (kbd ":"))
-;;(define-key input-decode-map (kbd "SPC") (kbd ":"))
-;;(define-key input-decode-map [?\ ] (kbd ":"))
-;;(define-key input-decode-map (vector ?\ ) (vector ?:))
-;;(define-key input-decode-map (vector ?\ ?\ ) (vector ?\ ))
-;;(define-key input-decode-map [?\. ?\. ] (vector ?\ ))
-;;(define-key input-decode-map [?\. ?\. ] (vector ?\ ))
-;;(define-key input-decode-map [?\.] (vector ?\ ))    
-;;(define-key input-decode-map (kbd "SPC SPC") (vector ?\ ))
-;;(define-key input-decode-map (kbd "SPC a") (vector ?\ ))
-;; (defvar my-space-map (make-sparse-keymap))
-;; (define-key my-space-map [?\ ] [?\ ])
-;; (define-key my-space-map [?\:] [?\.])
-;; (define-key input-decode-map [?\:] my-space-map)
-;; (define-key input-decode-map [?\.] [?\:])
-;;(setq input-decode-map (make-sparse-keymap))
-
-(provide 'half-qwerty)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; half-qwerty.el ends here
diff --git a/elpa-to-submit/nxhtml/util/hexcolor.el b/elpa-to-submit/nxhtml/util/hexcolor.el
deleted file mode 100644
index e68df1d891..0000000000
--- a/elpa-to-submit/nxhtml/util/hexcolor.el
+++ /dev/null
@@ -1,146 +0,0 @@
-;;; hexcolor.el --- Display hex colors
-;;
-;; Author: Lennart Borgman
-;; Created: Sun Apr 30 00:19:18 2006
-(defconst hexcolor:version "0.51");; Version:
-;; Last-Updated:
-;; Keywords:
-;; Compatibility: Emacs 22
-;;
-;; Features that might be required by this library:
-;;
-;;   None
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Functions for displaying hex colors.  The minor mode part of this
-;; is mostly from hexcolour.el on EmacsWiki by Oliver Scholz.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(defun hexcolor-inverse-color (hex-color)
-  (let ((len (length hex-color))
-        rr gg bb
-        r2 g2 b2)
-    (if (< 4 len)
-        (progn
-          (setq rr (substring hex-color 1 3)
-                gg (substring hex-color 3 5)
-                bb (substring hex-color 5 7)))
-      (setq rr (substring hex-color 1 2)
-            gg (substring hex-color 2 3)
-            bb (substring hex-color 3 4))
-      (setq rr (concat rr rr))
-      (setq gg (concat gg gg))
-      (setq bb (concat bb bb)))
-    (setq r2 (- 255 (string-to-number rr 16)))
-    (setq g2 (- 255 (string-to-number gg 16)))
-    (setq b2 (- 255 (string-to-number bb 16)))
-    (let ((mm (mod (- (/ (+ r2 g2 b2)
-                         3)
-                      (/ 255 3))
-                   255)))
-      (format "#%02x%02x%02x" mm mm mm))
-    ))
-;; (hexcolor-inverse-color "#fed")
-;; (hexcolor-inverse-color "#ffeedd")
-;; (hexcolor-inverse-color "#f00")
-;; (hexcolor-inverse-color "#000")
-;; (hexcolor-inverse-color "#000000")
-;; (hexcolor-inverse-color "#ffeedd")
-
-(defvar hexcolor-keywords
-  '((
-     ;; Why does not the next line work?
-     ;;"#\\(?:[a-fA-F[:digit:]]\\{6\\}\\|[a-fA-F[:digit:]]\\{3\\}\\)[^a-fA-F[:digit:]]"
-     "#\\(?:[a-fA-F[:digit:]]\\{6\\}\\|[a-fA-F[:digit:]]\\{3\\}\\)"
-     (0 (put-text-property (match-beginning 0)
-                           (match-end 0)
-                           'face (list :background (match-string-no-properties 0)
-                                       :foreground (hexcolor-inverse-color (match-string-no-properties 0))
-                                       ;;:foreground "#ffffff"
-                                       ))))))
-;;(put 'hexcolor-keywords 'permanent-local t)
-
-(define-minor-mode hexcolor-mode
-  "Show hex color literals with the given color as background.
-In this mode hexadecimal colour specifications like #3253ff are
-displayed with the specified colour as background."
-  :initial-value nil
-;;;   (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
-;;;     (error "Can't use hexcolor-mode and mumamo together"))
-  (unless font-lock-defaults
-    (error "Can't use hexcolor-mode for this major mode"))
-  (if hexcolor-mode
-      (progn
-	(unless font-lock-mode (font-lock-mode 1))
-        ;;(font-lock-add-keywords nil hexcolor-keywords)
-        (hexcolor-font-lock-hook)
-        (add-hook 'font-lock-mode-hook 'hexcolor-font-lock-hook nil t))
-    ;;(font-lock-remove-keywords nil hexcolor-keywords)
-    (remove-hook 'font-lock-mode-hook 'hexcolor-font-lock-hook t))
-  (font-lock-fontify-buffer))
-(put 'hexcolor-mode 'permanent-local t)
-
-(defun hexcolor-font-lock-hook ()
-  "Add hexcolor pattern to font-lock's."
-  (if font-lock-mode
-      (font-lock-add-keywords nil hexcolor-keywords t)
-    (hexcolor-mode -1)))
-
-;;(add-hook 'css-mode-hook 'hexcolour-add-to-font-lock)
-;;(remove-hook 'css-mode-hook 'hexcoulour-add-to-font-lock)
-
-(defvar hexcolor-fg-history nil)
-(defvar hexcolor-bg-history nil)
-(defun hexcolor-test ()
-  "Test colors interactively.
-The colors are displayed in the echo area. You can specify the
-colors in any way Emacs knows about.  Example:
-
-  red
-  #f00
-  #0C0
-  #b0ff00
-  rgb:ff/00/00"
-  (interactive)
-  (let* ((fg-color (completing-read "Foreground color: " (defined-colors) nil nil nil nil hexcolor-fg-history))
-         (bg-color (completing-read "Background color: " (defined-colors) nil nil nil nil hexcolor-bg-history))
-         (s (concat " Foreground: " fg-color ", Background: " bg-color " ")))
-    (put-text-property 0 (length s)
-                       'face (list
-                              :foreground fg-color
-                              :background bg-color)
-                       s)
-    (message "Here are the colors: %s" s)))
-
-
-(provide 'hexcolor)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; hexcolor.el ends here
diff --git a/elpa-to-submit/nxhtml/util/hfyview.el b/elpa-to-submit/nxhtml/util/hfyview.el
index cad20c4fb7..ee0f8d0088 100644
--- a/elpa-to-submit/nxhtml/util/hfyview.el
+++ b/elpa-to-submit/nxhtml/util/hfyview.el
@@ -3,9 +3,9 @@
 ;; Copyright (C) 2005, 2006, 2007 by Lennart Borgman
 
 ;; Author: Lennart Borgman
-;; Created: Fri Oct 21 00:11:07 2005
-;; Version: 0.63
-;; Last-Updated: 2008-03-20T19:36:39+0100 Thu
+;; Created: Fri Oct 21 2005
+(defconst hfyview:version "0.63") ;; Version:
+;; Last-Updated: 2009-08-04 Tue
 ;; Keywords: printing
 ;; URL: http://OurComments.org/Emacs/DL/elisp/hfyview.el
 ;; Compatibility:
@@ -13,7 +13,7 @@
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `easymenu', `htmlfontify'.
+;; `easymenu'.
 ;;
 ;;
 ;; You can find htmlfontify.el at
@@ -73,10 +73,58 @@
 ;;
 ;;; Code:
 
-
-(require 'htmlfontify)
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'htmlfontify))
 (require 'easymenu)
 
+(defvar hfyview-selected-window)
+
+(defvar hfyview-mode-emulation-map
+  (let ((m (make-sparse-keymap)))
+    ;;(define-key m [apps] 'hfyview-frame)
+    m))
+
+;;(define-key hfyview-mode-emulation-map [apps] 'hfy-show-grabbed)
+
+(defvar hfyview-mode-emulation-maps
+  (list (cons 'hfyview-mode hfyview-mode-emulation-map)))
+
+;; Fix-me: which are needed?
+(defconst hfyview-mode-other-maps
+  '(
+    hfyview-mode-emulation-map
+    minibuffer-local-completion-map
+    minibuffer-local-filename-completion-map
+    minibuffer-local-isearch-map
+    minibuffer-local-map
+    minibuffer-local-must-match-filename-map
+    minibuffer-local-must-match-map
+    minibuffer-local-ns-map
+    viper-minibuffer-map
+    isearch-mode-map))
+
+(define-minor-mode hfyview-mode
+  "Define some useful keys for `hfyview-frame' etc.
+Put this mode in `emulation-mode-map-alists' so they can be used
+at any time."
+  :global t
+  :group 'htmlfontify
+  (if hfyview-mode
+      (progn
+        (add-hook 'pre-command-hook 'hfy-grab-minibuffer-content)
+        (add-hook 'post-command-hook 'hfy-grab-echo-content)
+        (add-to-list 'emulation-mode-map-alists 'hfyview-mode-emulation-maps)
+        (dolist (map hfyview-mode-other-maps)
+          (define-key (symbol-value map) [(apps)] 'hfyview-frame)
+          ;;(define-key (symbol-value map) [(apps)] 'hfy-show-grabbed)
+          )
+        )
+    (remove-hook 'pre-command-hook 'hfy-grab-minibuffer-content)
+    (remove-hook 'post-command-hook 'hfy-grab-echo-content)
+    (setq emulation-mode-map-alists (delq 'hfyview-mode-emulation-maps emulation-mode-map-alists))
+    (dolist (map hfyview-mode-other-maps)
+      (define-key (symbol-value map) [(apps)] nil))))
+
 (defun hfyview-fontify-region (start end)
   ;; If the last command in mumamo resulted in a change of major-mode
   ;; the big bug watcher in mumamo will get us if we do not tell that
@@ -91,11 +139,13 @@
           (htmlfontify-buffer))
       (htmlfontify-buffer))))
 
-(defun hfyview-buffer-1(start end)
+(defun hfyview-buffer-1(start end show-source)
   (let ((hbuf (hfyview-fontify-region start end)))
     (with-current-buffer hbuf
       (setq buffer-file-name nil)
-      (browse-url-of-buffer))))
+      (browse-url-of-buffer))
+    (when show-source (switch-to-buffer-other-window hbuf))
+    hbuf))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -154,24 +204,49 @@ the Quick Print entry."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;; Interactive commands
 
-(defun hfyview-buffer (&optional region-only)
-  "Convert buffer to html preserving faces and show in web browser."
-  (interactive)
-  (hfyview-buffer-1 nil nil))
+;;;###autoload
+(defun hfyview-buffer (arg)
+  "Convert buffer to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window."
+  (interactive "P")
+  (hfyview-buffer-1 nil nil arg))
+
+;;;###autoload
+(defun hfyview-region (arg)
+  "Convert region to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window."
+  (interactive "P")
+  (hfyview-buffer-1 (region-beginning) (region-end) arg))
+
+;;;###autoload
+(defun hfyview-window (arg)
+  "Convert window to html preserving faces and show in web browser.
+With command prefix also show created HTML source in other window."
+  (interactive "P")
+  (hfyview-buffer-1 (window-start) (window-end) arg))
+
+;;;###autoload
+(defun hfyview-frame (whole-buffers)
+  "Convert frame to html preserving faces and show in web browser.
+Make an XHTML view of the current Emacs frame. Put it in a buffer
+named *hfyview-frame* and show that buffer in a web browser.
 
-(defun hfyview-region ()
-  "Convert region to html preserving faces and show in web browser."
-  (interactive)
-  (hfyview-buffer-1 (region-beginning) (region-end)))
+If WHOLE-BUFFERS is non-nil then the whole content of the buffers
+is shown in the XHTML page, otherwise just the part that is
+visible currently on the frame.
 
-(defun hfyview-window ()
-  "Convert window to html preserving faces and show in web browser."
-  (interactive)
-  (hfyview-buffer-1 (window-start) (window-end)))
+With command prefix also show created HTML source in other window."
+  (interactive (list (y-or-n-p "Enter y for whole buffers, n for only visible part: ")))
+  (let ((title "Emacs - Frame Dump")
+        buf)
+    (setq title (frame-parameter (selected-frame) 'name))
+    (setq buf (hfyview-frame-1 whole-buffers title))
+    (when current-prefix-arg
+      (switch-to-buffer-other-window buf))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;; Interactive commands
+;;;;;; Internal commands
 
 (defconst hfyview-modline-format
   ;; There seems to be a bug in Firefox that prevents this from
@@ -386,6 +461,10 @@ body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 50
   (or (hfy-triplet "SystemActiveTitle")
       (hfy-triplet "blue")))
 
+(defvar hfy-grabbed-echo-content nil)
+(defvar hfy-grabbed-minibuffer-content nil)
+(defvar hfyview-prompt-face nil)
+
 (defun hfyview-frame-minibuff (use-grabbed)
   (if (and use-grabbed
            (or hfy-grabbed-echo-content
@@ -420,8 +499,8 @@ body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 50
           (setq bdy-end (point))
           (list (buffer-substring css-start css-end)
                 (buffer-substring bdy-start bdy-end))))
-    (let ((mini-bg (face-attribute prompt-face :background))
-          (mini-fg (face-attribute prompt-face :foreground)))
+    (let ((mini-bg (face-attribute hfyview-prompt-face :background))
+          (mini-fg (face-attribute hfyview-prompt-face :foreground)))
       (if (eq mini-fg 'unspecified)
           (setq mini-fg "")
         (setq mini-fg (concat "color:" (hfy-triplet mini-fg) "; ")))
@@ -450,13 +529,15 @@ body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 50
          html
          css
          ;; (face-attribute 'minibuffer-prompt :foreground)
-         (prompt-face (plist-get minibuffer-prompt-properties 'face))
+         (hfyview-prompt-face (plist-get minibuffer-prompt-properties 'face))
          minibuf
          (frame-width (* 0.56 (frame-width)))
          table-style
          (icon-file (expand-file-name "../etc/images/icons/emacs_16.png" exec-directory))
          (img-tag (if (file-exists-p icon-file)
                       (concat "<img src=\"file://" icon-file "\" height=\"16\" width=\"16\" />")))
+	 mini-css
+	 mini-html
          )
     (setq table-style
           (format "border: solid %s; width:%sem;"
@@ -492,46 +573,9 @@ body { font-family: outline-courier new;  font-stretch: normal;  font-weight: 50
               "</tr>\n"
               "</table>\n"
               hfyview-xhtml-footer)
-      (browse-url-of-buffer))))
+      (browse-url-of-buffer)
+      outbuf)))
 
-(defun hfyview-frame (whole-buffers)
-  "Convert frame to html preserving faces and show in web browser.
-Make an XHTML view of the current Emacs frame. Put it in a buffer
-named *hfyview-frame* and show that buffer in a web browser.
-
-If WHOLE-BUFFERS is non-nil then the whole content of the buffers
-is shown in the XHTML page, otherwise just the part that is
-visible currently on the frame."
-  (interactive (list (y-or-n-p "Enter y for whole buffers, n for only visible part: ")))
-  (let ((title "Emacs - Frame Dump"))
-    (setq title (frame-parameter (selected-frame) 'name))
-    (hfyview-frame-1 whole-buffers title)))
-
-(defvar hfyview-mode-emulation-map
-  (let ((m (make-sparse-keymap)))
-    ;;(define-key m [apps] 'hfyview-frame)
-    m))
-
-;;(define-key hfyview-mode-emulation-map [apps] 'hfy-show-grabbed)
-
-(defvar hfyview-mode-emulation-maps
-  (list (cons 'hfyview-mode hfyview-mode-emulation-map)))
-
-;; Fix-me: which are needed?
-(defconst hfyview-mode-other-maps
-  '(
-    hfyview-mode-emulation-map
-    minibuffer-local-completion-map
-    minibuffer-local-filename-completion-map
-    minibuffer-local-isearch-map
-    minibuffer-local-map
-    minibuffer-local-must-match-filename-map
-    minibuffer-local-must-match-map
-    minibuffer-local-ns-map
-    viper-minibuffer-map
-    isearch-mode-map))
-
-(defvar hfy-grabbed-minibuffer-content nil)
 ;; (global-set-key [f7] '(lambda () (interactive) (message "grabbed=%s" hfy-grabbed-minibuffer-content)))
 ;; (global-set-key [f7] '(lambda () (interactive) (message "grabbed cm=%s" hfy-grabbed-echo-content)))
 ;; (global-set-key [f7] '(lambda () (interactive) (message "grabbed cm=%s, mb=%s" hfy-grabbed-echo-content hfy-grabbed-minibuffer-content)))
@@ -539,8 +583,6 @@ visible currently on the frame."
 ;;   (interactive)
 ;;   (message "grabbed cm=%s, mb=%s" hfy-grabbed-echo-content hfy-grabbed-minibuffer-content))
 
-(defvar hfy-grabbed-echo-content nil)
-
 (defun hfy-grab-echo-content ()
   (setq hfy-grabbed-echo-content (current-message)))
 
@@ -554,30 +596,6 @@ visible currently on the frame."
                (point-min) (point-max)))
             )))
 
-(define-minor-mode hfyview-mode
-  "Define some useful keys for `hfyview-frame' etc.
-Put this mode in `emulation-mode-map-alists' so they can be used
-at any time."
-  :global t
-  :group 'htmlfontify
-  (if hfyview-mode
-      (progn
-        (add-hook 'pre-command-hook 'hfy-grab-minibuffer-content)
-        (add-hook 'post-command-hook 'hfy-grab-echo-content)
-        (add-to-list 'emulation-mode-map-alists 'hfyview-mode-emulation-maps)
-        (dolist (map hfyview-mode-other-maps)
-          (define-key (symbol-value map) [(apps)] 'hfyview-frame)
-          ;;(define-key (symbol-value map) [(apps)] 'hfy-show-grabbed)
-          )
-        )
-    (remove-hook 'pre-command-hook 'hfy-grab-minibuffer-content)
-    (remove-hook 'post-command-hook 'hfy-grab-echo-content)
-    (setq emulation-mode-map-alists (delq 'hfyview-mode-emulation-maps emulation-mode-map-alists))
-    (dolist (map hfyview-mode-other-maps)
-      (define-key (symbol-value map) [(apps)] nil))
-    )
-  )
-
 ;;(add-hook 'pre-command-hook 'grab-minibuffer-content nil t)
 ;;(remove-hook 'pre-command-hook 'grab-minibuffer-content) t)
 
diff --git a/elpa-to-submit/nxhtml/util/hl-needed.el b/elpa-to-submit/nxhtml/util/hl-needed.el
index a34c20015b..8f2bbf9354 100644
--- a/elpa-to-submit/nxhtml/util/hl-needed.el
+++ b/elpa-to-submit/nxhtml/util/hl-needed.el
@@ -176,7 +176,8 @@ otherwise."
   "Turn on with special error handling.
 Erros may go unnoticed in timers.  This should prevent it."
   (condition-case err
-      (hl-needed-show)
+      (save-match-data ;; runs in timer
+        (hl-needed-show))
     (error
      (lwarn 'hl-needed-show
             :error "%s" (error-message-string err)))))
diff --git a/elpa-to-submit/nxhtml/util/html-write.el b/elpa-to-submit/nxhtml/util/html-write.el
index 3a90d0d461..1f35d10db3 100644
--- a/elpa-to-submit/nxhtml/util/html-write.el
+++ b/elpa-to-submit/nxhtml/util/html-write.el
@@ -2,16 +2,18 @@
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-10-03T01:29:44+0200 Thu
-(defconst html-write:version "0.5") ;; Version:
-;; Last-Updated: 2008-10-04 Sat
+(defconst html-write:version "0.6") ;; Version:
+;; Last-Updated: 2008-12-26 Fri
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `backquote', `bytecomp', `cl', `flyspell', `ispell', `mumamo',
-;;   `sgml-mode'.
+  ;; `appmenu', `backquote', `bytecomp', `cl', `flyspell', `ispell',
+  ;; `mail-prsvr', `mlinks', `mm-util', `mumamo', `ourcomments-util',
+  ;; `rx', `sgml-mode', `timer', `url-expand', `url-methods',
+  ;; `url-parse', `url-util', `url-vars'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -45,8 +47,8 @@
 ;;
 ;;; Code:
 
-(require 'mumamo) ;; Just for the defmacro ...
-(require 'mlinks nil t)
+;;(require 'mumamo) ;; Just for the defmacro ...
+;;(require 'mlinks nil t)
 
 (defgroup html-write nil
   "Customization group for html-write."
@@ -148,7 +150,7 @@ OVERLAY is the overlay added by `html-write-hide-tags' for this tag."
         (overlay-put overlay 'help-echo href)
         (overlay-put overlay 'mouse-face 'highlight)
         (if (eq ?# (string-to-char href))
-            (setq href (concat "file:///" buffer-name href))
+            (setq href (concat "file:///" buffer-file-name href))
           (when (file-exists-p href)
             (setq href (expand-file-name href))))
         (overlay-put overlay 'html-write-url href))
@@ -281,11 +283,12 @@ See that variable for START, END and PRE-LEN."
   "Inner function for `html-write-post-command'."
   (save-restriction
     (widen)
+    ;;(message "html-write-pending-changes=%s" html-write-pending-changes)
     (dolist (pend html-write-pending-changes)
       (assert (markerp (car pend)))
       (assert (markerp (cdr pend))))
     (let ((pending html-write-pending-changes)
-          pending2
+          pending2 pend2
           pend pend-next
           (here (point-marker))
           (min-ovl (point-max))
@@ -336,12 +339,12 @@ See that variable for START, END and PRE-LEN."
                 (setcdr pend (copy-marker ovl-max)))
               ))))
       ;; Sort
-      (when dbg (message "Sort"))
+      (when dbg (message "Sort pending2"))
       (setq pending (sort pending2
-                           (lambda (rec-a rec-b)
-                             (if (= (car rec-a) (car rec-b))
-                                 (< (cdr rec-a) (cdr rec-b))
-                               (< (car rec-a) (car rec-b))))))
+                          (lambda (rec-a rec-b)
+                            (if (= (car rec-a) (car rec-b))
+                                (< (cdr rec-a) (cdr rec-b))
+                              (< (car rec-a) (car rec-b))))))
       ;; Extend end
       (when dbg (message "== Extend end"))
       (let ((high-end (point-min))
@@ -383,16 +386,16 @@ See that variable for START, END and PRE-LEN."
                     (if (eq ?< (char-after (1- (point))))
                         ;; Inside finished tag
                         (when dbg (message "Inside finished tag"))
-                        (if (eq ?/ (char-after))
-                            ;; End tag
-                            (progn
-                              (when dbg (message "End tag"))
-                              (setq end this->-pos+1))
-                          ;; Start tag
-                          (when dbg (message "Start tag 2"))
-                          (unless (eobp) (forward-char))
-                          (skip-chars-forward "^>")
-                          (setq end (point)))
+                      (if (eq ?/ (char-after))
+                          ;; End tag
+                          (progn
+                            (when dbg (message "End tag"))
+                            (setq end this->-pos+1))
+                        ;; Start tag
+                        (when dbg (message "Start tag 2"))
+                        (unless (eobp) (forward-char))
+                        (skip-chars-forward "^>")
+                        (setq end (point)))
                       ;; Between > and >
                       (when dbg (message "Between > and >"))
                       (setq end this->-pos+1)
@@ -457,46 +460,61 @@ See that variable for START, END and PRE-LEN."
             (setcar pend low-start))))
 
       ;; delete dublicates, merge
-      (when dbg (message "== delete dublicates, merge"))
+      (when dbg (message "== delete dublicates, merge, pending=%s" pending))
       (setq pending2 pending)
       (setq pending nil)
       (while pending2
         (setq pend2 (car pending2))
         (setq pending2 (cdr pending2))
-          ;; The list is sorted
-          (when dbg (message "The list is sorted"))
-          (setq pend (car pending))
-          (if (not pend)
-              (setq pending (cons pend2 pending))
-            (cond
-             ((= (car pend2) (car pend))
-              (when (> (cdr pend2) (cdr pend))
-                (setcdr pend (cdr pend2))))
-             ((<= (car pend2) (1+ (cdr pend)))
-              (setcdr pend (cdr pend2)))
-             ;; Probably never happens?
-             ((equal pend2 pend) nil)
-             (t
-              (setq pending (cons pend2 pending)))
-             )))
+        (setq pend (car pending))
+        ;; The list is sorted
+        (when dbg (message "The list is sorted, pend=%s, pend2=%s" pend pend2))
+        (if (not pend)
+            (setq pending (cons pend2 pending))
+          (assert (>= (car pend) (car pend2)) t)
+          (cond
+           ((= (car pend2) (car pend))
+            (when (> (cdr pend2) (cdr pend))
+              (when dbg (message "here"))
+              (setcdr pend (cdr pend2))))
+           ((<= (car pend2) (1+ (cdr pend)))
+            (when dbg (message "here 2"))
+            (setcar pend (car pend2)))
+           ;; Probably never happens?
+           ((equal pend2 pend)
+            (when dbg (message "here nil"))
+            nil)
+           (t
+            (when dbg (message "here t"))
+            (setq pending (cons pend2 pending)))
+           ))
+        (when dbg (message "at while end, pending=%s" pending))
+        )
       (setq pending (reverse pending))
       (setq pending (assq-delete-all nil pending))
+      (when dbg (message "Before dolist (pend pending)=%s" pending))
       (dolist (pend pending)
         (goto-char (car pend)) (goto-char (cdr pend))
+        (when dbg (message "After goto-char (pend pending)"))
         (html-write-reveal-tags (car pend) (cdr pend))
-        (html-write-hide-tags (car pend) (cdr pend)))
+        (when dbg (message "After html-write-reveal-tags (pend pending)"))
+        (html-write-hide-tags (car pend) (cdr pend))
+        (when dbg (message "After html-write-hide-tags (pend pending)"))
+        )
       (setq html-write-pending-changes nil)
       (goto-char here))))
 
 (defun html-write-hide-tags (start end)
   "Hide tags matching `html-write-tag-list' between START and END."
   (let ((here (point-marker))
-        (buffer-name (buffer-file-name)))
+        (buffer-name (buffer-file-name))
+        (dbg nil))
     (save-restriction
       (widen)
       (goto-char start)
       (save-match-data
         (let ((hide-tags-regexp (html-write-make-hide-tags-regexp)))
+          (when dbg (message "before search start=%s end=%s, point=%s" start end (point)))
           (while (re-search-forward hide-tags-regexp end t)
             (let* ((ovl (make-overlay (match-beginning 0) (match-end 0)
                                       nil t nil))
@@ -556,6 +574,11 @@ rendered text.
 See the customization group `html-write' for more information about
 faces.
 
+The following keys are defined when you are on a tag handled by
+this minor mode:
+
+\\{html-write-keymap}
+
 IMPORTANT: Most commands you use works also on the text that is
 hidden.  The movement commands is an exception, but as soon as
 you edit the buffer you may also change the hidden parts."
diff --git a/elpa-to-submit/nxhtml/util/htmlfontify.el b/elpa-to-submit/nxhtml/util/htmlfontify.el
index c13f2fbf9e..c3d78fc58a 100644
--- a/elpa-to-submit/nxhtml/util/htmlfontify.el
+++ b/elpa-to-submit/nxhtml/util/htmlfontify.el
@@ -1787,6 +1787,7 @@ Do not record undo information during evaluation of BODY."
     )
   )
 
+;;;###autoload
 (defun htmlfontify-buffer (&optional srcdir file)
   "Create a new buffer, named for the current buffer + a .html extension,
 containing an inline css-stylesheet and formatted css-markup html
diff --git a/elpa-to-submit/nxhtml/util/inlimg.el b/elpa-to-submit/nxhtml/util/inlimg.el
new file mode 100644
index 0000000000..aa3562ffa3
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/inlimg.el
@@ -0,0 +1,423 @@
+;;; inlimg.el --- Display images inline
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2008-09-27
+(defconst inlimg:version "0.7") ;; Version:
+;; Last-Updated: 2009-07-14 Tue
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Display images inline.  See `inlimg-mode' for more information.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'mumamo nil t))
+(eval-when-compile (require 'ourcomments-util nil t))
+
+(defvar inlimg-assoc-ext
+  '((png  (".png"))
+    (gif  (".gif"))
+    (tiff (".tiff"))
+    (jpeg (".jpg" ".jpeg"))
+    (xpm  (".xpm"))
+    (xbm  (".xbm"))
+    (pbm  (".pbm"))))
+
+(defvar inlimg-img-regexp nil)
+(make-variable-buffer-local 'inlimg-img-regexp)
+(put 'inlimg-img-regexp 'permanent-local t)
+
+(defvar inlimg-img-regexp-html
+  (rx (or (and "<img"
+               (1+ space)
+               (0+ (1+ (not (any " <>")))
+                   (1+ space))
+               "src=\""
+               (group (1+ (not (any "\""))))
+               "\""
+               (*? anything)
+               "/>")
+          (and "url("
+               ?\"
+               (group (1+ (not (any "\)"))))
+               ?\"
+               ")"
+               )
+          (and "url("
+               (group (+? (not (any ")"))))
+               ")"
+               )
+          )))
+
+(defvar inlimg-img-regexp-org
+  (rx-to-string
+   `(and "[[file:"
+         (group (+? (not (any "\]")))
+                ,(let ((types nil))
+                   (dolist (typ image-types)
+                     (when (image-type-available-p typ)
+                       (dolist (ext (cadr (assoc typ inlimg-assoc-ext)))
+                         (setq types (cons ext types)))))
+                   (cons 'or types)))
+         "]"
+         (optional "["
+                   (+? (not (any "\]")))
+                   "]")
+         "]"
+         )))
+
+(defconst inlimg-modes-img-values
+  '(
+    (html-mode inlimg-img-regexp-html)
+    (org-mode  inlimg-img-regexp-org)
+    ))
+
+(defun inlimg-img-spec-p (spec)
+  (assoc spec inlimg-modes-img-values))
+
+(defgroup inlimg nil
+  "Customization group for inlimg."
+  :group 'nxhtml)
+
+(defcustom inlimg-margins '(50 . 5)
+  "Margins when displaying image."
+  :type '(cons (integer :tag "Left margin")
+               (integer :tag "Top margin"))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (fboundp 'inlimg-update-all-buffers)
+           (inlimg-update-all-buffers)))
+  :group 'inlimg)
+
+(defcustom inlimg-slice '(0 0 400 100)
+  "How to slice images."
+  :type '(choice (const :tag "Show whole images" nil)
+                 (list :tag "Show slice of image"
+                       (integer :tag "Top")
+                       (integer :tag "Left")
+                       (integer :tag "Width")
+                       (integer :tag "Height")))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (fboundp 'inlimg-update-all-buffers)
+           (inlimg-update-all-buffers)))
+  :group 'inlimg)
+
+(define-widget 'inlimg-spec-widget 'symbol
+  "A major mode lisp function."
+  :complete-function (lambda ()
+                       (interactive)
+                       (lisp-complete-symbol 'inlimg-img-spec-p))
+  :prompt-match 'inlimg-img-spec-p
+  :prompt-history 'widget-function-prompt-value-history
+  :match-alternatives '(inlimg-img-spec-p)
+  :validate (lambda (widget)
+              (unless (inlimg-img-spec-p (widget-value widget))
+                (widget-put widget :error (format "Invalid function: %S"
+                                                  (widget-value widget)))
+                widget))
+  :value 'org-mode
+  :tag "Inlimg image values spec name")
+
+;; (customize-option 'inlimg-mode-specs)
+(defcustom inlimg-mode-specs
+  '(
+    (xml-mode html-mode)
+    (sgml-mode html-mode)
+    (nxml-mode html-mode)
+    (php-mode html-mode)
+    (css-mode html-mode)
+    )
+  "Equivalent mode for image tag search.
+Note that derived modes \(see info) are recognized by default.
+
+To add new image tag patterns modify `inlimg-modes-img-values'."
+  :type '(repeat
+          (list (major-mode-function :tag "Major mode")
+                (inlimg-spec-widget :tag "Use tags as specified in")))
+  :group 'inlimg)
+
+(defface inlimg-img-tag '((t :inherit 'lazy-highlight))
+  "Face added to img tag when displaying image."
+  :group 'inlimg)
+
+(defface inlimg-img-remote '((t :inherit 'isearch-fail))
+  "Face used for notes telling image is remote."
+  :group 'inlimg)
+
+(defface inlimg-img-missing '((t :inherit 'trailing-whitespace))
+  "Face used for notes telling image is missing."
+  :group 'inlimg)
+
+(defvar inlimg-img-keymap
+  (let ((map (make-sparse-keymap)))
+    (define-key map [(control ?c) ?+] 'inlimg-toggle-display)
+    (define-key map [(control ?c) ?%] 'inlimg-toggle-slicing)
+    map)
+  "Keymap on image overlay.")
+
+(eval-after-load 'gimp
+  '(gimp-add-point-bindings inlimg-img-keymap))
+
+(defsubst inlimg-ovl-p (ovl)
+  "Return non-nil if OVL is an inlimg image overlay."
+  (overlay-get ovl 'inlimg-img))
+
+(defun inlimg-ovl-valid-p (ovl)
+  (and (overlay-get ovl 'inlimg-img)
+       (save-match-data
+         (let ((here (point)))
+           (goto-char (overlay-start ovl))
+           (prog1
+               (looking-at (symbol-value inlimg-img-regexp))
+             (goto-char here))))))
+
+(defun inlimg-next (pt display-image)
+  "Display or hide next image after point PT.
+If DISPLAY-IMAGE is non-nil then display image, otherwise hide it.
+
+Return non-nil if an img tag was found."
+  (let (src dir beg end img ovl remote beg-face)
+    (goto-char pt)
+    (save-match-data
+      (when (re-search-forward (symbol-value inlimg-img-regexp) nil t)
+        (setq src (or (match-string-no-properties 1)
+                      (match-string-no-properties 2)
+                      (match-string-no-properties 3)))
+        (setq beg (match-beginning 0))
+        (setq beg-face (get-text-property beg 'face))
+        (setq remote (string-match "^https?://" src))
+        (setq end (- (line-end-position) 0))
+        (setq ovl (catch 'old-ovl
+                    (dolist (ovl (overlays-at beg))
+                      (when (inlimg-ovl-p ovl)
+                        (throw 'old-ovl ovl)))
+                    nil))
+        (unless ovl
+          (setq ovl (make-overlay beg end))
+          (overlay-put ovl 'inlimg-img t)
+          (overlay-put ovl 'priority 100)
+          (overlay-put ovl 'face 'inlimg-img-tag)
+          (overlay-put ovl 'keymap inlimg-img-keymap))
+        (overlay-put ovl 'image-file src)
+        (overlay-put ovl 'inlimg-slice inlimg-slice)
+        (if display-image
+            (unless (memq beg-face '(font-lock-comment-face font-lock-string-face))
+              (unless remote
+                (setq dir (if (buffer-file-name)
+                              (file-name-directory (buffer-file-name))
+                            default-directory))
+                (setq src (expand-file-name src dir)))
+              (if (or remote (not (file-exists-p src)))
+                  (setq img (propertize
+                             (if remote " Image is on the web " " Image not found ")
+                             'face (if remote 'inlimg-img-remote 'inlimg-img-missing)))
+                (setq img (create-image src nil nil
+                                        :relief 5
+                                        :margin inlimg-margins))
+                (setq img (inlimg-slice-img img inlimg-slice)))
+              (let ((str (copy-sequence "\nX")))
+                (setq str (propertize str 'face 'inlimg-img-tag))
+                (put-text-property 1 2 'display img str)
+                (overlay-put ovl 'after-string str)))
+          (overlay-put ovl 'after-string nil))))
+    ovl))
+
+(defun inlimg-slice-img (img slice)
+  (if (not slice)
+      img
+    (let* ((sizes (image-size img t))
+           (width  (car sizes))
+           (height (cdr sizes))
+           (sl-left (nth 0 slice))
+           (sl-top (nth 1 slice))
+           (sl-width (nth 2 slice))
+           (sl-height (nth 3 slice)))
+      (when (> sl-left width) (setq sl-left 0))
+      (when (> (+ sl-left sl-width) width) (setq sl-width (- width sl-left)))
+      (when (> sl-top height) (setq sl-top 0))
+      (when (> (+ sl-top sl-height) height) (setq sl-height (- height sl-top)))
+      (setq img (list img))
+      (setq img (cons (append '(slice)
+                              slice
+                              (list sl-top sl-left sl-width sl-height)
+                              nil)
+                      img)))))
+
+;;;###autoload
+(define-minor-mode inlimg-mode
+  "Display images inline.
+Search buffer for image tags.  Display found images.
+
+Image tags are setup per major mode in `inlimg-mode-specs'.
+
+Images are displayed on a line below the tag referencing them.
+The whole image or a slice of it may be displayed, see
+`inlimg-slice'.  Margins relative text are specified in
+`inlimg-margins'.
+
+See also the commands `inlimg-toggle-display' and
+`inlimg-toggle-slicing'.
+
+Note: This minor mode uses `font-lock-mode'."
+  :keymap nil
+  :group 'inlimg
+  (if inlimg-mode
+      (progn
+        (let ((major-mode (or (and (boundp 'mumamo-multi-major-mode)
+                                   mumamo-multi-major-mode
+                                   (mumamo-main-major-mode))
+                              major-mode)))
+          (add-hook 'font-lock-mode-hook 'inlimg-on-font-lock-off)
+          (inlimg-get-buffer-img-values))
+        (inlimg-font-lock t))
+    (inlimg-font-lock nil)
+    (inlimg-delete-overlays)))
+(put 'inlimg-mode 'permanent-local t)
+
+(defun inlimg-delete-overlays ()
+  (save-restriction
+    (widen)
+    (let (ovl)
+      (dolist (ovl (overlays-in (point-min) (point-max)))
+        (when (inlimg-ovl-p ovl)
+          (delete-overlay ovl))))))
+
+(defun inlimg-get-buffer-img-values ()
+  (let* (rec
+         (spec (or (catch 'spec
+                     (dolist (rec inlimg-mode-specs)
+                       (when (derived-mode-p (car rec))
+                         (throw 'spec (nth 1 rec)))))
+                   major-mode))
+        (values (when spec (nth 1 (assoc spec inlimg-modes-img-values))))
+        )
+    (setq inlimg-img-regexp values)
+    ))
+
+(defun inlimg--global-turn-on ()
+  (inlimg-get-buffer-img-values)
+  (when inlimg-img-regexp
+    (inlimg-mode 1)))
+
+;;;###autoload
+(define-globalized-minor-mode inlimg-global-mode inlimg-mode inlimg--global-turn-on)
+
+;;;###autoload
+(defun inlimg-toggle-display (point)
+  "Toggle display of image at point POINT.
+See also the command `inlimg-mode'."
+  (interactive (list (point)))
+  (let ((here (point))
+        (ovl
+         (catch 'ovl
+           (dolist (ovl (overlays-at (point)))
+             (when (inlimg-ovl-p ovl)
+               (throw 'ovl ovl)))))
+        is-displayed)
+    (if (not ovl)
+        (message "No image at point %s" here)
+      (setq is-displayed (overlay-get ovl 'after-string))
+      (inlimg-next (overlay-start ovl) (not is-displayed))
+      (goto-char here))))
+
+;;;###autoload
+(defun inlimg-toggle-slicing (point)
+  "Toggle slicing of image at point POINT.
+See also the command `inlimg-mode'."
+  (interactive (list (point)))
+  (let* ((here (point))
+         (ovl
+         (catch 'ovl
+           (dolist (ovl (overlays-at (point)))
+             (when (inlimg-ovl-p ovl)
+               (throw 'ovl ovl)))))
+         (inlimg-slice inlimg-slice)
+        is-displayed)
+    (if (not ovl)
+        (message "No image at point %s" here)
+      (setq is-displayed (overlay-get ovl 'after-string))
+      (when (overlay-get ovl 'inlimg-slice)
+        (setq inlimg-slice nil))
+      (inlimg-next (overlay-start ovl) is-displayed)
+      (goto-char here))))
+
+
+(defun inlimg-font-lock-fun (bound)
+  (let ((here (point))
+        old-ovls new-ovls ovl)
+    (goto-char (line-beginning-position))
+    (dolist (ovl (overlays-in (point) bound))
+      (when (inlimg-ovl-p ovl)
+        (setq old-ovls (cons ovl old-ovls))))
+    (while (and (< (point) bound)
+                (setq ovl (inlimg-next (point) t)))
+      (setq new-ovls (cons ovl new-ovls)))
+    (dolist (ovl old-ovls)
+      (unless (inlimg-ovl-valid-p ovl)
+        (delete-overlay ovl)
+        ))))
+
+;; Fix-me: This stops working for changes with nxhtml-mumamo-mode, but
+;; works for nxhtml-mode and html-mumamo-mode...
+(defvar inlimg-this-is-not-font-lock-off nil)
+(defun inlimg-font-lock (on)
+  (let ((add-or-remove (if on 'font-lock-add-keywords 'font-lock-remove-keywords))
+        (link-fun))
+    (funcall add-or-remove nil
+             `((inlimg-font-lock-fun
+                1
+                mlinks-link
+                prepend)))
+    (let ((inlimg-this-is-not-font-lock-off t)
+          (mumamo-multi-major-mode nil))
+      (font-lock-mode -1)
+      (font-lock-mode 1))))
+
+(defun inlimg-on-font-lock-off ()
+  (unless (or inlimg-this-is-not-font-lock-off
+              (and (boundp 'mumamo-multi-major-mode)
+                   mumamo-multi-major-mode))
+    (when inlimg-mode
+      (inlimg-mode -1)
+      )))
+(put 'inlimg-on-font-lock-off 'permanent-local-hook t)
+
+
+(provide 'inlimg)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; inlimg.el ends here
diff --git a/elpa-to-submit/nxhtml/util/key-cat.el b/elpa-to-submit/nxhtml/util/key-cat.el
new file mode 100644
index 0000000000..430651456b
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/key-cat.el
@@ -0,0 +1,331 @@
+;;; key-cat.el --- List key bindings by category
+
+;; Copyright (C) 2005 by Lennart Borgman
+
+;; Author: Lennart Borgman <lennartDOTborgmanDOT073ATstudentDOTluDOTse>
+;; Created: Sat Jan 28 2006
+;; Version: 0.25
+;; Last-Updated: 2009-05-09 Sat
+;; Keywords:
+;; Compatibility:
+;;
+;;   Requires Emacs 22.
+;;
+;; Features that might be required by this library:
+;;
+  ;; `cl'.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;  Display help that looks like a reference sheet for common
+;;  commands.
+;;
+;;  To use this in your .emacs put
+;;
+;;    (require 'key-cat)
+;;
+;;  Then use the command
+;;
+;;    M-x key-cat-help
+;;
+;;  For more information see that command.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+(defconst key-cat-cmd-list
+  '(
+    (error-testing
+     (commands
+      :visible nil
+      hallo
+      key-cat-help
+      key-cat-where-is
+      ))
+    ("Help"
+     (commands
+      help-for-help
+      info-emacs-manual
+      info
+      ))
+    ("Special Functions and Keys"
+     ;; For similar functions that are most often bound to a specific key
+     (commands
+      key-cat-tab
+      key-cat-complete
+      )
+     )
+    ("Files, Buffers and Windows"
+     (commands
+      find-file
+      save-buffer
+      write-file
+      split-window-vertically
+      split-window-horizontally
+      delete-other-windows
+      other-window
+      buffer-menu
+      ))
+    ("Search and replace"
+     (commands
+      isearch-forward
+      isearch-backward
+      query-replace
+      isearch-forward-regexp
+      isearch-backward-regexp
+      query-replace-regexp
+      occur
+      lgrep
+      rgrep
+      ))
+    ("Lines"
+     (commands
+      move-beginning-of-line
+      move-end-of-line
+      kill-line
+      ))
+    ("Words"
+     (commands
+      forward-word
+      backward-word
+      kill-word
+      ))
+    ("Region"
+     (commands
+      set-mark-command
+      ;;cua-set-mark
+      kill-region
+      copy-region-as-kill
+      yank
+      yank-pop
+      ))
+    ("Undo"
+     (commands
+      undo
+      ))
+    ("Viper"
+     (commands
+      :visible (lambda()
+                 (and (featurep 'viper)
+                      viper-mode))
+      viper-next-line
+      viper-previous-line
+      viper-forward-word
+      viper-backward-word
+      viper-forward-Word
+      viper-backward-Word
+      viper-repeat
+      viper-forward-char
+      viper-backward-char
+      viper-next-line-at-bol
+      viper-previous-line-at-bol
+      viper-command-argument
+      viper-digit-argument
+      ))
+    )
+  "List with common commands to display by `key-cat-help'.
+The elements of this list corresponds to sections to show in the
+help.  Each element consists of sublists beginning with the
+keyword 'commands.  The sublists may after 'command contain the
+keyword :visible which takes a variable or function as argument.
+If the argument evaluates to non-nil the list is shown."
+  )
+
+
+(defvar key-cat-cmd-list-1 nil)
+
+(defun key-cat-help()
+  "Display reference sheet style help for common commands.
+See also `key-cat-cmd-list'."
+  (interactive)
+  (if (> 22 emacs-major-version)
+      (message "Sorry, this requires Emacs 22 or later")
+    ;; Delay to get correct bindings when running through M-x
+    (setq key-cat-cmd-list-1 key-cat-cmd-list)
+    (run-with-timer 0.1 nil 'key-cat-help-internal)))
+
+(defun key-cat-help-internal()                   ;(category)
+  (message "Please wait ...")
+  (condition-case err
+      (save-match-data ;; runs in timer
+        (let ((result))
+          (help-setup-xref (list #'key-cat-help)
+                           (interactive-p))
+          ;;         (push (list "Changing commands"
+          ;;                     (list
+          ;;                      'command
+          ;;                      indent-line-function
+          ;;                      ))
+          ;;               key-cat-cmd-list-1)
+          (dolist (catentry key-cat-cmd-list-1)
+            (let ((category (car catentry))
+                  (commands (cdr catentry))
+                  (cmds)
+                  (keyw)
+                  (visible)
+                  (visible-fun)
+                  (cmdstr)
+                  (doc))
+              (dolist (cmdlist commands)
+                (setq cmdlist (cdr cmdlist))
+                (setq visible t)
+                (while (keywordp (setq keyw (car cmdlist)))
+                  (setq cmdlist (cdr cmdlist))
+                  (case keyw
+                    (:visible (setq visible-fun (pop cmdlist))
+                              (setq visible (if (symbolp visible-fun)
+                                                (progn
+                                                  (symbol-value visible-fun))
+                                              (funcall visible-fun)))
+                              )
+                    ))
+                (when visible
+                  (dolist (cmd cmdlist)
+                    (setq cmds (cons cmd cmds)))))
+              (when cmds
+                (push (format "\n%s:\n"
+                              (let ((s (format "%s" category)))
+                                (put-text-property 0 (length s)
+                                                   'face (list
+                                                          'bold
+                                                          )
+                                                   s)
+                                s))
+                      result))
+              (setq cmds (reverse cmds))
+              (dolist (cmd cmds)
+                (setq cmdstr
+                      (let ((s "Where to find it:" ))
+                        (put-text-property 0 (length s)
+                                           'face '(:slant italic
+                                                          :background "RGB:dd/dd/ff"
+                                                          ) s) s))
+                (if (not (functionp cmd))
+                    (cond
+                     ((eq 'key-cat-tab cmd)
+                      (let ((s "Indent line"))
+                        (put-text-property 0 (length s) 'face '(:foreground "blue") s)
+                        (push s result))
+                      (push ":\n" result)
+                      (push (concat
+                             "    "
+                             "Indent current line (done by specific major mode function).\n")
+                            result)
+                      (push (format "    %17s  %s\n" cmdstr (key-description [tab])) result)
+                      )
+                     ((eq 'key-cat-complete cmd)
+                      (let ((s "Completion"))
+                        (put-text-property 0 (length s) 'face '(:foreground "blue") s)
+                        (push s result))
+                      (push ":\n" result)
+                      (push (concat
+                             "    "
+                             "Performe completion at point (done by specific major mode function).\n")
+                            result)
+                      (push (format "    %17s  %s\n" cmdstr (key-description [meta tab])) result)
+                      )
+                     (t
+                      (let ((s (format "`%s':  (not a function)\n" cmd)))
+                        (put-text-property 0 (length s) 'face '(:foreground "red") s)
+                        (push s result))))
+                  (let ((keys (key-cat-where-is cmd)))
+                    (push (format "`%s':\n" cmd) result)
+                    (setq doc (documentation cmd t))
+                    (push
+                     (concat
+                      "    "
+                      (if doc
+                          (substring doc 0 (string-match "\n" doc))
+                        "(not documented)")
+                      "\n")
+                     result)
+                    (if (not keys)
+                        (if (interactive-form cmd)
+                            (push (format "    %17s  M-x %s\n" cmdstr cmd) result)
+                          (let ((s "(not an interactive command)"))
+                            (put-text-property 0 (length s) 'face '(:foreground "red") s)
+                            (push (format "    %17s  %s\n" cmdstr s) result)))
+                      (dolist (key keys)
+                        (push (format "    %17s  " cmdstr) result)
+                        (push (format "%s\n"
+                                      (if (eq (elt key 0) 'xmenu-bar)
+                                          "Menus"
+                                        (key-description key)))
+                              result)
+                        (setq cmdstr ""))))))))
+          (save-excursion
+            (with-current-buffer (help-buffer)
+              (with-output-to-temp-buffer (help-buffer)
+                (insert
+                 (let ((s "Some important commands\n"))
+                   (put-text-property 0 (length s)
+                                      'face '(:weight bold
+                                                      :height 1.5
+                                                      :foreground "RGB:00/00/66") s)
+                   s))
+                (setq result (reverse result))
+                (dolist (r result)
+                  (insert r))
+                )))
+          (message "")))
+    (error (message "%s" (error-message-string err)))))
+
+;; Mostly copied from `where-is':
+(defun key-cat-where-is (definition)
+  "Return key sequences that invoke the command DEFINITION.
+Argument is a command definition, usually a symbol with a function definition."
+  (let ((func (indirect-function definition))
+        (defs nil)
+        (all-keys))
+    ;; In DEFS, find all symbols that are aliases for DEFINITION.
+    (mapatoms (lambda (symbol)
+		(and (fboundp symbol)
+		     (not (eq symbol definition))
+		     (eq func (condition-case ()
+				  (indirect-function symbol)
+				(error symbol)))
+		     (push symbol defs))))
+    ;; Look at all the symbols--first DEFINITION,
+    ;; then its aliases.
+    (dolist (symbol (cons definition defs))
+      (let* ((remapped (command-remapping symbol))
+	     (keys (where-is-internal
+		    ;;symbol overriding-local-map nil nil remapped)))
+		    symbol nil nil nil remapped)))
+        (when keys
+          (dolist (key keys)
+            (setq all-keys (cons key all-keys))))))
+    all-keys))
+
+
+
+(provide 'key-cat)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; key-cat.el ends here
diff --git a/elpa-to-submit/nxhtml/util/majmodpri.el b/elpa-to-submit/nxhtml/util/majmodpri.el
index 1fa61c45a8..777e6055ae 100644
--- a/elpa-to-submit/nxhtml/util/majmodpri.el
+++ b/elpa-to-submit/nxhtml/util/majmodpri.el
@@ -2,8 +2,8 @@
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-08-26
-(defconst majmodpri:version "0.6") ;;Version:
-;; Last-Updated: 2008-08-26T19:21:00+0200 Tue
+(defconst majmodpri:version "0.62") ;;Version:
+;; Last-Updated: 2009-04-30 Thu
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
@@ -79,105 +79,10 @@
 
 (defun majmodpri-sort-lists-in-timer ()
   (condition-case err
-      (majmodpri-sort-lists)
+      (save-match-data ;; runs in timer
+        (majmodpri-sort-lists))
     (error (message "(majmodpri-sort-lists): %s" err))))
 
-;;;; Custom
-
-;;;###autoload
-(defgroup majmodpri nil
-  "Customization group for majmodpri.el"
-  :group 'nxhml
-  )
-
-(defcustom majmodpri-sort-after-load
-  nil
-  "Sort major mode lists after loading elisp libraries.
-Sorting is not done immediately.  Instead it runs in an idle
-timer.  This means that if several elisp libraries are loaded in
-a command then the sorting will only be done once, after the
-command has finished.
-
-See `majmodpri-sort-lists' for more information."
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "After loading any elisp library" t)
-                 (repeat :tag "After loading specified libraries" symbol))
-  :set (lambda (sym val)
-         (set-default sym val)
-         ;; Clean up `after-load-alist' first.
-         (setq after-load-alist
-               (delq nil
-                     (mapcar (lambda (rec)
-                               (unless (equal (cadr rec)
-                                              '(majmodpri-start-idle-sort))
-                                 rec))
-                             after-load-alist)))
-         (when val
-           (if (not (listp val))
-               (add-to-list 'after-load-alist
-                            '(".*" (majmodpri-start-idle-sort)))
-             (dolist (feat val)
-               (unless (featurep feat)
-                 (eval-after-load feat '(majmodpri-start-idle-sort)))))
-           (majmodpri-start-idle-sort)))
-  :group 'majmodpri)
-
-(defcustom majmodpri-lists-to-sort
-  '(magic-mode-alist auto-mode-alist magic-fallback-mode-alist)
-  ;;nil
-  "Which major mode lists to sort.
-See `majmodpri-sort-lists' for more information."
-  :type '(set (const magic-mode-alist)
-              (const auto-mode-alist)
-              (const magic-fallback-mode-alist))
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when majmodpri-sort-after-load
-           (majmodpri-start-idle-sort)))
-  :group 'majmodpri)
-
-(defcustom majmodpri-mode-priorities
-  '(
-    cperl-mumamo-mode
-    csound-sgml-mumamo-mode
-    django-nxhtml-mumamo-mode
-    django-html-mumamo-mode
-    embperl-nxhtml-mumamo-mode
-    embperl-html-mumamo-mode
-    eruby-nxhtml-mumamo-mode
-    eruby-html-mumamo-mode
-    genshi-nxhtml-mumamo-mode
-    genshi-html-mumamo-mode
-    jsp-nxhtml-mumamo-mode
-    jsp-html-mumamo-mode
-    laszlo-nxml-mumamo-mode
-    metapost-mumamo-mode
-    mjt-nxhtml-mumamo-mode
-    mjt-html-mumamo-mode
-    noweb2-mumamo-mode
-    ;;org-mumamo-mode
-    perl-mumamo-mode
-    smarty-nxhtml-mumamo-mode
-    smarty-html-mumamo-mode
-    ;;tt-html-mumamo-mode
-
-    nxhtml-mumamo-mode
-    html-mumamo-mode
-    nxml-mumamo-mode
-    nxml-mode
-
-    rhtml-mode
-    )
-  "Priority list for major modes.
-Modes that comes first have higher priority.
-See `majmodpri-sort-lists' for more information."
-  :type '(repeat symbol)
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when majmodpri-sort-after-load
-           (majmodpri-start-idle-sort)))
-  :group 'majmodpri)
-
 
 ;;;; Sorting
 
@@ -194,9 +99,27 @@ See `majmodpri-sort-lists' for more information."
   "Get original value of REC after sorting."
   (cadr rec))
 
+;; Fix-me: default for Emacs 22??
+(defcustom majmodpri-no-nxml (< emacs-major-version 23)
+  "Don't use multi major modes with nxml if non-nil.
+The default for Emacs prior to version 23 is to not use this
+multi major modes by default since there are some problems.
+
+This gives those multi major mode lower priority, but it does not
+prevent use of them."
+  :type 'boolean
+  :group 'majmodpri)
+
+;; (majmodpri-priority 'html-mumamo-mode)
+;; (majmodpri-priority 'nxhtml-mumamo-mode)
 (defsubst majmodpri-priority (mode)
   "Return major mode MODE priority."
-  (length (memq mode majmodpri-mode-priorities)))
+  (if (and majmodpri-no-nxml
+           (symbolp mode)
+           (save-match-data
+             (string-match "nxhtml-mumamo" (symbol-name mode))))
+      0
+    (length (memq mode majmodpri-mode-priorities))))
 
 (defun majmodpri-compare-auto-modes (rec1 rec2)
   "Compare record REC1 and record REC2.
@@ -286,8 +209,50 @@ See also `majmodpri-apply-priorities'."
   (when (memq 'auto-mode-alist majmodpri-lists-to-sort)
     (majmodpri-sort-auto-mode-alist))
   (when (memq 'magic-fallback-mode-alist majmodpri-lists-to-sort)
-    (majmodpri-sort-magic-list 'magic-fallback-mode-alist)))
+    (majmodpri-sort-magic-list 'magic-fallback-mode-alist))
+  (message "majmodpri-sort-lists running ... (done)"))
+
+
+;;;###autoload
+(defun majmodpri-apply ()
+  "Sort major mode lists and apply to existing buffers.
+Note: This function is suitable to add to
+`desktop-after-read-hook'. It will restore the multi major modes
+in buffers."
+  (majmodpri-apply-priorities t))
+
+(defun majmodpri-sort-apply-to-current ()
+  "Sort lists and apply to current buffer."
+  (majmodpri-sort-lists)
+  (add-hook 'find-file-hook 'normal-mode t t))
 
+(defun majmodpri-check-normal-mode ()
+  "Like `normal-mode', but keep major mode if same."
+  (let ((old-major-mode major-mode)
+        (old-mumamo-multi-major-mode (when (boundp 'mumamo-multi-major-mode)
+                                       mumamo-multi-major-mode)))
+    (report-errors "File mode specification error: %s"
+      (set-auto-mode t))
+    (unless (and (eq old-major-mode major-mode)
+                 (eq old-mumamo-multi-major-mode mumamo-multi-major-mode))
+      (report-errors "File local-variables error: %s"
+        (hack-local-variables))
+      ;; Turn font lock off and on, to make sure it takes account of
+      ;; whatever file local variables are relevant to it.
+      (when (and font-lock-mode
+                 ;; Font-lock-mode (now in font-core.el) can be ON when
+                 ;; font-lock.el still hasn't been loaded.
+                 (boundp 'font-lock-keywords)
+                 (eq (car font-lock-keywords) t))
+        (setq font-lock-keywords (cadr font-lock-keywords))
+        (font-lock-mode 1))
+      (message "majmodpri-apply-priorities: buffer=%s, %s,%s => %s,%s"
+               (current-buffer)
+               old-major-mode
+               old-mumamo-multi-major-mode
+               major-mode
+               (when (boundp 'mumamo-multi-major-mode)
+                 mumamo-multi-major-mode)))))
 
 ;;;###autoload
 (defun majmodpri-apply-priorities (change-modes)
@@ -296,6 +261,7 @@ First run `majmodpri-sort-lists' and then if CHANGE-MODES is
 non-nil apply to existing file buffers.  If interactive ask
 before applying."
   (interactive '(nil))
+  (message "majmodpri-apply-priorities running...")
   (majmodpri-sort-lists)
   (when (or change-modes
             (called-interactively-p))
@@ -309,13 +275,157 @@ before applying."
                 (setq file-buffers (cons buffer file-buffers))))))
       (if (not file-buffers)
           (when change-modes
-            (message "No file buffers to change modes in"))
+            (message "majmodpri-apply-priorities: No file buffers to change modes in"))
         (when (called-interactively-p)
           (setq change-modes
                 (y-or-n-p "Check major mode in all file visiting buffers? ")))
         (when change-modes
           (dolist (buffer file-buffers)
-            (with-current-buffer buffer (normal-mode))))))))
+            (with-current-buffer buffer
+              (let ((old-major major-mode))
+                (majmodpri-check-normal-mode)
+                )))))))
+  (message "majmodpri-apply-priorities running ... (done)"))
+
+
+;;;; Custom
+
+;;;###autoload
+(defgroup majmodpri nil
+  "Customization group for majmodpri.el"
+  :group 'nxhtml
+  )
+
+(defcustom majmodpri-mode-priorities
+  '(
+    cperl-mumamo-mode
+    csound-sgml-mumamo-mode
+    django-nxhtml-mumamo-mode
+    django-html-mumamo-mode
+    embperl-nxhtml-mumamo-mode
+    embperl-html-mumamo-mode
+    eruby-nxhtml-mumamo-mode
+    eruby-html-mumamo-mode
+    genshi-nxhtml-mumamo-mode
+    genshi-html-mumamo-mode
+    jsp-nxhtml-mumamo-mode
+    jsp-html-mumamo-mode
+    laszlo-nxml-mumamo-mode
+    metapost-mumamo-mode
+    mjt-nxhtml-mumamo-mode
+    mjt-html-mumamo-mode
+    noweb2-mumamo-mode
+    ;;org-mumamo-mode
+    perl-mumamo-mode
+    smarty-nxhtml-mumamo-mode
+    smarty-html-mumamo-mode
+    ;;tt-html-mumamo-mode
+
+    nxhtml-mumamo-mode
+    html-mumamo-mode
+    nxml-mumamo-mode
+    nxml-mode
+
+    javascript-mode
+    espresso-mode
+    rhtml-mode
+    )
+  "Priority list for major modes.
+Modes that comes first have higher priority.
+See `majmodpri-sort-lists' for more information."
+  :type '(repeat symbol)
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (and (boundp 'majmodpri-sort-after-load)
+                    majmodpri-sort-after-load)
+           (majmodpri-start-idle-sort)))
+  :group 'majmodpri)
+
+(defcustom majmodpri-lists-to-sort
+  '(magic-mode-alist auto-mode-alist magic-fallback-mode-alist)
+  ;;nil
+  "Which major mode lists to sort.
+See `majmodpri-sort-lists' for more information."
+  :type '(set (const magic-mode-alist)
+              (const auto-mode-alist)
+              (const magic-fallback-mode-alist))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (and (boundp 'majmodpri-sort-after-load)
+                    majmodpri-sort-after-load)
+           (majmodpri-start-idle-sort)))
+  :group 'majmodpri)
+
+(defcustom majmodpri-sort-after-load
+  '(
+    chart
+    gpl
+    nxhtml-autoload
+    php-mode
+    rnc-mode
+    ruby-mode
+    )
+  "Sort major mode lists after loading elisp libraries if non-nil.
+This should not really be needed since just loading a library
+should not change how Emacs behaves.  There are however quite a
+few thirt party libraries that does change `auto-mode-alist'
+\(including some of my own) since that sometimes seems
+reasonable.  Some of them are in the default value of this
+variable.
+
+There are two possibilities for sorting here:
+
+- Value=list of features (default). Sort immediately after loading a
+  library in the list.  Apply to current buffer.
+
+- Value=t. Sort after loading any library. Sorting is then not
+  done immediately.  Instead it runs in an idle timer.  This
+  means that if several elisp libraries are loaded in a command
+  then the sorting will only be done once, after the command has
+  finished.  After sorting apply to all buffers.
+
+Note that the default does break Emacs rule that loading a
+library should not change how Emacs behave.  On the other hand
+the default tries to compensate for that the loaded libraries
+breaks this rule by changing `auto-mode-alist'.
+
+See `majmodpri-sort-lists' for more information."
+  :type '(choice (const :tag "Never" nil)
+                 (const :tag "After loading any elisp library" t)
+                 (repeat :tag "After loading specified features" symbol))
+  :set (lambda (sym val)
+         (set-default sym val)
+         ;; Clean up `after-load-alist' first.
+         (setq after-load-alist
+               (delq nil
+                     (mapcar (lambda (rec)
+                               (unless (member (cadr rec)
+                                               '((majmodpri-start-idle-sort)
+                                                 (majmodpri-sort-lists)))
+                                 rec))
+                             after-load-alist)))
+         (when val
+           ;;(message "majmodpri-sort-after-load: val=%s" val)
+           (let ((sort-and-apply nil))
+             (if (not (listp val))
+                 (add-to-list 'after-load-alist
+                              (if (eq val t)
+                                  '(".*" (majmodpri-start-idle-sort))
+                                '("." (majmodpri-sort-lists))))
+               (dolist (feat val)
+                 ;;(message "feat=%s" feat)
+                 (if (featurep feat)
+                     (setq sort-and-apply t)
+                   (if (eq val t)
+                       (eval-after-load feat '(majmodpri-start-idle-sort))
+                     (eval-after-load feat '(majmodpri-sort-apply-to-current))))))
+             (when sort-and-apply
+               ;;(message "majmodpri-sort-after-load: sort-and-apply")
+               (majmodpri-apply-priorities t))
+             (if (eq val t)
+                 (majmodpri-start-idle-sort)
+               (majmodpri-apply-priorities t)))))
+  :group 'majmodpri)
 
 
 (provide 'majmodpri)
diff --git a/elpa-to-submit/nxhtml/util/mlinks.el b/elpa-to-submit/nxhtml/util/mlinks.el
index 54a616d851..d94fd0f1fb 100644
--- a/elpa-to-submit/nxhtml/util/mlinks.el
+++ b/elpa-to-submit/nxhtml/util/mlinks.el
@@ -1,9 +1,9 @@
 ;;; mlinks.el --- Minor mode making major mode dependent links
 ;;
 ;; Author: Lennar Borgman
-;; Created: Tue Jan 16 22:17:34 2007
+;; Created: Tue Jan 16 2007
 (defconst mlinks:version "0.28") ;;Version:
-;; Lxast-Updated: Mon Apr 09 14:31:03 2007 (7200 +0200)
+;; Last-Updated: 2009-05-01 Fri
 ;; Keywords:
 ;; Compatibility:
 ;;
@@ -18,9 +18,24 @@
 ;;; Commentary:
 ;;
 ;; This file implements the minor mode `mlinks-mode' that create
-;; hyperlinks for different major modes.
+;; hyperlinks for different major modes.  Such links can be visible or
+;; invisible.  The meanings of the links are defined per mode.
 ;;
-;; To-do: Underline all links?
+;; Examples:
+;;
+;; - In in html style modes the links are visible they can mean either
+;;   open a file for editing, go to an achnor or view the link in a
+;;   web browser etc.
+;;
+;; - In emacs lisp mode the links are invisible, but maybe highlighed
+;;   when point or mouse is on them.  (Having them highlighted when
+;;   point is on them can be a quick way to check that you have
+;;   spelled a symbol correct.)  The meanings of the links in emacs
+;;   lisp mode are go to definition.
+;;
+;; Common to links that open a buffer in Emacs is that you can the
+;; buffer opened in the same window, the other window or in a new
+;; frame.  The same key binding is used in all major modes for this.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -51,10 +66,10 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(require 'ourcomments-util)
+(eval-when-compile (require 'ourcomments-util))
 (require 'url-parse)
 (require 'url-expand)
-(require 'appmenu nil t)
+(eval-when-compile (require 'appmenu nil t))
 
 (defgroup mlinks-mode nil
   "Customization group for `mlinks-mode'."
@@ -286,22 +301,24 @@
 
 (defun mlinks-hilighter (buffer)
   ;;(message "mlinks-hilighter, buffer=%s, p=%s, live-p=%s" buffer (bufferp buffer) (buffer-live-p buffer))
-  (if (or (not (bufferp buffer))
-          (not (buffer-live-p buffer)))
-      ;;(mlinks-stop-hilighter)
-      (cancel-timer timer-event-last)
-    (with-current-buffer buffer
-      (when mlinks-mode ;t ;mlinks-hilight-this-buffer
-        (let* ((funs-- (mlinks-get-action 'hili))
-               bounds--)
-          (when funs--
-            (setq bounds-- (run-hook-with-args-until-success 'funs--)))
-          (if bounds--
-              (if mlinks-hilight-point-ovl
-                  (move-overlay mlinks-hilight-point-ovl (car bounds--) (cdr bounds--))
-                (mlinks-make-point-ovl bounds--))
-            (when mlinks-hilight-point-ovl
-              (delete-overlay mlinks-hilight-point-ovl))))))))
+  (save-match-data ;; runs in timer
+    (if (or (not (bufferp buffer))
+            (not (buffer-live-p buffer)))
+        ;;(mlinks-stop-hilighter)
+        ;;(cancel-timer timer-event-last)
+        (cancel-timer mlinks-mark-links-timer)
+      (with-current-buffer buffer
+        (when mlinks-mode ;t ;mlinks-hilight-this-buffer
+          (let* ((funs-- (mlinks-get-action 'hili))
+                 bounds--)
+            (when funs--
+              (setq bounds-- (run-hook-with-args-until-success 'funs--)))
+            (if bounds--
+                (if mlinks-hilight-point-ovl
+                    (move-overlay mlinks-hilight-point-ovl (car bounds--) (cdr bounds--))
+                  (mlinks-make-point-ovl bounds--))
+              (when mlinks-hilight-point-ovl
+                (delete-overlay mlinks-hilight-point-ovl)))))))))
 
 (defvar mlinks-active-hilight-keymap
   (let ((m (make-sparse-keymap)))
@@ -656,6 +673,7 @@ By default the link moved to will be active, see
     (mlinks-stop-hilighter)
     (mlinks-stop-marking-links)
     ;;(remove-hook 'after-change-major-mode-hook 'mlinks-after-change-major-mode)
+    (remove-hook 'after-change-functions 'mlinks-after-change t)
     (mlinks-remove-overlays)))
 (put 'mlinks-mode 'permanent-local t)
 
@@ -728,44 +746,44 @@ Any command cancels this state."
 (make-variable-buffer-local 'mlinks-mark-links-timer)
 (put 'mlinks-mark-links-timer 'permanent-local t)
 
-(defun mlinks-mark-next-link (buffer)
-  (when (buffer-live-p buffer)
-    (with-current-buffer buffer
-      (when (timerp mlinks-mark-links-timer)
-        (cancel-timer mlinks-mark-links-timer))
-      (let ((funs (mlinks-get-action 'next))
-            res
-            start-at)
-        (unless funs
-          (setq funs (mlinks-get-action 'next-mark)))
-        ;; When using mumamo-mode we can not be sure that funs is
-        ;; non-nil here:
-        (when funs
-          (save-excursion
-            (setq start-at
-                  (if mlinks-link-update-pos-min
-                      mlinks-link-update-pos-min
-                    (point-min)))
-            (goto-char start-at)
-            (save-match-data
-              (setq res (funcall (car funs)))))
-          ;; Fix-me: old links
-          (when res
-            (let ((ovl-chg start-at)
-                  (end-at (cdr res)))
-              (while (< ovl-chg end-at)
-                (dolist (o (overlays-at ovl-chg))
-                  (when (overlay-get o 'mlink)
-                    (if (= (overlay-start o) (car res))
-                        (delete-overlay o)
-                      (move-overlay o (car res) (cdr res)))))
-                (setq ovl-chg (next-overlay-change (+ ovl-chg)))))
-            (setq mlinks-link-update-pos-min (cdr res))
-            (mlinks-mark-link res)
-            (when (or (not mlinks-link-update-pos-max)
-                      (< (point) mlinks-link-update-pos-max))
-              (setq mlinks-mark-links-timer (run-with-idle-timer 0 nil 'mlinks-mark-next-link buffer))
-              )))))))
+;; (defun mlinks-mark-next-link (buffer)
+;;   (when (buffer-live-p buffer)
+;;     (with-current-buffer buffer
+;;       (when (timerp mlinks-mark-links-timer)
+;;         (cancel-timer mlinks-mark-links-timer))
+;;       (let ((funs (mlinks-get-action 'next))
+;;             res
+;;             start-at)
+;;         (unless funs
+;;           (setq funs (mlinks-get-action 'next-mark)))
+;;         ;; When using mumamo-mode we can not be sure that funs is
+;;         ;; non-nil here:
+;;         (when funs
+;;           (save-excursion
+;;             (setq start-at
+;;                   (if mlinks-link-update-pos-min
+;;                       mlinks-link-update-pos-min
+;;                     (point-min)))
+;;             (goto-char start-at)
+;;             (save-match-data
+;;               (setq res (funcall (car funs)))))
+;;           ;; Fix-me: old links
+;;           (when res
+;;             (let ((ovl-chg start-at)
+;;                   (end-at (cdr res)))
+;;               (while (< ovl-chg end-at)
+;;                 (dolist (o (overlays-at ovl-chg))
+;;                   (when (overlay-get o 'mlink)
+;;                     (if (= (overlay-start o) (car res))
+;;                         (delete-overlay o)
+;;                       (move-overlay o (car res) (cdr res)))))
+;;                 (setq ovl-chg (next-overlay-change (+ ovl-chg)))))
+;;             (setq mlinks-link-update-pos-min (cdr res))
+;;             (mlinks-mark-link res)
+;;             (when (or (not mlinks-link-update-pos-max)
+;;                       (< (point) mlinks-link-update-pos-max))
+;;               (setq mlinks-mark-links-timer (run-with-idle-timer 0 nil 'mlinks-mark-next-link buffer))
+;;               )))))))
 
 (defvar mlinks-link-update-pos-min nil)
 (make-variable-buffer-local 'mlinks-link-update-pos-min)
@@ -776,17 +794,11 @@ Any command cancels this state."
 (put 'mlinks-link-update-pos-max 'permanent-local t)
 
 (defun mlinks-stop-marking-links ()
-  (when (timerp mlinks-mark-links-timer)
-    (cancel-timer mlinks-mark-links-timer)))
+  (mlink-font-lock nil))
 
 (defun mlinks-start-marking-links ()
   (when (mlinks-want-marked-links)
-    ;;(message "start-marking-links, buffer=%s" (current-buffer))
-    (mlinks-stop-marking-links)
-    (setq mlinks-link-update-pos-min nil)
-    (setq mlinks-link-update-pos-max nil)
-    (setq mlinks-mark-links-timer (run-with-idle-timer 0 nil 'mlinks-mark-next-link (current-buffer))))
-  )
+    (mlink-font-lock t)))
 
 ;; Fix-me: old links, range handling?
 (defvar mlinks-after-change-extra 100)
@@ -803,7 +815,8 @@ Any command cancels this state."
              (max (cdr range)))
         (when (< min mlinks-link-update-pos-min) (setq mlinks-link-update-pos-min (- min mlinks-after-change-extra)))
         (when (> max mlinks-link-update-pos-max) (setq mlinks-link-update-pos-max (+ max mlinks-after-change-extra))))
-      (mlinks-mark-next-link (current-buffer)))))
+      ;;(mlinks-mark-next-link (current-buffer))
+      )))
 (put 'mlinks-after-change 'permanent-local t)
 
 
@@ -827,28 +840,29 @@ Any command cancels this state."
       (0+ space)
       "="
       (0+ space)
-      (or
+      (submatch
+       (or
         (seq "\""
-             (submatch
+             (and
               (0+ (not (any "\""))))
              "\"")
         (seq "'"
-             (submatch
-              (0+ (not (any "'"))))
-             "'"))))
+             (and
+              (0+ (not (any "\'"))))
+             "'")))))
 
 ;;(require 'rx)
 ;;(rx
 
-(defun mlinks-html-forward-link (&optional from)
+(defun mlinks-html-forward-link (&optional from bound)
   (when (if from
             (save-excursion
               (goto-char from)
-              (re-search-forward mlinks-html-link-regex nil t))
-          (re-search-forward mlinks-html-link-regex nil t))
+              (re-search-forward mlinks-html-link-regex bound t))
+          (re-search-forward mlinks-html-link-regex bound t))
     ;;(message "mlinks-html-link-regex match-string0=%s, 1=%s, 2=%s" (match-string-no-properties 0) (match-string-no-properties 1) (match-string-no-properties 2))
     (let ((which (if (match-beginning 1) 1 2)))
-      (cons (match-beginning which) (match-end which)))))
+      (cons (1+ (match-beginning which)) (1- (match-end which))))))
 
 (defun mlinks-html-backward-link (&optional from)
   (when (if from
@@ -858,7 +872,7 @@ Any command cancels this state."
           (re-search-backward mlinks-html-link-regex nil t))
     ;;(cons (match-beginning 1) (match-end 1))))
     (let ((which (if (match-beginning 1) 1 2)))
-      (cons (match-beginning which) (match-end which)))))
+      (cons (1+ (match-beginning which)) (1- (match-end which))))))
 
 (defun mlinks-html-style-mode-fun (goto)
   (let (start
@@ -866,6 +880,7 @@ Any command cancels this state."
         bounds)
     (save-excursion
       ;;(when (search-forward "\"" (line-end-position) t)
+      (forward-char)
       (when (< 0 (skip-chars-forward "^\"'" (line-end-position)))
         (forward-char)
         (save-match-data
@@ -873,8 +888,8 @@ Any command cancels this state."
                  mlinks-html-link-regex
                  (line-beginning-position -1))
             (let ((which (if (match-beginning 1) 1 2)))
-              (setq start (match-beginning which))
-              (setq end   (match-end which)))
+              (setq start (1+ (match-beginning which)))
+              (setq end   (1- (match-end which))))
             (setq bounds (cons start end))))))
     (when start
       (if (not goto)
@@ -1130,7 +1145,7 @@ Any command cancels this state."
                        (stralts (mapcar (lambda (elt)
                                           (car elt))
                                         alts))
-                       (case-fold-search t)
+                       (completion-ignore-case t)
                        (stralt (completing-read "Type: " stralts nil t))
                        (alt (assoc stralt alts)))
                   (setq def (cdr alt))))))
@@ -1143,21 +1158,56 @@ Any command cancels this state."
                      ;;(file (find-source-lisp-file (with-current-buffer buf buffer-file-name)) )
                      (file (with-current-buffer buf buffer-file-name))
                      (orig-buf (find-file-noselect file)))
-                (mlinks-switch-to-buffer orig-buf))
+                (mlinks-switch-to-buffer orig-buf)
               (let ((p (cdr (cdr def))))
+                  ;; Fix-me: Move this test to a more general place.
+                  (if (or (< p (point-min))
+                          (> p (point-max)))
+                      ;; Check for cloned indirect buffers.
+                      (progn
+                        (setq orig-buf
+                              (catch 'view-in-buf
+                                (dolist (indirect-buf (buffer-list))
+                                  ;;(message "base-buffer=%s, orig-buf=%s, eq => %s" (buffer-base-buffer indirect-buf) orig-buf (eq (buffer-base-buffer indirect-buf) orig-buf))
+                                  (when (eq (buffer-base-buffer indirect-buf) orig-buf)
+                                    (with-current-buffer indirect-buf
+                                      ;;(message "indirect-buf=%s" indirect-buf)
+                                      (unless (or (< p (point-min))
+                                                  (> p (point-max)))
+                                        ;;(message "switching")
+                                        ;;(mlinks-switch-to-buffer indirect-buf)
+                                        (message "mlinks: Switching to indirect buffer because of narrowing")
+                                        (throw 'view-in-buf indirect-buf)
+                                        ))
+                                    ))))
+                        (when orig-buf
+                          (mlinks-switch-to-buffer orig-buf))
+                        ;;(message "cb=%s" (current-buffer))
                 (if (or (< p (point-min))
                         (> p (point-max)))
                     (when (y-or-n-p (format "%s is invisible because of narrowing. Widen? " symbol--))
                       (widen)
                       (goto-char p))
-                  (goto-char p))))
+                          (goto-char p)))
+                    (goto-char p)))))
              ((eq goto-- 'custom)
               (mlinks-custom symbol--))
              (t
               (error "Back goto-- value again: %s" goto--)))))))))
 
 (defun mlinks-elisp-mode-require (module)
-  (find-library module))
+  (let ((where mlinks-temp-buffer-where))
+    (cond
+     ((null where)
+      (find-library module))
+     ((eq where 'other-window)
+      (other-window 1)
+      (find-library module))
+     ((eq where 'other-frame)
+      (make-frame-command)
+      (find-library module))
+     (t
+      (error "Invalid argument, where=%s" where)))))
 
 
 
@@ -1210,6 +1260,81 @@ Any command cancels this state."
             (funcall hitfun))
           )))))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Font lock (not ready)
+
+(defun mlink-render-link (beg end)
+  (when (not (get-text-property beg 'mlink-fontified))
+    (save-excursion
+      (goto-char beg)
+      (add-text-properties beg (+ beg 1) (list 'mlink-fontified t))
+      (let* ((sexp (read (current-buffer)))
+	     (plist (eval sexp))
+	     (renderer (plist-get plist :render)))
+	(when (null renderer) (error "No renderer for link."))
+	(funcall renderer beg end)))))
+
+
+(defun mlink-do-font-lock (add-or-remove)
+  (funcall add-or-remove nil
+	   `((,mlink-generic-regexp
+	      0
+	      (let ((beg (match-beginning 0))
+		    (end (match-end 0)))
+		(mlink-render-link beg end)
+		mlink-generic-face)
+	      prepend))))
+
+(defun mlink-font-lock (on)
+  (let ((add-or-remove (if on 'font-lock-add-keywords 'font-lock-remove-keywords))
+        (link-fun))
+    (funcall add-or-remove nil
+             `((mlinks-html-forward-link-2
+                1
+                mlinks-link
+                prepend)))
+    (font-lock-mode -1)
+    (font-lock-mode 1)))
+
+(defvar mlinks-nw 0)
+(defun mlinks-html-forward-link-2 (bound)
+  (when t ;;(> 100 (setq mlinks-nw (1+ mlinks-nw)))
+    (let ((start (point))
+          end-start
+          stop next-stop
+          (more t)
+          old-beg old-end
+          (wn 1)
+          ret)
+      (if (not (re-search-forward mlinks-html-link-regex bound t))
+      ;;(if (not (mlinks-html-forward-link nil bound))
+          (setq end-start bound)
+        (setq ret t)
+        (setq end-start (1- (point)))
+        (let* ((which (if (match-beginning 1) 1 2))
+               (beg (match-beginning which))
+               (end (match-end which)))
+          ;; Add the link, but how do I remove it? Or do I remove it?
+          ;; (message "added %s %s" beg end)
+          ;; (add-text-properties beg end
+          ;;                      (list 'mlinks-html-link t
+          ;;                            'mouse-face 'highlight))
+          ))
+      (setq stop start)
+      (setq next-stop -1)
+      (while (and (> 100 (setq wn (1+ wn)))
+                  (setq next-stop (next-single-property-change stop 'mlinks-html-link nil end-start))
+                  (/= next-stop stop))
+        (setq stop next-stop)
+        ;;(message "wn=%s, stop=%s beg=%s" wn stop end-start)
+        (if (get-text-property stop 'mlinks-html-link)
+            (setq old-beg stop)
+          (progn
+            ;;(message "remmd %s %s" old-beg stop)
+            (when old-beg
+              (remove-list-of-text-properties old-beg stop '(mlinks-html-link 'mouse-face))))
+          ))
+      ret)))
 ;;   (message "kb tab=%s, \\t=%s, ovl=%s, keymap=%s"
 ;;            (key-binding [tab])
 ;;            (key-binding "\t")
diff --git a/elpa-to-submit/nxhtml/util/mumamo-aspnet.el b/elpa-to-submit/nxhtml/util/mumamo-aspnet.el
index b8cb03f38e..4cee4c92b6 100644
--- a/elpa-to-submit/nxhtml/util/mumamo-aspnet.el
+++ b/elpa-to-submit/nxhtml/util/mumamo-aspnet.el
@@ -61,43 +61,43 @@
 
 ;;;
 
-(defun mumamo-aspnet-add-me()
-  "Make mumamo aware of the ASP.Net extension."
-  (add-to-list 'mumamo-chunk-family-list
-               '("ASP.Net nXhtml Family" nxhtml-mode
-                 (mumamo-chunk-aspnet
-                  mumamo-chunk-aspnet-script
-                  mumamo-chunk-inlined-style
-                  mumamo-chunk-inlined-script
-                  mumamo-chunk-style=
-                  mumamo-chunk-onjs=
-                  ))
-               t)
-  (add-to-list 'mumamo-chunk-family-list
-               '("ASP.Net XHTML Family" html-mode
-                 (mumamo-chunk-aspnet
-                  mumamo-chunk-aspnet-script
-                  mumamo-chunk-inlined-style
-                  mumamo-chunk-inlined-script
-                  mumamo-chunk-style=
-                  mumamo-chunk-onjs=
-                  ))
-               t)
-
-
-  (add-to-list 'mumamo-filenames-list
-               '("\\.aspx\\'" "ASP.Net nXhtml Family"))
-  ;; Make it SET for current session in Custom.
-  (customize-set-variable 'mumamo-filenames-list mumamo-filenames-list)
-  (customize-set-value 'mumamo-filenames-list mumamo-filenames-list)
-
-  ;; this is how to set up mode aliases, should we need them.
-  (add-to-list 'mumamo-major-modes '(csharp-mode csharp-mode))
-  (add-to-list 'mumamo-major-modes '(vbnet-mode vbnet-mode))
-  ;; Make it SET for current session in Custom.
-  (customize-set-variable 'mumamo-major-modes mumamo-major-modes)
-  (customize-set-value 'mumamo-major-modes mumamo-major-modes)
-  )
+;; (defun mumamo-aspnet-add-me()
+;;   "Make mumamo aware of the ASP.Net extension."
+;;   (add-to-list 'mumamo-chunk-family-list
+;;                '("ASP.Net nXhtml Family" nxhtml-mode
+;;                  (mumamo-chunk-aspnet
+;;                   mumamo-chunk-aspnet-script
+;;                   mumamo-chunk-inlined-style
+;;                   mumamo-chunk-inlined-script
+;;                   mumamo-chunk-style=
+;;                   mumamo-chunk-onjs=
+;;                   ))
+;;                t)
+;;   (add-to-list 'mumamo-chunk-family-list
+;;                '("ASP.Net XHTML Family" html-mode
+;;                  (mumamo-chunk-aspnet
+;;                   mumamo-chunk-aspnet-script
+;;                   mumamo-chunk-inlined-style
+;;                   mumamo-chunk-inlined-script
+;;                   mumamo-chunk-style=
+;;                   mumamo-chunk-onjs=
+;;                   ))
+;;                t)
+
+
+;;   (add-to-list 'mumamo-filenames-list
+;;                '("\\.aspx\\'" "ASP.Net nXhtml Family"))
+;;   ;; Make it SET for current session in Custom.
+;;   (customize-set-variable 'mumamo-filenames-list mumamo-filenames-list)
+;;   (customize-set-value 'mumamo-filenames-list mumamo-filenames-list)
+
+;;   ;; this is how to set up mode aliases, should we need them.
+;;   (add-to-list 'mumamo-major-modes '(csharp-mode csharp-mode))
+;;   (add-to-list 'mumamo-major-modes '(vbnet-mode vbnet-mode))
+;;   ;; Make it SET for current session in Custom.
+;;   (customize-set-variable 'mumamo-major-modes mumamo-major-modes)
+;;   (customize-set-value 'mumamo-major-modes mumamo-major-modes)
+;;   )
 
 
 ;;; aspnet
@@ -128,15 +128,19 @@ Internal variable.")
 
 (defun mumamo-aspnet-get-mode-for-chunk (&optional chunk-type)
   (cond ((eq chunk-type 'script)
-         (mumamo-mode-from-modespec
+         (mumamo-get-major-mode-substitute
           (or (if (looking-at mumamo-aspnet-language-regex)
                   (mumamo-aspnet-mode-spec-for-language (match-string 1))
                   (mumamo-aspnet-get-page-language-mode-spec))
-              'fundamental-mode)))
+              'fundamental-mode)
+          'fontification))
         ((eq chunk-type 'directive)
          'fundamental-mode)
-        (t (mumamo-mode-from-modespec
-            (mumamo-aspnet-get-page-language-mode-spec)))))
+        ;;(t (mumamo-mode-from-modespec
+        (t (mumamo-get-major-mode-substitute
+            (mumamo-aspnet-get-page-language-mode-spec)
+            'fontification
+            ))))
 
 
 (defun mumamo-chunk-aspnet(pos min max)
@@ -148,7 +152,8 @@ Internal variable.")
                               'mumamo-search-fw-exc-end-jsp))
 
 (defun mumamo-search-bw-exc-start-aspnet(pos min)
-  (let ((exc-start (mumamo-search-bw-exc-start-str pos min "<%")))
+  ;;(let ((exc-start (mumamo-search-bw-exc-start-str pos min "<%")))
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<%")))
     (when (and exc-start
                (<= exc-start pos))
       (cons exc-start
@@ -212,6 +217,8 @@ Internal variable.")
                               'mumamo-search-fw-exc-start-aspnet-script
                               'mumamo-search-fw-exc-end-inlined-script))
 
+;; Fix-me: define a multi major mode for asp. Or maybe just drop this
+;; file?
 
 (provide 'mumamo-aspnet)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/util/mumamo-fun.el b/elpa-to-submit/nxhtml/util/mumamo-fun.el
index 80db83d76c..42ff654c25 100644
--- a/elpa-to-submit/nxhtml/util/mumamo-fun.el
+++ b/elpa-to-submit/nxhtml/util/mumamo-fun.el
@@ -1,1993 +1,2435 @@
-;;; mumamo-fun.el --- Multi major mode functions
-;;
-;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-03-09T01:35:21+0100 Sun
-;; Version: 0.51
-;; Last-Updated: 2008-08-04T17:54:29+0200 Mon
-;; URL:
-;; Keywords:
-;; Compatibility:
-;;
-;; Features that might be required by this library:
-;;
-;;   `backquote', `bytecomp', `cl', `flyspell', `ispell', `mumamo',
-;;   `sgml-mode'.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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 3, or (at your option)
-;; any later version.
-;;
-;; This program 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;; Defines some "multi major modes" functions.  See mumamo.el for more
-;; information.
-;;
-;;;; Usage:
-;;
-;;  See mumamo.el for how to use the multi major mode functions
-;;  defined here.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Change log:
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(eval-when-compile (add-to-list 'load-path default-directory))
-(require 'mumamo)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; File wide key bindings
-
-(defun mumamo-multi-mode-map ()
-  "Return mumamo multi mode keymap."
-  (symbol-value
-   (intern-soft (concat (symbol-name mumamo-multi-major-mode) "-map"))))
-
-;; (defun mumamo-multi-mode-hook-symbol ()
-;;   "Return mumamo multi mode hook symbol."
-;;   (intern-soft (concat (symbol-name mumamo-multi-major-mode) "-hook")))
-
-(defun mumamo-define-html-file-wide-keys ()
-  (let ((map (mumamo-multi-mode-map)))
-    (define-key map [(control ?c) (control ?h) ?b] 'nxhtml-browse-file)
-    ))
-;; (defun mumamo-add-html-file-wide-keys (hook)
-;;   (add-hook hook 'mumamo-define-html-file-wide-keys)
-;;   )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Chunk search routines for XHTML things
-
-(defun mumamo-chunk-attr=(pos min max attr= attr=is-regex attr-regex submode)
-  "This should work similar to `mumamo-find-possible-chunk'.
-See `mumamo-chunk-style=' for an example of use."
-  (mumamo-condition-case err
-      (save-match-data
-        (if (not attr=is-regex)
-            (goto-char (+ pos (length attr=)))
-          (goto-char pos)
-          (skip-chars-forward "a-zA-Z="))
-        (let ((prev-attr= (if attr=is-regex
-                              (re-search-backward attr= min t)
-                            (search-backward attr= min t)))
-              prev-attr-sure
-              next-attr=
-              start start-border
-              end   end-border
-              exc-mode
-              borders
-              exc-start-prev
-              exc-end-prev
-              exc-start-next
-              exc-end-next
-              )
-          ;; make sure if we have find prev-attr= or not
-          (while (and prev-attr=
-                      (not prev-attr-sure))
-            (if (not (search-backward "<" min t))
-                (setq prev-attr= nil)
-              (if (looking-at attr-regex)
-                  (setq prev-attr-sure 'found)
-                (setq prev-attr= (if attr=is-regex
-                                     (re-search-backward attr= min t)
-                                   (search-backward attr= min t))))))
-          ;; find prev change and if inside style= the next change
-;;;           (when (and prev-attr=
-;;;                      (search-backward "<" min t))
-;;;             (when (looking-at attr-regex)
-          (when prev-attr=
-              (setq exc-start-prev (match-beginning 1))
-              (setq exc-end-prev   (match-end 2))
-              (when (<= exc-start-prev pos)
-;;;                 (if (>= pos exc-end-prev)
-;;;                     (setq start exc-end-prev)
-;;;                   (setq exc-mode submode)
-;;;                   (setq start exc-start-prev)
-;;;                   (setq end exc-end-prev))
-                (if (> pos exc-end-prev)
-                    (progn
-                      (setq start (+ (match-end 2) 1))
-                      ;;(setq start-border (+ (match-end 2) 2))
-                      )
-                  (setq exc-mode submode)
-                  (setq start (match-beginning 1))
-                  (setq start-border (match-beginning 2))
-                  (setq end (1+ (match-end 2)))
-                  (setq end-border (1- end)))
-                ))
-            ;;)
-          ;; find next change
-          (unless end
-            (if start
-                (goto-char start)
-              (goto-char pos)
-              (search-backward "<" min t))
-            (setq next-attr= (if attr=is-regex
-                                 (re-search-forward attr= max t)
-                               (search-forward attr= max t)))
-            (when (and next-attr=
-                       (search-backward "<" min t))
-              (when (looking-at attr-regex)
-                (setq end (match-beginning 1)))))
-          (when start (assert (<= start pos) t))
-          (when end   (assert (<= pos end) t))
-          (goto-char pos)
-          (setq borders (list start-border end-border nil))
-          ;;(message "ret=%s" (list start end exc-mode borders))
-          (list start end exc-mode borders)
-          ;;nil
-          ))
-    (error
-     (mumamo-display-error 'mumamo-chunk-attr= "%s"
-                           (error-message-string err)))))
-
-;;;; xml pi
-
-(defvar mumamo-xml-pi-mode-alist
-  '(("php"    . php-mode)
-    ("python" . python-mode))
-  "Alist used by `mumamo-chunk-xml-pi' to get exception mode." )
-
-;; Fix-me: make it possible to make the borders part of the php chunk
-;; so that parsing of them by nxml may be skipped. Or, rather if the
-;; borders are not part of the chunk then assume nxml can not parse
-;; the chunk and the borders.
-(defun mumamo-search-bw-exc-start-xml-pi-1 (pos min lt-chars)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MIN is where to stop.
-LT-CHARS is just <?.
-
-Actual use is in `mumamo-search-bw-exc-start-xml-pi'."
-  (let ((exc-start (mumamo-chunk-start-bw-str (+ pos 2) min lt-chars))
-        spec
-        exc-mode
-        hit)
-    (when exc-start
-      (goto-char exc-start)
-      (when (and (not (looking-at "xml"))
-                 (looking-at (rx (0+ (any "a-z")))))
-        ;; (setq exc-start (match-end 0)) include it in sub chunk instead
-        (setq exc-start (- exc-start 2))
-        (setq spec (match-string-no-properties 0))
-        (setq exc-mode (assoc spec mumamo-xml-pi-mode-alist))
-        (when exc-mode (setq exc-mode (cdr exc-mode)))
-        (setq hit t)
-        )
-      (when hit
-        (unless exc-mode
-          ;;(setq exc-mode 'fundamental-mode)
-          ;; Fix-me: Better assume php-mode
-          (setq exc-mode 'php-mode))
-        (when (<= exc-start pos)
-          ;;(cons exc-start exc-mode)
-          (list exc-start exc-mode nil)
-          )))))
-
-(defun mumamo-search-bw-exc-start-xml-pi (pos min)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-search-bw-exc-start-xml-pi-1 pos min "<?"))
-
-(defun mumamo-xml-pi-end-is-xml-end (pos)
-  "Return t if the ?> at pos is end of <?xml."
-  (when (> 1000 pos)
-;;;     (assert (and (= (char-after pos) ??)
-;;;                  (= (char-after (1+ pos)) ?>)))
-    (save-excursion
-      (save-restriction
-        (widen)
-        (save-match-data
-          (when (search-backward "<" (- pos 150) t)
-            (when (looking-at (rx line-start "<\?xml" (1+ space)))
-              (mumamo-msgfntfy "mumamo-xml-pi-end-is-xml-end %s => t" pos)
-              t)))))))
-
-(defun mumamo-search-bw-exc-end-xml-pi (pos min)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MIN is where to stop."
-  ;; Fix me: merge xml header
-  (mumamo-msgfntfy "mumamo-search-bw-exc-end-xml-pi %s %s" pos min)
-  ;;(let ((end-pos (mumamo-chunk-end-bw-str pos min "?>")))
-  (let ((end-pos (mumamo-chunk-end-bw-str-inc pos min "?>")))
-    (mumamo-msgfntfy "  end-pos=%s" end-pos)
-    (when end-pos
-      (unless (or (mumamo-xml-pi-end-is-xml-end end-pos)
-;;;                   (progn
-;;;                     (save-restriction
-;;;                       (widen)
-;;;                       (message "not xml-end, end-pos=%s, cb=%s, char-after end-pos - 1=%s, point=%s, point-max=%s, sub=%s"
-;;;                                end-pos
-;;;                                (current-buffer)
-;;;                                (char-after (- end-pos 1))
-;;;                                (point)
-;;;                                (point-max)
-;;;                                (buffer-substring-no-properties (1- end-pos) end-pos)
-;;;                                ))
-;;;                     nil)
-                  (= (save-restriction
-                       (widen)
-                       (char-after (- end-pos 1)))
-                     ?<))
-        (mumamo-msgfntfy "  returning end-pos")
-        end-pos))))
-
-(defun mumamo-search-fw-exc-end-xml-pi (pos max)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MAX is where to stop."
-  ;; Fix me: merge xml header
-  ;;(let ((end-pos (mumamo-chunk-end-fw-str pos max "?>")))
-  (let ((end-pos (mumamo-chunk-end-fw-str-inc pos max "?>")))
-    (when end-pos
-      (unless (mumamo-xml-pi-end-is-xml-end end-pos)
-        end-pos))))
-
-(defun mumamo-search-fw-exc-start-xml-pi-1 (pos max lt-chars)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MAX is where to stop.
-
-Used in `mumamo-search-fw-exc-start-xml-pi'.  For an explanation
-of LT-CHARS see `mumamo-search-bw-exc-start-xml-pi-1'."
-  (goto-char pos)
-  (skip-chars-backward "a-zA-Z")
-  ;;(let ((end-out (mumamo-chunk-start-fw-str (point) max lt-chars)))
-  (let ((end-out (mumamo-chunk-start-fw-str-inc (point) max lt-chars)))
-    (when (looking-at "xml")
-      (if t ;(= 1 pos)
-          (setq end-out (mumamo-chunk-start-fw-str-inc (1+ (point)) max lt-chars))
-        (setq end-out nil)))
-    (when end-out
-      ;; Get end-out:
-      (if (looking-at (rx (0+ (any "a-z"))))
-          ;;(setq end-out (match-end 0))
-          (setq end-out (- (match-beginning 0) 2))
-        (setq end-out nil)))
-    end-out))
-
-(defun mumamo-search-fw-exc-start-xml-pi (pos max)
-  "Helper for `mumamo-chunk-xml-pi'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-search-fw-exc-start-xml-pi-1 pos max "<?"))
-
-;; Add a find-borders-fun here so that for example src="<?php some
-;; code ?>" can be handled.
-;;
-;; Fix-me: Maybe generalize for other values than <?php
-(defun mumamo-find-borders-xml-pi (start end exc-mode)
-  (let (start-border
-        end-border
-        (inc t)
-        ;;(begin-mark "<?php")
-        (begin-mark "<?")
-        (end-mark "?>")
-        (here (point)))
-    (if (and inc exc-mode)
-        (progn
-          (when start
-            ;;(setq start-border (+ start (length begin-mark)))
-            (goto-char (+ start (length begin-mark)))
-            (skip-chars-forward "=a-zA-Z")
-            (setq start-border (point))
-            )
-          (when end
-            (setq end-border
-                  (- end (length end-mark)))))
-      (if (and (not inc) (not exc-mode))
-          (progn
-            (when start
-              (setq start-border
-                    (+ start (length end-mark))))
-            (when end
-              (setq end-border (- end (length begin-mark)))
-              ;;(goto-char end)
-              ;;(skip-chars-forward "=a-zA-Z")
-              ;;(setq end-border (point))
-              ))))
-    (goto-char here)
-    (when (or start-border end-border)
-      (list start-border end-border))))
-
-(defun mumamo-chunk-xml-pi (pos min max)
-  "Find process instruction, <? ... ?>.  Return range and wanted mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-xml-pi
-                              'mumamo-search-bw-exc-end-xml-pi
-                              'mumamo-search-fw-exc-start-xml-pi
-                              'mumamo-search-fw-exc-end-xml-pi
-                              'mumamo-find-borders-xml-pi
-                              ))
-
-
-;;;; <style ...>
-
-(defconst mumamo-style-tag-start-regex
-  (rx "<style"
-      space
-      (0+ (not (any ">")))
-      "type"
-      (0+ space)
-      "="
-      (0+ space)
-      ?\"
-      "text/css"
-      ?\"
-      (0+ (not (any ">")))
-      ">"
-      ;; FIX-ME: Commented out because of bug in Emacs
-      ;;
-      ;;(optional (0+ space) "<![CDATA[")
-      ))
-
-(defun mumamo-search-bw-exc-start-inlined-style (pos min)
-  "Helper for `mumamo-chunk-inlined-style'.
-POS is where to start search and MIN is where to stop."
-  (goto-char (+ pos 6))
-  (let ((marker-start (search-backward "<style" min t))
-        exc-mode
-        exc-start)
-    (when marker-start
-      (when (looking-at mumamo-style-tag-start-regex)
-        (setq exc-start (match-end 0))
-        (goto-char exc-start)
-        (when (<= exc-start pos)
-          ;;(cons (point) 'css-mode)
-          (list (point) 'css-mode '(nxml-mode))
-          )
-        ))))
-
-(defun mumamo-search-bw-exc-end-inlined-style (pos min)
-  "Helper for `mumamo-chunk-inlined-style'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</style>"))
-
-(defun mumamo-search-fw-exc-start-inlined-style (pos max)
-  "Helper for `mumamo-chunk-inlined-style'.
-POS is where to start search and MAX is where to stop."
-  (goto-char (1+ pos))
-  (skip-chars-backward "^<")
-  ;; Handle <![CDATA[
-  (when (and
-         (eq ?< (char-before))
-         (eq ?! (char-after))
-         (not (bobp)))
-    (backward-char)
-    (skip-chars-backward "^<"))
-  (unless (bobp)
-    (backward-char 1))
-  (let ((exc-start (search-forward "<style" max t))
-        exc-mode)
-    (when exc-start
-      (goto-char (- exc-start 6))
-      (when (looking-at mumamo-style-tag-start-regex)
-        (goto-char (match-end 0))
-        (point)
-        ))))
-
-(defun mumamo-search-fw-exc-end-inlined-style (pos max)
-  "Helper for `mumamo-chunk-inlined-style'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</style>"))
-
-(defun mumamo-chunk-inlined-style (pos min max)
-  "Find <style>...</style>.  Return range and 'css-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-inlined-style
-                              'mumamo-search-bw-exc-end-inlined-style
-                              'mumamo-search-fw-exc-start-inlined-style
-                              'mumamo-search-fw-exc-end-inlined-style))
-
-;;;; <script ...>
-
-(defconst mumamo-script-tag-start-regex
-  (rx "<script"
-      space
-      (0+ (not (any ">")))
-      "type"
-      (0+ space)
-      "="
-      (0+ space)
-      ?\"
-      ;;(or "text" "application")
-      ;;"/"
-      ;;(or "javascript" "ecmascript")
-      "text/javascript"
-      ?\"
-      (0+ (not (any ">")))
-      ">"
-      ;; FIX-ME: Commented out because of bug in Emacs
-      ;;
-      ;;(optional (0+ space) "<![CDATA[" )
-      ))
-
-(defun mumamo-search-bw-exc-start-inlined-script (pos min)
-  "Helper for `mumamo-chunk-inlined-script'.
-POS is where to start search and MIN is where to stop."
-  (goto-char (+ pos 7))
-  (let ((marker-start (search-backward "<script" min t))
-        exc-mode
-        exc-start)
-    (when marker-start
-      (when (looking-at mumamo-script-tag-start-regex)
-        (setq exc-start (match-end 0))
-        (goto-char exc-start)
-        (when (<= exc-start pos)
-          ;;(cons (point) 'javascript-mode)
-          (list (point) 'javascript-mode '(nxml-mode))
-          )
-        ))))
-
-(defun mumamo-search-bw-exc-end-inlined-script (pos min)
-  "Helper for `mumamo-chunk-inlined-script'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</script>"))
-
-(defun mumamo-search-fw-exc-start-inlined-script (pos max)
-  "Helper for `mumamo-chunk-inlined-script'.
-POS is where to start search and MAX is where to stop."
-  (goto-char (1+ pos))
-  (skip-chars-backward "^<")
-  ;; Handle <![CDATA[
-  (when (and
-         (eq ?< (char-before))
-         (eq ?! (char-after))
-         (not (bobp)))
-    (backward-char)
-    (skip-chars-backward "^<"))
-  (unless (bobp)
-    (backward-char 1))
-  (let ((exc-start (search-forward "<script" max t))
-        exc-mode)
-    (when exc-start
-      (goto-char (- exc-start 7))
-      (when (looking-at mumamo-script-tag-start-regex)
-        (goto-char (match-end 0))
-        (point)
-        ))))
-
-(defun mumamo-search-fw-exc-end-inlined-script (pos max)
-  "Helper for `mumamo-chunk-inlined-script'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</script>"))
-
-(defun mumamo-chunk-inlined-script (pos min max)
-  "Find <script>...</script>.  Return range and 'javascript-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-inlined-script
-                              'mumamo-search-bw-exc-end-inlined-script
-                              'mumamo-search-fw-exc-start-inlined-script
-                              'mumamo-search-fw-exc-end-inlined-script))
-
-;;;; on[a-z]+=\"javascript:"
-
-(defconst mumamo-onjs=start-regex
-  (rx "<"
-      (0+ (not (any ">")))
-      space
-      (submatch
-       "on"
-       (1+ (any "a-za-z"))
-       "=")
-      (0+ space)
-      ?\"
-      (submatch
-       (opt "javascript:")
-       (0+
-        (not (any "\""))))
-      ))
-
-(defun mumamo-chunk-onjs=(pos min max)
-  "Find javascript on...=\"...\".  Return range and 'javascript-mode."
-  (mumamo-chunk-attr= pos min max "on[a-z]+=" t mumamo-onjs=start-regex
-                      'javascript-mode))
-
-;;;; style=
-
-(defconst mumamo-style=start-regex
-  (rx "<"
-      (0+ (not (any ">")))
-      space
-      (submatch "style=")
-      (0+ space)
-      ?\"
-      (submatch
-       (0+
-        (not (any "\""))))
-      ))
-
-(defun mumamo-chunk-style=(pos min max)
-  "Find style=\"...\".  Return range and 'css-mode."
-  (mumamo-chunk-attr= pos min max "style=" nil mumamo-style=start-regex
-                      'css-mode))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; HTML w html-mode
-
-;;;###autoload
-(define-mumamo-multi-major-mode html-mumamo-mode
-  "Turn on multiple major modes for (X)HTML with main mode `html-mode'.
-This covers inlined style and javascript and PHP."
-  ("HTML Family" html-mode
-   (mumamo-chunk-xml-pi
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-(add-hook 'html-mumamo-mode-hook 'mumamo-define-html-file-wide-keys)
-;; (define-mumamo-multi-major-mode xml-pi-only-mumamo-mode
-;;   "Test"
-;;   ("HTML Family" html-mode
-;;    (mumamo-chunk-xml-pi
-;;     )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; XHTML w nxml-mode
-
-;;;###autoload
-(define-mumamo-multi-major-mode nxml-mumamo-mode
-  "Turn on multiple major modes for (X)HTML with main mode `nxml-mode'.
-This covers inlined style and javascript and PHP."
-    ("nXml Family" nxml-mode
-     (mumamo-chunk-xml-pi
-      mumamo-chunk-inlined-style
-      mumamo-chunk-inlined-script
-      mumamo-chunk-style=
-      mumamo-chunk-onjs=
-      )))
-(add-hook 'nxml-mumamo-mode-hook 'mumamo-define-html-file-wide-keys)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Embperl
-
-(defun mumamo-chunk-embperl-<- (pos min max)
-  "Find [- ... -], return range and `perl-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "[-" "-]" t 'perl-mode t))
-
-(defun mumamo-chunk-embperl-<+ (pos min max)
-  "Find [+ ... +], return range and `perl-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "[+" "+]" t 'perl-mode nil))
-
-(defun mumamo-chunk-embperl-<! (pos min max)
-  "Find [! ... !], return range and `perl-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "[!" "!]" t 'perl-mode t))
-
-(defun mumamo-chunk-embperl-<$ (pos min max)
-  "Find [$ ... $], return range and `perl-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  ;; This is a bit tricky since [$var] etc must be avoided.
-  (let* ((begin-mark "[$")
-         (end-mark "$]")
-         (good-chars '(32 ;space
-                       10 ;line feed
-                       9  ;tab
-                       ))
-         (search-bw-exc-start (lambda (pos min)
-                                (let ((not-found t)
-                                      (next-char nil)
-                                      (exc-start (mumamo-chunk-start-bw-str
-                                                  pos min begin-mark))
-                                      (here (point)))
-                                  (while (and not-found
-                                              exc-start)
-                                    (setq next-char (char-after (+ (point) 2)))
-                                    (if (memq next-char good-chars)
-                                        (setq not-found nil)
-                                      (setq exc-start
-                                            (search-backward begin-mark
-                                                             min t))))
-                                  (when (and exc-start
-                                             (<= exc-start pos))
-                                    (cons exc-start 'perl-mode)))))
-         (search-bw-exc-end (lambda (pos min)
-                              (mumamo-chunk-end-bw-str pos min end-mark)))
-         (search-fw-exc-start (lambda (pos max)
-                                (let ((not-found t)
-                                      (next-char nil)
-                                      (exc-start (mumamo-chunk-start-fw-str
-                                                  pos max begin-mark))
-                                      (here (point)))
-                                  (while (and not-found
-                                              exc-start)
-                                    (setq next-char (char-after))
-                                    (if (memq next-char good-chars)
-                                        (setq not-found nil)
-                                      (setq exc-start
-                                            (search-forward begin-mark
-                                                            max t))))
-                                  exc-start)))
-         (search-fw-exc-end (lambda (pos max)
-                              (mumamo-chunk-end-fw-str pos max end-mark)))
-         )
-    (mumamo-find-possible-chunk pos min max
-                                search-bw-exc-start
-                                search-bw-exc-end
-                                search-fw-exc-start
-                                search-fw-exc-end)))
-
-;;;###autoload
-(define-mumamo-multi-major-mode embperl-html-mumamo-mode
-  "Turn on multiple major modes for Embperl files with main mode `html-mode'.
-This also covers inlined style and javascript."
-    ("Embperl HTML Family" html-mode
-     (mumamo-chunk-embperl-<-
-      mumamo-chunk-embperl-<+
-      mumamo-chunk-embperl-<!
-      mumamo-chunk-embperl-<$
-      mumamo-chunk-inlined-style
-      mumamo-chunk-inlined-script
-      mumamo-chunk-style=
-      mumamo-chunk-onjs=
-     )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; django
-
-(defun mumamo-chunk-django4(pos min max)
-  "Find {% comment %}.  Return range and `django-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "{% comment %}" "{% endcomment %}" t 'django-comment-mode t))
-;;;   (mumamo-find-possible-chunk pos min max
-;;;                               'mumamo-search-bw-exc-start-django4
-;;;                               'mumamo-search-bw-exc-end-django4
-;;;                               'mumamo-search-fw-exc-start-django4
-;;;                               'mumamo-search-fw-exc-end-django4))
-
-(defun mumamo-chunk-django3(pos min max)
-  "Find {# ... #}.  Return range and `django-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "{#" "#}" t 'django-comment-mode t))
-;;;   (mumamo-find-possible-chunk pos min max
-;;;                               'mumamo-search-bw-exc-start-django3
-;;;                               'mumamo-search-bw-exc-end-django3
-;;;                               'mumamo-search-fw-exc-start-django3
-;;;                               'mumamo-search-fw-exc-end-django3))
-
-(defun mumamo-chunk-django2(pos min max)
-  "Find {{ ... }}.  Return range and `django-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "{{" "}}" t 'django-variable-mode t))
-;;;   (mumamo-find-possible-chunk pos min max
-;;;                               'mumamo-search-bw-exc-start-django2
-;;;                               'mumamo-search-bw-exc-end-django2
-;;;                               'mumamo-search-fw-exc-start-django2
-;;;                               'mumamo-search-fw-exc-end-django2))
-
-(defun mumamo-chunk-django (pos min max)
-  "Find {% ... %}.  Return range and `django-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "{%" "%}" t 'django-mode t))
-;;;   (mumamo-find-possible-chunk pos min max
-;;;                               'mumamo-search-bw-exc-start-django
-;;;                               'mumamo-search-bw-exc-end-django
-;;;                               'mumamo-search-fw-exc-start-django
-;;;                               'mumamo-search-fw-exc-end-django))
-
-(defun mumamo-search-bw-exc-start-django (pos min)
-  "Helper for `mumamo-chunk-django'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{%")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'django-mode))))
-
-(defun mumamo-search-bw-exc-start-django2(pos min)
-  "Helper for `mumamo-chunk-django2'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{{")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'django-mode))))
-
-(defun mumamo-search-bw-exc-start-django3(pos min)
-  "Helper for `mumamo-chunk-django3'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{#")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'django-comment-mode))))
-
-(defun mumamo-search-bw-exc-start-django4(pos min)
-  "Helper for `mumamo-chunk-django4'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min
-                                                       "{% comment %}")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'django-comment-mode))))
-
-(defun mumamo-search-bw-exc-end-django (pos min)
-  "Helper for `mumamo-chunk-django'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str-inc pos min "%}"))
-
-(defun mumamo-search-bw-exc-end-django2(pos min)
-  "Helper for `mumamo-chunk-django2'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str-inc pos min "}}"))
-
-(defun mumamo-search-bw-exc-end-django3(pos min)
-  "Helper for `mumamo-chunk-django3'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str-inc pos min "#}"))
-
-(defun mumamo-search-bw-exc-end-django4(pos min)
-  "Helper for `mumamo-chunk-django4'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str-inc pos min "{% endcomment %}"))
-
-(defun mumamo-search-fw-exc-start-django (pos max)
-  "Helper for `mumamo-chunk-django'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str-inc pos max "{%"))
-
-(defun mumamo-search-fw-exc-start-django2(pos max)
-  "Helper for `mumamo-chunk-django2'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str-inc pos max "{{"))
-
-(defun mumamo-search-fw-exc-start-django3(pos max)
-  "Helper for `mumamo-chunk-django3'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str-inc pos max "{#"))
-
-(defun mumamo-search-fw-exc-start-django4(pos max)
-  "Helper for `mumamo-chunk-django4'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str-inc pos max "{% comment %}"))
-
-(defun mumamo-search-fw-exc-end-django (pos max)
-  "Helper for `mumamo-chunk-django'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str-inc pos max "%}"))
-
-(defun mumamo-search-fw-exc-end-django2(pos max)
-  "Helper for `mumamo-chunk-django2'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str-inc pos max "}}"))
-
-(defun mumamo-search-fw-exc-end-django3(pos max)
-  "Helper for `mumamo-chunk-django3'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str-inc pos max "#}"))
-
-(defun mumamo-search-fw-exc-end-django4(pos max)
-  "Helper for `mumamo-chunk-django4'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str-inc pos max "{% endcomment %}"))
-
-;;;###autoload
-(define-mumamo-multi-major-mode django-html-mumamo-mode
-  "Turn on multiple major modes for Django with main mode `html-mode'.
-This also covers inlined style and javascript."
-  ("Django HTML Family" html-mode
-   (mumamo-chunk-django4
-    mumamo-chunk-django
-    mumamo-chunk-django2
-    mumamo-chunk-django3
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Genshi / kid
-
-;; {% python ... %}
-(defun mumamo-chunk-genshi%(pos min max)
-  "Find {% python ... %}.  Return range and `genshi-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "{% python" "%}" t 'python-mode t))
-
-;; ${expr}
-(defun mumamo-chunk-genshi$(pos min max)
-  "Find ${ ... }, return range and `python-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (let ((chunk
-         (mumamo-quick-static-chunk pos min max "${" "}" t 'python-mode t)))
-    (when chunk
-      ;; Test for clash with %}
-      (let ((sub-mode (nth 2 chunk))
-            (start (nth 0 chunk)))
-        (if sub-mode
-            chunk
-          ;;(message "point.1=%s" (point))
-          (when (and start
-                     (eq ?% (char-before start)))
-            ;;(message "point.2=%s" (point))
-            ;;(message "clash with %%}, chunk=%s" chunk)
-            ;;(setq chunk nil)
-            (setcar chunk (1- start))
-            )
-          ;;(message "chunk.return=%s" chunk)
-          chunk)))))
-
-;; Fix-me: Because of the way chunks currently are searched for there
-;; is an error when a python chunk is used. This is because mumamo
-;; gets confused by the %} ending and the } ending.  This can be
-;; solved by running a separate phase to get the chunks first and
-;; during that phase match start and end of the chunk.
-;;;###autoload
-(define-mumamo-multi-major-mode genshi-html-mumamo-mode
-  "Turn on multiple major modes for Genshi with main mode `html-mode'.
-This also covers inlined style and javascript.
-
-Note: You will currently get fontification errors if you use
-python chunks
-
-  {% python ... %}
-
-The reason is that the chunk routines currently do not know when
-to just look for the } or %} endings.  However this should not
-affect your editing normally."
-  ("Genshi HTML Family" html-mode
-   (
-    mumamo-chunk-genshi%
-    mumamo-chunk-genshi$
-    mumamo-chunk-xml-pi
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; MJT
-
-;; ${expr}
-(defun mumamo-chunk-mjt$(pos min max)
-  "Find ${ ... }, return range and `javascript-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "${" "}" t 'javascript-mode t))
-
-;;;###autoload
-(define-mumamo-multi-major-mode mjt-html-mumamo-mode
-  "Turn on multiple major modes for MJT with main mode `html-mode'.
-This also covers inlined style and javascript."
-  ("MJT HTML Family" html-mode
-   (
-    mumamo-chunk-mjt$
-    mumamo-chunk-xml-pi
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; smarty
-
-(defun mumamo-chunk-smarty (pos min max)
-  "Find { ... }.  Return range and 'smarty-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-smarty
-                              'mumamo-search-bw-exc-end-smarty
-                              'mumamo-search-fw-exc-start-smarty
-                              'mumamo-search-fw-exc-end-smarty))
-
-(defun mumamo-search-bw-exc-start-smarty (pos min)
-  "Helper for `mumamo-chunk-smarty'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{")))
-    (when (and exc-start
-               (<= exc-start pos))
-      (cons exc-start 'smarty-mode))))
-
-(defun mumamo-search-bw-exc-end-smarty (pos min)
-  "Helper for `mumamo-chunk-smarty'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str-inc pos min "}"))
-
-(defun mumamo-search-fw-exc-start-smarty (pos max)
-  "Helper for `mumamo-chunk-smarty'.
-POS is where to start search and MAX is where to stop."
-  (let ((end-out (mumamo-chunk-start-fw-str-inc pos max "{")))
-    end-out))
-
-(defun mumamo-search-fw-exc-end-smarty (pos max)
-  "Helper for `mumamo-chunk-smarty'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str-inc pos max "}"))
-
-;;;###autoload
-(define-mumamo-multi-major-mode smarty-html-mumamo-mode
-  "Turn on multiple major modes for Smarty with main mode `html-mode'.
-This also covers inlined style and javascript."
-  ("Smarty HTML Family" html-mode
-   (mumamo-chunk-xml-pi
-    mumamo-chunk-smarty
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; jsp
-
-(defun mumamo-chunk-jsp (pos min max)
-  "Find <% ... %>.  Return range and 'java-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "<%" "%>" t 'java-mode t))
-
-;;;###autoload
-(define-mumamo-multi-major-mode jsp-html-mumamo-mode
-  "Turn on multiple major modes for JSP with main mode `html-mode'.
-This also covers inlined style and javascript."
-    ("JSP HTML Family" html-mode
-     (mumamo-chunk-jsp
-      mumamo-chunk-inlined-style
-      mumamo-chunk-inlined-script
-      mumamo-chunk-style=
-      mumamo-chunk-onjs=
-      )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; eruby
-
-;; Fix-me: Maybe take care of <%= and <%- and -%>, but first ask the
-;; ruby people if this is worth doing.
-;;
-;; See also http://wiki.rubyonrails.org/rails/pages/UnderstandingViews
-(defun mumamo-chunk-eruby (pos min max)
-  "Find <% ... %>.  Return range and 'ruby-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "<%" "%>" t 'ruby-mode t))
-
-;; (defun mumamo-search-bw-exc-start-ruby (pos min)
-;;   "Helper for `mumamo-chunk-ruby'.
-;; POS is where to start search and MIN is where to stop."
-;;   (let ((exc-start (mumamo-chunk-start-bw-str pos min "<%")))
-;;     (when (and exc-start
-;;                (<= exc-start pos))
-;;       (cons exc-start 'ruby-mode))))
-
-;;;###autoload
-(define-mumamo-multi-major-mode eruby-mumamo-mode
-  "Turn on multiple major mode for eRuby with unspecified main mode.
-Current major-mode will be used as the main major mode."
-  ("eRuby Family" nil
-   (mumamo-chunk-eruby
-    )))
-
-;;;###autoload
-(define-mumamo-multi-major-mode eruby-html-mumamo-mode
-  "Turn on multiple major modes for eRuby with main mode `html-mode'.
-This also covers inlined style and javascript."
-  ("eRuby Html Family" html-mode
-   (mumamo-chunk-eruby
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Perl here doc
-
-(defcustom mumamo-perl-here-doc-modes
-  '(
-    ("_HTML_" html-mode)
-    )
-  "Matches for perl here doc modes.
-The entries in this list have the form
-
-  (REGEXP MAJOR-MODE)
-
-where REGEXP is a regular expression that should match the perl
-here document marker and MAJOR-MODE is the major mode to use in
-the perl here document.
-
-The entries are tried from the beginning until the first match."
-  :type '(repeat
-          (list
-           regexp
-           (function :tag "Major mode")))
-  :group 'mumamo)
-
-(defun mumamo-perl-here-doc-mode (marker)
-  "Get major mode associated with MARKER."
-  (let ((mode (catch 'mode
-                (dolist (rec mumamo-perl-here-doc-modes)
-                  (let ((regexp (nth 0 rec))
-                        (mode   (nth 1 rec)))
-                    (when (string-match regexp marker)
-                      (throw 'mode mode)))))))
-    (if mode
-        mode
-      'fundamental-mode)))
-
-(defun mumamo-chunk-perl-here-doc (pos min max)
-  "This should work similar to `mumamo-find-possible-chunk'.
-POS, MIN and MAX have the same meaning as there."
-  (mumamo-condition-case err
-      (let ((old-point (point)))
-        (goto-char pos)
-        ;; Adjust for beeing inside an <<...;
-        ;;(beginning-of-line)
-        ;;(when (looking-at (rx (1+ (not (any "<")))
-        ;;                      "<<"
-        ;;                      (submatch (1+ (not (any "^;")))) ";" line-end)
-        (end-of-line)
-        (beginning-of-line)
-        (let ((prev-<< (search-backward "<<" min t))
-              next-<<
-              here-doc-end-mark-end
-              here-doc-end-mark-start
-              here-doc-start-mark-start
-              here-doc-start-mark-end
-              here-doc-mark
-              start
-              end
-              exc-mode
-              )
-          ;; find prev change and end of that perl here doc
-          (when prev-<<
-            (when (looking-at (concat "<<[[:space:]]*\\([^\n;]*\\);"))
-              (setq here-doc-start-mark-start (match-beginning 0))
-              (setq here-doc-start-mark-end   (match-end 0))
-              (setq here-doc-mark  (buffer-substring-no-properties
-                                    (match-beginning 1)
-                                    (match-end 1)))
-              (end-of-line)
-              (setq here-doc-end-mark-end (search-forward here-doc-mark max t))
-              (when (and here-doc-end-mark-end
-                         (eolp))
-                (beginning-of-line)
-                (if (looking-at here-doc-mark)
-                    (setq here-doc-end-mark-start (point))
-                  (setq here-doc-end-mark-end nil)))
-              (if (and here-doc-end-mark-start
-                       (<= here-doc-end-mark-start pos))
-                  (progn
-                    (setq start here-doc-end-mark-start)
-                    )
-                (setq exc-mode (mumamo-perl-here-doc-mode here-doc-mark))
-                (setq start (1+ here-doc-start-mark-end))
-                (when here-doc-end-mark-start
-                  (setq end here-doc-end-mark-start))
-                )))
-          (unless end
-            (goto-char pos)
-            (beginning-of-line)
-            (setq next-<< (search-forward "<<" max t))
-            (when next-<<
-              (when (looking-at (concat "[[:space:]]*\\([^\n;]*\\);"))
-                (setq end (1+ (match-end 0))))))
-          (when start (assert (<= start pos) t))
-          (when end   (assert (<= pos end) t))
-          (goto-char old-point)
-          (list start end exc-mode t nil pos)))
-    (error (mumamo-display-error 'mumamo-chunk-perl-here-doc
-                                 "%s" (error-message-string err)))))
-
-(defun mumamo-chunk-perl-here-html (pos min max)
-  "Find perl here docs, still a little bit EXPERIMENTAL.
-See `mumamo-perl-here-doc-modes' for how to customize the choice
-of major mode in the perl here document.
-
-See `mumamo-find-possible-chunk' for POS, MIN
-and MAX.
-
-* Note: This used to be slow, but after fixing a bug in perl here
-  doc chunk dividing it seems to work ok."
-  (mumamo-msgfntfy "mumamo-chunk-perl-here-html start")
-  (let ((r (mumamo-chunk-perl-here-doc pos min max)))
-    (mumamo-msgfntfy "  perl-here stop")
-    r))
-
-;;;###autoload
-(define-mumamo-multi-major-mode perl-mumamo-mode
-  "Turn on multiple major modes for Perl Here Document."
-  ("Perl Here Doc" perl-mode
-   (mumamo-chunk-perl-here-html
-    )))
-
-;;;###autoload
-(define-mumamo-multi-major-mode cperl-mumamo-mode
-  "Turn on multiple major modes for Perl Here Document."
-  ("Perl Here Doc" cperl-mode
-   (mumamo-chunk-perl-here-html
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Tex meta
-
-(defun mumamo-search-bw-textext-start (pos min)
-  "Helper for `mumamo-chunk-textext'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "textext(\""))
-        (exc-mode 'plain-tex-mode))
-    (when exc-start
-      (when (<= exc-start pos)
-        (cons exc-start exc-mode)))))
-
-(defconst mumamo-textext-end-regex
-  (rx "textext("
-      (0+
-       (0+ (not (any "\"()")))
-       ?\"
-       (0+ (not (any "\"")))
-       ?\"
-       )
-      (0+ (not (any "\"()")))
-      ")"))
-
-(defun mumamo-textext-test-is-end (pos)
-  "Helper for `mumamo-chunk-textext'.
-Return POS if POS is at the end of textext chunk."
-  (when pos
-    (let ((here (point))
-          hit)
-      (goto-char (+ 2 pos))
-      (when (looking-back mumamo-textext-end-regex)
-        (setq hit t))
-      (goto-char here)
-      (when hit pos))))
-
-(defun mumamo-search-bw-textext-end (pos min)
-  "Helper for `mumamo-chunk-textext'.
-POS is where to start search and MIN is where to stop."
-  (let ((end (mumamo-chunk-end-bw-str pos min "\")"))
-        res)
-    (while (and end
-                (not (setq res (mumamo-textext-test-is-end end))))
-      (setq end (mumamo-chunk-end-bw-str (1- end) min "\")")))
-    res))
-
-(defun mumamo-search-fw-textext-start (pos max)
-  "Helper for `mumamo-chunk-textext'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str pos max "textext(\""))
-
-(defun mumamo-search-fw-textext-end (pos max)
-  "Helper for `mumamo-chunk-textext'.
-POS is where to start search and MAX is where to stop."
-  (let ((end (mumamo-chunk-end-fw-str pos max "\")")))
-    (mumamo-textext-test-is-end end)))
-
-(defun mumamo-chunk-textext (pos min max)
-  "Find textext or TEX chunks.  Return range and 'plain-tex-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-textext-start
-                              'mumamo-search-bw-textext-end
-                              'mumamo-search-fw-textext-start
-                              'mumamo-search-fw-textext-end))
-
-(defun mumamo-search-bw-verbatimtex-start (pos min)
-  "Helper for `mumamo-chunk-verbatimtextext'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "\nverbatimtex"))
-        (exc-mode 'plain-tex-mode))
-    (when exc-start
-      (when (<= exc-start pos)
-        (cons exc-start exc-mode)))))
-
-(defun mumamo-search-bw-verbatimtex-end (pos min)
-  "Helper for `mumamo-chunk-verbatimtextext'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "\netex"))
-
-(defun mumamo-search-fw-verbatimtex-start (pos max)
-  "Helper for `mumamo-chunk-verbatimtextext'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str pos max "\nverbatimtex"))
-
-(defun mumamo-search-fw-verbatimtex-end (pos max)
-  "Helper for `mumamo-chunk-verbatimtextext'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "\netex"))
-
-(defun mumamo-chunk-verbatimtex (pos min max)
-  "Find verbatimtex - etex chunks.  Return range and 'plain-tex-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-verbatimtex-start
-                              'mumamo-search-bw-verbatimtex-end
-                              'mumamo-search-fw-verbatimtex-start
-                              'mumamo-search-fw-verbatimtex-end))
-
-(defun mumamo-search-bw-btex-start (pos min)
-  "Helper for `mumamo-chunk-btex'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "\nverbatimtex"))
-        (exc-mode 'plain-tex-mode))
-    (when exc-start
-      (when (<= exc-start pos)
-        (cons exc-start exc-mode)))))
-
-(defun mumamo-search-bw-btex-end (pos min)
-  "Helper for `mumamo-chunk-btex'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "\netex"))
-
-(defun mumamo-search-fw-btex-start (pos max)
-  "Helper for `mumamo-chunk-btex'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str pos max "\nverbatimtex"))
-
-(defun mumamo-search-fw-btex-end (pos max)
-  "Helper for `mumamo-chunk-btex'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "\netex"))
-
-(defun mumamo-chunk-btex (pos min max)
-  "Find btex - etex chunks.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-btex-start
-                              'mumamo-search-bw-btex-end
-                              'mumamo-search-fw-btex-start
-                              'mumamo-search-fw-btex-end))
-
-;;;###autoload
-(define-mumamo-multi-major-mode metapost-mumamo-mode
-  "Turn on multiple major modes for MetaPost."
-  ("MetaPost TeX Family" metapost-mode
-   (mumamo-chunk-textext
-    mumamo-chunk-verbatimtex
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; OpenLaszlo
-
-(defconst mumamo-lzx-method-tag-start-regex
-  (rx "<method"
-      (optional
-       space
-       (0+ (not (any ">"))))
-      ">"
-      ;; FIX-ME: Commented out because of bug in Emacs
-      ;;
-      ;;(optional (0+ space) "<![CDATA[" )
-      ))
-
-(defun mumamo-search-bw-exc-start-inlined-lzx-method (pos min)
-  "Helper for `mumamo-chunk-inlined-lzx-method'.
-POS is where to start search and MIN is where to stop."
-  (goto-char (+ pos 7))
-  (let ((marker-start (search-backward "<method" min t))
-        exc-mode
-        exc-start)
-    (when marker-start
-      (when (looking-at mumamo-lzx-method-tag-start-regex)
-        (setq exc-start (match-end 0))
-        (goto-char exc-start)
-        (when (<= exc-start pos)
-          (cons (point) 'javascript-mode))
-        ))))
-
-(defun mumamo-search-bw-exc-end-inlined-lzx-method (pos min)
-  "Helper for `mumamo-chunk-inlined-lzx-method'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</method>"))
-
-(defun mumamo-search-fw-exc-start-inlined-lzx-method (pos max)
-  "Helper for `mumamo-chunk-inlined-lzx-method'.
-POS is where to start search and MAX is where to stop."
-  (goto-char (1+ pos))
-  (skip-chars-backward "^<")
-  ;; Handle <![CDATA[
-  (when (and
-         (eq ?< (char-before))
-         (eq ?! (char-after))
-         (not (bobp)))
-    (backward-char)
-    (skip-chars-backward "^<"))
-  (unless (bobp)
-    (backward-char 1))
-  (let ((exc-start (search-forward "<method" max t))
-        exc-mode)
-    (when exc-start
-      (goto-char (- exc-start 7))
-      (when (looking-at mumamo-lzx-method-tag-start-regex)
-        (goto-char (match-end 0))
-        (point)
-        ))))
-
-(defun mumamo-search-fw-exc-end-inlined-lzx-method (pos max)
-  "Helper for `mumamo-chunk-inlined-lzx-method'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</method>"))
-
-(defun mumamo-chunk-inlined-lzx-method (pos min max)
-  "Find <method>...</method>.  Return range and 'javascript-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-inlined-lzx-method
-                              'mumamo-search-bw-exc-end-inlined-lzx-method
-                              'mumamo-search-fw-exc-start-inlined-lzx-method
-                              'mumamo-search-fw-exc-end-inlined-lzx-method))
-
-(defconst mumamo-lzx-handler-tag-start-regex
-  (rx "<handler"
-      (optional
-       space
-       (0+ (not (any ">"))))
-      ">"
-      ;; FIX-ME: Commented out because of bug in Emacs
-      ;;
-      ;;(optional (0+ space) "<![CDATA[" )
-      ))
-
-(defun mumamo-search-bw-exc-start-inlined-lzx-handler (pos min)
-  "Helper for `mumamo-chunk-inlined-lzx-handler'.
-POS is where to start search and MIN is where to stop."
-  (goto-char (+ pos 8))
-  (let ((marker-start (search-backward "<handler" min t))
-        exc-mode
-        exc-start)
-    (when marker-start
-      (when (looking-at mumamo-lzx-handler-tag-start-regex)
-        (setq exc-start (match-end 0))
-        (goto-char exc-start)
-        (when (<= exc-start pos)
-          (cons (point) 'javascript-mode))
-        ))))
-
-(defun mumamo-search-bw-exc-end-inlined-lzx-handler (pos min)
-  "Helper for `mumamo-chunk-inlined-lzx-handler'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</handler>"))
-
-(defun mumamo-search-fw-exc-start-inlined-lzx-handler (pos max)
-  "Helper for `mumamo-chunk-inlined-lzx-handler'.
-POS is where to start search and MAX is where to stop."
-  (goto-char (1+ pos))
-  (skip-chars-backward "^<")
-  ;; Handle <![CDATA[
-  (when (and
-         (eq ?< (char-before))
-         (eq ?! (char-after))
-         (not (bobp)))
-    (backward-char)
-    (skip-chars-backward "^<"))
-  (unless (bobp)
-    (backward-char 1))
-  (let ((exc-start (search-forward "<handler" max t))
-        exc-mode)
-    (when exc-start
-      (goto-char (- exc-start 8))
-      (when (looking-at mumamo-lzx-handler-tag-start-regex)
-        (goto-char (match-end 0))
-        (point)
-        ))))
-
-(defun mumamo-search-fw-exc-end-inlined-lzx-handler (pos max)
-  "Helper for `mumamo-chunk-inlined-lzx-handler'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</handler>"))
-
-(defun mumamo-chunk-inlined-lzx-handler (pos min max)
-  "Find <handler>...</handler>.  Return range and 'javascript-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-inlined-lzx-handler
-                              'mumamo-search-bw-exc-end-inlined-lzx-handler
-                              'mumamo-search-fw-exc-start-inlined-lzx-handler
-                              'mumamo-search-fw-exc-end-inlined-lzx-handler))
-
-
-;;;###autoload
-(define-mumamo-multi-major-mode laszlo-nxml-mumamo-mode
-  "Turn on multiple major modes for OpenLaszlo."
-  ("OpenLaszlo Family" nxml-mode
-   (mumamo-chunk-inlined-script
-    mumamo-chunk-inlined-lzx-method
-    mumamo-chunk-inlined-lzx-handler
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; csound
-
-(defun mumamo-search-bw-exc-start-csound-orc (pos min)
-  "Helper for `mumamo-chunk-csound-orc'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<csinstruments>")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'csound-orc-mode))))
-
-(defun mumamo-search-bw-exc-end-csound-orc (pos min)
-  "Helper for `mumamo-chunk-csound-orc'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</csinstruments>"))
-
-(defun mumamo-search-fw-exc-start-csound-orc (pos max)
-  "Helper for `mumamo-chunk-csound-orc'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str pos max "<csinstruments>"))
-
-(defun mumamo-search-fw-exc-end-csound-orc (pos max)
-  "Helper for `mumamo-chunk-csound-orc'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</csinstruments>"))
-
-(defun mumamo-chunk-csound-orc (pos min max)
-  "Find <csinstruments>...</...>.  Return range and 'csound-orc-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-csound-orc
-                              'mumamo-search-bw-exc-end-csound-orc
-                              'mumamo-search-fw-exc-start-csound-orc
-                              'mumamo-search-fw-exc-end-csound-orc))
-
-(defun mumamo-search-bw-exc-start-csound-sco (pos min)
-  "Helper for `mumamo-chunk-csound-sco'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<csscore>")))
-    (and exc-start
-         (<= exc-start pos)
-         (cons exc-start 'csound-sco-mode))))
-
-(defun mumamo-search-bw-exc-end-csound-sco (pos min)
-  "Helper for `mumamo-chunk-csound-sco'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-str pos min "</csscore>"))
-
-(defun mumamo-search-fw-exc-start-csound-sco (pos max)
-  "Helper for `mumamo-chunk-csound-sco'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-str pos max "<csscore>"))
-
-(defun mumamo-search-fw-exc-end-csound-sco (pos max)
-  "Helper for `mumamo-chunk-csound-sco'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-str pos max "</csscore>"))
-
-(defun mumamo-chunk-csound-sco (pos min max)
-  "Found <csscore>...</csscore>.  Return range and 'csound-sco-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-csound-sco
-                              'mumamo-search-bw-exc-end-csound-sco
-                              'mumamo-search-fw-exc-start-csound-sco
-                              'mumamo-search-fw-exc-end-csound-sco))
-
-;;;###autoload
-(define-mumamo-multi-major-mode csound-sgml-mumamo-mode
-  "Turn on mutiple major modes for CSound orc/sco Modes."
-  ("CSound orc/sco Modes" sgml-mode
-   (mumamo-chunk-csound-sco
-    mumamo-chunk-csound-orc
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; noweb
-
-(defcustom mumamo-noweb2-mode-from-ext
-  '(
-    ("php" . php-mode)
-    ("c" . c-mode)
-    )
-  "File extension regexp to major mode mapping."
-  :type '(repeat
-          (cons regexp major-mode-function))
-  :group 'mumamo)
-
-(defvar mumamo-noweb2-found-mode-from-ext nil
-  "Major modes determined from file names.  Internal use.")
-
-(defun mumamo-noweb2-chunk-start-fw (pos max)
-  "Helper for `mumamo-noweb2-chunk'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-start-fw-re pos max "^<<\\(.*?\\)>>="))
-
-(defun mumamo-noweb2-chunk-start-bw (pos min)
-  "Helper for `mumamo-noweb2-chunk'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-re pos min "^<<\\(.*?\\)>>="))
-        (exc-mode 'text-mode))
-    (when exc-start
-      (let* ((file-name (match-string 1))
-             (file-ext  (when file-name (file-name-extension file-name))))
-        (when file-ext
-          (setq exc-mode (catch 'major
-                           (dolist (rec mumamo-noweb2-mode-from-ext)
-                             (when (string-match (car rec) file-ext)
-                               (throw 'major (cdr rec))))
-                           nil))
-          (unless exc-mode
-            (setq exc-mode
-                  (cdr (assoc file-ext mumamo-noweb2-found-mode-from-ext)))
-            (unless exc-mode
-              ;; Get the major mode from file name
-              (with-temp-buffer
-                (setq buffer-file-name file-name)
-                (condition-case err
-                    (normal-mode)
-                  (error (message "error (normal-mode): %s"
-                                  (error-message-string err))))
-                (setq exc-mode (or major-mode
-                                   'text-mode))
-                (add-to-list 'mumamo-noweb2-found-mode-from-ext
-                             (cons file-ext exc-mode)))
-              ))))
-      (cons exc-start exc-mode))))
-
-(defun mumamo-noweb2-chunk-end-fw (pos max)
-  "Helper for `mumamo-noweb2-chunk'.
-POS is where to start search and MAX is where to stop."
-  (mumamo-chunk-end-fw-re pos max "^@"))
-
-(defun mumamo-noweb2-chunk-end-bw (pos min)
-  "Helper for `mumamo-noweb2-chunk'.
-POS is where to start search and MIN is where to stop."
-  (mumamo-chunk-end-bw-re pos min "^@"))
-
-(defun mumamo-noweb2-code-chunk (pos min max)
-  "Find noweb chunks.  Return range and found mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (save-match-data
-    (mumamo-find-possible-chunk pos min max
-                                'mumamo-noweb2-chunk-start-bw
-                                'mumamo-noweb2-chunk-end-bw
-                                'mumamo-noweb2-chunk-start-fw
-                                'mumamo-noweb2-chunk-end-fw)))
-
-
-;;;###autoload
-(define-mumamo-multi-major-mode noweb2-mumamo-mode
-  "Multi major mode for noweb files."
-  ("noweb Family" latex-mode
-   (mumamo-noweb2-code-chunk)))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Template-Toolkit
-
-
-
-;; (setq auto-mode-alist
-;;       (append '(("\\.tt2?$" . tt-mode))  auto-mode-alist ))
-
-;;(require 'tt-mode)
-(defun mumamo-chunk-tt (pos min max)
-  "Find [% ... %], return range and `tt-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX.
-
-This is for Template Toolkit.
-See URL `http://dave.org.uk/emacs/' for `tt-mode'."
-  (mumamo-quick-static-chunk pos min max "[%" "%]" t 'tt-mode nil))
-
-(define-mumamo-multi-major-mode tt-html-mumamo-mode
-  "Turn on multiple major modes for TT files with main mode `nxhtml-mode'.
-TT = Template-Toolkit.
-
-This also covers inlined style and javascript."
-    ("TT HTML Family" html-mode
-     (mumamo-chunk-tt
-      mumamo-chunk-inlined-style
-      mumamo-chunk-inlined-script
-      mumamo-chunk-style=
-      mumamo-chunk-onjs=
-     )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Asp
-
-(defun mumamo-chunk-asp (pos min max)
-  "Find <% ... %>.  Return range and 'asp-js-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-search-bw-exc-start-asp
-                              'mumamo-search-bw-exc-end-jsp
-                              'mumamo-search-fw-exc-start-jsp
-                              'mumamo-search-fw-exc-end-jsp))
-
-(defconst mumamo-asp-lang-marker
-  (rx "<%@"
-      (0+ space)
-      "language"
-      (0+ space)
-      "="
-      (0+ space)
-      "\""
-      (submatch (1+ (not (any "\""))))
-      "\""
-      (0+ space)))
-
-(defun mumamo-search-bw-exc-start-asp (pos min)
-  "Helper function for `mumamo-chunk-asp'.
-POS is where to start search and MIN is where to stop."
-  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<%")))
-    (when (and exc-start
-               (<= exc-start pos))
-      (let ((here (point))
-            (mode 'asp-vb-mode)
-            lang)
-        (when (re-search-backward mumamo-asp-lang-marker nil t)
-          (setq lang (downcase (match-string-no-properties 1)))
-          (lwarn 't :warning "lang=%s" lang)
-          (cond
-           ((string= lang "javascript")
-            (setq mode 'asp-js-mode))
-           )
-          )
-        (cons exc-start mode)))))
-
-
-;;;; asp <script ...>
-
-(defconst mumamo-asp-script-tag-start-regex
-  (rx "<script"
-      space
-      (0+ (not (any ">")))
-      "language"
-      (0+ space)
-      "="
-      (0+ space)
-      ?\"
-      ;;(or "text" "application")
-      ;;"/"
-      ;;(or "javascript" "ecmascript")
-      ;; "text/javascript"
-      (or "javascript" "vbscript")
-      ?\"
-      (0+ (not (any ">")))
-      ">"
-      ;; FIX-ME: Commented out because of bug in Emacs
-      ;;
-      ;;(optional (0+ space) "<![CDATA[" )
-      ))
-
-(defun mumamo-asp-search-bw-exc-start-inlined-script (pos min)
-  "Helper function for `mumamo-asp-chunk-inlined-script'.
-POS is where to start search and MIN is where to stop."
-  (goto-char (+ pos 7))
-  (let ((marker-start (search-backward "<script" min t))
-        (exc-mode 'asp-vb-mode)
-        exc-start
-        lang)
-    (when marker-start
-      (when (looking-at mumamo-script-tag-start-regex)
-        (setq lang (downcase (match-string-no-properties 1)))
-        (cond
-         ((string= lang "javascript")
-          (setq exc-mode 'asp-js-mode))
-         )
-        (setq exc-start (match-end 0))
-        (goto-char exc-start)
-        (when (<= exc-start pos)
-          (cons (point) exc-mode))
-        ))))
-
-(defun mumamo-asp-chunk-inlined-script (pos min max)
-  "Find <script language=...  runat=...>...</script>.  Return 'asp-js-mode.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-asp-search-bw-exc-start-inlined-script
-                              'mumamo-search-bw-exc-end-inlined-script
-                              'mumamo-search-fw-exc-start-inlined-script
-                              'mumamo-search-fw-exc-end-inlined-script))
-
-;;;###autoload
-(define-mumamo-multi-major-mode asp-html-mumamo-mode
-  "Turn on multiple major modes for ASP with main mode `html-mode'.
-This also covers inlined style and javascript."
-  ("ASP Html Family" html-mode
-   (mumamo-chunk-asp
-    mumamo-asp-chunk-inlined-script
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Org-mode
-
-;; Fix-me: this opens and close org trees in a quite unfriendly
-;; way. Some buffer local variables in org-mode have to be preserved
-;; to prevent that.
-
-(defun mumamo-chunk-org-html (pos min max)
-  "Find #+BEGIN_HTML ... #+END_HTML, return range and `html-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "#+BEGIN_HTML" "#+END_HTML" t 'html-mode t))
-
-;;;###autoload
-(define-mumamo-multi-major-mode org-mumamo-mode
-  "Turn on multiple major modes for `org-mode' files with main mode `org-mode'.
-Unfortunately this only allows `html-mode' (not `nxhtml-mode') in
-sub chunks."
-    ("Org Mode + Html" org-mode
-     (mumamo-chunk-org-html
-      )))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; Mako
-
-;; See http://www.makotemplates.org/docs/syntax.html
-
-;;; Comments mode
-;; Fix-me: move to mumamo.el
-(defconst mumamo-comment-font-lock-keywords
-  (list
-   (cons "\\(.*\\)" (list 1 font-lock-comment-face))
-   ))
-(defvar mumamo-comment-font-lock-defaults
-  '(mumamo-comment-font-lock-keywords t t))
-
-(define-derived-mode mumamo-comment-mode nil "Comment chunk"
-  "For comment blocks."
-  (set (make-local-variable 'font-lock-defaults) mumamo-comment-font-lock-defaults))
-
-
-
-(defun mumamo-chunk-mako-<% (pos min max)
-  "Find <% ... %> and <%! ... %>. Return range and `python-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-find-possible-chunk pos min max
-                              'mumamo-mako-<%-bw-start
-                              'mumamo-mako-<%-bw-end
-                              'mumamo-mako-<%-fw-start
-                              'mumamo-mako-<%-fw-end
-                              'mumamo-mako-<%-find-borders
-                              ))
-(defun mumamo-mako-<%-find-borders (start end exc-mode)
-  (when exc-mode
-    (list
-     (when start
-       (+ start
-          (if (eq ?! (char-after (+ start 2)))
-              3
-            2)))
-     (when end (- end 2))
-     exc-mode)))
-
-(defun mumamo-mako-<%-bw-start (pos min)
-  (let ((here (point))
-        start
-        ret
-        )
-    (goto-char (+ pos 3))
-    (setq start (re-search-backward "<%!?\\(?:[ \t]\\|$\\)" min t))
-    (when (and start (<= start pos))
-      (setq ret (list start 'python-mode)))
-    (goto-char here)
-    ret))
-(defun mumamo-mako-<%-bw-end (pos min)
-  (mumamo-chunk-end-bw-str-inc pos min "%>")) ;; ok
-(defun mumamo-mako-<%-fw-start (pos max)
-  (let ((here (point))
-        start
-        ret)
-    (goto-char pos)
-    (setq start
-          (re-search-forward "<%!?\\(?:[ \t]\\|$\\)" max t))
-    (when start
-      (setq ret (match-beginning 0)))
-    (goto-char here)
-    ret))
-(defun mumamo-mako-<%-fw-end (pos max)
-  (mumamo-chunk-end-fw-str-inc pos max "%>")) ;; ok
-
-
-
-(defun mumamo-chunk-mako-% (pos min max)
-  "Find % python EOL.  Return range and `python-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-whole-line-chunk pos min max "%" 'python-mode))
-
-(defun mumamo-chunk-mako-one-line-comment (pos min max)
-  "Find ## comment EOL.  Return range and `python-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-whole-line-chunk pos min max "##" 'mumamo-comment-mode))
-
-;; Fix-me: Move this to mumamo.el
-(defun mumamo-whole-line-chunk (pos min max marker mode)
-  (let ((here (point))
-        (len-marker (length marker))
-        beg
-        end
-        ret)
-    (goto-char pos)
-    (setq beg (line-beginning-position))
-    (setq end (line-end-position))
-    (unless (or (when min (< beg min))
-                (when max (> end max))
-                (= pos end))
-      (goto-char beg)
-      (skip-chars-forward " \t")
-      (when (and
-             (string= marker (buffer-substring-no-properties (point) (+ (point) len-marker)))
-             (memq (char-after (+ (point) len-marker))
-                   '(?\  ?\t ?\n))
-             (>= pos (point)))
-        (setq ret
-              (list (point)
-                    end
-                    mode
-                    (let ((start-border (+ (point) len-marker)))
-                      (list start-border nil))))))
-    (unless ret
-      (let ((range-regexp
-             (concat "^[ \t]*"
-                     "\\("
-                     (regexp-quote marker)
-                     "[ \t\n].*\\)$")))
-        ;; Backward
-        (goto-char pos)
-        (unless (= pos (line-end-position))
-          (goto-char (line-beginning-position)))
-        (setq beg (re-search-backward range-regexp min t))
-        (when beg (setq beg (match-end 1)))
-        ;; Forward, take care of indentation part
-        (goto-char pos)
-        (unless (= pos (line-end-position))
-          (goto-char (line-beginning-position)))
-        (setq end (re-search-forward range-regexp max t))
-        (when end (setq end (match-beginning 1))))
-      (setq ret (list beg end)))
-    (goto-char here)
-    ;;(setq ret nil)
-    ret))
-
-;; (defun mumamo-single-regexp-chunk (pos min max begin-mark end-mark mode)
-;;   "Not ready yet. `mumamo-quick-static-chunk'"
-;;   (let ((here (point))
-;;         (len-marker (length marker))
-;;         beg
-;;         end
-;;         ret)
-;;     (goto-char pos)
-;;     (setq beg (line-beginning-position))
-;;     (setq end (line-end-position))
-;;     (unless (or (when min (< beg min))
-;;                 (when max (> end max))
-;;                 (= pos end))
-;;       (goto-char beg)
-;;       (skip-chars-forward " \t")
-;;       (when (and
-;;              (string= marker (buffer-substring-no-properties (point) (+ (point) len-marker)))
-;;              (memq (char-after (+ (point) len-marker))
-;;                    '(?\  ?\t ?\n))
-;;              (>= pos (point)))
-;;         (setq ret
-;;               (list (point)
-;;                     end
-;;                     mode
-;;                     (let ((start-border (+ (point) len-marker)))
-;;                       (list start-border nil))))))
-;;     (unless ret
-;;       (let ((range-regexp
-;;              (concat "^[ \t]*"
-;;                      "\\("
-;;                      (regexp-quote marker)
-;;                      "[ \t\n].*\\)$")))
-;;         ;; Backward
-;;         (goto-char pos)
-;;         (unless (= pos (line-end-position))
-;;           (goto-char (line-beginning-position)))
-;;         (setq beg (re-search-backward range-regexp min t))
-;;         (when beg (setq beg (match-end 1)))
-;;         ;; Forward, take care of indentation part
-;;         (goto-char pos)
-;;         (unless (= pos (line-end-position))
-;;           (goto-char (line-beginning-position)))
-;;         (setq end (re-search-forward range-regexp max t))
-;;         (when end (setq end (match-beginning 1))))
-;;       (setq ret (list beg end)))
-;;     (goto-char here)
-;;     ;;(setq ret nil)
-;;     ret))
-
-
-(defun mumamo-chunk-mako-<%doc (pos min max)
-  (mumamo-quick-static-chunk pos min max "<%doc>" "</%doc>" t 'mumamo-comment-mode t))
-
-(defun mumamo-chunk-mako-<%include (pos min max)
-  (mumamo-quick-static-chunk pos min max "<%include" "/>" t 'html-mode t))
-
-(defun mumamo-chunk-mako-<%inherit (pos min max)
-  (mumamo-quick-static-chunk pos min max "<%inherit" "/>" t 'html-mode t))
-
-(defun mumamo-chunk-mako-<%namespace (pos min max)
-  (mumamo-quick-static-chunk pos min max "<%namespace" "/>" t 'html-mode t))
-
-(defun mumamo-chunk-mako-<%page (pos min max)
-  (mumamo-quick-static-chunk pos min max "<%page" "/>" t 'html-mode t))
-
-(defun mumamo-chunk-mako$(pos min max)
-  "Find ${ ... }, return range and `python-mode'.
-See `mumamo-find-possible-chunk' for POS, MIN and MAX."
-  (mumamo-quick-static-chunk pos min max "${" "}" t 'python-mode t))
-
-;;;###autoload
-(define-mumamo-multi-major-mode mako-html-mumamo-mode
-  "Turn on multiple major modes for Mako with main mode `html-mode'.
-This also covers inlined style and javascript."
-;; Fix-me: test case
-;;
-;; Fix-me: Add chunks for the tags, but make sure these are made
-;; invisible to nxml-mode parser.
-;;
-;; Fix-me: Maybe finally add that indentation support for one-line chunks?
-  ("Mako HTML Family" html-mode
-   (
-    mumamo-chunk-mako-one-line-comment
-    mumamo-chunk-mako-<%doc
-    mumamo-chunk-mako-<%include
-    mumamo-chunk-mako-<%inherit
-    mumamo-chunk-mako-<%namespace
-    mumamo-chunk-mako-<%page
-
-    ;;mumamo-chunk-mako-<%def
-    ;;mumamo-chunk-mako-<%call
-    ;;mumamo-chunk-mako-<%text
-
-    mumamo-chunk-mako-<%
-    mumamo-chunk-mako-%
-    mumamo-chunk-mako$
-
-    mumamo-chunk-xml-pi
-    mumamo-chunk-inlined-style
-    mumamo-chunk-inlined-script
-    mumamo-chunk-style=
-    mumamo-chunk-onjs=
-    )))
-
-
-(provide 'mumamo-fun)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; mumamo-fun.el ends here
+;;; mumamo-fun.el --- Multi major mode functions
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2008-03-09T01:35:21+0100 Sun
+;; Version: 0.51
+;; Last-Updated: 2008-08-04T17:54:29+0200 Mon
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   `backquote', `bytecomp', `cl', `flyspell', `ispell', `mumamo',
+;;   `sgml-mode'.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or (at your option)
+;; any later version.
+;;
+;; This program 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., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Defines some "multi major modes" functions.  See mumamo.el for more
+;; information.
+;;
+;;;; Usage:
+;;
+;;  See mumamo.el for how to use the multi major mode functions
+;;  defined here.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (add-to-list 'load-path default-directory))
+(require 'mumamo)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; File wide key bindings
+
+(defun mumamo-multi-mode-map ()
+  "Return mumamo multi mode keymap."
+  (symbol-value
+   (intern-soft (concat (symbol-name mumamo-multi-major-mode) "-map"))))
+
+;; (defun mumamo-multi-mode-hook-symbol ()
+;;   "Return mumamo multi mode hook symbol."
+;;   (intern-soft (concat (symbol-name mumamo-multi-major-mode) "-hook")))
+
+(defun mumamo-define-html-file-wide-keys ()
+  (let ((map (mumamo-multi-mode-map)))
+    (define-key map [(control ?c) (control ?h) ?b] 'nxhtml-browse-file)
+    ))
+;; (defun mumamo-add-html-file-wide-keys (hook)
+;;   (add-hook hook 'mumamo-define-html-file-wide-keys)
+;;   )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Chunk search routines for XHTML things
+
+(defun mumamo-chunk-attr= (pos min max attr= attr=is-regex attr-regex submode)
+  "This should work similar to `mumamo-find-possible-chunk'.
+See `mumamo-chunk-style=' for an example of use."
+  (mumamo-chunk-attr=-new pos max attr= attr=is-regex attr-regex submode))
+
+(defun mumamo-chunk-attr=-new-fw-exc-fun (pos max)
+  ;;(msgtrc "(mumamo-chunk-attr=-new-fw-exc-fun %s %s)" pos max)
+  (save-match-data
+    (let ((here (point))
+          first-dq
+          next-dq
+          (this-chunk (mumamo-get-existing-new-chunk-at pos)))
+      (if this-chunk
+          (goto-char (overlay-end this-chunk))
+        (goto-char (overlay-end mumamo-last-chunk)))
+      (setq first-dq (search-forward "\"" max t))
+      (unless (bobp)
+        (backward-char)
+        (condition-case err
+            (with-syntax-table (standard-syntax-table)
+              (setq next-dq (scan-sexps (point) 1)))
+          (error nil)))
+      (prog1
+          next-dq
+        (goto-char here)))))
+
+(defun mumamo-chunk-attr=-new-find-borders-fun (start-border end-border dummy)
+  ;;(setq borders (funcall find-borders-fun start-border end-border exc-mode))
+  (save-match-data
+    (let ((here (point))
+          (end2 (when end-border (1- end-border)))
+          start2)
+      (goto-char start-border)
+      (save-match-data
+        (setq start2 (search-forward "\"" (+ start-border 200) t)))
+      (goto-char here)
+      (list start2 end2))))
+
+(defun mumamo-chunk-attr=-new (pos
+                               ;;min
+                               max
+                               attr=
+                               attr=is-regex
+                               attr-regex
+                               submode)
+  ;;(message "\n(mumamo-chunk-attr=-new %s %s %s %s %s %s)" pos max attr= attr=is-regex attr-regex submode)
+  ;;(mumamo-condition-case err
+  (condition-case err
+      (save-match-data
+        (let ((here (point))
+              (next-attr= (progn
+                            ;; fix-me:
+                            (if (not attr=is-regex)
+                                (goto-char (+ pos (length attr=)))
+                              (goto-char pos)
+                              (skip-chars-forward "a-zA-Z="))
+                            (goto-char pos)
+                            (if attr=is-regex
+                                (re-search-forward attr= max t)
+                              (search-forward attr= max t))))
+              next-attr-sure
+              ;;next-attr=
+              start start-border
+              end   end-border
+              exc-mode
+              borders
+              exc-start-next
+              exc-end-next
+              exc-start-next
+              exc-end-next
+              (tries 0)
+              (min (1- pos))
+	      look-max
+              )
+          ;; make sure if we have find prev-attr= or not
+          (when next-attr=
+            (forward-char)
+            (skip-chars-forward "^\"")
+            (setq look-max (+ (point) 2)))
+          (while (and next-attr=
+                      (< min (point))
+                      (not next-attr-sure)
+                      (< tries 5))
+            ;;(msgtrc "attr=-new: min=%s, point=%s" min (point))
+            (setq tries (1+ tries))
+            ;;(if (not (re-search-backward "<[^?]" (- min 300) t))
+            (if (not (re-search-backward "<[^?]\\|\?>" (- min 300) t))
+                (setq next-attr= nil)
+              ;;(if (looking-at attr-regex)
+              (if (let ((here (point)))
+                    (prog1
+                        (re-search-forward attr-regex look-max t)
+                      (goto-char here)))
+              ;;(if (mumamo-end-in-code (point) next-attr= 'php-mode)
+                  (setq next-attr-sure 'found)
+                (unless (bobp)
+                  (backward-char)
+                  ;;(msgtrc "attr=-new 1: min=%s, point=%s" min (point))
+                  (setq next-attr= (if attr=is-regex
+                                       (re-search-backward attr= (- min 300) t)
+                                     (search-backward attr= (- min 300) t)))))))
+          (unless next-attr-sure (setq next-attr= nil))
+
+
+          ;; find prev change and if inside style= the next change
+          (when next-attr=
+              (setq exc-start-next (match-beginning 1))
+              (setq exc-end-next   (match-end 2))
+              (when (>= exc-start-next pos)
+                (if (> pos exc-end-next)
+                    (progn
+                      (setq start (+ (match-end 2) 1))
+                      ;;(setq start-border (+ (match-end 2) 2))
+                      )
+                  (setq exc-mode submode)
+                  (setq start (match-beginning 1))
+                  (setq start-border (match-beginning 2))
+                  (setq end (1+ (match-end 2)))
+                  (setq end-border (1- end)))
+                ))
+          ;; find next change
+          (unless end
+            (if start
+                (goto-char start)
+              (goto-char pos)
+              (search-backward "<" min t))
+            ;;(msgtrc "attr=-new 2: min=%s, point=%s" min (point))
+            (setq next-attr= (if attr=is-regex
+                                 (re-search-forward attr= max t)
+                               (search-forward attr= max t)))
+            (when (and next-attr=
+                       (search-backward "<" min t))
+              (when (looking-at attr-regex)
+                (setq end (match-beginning 1)))))
+          (when start (assert (>= start pos) t))
+          (when end   (assert (<= pos end) t))
+          ;;(message "start-border=%s end-border=%s" start-border end-border)
+          (when (or start-border end-border)
+            (setq borders (list start-border end-border nil)))
+          ;; (message "mumamo-chunk-attr=-new: %s"
+          ;;          (list start
+          ;;                end
+          ;;                exc-mode
+          ;;                borders
+          ;;                nil ;; parseable-by
+          ;;                'mumamo-chunk-attr=-new-fw-exc-fun ;; fw-exc-fun
+          ;;                'mumamo-chunk-attr=-new-find-borders-fun ;; find-borders-fun
+          ;;                ))
+          (goto-char here)
+          (when (or start end)
+            (list start
+                  end
+                  exc-mode
+                  borders
+                  nil ;; parseable-by
+                  'mumamo-chunk-attr=-new-fw-exc-fun ;; fw-exc-fun
+                  'mumamo-chunk-attr=-new-find-borders-fun ;; find-borders-fun
+                  ))))
+    (error (mumamo-display-error 'mumamo-chunk-attr=-new "%s" (error-message-string err)))
+    ))
+
+;;;; xml pi
+
+(defvar mumamo-xml-pi-mode-alist
+  '(("php"    . php-mode)
+    ("python" . python-mode))
+  "Alist used by `mumamo-chunk-xml-pi' to get exception mode." )
+
+;; Fix-me: make it possible to make the borders part of the php chunk
+;; so that parsing of them by nxml may be skipped. Or, rather if the
+;; borders are not part of the chunk then assume nxml can not parse
+;; the chunk and the borders.
+(defun mumamo-search-bw-exc-start-xml-pi-1 (pos min lt-chars)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MIN is where to stop.
+LT-CHARS is just <?.
+
+Actual use is in `mumamo-search-bw-exc-start-xml-pi'."
+  (let ((exc-start (mumamo-chunk-start-bw-str (+ pos 2) min lt-chars))
+        spec
+        exc-mode
+        hit)
+    (when exc-start
+      (goto-char exc-start)
+      (when (and (not (looking-at "xml"))
+                 (looking-at (rx (0+ (any "a-z")))))
+        ;; (setq exc-start (match-end 0)) include it in sub chunk instead
+        (setq exc-start (- exc-start 2))
+        (setq spec (match-string-no-properties 0))
+        (setq exc-mode (assoc spec mumamo-xml-pi-mode-alist))
+        (when exc-mode (setq exc-mode (cdr exc-mode)))
+        (setq hit t)
+        )
+      (when hit
+        (unless exc-mode
+          ;;(setq exc-mode 'fundamental-mode)
+          ;; Fix-me: Better assume php-mode
+          (setq exc-mode 'php-mode))
+        (when (<= exc-start pos)
+          ;;(cons exc-start exc-mode)
+          (list exc-start exc-mode nil)
+          )))))
+
+(defun mumamo-search-bw-exc-start-xml-pi (pos min)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-search-bw-exc-start-xml-pi-1 pos min "<?"))
+
+(defun mumamo-xml-pi-end-is-xml-end (pos)
+  "Return t if the ?> at pos is end of <?xml."
+  (when (> 1000 pos)
+;;;     (assert (and (= (char-after pos) ??)
+;;;                  (= (char-after (1+ pos)) ?>)))
+    (save-excursion
+      (save-restriction
+        (widen)
+        (save-match-data
+          (when (search-backward "<" (- pos 150) t)
+            (when (looking-at (rx line-start "<\?xml" (1+ space)))
+              (mumamo-msgfntfy "mumamo-xml-pi-end-is-xml-end %s => t" pos)
+              t)))))))
+
+(defun mumamo-search-bw-exc-end-xml-pi (pos min)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MIN is where to stop."
+  ;; Fix me: merge xml header
+  (mumamo-msgfntfy "mumamo-search-bw-exc-end-xml-pi %s %s" pos min)
+  ;;(let ((end-pos (mumamo-chunk-end-bw-str pos min "?>")))
+  (let ((end-pos (mumamo-chunk-end-bw-str-inc pos min "?>")))
+    (mumamo-msgfntfy "  end-pos=%s" end-pos)
+    (when end-pos
+      (unless (or (mumamo-xml-pi-end-is-xml-end end-pos)
+                  (= (save-restriction
+                       (widen)
+                       (char-after (- end-pos 1)))
+                     ?<))
+        (mumamo-msgfntfy "  returning end-pos")
+        end-pos))))
+
+(defun mumamo-search-fw-exc-end-xml-pi (pos max)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MAX is where to stop."
+  ;; Fix me: merge xml header
+  ;;(let ((end-pos (mumamo-chunk-end-fw-str pos max "?>")))
+  (save-match-data
+    (let ((end-pos (mumamo-chunk-end-fw-str-inc pos max "?>")))
+      (when end-pos
+        (unless (mumamo-xml-pi-end-is-xml-end end-pos)
+          end-pos)))))
+
+(defun mumamo-search-fw-exc-start-xml-pi-1 (pos max lt-chars)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MAX is where to stop.
+
+Used in `mumamo-search-fw-exc-start-xml-pi'.  For an explanation
+of LT-CHARS see `mumamo-search-bw-exc-start-xml-pi-1'."
+  (goto-char pos)
+  (skip-chars-backward "a-zA-Z")
+  ;;(let ((end-out (mumamo-chunk-start-fw-str (point) max lt-chars)))
+  (let ((end-out (mumamo-chunk-start-fw-str-inc (point) max lt-chars))
+        spec
+        exc-mode
+        hit)
+    (when (looking-at "xml")
+      (if t ;(= 1 pos)
+          (setq end-out (mumamo-chunk-start-fw-str-inc (1+ (point)) max lt-chars))
+        (setq end-out nil)))
+    (when end-out
+      ;; Get end-out:
+      (if (looking-at (rx (0+ (any "a-z"))))
+          (progn
+            ;;(setq end-out (match-end 0))
+            (setq end-out (- (match-beginning 0) 2))
+            (setq spec (match-string-no-properties 0))
+            (setq exc-mode (assoc spec mumamo-xml-pi-mode-alist))
+            (if exc-mode
+                (setq exc-mode (cdr exc-mode))
+              (setq exc-mode 'php-mode))
+            (setq end-out (list end-out exc-mode nil))
+            )
+        (setq end-out nil))
+      end-out)))
+
+(defun mumamo-search-fw-exc-start-xml-pi (pos max)
+  "Helper for `mumamo-chunk-xml-pi'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-search-fw-exc-start-xml-pi-1 pos max "<?"))
+
+;; Add a find-borders-fun here so that for example src="<?php some
+;; code ?>" can be handled.
+;;
+;; Fix-me: Maybe generalize for other values than <?php
+(defun mumamo-find-borders-xml-pi (start end exc-mode)
+  (let (start-border
+        end-border
+        (inc t)
+        ;;(begin-mark "<?php")
+        (begin-mark "<?")
+        (end-mark "?>")
+        (here (point)))
+    (if (and inc exc-mode)
+        (progn
+          (when start
+            ;;(setq start-border (+ start (length begin-mark)))
+            (goto-char (+ start (length begin-mark)))
+            (skip-chars-forward "=a-zA-Z")
+            (setq start-border (point))
+            )
+          (when end
+            (setq end-border
+                  (- end (length end-mark)))))
+      (if (and (not inc) (not exc-mode))
+          (progn
+            (when start
+              (setq start-border
+                    (+ start (length end-mark))))
+            (when end
+              (setq end-border (- end (length begin-mark)))
+              ;;(goto-char end)
+              ;;(skip-chars-forward "=a-zA-Z")
+              ;;(setq end-border (point))
+              ))))
+    (goto-char here)
+    (when (or start-border end-border)
+      (list start-border end-border))))
+
+(defun mumamo-chunk-xml-pi (pos min max)
+  "Find process instruction, <? ... ?>.  Return range and wanted mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-xml-pi
+                              'mumamo-search-bw-exc-end-xml-pi
+                              'mumamo-search-fw-exc-start-xml-pi
+                              'mumamo-search-fw-exc-end-xml-pi
+                              'mumamo-find-borders-xml-pi
+                              ))
+
+
+;;;; <style ...>
+
+(defconst mumamo-style-tag-start-regex
+  (rx "<style"
+      space
+      (0+ (not (any ">")))
+      "type"
+      (0+ space)
+      "="
+      (0+ space)
+      ?\"
+      "text/css"
+      ?\"
+      (0+ (not (any ">")))
+      ">"
+      ;; FIX-ME: Commented out because of bug in Emacs
+      ;;
+      ;;(optional (0+ space) "<![CDATA[")
+      ))
+
+(defun mumamo-search-bw-exc-start-inlined-style (pos min)
+  "Helper for `mumamo-chunk-inlined-style'.
+POS is where to start search and MIN is where to stop."
+  (goto-char (+ pos 6))
+  (let ((marker-start (search-backward "<style" min t))
+        exc-mode
+        exc-start)
+    (when marker-start
+      (when (looking-at mumamo-style-tag-start-regex)
+        (setq exc-start (match-end 0))
+        (goto-char exc-start)
+        (when (<= exc-start pos)
+          ;;(cons (point) 'css-mode)
+          ;;(list (point) 'css-mode '(nxml-mode))
+          ;; Fix-me: Kubica looping problem
+          (list (point) 'css-mode)
+          )
+        ))))
+
+(defun mumamo-search-bw-exc-end-inlined-style (pos min)
+  "Helper for `mumamo-chunk-inlined-style'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</style>"))
+
+(defun mumamo-search-fw-exc-start-inlined-style (pos max)
+  "Helper for `mumamo-chunk-inlined-style'.
+POS is where to start search and MAX is where to stop."
+  (goto-char (1+ pos))
+  (skip-chars-backward "^<")
+  ;; Handle <![CDATA[
+  (when (and
+         (eq ?< (char-before))
+         (eq ?! (char-after))
+         (not (bobp)))
+    (backward-char)
+    (skip-chars-backward "^<"))
+  (unless (bobp)
+    (backward-char 1))
+  (let ((exc-start (search-forward "<style" max t))
+        exc-mode)
+    (when exc-start
+      (goto-char (- exc-start 6))
+      (when (looking-at mumamo-style-tag-start-regex)
+        (goto-char (match-end 0))
+        (point)
+        ))))
+
+(defun mumamo-search-fw-exc-end-inlined-style (pos max)
+  "Helper for `mumamo-chunk-inlined-style'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</style>")))
+
+(defun mumamo-chunk-inlined-style (pos min max)
+  "Find <style>...</style>.  Return range and 'css-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-inlined-style
+                              'mumamo-search-bw-exc-end-inlined-style
+                              'mumamo-search-fw-exc-start-inlined-style
+                              'mumamo-search-fw-exc-end-inlined-style))
+
+;;;; <script ...>
+
+(defconst mumamo-script-tag-start-regex
+  (rx "<script"
+      space
+      (0+ (not (any ">")))
+      "type"
+      (0+ space)
+      "="
+      (0+ space)
+      ?\"
+      ;;(or "text" "application")
+      ;;"/"
+      ;;(or "javascript" "ecmascript")
+      "text/javascript"
+      ?\"
+      (0+ (not (any ">")))
+      ">"
+      ;; FIX-ME: Commented out because of bug in Emacs
+      ;;
+      ;;(optional (0+ space) "<![CDATA[" )
+      ))
+
+(defun mumamo-search-bw-exc-start-inlined-script (pos min)
+  "Helper for `mumamo-chunk-inlined-script'.
+POS is where to start search and MIN is where to stop."
+  (goto-char (+ pos 7))
+  (let ((marker-start (search-backward "<script" min t))
+        exc-mode
+        exc-start)
+    (when marker-start
+      (when (looking-at mumamo-script-tag-start-regex)
+        (setq exc-start (match-end 0))
+        (goto-char exc-start)
+        (when (<= exc-start pos)
+          ;;(cons (point) 'javascript-mode)
+          (list (point) 'javascript-mode '(nxml-mode))
+          )
+        ))))
+
+(defun mumamo-search-bw-exc-end-inlined-script (pos min)
+  "Helper for `mumamo-chunk-inlined-script'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</script>"))
+
+(defun mumamo-search-fw-exc-start-inlined-script (pos max)
+  "Helper for `mumamo-chunk-inlined-script'.
+POS is where to start search and MAX is where to stop."
+  (goto-char (1+ pos))
+  (skip-chars-backward "^<")
+  ;; Handle <![CDATA[
+  (when (and
+         (eq ?< (char-before))
+         (eq ?! (char-after))
+         (not (bobp)))
+    (backward-char)
+    (skip-chars-backward "^<"))
+  (unless (bobp)
+    (backward-char 1))
+  (let ((exc-start (search-forward "<script" max t))
+        exc-mode)
+    (when exc-start
+      (goto-char (- exc-start 7))
+      (when (looking-at mumamo-script-tag-start-regex)
+        (goto-char (match-end 0))
+        (point)
+        ))))
+
+(defun mumamo-search-fw-exc-end-inlined-script (pos max)
+  "Helper for `mumamo-chunk-inlined-script'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</script>")))
+
+(defun mumamo-chunk-inlined-script (pos min max)
+  "Find <script>...</script>.  Return range and 'javascript-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-inlined-script
+                              'mumamo-search-bw-exc-end-inlined-script
+                              'mumamo-search-fw-exc-start-inlined-script
+                              'mumamo-search-fw-exc-end-inlined-script))
+
+;;;; on[a-z]+=\"javascript:"
+
+(defconst mumamo-onjs=start-regex
+  (rx point
+      (or "<" "?>")
+      (* (not (any ">")))
+      space
+      (submatch
+       "on"
+       (1+ (any "a-za-z"))
+       "=")
+      (0+ space)
+      ?\"
+      (submatch
+       (opt "javascript:")
+       (0+
+        (not (any "\""))))
+      ))
+
+(defun mumamo-chunk-onjs=(pos min max)
+  "Find javascript on...=\"...\".  Return range and 'javascript-mode."
+  (mumamo-chunk-attr= pos min max "on[a-z]+=" t mumamo-onjs=start-regex
+                      'javascript-mode))
+
+;;;; style=
+
+(defconst mumamo-style=start-regex
+  (rx "<"
+      (0+ (not (any ">")))
+      space
+      (submatch "style=")
+      (0+ space)
+      ?\"
+      (submatch
+       (0+
+        (not (any "\""))))
+      ))
+
+(defun mumamo-chunk-style=(pos min max)
+  "Find style=\"...\".  Return range and 'css-mode."
+  (mumamo-chunk-attr= pos min max "style=" nil mumamo-style=start-regex
+                      'css-mode))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; HTML w html-mode
+
+(defun mumamo-chunk-alt-php (pos min max)
+  "Find (?php ... ?), return range and `php-mode'.
+Workaround for the problem that I can not tame `nxml-mode' to recognize <?php.
+
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (when mumamo-alt-php-tags-mode
+    (mumamo-quick-static-chunk pos min max "(?php" "?)" t 'php-mode t)))
+
+(defun mumamo-chunk-alt-php= (pos min max)
+  "Find (?= ... ?), return range and `php-mode'.
+Workaround for the problem that I can not tame `nxml-mode' to recognize <?php.
+
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (when mumamo-alt-php-tags-mode
+    (mumamo-quick-static-chunk pos min max "(?=" "?)" t 'php-mode t)))
+
+;;;###autoload
+(define-mumamo-multi-major-mode html-mumamo-mode
+  "Turn on multiple major modes for (X)HTML with main mode `html-mode'.
+This covers inlined style and javascript and PHP."
+  ("HTML Family" html-mode
+   (mumamo-chunk-xml-pi
+    mumamo-chunk-alt-php
+    mumamo-chunk-alt-php=
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+(add-hook 'html-mumamo-mode-hook 'mumamo-define-html-file-wide-keys)
+(mumamo-inherit-sub-chunk-family 'html-mumamo-mode)
+
+;; (define-mumamo-multi-major-mode xml-pi-only-mumamo-mode
+;;   "Test"
+;;   ("HTML Family" html-mode
+;;    (mumamo-chunk-xml-pi
+;;     )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; XHTML w nxml-mode
+
+(defun mumamo-alt-php-write-contents ()
+  "For `write-contents-functions' when `mumamo-chunk-alt-php' is used."
+  (let ((here (point)))
+    (save-match-data
+      (save-restriction
+        (widen)
+        (condition-case nil
+            (atomic-change-group
+              (progn
+                (goto-char (point-min))
+                (while (search-forward "(?php" nil t)
+                  (replace-match "<?php"))
+                (goto-char (point-min))
+                (while (search-forward "(?=" nil t)
+                  (replace-match "<?="))
+                (goto-char (point-min))
+                (while (search-forward "?)" nil t)
+                  (replace-match "?>"))
+                (basic-save-buffer-1)
+                (signal 'mumamo-error-ind-0 nil)))
+          (mumamo-error-ind-0)))
+      (set-buffer-modified-p nil))
+    (goto-char here))
+  ;; saved, return t
+  t)
+
+(put 'mumamo-alt-php-tags-mode 'permanent-local t)
+(define-minor-mode mumamo-alt-php-tags-mode
+  "Minor mode for using '(?php' instead of '<?php' in buffer.
+When turning on this mode <?php is replace with (?php in the buffer.
+If you write the buffer to file (?php is however written as <?php.
+
+When turning off this mode (?php is replace with <?php in the buffer.
+
+The purpose of this minor mode is to work around problems with
+using the `nxml-mode' parser in php files.  `nxml-mode' knows
+damned well that you can not have the character < in strings and
+I can't make it forget that.  For PHP programmers it is however
+very convient to use <?php ... ?> in strings.
+
+There is no reason to use this minor mode unless you want XML
+validation and/or completion in your php file.  If you do not
+want that then you can simply use a multi major mode based on
+`html-mode' instead of `nxml-mode'/`nxhtml-mode'.  Or, of course,
+just `php-mode' if there is no html code in the file."
+  :lighter "<?php "
+  (if mumamo-alt-php-tags-mode
+      (progn
+        ;;(unless mumamo-multi-major-mode (error "Only for mumamo multi major modes"))
+        (unless (let ((major-mode (mumamo-main-major-mode)))
+                  (derived-mode-p 'nxml-mode))
+          ;;(error "Mumamo multi major mode must be based on nxml-mode")
+          )
+        (unless (memq 'mumamo-chunk-alt-php (caddr mumamo-current-chunk-family))
+          (error "Mumamo multi major must have chunk function mumamo-chunk-alt-php"))
+
+        ;; Be paranoid about the file/content write hooks
+        (when local-write-file-hooks ;; obsolete, but check!
+          (error "Will not do this because local-write-file-hooks is non-nil"))
+        (remove-hook 'write-contents-functions 'mumamo-alt-php-write-contents t)
+        (when write-contents-functions
+          (error "Will not do this because write-contents-functions is non-nil"))
+        (when (delq 'recentf-track-opened-file (copy-sequence write-file-functions))
+          (error "Will not do this because write-file-functions is non-nil"))
+
+        (add-hook 'write-contents-functions 'mumamo-alt-php-write-contents t t)
+        (put 'write-contents-functions 'permanent-local t)
+        (save-restriction
+          (let ((here (point)))
+            (widen)
+            (goto-char (point-min))
+            (while (search-forward "<?php" nil t)
+              (replace-match "(?php"))
+            (goto-char (point-min))
+            (while (search-forward "<?=" nil t)
+              (replace-match "(?="))
+            (goto-char (point-min))
+            (while (search-forward "?>" nil t)
+                (replace-match "?)"))
+            (goto-char here))))
+    (save-restriction
+      (let ((here (point)))
+        (widen)
+        (goto-char (point-min))
+        (while (search-forward "(?php" nil t)
+          (replace-match "<?php"))
+        (goto-char (point-min))
+        (while (search-forward "(?=" nil t)
+          (replace-match "<?="))
+        (goto-char (point-min))
+        (while (search-forward "?)" nil t)
+          (replace-match "?>"))
+        (goto-char here)))
+    (remove-hook 'write-contents-functions 'mumamo-alt-php-write-contents t)))
+
+;;;###autoload
+(define-mumamo-multi-major-mode nxml-mumamo-mode
+  "Turn on multiple major modes for (X)HTML with main mode `nxml-mode'.
+This covers inlined style and javascript and PHP.
+
+See also `mumamo-alt-php-tags-mode'."
+  ("nXml Family" nxml-mode
+   (mumamo-chunk-xml-pi
+    mumamo-chunk-alt-php
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+(add-hook 'nxml-mumamo-mode-hook 'mumamo-define-html-file-wide-keys)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Embperl
+
+(defun mumamo-chunk-embperl-<- (pos min max)
+  "Find [- ... -], return range and `perl-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "[-" "-]" t 'perl-mode t))
+
+(defun mumamo-chunk-embperl-<+ (pos min max)
+  "Find [+ ... +], return range and `perl-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "[+" "+]" t 'perl-mode nil))
+
+(defun mumamo-chunk-embperl-<! (pos min max)
+  "Find [! ... !], return range and `perl-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "[!" "!]" t 'perl-mode t))
+
+(defun mumamo-chunk-embperl-<$ (pos min max)
+  "Find [$ ... $], return range and `perl-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  ;; This is a bit tricky since [$var] etc must be avoided.
+  (let* ((begin-mark "[$")
+         (end-mark "$]")
+         (good-chars '(32 ;space
+                       10 ;line feed
+                       9  ;tab
+                       ))
+         (search-bw-exc-start (lambda (pos min)
+                                (let ((not-found t)
+                                      (next-char nil)
+                                      (exc-start (mumamo-chunk-start-bw-str
+                                                  pos min begin-mark))
+                                      (here (point)))
+                                  (while (and not-found
+                                              exc-start)
+                                    (setq next-char (char-after (+ (point) 2)))
+                                    (if (memq next-char good-chars)
+                                        (setq not-found nil)
+                                      (setq exc-start
+                                            (search-backward begin-mark
+                                                             min t))))
+                                  (when (and exc-start
+                                             (<= exc-start pos))
+                                    (cons exc-start 'perl-mode)))))
+         (search-bw-exc-end (lambda (pos min)
+                              (mumamo-chunk-end-bw-str pos min end-mark)))
+         (search-fw-exc-start (lambda (pos max)
+                                (let ((not-found t)
+                                      (next-char nil)
+                                      (exc-start (mumamo-chunk-start-fw-str
+                                                  pos max begin-mark))
+                                      (here (point)))
+                                  (while (and not-found
+                                              exc-start)
+                                    (setq next-char (char-after))
+                                    (if (memq next-char good-chars)
+                                        (setq not-found nil)
+                                      (setq exc-start
+                                            (search-forward begin-mark
+                                                            max t))))
+                                  exc-start)))
+         (search-fw-exc-end (lambda (pos max)
+                              (save-match-data
+                                (mumamo-chunk-end-fw-str pos max end-mark))))
+         )
+    (mumamo-find-possible-chunk pos min max
+                                search-bw-exc-start
+                                search-bw-exc-end
+                                search-fw-exc-start
+                                search-fw-exc-end)))
+
+;;;###autoload
+(define-mumamo-multi-major-mode embperl-html-mumamo-mode
+  "Turn on multiple major modes for Embperl files with main mode `html-mode'.
+This also covers inlined style and javascript."
+    ("Embperl HTML Family" html-mode
+     (mumamo-chunk-embperl-<-
+      mumamo-chunk-embperl-<+
+      mumamo-chunk-embperl-<!
+      mumamo-chunk-embperl-<$
+      mumamo-chunk-inlined-style
+      mumamo-chunk-inlined-script
+      mumamo-chunk-style=
+      mumamo-chunk-onjs=
+     )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; django
+
+(defun mumamo-chunk-django4(pos min max)
+  "Find {% comment %}.  Return range and `django-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "{% comment %}" "{% endcomment %}" t 'django-comment-mode t))
+;;;   (mumamo-find-possible-chunk pos min max
+;;;                               'mumamo-search-bw-exc-start-django4
+;;;                               'mumamo-search-bw-exc-end-django4
+;;;                               'mumamo-search-fw-exc-start-django4
+;;;                               'mumamo-search-fw-exc-end-django4))
+
+(defun mumamo-chunk-django3(pos min max)
+  "Find {# ... #}.  Return range and `django-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "{#" "#}" t 'django-comment-mode t))
+;;;   (mumamo-find-possible-chunk pos min max
+;;;                               'mumamo-search-bw-exc-start-django3
+;;;                               'mumamo-search-bw-exc-end-django3
+;;;                               'mumamo-search-fw-exc-start-django3
+;;;                               'mumamo-search-fw-exc-end-django3))
+
+(defun mumamo-chunk-django2(pos min max)
+  "Find {{ ... }}.  Return range and `django-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "{{" "}}" t 'django-variable-mode t))
+;;;   (mumamo-find-possible-chunk pos min max
+;;;                               'mumamo-search-bw-exc-start-django2
+;;;                               'mumamo-search-bw-exc-end-django2
+;;;                               'mumamo-search-fw-exc-start-django2
+;;;                               'mumamo-search-fw-exc-end-django2))
+
+(defun mumamo-chunk-django (pos min max)
+  "Find {% ... %}.  Return range and `django-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "{%" "%}" t 'django-mode t))
+;;;   (mumamo-find-possible-chunk pos min max
+;;;                               'mumamo-search-bw-exc-start-django
+;;;                               'mumamo-search-bw-exc-end-django
+;;;                               'mumamo-search-fw-exc-start-django
+;;;                               'mumamo-search-fw-exc-end-django))
+
+(defun mumamo-search-bw-exc-start-django (pos min)
+  "Helper for `mumamo-chunk-django'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{%")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'django-mode))))
+
+(defun mumamo-search-bw-exc-start-django2(pos min)
+  "Helper for `mumamo-chunk-django2'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{{")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'django-mode))))
+
+(defun mumamo-search-bw-exc-start-django3(pos min)
+  "Helper for `mumamo-chunk-django3'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{#")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'django-comment-mode))))
+
+(defun mumamo-search-bw-exc-start-django4(pos min)
+  "Helper for `mumamo-chunk-django4'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min
+                                                       "{% comment %}")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'django-comment-mode))))
+
+(defun mumamo-search-bw-exc-end-django (pos min)
+  "Helper for `mumamo-chunk-django'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str-inc pos min "%}"))
+
+(defun mumamo-search-bw-exc-end-django2(pos min)
+  "Helper for `mumamo-chunk-django2'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str-inc pos min "}}"))
+
+(defun mumamo-search-bw-exc-end-django3(pos min)
+  "Helper for `mumamo-chunk-django3'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str-inc pos min "#}"))
+
+(defun mumamo-search-bw-exc-end-django4(pos min)
+  "Helper for `mumamo-chunk-django4'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str-inc pos min "{% endcomment %}"))
+
+(defun mumamo-search-fw-exc-start-django (pos max)
+  "Helper for `mumamo-chunk-django'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str-inc pos max "{%"))
+
+(defun mumamo-search-fw-exc-start-django2(pos max)
+  "Helper for `mumamo-chunk-django2'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str-inc pos max "{{"))
+
+(defun mumamo-search-fw-exc-start-django3(pos max)
+  "Helper for `mumamo-chunk-django3'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str-inc pos max "{#"))
+
+(defun mumamo-search-fw-exc-start-django4(pos max)
+  "Helper for `mumamo-chunk-django4'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str-inc pos max "{% comment %}"))
+
+(defun mumamo-search-fw-exc-end-django (pos max)
+  "Helper for `mumamo-chunk-django'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-end-fw-str-inc pos max "%}"))
+
+(defun mumamo-search-fw-exc-end-django2(pos max)
+  "Helper for `mumamo-chunk-django2'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-end-fw-str-inc pos max "}}"))
+
+(defun mumamo-search-fw-exc-end-django3(pos max)
+  "Helper for `mumamo-chunk-django3'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-end-fw-str-inc pos max "#}"))
+
+(defun mumamo-search-fw-exc-end-django4(pos max)
+  "Helper for `mumamo-chunk-django4'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-end-fw-str-inc pos max "{% endcomment %}"))
+
+;;;###autoload
+(define-mumamo-multi-major-mode django-html-mumamo-mode
+  "Turn on multiple major modes for Django with main mode `html-mode'.
+This also covers inlined style and javascript."
+  ("Django HTML Family" html-mode
+   (mumamo-chunk-django4
+    mumamo-chunk-django
+    mumamo-chunk-django2
+    mumamo-chunk-django3
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Genshi / kid
+
+;; {% python ... %}
+(defun mumamo-chunk-genshi%(pos min max)
+  "Find {% python ... %}.  Return range and `genshi-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "{% python" "%}" t 'python-mode t))
+
+;; ${expr}
+(defun mumamo-chunk-genshi$(pos min max)
+  "Find ${ ... }, return range and `python-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (let ((chunk
+         (mumamo-quick-static-chunk pos min max "${" "}" t 'python-mode t)))
+    (when chunk
+      ;; Test for clash with %}
+      (let ((sub-mode (nth 2 chunk))
+            (start (nth 0 chunk)))
+        (if sub-mode
+            chunk
+          ;;(message "point.1=%s" (point))
+          (when (and start
+                     (eq ?% (char-before start)))
+            ;;(message "point.2=%s" (point))
+            ;;(message "clash with %%}, chunk=%s" chunk)
+            ;;(setq chunk nil)
+            (setcar chunk (1- start))
+            )
+          ;;(message "chunk.return=%s" chunk)
+          chunk)))))
+
+;; Fix-me: Because of the way chunks currently are searched for there
+;; is an error when a python chunk is used. This is because mumamo
+;; gets confused by the %} ending and the } ending.  This can be
+;; solved by running a separate phase to get the chunks first and
+;; during that phase match start and end of the chunk.
+;;;###autoload
+(define-mumamo-multi-major-mode genshi-html-mumamo-mode
+  "Turn on multiple major modes for Genshi with main mode `html-mode'.
+This also covers inlined style and javascript.
+
+Note: You will currently get fontification errors if you use
+python chunks
+
+  {% python ... %}
+
+The reason is that the chunk routines currently do not know when
+to just look for the } or %} endings.  However this should not
+affect your editing normally."
+  ("Genshi HTML Family" html-mode
+   (
+    mumamo-chunk-genshi%
+    mumamo-chunk-genshi$
+    mumamo-chunk-xml-pi
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; MJT
+
+;; ${expr}
+(defun mumamo-chunk-mjt$(pos min max)
+  "Find ${ ... }, return range and `javascript-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "${" "}" t 'javascript-mode t))
+
+;;;###autoload
+(define-mumamo-multi-major-mode mjt-html-mumamo-mode
+  "Turn on multiple major modes for MJT with main mode `html-mode'.
+This also covers inlined style and javascript."
+  ("MJT HTML Family" html-mode
+   (
+    mumamo-chunk-mjt$
+    mumamo-chunk-xml-pi
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; smarty
+
+(defun mumamo-chunk-smarty (pos min max)
+  "Find { ... }.  Return range and 'smarty-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-smarty
+                              'mumamo-search-bw-exc-end-smarty
+                              'mumamo-search-fw-exc-start-smarty
+                              'mumamo-search-fw-exc-end-smarty))
+
+(defun mumamo-search-bw-exc-start-smarty (pos min)
+  "Helper for `mumamo-chunk-smarty'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str-inc pos min "{")))
+    (when (and exc-start
+               (<= exc-start pos))
+      (cons exc-start 'smarty-mode))))
+
+(defun mumamo-search-bw-exc-end-smarty (pos min)
+  "Helper for `mumamo-chunk-smarty'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str-inc pos min "}"))
+
+(defun mumamo-search-fw-exc-start-smarty (pos max)
+  "Helper for `mumamo-chunk-smarty'.
+POS is where to start search and MAX is where to stop."
+  (let ((end-out (mumamo-chunk-start-fw-str-inc pos max "{")))
+    end-out))
+
+(defun mumamo-search-fw-exc-end-smarty (pos max)
+  "Helper for `mumamo-chunk-smarty'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str-inc pos max "}")))
+
+;;;###autoload
+(define-mumamo-multi-major-mode smarty-html-mumamo-mode
+  "Turn on multiple major modes for Smarty with main mode `html-mode'.
+This also covers inlined style and javascript."
+  ("Smarty HTML Family" html-mode
+   (mumamo-chunk-xml-pi
+    mumamo-chunk-smarty
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; jsp
+
+(defun mumamo-chunk-jsp (pos min max)
+  "Find <% ... %>.  Return range and 'java-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "<%" "%>" t 'java-mode t))
+
+;;;###autoload
+(define-mumamo-multi-major-mode jsp-html-mumamo-mode
+  "Turn on multiple major modes for JSP with main mode `html-mode'.
+This also covers inlined style and javascript."
+    ("JSP HTML Family" html-mode
+     (mumamo-chunk-jsp
+      mumamo-chunk-inlined-style
+      mumamo-chunk-inlined-script
+      mumamo-chunk-style=
+      mumamo-chunk-onjs=
+      )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; eruby
+
+;; Fix-me: Maybe take care of <%= and <%- and -%>, but first ask the
+;; ruby people if this is worth doing.
+;;
+;; See also http://wiki.rubyonrails.org/rails/pages/UnderstandingViews
+(defun mumamo-chunk-eruby (pos min max)
+  "Find <% ... %>.  Return range and 'ruby-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "<%" "%>" t 'ruby-mode t))
+
+;; (defun mumamo-search-bw-exc-start-ruby (pos min)
+;;   "Helper for `mumamo-chunk-ruby'.
+;; POS is where to start search and MIN is where to stop."
+;;   (let ((exc-start (mumamo-chunk-start-bw-str pos min "<%")))
+;;     (when (and exc-start
+;;                (<= exc-start pos))
+;;       (cons exc-start 'ruby-mode))))
+
+;;;###autoload
+(define-mumamo-multi-major-mode eruby-mumamo-mode
+  "Turn on multiple major mode for eRuby with unspecified main mode.
+Current major-mode will be used as the main major mode."
+  ("eRuby Family" nil
+   (mumamo-chunk-eruby
+    )))
+
+;;;###autoload
+(define-mumamo-multi-major-mode eruby-html-mumamo-mode
+  "Turn on multiple major modes for eRuby with main mode `html-mode'.
+This also covers inlined style and javascript."
+  ("eRuby Html Family" html-mode
+   (mumamo-chunk-eruby
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; heredoc
+
+(defcustom mumamo-heredoc-modes
+  '(
+    ("HTML" html-mode)
+    ("CSS" css-mode)
+    ("JAVASCRIPT" javascript-mode)
+    ("JAVA" java-mode)
+    )
+  "Matches for heredoc modes.
+The entries in this list have the form
+
+  (REGEXP MAJOR-MODE-SPEC)
+
+where REGEXP is a regular expression that should match the
+heredoc marker and MAJOR-MODE-SPEC is the major mode spec to use
+in the heredoc part.
+
+The major mode spec is translated to a major mode using
+`mumamo-major-mode-from-modespec'."
+  :type '(repeat
+          (list
+           regexp
+           (function :tag "Major mode")))
+  :group 'mumamo-modes)
+
+(defun mumamo-mode-for-heredoc (marker)
+  "Return major mode associated with MARKER.
+Use first match in `mumamo-heredoc-modes'.
+If no match use `text-mode'."
+  (let ((mode (catch 'mode
+                (save-match-data
+                  (dolist (rec mumamo-heredoc-modes)
+                    (let ((regexp (nth 0 rec))
+                          (mode   (nth 1 rec)))
+                      (when (string-match regexp marker)
+                        (throw 'mode mode))))))))
+    (if mode
+        (mumamo-major-mode-from-modespec mode)
+      'text-mode)))
+
+(defun mumamo-chunk-heredoc (pos min max lang)
+  "This should work similar to `mumamo-find-possible-chunk'.
+POS, MIN and MAX have the same meaning as there.
+
+LANG is the programming language.
+Supported values are 'perl."
+  ;; Fix-me: LANG
+  (mumamo-condition-case err
+      (let ((old-point (point)))
+        (goto-char pos)
+        (beginning-of-line)
+        (let (next-<<
+              (want-<< t)
+              heredoc-mark
+              (delimiter "")
+              (skip-b "")
+              start-inner
+              end
+              exc-mode
+              fw-exc-fun
+              border-fun
+              start-outer
+              ps
+              )
+          (goto-char pos)
+          (beginning-of-line)
+          (case lang
+            ('sh
+             (while want-<<
+               (setq next-<< (search-forward "<<" max t))
+               (if (not next-<<)
+                   (setq want-<< nil) ;; give up
+                 ;; Check inside string or comment.
+                 (setq ps (parse-partial-sexp (line-beginning-position) (point)))
+                 (unless (or (nth 3 ps) (nth 4 ps))
+                   (setq want-<< nil))))
+             (when next-<<
+               (setq start-outer (- (point) 2))
+               (when (= (char-after) ?-)
+                 (setq skip-b "\t*")
+                 (unless (eolp) (forward-char)))
+               (skip-chars-forward " \t")
+               (when (memq (char-after) '(?\" ?\'))
+                 (setq delimiter (list (char-after))))
+               (when (looking-at (concat delimiter "\\([^\n;]*\\)" delimiter "[[:blank:]]*\n"))
+                 (setq heredoc-mark  (buffer-substring-no-properties
+                                      (match-beginning 1)
+                                      (match-end 1)))
+                 (setq start-inner (match-end 0)))))
+            ('w32-ps (error "No support for windows power shell yet"))
+            ('php
+             (while want-<<
+               (setq next-<< (search-forward "<<<" max t))
+               ;; Check inside string or comment.
+               (if (not next-<<)
+                   (setq want-<< nil) ;; give up
+                 (setq ps (parse-partial-sexp (line-beginning-position) (point)))
+                 (unless (or (nth 3 ps) (nth 4 ps))
+                   (setq want-<< nil))))
+             (when next-<<
+               (setq start-outer (- (point) 3))
+               (skip-chars-forward " \t")
+               (when (looking-at (concat "\\([^\n;]*\\)[[:blank:]]*\n"))
+                 (setq heredoc-mark  (buffer-substring-no-properties
+                                      (match-beginning 1)
+                                      (match-end 1)))
+                 (setq start-inner (match-end 0)))))
+            ('perl
+             (while want-<<
+               (setq next-<< (search-forward "<<" max t))
+               (if (not next-<<)
+                   (setq want-<< nil) ;; give up
+                 ;; Check inside string or comment.
+                 (setq ps (parse-partial-sexp (line-beginning-position) (point)))
+                 (unless (or (nth 3 ps) (nth 4 ps))
+                   (setq want-<< nil))))
+             (when next-<<
+               (setq start-outer (- (point) 2))
+               (skip-chars-forward " \t")
+               (when (memq (char-after) '(?\" ?\'))
+                 (setq delimiter (list (char-after))))
+               (when (looking-at (concat delimiter "\\([^\n;]*\\)" delimiter ";[[:blank:]]*\n"))
+                 (setq heredoc-mark  (buffer-substring-no-properties
+                                      (match-beginning 1)
+                                      (match-end 1)))
+                 (setq start-inner (1+ (match-end 0))))))
+            ('python
+             (unless (eobp) (forward-char))
+             (while want-<<
+               (setq next-<< (re-search-forward "\"\"\"\\|'''" max t))
+               (setq start-outer (- (point) 3))
+               (if (not next-<<)
+                   (setq want-<< nil) ;; give up
+                 ;; Check inside string or comment.
+                 (setq ps (parse-partial-sexp (line-beginning-position) (- (point) 3)))
+                 (unless (or (nth 3 ps) (nth 4 ps))
+                   (setq want-<< nil)))))
+            ('ruby
+             (while want-<<
+               (setq next-<< (search-forward "<<" max t))
+               (if (not next-<<)
+                   (setq want-<< nil) ;; give up
+                 ;; Check inside string or comment.
+                 (setq ps (parse-partial-sexp (line-beginning-position) (point)))
+                 (unless (or (nth 3 ps) (nth 4 ps))
+                   (setq want-<< nil))))
+             (when next-<<
+               (setq start-outer (- (point) 2))
+               (when (= (char-after) ?-)
+                 (setq skip-b "[ \t]*")
+                 (forward-char))
+               (when (looking-at (concat "[^\n[:blank:]]*"))
+                 (setq heredoc-mark  (buffer-substring-no-properties
+                                      (match-beginning 0)
+                                      (match-end 0)))
+                 (setq start-inner (match-end 0)))))
+            (t (error "next-<< not implemented for lang %s" lang)))
+          (when start-inner (assert (<= pos start-inner) t))
+          (goto-char old-point)
+          (when (or start-inner end)
+            (let ((endmark-regexp
+                   (case lang
+                     ('sh (concat "^" skip-b heredoc-mark "$"))
+                     ('php (concat "^" heredoc-mark ";?$"))
+                     ('perl (concat "^" heredoc-mark "$"))
+                     ('python (concat "^" heredoc-mark "[[:space:]]*"))
+                     ('ruby (concat "^" skip-b heredoc-mark "$"))
+                     (t (error "mark-regexp not implemented for %s" lang)))))
+              ;; Fix-me: rename start-inner <=> start-outer...
+              (setq border-fun `(lambda (start end exc-mode)
+                                  ;; Fix-me: use lengths...
+                                  (list (+ start (- ,start-inner ,start-outer 1))
+                                        (when end
+                                          (- end ,(1+ (length heredoc-mark)))))))
+              (setq fw-exc-fun `(lambda (pos max)
+                                  (save-match-data
+                                    (let ((here (point)))
+                                      (goto-char pos)
+                                      (prog1
+                                          (when (re-search-forward ,endmark-regexp max t)
+                                            (- (point) 0))
+                                        (goto-char here)))))))
+            (setq exc-mode (mumamo-mode-for-heredoc heredoc-mark))
+            (list start-inner end exc-mode nil nil fw-exc-fun nil)
+            (list start-outer end exc-mode (list start-inner end) nil fw-exc-fun border-fun)
+            )))
+    (error (mumamo-display-error 'mumamo-chunk-heredoc
+                                 "%s" (error-message-string err)))))
+
+
+;;;; Unix style sh heredoc
+
+(defun mumamo-chunk-sh-heredoc (pos min max)
+  "Find sh here docs.
+See `mumamo-find-possible-chunk' for POS, MIN
+and MAX."
+  (let ((r (mumamo-chunk-heredoc pos min max 'sh)))
+    r))
+
+;;;###autoload
+(define-mumamo-multi-major-mode sh-heredoc-mumamo-mode
+  "Turn on multiple major modes for sh heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes."
+  ("SH HereDoc" sh-mode
+   (mumamo-chunk-sh-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'sh-heredoc-mumamo-mode)
+
+
+;;;; PHP heredoc
+
+(defun mumamo-chunk-php-heredoc (pos min max)
+  "Find PHP here docs.
+See `mumamo-find-possible-chunk' for POS, MIN
+and MAX."
+  (let ((r (mumamo-chunk-heredoc pos min max 'php)))
+    r))
+
+;;;###autoload
+(define-mumamo-multi-major-mode php-heredoc-mumamo-mode
+  "Turn on multiple major modes for PHP heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes."
+  ("PHP HereDoc" php-mode
+   (mumamo-chunk-php-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'php-heredoc-mumamo-mode)
+
+
+;;;; Perl heredoc
+
+(defun mumamo-chunk-perl-heredoc (pos min max)
+  "Find perl here docs.
+See `mumamo-find-possible-chunk' for POS, MIN
+and MAX."
+  (let ((r (mumamo-chunk-heredoc pos min max 'perl)))
+    r))
+
+;;;###autoload
+(define-mumamo-multi-major-mode perl-heredoc-mumamo-mode
+  "Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes."
+  ("Perl HereDoc" perl-mode
+   (mumamo-chunk-perl-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'perl-heredoc-mumamo-mode)
+
+;;;###autoload
+(define-mumamo-multi-major-mode cperl-heredoc-mumamo-mode
+  "Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes.
+
+Note: I have seen some problems with this.  Use
+`perl-mumamo-mode' instead for now."
+  ("Perl HereDoc" cperl-mode
+   (mumamo-chunk-perl-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'cperl-heredoc-mumamo-mode)
+
+
+;;;; Python heredoc
+
+(defun mumamo-chunk-python-heredoc (pos min max)
+  "Find python here docs.
+See `mumamo-find-possible-chunk' for POS, MIN
+and MAX."
+  (let ((r (mumamo-chunk-heredoc pos min max 'python)))
+    r))
+
+;;;###autoload
+(define-mumamo-multi-major-mode python-heredoc-mumamo-mode
+  "Turn on multiple major modes for Perl heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes."
+  ("Python HereDoc" python-mode
+   (mumamo-chunk-python-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'python-heredoc-mumamo-mode)
+
+
+;;;; Ruby heredoc
+
+(defun mumamo-chunk-ruby-heredoc (pos min max)
+  "Find Ruby here docs.
+See `mumamo-find-possible-chunk' for POS, MIN
+and MAX."
+  (let ((r (mumamo-chunk-heredoc pos min max 'ruby)))
+    r))
+
+;;;###autoload
+(define-mumamo-multi-major-mode ruby-heredoc-mumamo-mode
+  "Turn on multiple major modes for Ruby heredoc document.
+See `mumamo-heredoc-modes' for how to specify heredoc major modes."
+  ("Ruby HereDoc" ruby-mode
+   (mumamo-chunk-ruby-heredoc
+    )))
+(mumamo-inherit-sub-chunk-family 'ruby-heredoc-mumamo-mode)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Tex meta
+
+(defun mumamo-search-bw-textext-start (pos min)
+  "Helper for `mumamo-chunk-textext'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "textext(\""))
+        (exc-mode 'plain-tex-mode))
+    (when exc-start
+      (when (<= exc-start pos)
+        (cons exc-start exc-mode)))))
+
+(defconst mumamo-textext-end-regex
+  (rx "textext("
+      (0+
+       (0+ (not (any "\"()")))
+       ?\"
+       (0+ (not (any "\"")))
+       ?\"
+       )
+      (0+ (not (any "\"()")))
+      ")"))
+
+(defun mumamo-textext-test-is-end (pos)
+  "Helper for `mumamo-chunk-textext'.
+Return POS if POS is at the end of textext chunk."
+  (when pos
+    (let ((here (point))
+          hit)
+      (goto-char (+ 2 pos))
+      (when (looking-back mumamo-textext-end-regex)
+        (setq hit t))
+      (goto-char here)
+      (when hit pos))))
+
+(defun mumamo-search-bw-textext-end (pos min)
+  "Helper for `mumamo-chunk-textext'.
+POS is where to start search and MIN is where to stop."
+  (let ((end (mumamo-chunk-end-bw-str pos min "\")"))
+        res)
+    (while (and end
+                (not (setq res (mumamo-textext-test-is-end end))))
+      (setq end (mumamo-chunk-end-bw-str (1- end) min "\")")))
+    res))
+
+(defun mumamo-search-fw-textext-start (pos max)
+  "Helper for `mumamo-chunk-textext'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str pos max "textext(\""))
+
+(defun mumamo-search-fw-textext-end (pos max)
+  "Helper for `mumamo-chunk-textext'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (let ((end (mumamo-chunk-end-fw-str pos max "\")")))
+      (mumamo-textext-test-is-end end))))
+
+(defun mumamo-chunk-textext (pos min max)
+  "Find textext or TEX chunks.  Return range and 'plain-tex-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-textext-start
+                              'mumamo-search-bw-textext-end
+                              'mumamo-search-fw-textext-start
+                              'mumamo-search-fw-textext-end))
+
+(defun mumamo-search-bw-verbatimtex-start (pos min)
+  "Helper for `mumamo-chunk-verbatimtextext'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "\nverbatimtex"))
+        (exc-mode 'plain-tex-mode))
+    (when exc-start
+      (when (<= exc-start pos)
+        (cons exc-start exc-mode)))))
+
+(defun mumamo-search-bw-verbatimtex-end (pos min)
+  "Helper for `mumamo-chunk-verbatimtextext'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "\netex"))
+
+(defun mumamo-search-fw-verbatimtex-start (pos max)
+  "Helper for `mumamo-chunk-verbatimtextext'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str pos max "\nverbatimtex"))
+
+(defun mumamo-search-fw-verbatimtex-end (pos max)
+  "Helper for `mumamo-chunk-verbatimtextext'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "\netex")))
+
+(defun mumamo-chunk-verbatimtex (pos min max)
+  "Find verbatimtex - etex chunks.  Return range and 'plain-tex-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-verbatimtex-start
+                              'mumamo-search-bw-verbatimtex-end
+                              'mumamo-search-fw-verbatimtex-start
+                              'mumamo-search-fw-verbatimtex-end))
+
+(defun mumamo-search-bw-btex-start (pos min)
+  "Helper for `mumamo-chunk-btex'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "\nverbatimtex"))
+        (exc-mode 'plain-tex-mode))
+    (when exc-start
+      (when (<= exc-start pos)
+        (cons exc-start exc-mode)))))
+
+(defun mumamo-search-bw-btex-end (pos min)
+  "Helper for `mumamo-chunk-btex'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "\netex"))
+
+(defun mumamo-search-fw-btex-start (pos max)
+  "Helper for `mumamo-chunk-btex'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str pos max "\nverbatimtex"))
+
+(defun mumamo-search-fw-btex-end (pos max)
+  "Helper for `mumamo-chunk-btex'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "\netex")))
+
+(defun mumamo-chunk-btex (pos min max)
+  "Find btex - etex chunks.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-btex-start
+                              'mumamo-search-bw-btex-end
+                              'mumamo-search-fw-btex-start
+                              'mumamo-search-fw-btex-end))
+
+;;;###autoload
+(define-mumamo-multi-major-mode metapost-mumamo-mode
+  "Turn on multiple major modes for MetaPost."
+  ("MetaPost TeX Family" metapost-mode
+   (mumamo-chunk-textext
+    mumamo-chunk-verbatimtex
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; OpenLaszlo
+
+(defconst mumamo-lzx-method-tag-start-regex
+  (rx "<method"
+      (optional
+       space
+       (0+ (not (any ">"))))
+      ">"
+      ;; FIX-ME: Commented out because of bug in Emacs
+      ;;
+      ;;(optional (0+ space) "<![CDATA[" )
+      ))
+
+(defun mumamo-search-bw-exc-start-inlined-lzx-method (pos min)
+  "Helper for `mumamo-chunk-inlined-lzx-method'.
+POS is where to start search and MIN is where to stop."
+  (goto-char (+ pos 7))
+  (let ((marker-start (search-backward "<method" min t))
+        exc-mode
+        exc-start)
+    (when marker-start
+      (when (looking-at mumamo-lzx-method-tag-start-regex)
+        (setq exc-start (match-end 0))
+        (goto-char exc-start)
+        (when (<= exc-start pos)
+          (cons (point) 'javascript-mode))
+        ))))
+
+(defun mumamo-search-bw-exc-end-inlined-lzx-method (pos min)
+  "Helper for `mumamo-chunk-inlined-lzx-method'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</method>"))
+
+(defun mumamo-search-fw-exc-start-inlined-lzx-method (pos max)
+  "Helper for `mumamo-chunk-inlined-lzx-method'.
+POS is where to start search and MAX is where to stop."
+  (goto-char (1+ pos))
+  (skip-chars-backward "^<")
+  ;; Handle <![CDATA[
+  (when (and
+         (eq ?< (char-before))
+         (eq ?! (char-after))
+         (not (bobp)))
+    (backward-char)
+    (skip-chars-backward "^<"))
+  (unless (bobp)
+    (backward-char 1))
+  (let ((exc-start (search-forward "<method" max t))
+        exc-mode)
+    (when exc-start
+      (goto-char (- exc-start 7))
+      (when (looking-at mumamo-lzx-method-tag-start-regex)
+        (goto-char (match-end 0))
+        (point)
+        ))))
+
+(defun mumamo-search-fw-exc-end-inlined-lzx-method (pos max)
+  "Helper for `mumamo-chunk-inlined-lzx-method'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</method>")))
+
+(defun mumamo-chunk-inlined-lzx-method (pos min max)
+  "Find <method>...</method>.  Return range and 'javascript-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-inlined-lzx-method
+                              'mumamo-search-bw-exc-end-inlined-lzx-method
+                              'mumamo-search-fw-exc-start-inlined-lzx-method
+                              'mumamo-search-fw-exc-end-inlined-lzx-method))
+
+(defconst mumamo-lzx-handler-tag-start-regex
+  (rx "<handler"
+      (optional
+       space
+       (0+ (not (any ">"))))
+      ">"
+      ;; FIX-ME: Commented out because of bug in Emacs
+      ;;
+      ;;(optional (0+ space) "<![CDATA[" )
+      ))
+
+(defun mumamo-search-bw-exc-start-inlined-lzx-handler (pos min)
+  "Helper for `mumamo-chunk-inlined-lzx-handler'.
+POS is where to start search and MIN is where to stop."
+  (goto-char (+ pos 8))
+  (let ((marker-start (search-backward "<handler" min t))
+        exc-mode
+        exc-start)
+    (when marker-start
+      (when (looking-at mumamo-lzx-handler-tag-start-regex)
+        (setq exc-start (match-end 0))
+        (goto-char exc-start)
+        (when (<= exc-start pos)
+          (cons (point) 'javascript-mode))
+        ))))
+
+(defun mumamo-search-bw-exc-end-inlined-lzx-handler (pos min)
+  "Helper for `mumamo-chunk-inlined-lzx-handler'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</handler>"))
+
+(defun mumamo-search-fw-exc-start-inlined-lzx-handler (pos max)
+  "Helper for `mumamo-chunk-inlined-lzx-handler'.
+POS is where to start search and MAX is where to stop."
+  (goto-char (1+ pos))
+  (skip-chars-backward "^<")
+  ;; Handle <![CDATA[
+  (when (and
+         (eq ?< (char-before))
+         (eq ?! (char-after))
+         (not (bobp)))
+    (backward-char)
+    (skip-chars-backward "^<"))
+  (unless (bobp)
+    (backward-char 1))
+  (let ((exc-start (search-forward "<handler" max t))
+        exc-mode)
+    (when exc-start
+      (goto-char (- exc-start 8))
+      (when (looking-at mumamo-lzx-handler-tag-start-regex)
+        (goto-char (match-end 0))
+        (point)
+        ))))
+
+(defun mumamo-search-fw-exc-end-inlined-lzx-handler (pos max)
+  "Helper for `mumamo-chunk-inlined-lzx-handler'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</handler>")))
+
+(defun mumamo-chunk-inlined-lzx-handler (pos min max)
+  "Find <handler>...</handler>.  Return range and 'javascript-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-inlined-lzx-handler
+                              'mumamo-search-bw-exc-end-inlined-lzx-handler
+                              'mumamo-search-fw-exc-start-inlined-lzx-handler
+                              'mumamo-search-fw-exc-end-inlined-lzx-handler))
+
+
+;;;###autoload
+(define-mumamo-multi-major-mode laszlo-nxml-mumamo-mode
+  "Turn on multiple major modes for OpenLaszlo."
+  ("OpenLaszlo Family" nxml-mode
+   (mumamo-chunk-inlined-script
+    mumamo-chunk-inlined-lzx-method
+    mumamo-chunk-inlined-lzx-handler
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; csound
+
+(defun mumamo-search-bw-exc-start-csound-orc (pos min)
+  "Helper for `mumamo-chunk-csound-orc'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<csinstruments>")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'csound-orc-mode))))
+
+(defun mumamo-search-bw-exc-end-csound-orc (pos min)
+  "Helper for `mumamo-chunk-csound-orc'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</csinstruments>"))
+
+(defun mumamo-search-fw-exc-start-csound-orc (pos max)
+  "Helper for `mumamo-chunk-csound-orc'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str pos max "<csinstruments>"))
+
+(defun mumamo-search-fw-exc-end-csound-orc (pos max)
+  "Helper for `mumamo-chunk-csound-orc'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</csinstruments>")))
+
+(defun mumamo-chunk-csound-orc (pos min max)
+  "Find <csinstruments>...</...>.  Return range and 'csound-orc-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-csound-orc
+                              'mumamo-search-bw-exc-end-csound-orc
+                              'mumamo-search-fw-exc-start-csound-orc
+                              'mumamo-search-fw-exc-end-csound-orc))
+
+(defun mumamo-search-bw-exc-start-csound-sco (pos min)
+  "Helper for `mumamo-chunk-csound-sco'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<csscore>")))
+    (and exc-start
+         (<= exc-start pos)
+         (cons exc-start 'csound-sco-mode))))
+
+(defun mumamo-search-bw-exc-end-csound-sco (pos min)
+  "Helper for `mumamo-chunk-csound-sco'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-str pos min "</csscore>"))
+
+(defun mumamo-search-fw-exc-start-csound-sco (pos max)
+  "Helper for `mumamo-chunk-csound-sco'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-str pos max "<csscore>"))
+
+(defun mumamo-search-fw-exc-end-csound-sco (pos max)
+  "Helper for `mumamo-chunk-csound-sco'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-str pos max "</csscore>")))
+
+(defun mumamo-chunk-csound-sco (pos min max)
+  "Found <csscore>...</csscore>.  Return range and 'csound-sco-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-csound-sco
+                              'mumamo-search-bw-exc-end-csound-sco
+                              'mumamo-search-fw-exc-start-csound-sco
+                              'mumamo-search-fw-exc-end-csound-sco))
+
+;;;###autoload
+(define-mumamo-multi-major-mode csound-sgml-mumamo-mode
+  "Turn on mutiple major modes for CSound orc/sco Modes."
+  ("CSound orc/sco Modes" sgml-mode
+   (mumamo-chunk-csound-sco
+    mumamo-chunk-csound-orc
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; noweb
+
+(defgroup mumamo-noweb2 nil
+  "Customization group for `noweb2-mumamo-mode'."
+  :group 'mumamo-modes)
+
+(defcustom mumamo-noweb2-mode-from-ext
+  '(
+    ("php" . php-mode)
+    ("c" . c-mode)
+    )
+  "File extension regexp to major mode mapping.
+Used by `noweb2-mumamo-mode'."
+  :type '(repeat
+          (cons regexp major-mode-function))
+  :group 'mumamo-noweb2)
+
+(defvar mumamo-noweb2-found-mode-from-ext nil
+  "Major modes determined from file names.  Internal use.")
+
+(defun mumamo-noweb2-chunk-start-fw (pos max)
+  "Helper for `mumamo-noweb2-chunk'.
+POS is where to start search and MAX is where to stop."
+  (mumamo-chunk-start-fw-re pos max "^<<\\(.*?\\)>>="))
+
+(defun mumamo-noweb2-chunk-start-bw (pos min)
+  "Helper for `mumamo-noweb2-chunk'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-re pos min "^<<\\(.*?\\)>>="))
+        (exc-mode 'text-mode))
+    (when exc-start
+      (let* ((file-name (match-string 1))
+             (file-ext  (when file-name (file-name-extension file-name))))
+        (when file-ext
+          (setq exc-mode (catch 'major
+                           (dolist (rec mumamo-noweb2-mode-from-ext)
+                             (when (string-match (car rec) file-ext)
+                               (throw 'major (cdr rec))))
+                           nil))
+          (unless exc-mode
+            (setq exc-mode
+                  (cdr (assoc file-ext mumamo-noweb2-found-mode-from-ext)))
+            (unless exc-mode
+              ;; Get the major mode from file name
+              (with-temp-buffer
+                (setq buffer-file-name file-name)
+                (condition-case err
+                    (normal-mode)
+                  (error (message "error (normal-mode): %s"
+                                  (error-message-string err))))
+                (setq exc-mode (or major-mode
+                                   'text-mode))
+                (add-to-list 'mumamo-noweb2-found-mode-from-ext
+                             (cons file-ext exc-mode)))
+              ))))
+      (cons exc-start exc-mode))))
+
+(defun mumamo-noweb2-chunk-end-fw (pos max)
+  "Helper for `mumamo-noweb2-chunk'.
+POS is where to start search and MAX is where to stop."
+  (save-match-data
+    (mumamo-chunk-end-fw-re pos max "^@")))
+
+(defun mumamo-noweb2-chunk-end-bw (pos min)
+  "Helper for `mumamo-noweb2-chunk'.
+POS is where to start search and MIN is where to stop."
+  (mumamo-chunk-end-bw-re pos min "^@"))
+
+(defun mumamo-noweb2-code-chunk (pos min max)
+  "Find noweb chunks.  Return range and found mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (save-match-data
+    (mumamo-find-possible-chunk pos min max
+                                'mumamo-noweb2-chunk-start-bw
+                                'mumamo-noweb2-chunk-end-bw
+                                'mumamo-noweb2-chunk-start-fw
+                                'mumamo-noweb2-chunk-end-fw)))
+
+
+;;;###autoload
+(define-mumamo-multi-major-mode noweb2-mumamo-mode
+  "Multi major mode for noweb files."
+  ("noweb Family" latex-mode
+   (mumamo-noweb2-code-chunk)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Template-Toolkit
+
+
+
+;; (setq auto-mode-alist
+;;       (append '(("\\.tt2?$" . tt-mode))  auto-mode-alist ))
+
+;;(require 'tt-mode)
+(defun mumamo-chunk-tt (pos min max)
+  "Find [% ... %], return range and `tt-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX.
+
+This is for Template Toolkit.
+See URL `http://dave.org.uk/emacs/' for `tt-mode'."
+  (mumamo-quick-static-chunk pos min max "[%" "%]" t 'tt-mode nil))
+
+(define-mumamo-multi-major-mode tt-html-mumamo-mode
+  "Turn on multiple major modes for TT files with main mode `nxhtml-mode'.
+TT = Template-Toolkit.
+
+This also covers inlined style and javascript."
+    ("TT HTML Family" html-mode
+     (mumamo-chunk-tt
+      mumamo-chunk-inlined-style
+      mumamo-chunk-inlined-script
+      mumamo-chunk-style=
+      mumamo-chunk-onjs=
+     )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Asp
+
+(defun mumamo-chunk-asp (pos min max)
+  "Find <% ... %>.  Return range and 'asp-js-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  ;; Fix-me: this is broken!
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-search-bw-exc-start-asp
+                              'mumamo-search-bw-exc-end-jsp
+                              'mumamo-search-fw-exc-start-jsp
+                              'mumamo-search-fw-exc-end-jsp))
+
+(defconst mumamo-asp-lang-marker
+  (rx "<%@"
+      (0+ space)
+      "language"
+      (0+ space)
+      "="
+      (0+ space)
+      "\""
+      (submatch (1+ (not (any "\""))))
+      "\""
+      (0+ space)))
+
+(defun mumamo-search-bw-exc-start-asp (pos min)
+  "Helper function for `mumamo-chunk-asp'.
+POS is where to start search and MIN is where to stop."
+  (let ((exc-start (mumamo-chunk-start-bw-str pos min "<%")))
+    (when (and exc-start
+               (<= exc-start pos))
+      (let ((here (point))
+            (mode 'asp-vb-mode)
+            lang)
+        (when (re-search-backward mumamo-asp-lang-marker nil t)
+          (setq lang (downcase (match-string-no-properties 1)))
+          (lwarn 't :warning "lang=%s" lang)
+          (cond
+           ((string= lang "javascript")
+            (setq mode 'asp-js-mode))
+           )
+          )
+        (cons exc-start mode)))))
+
+
+;;;; asp <script ...>
+
+(defconst mumamo-asp-script-tag-start-regex
+  (rx "<script"
+      space
+      (0+ (not (any ">")))
+      "language"
+      (0+ space)
+      "="
+      (0+ space)
+      ?\"
+      ;;(or "text" "application")
+      ;;"/"
+      ;;(or "javascript" "ecmascript")
+      ;; "text/javascript"
+      (or "javascript" "vbscript")
+      ?\"
+      (0+ (not (any ">")))
+      ">"
+      ;; FIX-ME: Commented out because of bug in Emacs
+      ;;
+      ;;(optional (0+ space) "<![CDATA[" )
+      ))
+
+(defun mumamo-asp-search-bw-exc-start-inlined-script (pos min)
+  "Helper function for `mumamo-asp-chunk-inlined-script'.
+POS is where to start search and MIN is where to stop."
+  (goto-char (+ pos 7))
+  (let ((marker-start (search-backward "<script" min t))
+        (exc-mode 'asp-vb-mode)
+        exc-start
+        lang)
+    (when marker-start
+      (when (looking-at mumamo-script-tag-start-regex)
+        (setq lang (downcase (match-string-no-properties 1)))
+        (cond
+         ((string= lang "javascript")
+          (setq exc-mode 'asp-js-mode))
+         )
+        (setq exc-start (match-end 0))
+        (goto-char exc-start)
+        (when (<= exc-start pos)
+          (cons (point) exc-mode))
+        ))))
+
+(defun mumamo-asp-chunk-inlined-script (pos min max)
+  "Find <script language=...  runat=...>...</script>.  Return 'asp-js-mode.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-asp-search-bw-exc-start-inlined-script
+                              'mumamo-search-bw-exc-end-inlined-script
+                              'mumamo-search-fw-exc-start-inlined-script
+                              'mumamo-search-fw-exc-end-inlined-script))
+
+;;;###autoload
+(define-mumamo-multi-major-mode asp-html-mumamo-mode
+  "Turn on multiple major modes for ASP with main mode `html-mode'.
+This also covers inlined style and javascript."
+  ("ASP Html Family" html-mode
+   (mumamo-chunk-asp
+    mumamo-asp-chunk-inlined-script
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Org-mode
+
+;; Fix-me: this opens and close org trees in a quite unfriendly
+;; way. Some buffer local variables in org-mode have to be preserved
+;; to prevent that.
+
+(defun mumamo-chunk-org-html (pos min max)
+  "Find #+BEGIN_HTML ... #+END_HTML, return range and `html-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "#+BEGIN_HTML" "#+END_HTML" t 'html-mode t))
+
+;;;###autoload
+(define-mumamo-multi-major-mode org-mumamo-mode
+  "Turn on multiple major modes for `org-mode' files with main mode `org-mode'.
+Unfortunately this only allows `html-mode' (not `nxhtml-mode') in
+sub chunks."
+    ("Org Mode + Html" org-mode
+     (mumamo-chunk-org-html
+      )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Mako
+
+;; See http://www.makotemplates.org/docs/syntax.html
+
+;;; Comments mode
+;; Fix-me: move to mumamo.el
+(defconst mumamo-comment-font-lock-keywords
+  (list
+   (cons "\\(.*\\)" (list 1 font-lock-comment-face))
+   ))
+(defvar mumamo-comment-font-lock-defaults
+  '(mumamo-comment-font-lock-keywords t t))
+
+(define-derived-mode mumamo-comment-mode nil "Comment chunk"
+  "For comment blocks."
+  (set (make-local-variable 'font-lock-defaults) mumamo-comment-font-lock-defaults))
+
+
+
+(defun mumamo-chunk-mako-<% (pos min max)
+  "Find <% ... %> and <%! ... %>. Return range and `python-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-find-possible-chunk pos min max
+                              'mumamo-mako-<%-bw-start
+                              'mumamo-mako-<%-bw-end
+                              'mumamo-mako-<%-fw-start
+                              'mumamo-mako-<%-fw-end
+                              'mumamo-mako-<%-find-borders
+                              ))
+(defun mumamo-mako-<%-find-borders (start end exc-mode)
+  (when exc-mode
+    (list
+     (when start
+       (+ start
+          (if (eq ?! (char-after (+ start 2)))
+              3
+            2)))
+     (when end (- end 2))
+     exc-mode)))
+
+(defun mumamo-mako-<%-bw-start (pos min)
+  (let ((here (point))
+        start
+        ret
+        )
+    (goto-char (+ pos 3))
+    (setq start (re-search-backward "<%!?\\(?:[ \t]\\|$\\)" min t))
+    (when (and start (<= start pos))
+      (setq ret (list start 'python-mode)))
+    (goto-char here)
+    ret))
+(defun mumamo-mako-<%-bw-end (pos min)
+  (mumamo-chunk-end-bw-str-inc pos min "%>")) ;; ok
+(defun mumamo-mako-<%-fw-start (pos max)
+  (let ((here (point))
+        start
+        ret)
+    (goto-char pos)
+    (setq start
+          (re-search-forward "<%!?\\(?:[ \t]\\|$\\)" max t))
+    (when start
+      (setq ret (match-beginning 0)))
+    (goto-char here)
+    ret))
+(defun mumamo-mako-<%-fw-end (pos max)
+  (save-match-data
+    (mumamo-chunk-end-fw-str-inc pos max "%>"))) ;; ok
+
+
+
+(defun mumamo-chunk-mako-% (pos min max)
+  "Find % python EOL.  Return range and `python-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-whole-line-chunk pos min max "%" 'python-mode))
+
+(defun mumamo-chunk-mako-one-line-comment (pos min max)
+  "Find ## comment EOL.  Return range and `python-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-whole-line-chunk pos min max "##" 'mumamo-comment-mode))
+
+;; Fix-me: Move this to mumamo.el
+;; Fix-me: does not work with new chunk div
+(defun mumamo-whole-line-chunk-fw-exc-end-fun (pos max)
+  (let ((here (point)))
+    (goto-char pos)
+    (prog1
+        (line-end-position)
+      (goto-char here))))
+
+(defun mumamo-whole-line-chunk (pos min max marker mode)
+  (if nil ;;(not mumamo-use-new-chunks)
+      nil
+      ;; (let* ((here (point))
+      ;;        (len-marker (length marker))
+      ;;        (whole-line-chunk-borders-fun
+      ;;         `(lambda (start-border end-border dummy)
+      ;;            (let ((start-border (+ (point) ,len-marker)))
+      ;;              (list start-border nil))))
+      ;;        beg
+      ;;        end
+      ;;        ret)
+      ;;   (goto-char pos)
+      ;;   (setq beg (line-beginning-position))
+      ;;   (setq end (line-end-position))
+      ;;   (unless (or (when min (< beg min))
+      ;;               (when max (> end max))
+      ;;               (= pos end))
+      ;;     (goto-char beg)
+      ;;     (skip-chars-forward " \t")
+      ;;     (when (and
+      ;;            (string= marker (buffer-substring-no-properties (point) (+ (point) len-marker)))
+      ;;            (memq (char-after (+ (point) len-marker))
+      ;;                  '(?\  ?\t ?\n))
+      ;;            (>= pos (point)))
+      ;;       (setq ret
+      ;;             (list (point)
+      ;;                   end
+      ;;                   mode
+      ;;                   (let ((start-border (+ (point) len-marker)))
+      ;;                     (list start-border nil))
+      ;;                   nil
+      ;;                   'mumamo-whole-line-chunk-fw-exc-end-fun
+      ;;                   whole-line-chunk-borders-fun
+      ;;                   ))))
+      ;;   (unless ret
+      ;;     (let ((range-regexp
+      ;;            (concat "^[ \t]*"
+      ;;                    "\\("
+      ;;                    (regexp-quote marker)
+      ;;                    "[ \t\n].*\\)$")))
+      ;;       ;; Backward
+      ;;       (goto-char pos)
+      ;;       (unless (= pos (line-end-position))
+      ;;         (goto-char (line-beginning-position)))
+      ;;       (setq beg (re-search-backward range-regexp min t))
+      ;;       (when beg (setq beg (match-end 1)))
+      ;;       ;; Forward, take care of indentation part
+      ;;       (goto-char pos)
+      ;;       (unless (= pos (line-end-position))
+      ;;         (goto-char (line-beginning-position)))
+      ;;       (setq end (re-search-forward range-regexp max t))
+      ;;       (when end (setq end (match-beginning 1))))
+      ;;     (setq ret (list beg
+      ;;                     end
+      ;;                     mode
+      ;;                     nil ;(let ((start-border (+ (point) len-marker))) (list start-border nil))
+      ;;                     nil
+      ;;                     'mumamo-whole-line-chunk-fw-exc-end-fun
+      ;;                     whole-line-chunk-borders-fun
+      ;;                     )))
+      ;;   (goto-char here)
+      ;;   ;;(setq ret nil)
+      ;;   ret)
+    (let* ((here (point))
+           (len-marker (length marker))
+           ;;(pattern (rx bol (0+ blank) (eval marker) blank))
+           ;;(pattern (rx-to-string (list 'and 'bol (list '0+ 'blank) marker 'blank) t))
+           (pattern (rx-to-string `(and bol (0+ blank) ,marker blank) t))
+           (whole-line-chunk-borders-fun
+            `(lambda (start-border end-border dummy)
+               (let ((start-border (+ (point) ,len-marker)))
+                 (list start-border nil))))
+           beg
+           end
+           ret)
+      (goto-char pos)
+      (setq beg (re-search-forward pattern max t))
+      (when beg
+        (setq end (line-end-position))
+        (setq ret (list beg
+                        end
+                        mode
+                        (let ((start-border (+ beg len-marker)))
+                          (list start-border nil))
+                        nil
+                        'mumamo-whole-line-chunk-fw-exc-end-fun
+                        whole-line-chunk-borders-fun
+                        )))
+      (goto-char here)
+      ;;(setq ret nil)
+      ret)
+    ))
+
+;; (defun mumamo-single-regexp-chunk (pos min max begin-mark end-mark mode)
+;;   "Not ready yet. `mumamo-quick-static-chunk'"
+;;   (let ((here (point))
+;;         (len-marker (length marker))
+;;         beg
+;;         end
+;;         ret)
+;;     (goto-char pos)
+;;     (setq beg (line-beginning-position))
+;;     (setq end (line-end-position))
+;;     (unless (or (when min (< beg min))
+;;                 (when max (> end max))
+;;                 (= pos end))
+;;       (goto-char beg)
+;;       (skip-chars-forward " \t")
+;;       (when (and
+;;              (string= marker (buffer-substring-no-properties (point) (+ (point) len-marker)))
+;;              (memq (char-after (+ (point) len-marker))
+;;                    '(?\  ?\t ?\n))
+;;              (>= pos (point)))
+;;         (setq ret
+;;               (list (point)
+;;                     end
+;;                     mode
+;;                     (let ((start-border (+ (point) len-marker)))
+;;                       (list start-border nil))))))
+;;     (unless ret
+;;       (let ((range-regexp
+;;              (concat "^[ \t]*"
+;;                      "\\("
+;;                      (regexp-quote marker)
+;;                      "[ \t\n].*\\)$")))
+;;         ;; Backward
+;;         (goto-char pos)
+;;         (unless (= pos (line-end-position))
+;;           (goto-char (line-beginning-position)))
+;;         (setq beg (re-search-backward range-regexp min t))
+;;         (when beg (setq beg (match-end 1)))
+;;         ;; Forward, take care of indentation part
+;;         (goto-char pos)
+;;         (unless (= pos (line-end-position))
+;;           (goto-char (line-beginning-position)))
+;;         (setq end (re-search-forward range-regexp max t))
+;;         (when end (setq end (match-beginning 1))))
+;;       (setq ret (list beg end)))
+;;     (goto-char here)
+;;     ;;(setq ret nil)
+;;     ret))
+
+
+(defun mumamo-chunk-mako-<%doc (pos min max)
+  (mumamo-quick-static-chunk pos min max "<%doc>" "</%doc>" t 'mumamo-comment-mode t))
+
+(defun mumamo-chunk-mako-<%include (pos min max)
+  (mumamo-quick-static-chunk pos min max "<%include" "/>" t 'html-mode t))
+
+(defun mumamo-chunk-mako-<%inherit (pos min max)
+  (mumamo-quick-static-chunk pos min max "<%inherit" "/>" t 'html-mode t))
+
+(defun mumamo-chunk-mako-<%namespace (pos min max)
+  (mumamo-quick-static-chunk pos min max "<%namespace" "/>" t 'html-mode t))
+
+(defun mumamo-chunk-mako-<%page (pos min max)
+  (mumamo-quick-static-chunk pos min max "<%page" "/>" t 'html-mode t))
+
+(defun mumamo-chunk-mako$(pos min max)
+  "Find ${ ... }, return range and `python-mode'.
+See `mumamo-find-possible-chunk' for POS, MIN and MAX."
+  (mumamo-quick-static-chunk pos min max "${" "}" t 'python-mode t))
+
+;;;###autoload
+(define-mumamo-multi-major-mode mako-html-mumamo-mode
+  "Turn on multiple major modes for Mako with main mode `html-mode'.
+This also covers inlined style and javascript."
+;; Fix-me: test case
+;;
+;; Fix-me: Add chunks for the tags, but make sure these are made
+;; invisible to nxml-mode parser.
+;;
+;; Fix-me: Maybe finally add that indentation support for one-line chunks?
+  ("Mako HTML Family" html-mode
+   (
+    mumamo-chunk-mako-one-line-comment
+    mumamo-chunk-mako-<%doc
+    mumamo-chunk-mako-<%include
+    mumamo-chunk-mako-<%inherit
+    mumamo-chunk-mako-<%namespace
+    mumamo-chunk-mako-<%page
+
+    ;;mumamo-chunk-mako-<%def
+    ;;mumamo-chunk-mako-<%call
+    ;;mumamo-chunk-mako-<%text
+
+    mumamo-chunk-mako-<%
+    mumamo-chunk-mako-%
+    mumamo-chunk-mako$
+
+    mumamo-chunk-xml-pi
+    mumamo-chunk-inlined-style
+    mumamo-chunk-inlined-script
+    mumamo-chunk-style=
+    mumamo-chunk-onjs=
+    )))
+
+
+(provide 'mumamo-fun)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; mumamo-fun.el ends here
diff --git a/elpa-to-submit/nxhtml/util/mumamo-regions.el b/elpa-to-submit/nxhtml/util/mumamo-regions.el
new file mode 100644
index 0000000000..ca6ae040a9
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/mumamo-regions.el
@@ -0,0 +1,267 @@
+;;; mumamo-regions.el --- user defined regions with mumamo
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-05-31 Sun
+;; Version: 0.5
+;; Last-Updated: 2009-06-01 Mon
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Add temporary mumamo chunks (called mumamo regions).  This are
+;; added interactively from a highlighted region.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Internal side functions etc
+
+(defvar mumamo-regions nil
+  "List of active mumamo regions.  Internal use only.
+The entries in this list should be like this
+
+    \(OVL-DEF OVL-CHUNK)
+
+where OVL-DEF is an overlay containing the definitions, ie `major-mode'.
+OVL-CHUNK is the definitions set up temporarily for mumamo chunks.
+
+The fontification functions in mumamo looks in this list, but the
+chunk dividing functions defined by
+`define-mumamo-multi-major-mode' does not.  The effect is that
+the normal chunks exists regardless of what is in this list, but
+fontification etc is overridden by what this list says.")
+(make-variable-buffer-local 'mumamo-regions)
+(put 'mumamo-regions 'permanent-local t)
+
+(defun mumamo-add-region-1 (major start end buffer)
+  "Add a mumamo region with major mode MAJOR from START to END.
+Return the region.  The returned value can be used in
+`mumamo-clear-region'.
+
+START and END should be markers in the buffer BUFFER.  They may
+also be nil in which case they extend the region to the buffer
+boundaries."
+  (unless mumamo-multi-major-mode
+    (mumamo-temporary-multi-major))
+  (or (not start)
+      (markerp start)
+      (eq (marker-buffer start) buffer)
+      (error "Bad arg start: %s" start))
+  (or (not end)
+      (markerp end)
+      (eq (marker-buffer end) buffer)
+      (error "Bad arg end: %s" end))
+  (let ((ovl (make-overlay start end)))
+    (overlay-put ovl 'mumamo-region 'defined)
+    (overlay-put ovl 'face 'mumamo-region)
+    (mumamo-region-set-major ovl major)
+    (setq mumamo-regions (cons (list ovl nil) mumamo-regions))
+    (mumamo-mark-for-refontification (overlay-start ovl) (overlay-end ovl))
+    (message "Added mumamo region from %d to %d" (+ 0 start) (+ 0 end))
+    ovl))
+
+(defun mumamo-clear-region-1 (region-entry)
+  "Clear mumamo region REGION-ENTRY.
+The entry must have been returned from `mumamo-add-region-1'."
+  (let ((buffer (overlay-buffer (car region-entry)))
+        (entry  (cdr region-entry)))
+    (when (buffer-live-p buffer)
+      (with-current-buffer buffer
+        (let ((ovl1 (car region-entry))
+              (ovl2 (cadr region-entry)))
+          (delete-overlay ovl1)
+          (when ovl2
+            (mumamo-mark-for-refontification (overlay-start ovl2) (overlay-end ovl2))
+            (delete-overlay ovl2))
+          (setq mumamo-regions (delete region-entry mumamo-regions)))))))
+
+(defvar mumamo-region-priority 0)
+(make-variable-buffer-local 'mumamo-region-priority)
+(put 'mumamo-region-priority 'permanent-local t)
+
+(defun mumamo-get-region-from-1 (point)
+  "Return mumamo region values for POINT.
+The return value is either mumamo chunk or a cons with
+information about where regions starts to hide normal chunks.
+Such a cons has the format \(BELOW . OVER) where each of them is
+a position or nil."
+  (when mumamo-regions
+    (save-restriction
+      (widen)
+      (let* ((start nil)
+             (end   nil)
+             (major nil)
+             hit-reg
+             ret-val)
+        (catch 'found-major
+          (dolist (reg mumamo-regions)
+            (assert (eq (overlay-get (car reg) 'mumamo-region) 'defined) t)
+            (assert (or (not (cadr reg)) (overlayp (cadr reg))))
+            (let* ((this-ovl (car reg))
+                   (this-start (overlay-start this-ovl))
+                   (this-end   (overlay-end this-ovl)))
+               (when  (<= this-end point)
+                 (setq start this-end))
+               (when  (< point this-start)
+                 (setq end this-start))
+               (when (and (<= this-start point)
+                          (< point this-end))
+                 (setq major (overlay-get this-ovl 'mumamo-major-mode))
+                 (setq start (max this-start (or start this-start)))
+                 (setq end   (min this-end   (or end this-end)))
+                 (setq hit-reg reg)
+                 (throw 'found-major nil)))))
+        (if major
+            (progn
+              (setq ret-val (nth 1 hit-reg))
+              (when ret-val (assert (eq (overlay-get ret-val 'mumamo-region) 'used) t))
+              (if ret-val
+                  (move-overlay ret-val start end)
+                (setq ret-val (make-overlay start end nil t nil)) ;; fix-me
+                (setcar (cdr hit-reg) ret-val)
+                (overlay-put ret-val 'mumamo-region 'used)
+                (overlay-put ret-val 'priority ;; above normal chunks + chunks on chunks
+                             (setq mumamo-region-priority (1+ mumamo-region-priority)))
+                ;;(overlay-put ret-val 'face '(:background "chocolate")) ;; temporary
+                (overlay-put ret-val 'mumamo-major-mode
+                             (overlay-get (car hit-reg) 'mumamo-major-mode))))
+          (setq ret-val (cons start end)))
+        ;;(message "mumamo-get-region-from-1, point=%s ret-val=%s" point ret-val)
+        ret-val))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; User side functions
+
+(defun mumamo-temporary-multi-major ()
+  "Turn on a temporary multi major mode from buffers current mode.
+Define one if no one exists.  It will have no chunk dividing
+routines.  It is meant mainly to be used with mumamo regions when
+there is no mumamo multi major mode in the buffer and the user
+wants to add a mumamo region \(which requires a multi major mode
+to work)."
+  (when mumamo-multi-major-mode
+    (error "Mumamo is already active in buffer"))
+  (let* ((temp-mode-name (concat "mumamo-1-"
+                                 (symbol-name major-mode)))
+         (temp-mode-sym (intern-soft temp-mode-name)))
+    (unless temp-mode-sym
+      (setq temp-mode-sym (intern temp-mode-name))
+      (eval
+       `(define-mumamo-multi-major-mode ,temp-mode-sym
+          "Temporary multi major mode."
+          ("Temporary" ,major-mode nil))))
+    (funcall temp-mode-sym)))
+
+(defface mumamo-region
+  '((t (:background "white")))
+  "Face for mumamo-region regions."
+  :group 'mumamo)
+
+;;;###autoload
+(defun mumamo-add-region ()
+  "Add a mumamo region.
+Mumamo regions are like another layer of chunks above the normal chunks.
+They does not affect the normal chunks, but they overrides them.
+
+To create a mumamo region first select a visible region and then
+call this function."
+  (interactive)
+  (if (not mark-active)
+      (message (propertize "Please select a visible region first" 'face 'secondary-selection))
+    (let ((beg (region-beginning))
+          (end (region-end))
+          (maj (mumamo-region-read-major)))
+      (mumamo-add-region-1 maj (copy-marker beg) (copy-marker end) (current-buffer))
+      (setq deactivate-mark t))))
+
+;; (dolist (o (overlays-in (point-min) (point-max))) (delete-overlay o))
+(defun mumamo-clear-all-regions ()
+  "Clear all mumamo regions in buffer.
+For information about mumamo regions see `mumamo-add-region'."
+  (interactive)
+  (while mumamo-regions
+    (mumamo-clear-region-1 (car mumamo-regions))
+    (setq mumamo-regions (cdr mumamo-regions)))
+  (message "Cleared all mumamo regions"))
+
+(defun mumamo-region-read-major ()
+  "Prompt user for major mode.
+Accept only single major mode, not mumamo multi major modes."
+  (let ((major (read-command "Major mode: ")))
+    (unless (major-modep major) (error "Not a major mode: %s" major))
+    (when (mumamo-multi-major-modep major) (error "Multi major modes not allowed: %s" major))
+    (when (let ((major-mode major))
+            (derived-mode-p 'nxml-mode))
+      (error "%s is based on nxml-mode and can't be used here" major))
+    major))
+
+(defun mumamo-region-at (point)
+  "Return mumamo region at POINT."
+   (let ((ovls (overlays-at (point))))
+     (catch 'overlay
+       (dolist (o ovls)
+         (when (overlay-get o 'mumamo-region)
+           (throw 'overlay o)))
+       nil)))
+
+(defun mumamo-region-set-major (ovl major)
+  "Change major mode for mumamo region at point.
+For information about mumamo regions see `mumamo-add-region'.
+
+If run non-interactively then OVL should be a mumamo region and
+MAJOR the major mode to set for that region."
+  (interactive
+   (list (or (mumamo-region-at (point))
+             (error "There is no mumamo region at point"))
+         (mumamo-region-read-major)))
+  (overlay-put ovl 'mumamo-major-mode `(,major))
+  (overlay-put ovl 'help-echo (format "Mumamo region, major mode `%s'" major)))
+
+(defun mumamo-clear-region (ovl)
+  "Clear the mumamo region at point.
+For information about mumamo regions see `mumamo-add-region'.
+
+If run non-interactively then OVL should be the mumamo region to
+clear."
+  (interactive
+   (list (or (mumamo-region-at (point))
+             (error "There is no mumamo region at point"))))
+  (let ((region-entry (assoc ovl mumamo-regions)))
+    (mumamo-clear-region-1 region-entry)))
+
+
+(provide 'mumamo-regions)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; mumamo-regions.el ends here
diff --git a/elpa-to-submit/nxhtml/util/mumamo.el b/elpa-to-submit/nxhtml/util/mumamo.el
index 5adc52f01f..a8dfca953d 100644
--- a/elpa-to-submit/nxhtml/util/mumamo.el
+++ b/elpa-to-submit/nxhtml/util/mumamo.el
@@ -2,17 +2,25 @@
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Maintainer:
-;; Created: Fri Mar 09 18:15:25 2007
-(defconst mumamo:version "0.88") ;;Version:
-;; Last-Updated: 2008-09-23T19:09:11+0200 Tue
+;; Created: Fri Mar 09 2007
+(defconst mumamo:version "0.91") ;;Version:
+;; Last-Updated: 2009-05-28 Thu
 ;; URL: http://OurComments.org/Emacs/Emacs.html
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `backquote', `bytecomp', `cl', `flyspell', `ispell',
-;;   `sgml-mode'.
+  ;; `appmenu', `apropos', `backquote', `button', `bytecomp', `cl',
+  ;; `comint', `compile', `easymenu', `flyspell', `grep', `ido',
+  ;; `ispell', `mail-prsvr', `mlinks', `mm-util', `nxml-enc',
+  ;; `nxml-glyph', `nxml-mode', `nxml-ns', `nxml-outln',
+  ;; `nxml-parse', `nxml-rap', `nxml-util', `ourcomments-util',
+  ;; `recentf', `ring', `rng-dt', `rng-loc', `rng-match',
+  ;; `rng-parse', `rng-pttrn', `rng-uri', `rng-util', `rng-valid',
+  ;; `rx', `sgml-mode', `timer', `tool-bar', `tree-widget',
+  ;; `url-expand', `url-methods', `url-parse', `url-util',
+  ;; `url-vars', `wid-edit', `xmltok'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -56,7 +64,7 @@
 ;;
 ;; The multiple major mode support is turned on by calling special
 ;; functions which are used nearly the same way as major modes.  See
-;; `mumamo-defined-turn-on-functions' for more information about those
+;; `mumamo-defined-multi-major-modes' for more information about those
 ;; functions.
 ;;
 ;; Each such function defines how to take care of a certain mix of
@@ -228,7 +236,7 @@
 ;;   that is needed.  The current logic is mainly in
 ;;   `mumamo-get-chunk-at' and `mumamo-find-possible-chunk'.  (Some
 ;;   other routines tries to behave like `mumamo-find-possible-chunk'
-;;   too: `mumamo-chunk-attr=' and `mumamo-easy-make-chunk-fun'.)
+;;   too: `mumamo-chunk-attr=' and `mumamo-quick-static-chunk'.)
 ;;
 ;; - One idea that I currently have not used is to check outer major
 ;;   mode while dividing into chunks.  This could probably be done
@@ -247,6 +255,13 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'flyspell))
+(eval-when-compile (require 'mlinks))
+(eval-when-compile (require 'nxml-mode nil t))
+(eval-when-compile
+  (when (featurep 'nxml-mode)
+    (require 'rng-valid nil t)
+    ;;(require 'rngalt nil t)
+    ))
 (eval-when-compile (require 'sgml-mode)) ;; For sgml-xml-mode
 ;; For `define-globalized-minor-mode-with-on-off':
 ;;(require 'ourcomments-util)
@@ -295,17 +310,33 @@
 (defvar msgtrc-buffer
   "*Messages*"
   ;;"*trace-output*"
-  "Doc"
+  "Buffer or name of buffer for trace messages.
+See `msgtrc'."
   )
 
 (defun msgtrc (format-string &rest args)
-  ;;(apply 'message format-string args)
-  (with-current-buffer msgtrc-buffer
-    (goto-char (point-max))
-    (insert (apply 'format format-string args))
-    (insert "\n")
-    )
-  )
+  "Print message to `msgtrc-buffer'.
+Arguments FORMAT-STRING and ARGS are like for `message'."
+  (if nil
+      nil ;;(apply 'message format-string args)
+    ;; bug#3350 prevents use of this:
+    (let ((trc-buffer (get-buffer-create msgtrc-buffer))
+          ;; Cure 3350: Stop insert from deactivating the mark
+          (deactivate-mark))
+      (with-current-buffer trc-buffer
+        (goto-char (point-max))
+        (insert "MU:" (apply 'format format-string args) "\n")
+        ;;(insert "constant string\n")
+        (when buffer-file-name (write-region nil nil buffer-file-name))))))
+
+(defvar mumamo-message-file-buffer nil)
+(defsubst mumamo-msgtrc-to-file ()
+  "Start writing message to file. Erase `msgtrc-buffer' first."
+  (unless mumamo-message-file-buffer
+    (setq mumamo-message-file-buffer (find-file-noselect "c:/emacs/bugs/temp-messages.txt"))
+    (setq msgtrc-buffer mumamo-message-file-buffer)
+    (with-current-buffer mumamo-message-file-buffer
+      (erase-buffer))))
 
 (defmacro mumamo-msgfntfy (format-string &rest args)
   "Give some messages during fontification.
@@ -320,6 +351,8 @@ FORMAT-STRING and ARGS have the same meaning as for the function
 `message'."
   ;;(list 'apply (list 'quote 'msgtrc) format-string (append '(list) args))
   ;;(list 'apply (list 'quote 'message) format-string (append '(list) args))
+  ;;(list 'progn 'apply (list 'quote 'message) format-string (append '(list) args) nil)
+  ;;(list 'apply (list 'quote 'message) format-string (append '(list) args))
   ;;(list 'apply (list 'quote 'message) (list 'concat "%s: " format-string)
   ;;   (list 'get-internal-run-time) (append '(list) args))
   )
@@ -368,9 +401,10 @@ errors.")
 ;;(run-with-idle-timer 1 nil 'mumamo-show-report-message)
 (defun mumamo-show-report-message ()
   "Tell the user there is a long error message."
-  (mumamo-message-with-face
-   "MuMaMo error, please look in the *Message* buffer"
-    'highlight))
+  (save-match-data ;; runs in timer
+    (mumamo-message-with-face
+     "MuMaMo error, please look in the *Message* buffer"
+     'highlight)))
 
 ;; This code can't be used now because `debugger' is currently not
 ;; useable in timers. I keep it here since I hope someone will make it
@@ -512,9 +546,9 @@ Otherwise just evaluate BODY-FORM."
        (let* ((debugger (or mumamo-debugger 'debug))
               (debug-on-error (if debugger t debug-on-error)))
          ,body-form)
-    (condition-case ,var
-        ,body-form
-      ,@handlers)))
+     (condition-case ,var
+         ,body-form
+       ,@handlers)))
 
 ;; (defun my-test-err4 ()
 ;;   (interactive)
@@ -528,7 +562,7 @@ Otherwise just evaluate BODY-FORM."
 (make-variable-buffer-local 'mumamo-warned-once)
 (put 'mumamo-warned-once 'permanent-local t)
 
-; (append '(0 1) '(a b))
+                                        ; (append '(0 1) '(a b))
 (defun mumamo-warn-once (type message &rest args)
   "Warn only once with TYPE, MESSAGE and ARGS.
 If the same problem happens again then do not warn again."
@@ -573,12 +607,6 @@ text buttons."
   :group 'nxhtml
   )
 
-(defface mumamo-border-face
-  '((t (:inherit font-lock-preprocessor-face :bold t :italic t)))
-  "Face for marking borders."
-  :group 'mumamo)
-
-
 ;;(setq mumamo-set-major-mode-delay -1)
 ;;(setq mumamo-set-major-mode-delay 5)
 (defcustom mumamo-set-major-mode-delay idle-update-delay
@@ -603,7 +631,102 @@ derivate it took 20 ms on a 3GHz CPU."
   :type 'number
   :group 'mumamo)
 
-(defface mumamo-background-chunk-submode
+
+(defgroup mumamo-display nil
+  "Customization group for mumamo chunk display."
+  :group 'mumamo)
+
+(defun mumamo-update-this-buffer-margin-use ()
+  (mumamo-update-buffer-margin-use (current-buffer)))
+
+(define-minor-mode mumamo-margin-info-mode
+  "Display chunk info in margin when on.
+Display chunk depth and major mode where a chunk begin in left or
+right margin.  \(The '-mode' part of the major mode is stripped.)
+
+See also `mumamo-margin-use'.
+
+Note: When `linum-mode' is on the right margin is always used
+\(since `linum-mode' uses the left)."
+  :group 'mumamo-display
+  (mumamo-update-this-buffer-margin-use)
+  (if mumamo-margin-info-mode
+      (progn
+        (add-hook 'window-configuration-change-hook 'mumamo-update-this-buffer-margin-use nil t)
+        (add-hook 'linum-mode-hook 'mumamo-update-this-buffer-margin-use nil t)
+        )
+    (remove-hook 'window-configuration-change-hook 'mumamo-update-this-buffer-margin-use t)
+    (remove-hook 'linum-mode-hook 'mumamo-update-this-buffer-margin-use t)
+    ))
+(put 'mumamo-margin-info-mode 'permanent-local t)
+
+(defun mumamo-margin-info-mode-turn-off ()
+  (mumamo-margin-info-mode -1))
+(put 'mumamo-margin-info-mode-turn-off 'permanent-local-hook t)
+
+(define-globalized-minor-mode mumamo-margin-info-global-mode mumamo-margin-info-mode
+  (lambda () (when (and (boundp 'mumamo-multi-major-mode)
+                        mumamo-multi-major-mode)
+               (mumamo-margin-info-mode 1)))
+  :group 'mumamo-display)
+
+(defcustom mumamo-margin-use '(left-margin 13)
+  "Display chunk info in left or right margin if non-nil."
+  :type '(list (radio (const :tag "Display chunk info in left margin" left-margin)
+                      (const :tag "Display chunk info in right margin" right-margin))
+               (integer :tag "Margin width (when used)" :value 13))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (fboundp 'mumamo-update-all-buffers-margin-use)
+           (mumamo-update-all-buffers-margin-use)))
+  :group 'mumamo-display)
+
+(defun mumamo-update-all-buffers-margin-use ()
+  (dolist (buf (buffer-list))
+    (mumamo-update-buffer-margin-use buf)))
+
+(defun mumamo-update-buffer-margin-use (buffer)
+  ;;(msgtrc "update-buffer-margin-use %s" buffer)
+  (when (fboundp 'mumamo-update-chunks-margin-display)
+    (with-current-buffer buffer
+      (when mumamo-multi-major-mode
+        ;; Note: window update must be before buffer update because it
+        ;; uses old-margin from the call to function margin-used.
+        (dolist (win (get-buffer-window-list buffer))
+          (mumamo-set-window-margins-used win))
+        (mumamo-update-chunks-margin-display buffer)
+        ))))
+
+;; (setq mumamo-chunk-coloring 4)
+(defcustom mumamo-chunk-coloring 0
+  "Color chunks with depth greater than or equal to this.
+When 0 all chunks will be colored.  If 1 all sub mode chunks will
+be colored, etc."
+  :type '(integer :tag "Color chunks with depth greater than this")
+  :group 'mumamo-display)
+
+(defface mumamo-background-chunk-major
+  '((((class color) (min-colors 88) (background dark))
+     ;;:background "blue3")
+     :background "midnight blue")
+    (((class color) (min-colors 88) (background light))
+     ;;:background "lightgoldenrod2")
+     :background "cornsilk")
+    (((class color) (min-colors 16) (background dark))
+     :background "blue4")
+    (((class color) (min-colors 16) (background light))
+     :background "cornsilk")
+    (((class color) (min-colors 8))
+     :background "blue")
+    (((type tty) (class mono))
+     :inverse-video t)
+    (t :background "gray"))
+  "Background colors for chunks in sub modes.
+You should only specify :background here, otherwise it will
+interfere with syntax highlighting."
+  :group 'mumamo-display)
+
+(defface mumamo-background-chunk-submode1
   '((((class color) (min-colors 88) (background dark))
      ;;:background "blue3")
      :background "dark green")
@@ -622,53 +745,186 @@ derivate it took 20 ms on a 3GHz CPU."
   "Background colors for chunks in major mode.
 You should only specify :background here, otherwise it will
 interfere with syntax highlighting."
-  :group 'mumamo)
+  :group 'mumamo-display)
 
-(defcustom mumamo-background-chunk-major 'mumamo-background-chunk-major
+(defface mumamo-background-chunk-submode2
+  '((((class color) (min-colors 88) (background dark))
+     ;;:background "blue3")
+     :background "dark green")
+    (((class color) (min-colors 88) (background light))
+     ;;:background "lightgoldenrod2")
+     :background "#e6ff96")
+    (((class color) (min-colors 16) (background dark))
+     :background "blue3")
+    (((class color) (min-colors 16) (background light))
+     :background "azure")
+    (((class color) (min-colors 8))
+     :background "blue")
+    (((type tty) (class mono))
+     :inverse-video t)
+    (t :background "gray"))
   "Background colors for chunks in major mode.
-Pointer to face with background color.
+You should only specify :background here, otherwise it will
+interfere with syntax highlighting."
+  :group 'mumamo-display)
 
-If you do not want any special background color use the face named
-default."
-  :type 'face
-  :group 'mumamo)
+(defface mumamo-background-chunk-submode3
+  '((((class color) (min-colors 88) (background dark))
+     ;;:background "blue3")
+     :background "dark green")
+    (((class color) (min-colors 88) (background light))
+     ;;:background "lightgoldenrod2")
+     :background "#f7d1f4")
+     ;;:background "green")
+    (((class color) (min-colors 16) (background dark))
+     :background "blue3")
+    (((class color) (min-colors 16) (background light))
+     :background "azure")
+    (((class color) (min-colors 8))
+     :background "blue")
+    (((type tty) (class mono))
+     :inverse-video t)
+    (t :background "gray"))
+  "Background colors for chunks in major mode.
+You should only specify :background here, otherwise it will
+interfere with syntax highlighting."
+  :group 'mumamo-display)
 
-(defface mumamo-background-chunk-major
+(defface mumamo-background-chunk-submode4
   '((((class color) (min-colors 88) (background dark))
      ;;:background "blue3")
-     :background "midnight blue")
+     :background "dark green")
     (((class color) (min-colors 88) (background light))
      ;;:background "lightgoldenrod2")
-     :background "cornsilk")
+     :background "orange")
     (((class color) (min-colors 16) (background dark))
-     :background "blue4")
+     :background "blue3")
     (((class color) (min-colors 16) (background light))
-     :background "cornsilk")
+     :background "azure")
     (((class color) (min-colors 8))
      :background "blue")
     (((type tty) (class mono))
      :inverse-video t)
     (t :background "gray"))
-  "Background colors for chunks in sub modes.
+  "Background colors for chunks in major mode.
 You should only specify :background here, otherwise it will
 interfere with syntax highlighting."
-  :group 'mumamo)
+  :group 'mumamo-display)
+
+(defcustom mumamo-background-chunk-major 'mumamo-background-chunk-major
+  "Background colors for chunks in major mode.
+Pointer to face with background color.
+
+If you do not want any special background color use the face named
+default."
+  :type 'face
+  :group 'mumamo-display)
 
-(defcustom mumamo-background-chunk-submode 'mumamo-background-chunk-submode
+(defcustom mumamo-background-chunk-submode1 'mumamo-background-chunk-submode1
   "Background colors for chunks in sub modes.
 Pointer to face with background color.
 
 If you do not want any special background color use the face named
 default."
   :type 'face
-  :group 'mumamo)
+  :group 'mumamo-display)
+
+(defcustom mumamo-background-chunk-submode2 'mumamo-background-chunk-submode2
+  "Background colors for chunks in sub modes.
+Pointer to face with background color.
+
+If you do not want any special background color use the face named
+default."
+  :type 'face
+  :group 'mumamo-display)
+
+(defcustom mumamo-background-chunk-submode3 'mumamo-background-chunk-submode3
+  "Background colors for chunks in sub modes.
+Pointer to face with background color.
 
-(defcustom mumamo-chunk-coloring 'both-colored
-  "What chunks to color."
-  :type '(choice (const :tag "Color only submode chunks" submode-colored)
-                 (const :tag "No coloring of chunks" no-chunks-colored)
-                 (const :tag "Color both submode and main major mode chunks"
-                        both-colored))
+If you do not want any special background color use the face named
+default."
+  :type 'face
+  :group 'mumamo-display)
+
+(defcustom mumamo-background-chunk-submode4 'mumamo-background-chunk-submode4
+  "Background colors for chunks in sub modes.
+Pointer to face with background color.
+
+If you do not want any special background color use the face named
+default."
+  :type 'face
+  :group 'mumamo-display)
+
+;; Fix-me: use and enhance this
+(defcustom mumamo-background-colors '(mumamo-background-chunk-major
+                                      mumamo-background-chunk-submode1
+                                      mumamo-background-chunk-submode2
+                                      mumamo-background-chunk-submode3
+                                      mumamo-background-chunk-submode4
+                                      )
+  "List of background colors in order of use.
+First color is for main major mode chunks, then for submode
+chunks, sub-submode chunks etc.  Colors are reused in cyclic
+order.
+
+The default colors are choosen so that inner chunks has a more
+standing out color the further in you get.  This is supposed to
+be helpful when you make mistakes and the chunk nesting is not
+what you intended.
+
+Note: Only the light background colors have been set by me.  The
+dark background colors might currently be unuseful.
+Contributions and suggestions are welcome!
+
+The values in the list should be symbols. Each symbol should either be
+
+  1: a variable symbol pointing to a face (or beeing nil)
+  2: a face symbol
+  3: a function with one argument (subchunk depth) returning a
+     face symbol"
+  :type '(repeat symbol)
+  :group 'mumamo-display)
+
+;;(mumamo-background-color 0)
+;;(mumamo-background-color 1)
+;;(mumamo-background-color 2)
+(defun mumamo-background-color (sub-chunk-depth)
+  (when (or (not (integerp mumamo-chunk-coloring)) ;; Old values
+            (>= sub-chunk-depth mumamo-chunk-coloring))
+    (let* ((idx (when mumamo-background-colors
+                  (mod sub-chunk-depth (length mumamo-background-colors))))
+           (sym (when idx (nth idx mumamo-background-colors)))
+           fac)
+      (when sym
+        (when (boundp sym)
+          (setq fac (symbol-value sym))
+          (unless (facep fac) (setq fac nil)))
+        (unless fac
+          (when (facep sym)
+            (setq fac sym)))
+        (unless fac
+          (when (fboundp sym)
+            (setq fac (funcall sym sub-chunk-depth))))
+        (when fac
+          (unless (facep fac)
+            (setq fac nil)))
+        fac
+        ))))
+
+(defface mumamo-border-face-in
+  '((t (:inherit font-lock-preprocessor-face :bold t :italic t :underline t)))
+  "Face for marking borders."
+  :group 'mumamo-display)
+
+(defface mumamo-border-face-out
+  '((t (:inherit font-lock-preprocessor-face :bold t :italic t)))
+  "Face for marking borders."
+  :group 'mumamo-display)
+
+
+(defgroup mumamo-indentation nil
+  "Customization group for mumamo chunk indentation."
   :group 'mumamo)
 
 (defcustom mumamo-submode-indent-offset 2
@@ -679,7 +935,7 @@ submode.
 See also `mumamo-submode-indent-offset-0'."
   :type '(choice integer
                  (const :tag "No special"))
-  :group 'mumamo)
+  :group 'mumamo-indentation)
 
 (defcustom mumamo-submode-indent-offset-0 0
   "Indentation of submode at column 0.
@@ -687,7 +943,7 @@ This value overrides `mumamo-submode-indent-offset' when the main
 major mode above has indentation 0."
   :type '(choice integer
                  (const :tag "No special"))
-  :group 'mumamo)
+  :group 'mumamo-indentation)
 
 (defcustom mumamo-major-mode-indent-specials
   '(
@@ -700,29 +956,109 @@ major mode above has indentation 0."
           (list (symbol :tag "Major mode symbol")
                 (set
                  (const :tag "Widen buffer during indentation" use-widen))))
-  :group 'mumamo)
-
-(defcustom mumamo-check-chunk-major-same nil
-  "Check if main major mode is the same as normal mode."
-  :type 'boolean
-  :group 'mumamo)
+  :group 'mumamo-indentation)
+
+
+(defgroup mumamo-hi-lock-faces nil
+  "Faces for hi-lock that are visible in mumamo multiple modes.
+This is a workaround for the problem that text properties are
+always hidden behind overlay dito.
+
+This faces are not as visible as those that defines background
+colors.  However they use underlining so they are at least
+somewhat visible."
+  :group 'hi-lock
+  :group 'mumamo-display
+  :group 'faces)
+
+(defface hi-mumamo-yellow
+  '((((min-colors 88) (background dark))
+     (:underline "yellow1"))
+    (((background dark)) (:underline "yellow"))
+    (((min-colors 88)) (:underline "yellow1"))
+    (t (:underline "yellow")))
+  "Default face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-pink
+  '((((background dark)) (:underline "pink"))
+    (t (:underline "pink")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-green
+  '((((min-colors 88) (background dark))
+     (:underline "green1"))
+    (((background dark)) (:underline "green"))
+    (((min-colors 88)) (:underline "green1"))
+    (t (:underline "green")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-blue
+  '((((background dark)) (:underline "light blue"))
+    (t (:underline "light blue")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-black-b
+  '((t (:weight bold :underline t)))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-blue-b
+  '((((min-colors 88)) (:weight bold :underline "blue1"))
+    (t (:weight bold :underline "blue")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-green-b
+  '((((min-colors 88)) (:weight bold :underline "green1"))
+    (t (:weight bold :underline "green")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+(defface hi-mumamo-red-b
+  '((((min-colors 88)) (:weight bold :underline "red1"))
+    (t (:weight bold :underline "red")))
+  "Face for hi-lock mode."
+  :group 'mumamo-hi-lock-faces)
+
+
+;; (defcustom mumamo-check-chunk-major-same nil
+;;   "Check if main major mode is the same as normal mode."
+;;   :type 'boolean
+;;   :group 'mumamo)
 
 ;; (customize-option 'mumamo-major-modes)
 ;;(require 'django)
+
+(defgroup mumamo-modes nil
+  "Customization group for mumamo chunk modes."
+  :group 'mumamo)
+
 (defcustom mumamo-major-modes
   '(
     (asp-js-mode
-     javascript-mode)
+     javascript-mode
+     espresso-mode
+     ecmascript-mode)
     (asp-vb-mode
      visual-basic-mode)
     ;;(css-mode fundamental-mode)
     (javascript-mode
      javascript-mode
-     js2-fl-mode
+     espresso-mode
+     ;;js2-fl-mode
      ecmascript-mode)
     (java-mode
      jde-mode
      java-mode)
+    ;; For Emacs 22 that do not have nxml by default
+    ;; Fix me: fallback when autoload fails!
+    (nxhtml-mode
+     nxhtml-mode
+     html-mode)
     )
   "Alist for conversion of chunk major mode specifier to major mode.
 Each entry has the form
@@ -739,12 +1075,11 @@ The MAJOR-SPEC symbols are used by the chunk definitions in
 `define-mumamo-multi-major-mode'.
 
 The major modes are not specified directly in the chunk
-definitions. Instead a chunk definition contains a symbol that is
-looked up in this list to find the chunk's major
-mode.
+definitions.  Instead a chunk definition contains a symbol that
+is looked up in this list to find the chunk's major mode.
 
 The reason for doing it this way is to make it possible to use
-new major modes with existing multi major modes. If for example
+new major modes with existing multi major modes.  If for example
 someone writes a new CSS mode that could easily be used instead
 of the current one in `html-mumamo-mode'.
 
@@ -755,7 +1090,7 @@ Lookup in this list is done by `mumamo-major-mode-from-modespec'."
                                (command :tag "Major mode")
                                (symbol :tag "Major mode (not yet loaded)")))
           )
-  :group 'mumamo)
+  :group 'mumamo-modes)
 
 
 
@@ -766,9 +1101,13 @@ Lookup in this list is done by `mumamo-major-mode-from-modespec'."
   "This function is added to `fontification-functions' by mumamo.
 START is a parameter given to functions in that hook."
   (mumamo-msgfntfy "mumamo-jit-lock-function %s, ff=%s, just-changed=%s" start (get-text-property start 'fontified) mumamo-just-changed-major)
+  ;;(msgtrc "mumamo-jit-lock-function enter: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
   (if mumamo-just-changed-major
       (setq mumamo-just-changed-major nil))
-  (jit-lock-function start))
+  (let ((ret (jit-lock-function start)))
+    (mumamo-msgfntfy "mumamo-jit-lock-function EXIT %s, ff=%s, just-changed=%s" start (get-text-property start 'fontified) mumamo-just-changed-major)
+    ;;(msgtrc "mumamo-jit-lock-function exit: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
+    ret))
 
 (defun mumamo-jit-lock-register (fun &optional contextual)
   "Replacement for `jit-lock-register'.
@@ -864,53 +1203,91 @@ Preserves the `buffer-modified-p' state of the current buffer."
 (put 'mumamo-find-chunks-timer 'permanent-local t)
 
 (defun mumamo-stop-find-chunks-timer ()
+  "Stop timer that find chunks."
   (when (and mumamo-find-chunks-timer
              (timerp mumamo-find-chunks-timer))
     (cancel-timer mumamo-find-chunks-timer))
   (setq mumamo-find-chunks-timer nil))
 
 (defun mumamo-start-find-chunks-timer ()
-  ;;(message "TIMER mumamo-start-find-chunks-timer ()")
+  "Start timer that find chunks."
   (mumamo-stop-find-chunks-timer)
-  (setq mumamo-find-chunks-timer
-        (run-with-idle-timer mumamo-find-chunk-delay nil
-                             'mumamo-find-chunks-in-timer (current-buffer))))
+  ;; (setq mumamo-find-chunks-timer
+  ;;       (run-with-idle-timer mumamo-find-chunk-delay nil
+  ;;                            'mumamo-find-chunks-in-timer (current-buffer)))
+  )
 
 (defun mumamo-find-chunks-in-timer (buffer)
-  (mumamo-msgfntfy "mumamo-find-chunks-in-timer")
+  "Run `mumamo-find-chunks' in buffer BUFFER in a timer."
+  (mumamo-msgfntfy "mumamo-find-chunks-in-timer %s" buffer)
+  ;;(message "mumamo-find-chunks-in-timer %s" buffer)
   (condition-case err
       (when (buffer-live-p buffer)
         (with-current-buffer buffer
-          ;;(mumamo-find-chunks nil 'until-input)))
-          (mumamo-find-chunks nil)))
+          (mumamo-find-chunks nil "mumamo-find-chunks-in-timer")))
     (error (message "mumamo-find-chunks error: %s" err))))
 
-;; (defvar mumamo-end-last-chunk-pos nil)
-;; (make-variable-buffer-local 'mumamo-end-last-chunk-pos)
-;; (put 'mumamo-end-last-chunk-pos 'permanent-local t)
+
 (defvar mumamo-last-chunk nil)
 (make-variable-buffer-local 'mumamo-last-chunk)
 (put 'mumamo-last-chunk 'permanent-local t)
 
-(defvar mumamo-last-chunk-change-pos nil)
-(make-variable-buffer-local 'mumamo-last-chunk-change-pos)
-(put 'mumamo-last-chunk-change-pos 'permanent-local t)
-
-(defvar mumamo-last-chunk-change-pos-list nil)
-(make-variable-buffer-local 'mumamo-last-chunk-change-pos-list)
-(put 'mumamo-last-chunk-change-pos-list 'permanent-local t)
-
-(defvar mumamo-old-chunks nil)
-(make-variable-buffer-local 'mumamo-old-chunks)
-(put 'mumamo-old-chunks 'permanent-local t)
+(defvar mumamo-last-change-pos nil)
+(make-variable-buffer-local 'mumamo-last-change-pos)
+(put 'mumamo-last-change-pos 'permanent-local t)
 
 ;; Fix-me: maybe this belongs to contextual fontification? Eh,
 ;; no. Unfortunately there is not way to make that handle more than
 ;; multiple lines.
-(defun mumamo-find-chunks (end) ;; min max)
+(defvar mumamo-find-chunk-is-active nil
+  "Protect from recursive calls.")
+
+;; Fix-me: temporary things for testing new chunk routines.
+(defconst mumamo-find-chunks-level 0)
+(defvar mumamo-old-tail nil)
+(make-variable-buffer-local 'mumamo-old-tail)
+(put 'mumamo-old-tail 'permanent-local t)
+
+(defun mumamo-update-obscure (chunk pos)
+  "Update obscure cache."
+  (let ((obscured (overlay-get chunk 'obscured))
+        region-info)
+    (unless (and obscured (= (car obscured) pos))
+      (setq region-info (mumamo-get-region-from pos))
+      ;;(msgtrc "update-obscure:region-info=%s" region-info)
+      ;; This should not be a chunk here
+      (mumamo-put-obscure chunk pos region-info))))
+
+(defun mumamo-put-obscure (chunk pos region-or-chunk)
+  "Cache obscure info."
+  (assert (overlayp chunk) t)
+  (when pos (assert (or (markerp pos) (integerp pos)) t))
+  (let* ((region-info (if (overlayp region-or-chunk)
+                         (cons (overlay-start region-or-chunk)
+                               (overlay-end region-or-chunk))
+                       region-or-chunk))
+         (obscured (when pos (list pos region-info))))
+      ;;(msgtrc "put-obscure:region-info=%s, obscured=%s" region-info obscured)
+    (when region-info (assert (consp region-info) t))
+    (assert (not (overlayp region-info)) t)
+    (overlay-put chunk 'obscured obscured)
+    (setq obscured (overlay-get chunk 'obscured))
+    ;;(msgtrc "                            obscured=%s" obscured)
+    ))
+
+(defun mumamo-get-region-from (point)
+  (when (fboundp 'mumamo-get-region-from-1)
+    (mumamo-get-region-from-1 point)))
+
+(defun mumamo-clear-chunk-cache (chunk)
+  (overlay-put chunk 'mumamo-ppss-cache nil)
+  (overlay-put chunk 'mumamo-ppss-last nil)
+  (overlay-put chunk 'mumamo-ppss-stats nil))
+
+(defun mumamo-find-chunks (end tracer)
   "Find or create chunks from last known chunk.
-Ie, start from the end of `mumamo-last-chunk' if this is non-nil,
-otherwise 1.
+Ie, start from the end of `mumamo-last-chunk' if this is
+non-nil, otherwise 1.
 
 If END is nil then continue till end of buffer or until any input
 is available.  In this case the return value is undefined.
@@ -921,182 +1298,280 @@ ends before END then create chunks upto END.
 
 If MIN and MAX are non-nil then do not mark for refontification
 in this part of the buffer."
-  (mumamo-msgfntfy "!!!!!!!!!!!!!!!!!!!mumamo-find-chunks %s, last-chunk-change=%s, mumamo-last-chunk=%s" end mumamo-last-chunk-change-pos mumamo-last-chunk)
-  ;;(message "!!!!!!!!!!!!!!!!!!!mumamo-find-chunks %s, last-chunk-change=%s, mumamo-last-chunk=%s" end mumamo-last-chunk-change-pos mumamo-last-chunk)
-  (mumamo-stop-find-chunks-timer)
-  ;; If `mumamo-last-chunk-change-pos' is an integer then it was set
-  ;; by `mumamo-find-chunk-after-change'.  We need to investigate
-  ;; chunks after this position.
-  (when (integerp mumamo-last-chunk-change-pos)
-    (let* ((this-chunk (mumamo-get-existing-chunk-at
-                       mumamo-last-chunk-change-pos))
-           ;; Check if near border
-           (in-border (when this-chunk
-                        (>= (mumamo-chunk-syntax-min this-chunk)
-                            mumamo-last-chunk-change-pos))))
-      (when this-chunk
-        (setq mumamo-last-chunk (overlay-get this-chunk 'mumamo-prev-chunk))
-        (when in-border
-          (setq mumamo-last-chunk
-                (overlay-get mumamo-last-chunk 'mumamo-prev-chunk))))
-      (setq mumamo-last-chunk-change-pos nil)))
-  (unless (and (overlayp mumamo-last-chunk) (overlay-buffer mumamo-last-chunk))
-    (setq mumamo-last-chunk nil))
-  (let ((ok-pos (if mumamo-last-chunk (overlay-end mumamo-last-chunk) 1))
-        (end (or end (point-max)))
-        narpos
-        this-values
-        this-chunk
-        prev-chunk
-        first-change-pos
-        interrupted
-        (point-max (1+ (buffer-size)))
-        (here (point)))
-    (if (> ok-pos end)
-        (progn
-          (setq this-chunk (mumamo-get-existing-chunk-at end))
-          (unless this-chunk (error "Could not find chunk though ok-pos=%s > end=%s" ok-pos end))
-          this-chunk)
-      (save-restriction
-        (widen)
-        (mumamo-save-buffer-state nil
-          (setq this-chunk mumamo-last-chunk)
-          (while (and (or (not end)
-                          (<= ok-pos end))
-                      (< ok-pos (point-max))
-                      (not (setq interrupted (and (not end)
-                                                  (input-pending-p)))))
-            ;; Narrow to speed up. However the chunk divider may be
-            ;; before ok-pos here. Assume that the marker is not
-            ;; longer than 200 chars. fix-me.
-            (setq narpos (max (- ok-pos 200) 1))
-            (widen)
-            (narrow-to-region narpos point-max)
-            ;;(message "narrow-to-region %s %s, ok-pos=%s, end=%s, this-chunk=%s" narpos point-max ok-pos end this-chunk)
-            (setq prev-chunk this-chunk)
-            (setq this-chunk nil)
-            (setq this-values (mumamo-create-chunk-values-at ok-pos))
-            (setq ok-pos (or (mumamo-chunk-value-max this-values) ;;(overlay-end this-chunk)
-                             (point-max)))
-            (mumamo-msgfntfy "!!!new ok-pos=%s, this-values=%s" ok-pos this-values)
-            ;;(message "!!!new ok-pos=%s, this-values=%s" ok-pos this-values)
-            ;; With the new organization all chunks are created here.
-            (let ((old-chunk (if (= 1 (mumamo-chunk-value-min this-values))
-                                 (mumamo-get-existing-chunk-at 1)
-                               (when (and prev-chunk
-                                          (overlayp prev-chunk)
-                                          (overlay-buffer prev-chunk))
-                                 (overlay-get prev-chunk 'mumamo-next-chunk))))
-                  next-old-chunk)
-              (when old-chunk
-                (mumamo-msgfntfy "old-chunk=%s" old-chunk)
-                ;;(message "old-chunk=%s" old-chunk)
-                (if (mumamo-chunk-equal-chunk-values old-chunk this-values)
-                    (progn
-                      ;;(message "setting this-chunk to old-chunk")
-                      (setq this-chunk old-chunk))
-                  ;; Fix-me: delete just until next old chunk fits again
-                  (while old-chunk
-                    (setq next-old-chunk
-                          (overlay-get old-chunk 'mumamo-next-chunk))
-                    ;;(message "deleting old-chunk %s" old-chunk)
-                    (delete-overlay old-chunk)
-                    (setq old-chunk next-old-chunk))
-                  (when end (mumamo-start-find-chunks-timer))
-                  ))
-              (unless this-chunk
-                ;; Create chunk and chunk links
-                ;; Fix-me: Mark chunk borders here??? Won't work
-                ;; well with font lock turn on/off.
-                (setq this-chunk (mumamo-create-chunk-from-chunk-values this-values))
-                ;;(message "created this-chunk=%s" this-chunk)
-                (when prev-chunk
-                  (overlay-put prev-chunk 'mumamo-next-chunk this-chunk))
-                (overlay-put this-chunk 'mumamo-prev-chunk prev-chunk)
-                (unless first-change-pos
-                  (setq first-change-pos (mumamo-chunk-value-min this-values)))
-                ;; Fix-me: Mark old chunks for refontification, but
-                ;; only where fontified=t. This must be sent back to
-                ;; fontify-region in some way. Add a new text prop for
-                ;; this? Eh, or just use fontified ...
-
-                ;; Fix-me: Maybe better do what jit-lock-after-change
-                ;; does, but just for the current chunks?
-;;;                 (let (jit-lock-start jit-lock-end)
-;;;                   (while (and (prog1
-;;;                                   (setq old-chunk (car mumamo-old-chunks))
-;;;                                 (setq mumamo-old-chunks (cdr mumamo-old-chunks)))
-;;;                               (< (mumamo-chunk-value-min old-chunk)
-;;;                                  (mumamo-chunk-value-max this-chunk)))
-;;;                     (if (eq (mumamo-chunk-value-major this-chunk)
-;;;                             (mumamo-chunk-value-major old-chunk))
-;;;                         ;; Fix-me: extend?  Fix-me: Should we really
-;;;                         ;; mark for refontification here? this is before
-;;;                         ;; fontification per major mode is done, but
-;;;                         ;; fontified=t ...  So we must use another
-;;;                         ;; property here to tell what is not needed to
-;;;                         ;; refontify afaics.  (put-text-property min max
-;;;                         ;; 'fontified nil)
-;;;                         ;;
-;;;                         ;; Mark for refontification if major mode was
-;;;                         ;; changed, but not between MIN and MAX which
-;;;                         ;; are the values from `mumamo-fontify-region'
-;;;                         ;; because that region is beeing fontified right
-;;;                         ;; after this and `fontified' prop is already
-;;;                         ;; set to t.
-;;;                         ;;
-;;;                         (progn
-;;;                           ;; Border at start of old chunk
-;;;                           (setq jit-lock-start (mumamo-chunk-value-min old-chunk))
-;;;                           (setq jit-lock-end (mumamo-chunk-value-syntax-min old-chunk))
-;;;                           ;; Fix-me: make this a function - eh..., or move it ... - eh, no
-;;;                           (when (and (> jit-lock-end jit-lock-start)
-;;;                                      (not (or (< max jit-lock-start)
-;;;                                               (> min jit-lock-end))))
-;;;                             (when (> min jit-lock-start) (setq jit-lock-start min))
-;;;                             (when (< max jit-lock-end)   (setq jit-lock-end   max))
-;;;                             (run-hooks jit-lock-after-change-extend-region-functions)
-;;;                             )
-;;;                           ;; Border at end of old chunk
-;;;                           )
-;;;                       ;; Whole old chunk (within the range we are
-;;;                       ;; interested in here of course)
-;;;                       (mumamo-mark-for-refontification (mumamo-chunk-value-min old-chunk))
-;;;                       )))
-                ))
-            ;; Cache ppss syntax
-            ;;(syntax-ppss (1+ (mumamo-chunk-syntax-min this-chunk)))
-            ;;(setq mumamo-end-last-chunk-pos ok-pos)
-            )))
-      (when (or interrupted
-                (and mumamo-last-chunk
-                     (overlayp mumamo-last-chunk)
-                     (< (overlay-end mumamo-last-chunk) (point-max))))
-        ;; Fix-me
-        ;;(mumamo-start-find-chunks-timer)
-        )
-      (when first-change-pos
-;;;         (mumamo-with-buffer-prepared-for-jit-lock
-;;;          (put-text-property first-change-pos (point) 'fontified nil))
-        (setq jit-lock-context-unfontify-pos
-              (min jit-lock-context-unfontify-pos first-change-pos)))
-      (goto-char here)
-      (mumamo-msgfntfy "!!!!mumamo-find-chunks, this-chunk=%s, this-values=%s" this-chunk this-values)
-      ;;(message "!!!!mumamo-find-chunks, this-chunk=%s, this-values=%s" this-chunk this-values)
-      this-chunk)))
+  (let ((chunk (mumamo-find-chunks-1 end tracer))
+        region-info)
+    (when (and end chunk (featurep 'mumamo-regions))
+      (setq region-info (mumamo-get-region-from end))
+      ;;(msgtrc "find-chunks:region-info=%s" region-info)
+      (if (overlayp region-info)
+          (setq chunk region-info)
+        ;;(overlay-put chunk 'obscured (list end region-info))))
+        (mumamo-put-obscure chunk end region-info)))
+    ;;(msgtrc "find-chunks ret chunk=%s" chunk)
+    chunk))
 
-(defun mumamo-find-chunk-after-change (min)
-  (setq mumamo-last-chunk-change-pos
-        (if mumamo-last-chunk-change-pos
-            (min min mumamo-last-chunk-change-pos)
-          min)))
+(defun mumamo-find-chunks-1 (end tracer) ;; min max)
+  ;; Note: This code must probably be reentrant.  The globals changed
+  ;; here are `mumamo-last-chunk' and `mumamo-old-tail'.  They must be
+  ;; handled as a pair.
+
+  (mumamo-msgfntfy "")
+  ;;(msgtrc "!!!!!!!!!!!!!!!!!!!find-chunks end=%s from %s, level=%s" end tracer mumamo-find-chunks-level)
+  (setq mumamo-find-chunks-level (1+ mumamo-find-chunks-level))
+  (unless (and (overlayp mumamo-last-chunk) (overlay-buffer mumamo-last-chunk)) (setq mumamo-last-chunk nil))
+  (save-restriction
+    (widen)
+    ;;(msgtrc "find-chunks: mumamo-last-change-pos=%s" mumamo-last-change-pos)
+    (let* ((mumamo-find-chunks-1-active t)
+           (change-min (car mumamo-last-change-pos))
+           (change-max (cdr mumamo-last-change-pos))
+           (chunk-at-change-min (when change-min (mumamo-get-existing-new-chunk-at change-min)))
+           (chunk-at-change-min-start (when chunk-at-change-min (overlay-start chunk-at-change-min)))
+           ;; Check if near border
+           (this-syntax-min-max
+            (when chunk-at-change-min-start
+              (mumamo-update-obscure chunk-at-change-min chunk-at-change-min-start)
+              (mumamo-chunk-syntax-min-max chunk-at-change-min nil)))
+           (this-syntax-min (car this-syntax-min-max))
+           (in-min-border (when this-syntax-min (>= this-syntax-min change-min)))
+           (here (point))
+           ;; Fix-me: Use this:
+           (first-check-from (if chunk-at-change-min
+                                 (if (or in-min-border
+                                         ;; Fix-me: 20?
+                                         (> 20 (- change-min chunk-at-change-min-start)))
+                                     (max 1
+                                          (- chunk-at-change-min-start 1))
+                                   chunk-at-change-min-start)
+                               (when change-min
+                                 (goto-char change-min)
+                                 ;;(move-beginning-of-line nil)
+                                 (skip-chars-backward "^\n")
+                                 (unless (bobp) (backward-char))
+                                 ;;(msgtrc "find-chunks:change-min=%s, point=%s" change-min (point))
+                                 (prog1
+                                     (point)
+                                   (goto-char here)))))
+           )
+      (when (and chunk-at-change-min (= 0 (- (overlay-end chunk-at-change-min)
+                                             (overlay-start chunk-at-change-min))))
+        (assert in-min-border)) ;; 0 len must be in border
+      ;;(msgtrc "find-chunks:first-check-from=%s, chunk-at-change-min=%s/%s" first-check-from chunk-at-change-min (mumamo-chunk-major-mode chunk-at-change-min))
+      (when mumamo-last-change-pos
+        ;; Fix-me:
+        (when chunk-at-change-min
+          (mumamo-clear-chunk-cache chunk-at-change-min)
+          ;; (setq mumamo-last-chunk (overlay-get chunk-at-change-min 'mumamo-prev-chunk))
+          ;; (or (not mumamo-last-chunk)
+          ;;     (overlay-buffer mumamo-last-chunk)
+          ;;     (setq mumamo-last-chunk nil))
+
+          (while (and mumamo-last-chunk
+                      first-check-from
+                      (< first-check-from (overlay-end mumamo-last-chunk)))
+            (setq mumamo-old-tail mumamo-last-chunk)
+            (overlay-put mumamo-old-tail 'mumamo-is-new nil)
+            (when nil ;; For debugging
+              (overlay-put mumamo-old-tail
+                           'face
+                           (list :background
+                                 (format "red%d" (overlay-get mumamo-old-tail 'mumamo-depth)))))
+            (setq mumamo-last-chunk
+                  (overlay-get mumamo-last-chunk 'mumamo-prev-chunk)))
+          ;; Delete empty chunks at end, will be recreated if really needed
+          (while (and mumamo-last-chunk
+                      ;;(= (point-max) (overlay-end mumamo-last-chunk))
+                      (= (overlay-end mumamo-last-chunk) (overlay-start mumamo-last-chunk)))
+            ;;(msgtrc "delete-overlay at end")
+            (delete-overlay mumamo-last-chunk)
+            (setq mumamo-last-chunk (overlay-get mumamo-last-chunk 'mumamo-prev-chunk))
+            (when mumamo-last-chunk (overlay-put mumamo-last-chunk 'mumamo-next-chunk nil)))
+          )
+        (setq mumamo-last-change-pos nil))
+      ;;(msgtrc "find-chunks:at start mumamo-old-tail=%s/%s, mumamo-last-chunk=%s/%s" mumamo-old-tail (mumamo-chunk-major-mode mumamo-old-tail) mumamo-last-chunk (mumamo-chunk-major-mode mumamo-last-chunk))
+      (let* ((last-chunk-is-closed (when mumamo-last-chunk (overlay-get mumamo-last-chunk 'mumamo-is-closed)))
+             ;; (ok-pos (if (not mumamo-last-chunk)
+             ;;             0
+             ;;           (if last-chunk-is-closed
+             ;;               (- (overlay-end mumamo-last-chunk) 1)
+             ;;             (- (overlay-end mumamo-last-chunk) 0)
+             ;;             )))
+             (ok-pos (or (and mumamo-last-chunk
+                              (- (overlay-end mumamo-last-chunk)
+                                 (or (and last-chunk-is-closed 1)
+                                     0)))
+                         0))
+             (end-param end)
+             (end (or end (point-max)))
+             narpos
+             this-new-values
+             this-new-chunk
+             prev-chunk
+             first-change-pos
+             interrupted
+             (point-max (1+ (buffer-size)))
+             (while-n2 0)
+             (while-n3 0)
+             old-are-deleted
+             )
+        (when (>= ok-pos end)
+          (setq this-new-chunk (mumamo-get-existing-new-chunk-at end))
+          ;;(msgtrc "find-chunks:using old at end=%s, ok-pos=%s, this-new-chunk=%s" end ok-pos this-new-chunk)
+          (unless this-new-chunk (error "Could not find new chunk though ok-pos-new=%s > end=%s (ovls at end=%s)" ok-pos end (overlays-in end end))))
+        (unless this-new-chunk
+          (save-match-data
+            (unless  mumamo-find-chunk-is-active
+              ;;(setq  mumamo-find-chunk-is-active t)
+              (mumamo-stop-find-chunks-timer)
+              (mumamo-save-buffer-state nil
+                (unless this-new-chunk
+                  ;; So now mumamo-last-chunk is the last in the top
+                  ;; chain and mumamo-old-tail the first in the bottom chain.
+
+                  ;; Loop forward until end or buffer end ...
+                  (while (and (> 500 (setq while-n3 (1+ while-n3))) ;; fix-me
+                              (or (not end)
+                                  (<= ok-pos end))
+                              (< ok-pos (point-max))
+                              (not (setq interrupted (and (not end)
+                                                          (input-pending-p)))))
+                    ;; Narrow to speed up. However the chunk divider may be
+                    ;; before ok-pos here. Assume that the marker is not
+                    ;; longer than 200 chars. fix-me.
+                    (setq narpos (max (- ok-pos 200) 1))
+                    (narrow-to-region narpos point-max)
+                    (setq this-new-values (mumamo-find-next-chunk-values
+                                           mumamo-last-chunk
+                                           first-check-from
+                                           ;; If this was after a change
+                                           ;; within one chunk then tell
+                                           ;; that:
+                                           (when (and change-max
+                                                      chunk-at-change-min
+                                                      (overlay-buffer chunk-at-change-min)
+                                                      (< change-max
+                                                         (overlay-end chunk-at-change-min)))
+                                             change-max)
+                                           chunk-at-change-min))
+                    (if (not this-new-values)
+                        (setq ok-pos (point-max))
+                      (setq first-check-from nil)
+                      (setq ok-pos (or (mumamo-new-chunk-value-max this-new-values) ;;(overlay-end this-chunk)
+                                       (point-max)))
+                      ;; With the new organization all chunks are created here.
+                      ;;(msgtrc "find-chunks:mumamo-old-tail=%s/%s, mumamo-last-chunk=%s/%s" mumamo-old-tail (when mumamo-old-tail (mumamo-chunk-major-mode mumamo-old-tail)) mumamo-last-chunk (mumamo-chunk-major-mode mumamo-last-chunk ))
+                      ;;(msgtrc "find-chunks:this-new-values=%s" this-new-values)
+                      (if (and mumamo-old-tail
+                               (overlay-buffer mumamo-old-tail)
+                               (mumamo-new-chunk-equal-chunk-values mumamo-old-tail this-new-values))
+                          (progn
+                            ;;(msgtrc "find-chunks:eq")
+                            (setq mumamo-last-chunk mumamo-old-tail)
+                            (overlay-put mumamo-last-chunk 'mumamo-is-new t)
+                            (mumamo-clear-chunk-cache mumamo-last-chunk)
+                            (overlay-put mumamo-last-chunk 'face (mumamo-background-color (overlay-get mumamo-last-chunk 'mumamo-depth)))
+                            (setq mumamo-old-tail (overlay-get mumamo-old-tail 'mumamo-next-chunk)))
+                        (or (not mumamo-old-tail)
+                            (overlay-buffer mumamo-old-tail)
+                            (setq mumamo-old-tail nil))
+                        ;; Loop for fit
+                        ;;(msgtrc "for fit:old-tail=%s, this-new=%s" mumamo-old-tail this-new-values)
+                        (setq while-n2 1)
+                        (while (and (> 500 (setq while-n2 (1+ while-n2)))
+                                    (and mumamo-old-tail (< (overlay-start mumamo-old-tail) ok-pos)))
+                          (mumamo-mark-for-refontification (overlay-start mumamo-old-tail) (overlay-end mumamo-old-tail))
+                          ;;(msgtrc "find-chunks:not eq delete %s" mumamo-old-tail)
+                          (delete-overlay mumamo-old-tail)
+                          (setq mumamo-old-tail (overlay-get mumamo-old-tail 'mumamo-next-chunk))
+                          (or (not mumamo-old-tail)
+                              (overlay-buffer mumamo-old-tail)
+                              (setq mumamo-old-tail nil)))
+                        ;; Create chunk and chunk links
+                        (setq mumamo-last-chunk (mumamo-new-create-chunk this-new-values))
+                        (setq last-chunk-is-closed (overlay-get mumamo-last-chunk 'mumamo-is-closed))
+                        (unless first-change-pos
+                          (setq first-change-pos (mumamo-new-chunk-value-min this-new-values)))
+                        )
+                      ;;(msgtrc "find-chunks:while end start mumamo-old-tail=%s, mumamo-last-chunk=%s" mumamo-old-tail mumamo-last-chunk)
+                      )
+                    ;; Cache ppss syntax
+                    ;;(setq mumamo-end-last-chunk-pos ok-pos)
+                    ;;(syntax-ppss (1+ (mumamo-chunk-syntax-min this-new-chunk)))
+                    )
+                  (setq this-new-chunk mumamo-last-chunk)))
+              (widen)
+              (when (or interrupted
+                        (and mumamo-last-chunk
+                             (overlayp mumamo-last-chunk)
+                             (overlay-buffer mumamo-last-chunk)
+                             (buffer-live-p (overlay-buffer mumamo-last-chunk))
+                             (< (overlay-end mumamo-last-chunk) (point-max))))
+                (mumamo-start-find-chunks-timer)
+                )
+              (when first-change-pos
+                (setq jit-lock-context-unfontify-pos
+                      (if jit-lock-context-unfontify-pos
+                          (min jit-lock-context-unfontify-pos first-change-pos)
+                        first-change-pos))))
+            (goto-char here)
+            (setq  mumamo-find-chunk-is-active nil)))
+        ;; fix-me: continue here
+        (setq mumamo-find-chunks-level (1- mumamo-find-chunks-level))
+        ;; Avoid two empty overlays at the end of the buffer. There
+        ;; can be two empty overlays here if the last overlay content
+        ;; was deleted.
+        (when this-new-chunk
+          (setq prev-chunk (overlay-get this-new-chunk 'mumamo-prev-chunk))
+          (when (and prev-chunk
+                     (overlay-buffer prev-chunk)
+                     (= (overlay-start this-new-chunk) (overlay-end this-new-chunk))
+                     (= (overlay-start prev-chunk) (overlay-end prev-chunk)))
+            (overlay-put prev-chunk 'mumamo-next-chunk nil)
+            (overlay-put prev-chunk 'mumamo-prev-chunk nil)
+            ;;(msgtrc "find-chunks:deleting this-new-chunk %s" this-new-chunk)
+            (delete-overlay this-new-chunk)
+            (setq this-new-chunk prev-chunk)
+            ))
+        (when end-param
+          ;;(msgtrc "find-chunks:Exit.end-param=%s, this-new-chunk=%s, point-max=%s, last=%s" end-param this-new-chunk (point-max) mumamo-last-chunk)
+          (let* ((ret this-new-chunk)
+                 (ret-beg (overlay-start ret))
+                 (ret-end (overlay-end ret)))
+            (unless (and (<= ret-beg end-param)
+                         (<= end-param ret-end))
+              (error "mumamo-find-chunks: Bad ret=%s, end=%s" ret end-param))
+            ;;(msgtrc "find-chunks=>%S" ret)
+            ret))))))
+
+(defun mumamo-find-chunk-after-change (min max)
+  "Save change position after a buffer change.
+This should be run after a buffer change.  For MIN see
+`after-change-functions'."
+  ;; Fix-me: Maybe use a list of all min, max instead?
+  (mumamo-start-find-chunks-timer)
+  ;;(msgtrc "(mumamo-find-chunk-after-change %s %s)" min max)
+  (setq min (copy-marker min nil))
+  (setq max (copy-marker max t))
+  (setq mumamo-last-change-pos
+        (if mumamo-last-change-pos
+            (let* ((old-min (car mumamo-last-change-pos))
+                   (old-max (cdr mumamo-last-change-pos))
+                   (new-min (min min old-min))
+                   (new-max (max max old-max)))
+              (cons new-min new-max))
+          (cons min max))))
 
 (defun mumamo-after-change (min max old-len)
   "Everything that needs to be done in mumamo after a change.
 This is run in the `after-change-functions' hook.  For MIN, MAX
 and OLD-LEN see that variable."
-  (mumamo-find-chunk-after-change min)
-  (mumamo-jit-lock-after-change min max old-len))
+  ;;(msgtrc "mumamo-after-change BEGIN min/max/old-len=%s/%s/%s" min max old-len)
+  ;;(msgtrc "mumamo-after-change BEGIN")
+  (mumamo-find-chunk-after-change min max)
+  (mumamo-jit-lock-after-change min max old-len)
+  (mumamo-msgfntfy "mumamo-after-change EXIT")
+  ;;(msgtrc "mumamo-after-change EXIT mumamo-last-change-pos=%s" mumamo-last-change-pos)
+  )
 
 (defun mumamo-jit-lock-after-change (min max old-len)
   "Replacement for `jit-lock-after-change'.
@@ -1113,13 +1588,13 @@ fontified after a change) is added locally to the hook
 `after-change-functions'.  This function runs
 `jit-lock-after-change-extend-region-functions'."
   (when (and jit-lock-mode (not memory-full))
-    (mumamo-msgfntfy "mumamo-jit-lock-after-change %s %s %s" min max old-len)
+    (mumamo-msgfntfy "mumamo-jit-lock-after-change ENTER %s %s %s" min max old-len)
     ;; Why is this nil?:
     (mumamo-msgfntfy "  mumamo-jit-lock-after-change: font-lock-extend-after-change-region-function=%s" font-lock-extend-after-change-region-function)
-    (let* ((ovl-min (mumamo-get-existing-chunk-at min))
+    (let* ((ovl-min (mumamo-get-existing-new-chunk-at min))
            (ovl-max (when (or (not ovl-min)
                               (< (overlay-end ovl-min) max))
-                      (mumamo-get-existing-chunk-at max)))
+                      (mumamo-get-existing-new-chunk-at max)))
            (major-min (when ovl-min (mumamo-chunk-major-mode ovl-min)))
            (major-max (when ovl-max (mumamo-chunk-major-mode ovl-max)))
            (r-min nil)
@@ -1151,6 +1626,7 @@ fontified after a change) is added locally to the hook
       (mumamo-mark-for-refontification new-min new-max)
 
       ;; Mark the change for deferred contextual refontification.
+      ;;(setq jit-lock-context-unfontify-pos nil) (setq message-log-max t)
       (when jit-lock-context-unfontify-pos
         (setq jit-lock-context-unfontify-pos
               ;; Here we use `start' because nothing guarantees that the
@@ -1159,9 +1635,11 @@ fontified after a change) is added locally to the hook
               ;; displayed, but if it's outside of any displayed area in the
               ;; buffer, only jit-lock-context-* will re-fontify it.
               (min jit-lock-context-unfontify-pos new-min))
-        (mumamo-msgfntfy "mumamo-jit-lock-after-change.unfontify-pos=%s" jit-lock-context-unfontify-pos)
+        ;;(with-current-buffer (get-buffer "*Messages*") (erase-buffer))
+        (mumamo-msgfntfy "mumamo-jit-lock-after-change EXIT unfontify-pos=%s" jit-lock-context-unfontify-pos)
+        ;;(message "mumamo-jit-lock-after-change.unfontify-pos=%s" jit-lock-context-unfontify-pos)
         ))))
-              ;;(min jit-lock-context-unfontify-pos jit-lock-start))))))
+;;(min jit-lock-context-unfontify-pos jit-lock-start))))))
 ;;(put 'mumamo-jit-lock-after-change 'permanent-local-hook t)
 (put 'mumamo-after-change 'permanent-local-hook t)
 
@@ -1190,15 +1668,16 @@ mode."
           )
          (setq min jit-lock-start)
          (setq max jit-lock-end)
-         (syntax-ppss-flush-cache min)
+         ;;(syntax-ppss-flush-cache min)
          )))
+  (mumamo-msgfntfy "mumamo-mumamo-jit-lock-after-change-1 EXIT %s" (cons min max))
   (cons min max))
 
 (defun mumamo-mark-chunk ()
   "Mark chunk and move point to beginning of chunk."
   (interactive)
-  (let ((chunk (mumamo-get-existing-chunk-at (point))))
-    (unless chunk (error "There is no MuMaMo chunk here."))
+  (let ((chunk (mumamo-find-chunks (point) "mumamo-mark-chunk")))
+    (unless chunk (error "There is no MuMaMo chunk here"))
     (goto-char (overlay-start chunk))
     (push-mark (overlay-end chunk) t t)))
 
@@ -1227,6 +1706,7 @@ Do not record undo information during evaluation of BODY."
        (unless ,modified
          (restore-buffer-modified-p nil)))))
 
+;;;###autoload
 (defun mumamo-mark-for-refontification (min max)
   "Mark region between MIN and MAX for refontification."
   (mumamo-msgfntfy "mumamo-mark-for-refontification A min,max=%s,%s point-min,max=%s,%s modified=%s" min max (point-min) (point-max) (buffer-modified-p) )
@@ -1237,10 +1717,18 @@ Do not record undo information during evaluation of BODY."
       (mumamo-msgfntfy "mumamo-mark-for-refontification B min,max=%s,%s point-min,max=%s,%s modified=%s" min max (point-min) (point-max) (buffer-modified-p) )
       ;;(mumamo-save-buffer-state nil
       (mumamo-with-buffer-prepared-for-jit-lock
-        (put-text-property min max 'fontified nil)
-        ))))
+       (put-text-property min max 'fontified nil)
+       ))))
 
 
+;; Fix me: The functions in this list must be replaced by variables
+;; pointing to anonymous functions for buffer local values of
+;; fontification keywords to be supported. And that is of course
+;; necessary for things like hi-lock etc. (Or..., perhaps some kind of
+;; with-variable-values... as RMS suggested once... but that will not
+;; help here...)
+;;
+;; Seems like font-lock-add-keywords must be advised...
 (defvar mumamo-internal-major-modes-alist nil
   "Alist with info for different major modes.
 Internal use only.  This is automatically set up by
@@ -1321,20 +1809,21 @@ local since they otherwise could be wrong at \(point) in top
 level \(ie user interaction level)."
   (declare (indent 2) (debug t))
   `(let ((need-major-mode (mumamo-get-major-mode-substitute ,major ,for-what)))
-     (mumamo-msgfntfy "mumamo-with-major-mode-setup %s => %s, modified=%s" ,major need-major-mode (buffer-modified-p))
-     (mumamo-msgfntfy "mumamo-with-major-mode-setup <<<<<<<<<< body=%S\n>>>>>>>>>>" '(progn ,@body))
+     ;;(msgtrc "mumamo-with-major-mode-setup %s => %s, modified=%s" ,major need-major-mode (buffer-modified-p))
+     ;;(msgtrc "with-major-mode-setup <<<<<<<<<< body=%S\n>>>>>>>>>>" '(progn ,@body))
+     ;;(msgtrc "with-major-mode-setup:in buffer %s after-chunk=%s" (current-buffer) (when (boundp 'after-chunk) after-chunk))
      (let ((major-mode need-major-mode)
            (evaled-set-mode (mumamo-get-major-mode-setup need-major-mode)))
-         ;;(message ">>>>>> before %s" evaled-set-mode)
-         ;;(message ">>>>>> before %s, body=%s" evaled-set-mode (list ,@body))
-         (funcall evaled-set-mode
-                  (list 'progn
-                        ,@body))
-         ;;(mumamo-msgfntfy "<<<<<< after evaled-set-mode modified=%s" (buffer-modified-p))
-         )))
+       ;;(message ">>>>>> before %s" evaled-set-mode)
+       ;;(message ">>>>>> before %s, body=%s" evaled-set-mode (list ,@body))
+       (funcall (symbol-value evaled-set-mode)
+                (list 'progn
+                      ,@body))
+       ;;(mumamo-msgfntfy "<<<<<< after evaled-set-mode modified=%s" (buffer-modified-p))
+       )))
 
 (defmacro mumamo-with-major-mode-fontification (major &rest body)
-  "With fontification variables set as in another major mode do things.
+  "With fontification variables set as major mode MAJOR eval BODY.
 This is used during font locking and indentation.  The variables
 affecting those are set as they are in major mode MAJOR.
 
@@ -1343,6 +1832,9 @@ local variables that are set."
   (declare (indent 1) (debug t))
   `(mumamo-with-major-mode-setup ,major 'fontification
      ,@body))
+;; Fontification disappears in for example *grep* if
+;; font-lock-mode-major-mode is 'permanent-local t.
+;;(put 'font-lock-mode-major-mode 'permanent-local t)
 
 (defmacro mumamo-with-major-mode-indentation (major &rest body)
   "With indentation variables set as in another major mode do things.
@@ -1353,7 +1845,7 @@ BODY."
   `(mumamo-with-major-mode-setup ,major 'indentation ,@body))
 
 (defun mumamo-assert-fontified-t (start end)
-  "Assert that the region start to end has 'fontified t."
+  "Assert that the region START to END has 'fontified t."
   (let ((start-ok (get-text-property start 'fontified))
         (first-not-ok
          (next-single-property-change (1+ start) 'fontified nil end)))
@@ -1387,7 +1879,9 @@ is not called when mumamo is used!
 
 PS: `font-lock-fontify-syntactically-region' is the main function
 that does syntactic fontification."
-  (mumamo-msgfntfy "mumamo-do-fontify <<<<<<< %s %s %s %s %s %s" start end verbose chunk-syntax-min chunk-syntax-max chunk-major)
+  ;;(msgtrc "mumamo-do-fontify enter: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
+  ;;(msgtrc "mumamo-do-fontify <<<<<<< %s %s %s %s %s %s" start end verbose chunk-syntax-min chunk-syntax-max chunk-major)
+  ;;(msgtrc "mumamo-do-fontify <<<<<<< %s %s %s %s %s %s" start end verbose chunk-syntax-min chunk-syntax-max chunk-major)
   ;;(mumamo-assert-fontified-t start end)
   (mumamo-condition-case err
       (let* ((font-lock-dont-widen t)
@@ -1398,8 +1892,10 @@ that does syntactic fontification."
              ;; Extend like in `font-lock-default-fontify-region':
              (funs font-lock-extend-region-functions)
              (font-lock-beg start)
-             (font-lock-end end))
-        (while funs
+             (font-lock-end end)
+             (while-n1 0))
+        (while (and (> 500 (setq while-n1 (1+ while-n1)))
+                    funs)
           (setq funs (if (or (not (funcall (car funs)))
                              (eq funs font-lock-extend-region-functions))
                          (cdr funs)
@@ -1413,28 +1909,39 @@ that does syntactic fontification."
               (new-end (min chunk-syntax-max font-lock-end)))
           (mumamo-msgfntfy "  mumamo-do-fontify %s %s, chunk-syntax-min,max=%s,%s, new: %s %s" start end chunk-syntax-min chunk-syntax-max new-start new-end)
           ;; A new condition-case just to catch errors easier:
-          (mumamo-condition-case err
-              (save-restriction
-                (narrow-to-region chunk-syntax-min chunk-syntax-max)
-                ;; Now call font-lock-fontify-region again with
-                ;; the chunk font lock parameters:
-                ;;(message "(font-lock-fontify-region %s %s)" new-start new-end)
-                (setq font-lock-syntactically-fontified (1- new-start))
-                (font-lock-fontify-region new-start new-end verbose))
-            (error
-             (mumamo-display-error 'mumamo-do-fontify-2
-                                   "mumamo-do-fontify m=%s, s/e=%s/%s syn-min/max=%s/%s: %s"
-                                   chunk-major
-                                   start end
-                                   chunk-syntax-min chunk-syntax-max
-                                   (error-message-string err)))
-            )))
+          (when (< new-start new-end)
+            (mumamo-condition-case err
+                (save-restriction
+                  ;;(when (and (>= 625 (point-min)) (<= 625 (point-max))) (msgtrc "multi at 625=%s" (get-text-property 625 'font-lock-multiline)))
+                  ;;(msgtrc "(narrow-to-region %s %s)" chunk-syntax-min chunk-syntax-max)
+                  (when (< chunk-syntax-min chunk-syntax-max)
+                    (narrow-to-region chunk-syntax-min chunk-syntax-max)
+                    ;; Now call font-lock-fontify-region again but now
+                    ;; with the chunk font lock parameters:
+                    ;;(msgtrc "(font-lock-do-fontify new-start=%s new-end=%s)" new-start new-end)
+                    (setq font-lock-syntactically-fontified (1- new-start))
+                    (mumamo-msgfntfy "ENTER font-lock-fontify-region %s %s %s" new-start new-end verbose)
+                    ;;(msgtrc "ENTER font-lock-fontify-region %s %s %s" new-start new-end verbose)
+                    ;;(message "mumamo-do-fontify: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
+                    (font-lock-fontify-region new-start new-end verbose)
+                    (mumamo-msgfntfy "END font-lock-fontify-region %s %s %s" new-start new-end verbose)
+                    ;;(msgtrc "END font-lock-fontify-region %s %s %s" new-start new-end verbose)
+                    )
+                  )
+              (error
+               (mumamo-display-error 'mumamo-do-fontify-2
+                                     "mumamo-do-fontify m=%s, s/e=%s/%s syn-min/max=%s/%s: %s"
+                                     chunk-major
+                                     start end
+                                     chunk-syntax-min chunk-syntax-max
+                                     (error-message-string err)))))))
     (error
      (mumamo-display-error 'mumamo-do-fontify
                            "mumamo-do-fontify m=%s, s=%s, e=%s: %s"
                            chunk-major start end (error-message-string err)))
     )
-  (mumamo-msgfntfy "mumamo-do-fontify exit >>>>>>> %s %s %s %s %s %s" start end verbose chunk-syntax-min chunk-syntax-max major)
+  (mumamo-msgfntfy "mumamo-do-fontify exit >>>>>>> %s %s %s %s %s %s" start end verbose chunk-syntax-min chunk-syntax-max chunk-major)
+  ;;(msgtrc "mumamo-do-fontify exit: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
   )
 
 (defun mumamo-do-unfontify (start end)
@@ -1457,16 +1964,20 @@ fontification."
   ;; The text property 'fontified is always t here due to the way
   ;; jit-lock works!
 
-  (mumamo-msgfntfy "mumamo-fontify-region-with %s %s %s %s, ff=%s" start end verbose major (get-text-property start 'fontified))
+  ;;(msgtrc "mumamo-fontify-region-with %s %s %s %s, ff=%s" start end verbose major (get-text-property start 'fontified))
   ;;(mumamo-assert-fontified-t start end)
+  ;;(msgtrc "mumamo-fontify-region-with enter: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
   (mumamo-condition-case err
       (progn
+        ;;(msgtrc "mumamo-fontify-region-with: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
         (mumamo-with-major-mode-fontification major
           `(mumamo-do-fontify ,start ,end ,verbose ,chunk-syntax-min ,chunk-syntax-max major))
         )
     (error
      (mumamo-display-error 'mumamo-fontify-region-with "%s"
-                           (error-message-string err)))))
+                           (error-message-string err))))
+  ;;(msgtrc "mumamo-fontify-region-with exit: font-lock-keywords-only def=%s" (default-value 'font-lock-keywords-only))
+  )
 
 (defun mumamo-unfontify-region-with (start end major)
   "Unfontify from START to END as in major mode MAJOR."
@@ -1475,28 +1986,46 @@ fontification."
     `(mumamo-do-unfontify ,start ,end)))
 
 
+(defvar mumamo-multi-major-mode nil
+  "The function that handles multiple major modes.
+If this is nil then multiple major modes in the buffer is not
+handled by mumamo.
+
+Set by functions defined by `define-mumamo-multi-major-mode'.")
+(make-variable-buffer-local 'mumamo-multi-major-mode)
+(put 'mumamo-multi-major-mode 'permanent-local t)
+
+
+(defun mumamo-backtrace (label)
+  (msgtrc "%s:backtrace in buffer %s\n%s" label (current-buffer) (with-output-to-string (backtrace)))
+  (msgtrc "%s:backtrace in buffer %s END ------------------------------------" label (current-buffer)))
+
 (defun mumamo-unfontify-buffer ()
   "Unfontify buffer.
 This function is called when the minor mode function
-`font-lock-mode' is turned off. \(It is the value of
+`font-lock-mode' is turned off.  \(It is the value of
 `font-lock-unfontify-uffer-function')."
-  ;;(message "BACKTRACE: %s" (with-output-to-string (backtrace)))
-  (when mumamo-multi-major-mode
+  (when (and mumamo-multi-major-mode
+             (not (and (boundp 'mumamo-find-chunks-1-active)
+                       mumamo-find-chunks-1-active)))
+    ;;(mumamo-backtrace "unfontify-buffer")
+    ;;(msgtrc "mumamo-unfontify-buffer:\n%s" (with-output-to-string (backtrace)))
     (save-excursion
       (save-restriction
         (widen)
         (let ((ovls (overlays-in (point-min) (point-max)))
               (main-major (mumamo-main-major-mode)))
           (dolist (o ovls)
-            (let ((major (mumamo-chunk-major-mode o)))
-              (when major
-                (unless (eq major main-major)
-                  (mumamo-unfontify-chunk o))
-                (mumamo-msgfntfy "delete-overlay 1")
-                (delete-overlay o)
-                ))))
-        (mumamo-unfontify-region-with (point-min) (point-max)
-                                      (mumamo-main-major-mode))))))
+            (when (overlay-get o 'mumamo-is-new)
+              (let ((major (mumamo-chunk-major-mode o)))
+                (when major
+                  (unless (eq major main-major)
+                    (mumamo-unfontify-chunk o))
+                  ;;(msgtrc "delete-overlay 1")
+                  (delete-overlay o)
+                  ))))
+          (mumamo-unfontify-region-with (point-min) (point-max)
+                                        (mumamo-main-major-mode)))))))
 
 
 (defun mumamo-fontify-buffer ()
@@ -1515,15 +2044,17 @@ this to ensure that the whole buffer is fontified."
 
 (defun mumamo-unfontify-chunk (chunk) ; &optional start end)
   "Unfontify mumamo chunk CHUNK."
-  (let ((major (mumamo-chunk-major-mode chunk))
-        ;;(start (overlay-start chunk))
-        ;;(end   (overlay-end   chunk))
-        (syntax-min (mumamo-chunk-syntax-min chunk))
-        (syntax-max (mumamo-chunk-syntax-max chunk))
-        (font-lock-dont-widen t))
-    (save-restriction
-      (narrow-to-region syntax-min syntax-max)
-      (mumamo-unfontify-region-with syntax-min syntax-max major))))
+  (let* ((major (mumamo-chunk-major-mode chunk))
+         ;;(start (overlay-start chunk))
+         ;;(end   (overlay-end   chunk))
+         (syntax-min-max (mumamo-chunk-syntax-min-max chunk t))
+         (syntax-min (car syntax-min-max))
+         (syntax-max (cdr syntax-min-max))
+         (font-lock-dont-widen t))
+    (when (< syntax-min syntax-max)
+      (save-restriction
+        (narrow-to-region syntax-min syntax-max)
+        (mumamo-unfontify-region-with syntax-min syntax-max major)))))
 
 (defvar mumamo-just-changed-major nil
   "Avoid refontification when switching major mode.
@@ -1540,6 +2071,7 @@ If VERBOSE do the verbously.
 The value of `font-lock-fontify-region-function' when
 mumamo is used is this function."
   (mumamo-msgfntfy "++++++ mumamo-fontify-regionX %s %s %s, skip=%s" start end verbose mumamo-just-changed-major)
+  ;;(msgtrc "mumamo-fontify-region: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
   ;;(mumamo-assert-fontified-t start end)
   ;; If someone else tries to fontify the buffer ...
   (if (and mumamo-just-changed-major
@@ -1575,6 +2107,17 @@ the major mode for the chunk."
     (unless (eq major (mumamo-main-major-mode))
       major)))
 
+;;; Chunk in chunk needs push/pop relative prev chunk
+(defun mumamo-chunk-push (chunk prop val)
+  (let* ((prev-chunk (overlay-get chunk 'mumamo-prev-chunk))
+         (prev-val (when prev-chunk (overlay-get prev-chunk prop))))
+    (overlay-put chunk prop (cons val prev-val))))
+(defun mumamo-chunk-pop (chunk prop)
+  (overlay-put chunk prop (cdr (overlay-get (overlay-get chunk 'mumamo-prev-chunk)
+                                            prop))))
+(defun mumamo-chunk-car (chunk prop)
+  (car (overlay-get chunk prop)))
+
 ;; (let ((l '(1 2))) (setcar (nthcdr 1 l) 10) l)
 ;; setters
 (defsubst mumamo-chunk-value-set-min (chunk-values min)
@@ -1620,101 +2163,30 @@ See also `mumamo-chunk-value-set-min'."
 See also `mumamo-chunk-value-set-min'.
 For parseable-by see `mumamo-find-possible-chunk'."
   (nth 5 chunk-values))
-(defsubst mumamo-chunk-prev-chunk (chunk-values)
-  "Get prevous chunk from CHUNK-VALUES.
+;; (defsubst mumamo-chunk-prev-chunk (chunk-values)
+;;   "Get previous chunk from CHUNK-VALUES.
+;; See also `mumamo-chunk-value-set-min'."
+;;   (nth 6 chunk-values))
+(defsubst mumamo-chunk-value-fw-exc-fun (chunk-values)
+  "Get function that find chunk end from CHUNK-VALUES.
 See also `mumamo-chunk-value-set-min'."
   (nth 6 chunk-values))
 
-;; (defun mumamo-adjust-old-chunks (new-chunk-values start end)
-;;   "Adjust old chunks to NEW-CHUNK-VALUES.
-;; This must be run whenever adding a new chunk.
-
-;; If START and END is non-nil then mark ranges outside of NEW-CHUNK
-;; for refontification."
-;;   (let* ((new-start      (mumamo-chunk-value-min   new-chunk-values))
-;;          (new-end        (mumamo-chunk-value-max   new-chunk-values))
-;;          (new-syntax-min (mumamo-chunk-value-syntax-min new-chunk-values))
-;;          (new-major      (mumamo-chunk-value-major new-chunk-values))
-;;          (new-is-closed new-end)
-;;          (new-real-end (or new-end (point-max)))
-;; ;;;          (old-chunks (delq nil
-;; ;;;                            (mapcar
-;; ;;;                             (lambda (ovl)
-;; ;;;                               (when (mumamo-chunk-major-mode ovl)
-;; ;;;                                 ovl))
-;; ;;;                             (overlays-in new-start new-real-end))))
-;;          old-chunks)
-;;     ;;(setq old-chunks (delq nil old-chunks))
-;;     (dolist (ovl (overlays-in new-start new-real-end))
-;;       (when (mumamo-chunk-major-mode ovl)
-;;         (setq old-chunks (cons ovl old-chunks))))
-;;     (when (and start (< new-start start))
-;;       (let ((must-refontify t))
-;;         (dolist (old old-chunks)
-;;           (when (and (= (overlay-start old) new-start)
-;;                      (>= (overlay-end old) start)
-;;                      (eq new-major (mumamo-chunk-major-mode old)))
-;;             (setq must-refontify nil)))
-;;         (when must-refontify
-;;           ;;(mumamo-mark-for-refontification new-start (- start 1))
-;;           )))
-;;     (when (and end new-real-end (> new-real-end end))
-;;       (mumamo-msgfntfy "(when (and end new-real-end (> new-real-end end))")
-;;       (mumamo-mark-for-refontification (+ end 0) new-real-end))
-;;     (dolist (old old-chunks)
-;;       (let ((old-start (overlay-start old))
-;;             (old-end   (overlay-end   old))
-;;             (old-syntax-max (overlay-get old 'syntax-max))
-;;             (old-major (mumamo-chunk-major-mode old)))
-;;       (assert old)
-;;       (assert old-major)
-;;       ;; Fix-me: I forget to refontify something here.
-;;       ;;
-;;       ;; Fix-me: Clean up among the overlay removal.
-;;       ;;
-;;       (when (< old-start new-start)
-;;         (mumamo-msgfntfy "(move-overlay %s %s %s" old old-start (1- new-start))
-;;         (move-overlay old old-start (1- new-start)))
-;;       (when (and (<= new-start old-start)
-;;                  (<= old-end new-real-end))
-;;         (mumamo-msgfntfy "delete-overlay 2")
-;;         (delete-overlay old))
-;;       ;;(when (< old-start new-start))
-;;       ;; There is nothing to do in this case since the conditions
-;;       ;; for fontifying have not changed in this region.
-;;       (when (< new-real-end old-end)
-;;         (mumamo-msgfntfy "new-is-closed=%s" new-is-closed)
-;;         (if new-is-closed
-;;             (progn
-;;               (mumamo-msgfntfy "delete-overlay 3")
-;;               (delete-overlay old)
-;;               (mumamo-mark-for-refontification (+ new-real-end 1) old-end))
-;;           (if (eq (mumamo-chunk-major-mode old) new-major)
-;;               (progn
-;;                 ;;(move-overlay new-chunk new-start old-end)
-;;                 ;; Fix-me: Is this really correct????
-;;                 (mumamo-chunk-value-set-min        new-chunk-values new-start)
-;;                 (mumamo-chunk-value-set-max        new-chunk-values old-end)
-;;                 (mumamo-chunk-value-set-syntax-min new-chunk-values new-syntax-min)
-;;                 (mumamo-chunk-value-set-syntax-max new-chunk-values old-syntax-max)
-;;                 (mumamo-msgfntfy "delete-overlay 4")
-;;                 (delete-overlay old))
-;;             (mumamo-msgfntfy "delete-overlay 5")
-;;             (delete-overlay old)
-;;             (mumamo-mark-for-refontification (+ new-real-end 1) old-end))))))))
-
-(defvar mumamo-chunks-to-remove nil
-  "Internal.  Chunk overlays marked for removal.")
-(make-variable-buffer-local 'mumamo-chunks-to-remove)
+
+;; (defvar mumamo-chunks-to-remove nil
+;;   "Internal.  Chunk overlays marked for removal.")
+;; (make-variable-buffer-local 'mumamo-chunks-to-remove)
 
 (defun mumamo-flush-chunk-syntax (chunk chunk-min chunk-max)
-  "Flush syntax cache for chunk CHUNK."
+  "Flush syntax cache for chunk CHUNK.
+This includes removing text property 'syntax-table between
+CHUNK-MIN and CHUNK-MAX."
   ;; syntax-ppss-flush-cache
   (overlay-put chunk 'syntax-ppss-last  nil)
   (overlay-put chunk 'syntax-ppss-cache nil)
   (overlay-put chunk 'syntax-ppss-stats nil)
   (mumamo-save-buffer-state nil
-    (remove-text-properties chunk-min chunk-max '(syntax-table nil))))
+    (remove-list-of-text-properties chunk-min chunk-max '(syntax-table))))
 
 ;; Fix-me: If I open nxhtml-changes.html and then go to the bottom of
 ;; the file at once syntax-ppss seems to be upset. It is however cured
@@ -1757,6 +2229,7 @@ surrounded by \"...\" since they are fontified a bit special in
 most major modes."
   ;; Fix-me: unfontifying should be done using the correct syntax table etc.
   ;; Fix-me: refontify when new chunk
+  ;;(msgtrc "mumamo-fontify-region-1: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
   (save-match-data
     (let* ((old-point (point))
            (here start)
@@ -1767,13 +2240,16 @@ most major modes."
            after-change-functions ;; Fix-me: tested adding this to avoid looping
            (first-new-ovl nil)
            (last-new-ovl nil)
-           (chunk-at-start-1 (mumamo-get-existing-chunk-at start)))
+           (chunk-at-start-1 (mumamo-find-chunks start "mumamo-fontify-region-1"))
+           (while-n1 0)
+           )
       (when chunk-at-start-1
         (unless (= start (1- (overlay-end chunk-at-start-1)))
           (setq chunk-at-start-1 nil)))
-      (while (and fontified-t
+      (while (and (> 500 (setq while-n1 (1+ while-n1)))
+                  fontified-t
                   (< here end))
-        (mumamo-msgfntfy "mumamo-fontify-region-1 heree 1, here=%s, end=%s" here end)
+        ;;(msgtrc "mumamo-fontify-region-1 heree 1, here=%s, end=%s" here end)
         ;;(mumamo-assert-fontified-t here end)
         ;;(mumamo-assert-fontified-t start end)
         ;; Check where new chunks should be, adjust old chunks as
@@ -1782,9 +2258,7 @@ most major modes."
         ;; changed or there was no old chunk.
         ;;
         ;; Fix-me: Join chunks!
-        (let* (;;(chunk (mumamo-get-existing-chunk-at here))
-               ;;(old-chunk chunk)
-               (chunk (mumamo-find-chunks here))
+        (let* ((chunk (mumamo-find-chunks here "mumamo-fontify-region-1 2"))
                (chunk-min (when chunk (overlay-start chunk)))
                (chunk-max (when chunk (overlay-end chunk)))
                (chunk-min-1 (when chunk (if (> chunk-min (point-min)) (1- chunk-min) (point-min))))
@@ -1792,29 +2266,9 @@ most major modes."
                (chunk-min-face (when chunk (get-text-property chunk-min-1 'face)))
                (chunk-max-face (when chunk (get-text-property chunk-max-1 'face)))
                (chunk-major (when chunk (mumamo-chunk-major-mode chunk)))
-               ;;(chunk-values (mumamo-find-chunk-values-at here))
-               ;;(cv-min          (mumamo-chunk-value-min          chunk-values))
-               ;;(cv-max          (mumamo-chunk-value-max          chunk-values))
-               ;;(cv-is-closed    cv-max) ;(mumamo-chunk-value-is-closed    chunk-values))
-               ;;(cv-major-sub    (mumamo-chunk-value-major  chunk-values))
                max                    ; (min chunk-max end))
-               ;;prev-major
-               ;;prev-chunk
-               ;;(need-new-chunk nil)
                )
-          ;;(unless cv-max (setq cv-max end))
-          ;;(unless old-chunk
-          ;;  (mumamo-adjust-old-chunks chunk-values nil end)
-          ;;  (setq chunk (mumamo-create-chunk-from-chunk-values chunk-values)))
-          ;;(when old-chunk
-          ;;  ;; Compare with cv:
-          ;;  (unless (mumamo-chunk-equal-chunk-values old-chunk chunk-values)
-          ;;    (setq need-new-chunk t)))
-
-          ;;(when need-new-chunk
-          ;;  ;; Fix-me: unfontify somewhere here
-          ;;  (mumamo-adjust-old-chunks chunk-values start end)
-          ;;  (setq chunk (mumamo-create-chunk-from-chunk-values chunk-values)))
+          (assert chunk)
 
           (setq chunk-min (when chunk (overlay-start chunk)))
           (setq chunk-max (when chunk (overlay-end chunk)))
@@ -1849,20 +2303,29 @@ most major modes."
           ;;  (assert (= (overlay-end prev-chunk) (overlay-start chunk))))
 
           ;; Fontify
-          (let ((syntax-min (mumamo-chunk-syntax-min chunk))
-                (syntax-max (mumamo-chunk-syntax-max chunk))
-                (chunk-min (overlay-start chunk))
-                (chunk-max (overlay-end chunk)))
+          ;;(message "\nmumamo-fontify-region-1 before chunk=%s" chunk)
+          (mumamo-update-obscure chunk here)
+          (let* ((syntax-min-max (mumamo-chunk-syntax-min-max chunk nil))
+                 (syntax-min (car syntax-min-max))
+                 (syntax-max (cdr syntax-min-max))
+                 (chunk-min (overlay-start chunk))
+                 (chunk-max (overlay-end chunk))
+                 (border-min-max (mumamo-chunk-syntax-min-max chunk t))
+                 (border-min (car border-min-max))
+                 (border-max (cdr border-min-max))
+                 )
+            ;;(msgtrc "chunk mumamo-border-face: %s" chunk)
+            ;;(message "mumamo-fontify-region-1, here=%s chunk-min=%s syn-mn/mx=%s/%s" here chunk-min syntax-min syntax-max)
             (when (<= here syntax-min)
               (mumamo-flush-chunk-syntax chunk chunk-min chunk-max))
             (when (and (<= here syntax-min)
-                       (< chunk-min syntax-min))
-              (put-text-property chunk-min syntax-min
-                                 'face 'mumamo-border-face))
+                       (< chunk-min border-min))
+              (put-text-property chunk-min border-min
+                                 'face 'mumamo-border-face-in))
             (when (and (<= chunk-max max)
-                       (< syntax-max chunk-max))
-              (put-text-property syntax-max chunk-max
-                                 'face 'mumamo-border-face))
+                       (< (1+ border-max) chunk-max))
+              (put-text-property (1+ border-max) chunk-max
+                                 'face 'mumamo-border-face-out))
             (mumamo-fontify-region-with here max verbose chunk-major
                                         syntax-min syntax-max))
 
@@ -1873,88 +2336,24 @@ most major modes."
                                 (get-text-property here 'fontified)))
           ))
       (goto-char old-point)
-      (mumamo-msgfntfy "b first-new-ovl=%s last-new-ovl=%s" first-new-ovl last-new-ovl)
+      ;;(msgtrc "b first-new-ovl=%s last-new-ovl=%s" first-new-ovl last-new-ovl)
       (unless fontified-t
         ;; Fix-me: I am not sure what to do here.  Probably just
         ;; refontify the rest between start and end.  But does not
         ;; this lead to unnecessary refontification?
-        (mumamo-msgfntfy "not sure, here=%s, end=%s" here end)
+        ;;(msgtrc "not sure, here=%s, end=%s" here end)
         (unless (= here (point-max))
           (mumamo-mark-for-refontification here end)))
-      ;; Check if more should be refontified due to major mode
-      ;; changes.  Compare with old overlays.
-      (mumamo-msgfntfy "c first-new-ovl=%s last-new-ovl=%s" first-new-ovl last-new-ovl)
-      (let ((ovl-start (min start (overlay-start first-new-ovl)))
-            (ovl-end   (max end   (overlay-end   last-new-ovl)))
-            (first-new-major (overlay-get first-new-ovl 'mumamo-major))
-            (last-new-major  (overlay-get last-new-ovl  'mumamo-major)))
-        (mumamo-msgfntfy "*** mumamo-fontify-region-1: here 3 ovl-start=%s,end=%s, start=%s, chunks-to-remove=%s" ovl-start ovl-end start mumamo-chunks-to-remove)
-        (when (< ovl-start start)
-          ;; Check all old overlays in this region
-          (dolist (old-o mumamo-chunks-to-remove)
-            (when (overlay-buffer old-o)
-              (let ((old-start (overlay-start old-o))
-                    (old-end   (overlay-end   old-o))
-                    min-refont
-                    max-refont)
-                (mumamo-msgfntfy "*** mumamo-fontify-region-1: here 3a old-start=%s,end=%s" old-start old-end)
-                ;; The trick here is writing this in a manner so that
-                ;; you do not have to use paper and pencil to check it:
-                (when (< ovl-start old-end)
-                  (setq max-refont (min ovl-start old-start)))
-                (when (< old-start start)
-                  (setq min-refont (max start old-end)))
-                (and min-refont
-                     max-refont
-                     (< min-refont max-refont)
-                     (not (eq first-new-major
-                              (overlay-get old-o 'mumamo-old-major-mode)))
-                     (progn
-                       (mumamo-msgfntfy "min-refont/max=%s/%s" min-refont max-refont)
-                       (mumamo-mark-for-refontification min-refont max-refont)
-                       )
-                     )))))
-        (mumamo-msgfntfy "*** mumamo-fontify-region-1: here 4")
-        (when (< end ovl-end)
-          ;; Check all old overlays in this region
-          (dolist (old-o mumamo-chunks-to-remove)
-            (when (overlay-buffer old-o)
-              (let ((old-start (overlay-start old-o))
-                    (old-end   (overlay-end   old-o))
-                    min-refont
-                    max-refont)
-                (when (< end old-end)
-                  (setq max-refont (min ovl-end old-end)))
-                (when (< old-start ovl-end)
-                  (setq min-refont (max end old-start)))
-                (and min-refont
-                     max-refont
-                     (< min-refont max-refont)
-                     (not (eq last-new-major
-                              (overlay-get old-o 'mumamo-old-major-mode)))
-                     (progn
-                       (mumamo-msgfntfy "2 min-refont/max=%s/%s" min-refont max-refont)
-                       (mumamo-mark-for-refontification min-refont
-                                                        max-refont))))))))
-      ;;(mumamo-remove-old-overlays)
-      )))
-
-(defun mumamo-remove-old-overlays ()
-  "Remove mumamo overlays marked for removal from the buffer."
-  (while mumamo-chunks-to-remove
-    (let ((ovl (car mumamo-chunks-to-remove)))
-      (setq mumamo-chunks-to-remove (cdr mumamo-chunks-to-remove))
-      ;;(unless (overlay-get ovl 'mumamo-old-major-mode) (error "Chunk overlay was not marked for removal"))
-      (overlay-put ovl 'mumamo-old-major-mode nil)
-      (mumamo-msgfntfy "delete-overlay 6")
-      (delete-overlay ovl))))
+      ))
+  ;;(msgtrc "EXIT mumamo-fontify-region-1")
+  )
 
 
 (defvar mumamo-known-buffer-local-fontifications
   '(
     font-lock-mode-hook
     ;;
-    hexcolor-mode
+    css-color-mode
     hi-lock-mode
     hi-lock-file-patterns
     hi-lock-interactive-patterns
@@ -1997,10 +2396,10 @@ most major modes."
     font-lock-defaults
     font-lock-fontified
     font-lock-keywords
-    font-lock-keywords-only
+    ;;font-lock-keywords-only
     font-lock-keywords-case-fold-search
     font-lock-mode
-    font-lock-mode-major-mode
+    ;;font-lock-mode-major-mode
     font-lock-set-defaults
     font-lock-syntax-table
     font-lock-beginning-of-syntax-function
@@ -2101,6 +2500,35 @@ An entry in the list looks like
 
   \(MAJOR-MODE LOCAL-KEYMAP)")
 
+;; (defun mumamo-font-lock-keyword-hook-symbol (major)
+;;   "Return hook symbol for adding font-lock keywords to MAJOR."
+;;   (intern (concat "mumamo-" (symbol-name major) "-font-lock-keyword-hook")))
+
+;; (defun mumamo-remove-font-lock-hook (major setup-fun)
+;;   "For mode MAJOR remove function SETUP-FUN.
+;; See `mumamo-add-font-lock-hook' for more information."
+;;   (remove-hook (mumamo-font-lock-keyword-hook-symbol major) setup-fun))
+
+(defun mumamo-refresh-multi-font-lock (major)
+  "Refresh font lock information for mode MAJOR in chunks.
+If multi fontification functions for major mode MAJOR is already
+setup up they will be refreshed.
+
+If MAJOR is nil then all font lock information for major modes
+used in chunks will be refreshed.
+
+After calling font-lock-add-keywords or changing the
+fontification in other ways you must call this function for the
+changes to take effect.  However already fontified buffers will
+not be refontified.  You can use `normal-mode' to refontify
+them.
+
+Fix-me: Does not work yet."
+
+  (setq mumamo-internal-major-modes-alist
+        (if (not major)
+            nil
+          (assq-delete-all major mumamo-internal-major-modes-alist))))
 
 ;; RMS had the following idea:
 ;;
@@ -2113,7 +2541,7 @@ An entry in the list looks like
 ;;;     is a better way to do this than with helper functions.
 ;;
 ;; OK with me, as long as this point doesn't get forgotten.
-(defun mumamo-fetch-major-mode-setup (major)
+(defun mumamo-fetch-major-mode-setup (major keywords mode-keywords add-keywords how)
   "Return a helper function to do fontification etc like in major mode MAJOR.
 Fetch the variables affecting font locking, indentation and
 filling by calling the major mode MAJOR in a temporary buffer.
@@ -2139,7 +2567,12 @@ The main reasons for doing it this way is:
 - It does not affect buffer local variables."
   ;; (info "(elisp) Other Font Lock Variables")
   ;; (info "(elisp) Syntactic Font Lock)
+  ;;(msgtrc "fetch-major 1: font-lock-keywords-only =%s" font-lock-keywords-only)
   (let ((func-sym (intern (concat "mumamo-eval-in-" (symbol-name major))))
+        (func-def-sym (intern (concat "mumamo-def-eval-in-" (symbol-name major))))
+        ;;(add-keywords-hook (mumamo-font-lock-keyword-hook-symbol major))
+        byte-compiled-fun
+        (fetch-func-definition `(lambda  (body))) ;;`(defun ,func-sym (body)))
         temp-buf-name
         temp-buf)
     ;; font-lock-mode can't be turned on in buffers whose names start
@@ -2149,10 +2582,13 @@ The main reasons for doing it this way is:
     (setq temp-buf (get-buffer temp-buf-name))
     (when temp-buf (kill-buffer temp-buf))
     (setq temp-buf (get-buffer-create temp-buf-name))
+    ;;(msgtrc "fetch-major-mode-setup in buffer %s, after-chunk=%s, before with-current-buffer" (current-buffer) (when (boundp 'after-chunk) after-chunk))
     (with-current-buffer temp-buf
 
       (mumamo-msgfntfy "mumamo-fetch-major-mode-setup %s" major)
-      (let ((mumamo-fetching-major t))
+      (let ((mumamo-fetching-major t)
+            mumamo-multi-major-mode)
+        ;;(msgtrc "fetch-major-mode-setup in buffer %s, before (funcall %s)" (current-buffer) major)
         (funcall major)
         )
 
@@ -2161,19 +2597,24 @@ The main reasons for doing it this way is:
       (mumamo-msgfntfy "<<< mumamo-fetch-major-mode-setup B font-lock-mode=%s" font-lock-mode)
       (mumamo-msgfntfy "mumamo-fetch-major-mode-setup: fetching jit-lock-after-change-extend-region-functions A=%s" jit-lock-after-change-extend-region-functions)
 
-      ;; Fix-me: Make this some kind of hook. I think this has better
-      ;; wait until mumamo is merged with Emacs. Some changes to
-      ;; hi-lock could simplify this. Also there is little use in
-      ;; setting this now before negative priorities can be used for
-      ;; the background chunks since hi-lock uses background colors
-      ;; and those will be invisible since the chunk overlays also
-      ;; uses background colors.
-;;;       (when (boundp 'hi-lock-interactive-patterns)
-;;;         (dolist (hi hi-lock-interactive-patterns)
-;;;           (font-lock-add-keywords nil (list hi) t)))
-;;;      (run-hooks 'font-lock-mode-hook)
-
+      ;; Note: font-lock-set-defaults must be called before adding
+      ;; keywords. Otherwise Emacs loops. I have no idea why. Hm,
+      ;; probably wrong, it is likely to be nxhtml-mumamo that is the
+      ;; problem. Does not loop in html-mumamo.
+      ;;(msgtrc "\n--------------------")
       (font-lock-set-defaults)
+      ;; Fix-me: but hi-lock still does not work... what have I
+      ;; forgotten??? font-lock-keywords looks ok...
+      (when keywords
+        (if add-keywords
+            (progn
+              ;;(msgtrc "fetch:font-lock-add-keywords %S %S %S" (if mode-keywords major nil) keywords how)
+              (font-lock-add-keywords (if mode-keywords major nil) keywords how))
+          (font-lock-remove-keywords (if mode-keywords major nil) keywords))
+        (unless mode-keywords (font-lock-mode -1) (font-lock-mode 1))
+        ;;(msgtrc "fetch-major-mode-setup:font-lock-keywords=%S" font-lock-keywords)
+        )
+      ;;(run-hooks add-keywords-hook)
 
       (add-to-list 'mumamo-major-modes-local-maps
                    (let ((local-map (current-local-map)))
@@ -2183,84 +2624,93 @@ The main reasons for doing it this way is:
 
       (mumamo-msgfntfy "mumamo-fetch-major-mode-setup: fetching jit-lock-after-change-extend-region-functions B=%s" jit-lock-after-change-extend-region-functions)
       (let* ((syntax-sym (intern-soft (concat (symbol-name major) "-syntax-table")))
-             (fetch-func-definition
-              `(defun ,func-sym (body)))
              (fetch-func-definition-let
-                 ;; Be XML compliant:
-                 (list
-                  (list 'sgml-xml-mode
-                   (when (mumamo-derived-from-mode ',major 'sgml-mode) t))
-
-                  ;; We need to copy the variables that we need and
-                  ;; that are not automatically buffer local, but
-                  ;; could be it. Arguably it is a bug if they are not
-                  ;; buffer local though we have to adapt.
-
-                  ;; From cc-mode.el:
-                  (list 'indent-line-function (custom-quote indent-line-function))
-                  (list 'indent-region-function (custom-quote indent-region-function))
-                  (list 'normal-auto-fill-function (custom-quote normal-auto-fill-function))
-                  (list 'comment-start (custom-quote comment-start))
-                  (list 'comment-end (custom-quote comment-end))
-                  (list 'comment-start-skip (custom-quote comment-start-skip))
-                  (list 'comment-end-skip (custom-quote comment-end-skip))
-                  (list 'comment-multi-line (custom-quote comment-multi-line))
-                  (list 'comment-line-break-function (custom-quote comment-line-break-function))
-                  (list 'paragraph-start (custom-quote paragraph-start))
-                  (list 'paragraph-separate (custom-quote paragraph-separate))
-                  (list 'paragraph-ignore-fill-prefix (custom-quote paragraph-ignore-fill-prefix))
-                  (list 'adaptive-fill-mode (custom-quote adaptive-fill-mode))
-                  (list 'adaptive-fill-regexp (custom-quote adaptive-fill-regexp))
+              ;; Be XML compliant:
+              (list
+               (list 'sgml-xml-mode
+                     ;;(when (mumamo-derived-from-mode ',major 'sgml-mode) t))
+                     (when (mumamo-derived-from-mode major 'sgml-mode) t))
+
+               ;; We need to copy the variables that we need and
+               ;; that are not automatically buffer local, but
+               ;; could be it. Arguably it is a bug if they are not
+               ;; buffer local though we have to adapt.
+
+               ;; From cc-mode.el:
+               (list 'indent-line-function (custom-quote indent-line-function))
+               (list 'indent-region-function (custom-quote indent-region-function))
+               (list 'normal-auto-fill-function (custom-quote normal-auto-fill-function))
+               (list 'comment-start (custom-quote comment-start))
+               (list 'comment-end (custom-quote comment-end))
+               (list 'comment-start-skip (custom-quote comment-start-skip))
+               (list 'comment-end-skip (custom-quote comment-end-skip))
+               (list 'comment-multi-line (custom-quote comment-multi-line))
+               (list 'comment-line-break-function (custom-quote comment-line-break-function))
+               (list 'paragraph-start (custom-quote paragraph-start))
+               (list 'paragraph-separate (custom-quote paragraph-separate))
+               (list 'paragraph-ignore-fill-prefix (custom-quote paragraph-ignore-fill-prefix))
+               (list 'adaptive-fill-mode (custom-quote adaptive-fill-mode))
+               (list 'adaptive-fill-regexp (custom-quote adaptive-fill-regexp))
 
                  ;;; Try doing the font lock things last, keywords really last
-                  (list 'font-lock-multiline (custom-quote font-lock-multiline))
-                  (list 'font-lock-extend-after-change-region-function (custom-quote font-lock-extend-after-change-region-function))
-                  (list 'font-lock-extend-region-functions (custom-quote font-lock-extend-region-functions))
-                  (list 'font-lock-comment-start-skip (custom-quote font-lock-comment-start-skip))
-                  (list 'font-lock-comment-end-skip (custom-quote font-lock-comment-end-skip))
-                  (list 'font-lock-syntactic-keywords (custom-quote font-lock-syntactic-keywords))
-
-                  (list 'font-lock-set-defaults) ; whether we have set up defaults.
-
-                  ;; Set from font-lock-defaults normally:
-                  (list 'font-lock-defaults (custom-quote (copy-tree font-lock-defaults)))
-                  ;; Syntactic Font Lock
-                  ;;(set 'font-lock-syntax-table (custom-quote font-lock-syntax-table))
-                  (list 'font-lock-beginning-of-syntax-function (custom-quote font-lock-beginning-of-syntax-function))
-                  (list 'font-lock-syntactic-face-function (custom-quote font-lock-syntactic-face-function))
-
-                  ;; Other Font Lock Variables
-                  (list 'font-lock-mark-block-function (custom-quote font-lock-mark-block-function))
-                  (list 'font-lock-extra-managed-props (custom-quote font-lock-extra-managed-props))
-                  ;; This value is fetched from font-lock:
-                  (list 'font-lock-fontify-buffer-function (custom-quote font-lock-fontify-buffer-function))
-                  (list 'font-lock-unfontify-buffer-function (custom-quote font-lock-unfontify-buffer-function))
-                  (list 'font-lock-fontify-region-function (custom-quote font-lock-fontify-region-function))
-                  (list 'font-lock-unfontify-region-function (custom-quote font-lock-unfontify-region-function))
-
-                  ;; Jit Lock Variables
-                  (list 'jit-lock-after-change-extend-region-functions (custom-quote jit-lock-after-change-extend-region-functions))
-
-                  ;;(list 'syntax-table (custom-quote (copy-syntax-table (syntax-table))))
-                  ;;(list 'mumamo-original-syntax-begin-function (custom-quote syntax-begin-function))
-                  (list 'syntax-begin-function (custom-quote syntax-begin-function))
-                  (list 'fill-paragraph-function (custom-quote fill-paragraph-function))
-                  (list 'fill-forward-paragraph-function
-                        (when (boundp 'fill-forward-paragraph-function)
-                          (custom-quote fill-forward-paragraph-function)))
-
-                  ;; newcomment
-                  (list 'comment-use-global-state (custom-quote (when (boundp 'comment-use-global-state) comment-use-global-state)))
-
-                  ;; parsing sexps
-                  (list 'multibyte-syntax-as-symbol (custom-quote multibyte-syntax-as-symbol))
-                  (list 'parse-sexp-ignore-comments (custom-quote parse-sexp-ignore-comments))
-                  (list 'parse-sexp-lookup-properties (custom-quote parse-sexp-lookup-properties))
-                  ;; fix-me: does not the next line work?
-                  (list 'forward-sexp-function (custom-quote forward-sexp-function))
-                  ))
+               (list 'font-lock-multiline (custom-quote font-lock-multiline))
+               (list 'font-lock-extend-after-change-region-function (custom-quote font-lock-extend-after-change-region-function))
+               (list 'font-lock-extend-region-functions (custom-quote font-lock-extend-region-functions))
+               (list 'font-lock-comment-start-skip (custom-quote font-lock-comment-start-skip))
+               (list 'font-lock-comment-end-skip (custom-quote font-lock-comment-end-skip))
+               (list 'font-lock-syntactic-keywords (custom-quote font-lock-syntactic-keywords))
+
+               (list 'font-lock-keywords (custom-quote font-lock-keywords))
+               ;;(list 'font-lock-keywords-alist (custom-quote font-lock-keywords-alist))
+               ;;(list 'font-lock-removed-keywords-alist (custom-quote font-lock-removed-keywords-alist))
+
+               ;; Fix-me: uncommenting this line (as it should be)
+               ;; sets font-lock-keywords-only to t globally...: bug 3467
+               (list 'font-lock-keywords-only (custom-quote font-lock-keywords-only))
+
+               (list 'font-lock-keywords-case-fold-search (custom-quote font-lock-keywords-case-fold-search))
+
+               (list 'font-lock-set-defaults t) ; whether we have set up defaults.
+
+               ;; Set from font-lock-defaults normally:
+               (list 'font-lock-defaults (custom-quote (copy-tree font-lock-defaults)))
+               ;; Syntactic Font Lock
+               (list 'font-lock-syntax-table (custom-quote font-lock-syntax-table)) ;; See nXhtml bug 400415
+               (list 'font-lock-beginning-of-syntax-function (custom-quote font-lock-beginning-of-syntax-function))
+               (list 'font-lock-syntactic-face-function (custom-quote font-lock-syntactic-face-function))
+
+               ;; Other Font Lock Variables
+               (list 'font-lock-mark-block-function (custom-quote font-lock-mark-block-function))
+               (list 'font-lock-extra-managed-props (custom-quote font-lock-extra-managed-props))
+               ;; This value is fetched from font-lock:
+               (list 'font-lock-fontify-buffer-function (custom-quote font-lock-fontify-buffer-function))
+               (list 'font-lock-unfontify-buffer-function (custom-quote font-lock-unfontify-buffer-function))
+               (list 'font-lock-fontify-region-function (custom-quote font-lock-fontify-region-function))
+               (list 'font-lock-unfontify-region-function (custom-quote font-lock-unfontify-region-function))
+
+               ;; Jit Lock Variables
+               (list 'jit-lock-after-change-extend-region-functions (custom-quote jit-lock-after-change-extend-region-functions))
+
+               ;;(list 'syntax-table (custom-quote (copy-syntax-table (syntax-table))))
+               ;;(list 'mumamo-original-syntax-begin-function (custom-quote syntax-begin-function))
+               (list 'syntax-begin-function (custom-quote syntax-begin-function))
+               (list 'fill-paragraph-function (custom-quote fill-paragraph-function))
+               (list 'fill-forward-paragraph-function
+                     (when (boundp 'fill-forward-paragraph-function)
+                       (custom-quote fill-forward-paragraph-function)))
+
+               ;; newcomment
+               (list 'comment-use-global-state (custom-quote (when (boundp 'comment-use-global-state) comment-use-global-state)))
+
+               ;; parsing sexps
+               (list 'multibyte-syntax-as-symbol (custom-quote multibyte-syntax-as-symbol))
+               (list 'parse-sexp-ignore-comments (custom-quote parse-sexp-ignore-comments))
+               (list 'parse-sexp-lookup-properties (custom-quote parse-sexp-lookup-properties))
+               ;; fix-me: does not the next line work?
+               (list 'forward-sexp-function (custom-quote forward-sexp-function))
+               ))
              (relevant-buffer-locals (mumamo-get-relevant-buffer-local-vars))
-                 )
+             )
         ;;(append '(1 2) '(3 4) '((eval body)))
         (mumamo-msgfntfy "===========> before setq fetch-func-definition %s" func-sym)
         ;; Avoid doublets
@@ -2269,59 +2719,92 @@ The main reasons for doing it this way is:
             (setq relevant-buffer-locals (assq-delete-all fvar relevant-buffer-locals))))
         (setq fetch-func-definition
               (append fetch-func-definition
-                      (list
-                       (list 'let
-                             (append
-                              fetch-func-definition-let
-                              relevant-buffer-locals
-                              )
-                             (list 'with-syntax-table
-                                   ;;(list 'if syntax-sym syntax-sym
-                                   (if syntax-sym
-                                       syntax-sym
-                                     (list 'standard-syntax-table)
-                                     );;'syntax-table
-                                   ;; I can't see why it should be
-                                   ;; needed to call
-                                   ;; `font-lock-set-defaults' now:
-;;;                                    '(let ((t1 (get-internal-run-time))
-;;;                                           t2)
-;;;                                       (setq font-lock-set-defaults nil)
-;;;                                       (font-lock-set-defaults)
-;;;                                       (setq t2 (get-internal-run-time))
-;;;                                       (mumamo-msgfntfy "font-lock-set-defaults runtime=%s, %s" t1 t2)
-;;;                                       t2
-;;;                                       )
-
-;;;                                 '(message "eval body: syntax-table=html ? %s, not flsyn-tab=%s"
-;;;                                       (equal
-;;;                                             (syntax-table)
-;;;                                             html-mode-syntax-table)
-;;;                                       (not font-lock-syntax-table))
-;;;                                 '(message "  syntax-table=html ? %s" (equal (syntax-table) html-mode-syntax-table))
-;;;                                 '(message "  sgml-font-lock-syntactic-keywords=%S" sgml-font-lock-syntactic-keywords)
-;;;                                 '(message "  font-lock-syntactic-keywords=%S" font-lock-syntactic-keywords)
-;;;                                 '(message "  font-lock-syntactic-keywords=html? %s"
-;;;                                           (or (equal font-lock-syntactic-keywords 'sgml-font-lock-syntactic-keywords)
-;;;                                               (equal (nth 1 font-lock-syntactic-keywords) sgml-font-lock-syntactic-keywords)))
-;;;                                 '(message "  multibyte-syntax-as-symbol=%s parse-sexp-ignore-comments=%s parse-sexp-lookup-properties=%s"
-;;;                                           multibyte-syntax-as-symbol
-;;;                                           parse-sexp-ignore-comments
-;;;                                           parse-sexp-lookup-properties)
-
-                                (list 'eval 'body))))))
-        (eval fetch-func-definition)
-        (byte-compile fetch-func-definition)
-        (mumamo-msgfntfy "===========> after eval")
-        ;; Silence the byte compiler:
-        (let ((major-syntax-table))
-          (byte-compile func-sym))
-        (mumamo-msgfntfy "===========> after byte-compile")
-        (put func-sym 'mumamo-defun fetch-func-definition)
-        ))
+                      `((let ,(append fetch-func-definition-let
+                                      relevant-buffer-locals)
+                          (with-syntax-table ,(if syntax-sym
+                                                  syntax-sym
+                                                '(standard-syntax-table));;'syntax-table
+                            ;; fix-me: Protect against font-lock-keywords-only to t globally...: bug 3467
+                            ;;(msgtrc "%s enter 1: font-lock-keywords-only def=%s, body=%S" ',major (default-value 'font-lock-keywords-only) body)
+                            (let (;(font-lock-keywords-only font-lock-keywords-only)
+                                  ret)
+                              ;;(msgtrc "%s enter 2: font-lock-keywords-only def=%s" ',major (default-value 'font-lock-keywords-only))
+                              (setq ret (eval body))
+                              ;;(msgtrc "%s exit 1: font-lock-keywords-only def=%s" ',major (default-value 'font-lock-keywords-only))
+                              ret))
+                          ;;(msgtrc "in %s 1: font-lock-keywords-only =%s in buffer %s, def=%s" ',func-sym font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
+                          )
+                        ;;(msgtrc "in %s 2: font-lock-keywords-only =%s in buffer %s, def=%s" ',func-sym font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
+                        ;;(message "backtrace there:\n%s" (with-output-to-string (backtrace)))
+                        )))
+
+        (setq byte-compiled-fun (let ((major-syntax-table))
+                                  (byte-compile fetch-func-definition)))
+        (assert (functionp byte-compiled-fun))
+        (unless keywords
+          (eval `(defvar ,func-sym nil))
+          (eval `(defvar ,func-def-sym ,fetch-func-definition))
+          (set func-sym byte-compiled-fun) ;; Will be used as default
+          (assert (functionp (symbol-value func-sym)) t)
+          (funcall (symbol-value func-sym) nil)
+          (put func-sym 'permanent-local t)
+          (put func-def-sym 'permanent-local t))))
     (kill-buffer temp-buf)
-    func-sym))
+    ;; Use the new value in current buffer.
+    (when  keywords
+      ;;(set (make-local-variable func-sym) (symbol-value func-sym))
+      (set (make-local-variable func-sym) byte-compiled-fun)
+      (set (make-local-variable func-def-sym) fetch-func-definition))
+    (assert (functionp (symbol-value func-sym)) t)
+    ;; return a list def + fun
+    (cons func-sym func-def-sym)))
+
+;; Fix-me: maybe a hook in font-lock-add-keywords??
+(defun mumamo-ad-font-lock-keywords-helper (major keywords how add-keywords)
+  (if major
+      (mumamo-fetch-major-mode-setup major keywords t t how)
+    ;; Fix-me: Can't do that, need a list of all
+    ;; mumamo-current-chunk-family chunk functions major
+    ;; modes. But this is impossible since the major modes might
+    ;; be determined dynamically. As a work around look in current
+    ;; chunks.
+    (let ((majors (list (mumamo-main-major-mode))))
+      (dolist (entry mumamo-internal-major-modes-alist)
+        (let ((major (car entry))
+              (fun-var-sym (caadr entry)))
+          (when (local-variable-p fun-var-sym)
+            (setq majors (cons (car entry) majors)))))
+      (dolist (major majors)
+        (setq major (mumamo-get-major-mode-substitute major 'fontification))
+        ;;(msgtrc "(fetch-major-mode-setup %s %s %s %s %s)" major keywords nil t how)
+        (mumamo-fetch-major-mode-setup major keywords nil add-keywords how))
+      ;;(font-lock-mode -1) (font-lock-mode 1)
+      )))
 
+(defadvice font-lock-add-keywords (around
+                                   mumamo-ad-font-lock-add-keywords
+                                   activate
+                                   compile)
+  (if (or (boundp 'mumamo-fetching-major) (boundp 'mumamo-add-font-lock-called) (not mumamo-multi-major-mode))
+      ad-do-it
+    (let (mumamo-multi-major-mode
+          mumamo-add-font-lock-called
+          (major    (ad-get-arg 0))
+          (keywords (ad-get-arg 1))
+          (how      (ad-get-arg 2)))
+      (mumamo-ad-font-lock-keywords-helper major keywords how t))))
+
+(defadvice font-lock-remove-keywords (around
+                                      mumamo-ad-font-lock-remove-keywords
+                                      activate
+                                      compile)
+  (if (or (boundp 'mumamo-fetching-major) (boundp 'mumamo-add-font-lock-called) (not mumamo-multi-major-mode))
+      ad-do-it
+    (let (mumamo-multi-major-mode
+          mumamo-add-font-lock-called
+          (major    (ad-get-arg 0))
+          (keywords (ad-get-arg 1)))
+      (mumamo-ad-font-lock-keywords-helper major keywords nil nil))))
 
 (defun mumamo-bad-mode ()
   "MuMaMo replacement for a major mode that could not be loaded."
@@ -2344,7 +2827,7 @@ variables are returned in a list with the same format as
 `mumamo-fetch-major-mode-setup'.
 
 The list of local variable values which is returned by this
-function is cached in `mumamo-internal-major-modes-alist'. This
+function is cached in `mumamo-internal-major-modes-alist'.  This
 avoids calling the major mode USE-MAJOR for each chunk during
 fontification and speeds up fontification significantly."
   ;; Fix-me: Problems here can cause mumamo to loop badly when this
@@ -2355,7 +2838,9 @@ fontification and speeds up fontification significantly."
   ;;(assq 'mumamo-bad-mode mumamo-internal-major-modes-alist)
   (let ((use-major-entry (assq use-major mumamo-internal-major-modes-alist))
         bad-mode-entry
-        dummy-entry)
+        dummy-entry
+        fun-var-sym
+        fun-var-def-sym)
     (unless use-major-entry
       ;; Get mumamo-bad-mode entry and add a dummy entry based on
       ;; this to avoid looping.
@@ -2365,8 +2850,7 @@ fontification and speeds up fontification significantly."
         ;; Assume it is safe to get the mumamo-bad-mode entry ;-)
         (add-to-list 'mumamo-internal-major-modes-alist
                      (list 'mumamo-bad-mode
-                           (mumamo-fetch-major-mode-setup
-                            'mumamo-bad-mode)))
+                           (mumamo-fetch-major-mode-setup 'mumamo-bad-mode nil nil nil nil)))
         (setq bad-mode-entry
               (assq 'mumamo-bad-mode mumamo-internal-major-modes-alist)))
       (setq dummy-entry (list use-major (cadr bad-mode-entry)))
@@ -2374,60 +2858,32 @@ fontification and speeds up fontification significantly."
       ;; immediately remove it.
       (add-to-list 'mumamo-internal-major-modes-alist dummy-entry)
       (setq use-major-entry (list use-major
-                                  (mumamo-fetch-major-mode-setup
-                                   use-major)))
+                                  (mumamo-fetch-major-mode-setup use-major nil nil nil nil)))
       (setq mumamo-internal-major-modes-alist
             (delete dummy-entry
                     mumamo-internal-major-modes-alist))
-      (add-to-list 'mumamo-internal-major-modes-alist use-major-entry)
-      ))
-
-  (cadr (or (assq use-major mumamo-internal-major-modes-alist)
-            (assq use-major
-                  (add-to-list 'mumamo-internal-major-modes-alist
-                               (list use-major
-                                     (mumamo-fetch-major-mode-setup
-                                      use-major)))))))
-
-;; Fix-me: This is to drastic since after-change-functions are run
-;; immediately after a change.  It breaks indentation for
-;; example.  Change this to not remove the chunks but just mark them
-;; for maybe removing.  They should still be used until new chunks are
-;; created by fontification.
-(defun mumamo-remove-chunk-overlays (min max)
-  "Mark chunk overlays in MIN to MAX as old.
-Return as a cons region covered by those overlays if greater than
-MIN to MAX, otherwise MIN to MAX."
-  (mumamo-msgfntfy "mumamo-remove-chunk-overlays %s %s, modified=%s" min max (buffer-modified-p))
-  ;;(mumamo-assert-fontified-t min max)
-  (let ((min-min min)
-        (max-max max)
-        (did-remove nil))
-    (dolist (o (overlays-in min max))
-      (when (mumamo-chunk-major-mode o)
-        (when (< max (overlay-end o))
-          (setq max-max (overlay-end o)))
-        (when (> min (overlay-start o))
-          (setq min-min (overlay-start o)))
-        ;; Save the old major mode so that we can compare with it:
-        (overlay-put o 'mumamo-old-major-mode (mumamo-chunk-major-mode o))
-        (overlay-put o 'mumamo-major-mode nil)
-        ;; Fix-me: There must be something wrong. If we remove the
-        ;; overlay there is no need to save it.
-        (mumamo-msgfntfy "delete-overlay 7")
-        (delete-overlay o)
-        (setq did-remove t)
-        (setq mumamo-chunks-to-remove (cons o mumamo-chunks-to-remove))))
-    (mumamo-msgfntfy "  exit mumamo-remove-chunk-overlays %s %s, modified=%s" min max (buffer-modified-p))
-    ;;(mumamo-assert-fontified-t min max)
-    (when did-remove (cons min-min max-max))))
+      (add-to-list 'mumamo-internal-major-modes-alist use-major-entry))
+    (setq fun-var-sym (caadr use-major-entry))
+    (setq fun-var-def-sym (cdadr use-major-entry))
+    (assert (functionp (symbol-value fun-var-sym)) t)
+    (assert (eq 'lambda (car (symbol-value fun-var-def-sym))) t)
+    ;; Always make a buffer local value for keywords.
+    (unless (local-variable-p fun-var-sym)
+      (set (make-local-variable fun-var-sym) (symbol-value fun-var-sym))
+      (set (make-local-variable fun-var-def-sym) (symbol-value fun-var-def-sym)))
+    (caadr (or (assq use-major mumamo-internal-major-modes-alist)
+               ))))
+               ;; (assq use-major
+               ;;     (add-to-list 'mumamo-internal-major-modes-alist
+               ;;                  (list use-major
+               ;;                        (mumamo-fetch-major-mode-setup
+               ;;                         use-major nil nil nil))))))))
 
 (defun mumamo-remove-all-chunk-overlays ()
   "Remove all CHUNK overlays from the current buffer."
   (save-restriction
     (widen)
-    (mumamo-remove-chunk-overlays (point-min) (point-max))
-    (mumamo-remove-old-overlays)))
+    (mumamo-delete-new-chunks)))
 
 
 
@@ -2436,142 +2892,8 @@ MIN to MAX, otherwise MIN to MAX."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Creating and accessing chunks
 
-;; (defun mumamo-find-chunk-values-at (pos)
-;;   "Return a list of values for creating a chunk at POS after last chunk.
-;; Like `mumamo-create-chunk-values-at, but first create chunks
-;; before POS."
-;;   (mumamo-msgfntfy "********* computing new-way and old-way")
-;;   (let ((new-way (mumamo-find-chunks pos 'last-as-values))
-;;         ;; Fix-me: remove
-;;         (old-way (mumamo-create-chunk-values-at pos)))
-;;     (mumamo-msgfntfy "new-way=%s" new-way)
-;;     (mumamo-msgfntfy "old-way=%s" old-way)
-;;     (setcar (nthcdr 6 old-way) (nth 6 new-way))
-;;     (unless (equal new-way old-way)
-;;       (message "ERROR: new-way /= old-way, pos=%s => %s /= %s" pos new-way old-way))
-;;     new-way)
-;;   )
-
-(defun mumamo-create-chunk-values-at (pos)
-  "Return a list of values to be used to create a chunk at POS."
-  (assert mumamo-current-chunk-family)
-  (let* ((chunk-info (cdr mumamo-current-chunk-family))
-         (chunk-fns    (cadr chunk-info))
-         (here (point))
-         min
-         max
-         border-min
-         border-max
-         parseable
-         (max-found nil)
-         major-sub)
-    ;; Fix-me: maybe assume previous chunk is trustworthy if it ends
-    ;; before pos. But check first at which pos this function is
-    ;; called relative to old chunks.
-
-;;;     (unless t ;(overlays-at pos)
-;;;       (let* ((ovl-pos pos)
-;;;              (prev-end (previous-overlay-change ovl-pos))
-;;;              ;; fix-me: start vs end
-;;;              (prev-chunk (when prev-end
-;;;                            (mumamo-get-existing-chunk-at prev-end))))
-;;;         (when prev-chunk
-;;;           (unless (= prev-end (overlay-end prev-chunk))
-;;;             (setq prev-chunk nil)))
-;;;         ;; fix-me: use ovl-pos to find chunk? That would make ppss work I believe.
-;;;         (while prev-chunk
-;;;           (if (mumamo-chunk-major-mode prev-chunk)
-;;;               (progn
-;;;                 (setq min (1+ (overlay-end prev-chunk)))
-;;;                 (setq prev-chunk nil))
-;;;             (setq ovl-pos (1- (overlay-start prev-chunk)))
-;;;             (if (< ovl-pos (point-min))
-;;;                 (setq prev-chunk nil)
-;;;               (setq prev-end (previous-overlay-change ovl-pos))
-;;;               (setq prev-chunk (when prev-end (mumamo-get-existing-chunk-at prev-end)))
-;;;               )))))
-    (dolist (fn chunk-fns)
-      (let* (
-             (r (funcall fn pos (point-min) (point-max)))
-             (rmin       (nth 0 r))
-             (rmax       (nth 1 r))
-             (rmajor-sub (nth 2 r))
-             (rborder    (nth 3 r))
-             (rparseable (nth 4 r))
-             (rborder-min (when rborder (nth 0 rborder)))
-             (rborder-max (when rborder (nth 1 rborder)))
-             (rmax-found rmax))
-        (mumamo-msgfntfy "  fn=%s, r=%s" fn r)
-        (unless rmin (setq rmin (point-min)))
-        (unless rmax (setq rmax (point-max)))
-        ;; Do not allow zero length chunks
-        (unless (and (> rmin 1) (= rmin rmax))
-          ;; comparision have to be done differently if we are in an
-          ;; exception part or not.  since we are doing this from top to
-          ;; bottom the rules are:
-          ;;
-          ;; - exception parts always outrules non-exception part.  when
-          ;;   in exception part the min start point should be used.
-          ;; - when in non-exception part the max start point and the
-          ;;   min end point should be used.
-          ;;
-          ;; check if first run:
-
-          ;; Fix-me: there is some bug here when borders are not
-          ;; included and are not 0 width.
-          (if (not min)
-              (progn
-                (setq min rmin)
-                (setq border-min rborder-min)
-                (setq max rmax)
-                (setq border-max rborder-max)
-                (setq max-found rmax-found)
-                (setq parseable rparseable)
-                (setq major-sub rmajor-sub))
-            (if rmajor-sub
-                (if major-sub
-                    (when (or (not min)
-                              (< rmin min))
-                      (setq min rmin)
-                      (setq border-min rborder-min)
-                      (setq max rmax)
-                      (setq border-max rborder-max)
-                      (when rmax-found (setq max-found t))
-                      (setq parseable rparseable)
-                      (setq major-sub rmajor-sub))
-                  (setq min rmin)
-                  (setq border-min rborder-min)
-                  (setq max rmax)
-                  (setq border-max rborder-max)
-                  (when rmax-found (setq max-found t))
-                  (setq parseable rparseable)
-                  (setq major-sub rmajor-sub))
-              (unless major-sub
-                (when (< min rmin)
-                  (setq min rmin)
-                  (setq border-min rborder-min))
-                (when (< rmax max)
-                  (setq max-found rmax-found)
-                  (setq max rmax)
-                  (setq border-max rborder-max))
-                ))))
-        (mumamo-msgfntfy "min/max=%s/%s border=%s/%s pos=%s" min max border-min border-max pos)
-        ;; check!
-        (when (and min max)
-          (assert (<= min pos) t)
-          (assert (<= pos max) t)
-          (when border-min
-            (assert (< min border-min) t)
-            (assert (<= border-min max) t))
-          (when border-max
-            (assert (<= min border-max) t)
-            (assert (< border-max max) t)))))
-    ;;(list min (when max-found max) major-sub syntax-min syntax-max)
-    (goto-char here)
-    (list min (when max-found max) major-sub border-min border-max parseable)
-    ))
-
 (defun mumamo-define-no-mode (mode-sym)
+  "Fallback major mode when no major mode for MODE-SYM is found."
   (let ((mumamo-repl4 (intern (format "mumamo-4-%s" mode-sym)))
         (lighter (format "No %s" mode-sym))
         (doc (format "MuMaMo replacement for %s which was not found."
@@ -2588,12 +2910,15 @@ MIN to MAX, otherwise MIN to MAX."
                                  'face 'font-lock-warning-face)))))))
 ;;(mumamo-define-no-mode 'my-ownB-mode)
 
+;;(mumamo-major-mode-from-modespec 'javascript-mode)
 (defun mumamo-major-mode-from-modespec (major-spec)
   "Translate MAJOR-SPEC to a major mode.
 Translate MAJOR-SPEC used in chunk definitions of multi major
 modes to a major mode.
 
 See `mumamo-major-modes' for an explanation."
+  (unless major-spec
+    (mumamo-backtrace "mode-from-modespec, major-spec is nil"))
   (let ((modes (cdr (assq major-spec mumamo-major-modes)))
         (mode 'mumamo-bad-mode))
     (setq mode
@@ -2617,203 +2942,42 @@ See `mumamo-major-modes' for an explanation."
                               "Couldn't find an available major mode for specification %s,\n  alternatives are:\n    %s"
                               major-spec modes)
           (mumamo-warn-once '(mumamo-major-mode-from-modespec)
-                 "Couldn't find an available major mode for spec %s"
-                 major-spec))
+                            "Couldn't find an available major mode for spec %s"
+                            major-spec))
         ;;(setq mode 'fundamental-mode)
         (setq mode (mumamo-define-no-mode major-spec))
         ))
     (mumamo-msgfntfy " mumamo-major-mode-from-modespec %s => %s" major-spec mode)
     mode))
-;(mumamo-major-mode-from-modespec 'ruby-mode)
-
-;; (defun mumamo-ceqcv ()
-;;   (mumamo-chunk-equal-chunk-values (mumamo-get-existing-chunk-at (point))
-;;                                    (mumamo-create-chunk-values-at (point))))
-
-(defun mumamo-chunk-equal-chunk-values (chunk chunk-values)
-  "Return non-nil if CHUNK corresponds to CHUNK-VALUES."
-  ;;(message "mumamo-chunk-equal-chunk-values, c=%s, v=%s" chunk chunk-values)
-  (let* ((chunk-min (overlay-start chunk))
-         (chunk-max (overlay-end chunk))
-         (chunk-syntax-min-d    (overlay-get chunk 'syntax-min-d))
-         (chunk-syntax-max-d    (overlay-get chunk 'syntax-max-d))
-         (chunk-syntax-min    (when (and chunk-syntax-min-d chunk-min) (+ chunk-min chunk-syntax-min-d)))
-         (chunk-syntax-max    (when (and chunk-syntax-max-d chunk-max) (- chunk-max chunk-syntax-max-d)))
-         (chunk-major-sub     (overlay-get chunk 'mumamo-major-mode))
-         (chunk-parseable-by (overlay-get chunk 'mumamo-parseable-by))
-         (val-syntax-min (mumamo-chunk-value-syntax-min chunk-values))
-         (val-syntax-max (mumamo-chunk-value-syntax-max chunk-values))
-         (val-major-sub (let ((mode-spec (mumamo-chunk-value-major  chunk-values)))
-                          (if mode-spec
-                              (mumamo-major-mode-from-modespec mode-spec)
-                            (mumamo-main-major-mode))))
-         )
-    (and (eq chunk-min (or (mumamo-chunk-value-min chunk-values)
-                           (point-min)))
-         (eq chunk-max (or (mumamo-chunk-value-max chunk-values)
-                           (point-max)))
-         (eq chunk-syntax-min val-syntax-min)
-         (eq chunk-syntax-max val-syntax-max)
-         (eq chunk-major-sub val-major-sub)
-         (equal chunk-parseable-by (mumamo-chunk-value-parseable-by  chunk-values))
-         ;;(or (message " equal") t)
-         )))
 
-(defun mumamo-create-chunk-from-chunk-values (chunk-values)
-  "Create a chunk from CHUNK-VALUES and return it.
-CHUNK-VALUES should be in the format returned by
-`mumamo-create-chunk-values-at'."
-  (mumamo-msgfntfy "mumamo-create-chunk-from-chunk-values %s" chunk-values)
-  ;; Fix-me: Move adjusting of old chunks to here since it must always
-  ;; be done.
-  (let* ((min           (mumamo-chunk-value-min    chunk-values))
-         (max           (mumamo-chunk-value-max    chunk-values))
-         (syntax-min    (mumamo-chunk-value-syntax-min chunk-values))
-         (syntax-max    (mumamo-chunk-value-syntax-max chunk-values))
-         (major-sub     (mumamo-chunk-value-major  chunk-values))
-         (parseable-by  (mumamo-chunk-value-parseable-by  chunk-values))
-         ;;(prev-chunk    (mumamo-chunk-prev-chunk   chunk-values))
-         (major-normal (mumamo-main-major-mode))
-         (max-found    (when max t))
-         (prev-chunk   (mumamo-get-existing-chunk-at (1- min)))
-         (prev-major   (and prev-chunk
-                            (mumamo-chunk-major-mode prev-chunk)))
-         (prev-same    (and prev-chunk
-                            (eq prev-major
-                                (if major-sub
-                                    major-sub
-                                  major-normal))))
-         ;;(prev-min      (when prev-same (overlay-start prev-chunk)))
-         chunk-ovl)
-    (assert major-normal)
-    ;; remove all old chunk overlays between min and max
-    ;; Fix-me: Must keep track of those to know how much to refontify:
-    (unless max-found  (setq max (point-max)))
-    ;;(mumamo-remove-chunk-overlays min max)
-    ;;(message "min-max=%s-%s, prev-chunk=%s, prev-major=%s, prev-same=%s, major-sub=%s" min max prev-chunk prev-major prev-same major-sub)
-    (setq chunk-ovl (make-overlay min max))
-    (overlay-put chunk-ovl 'mumamo-prev-chunk prev-chunk)
-    (overlay-put chunk-ovl 'mumamo-is-closed max-found)
-    ;; Make syntax border width positive integers:
-    (overlay-put chunk-ovl 'syntax-min-d (when syntax-min (- syntax-min min)))
-    (overlay-put chunk-ovl 'syntax-max-d (when syntax-max (- max syntax-max)))
-;;;     (when (and (= min (point-min))
-;;;                (= max (point-max)))
-;;;       ;; Fix-me: I believe this is not needed any more and it creates
-;;;       ;; trouble for files starting in a sub mode, for example php
-;;;       ;; files.  They will get the wrong major mode in the
-;;;       ;; chunk.
-;;;       ;;
-;;;       ;;(setq major-sub nil)
-;;;       )
-    ;; Get syntax-begin-function for syntax-ppss:
-    (let* ((major (if major-sub major-sub major-normal))
-           (syntax-begin-function
-            (mumamo-with-major-mode-fontification major
-              ;; Do like in syntax.el:
-              '(if syntax-begin-function
-                   (progn
-                     syntax-begin-function)
-                 (when (and (not syntax-begin-function)
-                            ;; fix-me: How to handle boundp here?
-                            (boundp 'font-lock-beginning-of-syntax-function)
-                            font-lock-beginning-of-syntax-function)
-                   font-lock-beginning-of-syntax-function)))))
-      (mumamo-msgfntfy "Got syntax-begin-function, modified=%s" (buffer-modified-p))
-      (overlay-put chunk-ovl 'syntax-begin-function syntax-begin-function))
-
-    (if major-sub
-        (let ((major-sub-to-use (mumamo-major-mode-from-modespec major-sub)))
-          (remove-list-of-text-properties min max '(category))
-          (overlay-put chunk-ovl 'mumamo-major-mode major-sub-to-use)
-          (overlay-put chunk-ovl 'mumamo-parseable-by parseable-by)
-          (overlay-put chunk-ovl
-                       'face
-                       (when (memq mumamo-chunk-coloring
-                                   '(submode-colored both-colored))
-                         mumamo-background-chunk-submode)))
-      (overlay-put chunk-ovl 'mumamo-major-mode major-normal)
-      (overlay-put chunk-ovl
-                   'face
-                   (when (memq mumamo-chunk-coloring '(both-colored))
-                     mumamo-background-chunk-major)))
-    (assert (mumamo-chunk-major-mode chunk-ovl))
-    (unless (mumamo-valid-nxml-chunk chunk-ovl)
-      (rng-clear-overlays min max))
-    (when (and (not parseable-by)
-               (not major-sub)
-               nil ;; Fix-me: I can't understand the next line...
-               (mumamo-derived-from-mode major-normal 'nxml-mode))
-      (setq parseable-by '(nxml-mode)))
-    (mumamo-with-buffer-prepared-for-jit-lock
-     (put-text-property min max 'mumamo-parseable-by parseable-by))
-    (mumamo-msgfntfy "after put mumamo-parseable-by, modified=%s" (buffer-modified-p))
-    (unless (memq 'nxml-mode parseable-by)
-      (mumamo-with-buffer-prepared-for-jit-lock
-       (remove-text-properties min max '(category rng-error))))
-    (let ((ovls (overlays-in min max)))
-      (dolist (ovl ovls)
-        (let ((ctg (overlay-get ovl 'category)))
-          ;;(message "ctg=%s" ctg)
-          (when (memq ctg '(nxml-dependent rng-dependent rng-error))
-            (mumamo-msgfntfy "delete-overlay 8")
-            (delete-overlay ovl))
-          )))
-    (mumamo-msgfntfy "leaving mumamo-create-chunk-from-chunk-values modified=%s" (buffer-modified-p))
-    ;;(setq mumamo-end-last-chunk-pos (overlay-end chunk-ovl))
-    (setq mumamo-last-chunk chunk-ovl)
-    chunk-ovl))
-
-(defun mumamo-create-chunk-at (pos)
-  "Create and return a new chunk at POS.
-There must not be an old chunk there.  Mark for refontification."
-  (assert (not (mumamo-get-existing-chunk-at pos)))
-;;;   (let ((new-chunk-values (mumamo-find-chunk-values-at pos))
-;;;         (new-chunk))
-;;;     (mumamo-msgfntfy "mumamo-create-chunk-at %s, ncv=%s" pos new-chunk-values)
-;;;     (mumamo-adjust-old-chunks new-chunk-values nil nil)
-;;;     (setq new-chunk (mumamo-create-chunk-from-chunk-values new-chunk-values nil))
-;;;     (mumamo-mark-for-refontification (overlay-start new-chunk) (overlay-end new-chunk))
-;;;     new-chunk))
-  (mumamo-find-chunks pos))
-
-(defun mumamo-get-existing-chunk-at (pos)
-  "Return existing chunk at POS if any."
-  (let ((chunk-ovl))
+(defun mumamo-get-existing-new-chunk-at (pos)
+  "Return last existing chunk at POS if any."
+  ;;(msgtrc "(mumamo-get-existing-new-chunk-at %s)" pos)
+  (let ((chunk-ovl)
+        (orig-pos pos))
     (when (= pos (point-max))
       (setq pos (1- pos)))
-    (dolist (o (overlays-at pos))
-      (unless chunk-ovl
-        (when ;;(mumamo-chunk-major-mode o)
-            (and (overlay-get o 'mumamo-major-mode)
-                 (not (overlay-get o 'mumamo-is-old)))
-          (setq chunk-ovl o))))
+    (when (= pos 0) (setq pos 1))
+    (dolist (o (overlays-in pos (1+ pos)))
+      (when (overlay-get o 'mumamo-is-new)
+        ;; There can be two, choose the last.
+        (if chunk-ovl
+            (when (or (> (overlay-end o) (overlay-start o))
+                      (overlay-get o 'mumamo-prev-chunk))
+              (setq chunk-ovl o)
+              )
+          (setq chunk-ovl o)
+          )))
     chunk-ovl))
 
 (defun mumamo-get-chunk-save-buffer-state (pos)
-  "Return chunk overlay at POS. Preserve state."
+  "Return chunk overlay at POS.  Preserve state."
   (let (chunk)
     (mumamo-save-buffer-state nil
-      (setq chunk (mumamo-get-chunk-at pos)))
+      ;;(setq chunk (mumamo-get-chunk-at pos)))
+      (setq chunk (mumamo-find-chunks pos "mumamo-get-chunk-save-buffer-state")))
     chunk))
 
-(defun mumamo-get-chunk-at (pos)
-  "Return chunk overlay at POS.
-Create it if it does not exist.  How to do this is governed by
-`mumamo-current-chunk-family'.
-
-A mumamo chunk is an Emacs overlay with some properties telling
-how mumamo should handle the chunk during fontification,
-indentation etc."
-  (let ((chunk-ovl (mumamo-get-existing-chunk-at pos)))
-    (if chunk-ovl
-        ;;(mumamo-msgfntfy "existing %s %s" pos chunk-ovl)
-        (unless (and (<= (overlay-start chunk-ovl) pos)
-                     (<= pos (overlay-end chunk-ovl)))
-          (error "Mumamo-get-chunk-at: start=%s, pos=%s, end=%s"
-                   (overlay-start chunk-ovl) pos (overlay-end chunk-ovl)))
-      (setq chunk-ovl (mumamo-create-chunk-at pos)))
-    chunk-ovl))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2823,33 +2987,57 @@ indentation etc."
   "Get major mode specified in CHUNK."
   ;;(assert chunk)
   ;;(assert (overlay-buffer chunk))
-  (if chunk
-      (overlay-get chunk 'mumamo-major-mode)
-    major-mode))
-
-(defsubst mumamo-chunk-syntax-min (chunk)
-  "Get min syntactically safe point inside mumamo chunk CHUNK.
-Syntax here refer to the syntax handled by `syntax-ppss' etc."
-;;  (overlay-start chunk))
-  (+ (overlay-start chunk)
-     (or (overlay-get chunk 'syntax-min-d)
-         0)))
-
-(defsubst mumamo-chunk-syntax-max (chunk)
-  "Get max point where syntax is consistent inside mumamo chunk CHUNK.
-See `mumamo-chunk-syntax-min'."
-  (- (overlay-end chunk)
-     (or (overlay-get chunk 'syntax-max-d)
-         0)))
+  (let ((mode-spec (if chunk
+                       (mumamo-chunk-car chunk 'mumamo-major-mode)
+                     (mumamo-main-major-mode))))
+    (mumamo-major-mode-from-modespec mode-spec)))
+
+(defsubst mumamo-chunk-syntax-min-max (chunk no-obscure)
+  (when chunk
+    (let* ((ovl-end   (overlay-end chunk))
+           (ovl-start (overlay-start chunk))
+           (syntax-min (min ovl-end
+                            (+ ovl-start
+                               (or (overlay-get chunk 'syntax-min-d)
+                                   0))))
+           (syntax-max
+            (max ovl-start
+                 (- (overlay-end chunk)
+                    (or (overlay-get chunk 'syntax-max-d)
+                        0)
+                    ;; Note: We must subtract one here because
+                    ;; overlay-end is +1 from the last point in the
+                    ;; overlay. (This cured the problem with
+                    ;; kubica-freezing-i.html that made Emacs loop in
+                    ;; font-lock-extend-region-multiline.)
+                    1 )))
+           (obscure (unless no-obscure (overlay-get chunk 'obscured)))
+           (region-info (cadr obscure))
+           (obscure-min (car region-info))
+           (obscure-max (cdr region-info))
+           ;;(dummy (message "syn-mn-mx:obs=%s r-info=%s ob=%s/%s" obscure region-info obscure-min obscure-max ))
+           (actual-min (max (or obscure-min ovl-start)
+                            (or syntax-min ovl-start)))
+           (actual-max (min (or obscure-max ovl-end)
+                            (or syntax-max ovl-end)))
+           (maj (mumamo-chunk-car chunk 'mumamo-major-mode))
+           ;;(dummy (message "syn-mn-mx:obs=%s r-info=%s ob=%s/%s ac=%s/%s" obscure region-info obscure-min obscure-max actual-min actual-max))
+           )
+      (cons actual-min actual-max))))
 
 (defun mumamo-syntax-maybe-completable (pnt)
   "Return non-nil if at point PNT non-printable characters may occur.
 This just considers existing chunks."
-  (let ((chunk (mumamo-get-existing-chunk-at pnt)))
+  (let* ((chunk (mumamo-find-chunks pnt "mumamo-syntax-maybe-completable"))
+         syn-min-max)
     (if (not chunk)
         t
-      (and (> pnt (1+ (mumamo-chunk-syntax-min chunk)))
-           (< pnt (1- (mumamo-chunk-syntax-max chunk)))))))
+      (mumamo-update-obscure chunk pnt)
+      (setq syn-min-max (mumamo-chunk-syntax-min-max chunk nil))
+      ;;(and (> pnt (1+ (mumamo-chunk-syntax-min chunk)))
+      (and (> pnt (1+ (car syn-min-max)))
+           ;;(< pnt (1- (mumamo-chunk-syntax-max chunk)))))))
+           (< pnt (1- (cdr syn-min-max)))))))
 
 (defvar mumamo-current-chunk-family nil
   "The currently used chunk family.")
@@ -2936,7 +3124,7 @@ meaning of POS, MAX and MARKER."
   "General chunk function helper.
 See `mumamo-chunk-start-fw-str' for more information and the
 meaning of POS, MIN and MARKER."
-  (assert (stringp marker))
+  ;;(assert (stringp marker))
   (let (start-in)
     (goto-char pos)
     (setq start-in (search-backward marker min t))
@@ -3041,26 +3229,29 @@ meaning of POS, MIN and MARKER."
     (modify-syntax-entry ?\" "\"" tbl)
     (modify-syntax-entry ?\' "\"" tbl)
     tbl)
-    "Just for \"..\" and '...'.")
+  "Just for \"..\" and '...'.")
 
 ;; "..." '...' "..'.." '.."..'
 (defun mumamo-guess-in-string (pos)
-  (let ((here (point))
-        (inhibit-field-text-motion t)
-        line-beg
-        parsed
-        str-char
-        str-pos)
-    (goto-char pos)
-    (setq line-beg (line-beginning-position))
-    (setq parsed (with-syntax-table mumamo-string-syntax-table
-                   (parse-partial-sexp line-beg pos)))
-    (setq str-char (nth 3 parsed))
-    (when str-char
-      (skip-chars-backward (string ?^ str-char))
-      (setq str-pos (point)))
-    (goto-char here)
-    str-pos))
+  "If POS is in a string then return string start position.
+Otherwise return nil."
+  (when (and (>= pos (point-min)))
+    (let ((here (point))
+          (inhibit-field-text-motion t)
+          line-beg
+          parsed
+          str-char
+          str-pos)
+      (goto-char pos)
+      (setq line-beg (line-beginning-position))
+      (setq parsed (with-syntax-table mumamo-string-syntax-table
+                     (parse-partial-sexp line-beg pos)))
+      (setq str-char (nth 3 parsed))
+      (when str-char
+        (skip-chars-backward (string ?^ str-char))
+        (setq str-pos (point)))
+      (goto-char here)
+      str-pos)))
 
 ;;; The main generic chunk routine
 
@@ -3076,12 +3267,30 @@ meaning of POS, MIN and MARKER."
                                    fw-exc-start-fun
                                    fw-exc-end-fun
                                    &optional find-borders-fun)
-  "Return list describing a possible chunk that includes POS.
+  (mumamo-find-possible-chunk-new pos
+                                  ;;min
+                                  max
+                                  bw-exc-start-fun
+                                  ;;bw-exc-end-fun
+                                  fw-exc-start-fun
+                                  fw-exc-end-fun
+                                  find-borders-fun))
+
+(defun mumamo-find-possible-chunk-new (pos
+                                       ;;min
+                                       max
+                                       bw-exc-start-fun
+                                       ;;bw-exc-end-fun
+                                       fw-exc-start-fun
+                                       fw-exc-end-fun
+                                       &optional find-borders-fun)
+  ;; This should return no end value!
+  "Return list describing a possible chunk that starts after POS.
 No notice is taken about existing chunks and no chunks are
 created.  The description returned is for the smallest possible
 chunk which is delimited by the function parameters.
 
-POS must be between MIN and MAX.
+POS must be less than MAX.
 
 The function BW-EXC-START-FUN takes two parameters, POS and
 MIN.  It should search backward from POS, bound by MIN, for
@@ -3090,27 +3299,28 @@ exception start and return a cons or a list:
   \(FOUND-POS . EXCEPTION-MODE)
   \(FOUND-POS EXCEPTION-MODE PARSEABLE-BY)
 
-Here FOUND-POS is the start of the chunk. EXCEPTION-MODE is the
-major mode specifier for this chunk. \(Note that this specifier
+Here FOUND-POS is the start of the chunk.  EXCEPTION-MODE is the
+major mode specifier for this chunk.  \(Note that this specifier
 is translated to a major mode through `mumamo-major-modes'.)
 
 PARSEABLE-BY is a list of parsers that can handle the chunk
-beside the one that may be used by the chunks major
-mode. Currently only the XML parser in `nxml-mode' is
-recognized. In this list it should be the symbol `nxml-mode'.
+beside the one that may be used by the chunks major mode.
+Currently only the XML parser in `nxml-mode' is recognized.  In
+this list it should be the symbol `nxml-mode'.
 
-The functions BW-EXC-END-FUN, FW-EXC-START-FUN and FW-EXC-END-FUN
-should search for exception start or end, forward resp backward.
-Those three should return just the start respectively the end of
-the chunk.
+The functions FW-EXC-START-FUN and FW-EXC-END-FUN should search
+for exception start or end, forward resp backward.  Those three
+should return just the start respectively the end of the chunk.
 
-For all four functions the position returned should be nil if
+For all three functions the position returned should be nil if
 search fails.
 
 
 Return as a list with values
 
-  \(START END EXCEPTION-MODE BORDERS PARSEABLE-BY)
+  \(START END EXCEPTION-MODE BORDERS PARSEABLE-BY FR-EXC-FUN FIND-BORDERS-FUN)
+
+**Fix-me: FIND-BORDERS-FUN must be split for chunks-in-chunks!
 
 The bounds START and END are where the exception starts or stop.
 Either of them may be nil, in which case this is equivalent to
@@ -3122,241 +3332,875 @@ chunk.
 
 BORDERS is the return value of the optional FIND-BORDERS-FUN
 which takes three parameters, START, END and EXCEPTION-MODE in
-the return values above. BORDERS may be nil and otherwise has
+the return values above.  BORDERS may be nil and otherwise has
 this format:
 
-  \(START-BORDER END-BORDER EXCEPTION-MODE)
+  \(START-BORDER END-BORDER EXCEPTION-MODE FW-EXC-FUN)
 
-START-BORDER and END-BORDER may be nil. Otherwise they should be
+START-BORDER and END-BORDER may be nil.  Otherwise they should be
 the position where the border ends respectively start at the
 corresponding end of the chunk.
 
 PARSEABLE-BY is a list of major modes with parsers that can parse
 the chunk.
 
-----
-* Note: This routine is used by to create new members for chunk
-families.  If you want to add a new chunk family you could most
-often do that by writing functions for this routine.  Please see
-the many examples in mumamo-fun.el for how this can be done. See
-also `mumamo-quick-static-chunk'."
-  ;;\(START END EXCEPTION-MODE END-OF-EXCEPTION POS)
-  (mumamo-msgfntfy "\nmumamo-find-possible-chunk %s %s %s %s %s\n%s %s %s %s %s" pos min max (point-min) (point-max) bw-exc-start-fun bw-exc-end-fun fw-exc-start-fun fw-exc-end-fun find-borders-fun)
-  ;;(message "\nmumamo-find-possible-chunk %s %s %s %s %s\n%s %s %s %s %s" pos min max (point-min) (point-max) bw-exc-start-fun bw-exc-end-fun fw-exc-start-fun fw-exc-end-fun find-borders-fun)
-  ;;(message "\nmumamo-find-possible-chunk %s %s %s %s %s" pos min max (point-min) (point-max))
-  ;;(message "\nmumamo-find-possible-chunk.debugger=%s" debugger)
-  (setq err nil)
-  (mumamo-condition-case err
-      (progn
-        (assert (and (<= min pos) (<= pos max))
-                nil
-                "mumamo-chunk: min=%s, pos=%s, max=%s, bt=%S"
-                min pos max (with-output-to-string (backtrace)))
-        ;; "in" refers to "in exception" and "out" is then in main
-        ;; major mode.
-        (let (start-in-cons
-              exc-mode
-              parseable-by
-              start-in start-out
-              end-in end-out
-              start end
-              ;;end-of-exception
-              wants-end-type
-              found-valid-end
-              (main-major (mumamo-main-major-mode))
-              borders
-              border-beg
-              border-end)
-          ;;;; find start of range
-          ;;
-          ;; start normal
-          ;;
-          ;;(message "here a1, bw-exc-end-fun=(%s %s %s) debugger=%s" bw-exc-end-fun pos min debugger)
-          (setq start-out (funcall bw-exc-end-fun pos min))
-          ;;(message "here a1b, start-out=%s debugger=%s" start-out debugger)
-          (when start-out
-            (assert (<= start-out pos))
-            (assert (<= min start-out)))
-          (when start-out (setq min start-out)) ;; minimize next search bw
-          ;; start exception
-          ;;(message "start exception, bw-exc-start-fun=%s debugger=%s" bw-exc-start-fun debugger)
-          (setq start-in-cons (funcall bw-exc-start-fun pos min))
-          ;;(message "start-in-cons=%s" start-in-cons)
-          ;;(message "after start exception, bw-exc-start-fun=%s" bw-exc-start-fun)
-          (setq start-in (car start-in-cons))
-          ;;(message "start-in=%s" start-in)
-          (when start-in
-            ;;(message "here in a2, start-in=%s, pos=%s" start-in pos)
-            (assert (<= start-in pos) t)
-            ;;(message "here in b")
-            (assert (<= min start-in) t)
-            ;;(message "here in c")
-            )
-          ;; compare
-          ;;(message "compare")
-          (cond
-           ((and start-in start-out)
-            (if (< start-in start-out)
-                (setq start start-out)
-              (setq exc-mode (cdr start-in-cons))
-              (setq start start-in)))
-           (start-in
-            (setq exc-mode (cdr start-in-cons))
-            (setq start start-in))
-           (start-out
-            (setq start start-out))
-           ;; Fix-me: I am not sure about this, I do not remember why
-           ;; I had this test. -1 just disables it.
-           ;;((= min 1)
-           ((= min -1)
-            (setq start-in 1)
-            (setq start 1)
-            (setq exc-mode nil)))
-          (when (and exc-mode
-                     (listp exc-mode))
-            (setq parseable-by (cadr exc-mode))
-            (setq exc-mode (car exc-mode)))
-          ;;;; find end of range
-          ;;
-          ;; what end type is acceptable?  three possible values: nil means
-          ;; any end type, the other values are 'end-normal and
-          ;; 'end-exception.
-          ;;(message "find end of range")
-          (while (not found-valid-end)
-            (when start
-              (if exc-mode
-                  (setq wants-end-type 'end-exception)
-                (setq wants-end-type 'end-normal)))
-            ;; end exception
-            (when (or (not wants-end-type)
-                      (eq wants-end-type 'end-exception))
-              (setq max end-in) ;; minimize next search fw
-              (setq end-in (funcall fw-exc-end-fun pos max)))
-            ;; end normal
-            (when (or (not wants-end-type)
-                      (eq wants-end-type 'end-normal))
-              ;; 1+ is for zero length chunks (that will never be created)
-              (setq end-out (funcall fw-exc-start-fun (1+ pos) max)))
-            ;;(message "=========================== fw-exc-start-fun=%s end-out=%s end-in=%s" fw-exc-start-fun end-out end-in)
-            ;; compare
-            (cond
-             ((and end-in end-out)
-              (if (> end-in end-out)
-                  (setq end end-out)
-                ;;(setq end-of-exception t)
-                (setq end end-in)))
-             (end-in
-              ;;(setq end-of-exception t)
-              (setq end end-in))
-             (end-out
-              (setq end end-out)))
-            ;; borders
-            (when find-borders-fun
-              (let ((start-border (when start (unless (and (= 1 start)
-                                                           (not exc-mode))
-                                                start)))
-                    (end-border (when end (unless (and (= (point-max) end)
-                                                       (not exc-mode))
-                                            end))))
-                (setq borders (funcall find-borders-fun start-border end-border exc-mode))))
-            ;; check
-            (setq border-beg (nth 0 borders))
-            (setq border-end (nth 1 borders))
-            (when start
-              (assert (<= start pos))
-              (when border-beg
-                (assert (<= start border-beg))))
-            (when end
-              ;;(message "start=%s, wants-end-type =%s" start wants-end-type)
-;;;               (message "pos=%s min=%s max=%s bw-exc-start-fun=%s bw-exc-end-fun=%s fw-exc-start-fun=%s fw-exc-end-fun=%s find-borders-fun=%s"
-;;;                        pos min max
-;;;                        bw-exc-start-fun
-;;;                        bw-exc-end-fun
-;;;                        fw-exc-start-fun
-;;;                        fw-exc-end-fun
-;;;                        find-borders-fun)
-              (assert (<= pos end) t)
-              (when border-end
-                (assert (<= border-end end))))
-            (if (not end)
-                (setq found-valid-end t)
-              (let ((syntax-start (if border-beg border-beg
-                                    (if start start min)))
-                    (syntax-end (if border-end border-end end))
-                    (major (if exc-mode exc-mode main-major)))
-                (mumamo-msgfntfy "point-min/max=%s/%s, border-beg=%s, border-end=%s, start/end/min=%s/%s/%s" (point-min) (point-max) border-beg border-end start end min)
-                (setq found-valid-end
-                      ;;(mumamo-end-chunk-is-valid syntax-start syntax-end major)
-                      t)
-                (mumamo-msgfntfy "after setq found-valid-end=%s" found-valid-end)
-                (unless found-valid-end
-                  (setq end nil)
-                  (setq end-in (point-max))
-                  (setq pos (1+ syntax-end)))
-                )))
-          ;;(list start end exc-mode end-of-exception pos)
-;;;           (message " return (%s %s %s %s)\n   %s %s %s\n   %s %s %s\n   %s %s" start end exc-mode borders
-;;;                    pos min max
-;;;                    bw-exc-start-fun
-;;;                    bw-exc-end-fun
-;;;                    fw-exc-start-fun
-;;;                    fw-exc-end-fun
-;;;                    find-borders-fun)
-          (mumamo-msgfntfy "start/end=%s/%s borders=%s, exc-mode=%s" start end borders exc-mode)
-          ;;(message "start/end=%s/%s borders=%s, exc-mode=%s" start end borders exc-mode)
-          ;; This is just totally wrong in some pieces and a desperate
-          ;; try after seeing the problems with wp-app.php around line
-          ;; 1120.  Maybe this can be used when cutting chunks from
-          ;; top to bottom however.
-          (when nil ;end
-            (let ((here (point))
-                  end-line-beg
-                  end-in-string
-                  start-in-string
-                  (start-border (or (nth 0 borders) start))
-                  (end-border   (or (nth 1 borders) end)))
-              ;; Check if in string
-              ;; Fix-me: add comments about why and examples + tests
-              ;; Fix-me: must loop to find good borders ....
-              (when end
-                ;; Fix-me: more careful positions for guess
-                (setq end-in-string
+FW-EXC-FUN is the function that finds the end of the chunk.  This
+is either FW-EXC-START-FUN or FW-EXC-END-FUN.
+
+---- * Note: This routine is used by to create new members for
+chunk families.  If you want to add a new chunk family you could
+most often do that by writing functions for this routine.  Please
+see the many examples in mumamo-fun.el for how this can be done.
+See also `mumamo-quick-static-chunk'."
+  ;;(msgtrc "====")
+  ;;(msgtrc "find-poss-new %s %s %s %s %s %s" pos max bw-exc-start-fun fw-exc-start-fun fw-exc-end-fun find-borders-fun)
+
+  ;;(mumamo-condition-case err
+  (progn
+    (assert (and (<= pos max)) nil
+            "mumamo-chunk: pos=%s, max=%s, bt=%S"
+            pos max (with-output-to-string (backtrace)))
+    ;; "in" refers to "in exception" and "out" is then in main
+    ;; major mode.
+    (let (start-in-cons
+          exc-mode
+          fw-exc-mode
+          fw-exc-fun
+          parseable-by
+          start-in start-out
+          end-in end-out
+          start end
+          ;;end-of-exception
+          wants-end-type
+          found-valid-end
+          (main-major (mumamo-main-major-mode))
+          borders
+          border-beg
+          border-end)
+      ;;;; find start of range
+      ;;
+      ;; start normal
+      ;;
+      ;;(setq start-out (funcall bw-exc-end-fun pos min))
+      ;; Do not check end here!
+      ;;(setq start-out (funcall fw-exc-end-fun pos max))
+      ;;(msgtrc "find-poss-new.start-out=%s" start-out)
+      ;; start exception
+      (setq start-in (funcall fw-exc-start-fun pos max))
+      ;;(msgtrc "find-poss-new.start-in=%s" start-in)
+      (when (listp start-in)
+        (setq fw-exc-mode (nth 1 start-in))
+        (setq start-in (car start-in)))
+      ;; compare
+      (when (and start-in start-out)
+        (if (> start-in start-out)
+            (setq start-in nil)
+          (setq start-out nil)))
+      (cond
+       (start-in
+        (setq start-in-cons (funcall bw-exc-start-fun start-in pos))
+        ;;(msgtrc "find-poss-new.start-in=%s start-in-cons=%s" start-in start-in-cons)
+        (when start-in-cons
+          (assert (= start-in (car start-in-cons)))
+          (setq exc-mode (cdr start-in-cons)))
+        (setq start start-in))
+       (start-out
+        (setq start start-out))
+       )
+      (when (and exc-mode
+                 (listp exc-mode))
+        (setq parseable-by (cadr exc-mode))
+        (setq exc-mode (car exc-mode)))
+      ;; borders
+      (when find-borders-fun
+        (let ((start-border (when start (unless (and (= 1 start)
+                                                     (not exc-mode))
+                                          start)))
+              (end-border (when end (unless (and (= (point-max) end)
+                                                 (not exc-mode))
+                                      end))))
+          (setq borders (funcall find-borders-fun start-border end-border exc-mode))))
+      ;; check
+      (setq border-beg (nth 0 borders))
+      (setq border-end (nth 1 borders))
+      ;;(when start (assert (<= start pos)))
+      ;;(assert (or (not start) (= start pos)))
+      (when border-beg
+        (assert (<= start border-beg)))
+      ;; Fix-me: This is just totally wrong in some pieces and a
+      ;; desperate try after seeing the problems with wp-app.php
+      ;; around line 1120.  Maybe this can be used when cutting chunks
+      ;; from top to bottom however.
+      (when nil ;end
+        (let ((here (point))
+              end-line-beg
+              end-in-string
+              start-in-string
+              (start-border (or (nth 0 borders) start))
+              (end-border   (or (nth 1 borders) end)))
+          ;; Check if in string
+          ;; Fix-me: add comments about why and examples + tests
+          ;; Fix-me: must loop to find good borders ....
+          (when end
+            ;; Fix-me: more careful positions for guess
+            (setq end-in-string
+                  (mumamo-guess-in-string
+                   ;;(+ end 2)
+                   (1+ end-border)
+                   ))
+            (when end-in-string
+              (when start
+                (setq start-in-string
                       (mumamo-guess-in-string
-                       ;;(+ end 2)
-                       (1+ end-border)
-                       ))
-                (when end-in-string
-                  (when start
-                    (setq start-in-string
-                          (mumamo-guess-in-string
-                           ;;(- start 2)
-                           (1- start-border)
-                           )))
-                  (if (not start-in-string)
-                      (setq end nil)
-                    (if exc-mode
-                        (if (and start-in-string end-in-string)
-                            ;; If both are in a string and on the same line then
-                            ;; guess this is actually borders, otherwise not.
-                            (unless (= start-in-string end-in-string)
-                              (setq start nil)
-                              (setq end nil))
-                          (when start-in-string (setq start nil))
-                          (when end-in-string (setq end nil)))
-                      ;; Fix-me: ???
+                       ;;(- start 2)
+                       (1- start-border)
+                       )))
+              (if (not start-in-string)
+                  (setq end nil)
+                (if exc-mode
+                    (if (and start-in-string end-in-string)
+                        ;; If both are in a string and on the same line then
+                        ;; guess this is actually borders, otherwise not.
+                        (unless (= start-in-string end-in-string)
+                          (setq start nil)
+                          (setq end nil))
                       (when start-in-string (setq start nil))
-                      ))
-                  (unless (or start end)
-                    (setq exc-mode nil)
-                    (setq borders nil)
-                    (setq parseable-by nil))))))
-          
-          (when (or start end exc-mode borders parseable-by)
-            (mumamo-msgfntfy "--- mumamo-find-possible-chunk %s" (list start end exc-mode borders parseable-by))
-            (list start end exc-mode borders parseable-by))))
-    (error
-     (mumamo-display-error 'mumamo-chunk "%s"
-                           (error-message-string err)))))
+                      (when end-in-string (setq end nil)))
+                  ;; Fix-me: ???
+                  (when start-in-string (setq start nil))
+                  ))
+              (unless (or start end)
+                (setq exc-mode nil)
+                (setq borders nil)
+                (setq parseable-by nil))))))
+
+      (when (or start end exc-mode borders parseable-by)
+        (setq fw-exc-fun (if exc-mode
+                             ;; Fix-me: this is currently correct,
+                             ;; but will change if exc mode in exc
+                             ;; mode is allowed.
+                             fw-exc-end-fun
+                           ;; Fix-me: these should be collected later
+                           ;;fw-exc-start-fun
+                           nil
+                           ))
+        (mumamo-msgfntfy "--- mumamo-find-possible-chunk-new %s" (list start end exc-mode borders parseable-by fw-exc-fun))
+        ;;(message "--- mumamo-find-possible-chunk-new %s" (list start end exc-mode borders parseable-by fw-exc-fun))
+        (when fw-exc-mode
+          (unless (eq fw-exc-mode exc-mode)
+            ;;(message "fw-exc-mode=%s NEQ exc-mode=%s" fw-exc-mode exc-mode)
+            ))
+        ;;(msgtrc "find-poss-new returns %s" (list start end exc-mode borders parseable-by fw-exc-fun find-borders-fun))
+        (when fw-exc-fun
+          (list start end exc-mode borders parseable-by fw-exc-fun find-borders-fun)))))
+  ;;(error (mumamo-display-error 'mumamo-chunk "%s" (error-message-string err)))
+
+  ;;)
+  )
+
+(defun temp-overlays-here ()
+  (interactive)
+  (let* ((here (point))
+         (ovl-at (overlays-at here))
+         (ovl-in (overlays-in here (1+ here)))
+         (ovl-in0 (overlays-in here here))
+         )
+    (with-output-to-temp-buffer (help-buffer)
+      (help-setup-xref (list #'temp-overlays-at) (interactive-p))
+      (with-current-buffer (help-buffer)
+        (insert (format "overlays-at %s:\n%S\n\n" here ovl-at))
+        (insert (format "overlays-in %s-%s:\n%S\n\n" here (1+ here) ovl-in))
+        (insert (format "overlays-in %s-%s:\n%S\n\n" here here ovl-in0))
+        ))))
+(defun temp-cursor-pos ()
+  (interactive)
+  (what-cursor-position t))
+;;(global-set-key [f9] 'temp-cursor-pos)
+(defun temp-test-new-create-chunk ()
+  (interactive)
+  (mumamo-delete-new-chunks)
+  ;;(setq x1 nil)
+  (let (x1
+        (first t))
+    (while (or first x1)
+      (setq first nil)
+      (setq x1 (mumamo-new-create-chunk (mumamo-find-next-chunk-values x1 nil nil nil)))))
+  )
+
+(defun temp-create-last-chunk ()
+  (interactive)
+  (mumamo-new-create-chunk (mumamo-find-next-chunk-values mumamo-last-chunk nil nil nil)))
+
+(defun mumamo-delete-new-chunks ()
+  (setq mumamo-last-chunk nil)
+  (save-restriction
+    (widen)
+    (let ((ovls (overlays-in (point-min) (point-max))))
+      (dolist (ovl ovls)
+        (when (overlay-get ovl 'mumamo-is-new)
+          ;;(msgtrc "delete-overlay %s delete-new-chunks" ovl)
+          (delete-overlay ovl))))))
+
+(defun mumamo-new-create-chunk (new-chunk-values)
+  "Create and return a chunk from NEW-CHUNK-VALUES.
+The values for this are stored in the properties
+below:
+
+The first two are used when the bottom:
+
+- `mumamo-next-major': is nil or the next chunk's major mode.
+- `mumamo-next-chunk-funs': nil or similar to
+  `mumamo-current-chunk-family'.
+- `mumamo-next-end-fun': function that searches for end of AFTER-CHUNK
+
+- `mumamo-next-border-funs': functions that finds borders
+"
+  ;;((1 696 nxhtml-mode nil nil nil nil) (696 nil php-mode nil nil nil nil))
+  ;;(current (list curr-min curr-max curr-major curr-border-min curr-border-max curr-parseable curr-fw-exc-fun))
+  ;;(next    (list next-min next-max next-major next-border-min next-border-max next-parseable next-fw-exc-fun)))
+  ;;(msgtrc "######new-create.chunk.new-chunk-values=%s" new-chunk-values)
+  (when new-chunk-values
+    (let* ((this-values (nth 0 new-chunk-values))
+           (next-values (nth 1 new-chunk-values))
+           (next-major      (nth 0 next-values))
+           (next-end-fun    (nth 1 next-values))
+           (next-border-fun (nth 2 next-values))
+           (next-chunk-funs (nth 3 next-values))
+           (next-depth-diff (nth 4 next-values))
+           (beg         (nth 0 this-values))
+           (end         (nth 1 this-values))
+           (maj         (nth 2 this-values))
+           (bmin        (nth 3 this-values))
+           (bmax        (nth 4 this-values))
+           (pable       (nth 5 this-values))
+           (after-chunk (nth 7 this-values))
+           (is-closed   (nth 8 this-values))
+           ;;(is-closed (and end (< 1 end)))
+           (after-chunk-depth (when after-chunk
+                                (overlay-get after-chunk 'mumamo-depth)))
+           (depth-diff (if after-chunk
+                           (overlay-get after-chunk 'mumamo-next-depth-diff)
+                         1))
+           (depth (if after-chunk-depth
+                      (+ after-chunk-depth depth-diff)
+                    0))
+           ;;(fw-funs (nth 6 this-values))
+           ;;(borders-fun (nth 7 this-values))
+           ;;(is-closed (when (or end (eq maj (mumamo-main-major-mode))) t))
+           (use-end (if end end (1+ (buffer-size)))) ;(save-restriction (widen) (point-max))))
+           (this-chunk (when (and (<= beg use-end)
+                                  ;; Avoid creating two empty overlays
+                                  ;; at the end - but what if we are
+                                  ;; not creating, just changing the
+                                  ;; last overlay ...
+                                  ;;
+                                  ;; (not (and (= beg use-end)
+                                  ;;           (= use-end (1+ (buffer-size)))
+                                  ;;           after-chunk
+                                  ;;           (= 0 (- (overlay-end after-chunk) (overlay-start after-chunk)))
+                                  ;;           ))
+                                  )
+                         (when (= beg 1)
+                           (if (= use-end 1)
+                               (assert (eq (mumamo-main-major-mode) maj) t)
+                             (if after-chunk ;; not first
+                                 (assert (not (eq (mumamo-main-major-mode) maj)) t)
+                               (assert (eq (mumamo-main-major-mode) maj) t))))
+                         (make-overlay beg use-end nil nil (not is-closed))))
+           ;; Fix-me: move to mumamo-find-next-chunk-values
+           (this-border-fun (when (and this-chunk after-chunk)
+                              ;;(overlay-get after-chunk 'mumamo-next-border-fun)
+                              (mumamo-chunk-car after-chunk 'mumamo-next-border-fun)
+                              ))
+           (this-borders (when this-border-fun
+                           ;;(msgtrc "(funcall %s %s %s %s)" this-border-fun beg end maj)
+                           (funcall this-border-fun beg end maj)))
+           ;; Fix-me, check: there is no first border when moving out.
+           (this-borders-min (when (= 1 depth-diff)
+                               (nth 0 this-borders)))
+           ;; Fix-me, check: there is no bottom border when we move
+           ;; further "in" since borders are now always inside
+           ;; sub-chunks (if I remember correctly...).
+           (this-borders-max (when (and is-closed
+                                        (/= 1 next-depth-diff))
+                               (nth 1 this-borders)))
+           )
+      ;;(msgtrc "created %s, major=%s" this-chunk maj)
+      (when (> depth 4) (error "Chunk depth > 4"))
+      (setq bmin nil)
+      (setq bmax nil)
+      (when this-borders-min (setq bmin (- this-borders-min beg)))
+      (when this-borders-max (setq bmax (- end this-borders-max)))
+      ;;(when after-chunk (message "after-chunk.end=%s, beg=%s, end=%s" (overlay-end after-chunk) beg end))
+      ;;(message "fw-funs=%s" fw-funs)
+      (unless (or (not next-chunk-funs) (eq 'none next-chunk-funs)) (error "next-chunk-funs not 'none=%s" next-chunk-funs))
+      (when this-chunk
+        (overlay-put this-chunk 'mumamo-is-new t)
+        (overlay-put this-chunk 'face (mumamo-background-color depth))
+        (overlay-put this-chunk 'mumamo-depth depth)
+        ;; Values for next chunk
+        (overlay-put this-chunk 'mumamo-next-depth-diff next-depth-diff)
+        (assert (symbolp next-major) t)
+        (overlay-put this-chunk 'mumamo-next-major next-major)
+        (overlay-put this-chunk 'mumamo-next-chunk-funs next-chunk-funs)
+        ;; Values for this chunk
+        (overlay-put this-chunk 'mumamo-is-closed is-closed)
+        (overlay-put this-chunk 'syntax-min-d bmin)
+        (overlay-put this-chunk 'syntax-max-d bmax)
+        (overlay-put this-chunk 'mumamo-prev-chunk after-chunk)
+        (when after-chunk (overlay-put after-chunk 'mumamo-next-chunk this-chunk))
+
+        ;;(msgtrc "\n<<<<<<<<<<<<<<<<< next-depth-diff/depth-diff=%s/%s, maj=%s, after-chunk=%s" next-depth-diff depth-diff maj after-chunk)
+        ;;(overlay-put this-chunk 'mumamo-next-end-fun next-end-fun)
+        (cond
+         ((= 1 next-depth-diff)
+          (mumamo-chunk-push this-chunk 'mumamo-next-border-fun next-border-fun)
+          (mumamo-chunk-push this-chunk 'mumamo-next-end-fun next-end-fun))
+         ((= -1 next-depth-diff)
+          (mumamo-chunk-pop this-chunk 'mumamo-next-border-fun)
+          (mumamo-chunk-pop  this-chunk 'mumamo-next-end-fun)
+          )
+         (t (error "next-depth-diff=%s" next-depth-diff)))
+        ;;(msgtrc "mumamo-next-end-fun=%S" (overlay-get this-chunk 'mumamo-next-end-fun))
+
+        (cond
+         ((= 1 depth-diff)
+          (mumamo-chunk-push this-chunk 'mumamo-major-mode maj))
+         ((= -1 depth-diff)
+          (mumamo-chunk-pop  this-chunk 'mumamo-major-mode)
+          )
+         (t (error "depth-diff=%s" depth-diff)))
+
+        (overlay-put this-chunk 'mumamo-parseable-by pable)
+        (overlay-put this-chunk 'created (current-time-string))
+        (mumamo-update-chunk-margin-display this-chunk)
+        (setq mumamo-last-chunk this-chunk) ;; Use this chunk!!!!
+        ;; Get syntax-begin-function for syntax-ppss:
+        (let* ((syntax-begin-function
+                (mumamo-with-major-mode-fontification maj
+                  ;; Do like in syntax.el:
+                  '(if syntax-begin-function
+                       (progn
+                         syntax-begin-function)
+                     (when (and (not syntax-begin-function)
+                                ;; fix-me: How to handle boundp here?
+                                (boundp 'font-lock-beginning-of-syntax-function)
+                                font-lock-beginning-of-syntax-function)
+                       font-lock-beginning-of-syntax-function)))))
+          (mumamo-msgfntfy "Got syntax-begin-function, modified=%s" (buffer-modified-p))
+          (overlay-put this-chunk 'syntax-begin-function syntax-begin-function))
+        )
+      ;;(msgtrc "Created %s, this=%s, next=%s" this-chunk this-values next-values)
+      this-chunk
+      )
+    ))
+
+(defun mumamo-update-chunk-margin-display (chunk)
+  "Set before-string of CHUNK as spec by `mumamo-margin-use'."
+  ;; Fix-me: This is not displayed. Emacs bug?
+  ;;(overlay-put this-chunk 'before-string `((margin left-margin) ,(format "%d %s" depth maj)))
+  (if (not mumamo-margin-info-mode)
+      (overlay-put chunk 'before-string nil)
+    (let* ((depth (overlay-get chunk 'mumamo-depth))
+           (maj   (mumamo-chunk-car chunk 'mumamo-major-mode))
+           (strn (propertize (format "%d" depth)
+                             'face (list :inherit (or (mumamo-background-color depth)
+                                                      'default)
+                                         :foreground "#505050"
+                                         :underline t
+                                         :slant 'normal
+                                         :weight 'normal
+                                         )))
+           (maj-name (substring (symbol-name maj) 0 -5))
+           (strm (propertize maj-name 'face
+                             (list :foreground "#a0a0a0" :underline nil
+                                   :background (frame-parameter nil 'background-color)
+                                   :weight 'normal
+                                   :slant 'normal)))
+           str
+           (margin (mumamo-margin-used)))
+      (when (> (length strm) 5) (setq strm (substring strm 0 5)))
+      (setq str (concat strn
+                        strm
+                        (propertize " " 'face 'default)
+                        ))
+      (overlay-put chunk 'before-string
+                   (propertize " " 'display
+                               `((margin ,margin) ,str))))))
+
+(defun mumamo-update-chunks-margin-display (buffer)
+  "Apply `update-chunk-margin-display' to all chunks in BUFFER."
+  (with-current-buffer buffer
+    (save-restriction
+      (widen)
+      (let ((chunk (mumamo-find-chunks 1 "margin-disp")))
+        (while chunk
+          (mumamo-update-chunk-margin-display chunk)
+          (setq chunk (overlay-get chunk 'mumamo-next-chunk)))))))
+
+(defvar mumamo-margin-used nil)
+(make-variable-buffer-local 'mumamo-margin-used)
+(put 'mumamo-margin-used 'permanent-local t)
+
+(defun mumamo-margin-used ()
+  (setq mumamo-margin-used
+        (if (and (boundp 'linum-mode) linum-mode) 'right-margin (nth 0 mumamo-margin-use))))
+
+(defun mumamo-set-window-margins-used (win)
+  "Set window margin according to `mumamo-margin-use'."
+  ;; Fix-me: old-margin does not work, break it up
+  (let* ((old-margin mumamo-margin-used)
+         (margin    (mumamo-margin-used))
+         (width  (nth 1 mumamo-margin-use))
+         (both-widths (window-margins win))
+         (old-left (eq old-margin 'left-margin))
+         (left (eq margin 'left-margin)))
+    ;; Change only the margin we used!
+    (if (not mumamo-margin-info-mode)
+        (set-window-margins win
+                            (if left nil (car both-widths))
+                            (if (not left) nil (cdr both-widths)))
+      ;;(msgtrc "set-window-margins-used margin-info-mode=t")
+      (case margin
+        ('left-margin  (set-window-margins win width (when old-left (cdr both-widths))))
+        ('right-margin (set-window-margins win (car both-widths) width))))))
+
+(defun mumamo-new-chunk-value-min (values)
+  (let ((this-values (nth 0 values)))
+    (nth 0 this-values)))
+
+(defun mumamo-new-chunk-value-max (values)
+  (let ((this-values (nth 0 values)))
+    (nth 1 this-values)))
+
+(defun mumamo-new-chunk-equal-chunk-values (chunk values)
+  (let* (;; Chunk
+         (chunk-is-new          (overlay-get chunk 'mumamo-is-new))
+         (chunk-is-closed       (overlay-get chunk 'mumamo-is-closed))
+         (chunk-next-major      (overlay-get chunk 'mumamo-next-major))
+         (chunk-next-end-fun    (mumamo-chunk-car chunk 'mumamo-next-end-fun))
+         (chunk-next-border-fun (mumamo-chunk-car chunk 'mumamo-next-border-fun))
+         (chunk-next-chunk-funs (overlay-get chunk 'mumamo-next-chunk-funs))
+         (chunk-next-chunk-diff (overlay-get chunk 'mumamo-next-depth-diff))
+         (chunk-beg (overlay-start chunk))
+         (chunk-end (overlay-end chunk))
+         (chunk-bmin       (overlay-get chunk 'mumamo-syntax-min-d))
+         (chunk-bmax       (overlay-get chunk 'mumamo-syntax-max-d))
+         (chunk-prev-chunk (overlay-get chunk 'mumamo-prev-chunk))
+         (chunk-major-mode (mumamo-chunk-car chunk 'mumamo-major-mode))
+         (chunk-pable      (overlay-get chunk 'mumamo-parseable-by))
+         (chunk-depth-diff (if chunk-prev-chunk
+                               (overlay-get chunk-prev-chunk 'mumamo-next-depth-diff)
+                             0))
+         ;; Values
+         (this-values (nth 0 values))
+         (next-values (nth 1 values))
+         (values-next-major      (nth 0 next-values))
+         (values-next-end-fun    (nth 1 next-values))
+         (values-next-border-fun (nth 2 next-values))
+         (values-next-chunk-funs (nth 3 next-values))
+         (values-next-depth-diff (nth 4 next-values))
+         (values-beg         (nth 0 this-values))
+         (values-end         (nth 1 this-values))
+         (values-major-mode  (nth 2 this-values))
+         (values-bmin        (nth 3 this-values))
+         (values-bmax        (nth 4 this-values))
+         (values-pable       (nth 5 this-values))
+         (values-prev-chunk  (nth 7 this-values))
+         (values-is-closed   (nth 8 this-values))
+         ;;(values-is-closed   (when values-end t))
+         )
+    ;;(msgtrc "values=%S" values)
+    (and t ;chunk-is-new
+         (eq chunk-next-major         values-next-major)
+
+         ;; Can't check chunk-next-end-fun or chunk-next-border-fun
+         ;; here since they are fetched from prev chunk:
+         ;;(progn (message "eq-c-v: here b: %s /= %s" chunk-next-end-fun values-next-end-fun) t)
+         ;;(eq chunk-next-end-fun       values-next-end-fun)
+         ;;(progn (message "eq-c-v: here c, %s /= %s" chunk-next-border-fun values-next-border-fun) t)
+         ;;(eq chunk-next-border-fun    values-next-border-fun)
+
+         ;;(progn (message "eq-c-v: here a, %s /= %s" chunk-next-chunk-funs values-next-chunk-funs) t)
+         (equal chunk-next-chunk-funs values-next-chunk-funs)
+         (= chunk-next-chunk-diff     values-next-depth-diff)
+         (= chunk-beg values-beg)
+         ;;(progn (message "eq-c-v: here b") t)
+         (and (equal chunk-is-closed values-is-closed)
+              (or (not chunk-is-closed)
+                  (= chunk-end values-end)))
+         ;;(progn (message "eq-c-v: here c, %s /= %s" chunk-major-mode values-major-mode) t)
+         (or (= -1 chunk-depth-diff)
+             (eq chunk-major-mode values-major-mode))
+         ;;(progn (message "eq-c-v: here d") t)
+         (equal chunk-pable values-pable)
+         ;;(progn (message "eq-c-v: here e") t)
+         (eq chunk-prev-chunk values-prev-chunk)
+         ;;(progn (message "eq-c-v: here f") t)
+         (eq chunk-is-closed values-is-closed)
+         ;; fix-me: bmin bmax
+         ;;(and chunk-bmin values-bmin (= chunk-bmin values-bmin))
+         ;;(and chunk-bmax values-bmax (= chunk-bmax values-bmax))
+         )
+    ))
+
+(defvar mumamo-sub-chunk-families nil
+  "Chunk dividing routines for sub chunks.
+A major mode in a sub chunk can inherit chunk dividing routines
+from multi major modes.  This is the way chunks in chunks is
+implemented.
+
+This variable is an association list with entries of the form
+
+  \(CHUNK-MAJOR CHUNK-FAMILY)
+
+where CHUNK-MAJOR is the major mode in a chunk and CHUNK-FAMILY
+is a chunk family \(ie the third argument to
+`define-mumamo-multi-major-mode'.
+
+You can use the function `mumamo-inherit-sub-chunk-family' to add
+to this list.")
+
+;;(mumamo-get-sub-chunk-funs 'html-mode)
+(defun mumamo-get-sub-chunk-funs (major)
+  "Get chunk family sub chunk with major mode MAJOR."
+  (let ((rec (assoc major mumamo-sub-chunk-families)))
+    (caddr (cadr rec))))
+
+(defun mumamo-inherit-sub-chunk-family (multi-major)
+  "Inherit chunk dividing routines from multi major modes.
+Add chunk family from multi major mode MULTI-MAJOR to
+`mumamo-inherit-chunk-family'."
+  (let* ((chunk-family (get multi-major 'mumamo-chunk-family))
+         (major      (nth 1 chunk-family)))
+    (let ((major-mode major))
+      (when (derived-mode-p 'nxml-mode)
+        (error "Major mode %s major can't be used in sub chunks" major)))
+    (add-to-list 'mumamo-sub-chunk-families (list major chunk-family))))
+
+(defun mumamo-find-next-chunk-values (after-chunk from after-change-max chunk-at-after-change)
+  "Search forward for start of next chunk.
+Return a list with chunk values for next chunk after AFTER-CHUNK
+and some values for the chunk after it.
+
+For the first chunk AFTER-CHUNK is nil.  Then use
+`mumamo-current-chunk-family' to get next chunk.
+
+;; Otherwise use the values cached in AFTER-CHUNK for how to search
+;; for next chunk. The values for the next chunk are stored in the
+;; property `mumamo-next-values' in AFTER-CHUNK. The values are a
+;; list:
+
+;;   \(NEXT-MAJOR END-FUNS NEXT-CHUNK-FUNS)
+
+;; - NEXT-MAJOR is nil or the next chunk's major mode.
+;; - END-FUNS is nil or a list (END-FUN BORDER-FUN):
+;;   - END-FUN searches for end of this chunk
+;;   - BORDER-FUN finds borders
+;; - NEXT-CHUNK-FUNS is nil or similar to
+;; END-FUNS and NEXT-CHUNK-FUNS are used to search for the end of
+;; the current chunk.
+
+Otherwise use the values cached in AFTER-CHUNK for how to search
+for next chunk.  See `mumamo-new-create-chunk' for more
+information.
+
+"
+  ;;(msgtrc "(find-next-chunk-values %s %s %s %s)" after-chunk from after-change-max chunk-at-after-change)
+  (let* (;;(mumamo-find-possible-chunk-new t)
+         (here (point))
+         (max (point-max))
+         (after-chunk-valid (and after-chunk
+                                 (eq (overlay-buffer after-chunk)
+                                     (current-buffer))))
+         (after-chunk-is-closed (when after-chunk-valid (overlay-get after-chunk 'mumamo-is-closed)))
+         (use-syntax-min (or (and after-chunk-valid
+                                  (+ (overlay-start after-chunk)
+                                     (or (overlay-get after-chunk 'syntax-min-d)
+                                         0)))
+                             1))
+         (pos (or nil ;from
+                  (if after-chunk-valid
+                      (if after-chunk-is-closed
+                          (1+ (overlay-end after-chunk))
+                        (overlay-start after-chunk))
+                    1)))
+         (main-chunk-funs (let ((chunk-info (cdr mumamo-current-chunk-family)))
+                            (cadr chunk-info)))
+         (after-next-chunk-funs (when after-chunk-valid (overlay-get after-chunk 'mumamo-next-chunk-funs)))
+         ;; Note that "curr-*" values are fetched from "mumamo-next-*" values in after-chunk
+         (curr-major (if after-chunk-valid
+                         (or (overlay-get after-chunk 'mumamo-next-major)
+                             ;;(mumamo-main-major-mode))
+                             (let ((after-after-chunk (overlay-get after-chunk 'mumamo-prev-chunk)))
+                               (msgtrc "after-after-chunk...=%s" after-after-chunk)
+                               (unless after-after-chunk (error "after-after-chunk is nil"))
+                               (mumamo-chunk-car after-after-chunk 'mumamo-major-mode)))
+                       (mumamo-main-major-mode)))
+         (curr-chunk-funs
+          (if (eq curr-major (mumamo-main-major-mode))
+              main-chunk-funs
+            ;;(msgtrc "find-next-chunk-values:get-sub-chunk-funs %s" curr-major)
+            (mumamo-get-sub-chunk-funs curr-major)))
+          ;; (if (and after-chunk-valid
+          ;;          after-next-chunk-funs)
+          ;;     (if (listp after-next-chunk-funs)
+          ;;         after-next-chunk-funs
+          ;;       nil)
+          ;;   main-chunk-funs))
+         (curr-end-fun (when after-chunk-valid
+                         (mumamo-chunk-car after-chunk 'mumamo-next-end-fun)))
+         ;; Fix-me: there is obviously something wrong below...
+         curr-border-fun
+         (curr-border-fun (when curr-end-fun (mumamo-chunk-car after-chunk 'mumamo-next-border-fun)))
+         curr-max
+         next-max
+         curr-max-found
+         (curr-min (if (= pos 1) 1 (1- pos)))
+         next-min
+         border-min
+         border-max
+         parseable
+         curr-border-min
+         next-border-min
+         curr-border-max
+         next-border-max
+         curr-parseable
+         next-parseable
+         fw-exc-fun
+         curr-fw-exc-fun
+         next-fw-exc-fun
+         border-fun
+         next-major
+         curr-end-fun-end
+         (next-chunk-funs 'none)
+         next-border-fun
+         curr-is-closed
+         next-depth-diff
+         r-point
+         )
+    ;;(msgtrc "find-next-chunk-values:here a, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+    ;;(msgtrc "find-next-chunk-values:(when (>= %s %s)" max pos)
+    (when (>= max pos)
+      ;; Fix-me: like mumamo-create-chunk-values-at, but simplified:
+      ;;(message "  curr-chunk-funs=%s" curr-chunk-funs)
+      (when curr-end-fun
+        ;;(message "curr-end-fun=%s" curr-end-fun)
+        ;; Subtract 2 from the position here to find end. Fix-me: is
+        ;; this really correct???
+
+        ;; If after-change-max is non-nil here then this function has
+        ;; been called after changes that are all in one chunk. We
+        ;; need to check if the chunk right border have been changed,
+        ;; but we do not have to look much longer than the max point
+        ;; of the change.
+        ;;(message "set after-change-max nil")
+        ;;(setq after-change-max nil)
+        (let* ((use-max (if after-change-max
+                            (+ after-change-max 100)
+                          max))
+               (use-min (max (- pos 2) (point-min)))
+               (syntax-min-max (when curr-border-fun (funcall curr-border-fun
+                                                              (overlay-end after-chunk)
+                                                              nil nil)))
+               (syntax-min (or (car syntax-min-max)
+                               (when after-chunk (overlay-end after-chunk))
+                               1)))
+          (setq curr-end-fun-end (funcall curr-end-fun use-min use-max))
+          ;; Fix-me: Check if old chunk is valid. It is not valid if
+          ;; depth-diff = -1 and curr-end-fun-end is not the same as
+          ;; before.
+
+          ;;(msgtrc "find-next-chunk-values:Calling (curr-end-fun=%s %s %s), point=%s/%s=>%s" curr-end-fun use-min use-max (point) here curr-end-fun-end)
+          ;; Fix-me: this test should also be made for other chunks
+          ;; searches, but this catches most problems I think.
+          ;;(msgtrc "find-next-chunk-values:here c, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+          (or (not curr-end-fun-end)
+              ;;(mumamo-end-in-code syntax-min (1- curr-end-fun-end) curr-major)
+
+              ;; Fix-me: The bug in wiki-090804-js.html indicates that
+              ;; we should not subtract 1 here.  The subchunk there
+              ;; ends with </script> and this can't be in column 1
+              ;; when the line before ends with a // style js comment
+              ;; unless we don't subtract 1.
+              ;;
+              ;; However wiki-strange-hili-080629.html does not work
+              ;; then because then the final " in style="..." is
+              ;; included in the scan done in mumamo-end-in-code.
+              ;;
+              ;; The solution is to check for the syntax borders here.
+              (let* ((syn2-min-max (when curr-border-fun
+                                     (funcall curr-border-fun
+                                              (overlay-end after-chunk)
+                                              curr-end-fun-end
+                                              nil)))
+                     (syntax-max (or (cadr syn2-min-max)
+                                     curr-end-fun-end)))
+                ;;(mumamo-end-in-code syntax-min (- curr-end-fun-end 1) curr-major)
+                (mumamo-end-in-code syntax-min syntax-max curr-major)
+                )
+              (setq curr-end-fun-end nil))
+          ;; Use old result if valid
+          (and nil ;(not curr-end-fun-end)
+               chunk-at-after-change
+               (= -1 (overlay-get chunk-at-after-change 'mumamo-next-depth-diff))
+               (setq curr-end-fun-end (overlay-end chunk-at-after-change)))
+          ;;(msgtrc "find-next-chunk-values:curr-end-fun-end after end-in-code=%s" curr-end-fun-end)
+          ))
+      ;;(msgtrc "find-next-chunk-values:here d, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+      (when (listp curr-chunk-funs)
+        ;;(msgtrc "find-next-chunk-values:curr-chunk-funs=%s" curr-chunk-funs)
+        (setq r-point (point))
+        (dolist (fn curr-chunk-funs)
+          ;;(msgtrc "find-next-chunk-values:before (r (funcall fn pos pos max)), fn=%s pos=%s, max=%s" fn pos max)
+          (assert (= r-point (point)) t)
+          (let* (
+                 ;;(r (funcall fn pos (point-min) (point-max)))
+                 (r (funcall fn pos pos max))
+                 (rmin        (nth 0 r))
+                 (rmax        (nth 1 r))
+                 (rmajor-sub  (nth 2 r))
+                 (rborder     (nth 3 r))
+                 (rparseable  (nth 4 r))
+                 (rfw-exc-fun (nth 5 r))
+                 (rborder-fun (nth 6 r))
+                 (rborder-min (when rborder (nth 0 rborder)))
+                 (rborder-max (when rborder (nth 1 rborder)))
+                 (rmin-found rmin))
+            ;;(msgtrc "find-next-chunk-values:fn=%s, r=%s" fn r)
+            (goto-char r-point)
+            (assert (= r-point (point)) t)
+            (when r
+              ;;(unless (or rmin rmax rmajor-sub rborder rparseable rfw-exc-fun rborder-fun)
+              ;;;(unless (or rmin rmax rmajor-sub rparseable rfw-exc-fun rborder-fun)
+              (unless (or rmin rmax)
+                (error "Bad r=%s, fn=%s" r fn))
+              (unless rfw-exc-fun
+                (error "No fw-exc-fun returned from fn=%s, r=%s" fn r))
+              (unless rmajor-sub
+                (error "No major mode for sub chunk, fn=%s, r=%s" fn r))
+              )
+            (when r
+              (mumamo-msgfntfy "  fn=%s, r=%s" fn r)
+              ;;(message "  fn=%s, r=%s, max=%s" fn r max)
+              (unless rmin (setq rmin (point-max)))
+              ;;(unless rmax (setq rmax (point-min)))
+              ;; Do not allow zero length chunks
+              (unless rmax (setq rmax (point-max)))
+              (unless (and (> rmin 1)
+                           rmax
+                           (= rmin rmax))
+                ;; comparision have to be done differently if we are in an
+                ;; exception part or not.  since we are doing this from top to
+                ;; bottom the rules are:
+                ;;
+                ;; - exception parts always outrules non-exception part.  when
+                ;;   in exception part the min start point should be used.
+                ;; - when in non-exception part the max start point and the
+                ;;   min end point should be used.
+                ;;
+                ;; check if first run:
+
+                ;; Fix-me: there is some bug here when borders are not
+                ;; included and are not 0 width.
+                (if (not next-min)
+                    (progn
+                      (setq next-min rmin)
+                      (setq border-min rborder-min)
+                      (setq next-max rmax)
+                      (setq border-max rborder-max)
+                      (setq curr-max-found rmin-found)
+                      (setq parseable rparseable)
+                      (setq fw-exc-fun rfw-exc-fun)
+                      (setq border-fun rborder-fun)
+                      (setq next-major rmajor-sub))
+                  (if rmajor-sub
+                      (if next-major
+                          (when (or (not next-min)
+                                    (< rmin next-min))
+                            (setq next-min rmin)
+                            (setq border-min rborder-min)
+                            (when rmax (setq max rmax))
+                            (setq border-max rborder-max)
+                            (when rmin-found (setq curr-max-found t))
+                            (setq parseable rparseable)
+                            (setq fw-exc-fun rfw-exc-fun)
+                            (setq border-fun rborder-fun)
+                            (setq next-major rmajor-sub))
+                        (setq next-min rmin)
+                        (setq border-min rborder-min)
+                        (when rmax (setq max rmax))
+                        (setq border-max rborder-max)
+                        (when rmin-found (setq curr-max-found t))
+                        (setq parseable rparseable)
+                        (setq fw-exc-fun rfw-exc-fun)
+                        (setq border-fun rborder-fun)
+                        (setq next-major rmajor-sub))
+                    (unless next-major
+                      (when (> next-min rmin)
+                        (setq next-min rmin)
+                        (setq border-min rborder-min))
+                      (when (and rmax max
+                                 (> rmax max))
+                        ;;(setq max-found rmin-found)
+                        (when rmin-found (setq curr-max-found t))
+                        (when rmax (setq max rmax))
+                        (setq border-max rborder-max))
+                      ))))
+              (mumamo-msgfntfy "next-min/max=%s/%s border=%s/%s pos=%s" next-min max border-min border-max pos)
+              ;; check!
+              (when (and next-min max)
+                (assert (>= next-min pos) t)
+                (assert (<= pos max) t)
+                (when border-min
+                  (assert (< next-min border-min) t)
+                  (assert (<= border-min max) t))
+                (when border-max
+                  (assert (<= next-min border-max) t)
+                  (assert (< border-max max) t))))
+            )))
+      (goto-char here)
+      (setq curr-max-found (or curr-max-found curr-end-fun-end))
+      (when curr-max-found
+        (setq curr-max (if max max (point-max)))
+        (setq curr-max (min (if next-min next-min curr-max)
+                            (if curr-end-fun-end curr-end-fun-end curr-max))))
+      ;;(msgtrc "find-next-chunk-values:here A, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+      (when border-min (setq next-border-min border-min))
+      (when border-max (setq next-border-max border-max))
+      (setq next-fw-exc-fun fw-exc-fun)
+      (setq next-border-fun border-fun)
+      (setq curr-parseable parseable)
+      (setq curr-border-min border-min)
+      (setq curr-border-max border-max)
+      (setq next-depth-diff (if (and curr-max curr-end-fun-end
+                                     (= curr-max curr-end-fun-end))
+                                -1
+                              1))
+      ;;(msgtrc "find-next-chunk-values:here B, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+      (unless next-major (setq next-chunk-funs nil))
+      (when (= -1 next-depth-diff)
+        (setq next-major (mumamo-chunk-car after-chunk 'mumamo-major-mode)))
+      (when after-chunk-valid
+        ;;(msgtrc "find-next-chunk-values:here C, curr-min=%s, after-chunk=%s" curr-min after-chunk)
+        (unless (or (not after-chunk-is-closed)
+                    (= curr-min (overlay-end after-chunk)))
+          (error "curr-min is not right after after-chunk"))
+        ;;(msgtrc "find-next-chunk-values:here D")
+        (when curr-max
+          (unless (>= curr-max curr-min)
+            (error "curr-max is not >= curr-min"))))
+      ;;(msgtrc "find-next-chunk-values:here E")
+      (setq curr-is-closed (and curr-max (< 1 curr-max)))
+      ;;(msgtrc "find-next-chunk-values:curr-is-closed=%s" curr-is-closed)
+      (when (and curr-max (= 1 curr-max))
+        (assert (eq curr-major (mumamo-main-major-mode)) t))
+      (assert (symbolp next-major) t)
+      (let ((current (list curr-min curr-max curr-major curr-border-min curr-border-max curr-parseable
+                           curr-chunk-funs after-chunk curr-is-closed))
+            (next    (list next-major next-fw-exc-fun next-border-fun next-chunk-funs next-depth-diff)))
+        ;;(msgtrc "find-next-chunk-values=> current=%s, next=%s" current next)
+        (list current next)))))
 
 ;; Fix-me: This should check if the new chunk should be
 ;; parsed or not
@@ -3365,15 +4209,18 @@ also `mumamo-quick-static-chunk'."
 ;;       (mumamo-chunk-major-mode xml-chunk)))
 
 (defun mumamo-valid-nxml-point (pos)
-  "Return non-nil if point should be in valid XML chunk."
+  "Return non-nil if position POS is in an XML chunk."
   (memq 'nxml-mode (get-text-property pos 'mumamo-parseable-by)))
 
 (defun mumamo-valid-nxml-chunk (chunk)
   "Return t if chunk CHUNK should be valid XML."
   (when chunk
     (let ((major-mode (mumamo-chunk-major-mode chunk))
+          (region (overlay-get chunk 'mumamo-region))
           (parseable-by (overlay-get chunk 'mumamo-parseable-by)))
-      (or (derived-mode-p 'nxml-mode)
+      ;;(message "mumamo-valid-nxml-chunk: major-mode=%s, parseble-by=%s" major-mode parseable-by)
+      (or region
+          (derived-mode-p 'nxml-mode)
           (memq 'nxml-mode parseable-by)))))
 
 ;; A good test case for the use of this is the troublesome code in the
@@ -3384,40 +4231,72 @@ also `mumamo-quick-static-chunk'."
 ;; as a string separator?
 ;;
 ;; <?php header("Content-type:application/xml; charset=utf-8"); echo '<?xml version="1.0" encoding="utf-8"?>'; ?>
-(defun mumamo-end-chunk-is-valid (syntax-start syntax-end major)
-  "Return t if SYNTAX-END of chunk is not in a string or comment.
-Use MAJOR mode when testing this and assume that sexp syntax is
-nil at SYNTAX-START."
+;;
+;; However there are the reverse cases also, in lines like
+;;
+;;   href="<?php $this->url($url); ?>"
+;;   <!--    <td><?php insert_a_lot_of_html(); ?>
+;;
+;; These are supposedly handled by using this test at the right
+;; place... However it is not very clear in all cases whether chunk
+;; dividers in comments and strings should be valid or not...
+;;
+;; For example in the first case above the php divider should be
+;; valid.  Probably it should be that in the second case too, but how
+;; should mumamo know that?
+;;
+;; Fix-me: I think a per "chunk divider function + context" flag is
+;; needed to handle this. Probably this will work the same for all web
+;; dev things, ie the opening sub chunk divider is ALWAYS
+;; valid. However that is not true for things like CSS, Javascript etc
+;; in (X)HTML.
+
+(defun mumamo-end-in-code (syntax-start syntax-end major)
+  "Return t if possible syntax end is not in a string or comment.
+Assume that the sexp syntax is nil at SYNTAX-START return t if
+position SYNTAX-END is not in a string or comment according to
+the sexp syntax using major mode MAJOR."
   ;; Fix-me: This can't always detect html comments: <!--
   ;; ... -->. Could this be solved by RMS suggestion with a
   ;; function/defmacro that binds variables to their global values?
   (mumamo-msgfntfy "point-min,max=%s,%s syntax-start,end=%s,%s, major=%s" (point-min) (point-max) syntax-start syntax-end major)
+  ;;(msgtrc "end-in-code:here a  after-chunk=%s" (when (boundp 'after-chunk) after-chunk))
   (assert (and syntax-start syntax-end) t)
-  (save-restriction
-    (widen)
-    (mumamo-with-major-mode-fontification major
-      `(progn
-         (let (ppss ret)
+  (let ((doesnt-here (point))
+        doesnt-ret)
+    (save-restriction
+      (widen)
+      ;;(msgtrc "end-in-code:here a2  after-chunk=%s" (when (boundp 'after-chunk) after-chunk))
+      (mumamo-with-major-mode-fontification major
+        `(let (ppss)
            ;; fix-me: Use main major mode, and `syntax-ppss'. Change the
            ;; defadvice of this to make that possible.
+           ;;(msgtrc "end-in-code:here b  after-chunk=%s" (when (boundp 'after-chunk) after-chunk))
            (setq ppss (parse-partial-sexp ,syntax-start (+ ,syntax-end 0)))
+           ;;(msgtrc "end-in-code %s %s %s:ppss=%S" ,syntax-start ,syntax-end ',major ppss)
+           ;;(msgtrc "end-in-code:here c  after-chunk=%s" (when (boundp 'after-chunk) after-chunk))
            ;; If inside a string or comment then the end marker is
            ;; invalid:
+           ;;(msgtrc "mumamo-end-in-code:ppss=%s" ppss)
            (if (or (nth 3 ppss)
                    (nth 4 ppss))
                (progn
-                 ;;(message "invalid end, syntax-end =%s" syntax-end)
-                 nil
-                 t)
-             ;;(message "valid end, syntax-end =%s" syntax-end)
-             t))))))
+                 ;;(msgtrc "invalid end, syntax-end =%s" syntax-end)
+                 (setq doesnt-ret nil)
+                 )
+             (setq doesnt-ret t)
+             ;;(msgtrc "valid end, syntax-end =%s" syntax-end)
+             ))))
+    (goto-char doesnt-here)
+    ;;(msgtrc "end-in-code:ret=%s" doesnt-ret)
+    doesnt-ret))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Easy chunk defining
 
 (defun mumamo-quick-static-chunk (pos min max
-                                  begin-mark end-mark inc mode
-                                  mark-is-border)
+                                      begin-mark end-mark inc mode
+                                      mark-is-border)
   "Quick way to make a chunk function with static dividers.
 Here is an example of how to use it:
 
@@ -3434,57 +4313,56 @@ If INC is non-nil then the dividers are included in the chunks.
 MODE should be the major mode for the chunk.
 
 If MARK-IS-BORDER is non-nil then the marks are made borders."
-
-;;See also `mumamo-easy-make-chunk-fun'."
   (mumamo-msgfntfy "quick.pos=%s min,max=%s,%s begin-mark/end=%s/%s mark-is-border=%s" pos min max begin-mark end-mark mark-is-border)
   (let ((search-bw-exc-start
-         (lambda (pos min)
-           (let ((exc-start
-                  (if inc
-                      (mumamo-chunk-start-bw-str-inc pos min begin-mark)
-                    (mumamo-chunk-start-bw-str pos min begin-mark))))
-             (when (and exc-start
-                        (<= exc-start pos))
-               (cons exc-start mode)))))
+         `(lambda (pos min)
+            (let ((exc-start
+                   (if ,inc
+                       (mumamo-chunk-start-bw-str-inc pos min begin-mark)
+                     (mumamo-chunk-start-bw-str pos min begin-mark))))
+              (when (and exc-start
+                         (<= exc-start pos))
+                (cons exc-start mode)))))
         (search-bw-exc-end
-         (lambda (pos min)
-           (if inc
-               (mumamo-chunk-end-bw-str-inc pos min end-mark)
-             (mumamo-chunk-end-bw-str pos min end-mark))))
+         `(lambda (pos min)
+            (if ,inc
+                (mumamo-chunk-end-bw-str-inc pos min ,end-mark)
+              (mumamo-chunk-end-bw-str pos min ,end-mark))))
         (search-fw-exc-start
-         (lambda (pos max)
-           (if inc
-               (mumamo-chunk-start-fw-str-inc pos max begin-mark)
-             (mumamo-chunk-start-fw-str pos max begin-mark))))
+         `(lambda (pos max)
+            (if ,inc
+                (mumamo-chunk-start-fw-str-inc pos max ,begin-mark)
+              (mumamo-chunk-start-fw-str pos max ,begin-mark))))
         (search-fw-exc-end
-         (lambda (pos max)
-           (if inc
-               (mumamo-chunk-end-fw-str-inc pos max end-mark)
-             (mumamo-chunk-end-fw-str pos max end-mark))))
+         `(lambda (pos max)
+            (save-match-data
+              (if ,inc
+                  (mumamo-chunk-end-fw-str-inc pos max ,end-mark)
+                (mumamo-chunk-end-fw-str pos max ,end-mark)))))
         (find-borders
          (when mark-is-border
-           (lambda (start end exc-mode)
-             (let ((start-border)
-                   (end-border))
-               (if (and inc exc-mode)
-                   (progn
-                     (when start
-                       (setq start-border
-                             (+ start (length begin-mark))))
-                     (when end
-                       (setq end-border
-                             (- end (length end-mark)))))
-                 (if (and (not inc) (not exc-mode))
-                     (progn
-                       (when start
-                         (setq start-border
-                               (+ start (length end-mark))))
-                       (when end
-                         (setq end-border
-                               (- end (length begin-mark)))))))
-               (when (or start-border end-border)
-                 (mumamo-msgfntfy "quick.start-border/end=%s/%s, start/end=%s/%s exc-mode=%s" start-border end-border start end exc-mode)
-                 (list start-border end-border)))))))
+           `(lambda (start end exc-mode)
+              (let ((start-border)
+                    (end-border))
+                (if (and ,inc exc-mode)
+                    (progn
+                      (when start
+                        (setq start-border
+                              (+ start (length ,begin-mark))))
+                      (when end
+                        (setq end-border
+                              (- end (length ,end-mark)))))
+                  (if (and (not ,inc) (not exc-mode))
+                      (progn
+                        (when start
+                          (setq start-border
+                                (+ start (length ,end-mark))))
+                        (when end
+                          (setq end-border
+                                (- end (length ,begin-mark)))))))
+                (when (or start-border end-border)
+                  (mumamo-msgfntfy "quick.start-border/end=%s/%s, start/end=%s/%s exc-mode=%s" start-border end-border start end exc-mode)
+                  (list start-border end-border)))))))
     (mumamo-find-possible-chunk pos min max
                                 search-bw-exc-start
                                 search-bw-exc-end
@@ -3536,53 +4414,60 @@ this function will not see it since it is run in a timer.)"
 (put 'mumamo-idle-set-major-mode-timer 'permanent-local t)
 
 (defun mumamotemp-pre-command ()
+  "Temporary command for debugging."
   (message "mumamotemp-pre 1: modified=%s %s" (buffer-modified-p) (current-buffer)))
 (defun mumamotemp-post-command ()
+  "Temporary command for debugging."
   (message "mumamotemp-post 1: modified=%s %s" (buffer-modified-p) (current-buffer)))
 (put 'mumamotemp-pre-command 'permanent-local-hook t)
 (put 'mumamotemp-post-command 'permanent-local-hook t)
 (defun mumamotemp-start ()
+  "Temporary command for debugging."
   (add-hook 'post-command-hook 'mumamotemp-post-command nil t)
   (add-hook 'pre-command-hook 'mumamotemp-pre-command nil t))
 
 (defun mumamo-idle-set-major-mode (buffer window)
   "Set major mode from mumamo chunk when Emacs is idle.
-Do this in window WINDOW if and only if current buffer is BUFFER.
+Do this only if current buffer is BUFFER and then do it in window
+WINDOW.
 
 See the variable `mumamo-set-major-mode-delay' for an
 explanation."
-  (mumamo-msgfntfy "mumamo-idle-set-major-mode b=%s, window=%s" buffer window)
-  (with-selected-window window
-    ;; According to Stefan Monnier we need to set the buffer too.
-    (with-current-buffer (window-buffer)
-      (when (eq buffer (current-buffer))
-        (mumamo-condition-case err
-            (let* ((ovl (mumamo-get-chunk-at (point)))
-                   (major (mumamo-chunk-major-mode ovl))
-                   (modified (buffer-modified-p)))
-              (unless (eq major major-mode)
-                (mumamo-set-major major)
-                ;; Fix-me: This is a bug workaround. Possibly in Emacs.
-                (when (and (buffer-modified-p)
-                           (not modified))
-                  (set-buffer-modified-p nil))
-                ;; sync keymap
-                (when (timerp mumamo-unread-command-events-timer)
-                  (cancel-timer mumamo-unread-command-events-timer))
-                (when unread-command-events
-                  ;; Save unread keys before calling `top-level' which
-                  ;; will clear them.
-                  (setq mumamo-unread-command-events-timer
-                        (run-with-idle-timer
-                         0 nil
-                         'mumamo-unread-command-events
-                         unread-command-events
-                         major last-command))
-                  (top-level)
-                  )))
-          (error
-           (mumamo-display-error 'mumamo-idle-set-major-mode
-                                 "cb=%s, err=%s" (current-buffer) err)))))))
+  (save-match-data ;; runs in idle timer
+    (mumamo-msgfntfy "mumamo-idle-set-major-mode b=%s, window=%s" buffer window)
+    (with-selected-window window
+      ;; According to Stefan Monnier we need to set the buffer too.
+      (with-current-buffer (window-buffer)
+        (when (eq buffer (current-buffer))
+          (mumamo-condition-case err
+              ;;(let* ((ovl (mumamo-get-chunk-at (point)))
+              (let* ((ovl (mumamo-find-chunks (point) "mumamo-idle-set-major-mode"))
+                     (major (mumamo-chunk-major-mode ovl))
+                     (modified (buffer-modified-p)))
+                (unless (eq major major-mode)
+                  ;;(message "mumamo-set-major at A")
+                  (mumamo-set-major major)
+                  ;; Fix-me: This is a bug workaround. Possibly in Emacs.
+                  (when (and (buffer-modified-p)
+                             (not modified))
+                    (set-buffer-modified-p nil))
+                  ;; sync keymap
+                  (when (timerp mumamo-unread-command-events-timer)
+                    (cancel-timer mumamo-unread-command-events-timer))
+                  (when unread-command-events
+                    ;; Save unread keys before calling `top-level' which
+                    ;; will clear them.
+                    (setq mumamo-unread-command-events-timer
+                          (run-with-idle-timer
+                           0 nil
+                           'mumamo-unread-command-events
+                           unread-command-events
+                           major last-command))
+                    (top-level)
+                    )))
+            (error
+             (mumamo-display-error 'mumamo-idle-set-major-mode
+                                   "cb=%s, err=%s" (current-buffer) err))))))))
 
 (defun mumamo-request-idle-set-major-mode ()
   "Setup to change major mode from chunk when Emacs is idle."
@@ -3599,18 +4484,11 @@ explanation."
 (make-variable-buffer-local 'mumamo-done-first-set-major)
 (put 'mumamo-done-first-set-major 'permanent-local t)
 
-(defvar mumamo-multi-major-mode nil
-  "The function that handles multiple major modes.
-If this is nil then multiple major modes in the buffer is not
-handled by mumamo.
-
-Set by functions defined by `define-mumamo-multi-major-mode'.")
-(make-variable-buffer-local 'mumamo-multi-major-mode)
-(put 'mumamo-multi-major-mode 'permanent-local t)
-
 ;; Fix-me: Add a property to the symbol instead (like in CUA).
 (defvar mumamo-safe-commands-in-wrong-major
-  '(forward-char
+  '(self-insert-command
+    fill-paragraph ;; It changes major mode
+    forward-char
     viper-forward-char
     backward-char
     viper-backward-char
@@ -3639,32 +4517,37 @@ local map and major mode is not the major mode for the current
 mumamo chunk then set major mode to that for the chunk."
   ;;(message "enter mumamo-set-major-pre-command")
   (mumamo-condition-case err
-      (let* ((ovl (mumamo-get-chunk-at (point)))
-             (major (mumamo-chunk-major-mode ovl))
-             (found-this (lookup-key (current-local-map) (this-command-keys-vector)))
-             )
+      ;; First see if we can avoid changing major mode
+      (let ((glob-command) ; (lookup-key global-map (this-command-keys-vector)))
+            )
+        (if (memq this-command mumamo-safe-commands-in-wrong-major)
+            nil ;;(message "safe %s" this-command)
+          (message "not safe %s" this-command)
+          (let* ((ovl (mumamo-find-chunks (point) "mumamo-set-major-pre-command"))
+                 (major (mumamo-chunk-major-mode ovl))
+                 (found-this (lookup-key (current-local-map) (this-command-keys-vector)))
+                 )
 ;;;         (message "pre-commend: major=%s, major-mode=%s, lookup M-TAB=%s, binding=%s, found-this=%s"
 ;;;                  major major-mode (lookup-key (current-local-map) [(meta tab)])
 ;;;                  (key-binding [(meta tab)] t)
 ;;;                  found-this)
-        (if (not major)
-            (lwarn '(mumamo-set-major-pre-command)
-                   :error "major=%s" major)
-          (when (and (not (eq major-mode major))
-                     ;;(lookup-key (current-local-map) (this-command-keys-vector))
-                     (not (memq this-command mumamo-safe-commands-in-wrong-major))
-                     )
-            (mumamo-set-major major)
-            ;; Unread the last command key sequence
-            (setq unread-command-events
-                  (append (listify-key-sequence (this-command-keys-vector))
-                          unread-command-events))
-            ;; Some commands, like `viper-command-argument' need to
-            ;; know the last command, so tell them.
-            (setq this-command (lambda ()
-                                 (interactive)
-                                 (setq this-command last-command)))
-            )))
+            (if (not major)
+                (lwarn '(mumamo-set-major-pre-command) :error "major=%s" major)
+              (when (or (not (eq major-mode major))
+                        (not (mumamo-set-major-check-keymap))
+                        )
+                (setq major-mode nil)
+                (mumamo-set-major major)
+                ;; Unread the last command key sequence
+                (setq unread-command-events
+                      (append (listify-key-sequence (this-command-keys-vector))
+                              unread-command-events))
+                ;; Some commands, like `viper-command-argument' need to
+                ;; know the last command, so tell them.
+                (setq this-command (lambda ()
+                                     (interactive)
+                                     (setq this-command last-command)))
+                )))))
     (error
      (mumamo-display-error 'mumamo-set-major-pre-command
                            "%s" (error-message-string err)))))
@@ -3693,6 +4576,28 @@ Return the fetched local map."
     (kill-buffer temp-buf)
     local-map))
 
+(defvar mumamo-post-command-chunk nil)
+(make-variable-buffer-local 'mumamo-post-command-chunk)
+
+(defun mumamo-post-command-get-chunk (pos)
+  (if (and mumamo-post-command-chunk
+           (overlayp mumamo-post-command-chunk)
+           ;;(progn (message "here a=%s" mumamo-post-command-chunk) t)
+           (overlay-buffer mumamo-post-command-chunk)
+           ;;(progn (message "here b=%s" mumamo-post-command-chunk) t)
+           (< pos (overlay-end mumamo-post-command-chunk))
+           ;;(progn (message "here c=%s" mumamo-post-command-chunk) t)
+           (>= pos (overlay-start mumamo-post-command-chunk))
+           ;;(progn (message "here d=%s" mumamo-post-command-chunk) t)
+           (mumamo-chunk-major-mode mumamo-post-command-chunk)
+           ;;(progn (message "here e=%s" mumamo-post-command-chunk) t)
+           )
+      mumamo-post-command-chunk
+    (msgtrc "--------------- new post-command-chunk")
+    (setq mumamo-post-command-chunk
+          (or (mumamo-get-existing-new-chunk-at (point))
+              (mumamo-find-chunks (point) "post-command-get-chunk")))))
+
 ;; (setq mumamo-set-major-mode-delay 10)
 (defun mumamo-set-major-post-command ()
   "Change major mode if necessary after a command.
@@ -3702,19 +4607,24 @@ however `mumamo-set-major-mode-delay' is greater than 0 just
 request a change of major mode when Emacs is idle that long.
 
 See the variable above for an explanation why a delay might be
-needed \(and is the default).
-"
-  ;;(message "mumamo-set-major-post-command here")
-  (let* ((ovl (mumamo-get-chunk-at (point)))
-         (major (mumamo-chunk-major-mode ovl))
-         (in-pre-hook (memq 'mumamo-set-major-pre-command pre-command-hook)))
-    (if (not major)
+needed \(and is the default)."
+  ;;(msgtrc "set-major-post-command here")
+  (let* (;;(ovl (mumamo-get-chunk-at (point)))
+         ;;(ovl (mumamo-find-chunks (point) "mumamo-set-major-post-command"))
+         (in-pre-hook (memq 'mumamo-set-major-pre-command pre-command-hook))
+         ;;(ovl (unless in-pre-hook (mumamo-get-existing-new-chunk-at (point))))
+         (ovl (unless in-pre-hook (mumamo-post-command-get-chunk (point))))
+         (major (when ovl (mumamo-chunk-major-mode ovl)))
+         )
+    ;;(msgtrc "set-major-post-command ovl=%s, in-pre-hook=%s" ovl in-pre-hook)
+    (if (and (not in-pre-hook)
+             (not major))
         (lwarn '(mumamo-set-major-post-command)
                :error "major=%s" major)
       (unless (and mumamo-done-first-set-major
-                   (eq major-mode major)
-                   (not in-pre-hook))
-        ;;(message "mumamo-set-major-post-command here done=%s\nsurvive=%s" mumamo-done-first-set-major mumamo-survive)
+                   (or (eq major-mode major)
+                       in-pre-hook))
+        ;;(msgtrc "set-major-post-command here done=%s\nsurvive=%s" mumamo-done-first-set-major mumamo-survive)
         (if mumamo-done-first-set-major
             (if (<= 0 mumamo-set-major-mode-delay)
                 ;; Window point has been moved to a new chunk with a
@@ -3728,25 +4638,71 @@ needed \(and is the default).
                     (setq map (mumamo-fetch-local-map major)))
                   (unless (eq map 'no-local-map)
                     (use-local-map map))
-                  (add-hook 'pre-command-hook
-                            'mumamo-set-major-pre-command nil t)
+                  (add-hook 'pre-command-hook 'mumamo-set-major-pre-command nil t)
+                  ;;(msgtrc "request mumamo-set-major at C")
                   (mumamo-request-idle-set-major-mode))
+              ;;(msgtrc "mumamo-set-major at C")
               (mumamo-set-major major)
               (message "Switched to %s" major-mode))
+          ;;(msgtrc "mumamo-set-major at D")
           (mumamo-set-major major))))))
 
 (defun mumamo-post-command-1 (&optional no-debug)
+  "See `mumamo-post-command'.
+Turn on `debug-on-error' unless NO-DEBUG is nil."
   (unless no-debug (setq debug-on-error t))
-  (mumamo-msgfntfy "mumamo-post-command-1: font-lock-mode=%s" font-lock-mode)
+  (mumamo-msgfntfy "mumamo-post-command-1 ENTER: font-lock-mode=%s" font-lock-mode)
   (if font-lock-mode
       (mumamo-set-major-post-command)
     ;;(mumamo-on-font-lock-off)
+    )
+  ;;(msgtrc "mumamo-post-command-1 EXIT: font-lock-keywords-only =%s" (default-value 'font-lock-keywords-only))
+  )
+
+(defun mumamo-emacs-start-bug3467-timer-if-needed ()
+  "Work around for Emacs bug 3467. The only one I have found."
+  (when mumamo-has-bug3467
+    (run-with-idle-timer 0 nil 'mumamo-emacs-bug3467-workaround)))
+
+(defun mumamo-emacs-bug3467-workaround ()
+  "Work around for Emacs bug 3467. The only one I have found."
+  (set-default 'font-lock-keywords-only nil))
+
+(defvar mumamo-bug-3467-w14 41)
+(defvar mumamo-bug-3467-w15 51)
+;;(mumamo-check-has-bug3467 t)
+;;(kill-local-variable 'mumamo-bug-3467-w14)
+(defun mumamo-check-has-bug3467 (verbose)
+  (let ((has-bug nil))
+    (with-temp-buffer
+      (let ((mumamo-bug-3467-w14 42)
+            (mumamo-bug-3467-w15 52))
+        (when verbose (message "mumamo-bug-3467-w14 maybe let: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w14 (default-value 'mumamo-bug-3467-w14)))
+        (when verbose (message "mumamo-bug-3467-w15 maybe let: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w15 (default-value 'mumamo-bug-3467-w15)))
+        (set (make-local-variable 'mumamo-bug-3467-w14) 43)
+        (set-default 'mumamo-bug-3467-w14 44)
+        (set-default 'mumamo-bug-3467-w15 54)
+        (when verbose (message "mumamo-bug-3467-w14 maybe let: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w14 (default-value 'mumamo-bug-3467-w14)))
+        (when verbose (message "mumamo-bug-3467-w15 maybe let: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w15 (default-value 'mumamo-bug-3467-w15))))
+      (when verbose (message "mumamo-bug-3467-w14 top level: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w14 (default-value 'mumamo-bug-3467-w14)))
+      (when (/= mumamo-bug-3467-w14 43) (setq has-bug t))
+      (when (/= (default-value 'mumamo-bug-3467-w14) 41) (setq has-bug t))
+      (when verbose (message "mumamo-bug-3467-w15 top level: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w15 (default-value 'mumamo-bug-3467-w15)))
+      )
+    (when verbose (message "mumamo-bug-3467-w14 top level: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w14 (default-value 'mumamo-bug-3467-w14)))
+    (when verbose (message "mumamo-bug-3467-w15 top level: in buffer %s=%S, global=%S" (current-buffer) mumamo-bug-3467-w15 (default-value 'mumamo-bug-3467-w15)))
+    (or has-bug
+        (local-variable-p 'mumamo-bug-3467-w14)
+        (/= (default-value 'mumamo-bug-3467-w14) 41)
+        )
     ))
 
+(defvar mumamo-has-bug3467 (mumamo-check-has-bug3467 nil))
+
 (defun mumamo-post-command ()
   "Run this in `post-command-hook'.
 Change major mode if necessary."
-  (mumamo-msgfntfy "mumamo-post-command")
+  ;;(msgtrc "mumamo-post-command")
   (when mumamo-multi-major-mode
     (mumamo-condition-case err
         (mumamo-post-command-1 t)
@@ -3839,18 +4795,18 @@ function, it is changed to a list of functions."
 
 (defvar mumamo-survive-hooks
   '(
-;;     activate-mark-hook after-change-functions after-save-hook
-;;     before-save-functions auto-save-hook before-revert-hook
-;;     buffer-access-fontify-functions calendar-load-hook
-;;     command-line-functions compilation-finish-function
-;;     deactivate-mark-hook find-file-hook
-;;     find-file-not-found-functions first-change-hook
-;;     kbd-macro-termination-hook kill-buffer-hook
-;;     kill-buffer-query-functions menu-bar-update-hook
-;;     post-command-hook pre-abbrev-expand-hook pre-command-hook
-;;     write-contents-functions write-file-functions
-;;     write-region-annotate-functions
-;;     c-special-indent-hook
+    ;;     activate-mark-hook after-change-functions after-save-hook
+    ;;     before-save-functions auto-save-hook before-revert-hook
+    ;;     buffer-access-fontify-functions calendar-load-hook
+    ;;     command-line-functions compilation-finish-function
+    ;;     deactivate-mark-hook find-file-hook
+    ;;     find-file-not-found-functions first-change-hook
+    ;;     kbd-macro-termination-hook kill-buffer-hook
+    ;;     kill-buffer-query-functions menu-bar-update-hook
+    ;;     post-command-hook pre-abbrev-expand-hook pre-command-hook
+    ;;     write-contents-functions write-file-functions
+    ;;     write-region-annotate-functions
+    ;;     c-special-indent-hook
     ))
 
 ;;
@@ -3871,7 +4827,7 @@ function, it is changed to a list of functions."
     ;; viper-mode-string -- is already buffer local, globally void
     (put 'viper-mode-string 'permanent-local t)
     ))
-    ;;viper-tut--part
+;;viper-tut--part
 (eval-after-load 'viper-init
   (progn
     (put 'viper-d-com 'permanent-local t)
@@ -4153,6 +5109,9 @@ function, it is changed to a list of functions."
 (defvar mumamo-survive
   '(
     buffer-file-name
+    ;; Fix-me: This is to prevent font-lock-mode turning off/on, but
+    ;; is it necessary?
+    ;;font-lock-mode-major-mode
     tags-file-name
     nxhtml-minor-mode
     ;; Fix-me: adding rng timers here stops Emacs from looping after
@@ -4233,8 +5192,8 @@ If you do not want to put a `permanent-local' property on a
 variable you can instead use this function to make variable VAR
 survive chunk switches in all mumamo multi major mode buffers."
 
-;; If you want it to survive chunk switches only in the current
-;; buffer then use `mumamo-make-local-permanent' instead."
+  ;; If you want it to survive chunk switches only in the current
+  ;; buffer then use `mumamo-make-local-permanent' instead."
   (pushnew var (default-value 'mumamo-survive)))
 
 ;; ;; Fix-me: use local value
@@ -4288,6 +5247,9 @@ Just check the name."
 (defvar mumamo-removed-from-hook nil)
 
 (defun mumamo-remove-from-hook (hook remove)
+  "From hook HOOK remove functions in list REMOVE.
+Save HOOK and the list of functions removed to
+`mumamo-removed-from-hook'."
   (let (did-remove
         removed)
     (dolist (rem remove)
@@ -4307,11 +5269,13 @@ Just check the name."
                 mumamo-removed-from-hook))))
 
 (defun mumamo-addback-to-hooks ()
+  "Add back what was removed by `mumamo-remove-from-hook'."
   ;;(message "mumamo-removed-from-hook=%s" mumamo-removed-from-hook)
   (dolist (rem-rec mumamo-removed-from-hook)
     (mumamo-addback-to-hook (car rem-rec) (cdr rem-rec))))
 
 (defun mumamo-addback-to-hook (hook removed)
+  "Add to hook HOOK the list of functions in REMOVED."
   ;;(message "addback: hook=%s, removed=%s" hook removed)
   (dolist (rem removed)
     ;;(message "add.rem=%s" rem)
@@ -4346,6 +5310,7 @@ Just check the name."
     buffer-read-only
     buffer-saved-size
     buffer-undo-list
+
     c++-template-syntax-table
     c-<-op-cont-regexp
     c-<>-multichar-token-regexp
@@ -4357,7 +5322,7 @@ Just check the name."
     c-at-vsemi-p-fn
     c-backslash-column
     c-backslash-max-column
-    c-basic-offset
+    ;;c-basic-offset
     c-before-font-lock-function
     c-block-comment-prefix
     c-block-comment-start-regexp
@@ -4389,9 +5354,9 @@ Just check the name."
     c-identifier-start
     c-identifier-syntax-modifications
     c-identifier-syntax-table
-    c-indent-comment-alist
-    c-indent-comments-syntactically-p
-    c-indentation-style
+    ;;c-indent-comment-alist
+    ;;c-indent-comments-syntactically-p
+    ;;c-indentation-style
     c-keywords-obarray
     c-keywords-regexp
     c-known-type-key
@@ -4405,7 +5370,7 @@ Just check the name."
     c-nonsymbol-chars
     c-nonsymbol-token-regexp
     c-not-decl-init-keywords
-    c-offsets-alist
+    ;;c-offsets-alist
     c-old-BOM
     c-old-EOM
     c-opt-<>-arglist-start
@@ -4490,7 +5455,7 @@ Just check the name."
     font-lock-fontify-buffer-function
     font-lock-fontify-region-function
     font-lock-keywords
-    font-lock-keywords-only
+    ;;font-lock-keywords-only
     font-lock-keywords-case-fold-search
     font-lock-mode
     font-lock-mode-hook
@@ -4557,7 +5522,21 @@ Just check the name."
 
     syntax-begin-function
     )
-  )
+  "Buffer local variables that is not saved/set per chunk.
+This is supposed to contain mostly buffer local variables
+specific to major modes and that are not meant to be customized
+by the user.
+")
+
+(when (< emacs-major-version 23)
+  (defadvice c-after-change (around
+                             mumamo-ad-c-after-change
+                             activate
+                             compile
+                             )
+    (msgtrc "c-after-change: major-mode=%s c-nonsymbol-token-regexp=%s" major-mode c-nonsymbol-token-regexp))
+    (when (derived-mode-p 'c-mode)
+      ad-do-it))
 
 (defun mumamo-save-most-buffer-locals (major)
   "Save some local variables for major mode MAJOR.
@@ -4586,6 +5565,9 @@ mode."
 ;; (benchmark 1000 '(mumamo-restore-most-buffer-locals major-mode))
 (defvar mumamo-restore-most-buffer-locals-in-hook-major nil)
 (defun mumamo-restore-most-buffer-locals-in-hook ()
+  "Call `mumamo-restore-most-buffer-locals'.
+Use `mumamo-restore-most-buffer-locals-in-hook-major' as the
+major mode."
   (mumamo-restore-most-buffer-locals
    mumamo-restore-most-buffer-locals-in-hook-major)
   (setq mumamo-restore-most-buffer-locals-in-hook-major nil))
@@ -4635,13 +5617,22 @@ default values."
 
 ;; FIX-ME: Clean up the different ways of surviving variables during
 ;; change of major mode.
+(defvar mumamo-set-major-keymap-checked nil)
+(make-variable-buffer-local 'mumamo-set-major-keymap-checked)
+
 (defun mumamo-set-major (major)
   "Set major mode to MAJOR for mumamo."
   (mumamo-msgfntfy "mumamo-set-major %s, %s" major (current-buffer))
+  ;;(mumamo-backtrace "mumamo-set-major")
   ;;(message "mumamo-set-major %s, %s" major (current-buffer))
+  (remove-hook 'text-mode-hook 'viper-mode) ;; Fix-me: maybe add it back...
   (let ((start-time (get-internal-run-time))
         end-time
         used-time
+        ;; Viper
+        viper-vi-state-mode-list
+        viper-emacs-state-mode-list
+        viper-insert-state-mode-list
         ;; Tell `mumamo-change-major-function':
         (mumamo-set-major-running major)
         ;; Fix-me: Take care of the new values added to these hooks!
@@ -4672,7 +5663,6 @@ default values."
     ;; We are not changing mode from font-lock's point of view, so do
     ;; not tell font-lock (let binding these hooks is probably not a
     ;; good choice since they may contain other stuff too):
-    ;;(message "here 1")
     (setq mumamo-removed-from-hook nil)
     (mumamo-remove-from-hook 'change-major-mode-hook mumamo-change-major-mode-no-nos)
     ;;(message "change-major-mode-hook=%s" change-major-mode-hook)
@@ -4748,7 +5738,12 @@ default values."
                   ;;restore-fun
                   'mumamo-restore-most-buffer-locals-in-hook
                   nil t))
+      ;;(msgtrc "mumamo-set-major before: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
       (funcall major) ;; <-----------------------------------------------
+      ;;(msgtrc "mumamo-set-major after: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
+      ;;(message "backtrace there:\n%s" (with-output-to-string (backtrace)))
+      (setq font-lock-mode-major-mode major) ;; Tell font-lock it is ok
+      (set (make-local-variable 'font-lock-function) 'mumamo-font-lock-function)
       (if (not ancestor-hook-sym)
           (mumamo-restore-most-buffer-locals major)
         (remove-hook ancestor-hook-sym
@@ -4756,6 +5751,9 @@ default values."
                      'mumamo-restore-most-buffer-locals-in-hook
                      t)))
 
+    (setq mumamo-major-mode-indent-line-function (cons major-mode indent-line-function))
+    (make-local-variable 'indent-line-function)
+
     (setq mode-name (concat (format-mode-line mode-name)
                             (save-match-data
                               (replace-regexp-in-string
@@ -4766,11 +5764,11 @@ default values."
 
     (dolist (hk mumamo-survive-hooks) (put hk 'permanent-local nil))
 
-;;     (when (and (featurep 'flymake)
-;;                flymake-mode)
-;;       (add-hook 'after-change-functions 'flymake-after-change-function nil t)
-;;       (add-hook 'after-save-hook 'flymake-after-save-hook nil t)
-;;       (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t))
+    ;;     (when (and (featurep 'flymake)
+    ;;                flymake-mode)
+    ;;       (add-hook 'after-change-functions 'flymake-after-change-function nil t)
+    ;;       (add-hook 'after-save-hook 'flymake-after-save-hook nil t)
+    ;;       (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t))
 
 
 ;;;     (dolist (sym mumamo-survive)
@@ -4778,7 +5776,6 @@ default values."
 ;;;         (put sym 'permanent-local nil)))
     (dolist (saved saved-state)
       (set (make-local-variable (car saved)) (cdr saved)))
-    ;;(message "here 2")
     ;;(mumamo-addback-to-hook 'change-major-mode-hook mumamo-change-major-mode-no-nos)
     (mumamo-addback-to-hooks)
     (when (and (featurep 'mlinks)
@@ -4802,11 +5799,11 @@ default values."
                 (rng-what-schema))
             (nxml-file-parse-error
              (nxml-display-file-parse-error err)))
-	 (when rng-validate-mode
-           ;; Fix-me: Change rng-validate variables so that this is
-           ;; not necessary any more.
-           (rng-validate-mode 0)
-           (rng-validate-mode 1))
+          (when rng-validate-mode
+            ;; Fix-me: Change rng-validate variables so that this is
+            ;; not necessary any more.
+            (rng-validate-mode 0)
+            (rng-validate-mode 1))
           )))
     ;; The nxml-parser should not die:
     (when (mumamo-derived-from-mode (mumamo-main-major-mode) 'nxml-mode)
@@ -4838,7 +5835,7 @@ default values."
       (mumamo-msgfntfy "mumamo-set-major: ----- removing 'fontified")
       ;; Set up to fontify buffer
       (mumamo-save-buffer-state nil
-        (remove-text-properties (point-min) (point-max) '(fontified)))
+        (remove-list-of-text-properties (point-min) (point-max) '(fontified)))
       (setq mumamo-done-first-set-major t))
 
     (remove-hook 'pre-command-hook 'mumamo-set-major-pre-command t)
@@ -4863,7 +5860,23 @@ default values."
     ;;
     ;;(setq end-time (get-internal-run-time))
     ;;(setq used-time (time-subtract end-time start-time))
-    ))
+    )
+  (setq mumamo-set-major-keymap-checked nil)
+  ;; Fix-me: Seems like setting/checking the keymap in a timer is
+  ;; problematc. This is an Emacs bug.
+  ;;(run-with-idle-timer 1 nil 'mumamo-set-major-check-keymap)
+  )
+
+(defun mumamo-set-major-check-keymap ()
+  "Helper to work around an Emacs bug when setting local map in a timer."
+  (or mumamo-set-major-keymap-checked
+      (setq mumamo-set-major-keymap-checked
+            (let ((map-sym (intern-soft (concat (symbol-name major-mode) "-map"))))
+              (equal (current-local-map)
+                     (symbol-value map-sym))))))
+
+(defvar mumamo-original-fill-paragraph-function nil)
+(make-variable-buffer-local 'mumamo-original-fill-paragraph-function)
 
 (defun mumamo-setup-local-fontification-vars ()
   "Set up buffer local variables for mumamo style fontification."
@@ -4880,25 +5893,33 @@ default values."
   (make-local-variable 'font-lock-unfontify-buffer-function)
   (setq font-lock-unfontify-buffer-function 'mumamo-unfontify-buffer)
 
+  (set (make-local-variable 'indent-line-function) 'mumamo-indent-line-function)
 
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'mumamo-indent-line-function)
-
+  (setq mumamo-original-fill-paragraph-function fill-paragraph-function)
   (set (make-local-variable 'fill-paragraph-function) 'mumamo-fill-paragraph-function)
+  ;;(set (make-local-variable 'fill-forward-paragraph-function 'forward-paragraph)
 
   (make-local-variable 'indent-region-function)
   (setq indent-region-function 'mumamo-indent-region-function)
 
   ;;(set (make-local-variable 'syntax-begin-function) 'mumamo-beginning-of-syntax)
 
+  ;;(put 'font-lock-function 'permanent-local t)
+
   ;; FIX-ME: Not sure about this one, but it looks like it must be
   ;; set:
   (make-local-variable 'jit-lock-contextually)
   (setq jit-lock-contextually t)
   )
 
+(defun mumamo-font-lock-function (mode)
+  ;;(mumamo-backtrace "font-lock-function")
+  (font-lock-default-function mode))
 
 
+(defvar mumamo-major-mode-indent-line-function nil)
+(make-variable-buffer-local 'mumamo-major-mode-indent-line-function)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Turning on/off multi major modes
 
@@ -4934,10 +5955,7 @@ OLD-MAJOR-MODE is used for the main major mode if the main major
 mode in the chunk family is nil."
   ;;(unless font-lock-mode (font-lock-mode 1))
   (mumamo-msgfntfy "mumamo-turn-on-actions")
-  (unless mumamo-current-chunk-family
-    ;;(mumamo-select-chunk-family)
-    (error "Internal error: Chunk family is not set")
-    )
+  (unless mumamo-current-chunk-family (error "Internal error: Chunk family is not set"))
   (if (not mumamo-current-chunk-family)
       (progn
         (lwarn '(mumamo) :warning
@@ -4948,7 +5966,7 @@ mode in the chunk family is nil."
           (mumamo-insert-describe-button 'define-mumamo-multi-major-mode 'describe-function)
           (insert "'.\n")))
     ;; Load major mode:
-    (let ((main-major-mode (mumamo-main-major-mode)))
+    (let ((main-major-mode (mumamo-major-mode-from-modespec (mumamo-main-major-mode))))
       (unless main-major-mode
         (setcar (cdr mumamo-current-chunk-family) old-major-mode)
         (setq main-major-mode (mumamo-main-major-mode)))
@@ -4956,34 +5974,46 @@ mode in the chunk family is nil."
       (setq mumamo-major-mode main-major-mode)
       (when (boundp 'nxml-syntax-highlight-flag)
         (when (mumamo-derived-from-mode main-major-mode 'nxml-mode)
-          (set (make-local-variable 'nxml-syntax-highlight-flag) nil))))
-    ;; Init fontification
-    (mumamo-initialize-state)
-    (mumamo-set-fontification-functions)
-    (mumamo-save-buffer-state nil
-      (remove-list-of-text-properties (point-min) (point-max)
-                                      (list 'fontified)))
-    ;; For validation header etc:
-    (require 'rngalt nil t)
-    (when (featurep 'rngalt)
-      (setq rngalt-major-mode (mumamo-main-major-mode))
-      (rngalt-update-validation-header-overlay))
-    (when (featurep 'rng-valid)
-      ;;(setq rng-get-major-mode-chunk-function 'mumamo-get-existing-chunk-at)
-      (setq rng-get-major-mode-chunk-function 'mumamo-get-chunk-at)
-      (setq rng-valid-nxml-major-mode-chunk-function 'mumamo-valid-nxml-chunk)
-      (setq rng-end-major-mode-chunk-function 'overlay-end))
+          (set (make-local-variable 'nxml-syntax-highlight-flag) nil)))
+      ;; Init fontification
+      (mumamo-initialize-state)
+      (mumamo-set-fontification-functions)
+      (mumamo-save-buffer-state nil
+        (remove-list-of-text-properties (point-min) (point-max)
+                                        (list 'fontified)))
+      ;; For validation header etc:
+      (when (mumamo-derived-from-mode main-major-mode 'nxhtml-mode)
+        (require 'rngalt nil t)
+        (when (featurep 'rngalt)
+          (setq rngalt-major-mode (mumamo-main-major-mode))
+          (rngalt-update-validation-header-overlay))
+        (when (featurep 'rng-valid)
+          (setq rng-get-major-mode-chunk-function 'mumamo-find-chunks)
+          (setq rng-valid-nxml-major-mode-chunk-function 'mumamo-valid-nxml-chunk)
+          (setq rng-end-major-mode-chunk-function 'overlay-end))))
     ;;(mumamo-set-major-post-command)
     ;;(add-hook 'change-major-mode-hook 'mumamo-change-major-function nil t)
     (when (boundp 'flyspell-generic-check-word-predicate)
       (setq flyspell-generic-check-word-predicate 'mumamo-flyspell-verify))
     (run-hooks 'mumamo-turn-on-hook)
-    (mumamo-get-chunk-save-buffer-state (point))
-    ;;(message "(benchmark 1 '(mumamo-find-chunks))") (benchmark 1 '(mumamo-find-chunks nil nil))
-    ;;(setq mumamo-end-last-chunk-pos nil)
-    ;;(mumamo-find-chunks nil 'until-input)
-    (mumamo-find-chunks nil)
-    ))
+    ;;(mumamo-get-chunk-save-buffer-state (point))
+    (dolist (win (get-buffer-window-list (current-buffer)))
+      (let ((wp (or (window-end win)
+                    (window-point win)
+                    (window-start win))))
+        (mumamo-get-chunk-save-buffer-state wp)
+        (when (eq win (selected-window))
+          (let* ((ovl (mumamo-find-chunks wp "mumamo-turn-on-actions"))
+                 (major (mumamo-chunk-major-mode ovl)))
+            (mumamo-set-major major)))))
+    ;;(msgtrc "mumamo-turn-on-action exit: font-lock-keywords-only =%s in buffer %s, def=%s" font-lock-keywords-only (current-buffer) (default-value 'font-lock-keywords-only))
+    ;; This did not help for Emacs bug 3467:
+    ;;(set-default 'font-lock-keywords-only nil)
+    ;;(setq font-lock-keywords-only nil)
+    )
+  (set (make-local-variable 'font-lock-function) 'mumamo-font-lock-function)
+  (mumamo-emacs-start-bug3467-timer-if-needed)
+  )
 
 ;; (defun mumamo-on-font-lock-off ()
 ;;   "The reverse of `mumamo-turn-on-actions'."
@@ -5029,6 +6059,9 @@ mode in the chunk family is nil."
     (setq rng-valid-nxml-major-mode-chunk-function nil)
     (setq rng-end-major-mode-chunk-function nil)
     )
+  ;; Remove nxml for Emacs 22
+  (remove-hook 'after-change-functions 'rng-after-change-function t)
+  (remove-hook 'after-change-functions 'nxml-after-change t)
   (when (boundp 'rngalt-major-mode)
     (setq rngalt-major-mode nil))
   (remove-hook 'change-major-mode-hook 'mumamo-change-major-function t)
@@ -5038,6 +6071,8 @@ mode in the chunk family is nil."
   (remove-hook 'post-command-hook 'mumamo-post-command t)
   ;;(remove-hook 'c-special-indent-hook 'mumamo-c-special-indent t)
   (mumamo-remove-all-chunk-overlays)
+  (mumamo-margin-info-mode -1)
+  (when (fboundp 'mumamo-clear-all-regions) (mumamo-clear-all-regions))
   (save-restriction
     (widen)
     (mumamo-save-buffer-state nil
@@ -5067,7 +6102,7 @@ mode in the chunk family is nil."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Defining multi major modes
 
-(defvar mumamo-defined-turn-on-functions nil
+(defvar mumamo-defined-multi-major-modes nil
   "List of functions defined for turning on mumamo.
 Those functions should be called instead of calling a major mode
 function when you want to use multiple major modes in a buffer.
@@ -5085,6 +6120,26 @@ of how the functions work.
 If you want to quickly define a new mix of major modes you can
 use `mumamo-quick-static-chunk'.")
 
+(defun mumamo-list-defined-multi-major-modes ()
+  (interactive)
+  (with-output-to-temp-buffer (help-buffer)
+    (help-setup-xref (list #'mumamo-list-defined-multi-major-modes) (interactive-p))
+    (with-current-buffer (help-buffer)
+      (insert "The currently defined multi major modes in your Emacs are:\n\n")
+      (let ((mmms (reverse mumamo-defined-multi-major-modes))
+            (here (point)))
+        (setq mmms (sort mmms (lambda (a b)
+                                (string< (symbol-name (cdr a))
+                                         (symbol-name (cdr b))))))
+        (while mmms
+          (let* ((mmm (car mmms))
+                 (sym  (cdr mmm))
+                 (desc (car mmm)))
+            (insert "  `" (symbol-name sym) "'"
+                    " (" desc ")\n")
+            (setq mmms (cdr mmms))))
+        ))))
+
 (defun mumamo-describe-chunks (chunks)
   "Return text describing CHUNKS."
   (let* ((desc
@@ -5140,6 +6195,7 @@ with a multi major mode."
     (define-key map [(control meta next)]  'mumamo-forward-chunk)
     ;; Use mumamo-indent-line-function:
     ;;(define-key map [tab] 'indent-for-tab-command)
+    (define-key map [(meta ?q)] 'fill-paragraph)
     map)
   "Keymap that is active in all mumamo buffers.
 It has the some priority as minor mode maps.")
@@ -5148,6 +6204,12 @@ It has the some priority as minor mode maps.")
 
 (mumamo-add-multi-keymap 'mumamo-multi-major-mode mumamo-map)
 
+;;;###autoload
+(defun mumamo-multi-major-modep (value)
+  "Return t if VALUE is a multi major mode function."
+  (and (fboundp value)
+       (rassq value mumamo-defined-multi-major-modes)))
+
 ;; fix-me: tell no sub-chunks in sub-chunks
 (defmacro define-mumamo-multi-major-mode (fun-sym spec-doc chunks)
   "Define a function that turn on support for multiple major modes.
@@ -5156,10 +6218,10 @@ buffer into chunks with different major modes.
 
 The documentation string for FUN-SYM should contain the special
 documentation in the string SPEC-DOC, general documentation for
-functions of this type and information about CHUNKS.
+functions of this type and information about chunks.
 
-The new function will use the definitions in CHUNKS to make the
-dividing of the buffer.
+The new function will use the definitions in CHUNKS \(which is
+called a \"chunk family\") to make the dividing of the buffer.
 
 The function FUN-SYM can be used to setup a buffer instead of a
 major mode function:
@@ -5217,7 +6279,7 @@ The name of the function is saved in in the buffer local variable
 `mumamo-multi-major-mode' when the function is called.
 
 All functions defined by this macro is added to the list
-`mumamo-defined-turn-on-functions'.
+`mumamo-defined-multi-major-modes'.
 
 Basically Mumamo handles only major modes that uses jit-lock.
 However as a special effort also `nxml-mode' and derivatives
@@ -5296,37 +6358,46 @@ There is a keymap specific to this multi major mode, but it is
 not returned by `current-local-map' which returns the chunk's
 major mode's local keymap.
 
-The keymap is named `" (symbol-name turn-on-map) "'.
+The multi mode keymap is named `" (symbol-name turn-on-map) "'.
+
+Note: When adding new font-lock keywords for major mode chunks
+you should use the function `mumamo-refresh-multi-font-lock'
+afterwards.
 
 This major mode has an alias `mumamo-alias-"
 (symbol-name turn-on-fun) "'.
-For more information see `define-mumamo-multi-major-mode'."
-           )))
-    `(progn
-       (add-to-list 'mumamo-defined-turn-on-functions (cons (car ',chunks2) ',turn-on-fun))
-       (defvar ,turn-on-hook nil ,turn-on-hook-doc)
-       (defvar ,turn-on-map (make-sparse-keymap)
-         ,(concat "Keymap for multi major mode function `"
-                  (symbol-name turn-on-fun) "'"))
-       (defvar ,turn-on-fun nil)
-       (make-variable-buffer-local ',turn-on-fun)
-       (put ',turn-on-fun 'permanent-local t)
-       (defun ,turn-on-fun nil ,docstring
-         (interactive)
-         (let ((old-major-mode (or mumamo-major-mode
-                                   major-mode)))
-           (kill-all-local-variables)
-           (run-hooks 'change-major-mode-hook)
-           (setq mumamo-multi-major-mode ',turn-on-fun)
-           (setq ,turn-on-fun t)
-           (mumamo-add-multi-keymap ',turn-on-fun ,turn-on-map)
-           (setq mumamo-current-chunk-family (copy-tree ',chunks2))
-           (mumamo-turn-on-actions old-major-mode)
-           (run-hooks ',turn-on-hook)))
-       (defalias ',turn-on-fun-alias ',turn-on-fun)
-       (when (intern-soft ',turn-on-fun-old)
-         (defalias ',turn-on-fun-old ',turn-on-fun))
-       )))
+
+The value of `mumamo-multi-major-mode' tells you which multi
+major mode if any has been turned on in a buffer.  For more
+information about multi major modes please see
+`define-mumamo-multi-major-mode'."  )))
+`(progn
+(add-to-list 'mumamo-defined-multi-major-modes (cons (car ',chunks2) ',turn-on-fun))
+(defvar ,turn-on-hook nil ,turn-on-hook-doc)
+(defvar ,turn-on-map (make-sparse-keymap)
+  ,(concat "Keymap for multi major mode function `"
+           (symbol-name turn-on-fun) "'"))
+(defvar ,turn-on-fun nil)
+(make-variable-buffer-local ',turn-on-fun)
+(put ',turn-on-fun 'permanent-local t)
+(put ',turn-on-fun 'mumamo-chunk-family (copy-tree ',chunks2))
+(put ',turn-on-fun-alias 'mumamo-chunk-family (copy-tree ',chunks2))
+(defun ,turn-on-fun nil ,docstring
+  (interactive)
+  (let ((old-major-mode (or mumamo-major-mode
+                            major-mode)))
+    (kill-all-local-variables)
+    (run-hooks 'change-major-mode-hook)
+    (setq mumamo-multi-major-mode ',turn-on-fun)
+    (setq ,turn-on-fun t)
+    (mumamo-add-multi-keymap ',turn-on-fun ,turn-on-map)
+    (setq mumamo-current-chunk-family (copy-tree ',chunks2))
+    (mumamo-turn-on-actions old-major-mode)
+    (run-hooks ',turn-on-hook)))
+(defalias ',turn-on-fun-alias ',turn-on-fun)
+(when (intern-soft ',turn-on-fun-old)
+  (defalias ',turn-on-fun-old ',turn-on-fun))
+)))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -5374,9 +6445,9 @@ is returned."
                    (mumamo-get-chunk-save-buffer-state pos2)))
            (ovl3 (mumamo-get-chunk-save-buffer-state pos3))
            (ovl4 (if (<= pos4 (overlay-end ovl3))
-                   ovl3
-                 (mumamo-get-chunk-save-buffer-state pos4)))
-         )
+                     ovl3
+                   (mumamo-get-chunk-save-buffer-state pos4)))
+           )
       (list ovl1 ovl2 ovl3 ovl4))))
 
 ;; Fix-me: need to back up past comments in for example <style> /* comment */
@@ -5429,7 +6500,11 @@ The following rules are used when indenting:
          want-indent ;; The indentation we desire
          got-indent
          (here-on-line (point-marker))
-         this-pending-undo-list)
+         this-pending-undo-list
+         (while-n1 0)
+         (while-n2 0)
+         (while-n3 0)
+         )
     (unless prev-line-chunks
       (save-excursion
         (goto-char (line-beginning-position 1))
@@ -5469,11 +6544,12 @@ The following rules are used when indenting:
     ;; Fix-me: indentation of <?\n?>
     (assert (not (and leaving-submode entering-submode)) t)
     ;; Fix-me: indentation
-    ;;(error "leaving=%s, entering=%s this0,1,2,3=%s,%s,%s,%s" leaving-submode entering-submode this-line-major0 this-line-major1 this-line-major2 this-line-major3)
+    ;;(error "Leaving=%s, entering=%s this0,1,2,3=%s,%s,%s,%s" leaving-submode entering-submode this-line-major0 this-line-major1 this-line-major2 this-line-major3)
     (when (or leaving-submode entering-submode)
       (unless last-main-major-indent
         (save-excursion
-          (while (not last-main-major-indent)
+          (while (and (> 500 (setq while-n1 (1+ while-n1)))
+                      (not last-main-major-indent))
             (if (bobp)
                 (setq last-main-major-indent 0)
               (goto-char (line-beginning-position 0))
@@ -5515,13 +6591,13 @@ The following rules are used when indenting:
         ;; indentation calling indent-line-function would give.
         (condition-case nil
             (atomic-change-group
-              (mumamo-call-indent-line)
+              (mumamo-call-indent-line (nth 0 this-line-chunks))
               (when (> want-indent (current-indentation))
                 (signal 'mumamo-error-ind-0 nil))
               (setq want-indent nil))
           (mumamo-error-ind-0)))
       (unless want-indent
-        (mumamo-call-indent-line))
+        (mumamo-call-indent-line (nth 0 this-line-chunks)))
       (mumamo-msgindent "  enter sub.want-indent=%s, curr=%s, last-main=%s" want-indent (current-indentation)
                         last-main-major-indent)
       ;;(unless (> want-indent (current-indentation)) (setq want-indent nil))
@@ -5545,7 +6621,7 @@ The following rules are used when indenting:
           ;; the code all belongs to the surrounding major mode.
           (progn
             (mumamo-msgindent "  In main major mode")
-            (mumamo-call-indent-line)
+            (mumamo-call-indent-line (nth 0 this-line-chunks))
             (setq last-main-major-indent (current-indentation)))
         ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         ;;;;; In sub major mode
@@ -5562,20 +6638,22 @@ The following rules are used when indenting:
               (here (point))
               ind-on-first-sub-line)
           (save-restriction
-            (narrow-to-region (mumamo-chunk-syntax-min chunk)
-                              (mumamo-chunk-syntax-max chunk))
+            (mumamo-update-obscure chunk here)
+            (let ((syn-min-max (mumamo-chunk-syntax-min-max chunk nil)))
+              (narrow-to-region (car syn-min-max)
+                                (cdr syn-min-max)))
             (save-restriction
               (condition-case nil
                   (atomic-change-group
-                    (mumamo-call-indent-line)
+                    (mumamo-call-indent-line (nth 0 this-line-chunks))
                     (when (= 0 (current-indentation))
                       (setq ind-zero t)
                       ;; It is maybe ok if indentation on first sub
                       ;; line is 0 so check that:
                       (goto-char (point-min))
+                      (widen)
                       (setq ind-on-first-sub-line (current-indentation))
                       (goto-char here)
-                      (widen)
                       (signal 'mumamo-error-ind-0 nil)))
                 (mumamo-error-ind-0)))
             ;; Unfortunately the indentation can sometimes get 0
@@ -5588,14 +6666,16 @@ The following rules are used when indenting:
               (save-excursion
                 (setq want-indent 0)
                 (unless (= 0 ind-on-first-sub-line)
-                  (while (and (= 0 want-indent)
+                  (while (and (> 500 (setq while-n2 (1+ while-n2)))
+                              (= 0 want-indent)
                               (/= (point) (point-min)))
                     (beginning-of-line 0)
                     (setq want-indent (current-indentation)))
                   ;; Now if want-indent is still 0 we need to look further above
                   (when (= 0 want-indent)
                     (widen)
-                    (while (and (= 0 want-indent)
+                    (while (and (> 500 (setq while-n3 (1+ while-n3)))
+                                (= 0 want-indent)
                                 (/= (point) (point-min)))
                       (beginning-of-line 0)
                       (setq want-indent (current-indentation)))
@@ -5617,6 +6697,7 @@ The following rules are used when indenting:
 
 ;; Fix-me: use this for first line in a submode
 (defun mumamo-indent-use-widen (major-mode)
+  "Return non-nil if widen before indentation in MAJOR-MODE."
   (let* ((specials (cadr (assoc major-mode mumamo-major-mode-indent-specials)))
          (use-widen (memq 'use-widen specials))
          (use-widen-maybe (assq 'use-widen specials)))
@@ -5631,21 +6712,32 @@ The following rules are used when indenting:
   "Indent to DEFAULT-INDENT unless a special indent can be done."
   (mumamo-with-major-mode-indentation major-mode
     `(progn
-         (if (mumamo-indent-use-widen major-mode)
-             (save-restriction
-               (widen)
-               (mumamo-msgindent "=> special-or-default did widen, %s" major-mode)
-               (funcall indent-line-function))
-           (indent-to-column default-indent)))))
-
-(defun mumamo-call-indent-line ()
+       (if (mumamo-indent-use-widen major-mode)
+           (save-restriction
+             (widen)
+             (mumamo-msgindent "=> special-or-default did widen, %s" major-mode)
+             (funcall indent-line-function))
+         (indent-to-column default-indent)))))
+
+(defun mumamo-call-indent-line (chunk)
   "Call the relevant `indent-line-function'."
-  (mumamo-with-major-mode-indentation major-mode
-    `(save-restriction
-       (when (mumamo-indent-use-widen major-mode)
-         (mumamo-msgindent "=> indent-line did widen")
-         (widen))
-       (funcall indent-line-function))))
+  (if nil
+      (mumamo-with-major-mode-indentation major-mode
+        `(save-restriction
+           (when (mumamo-indent-use-widen major-mode)
+             (mumamo-msgindent "=> indent-line did widen")
+             (widen))
+           (funcall indent-line-function)))
+    (let ((maj (car mumamo-major-mode-indent-line-function))
+          (fun (cdr mumamo-major-mode-indent-line-function)))
+      (assert (eq maj major-mode))
+      (save-restriction
+        ;; (unless (mumamo-indent-use-widen major-mode)
+        ;;   (let ((syn-min-max (mumamo-chunk-syntax-min-max chunk nil)))
+        ;;     (narrow-to-region (car syn-min-max) (cdr syn-min-max))))
+        (when (mumamo-indent-use-widen major-mode) (widen))
+        (funcall fun)
+        ))))
 
 (defun mumamo-indent-region-function (start end)
   "Indent the region between START and END."
@@ -5654,8 +6746,10 @@ The following rules are used when indenting:
     (goto-char start)
     (let ((old-point -1)
           prev-line-major
-          last-main-major-indent)
-      (while (and (< (point) end)
+          last-main-major-indent
+          (while-n1 0))
+      (while (and (> 3000 (setq while-n1 (1+ while-n1)))
+                  (< (point) end)
                   (/= old-point (point)))
         ;;(message "mumamo-indent-region-function, point=%s" (point))
         (or (and (bolp) (eolp))
@@ -5685,15 +6779,41 @@ This is the buffer local value of
 This is the buffer local value of `fill-paragraph-function' when
 mumamo is used."
   (let* ((ovl (mumamo-get-chunk-save-buffer-state (point)))
-         (major (mumamo-chunk-major-mode ovl))
-         ;;(main-major (mumamo-main-major-mode))
-         )
+         (major (mumamo-chunk-major-mode ovl)))
+    ;; Fix-me: There must be some bug that makes it necessary to
+    ;; always change mode when fill-paragraph-function is
+    ;; c-fill-paragraph.
+
+    ;;(unless (eq major major-mode) (mumamo-set-major major))
+    (mumamo-set-major major)
+
     (save-restriction
-      (narrow-to-region (mumamo-chunk-syntax-min ovl)
-                        (mumamo-chunk-syntax-max ovl))
-      (mumamo-with-major-mode-fontification major
-        ;;`(let ((fill-paragraph-function ,mumamo-original-fill-paragraph-function))
-        `(fill-paragraph ,justify ,region)))))
+      (mumamo-update-obscure ovl (point))
+      (let ((syn-min-max (mumamo-chunk-syntax-min-max ovl nil)))
+        (narrow-to-region (car syn-min-max)
+                          (cdr syn-min-max)))
+      (let ((fill-paragraph-function mumamo-original-fill-paragraph-function)
+            (mumamo-dont-widen t))
+        (ad-enable-advice 'widen 'around 'mumamo-ad-widen)
+        (unwind-protect
+            (fill-paragraph justify region)
+          (ad-disable-advice 'widen 'around 'mumamo-ad-widen)
+          )))))
+
+(defvar mumamo-dont-widen)
+(defadvice widen  (around
+                   mumamo-ad-widen
+                   activate
+                   disable
+                   compile
+                   )
+  "Make `widen' do nothing.
+This is for `mumamo-fill-paragraph-function' and is necessary
+when `c-fill-paragraph' is the real function used."
+  (unless (and (boundp 'mumamo-dont-widen)
+               mumamo-dont-widen)
+    ad-do-it))
+
 
 (defun mumamo-forward-chunk ()
   "Move forward to next chunk."
@@ -5718,7 +6838,7 @@ mumamo is used."
 (defun mumamo-flyspell-verify ()
   "Function used for `flyspell-generic-check-word-predicate'."
   (let* ((chunk (when mumamo-multi-major-mode
-                  (mumamo-get-existing-chunk-at (point))))
+                  (mumamo-find-chunks (point) "mumamo-lyspell-verify")))
          (chunk-major (when chunk (mumamo-chunk-major-mode chunk)))
          (mode-predicate (when chunk-major
                            (let ((predicate (get chunk-major
@@ -5812,22 +6932,28 @@ mumamo is used."
 ;; New versions of syntax-ppss functions, temporary written as defadvice.
 
 (defadvice syntax-ppss-flush-cache (around
-                                    mumamo-advice-syntax-ppss-flush-cache
+                                    mumamo-ad-syntax-ppss-flush-cache
                                     activate
                                     compile
                                     )
   "Support for mumamo.
 See the defadvice for `syntax-ppss' for an explanation."
-  (let ((pos (ad-get-arg 0)))
-    (let* ((chunk-at-pos (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode) (mumamo-get-existing-chunk-at pos))))
-      (if chunk-at-pos
-          (let* ((syntax-ppss-last  (overlay-get chunk-at-pos 'syntax-ppss-last))
-                 (syntax-ppss-cache (overlay-get chunk-at-pos 'syntax-ppss-cache)))
-            (setq ad-return-value ad-do-it)
-            (overlay-put chunk-at-pos 'syntax-ppss-last syntax-ppss-last)
-            (overlay-put chunk-at-pos 'syntax-ppss-cache syntax-ppss-cache)
-            )
-        (setq ad-return-value ad-do-it)))))
+  (if (not mumamo-multi-major-mode)
+      ad-do-it
+    (let ((pos (ad-get-arg 0)))
+      (let* ((chunk-at-pos (when (and (boundp 'mumamo-multi-major-mode)
+                                      mumamo-multi-major-mode)
+                             (mumamo-find-chunks-1 pos "syntax-ppss-flush-cache"))))
+        (if chunk-at-pos
+            (let* ((syntax-ppss-last  (overlay-get chunk-at-pos 'syntax-ppss-last))
+                   (syntax-ppss-cache (overlay-get chunk-at-pos 'syntax-ppss-cache)))
+              ;;(setq ad-return-value ad-do-it)
+              ad-do-it
+              (overlay-put chunk-at-pos 'syntax-ppss-last syntax-ppss-last)
+              (overlay-put chunk-at-pos 'syntax-ppss-cache syntax-ppss-cache))
+          ;;(setq ad-return-value ad-do-it)
+          ad-do-it
+          )))))
 
 (defvar mumamo-syntax-chunk-at-pos nil
   "Internal use.")
@@ -5836,7 +6962,7 @@ See the defadvice for `syntax-ppss' for an explanation."
 ;; Fix-me: Is this really needed?
 ;; See http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg00374.html
 (defadvice syntax-ppss-stats (around
-                              mumamo-advice-syntax-ppss-stats
+                              mumamo-ad-syntax-ppss-stats
                               activate
                               compile
                               )
@@ -5845,10 +6971,9 @@ See the defadvice for `syntax-ppss' for an explanation."
   (if mumamo-syntax-chunk-at-pos
       (let* ((syntax-ppss-stats
               (overlay-get mumamo-syntax-chunk-at-pos 'syntax-ppss-stats)))
-        (setq ad-return-value ad-do-it)
-        (overlay-put mumamo-syntax-chunk-at-pos 'syntax-ppss-stats syntax-ppss-stats)
-        )
-    (setq ad-return-value ad-do-it)))
+        ad-do-it
+        (overlay-put mumamo-syntax-chunk-at-pos 'syntax-ppss-stats syntax-ppss-stats))
+    ad-do-it))
 
 (defvar mumamo-syntax-ppss-major nil)
 
@@ -5888,7 +7013,7 @@ See the defadvice for `syntax-ppss' for an explanation."
 ;; `mumamo-chunk-attr=' to make "" borders, but I am not sure that it
 ;; works and it is the wrong solution.
 (defadvice syntax-ppss (around
-                        mumamo-advice-syntax-ppss
+                        mumamo-ad-syntax-ppss
                         activate
                         compile
                         )
@@ -5913,119 +7038,134 @@ Put this at next chunk's beginning.
 - Otherwise set the state at the beginning of the chunk to nil.
 
 Do here also other necessary adjustments for this."
-  (let ((pos (ad-get-arg 0)))
-    (unless pos (setq pos (point)))
-    (let* ((chunk-at-pos (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode) (mumamo-get-existing-chunk-at pos)))
-           (dump2 (and (boundp 'dump-quote-hunt)
-                      dump-quote-hunt
-                      (boundp 'start)
-                      ;;(= 1109 start)
-                      )))
-      ;;(setq dump2 t)
-      (setq mumamo-syntax-chunk-at-pos chunk-at-pos)
-      (when dump2 (msgtrc "\npos=%s point-min=%s mumamo-syntax-ppss.chunk-at-pos=%s" pos (point-min) chunk-at-pos))
-      (if chunk-at-pos
-          (let* ((chunk-syntax-min (mumamo-chunk-syntax-min chunk-at-pos))
-                 (chunk-major (mumamo-chunk-major-mode chunk-at-pos))
-                 (syntax-ppss-last  (overlay-get chunk-at-pos 'syntax-ppss-last))
-                 (syntax-ppss-cache (overlay-get chunk-at-pos 'syntax-ppss-cache))
-                 (syntax-ppss-last-min  (overlay-get chunk-at-pos 'syntax-ppss-last-min))
-                 (syntax-ppss-cache-min (list syntax-ppss-last-min))
-                 ;; This must be fetch the same way as in syntax-ppss:
-                 (syntax-begin-function (overlay-get chunk-at-pos 'syntax-begin-function))
-                 (syntax-ppss-max-span (if chunk-syntax-min
-                                           (/ (- pos chunk-syntax-min -2) 2)
-                                         syntax-ppss-max-span))
-                 (syntax-ppss-stats (let ((stats (overlay-get chunk-at-pos 'syntax-ppss-stats)))
-                                      (if stats
-                                          stats
-                                        (default-value 'syntax-ppss-stats))))
-                 (last-min-pos (or (car syntax-ppss-last-min)
-                                   1))
-                 )
-            ;; If chunk has moved the cached values are invalid.
-            (unless (= chunk-syntax-min last-min-pos)
-              (setq syntax-ppss-last nil)
-              (setq syntax-ppss-last-min nil)
-              (setq syntax-ppss-cache nil)
-              (setq syntax-ppss-cache-min nil)
-              (setq syntax-ppss-stats (default-value 'syntax-ppss-stats)))
-            (when dump2
-              (msgtrc " get syntax-ppss-last-min=%s len=%s chunk=%s" syntax-ppss-last-min (length syntax-ppss-last-min) chunk-at-pos)
-              (msgtrc " prop syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos))
-              (msgtrc " chunk-major=%s, %s, syntax-min=%s\n last-min=%s" chunk-major major-mode chunk-syntax-min syntax-ppss-last-min))
-            ;;(setq dump2 nil)
-            (when syntax-ppss-last-min
-              (unless (car syntax-ppss-last-min)
-                ;;(msgtrc "fix-me: emacs bug workaround, setting car of syntax-ppss-last-min")
-                ;;(setcar syntax-ppss-last-min (1- chunk-syntax-min))
-                (msgtrc "fix-me: emacs bug workaround, need new syntax-ppss-last-min because car is nil")
+  (if (not mumamo-multi-major-mode)
+      ad-do-it
+    (let ((pos (ad-get-arg 0)))
+      (unless pos (setq pos (point)))
+      (let* ((chunk-at-pos (when (and (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+                             (mumamo-find-chunks-1 pos "syntax-ppss")))
+             (dump2 (and (boundp 'dump-quote-hunt)
+                         dump-quote-hunt
+                         (boundp 'start)
+                         ;;(= 1109 start)
+                         )))
+        ;;(setq dump2 t)
+        (setq mumamo-syntax-chunk-at-pos chunk-at-pos)
+        (when dump2 (msgtrc "\npos=%s point-min=%s mumamo-syntax-ppss.chunk-at-pos=%s" pos (point-min) chunk-at-pos))
+        (if chunk-at-pos
+            (let* ((chunk-syntax-min-max (mumamo-chunk-syntax-min-max chunk-at-pos t))
+                   (chunk-syntax-min (car chunk-syntax-min-max))
+                   (chunk-major (mumamo-chunk-major-mode chunk-at-pos))
+                   (syntax-ppss-last  (overlay-get chunk-at-pos 'syntax-ppss-last))
+                   (syntax-ppss-cache (overlay-get chunk-at-pos 'syntax-ppss-cache))
+                   (syntax-ppss-last-min  (overlay-get chunk-at-pos 'syntax-ppss-last-min))
+                   (syntax-ppss-cache-min (list syntax-ppss-last-min))
+                   ;; This must be fetch the same way as in syntax-ppss:
+                   (syntax-begin-function (overlay-get chunk-at-pos 'syntax-begin-function))
+                   (syntax-ppss-max-span (if chunk-syntax-min
+                                             (/ (- pos chunk-syntax-min -2) 2)
+                                           syntax-ppss-max-span))
+                   (syntax-ppss-stats (let ((stats (overlay-get chunk-at-pos 'syntax-ppss-stats)))
+                                        (if stats
+                                            stats
+                                          (default-value 'syntax-ppss-stats))))
+                   (last-min-pos (or (car syntax-ppss-last-min)
+                                     1))
+                   )
+              ;; If chunk has moved the cached values are invalid.
+              (unless (= chunk-syntax-min last-min-pos)
+                (setq syntax-ppss-last nil)
                 (setq syntax-ppss-last-min nil)
-                ))
-            (unless syntax-ppss-last-min
-              (setq syntax-ppss-last nil)
-              (save-restriction
-                (widen)
-                (let* ((min-pos chunk-syntax-min)
-                       (chunk-sub-major (mumamo-chunk-major-mode chunk-at-pos))
-                       (main-major (mumamo-main-major-mode))
-                       (is-main-mode-chunk (eq chunk-sub-major main-major)))
-                  (when dump2 (msgtrc " min-pos=%s, is-main-mode-chunk=%s" min-pos is-main-mode-chunk))
-                  (assert (and min-pos) t)
-                  (setq syntax-ppss-last-min
-                        (cons min-pos ;;(1- min-pos)
-                              (if nil ;is-main-mode-chunk
-                                  ;; Fix-me: previous chunks as a cache?
-                                  (mumamo-with-major-mode-fontification main-major
-                                    `(parse-partial-sexp 1 ,min-pos nil nil nil nil))
-                                (parse-partial-sexp 1 1))))
-                  (setq syntax-ppss-cache-min (list syntax-ppss-last-min))
-                  (when dump2 (msgtrc " put syntax-ppss-last-min=%s len=%s chunk=%s" syntax-ppss-last-min (length syntax-ppss-last-min) chunk-at-pos))
-                  (when dump2 (msgtrc " prop syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos)))
-                  (overlay-put chunk-at-pos 'syntax-ppss-last-min syntax-ppss-last-min)
-                  (let ((test-syntax-ppss-last-min
-                         (overlay-get chunk-at-pos 'syntax-ppss-last-min)))
-                    (when dump2 (msgtrc " test syntax-ppss-last-min=%s len=%s" test-syntax-ppss-last-min (length test-syntax-ppss-last-min)))
-                    (when dump2 (msgtrc " propt syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos)))
-                  ))))
-            (when dump2 (msgtrc " here 0, syntax-ppss-last=%s" syntax-ppss-last))
-            (unless syntax-ppss-last
-              (setq syntax-ppss-last syntax-ppss-last-min)
-              (setq syntax-ppss-cache syntax-ppss-cache-min))
-            ;;(syntax-ppss pos)
-            (when dump2 (msgtrc " at 1, syntax-ppss-last=%s" syntax-ppss-last))
-            (when dump2 (msgtrc " at 1, syntax-ppss-cache=%s" syntax-ppss-cache))
-            (let (ret-val
-                  (by-pass-cache t)
-                  (dump2 dump2))
-              (if (not by-pass-cache)
-                  (progn
-                    (when dump2
-                      (let ((old-ppss (cdr syntax-ppss-last))
-                            (old-pos (car syntax-ppss-last)))
-                        (assert (and old-pos pos) t)
-                        (msgtrc "parse-partial-sexp=>%s" (parse-partial-sexp old-pos pos nil nil old-ppss))))
-                    (let (dump2)
-                      (setq ret-val ad-do-it)))
-                (let ((old-ppss (cdr syntax-ppss-last))
-                      (old-pos (car syntax-ppss-last)))
-                  (when dump2
-                    (msgtrc "Xparse-partial-sexp %s %s nil nil %s" old-pos pos old-ppss)
-                    (let (dump2)
-                      (msgtrc "ad-do-it=>%s" ad-do-it)))
-                  (save-restriction
-                    (widen)
-                    (assert (and old-pos pos) t)
+                (setq syntax-ppss-cache nil)
+                (setq syntax-ppss-cache-min nil)
+                (setq syntax-ppss-stats (default-value 'syntax-ppss-stats)))
+              (when dump2
+                (msgtrc " get syntax-ppss-last-min=%s len=%s chunk=%s" syntax-ppss-last-min (length syntax-ppss-last-min) chunk-at-pos)
+                (msgtrc " prop syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos))
+                (msgtrc " chunk-major=%s, %s, syntax-min=%s\n last-min=%s" chunk-major major-mode chunk-syntax-min syntax-ppss-last-min))
+              ;;(setq dump2 nil)
+              (when syntax-ppss-last-min
+                (unless (car syntax-ppss-last-min)
+                  ;;(msgtrc "fix-me: emacs bug workaround, setting car of syntax-ppss-last-min")
+                  ;;(setcar syntax-ppss-last-min (1- chunk-syntax-min))
+                  ;;(msgtrc "fix-me: emacs bug workaround, need new syntax-ppss-last-min because car is nil")
+                  (setq syntax-ppss-last-min nil)
+                  ))
+              (unless syntax-ppss-last-min
+                (setq syntax-ppss-last nil)
+                (save-restriction
+                  (widen)
+                  (let* ((min-pos chunk-syntax-min)
+                         (chunk-sub-major (mumamo-chunk-major-mode chunk-at-pos))
+                         (main-major (mumamo-main-major-mode))
+                         (is-main-mode-chunk (eq chunk-sub-major main-major)))
+                    (when dump2 (msgtrc " min-pos=%s, is-main-mode-chunk=%s" min-pos is-main-mode-chunk))
+                    ;; Looks like assert can not be used here for some reason???
+                    ;;(assert (and min-pos) t)
+                    (unless (and min-pos) (error "defadvice syntax-ppss: (and min-pos=%s)" min-pos))
+                    (setq syntax-ppss-last-min
+                          (cons min-pos ;;(1- min-pos)
+                                (if nil ;is-main-mode-chunk
+                                    ;; Fix-me: previous chunks as a
+                                    ;; cache? The problem is updating
+                                    ;; this. Perhaps it is possible to
+                                    ;; prune how far back to go by
+                                    ;; going to the first chunk
+                                    ;; backwards where
+                                    ;; (pars-partial-sexp min max) is
+                                    ;; "nil"?
+                                    (mumamo-with-major-mode-fontification main-major
+                                      `(parse-partial-sexp 1 ,min-pos nil nil nil nil))
+                                  (parse-partial-sexp 1 1))))
+                    (setq syntax-ppss-cache-min (list syntax-ppss-last-min))
+                    (when dump2 (msgtrc " put syntax-ppss-last-min=%s len=%s chunk=%s" syntax-ppss-last-min (length syntax-ppss-last-min) chunk-at-pos))
+                    (when dump2 (msgtrc " prop syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos)))
+                    (overlay-put chunk-at-pos 'syntax-ppss-last-min syntax-ppss-last-min)
+                    (let ((test-syntax-ppss-last-min
+                           (overlay-get chunk-at-pos 'syntax-ppss-last-min)))
+                      (when dump2 (msgtrc " test syntax-ppss-last-min=%s len=%s" test-syntax-ppss-last-min (length test-syntax-ppss-last-min)))
+                      (when dump2 (msgtrc " propt syntax-ppss-last-min=%s" (overlay-properties chunk-at-pos)))
+                      ))))
+              (when dump2 (msgtrc " here 0, syntax-ppss-last=%s" syntax-ppss-last))
+              (unless syntax-ppss-last
+                (setq syntax-ppss-last syntax-ppss-last-min)
+                (setq syntax-ppss-cache syntax-ppss-cache-min))
+              ;;(syntax-ppss pos)
+              (when dump2 (msgtrc " at 1, syntax-ppss-last=%s" syntax-ppss-last))
+              (when dump2 (msgtrc " at 1, syntax-ppss-cache=%s" syntax-ppss-cache))
+              (let (ret-val
+                    (by-pass-cache t)
+                    (dump2 dump2))
+                (if (not by-pass-cache)
+                    (progn
+                      (when dump2
+                        (let ((old-ppss (cdr syntax-ppss-last))
+                              (old-pos (car syntax-ppss-last)))
+                          ;;(assert (and old-pos pos) t)
+                          (unless (and old-pos pos) (error "defadvice syntax-ppss: (and old-pos=%s pos=%s)" old-pos pos))
+                          (msgtrc "parse-partial-sexp=>%s" (parse-partial-sexp old-pos pos nil nil old-ppss))))
+                      (let (dump2)
+                        (setq ret-val ad-do-it)))
+                  (let ((old-ppss (cdr syntax-ppss-last))
+                        (old-pos (car syntax-ppss-last)))
                     (when dump2
-                      (msgtrc "parse-partial-sexp %s %s nil nil %s" old-pos pos old-ppss))
-                    (setq ret-val (parse-partial-sexp old-pos pos nil nil old-ppss)))))
-              (when dump2 (msgtrc " ==>ret-val=%s" ret-val))
-              (setq ad-return-value ret-val))
-            (overlay-put chunk-at-pos 'syntax-ppss-last syntax-ppss-last)
-            (overlay-put chunk-at-pos 'syntax-ppss-cache syntax-ppss-cache)
-            (overlay-put chunk-at-pos 'syntax-ppss-stats syntax-ppss-stats)
-            )
-        (setq ad-return-value ad-do-it)))))
+                      (msgtrc "Xparse-partial-sexp %s %s nil nil %s" old-pos pos old-ppss)
+                      (let (dump2)
+                        (msgtrc "ad-do-it=>%s" ad-do-it)))
+                    (save-restriction
+                      (widen)
+                      ;;(assert (and old-pos pos) t)
+                      (unless (and old-pos pos) (error "defadvice syntax-ppss 2 (and old-pos=%s pos=%s)" old-pos pos))
+                      (when dump2
+                        (msgtrc "parse-partial-sexp %s %s nil nil %s" old-pos pos old-ppss))
+                      (setq ret-val (parse-partial-sexp old-pos pos nil nil old-ppss)))))
+                (when dump2 (msgtrc " ==>ret-val=%s" ret-val))
+                (setq ad-return-value ret-val))
+              (overlay-put chunk-at-pos 'syntax-ppss-last syntax-ppss-last)
+              (overlay-put chunk-at-pos 'syntax-ppss-cache syntax-ppss-cache)
+              (overlay-put chunk-at-pos 'syntax-ppss-stats syntax-ppss-stats)
+              )
+          ad-do-it)))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -6040,7 +7180,7 @@ This is to be set by multiple major mode frame works, like
 mumamo.
 
 See also `rng-valid-nxml-major-mode-chunk-function' and
-`rng-end-major-mode-chunk-function'. Note that all three
+`rng-end-major-mode-chunk-function'.  Note that all three
 variables must be set.")
 (make-variable-buffer-local 'rng-get-major-mode-chunk-function)
 (put 'rng-get-major-mode-chunk-function 'permanent-local t)
@@ -6064,42 +7204,38 @@ For more info see also `rng-get-major-mode-chunk-function'.")
 
 ;; Fix-me: The solution in this defadvice is temporary. The defadvice
 ;; for rng-do-some-validation should be fixed instead.
+;; (ad-disable-advice 'rng-mark-error 'around 'mumamo-ad-rng-mark-error)
+;; (ad-ensable-advice 'rng-mark-error 'around 'mumamo-ad-rng-mark-error)
 (defadvice rng-mark-error (around
-                           mumamo-advice-rng-mark-error
+                           mumamo-ad-rng-mark-error
                            activate
-                           compile
-                           )
-  (let* ((beg (ad-get-arg 1))
-         (end (ad-get-arg 2))
-         (ovls-beg-end (overlays-in beg end))
-         (xml-parts nil)
-         chunks
-         )
-    (dolist (ovl ovls-beg-end)
-      (when (mumamo-chunk-major-mode ovl)
-        (setq chunks (cons ovl chunks))))
-    ;;(message "rng-mark-error advice, beg,end=%s,%s" beg end)
-    ;;(message "chunks=%s" chunks)
-    (if (not chunks)
-        ad-do-it
-      (dolist (chunk chunks)
-        (when (mumamo-valid-nxml-chunk chunk)
+                           compile)
+  "Adjust range for error to chunks."
+  (if (not mumamo-multi-major-mode)
+      ad-do-it
+    (let* ((beg (ad-get-arg 1))
+           (end (ad-get-arg 2))
+           (xml-parts nil)
+           (chunk (mumamo-find-chunks beg "rng-mark-error")))
+      (if (not chunk)
+          ad-do-it
+        (when (and (not (overlay-get chunk 'mumamo-region))
+                   (mumamo-valid-nxml-chunk chunk))
           ;; rng-error
           (let ((part-beg (max (overlay-start chunk)
                                beg))
                 (part-end (min (overlay-end chunk)
                                end)))
-            ;;(message "   part-beg/end=%s/%s" part-beg part-end)
             (when (< part-beg part-end)
               (ad-set-arg 1 part-beg)
               (ad-set-arg 2 part-end)
               ad-do-it)))))))
 
 (defadvice rng-do-some-validation-1 (around
-                                     mumamo-advice-rng-do-some-validation-1
+                                     mumamo-ad-rng-do-some-validation-1
                                      activate
-                                     compile
-                                     )
+                                     compile)
+  "Adjust validation to chunks."
   (if (not mumamo-multi-major-mode)
       ad-do-it
     (let (major-mode-chunk
@@ -6121,6 +7257,8 @@ For more info see also `rng-get-major-mode-chunk-function'.")
           xmltok-namespace-attributes
           xmltok-dependent-regions
           xmltok-errors
+          (while-n1 0)
+          (while-n2 0)
           )
       ;;(message "> > > > > enter rng-do-some-validation-1, continue-p-function=%s" continue-p-function)
       (setq have-remaining-chars (< (point) point-max))
@@ -6135,7 +7273,9 @@ For more info see also `rng-get-major-mode-chunk-function'.")
         (unless (equal rng-dtd xmltok-dtd)
           (rng-clear-conditional-region))
         (setq rng-dtd xmltok-dtd))
-      (while continue
+      (setq while-n1 0)
+      (while (and (> 500 (setq while-n1 (1+ while-n1)))
+                  continue)
         ;; If mumamo (or something similar) is used then jump over parts
         ;; that can not be parsed by nxml-mode.
         (when (and rng-get-major-mode-chunk-function
@@ -6146,18 +7286,19 @@ For more info see also `rng-get-major-mode-chunk-function'.")
             (skip-chars-forward " \t\r\n")
             (setq next-non-space-pos (point))
             (goto-char here)
-            ;;(message "here when, p=%s emmc=%s non-space=%s" (point) end-major-mode-chunk next-non-space-pos )
             (unless (and end-major-mode-chunk
                          ;; Remaining chars in this chunk?
                          (< next-non-space-pos end-major-mode-chunk))
               (setq end-major-mode-chunk nil)
-              (setq major-mode-chunk (funcall rng-get-major-mode-chunk-function next-non-space-pos))
-              (while (and major-mode-chunk
+              (setq major-mode-chunk (funcall rng-get-major-mode-chunk-function next-non-space-pos "rng-do-some-validation-1 A"))
+              (setq while-n2 0)
+              (while (and (> 500 (setq while-n2 (1+ while-n2)))
+                          major-mode-chunk
                           (not (funcall rng-valid-nxml-major-mode-chunk-function major-mode-chunk))
                           (< next-non-space-pos (point-max)))
                 (let ((end-pos (funcall rng-end-major-mode-chunk-function major-mode-chunk)))
                   (goto-char (+ end-pos 0))
-                  (setq major-mode-chunk (funcall rng-get-major-mode-chunk-function (point)))
+                  (setq major-mode-chunk (funcall rng-get-major-mode-chunk-function (point) "rng-do-some-validation-1 B"))
                   ;;(message "---> here 3, point=%s, ep=%s, mm-chunk=%s" (point) end-pos major-mode-chunk)
                   )
                 (setq next-non-space-pos (point))))
@@ -6261,31 +7402,54 @@ For more info see also `rng-get-major-mode-chunk-function'.")
                                           pos))))))))))
       ;;(message "--- exit rng-do-some-validation-1, have-remaining-chars=%s" have-remaining-chars)
       (setq have-remaining-chars (< (point) point-max))
-      have-remaining-chars)))
+      (setq ad-return-value have-remaining-chars))))
+
+(defadvice rng-after-change-function (around
+                                      mumamo-ad-rng-after-change-function
+                                      activate
+                                      compile)
+  (when rng-validate-up-to-date-end
+    ad-do-it))
+
+(defadvice rng-validate-while-idle (around
+                                    mumamo-ad-rng-validate-while-idle
+                                    activate
+                                    compile)
+  (if (not (buffer-live-p buffer))
+      (rng-kill-timers)
+    ad-do-it))
+
+(defadvice rng-validate-quick-while-idle (around
+                                    mumamo-ad-rng-validate-quick-while-idle
+                                    activate
+                                    compile)
+  (if (not (buffer-live-p buffer))
+      (rng-kill-timers)
+    ad-do-it))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; xmltok.el
 
-;; This advice only prevents adding nxml/rng-valid errors in non-xml
-;; chunks. Doing more seems like a very big job - unless Emacs gets a
-;; narrow-to-multiple-regions function!
+;; (ad-disable-advice 'xmltok-add-error 'around 'mumamo-ad-xmltok-add-error)
+;; (ad-ensable-advice 'xmltok-add-error 'around 'mumamo-ad-xmltok-add-error)
 (defadvice xmltok-add-error (around
-                             mumamo-advice-xmltok-add-error
+                             mumamo-ad-xmltok-add-error
                              activate
                              compile
                              )
+  "Prevent rng validation errors in non-xml chunks.
+This advice only prevents adding nxml/rng-valid errors in non-xml
+chunks.  Doing more seems like a very big job - unless Emacs gets
+a narrow-to-multiple-regions function!"
   (if (not mumamo-multi-major-mode)
       ad-do-it
     (when (let* ((start (or start xmltok-start))
                  (end (or end (point)))
-                 ;; Fix-me: this is too slow - or was that really the
-                 ;; problem???
-                 ;;(chunk (mumamo-get-existing-chunk-at (if start start end)))
+                 (chunk (mumamo-find-chunks (if start start end) "xmltok-add-error"))
                  )
-            (mumamo-valid-nxml-point (if start start end))
-            ;;(when chunk (mumamo-valid-nxml-chunk chunk))
-            )
-      ;;(message "xmltok-add-error start=%s, end=%s" start end)
+            (or (not chunk)
+                (and (not (overlay-get chunk 'mumamo-region))
+                     (mumamo-valid-nxml-chunk chunk))))
       (setq xmltok-errors
             (cons (xmltok-make-error message
                                      (or start xmltok-start)
@@ -6299,25 +7463,47 @@ For more info see also `rng-get-major-mode-chunk-function'.")
 ;; Fix-me: This assumes there are no other advices on these functions.
 (if t
     (progn
-      (ad-activate 'syntax-ppss)
-      (ad-activate 'syntax-ppss-flush-cache)
-      (ad-activate 'syntax-ppss-stats)
-      (ad-activate 'rng-do-some-validation-1)
-      (ad-activate 'rng-mark-error)
-      (ad-activate 'xmltok-add-error)
+      ;; (ad-activate 'syntax-ppss)
+      ;; (ad-activate 'syntax-ppss-flush-cache)
+      ;; (ad-activate 'syntax-ppss-stats)
+      ;; (ad-activate 'rng-do-some-validation-1)
+      ;; (ad-activate 'rng-mark-error)
+      ;; (ad-activate 'xmltok-add-error)
+      (ad-enable-advice 'syntax-ppss 'around 'mumamo-ad-syntax-ppss)
+      (ad-enable-advice 'syntax-ppss-flush-cache 'around 'mumamo-ad-syntax-ppss-flush-cache)
+      (ad-enable-advice 'syntax-ppss-stats 'around 'mumamo-ad-syntax-ppss-stats)
+      (ad-enable-advice 'rng-do-some-validation-1 'around 'mumamo-ad-rng-do-some-validation-1)
+      (ad-enable-advice 'rng-mark-error 'around 'mumamo-ad-rng-mark-error)
+      (ad-enable-advice 'rng-after-change-function 'around 'mumamo-ad-rng-after-change-function)
+      (ad-enable-advice 'rng-validate-while-idle 'around 'mumamo-ad-rng-validate-while-idle)
+      (ad-enable-advice 'rng-validate-quick-while-idle 'around 'mumamo-ad-rng-validate-quick-while-idle)
+      (ad-enable-advice 'xmltok-add-error 'around 'mumamo-ad-xmltok-add-error)
       )
-  (ad-deactivate 'syntax-ppss)
-  (ad-deactivate 'syntax-ppss-flush-cache)
-  (ad-deactivate 'syntax-ppss-stats)
-  (ad-deactivate 'rng-do-some-validation-1)
-  (ad-deactivate 'rng-mark-error)
-  (ad-deactivate 'xmltok-add-error)
+  ;; (ad-deactivate 'syntax-ppss)
+  ;; (ad-deactivate 'syntax-ppss-flush-cache)
+  ;; (ad-deactivate 'syntax-ppss-stats)
+  ;; (ad-deactivate 'rng-do-some-validation-1)
+  ;; (ad-deactivate 'rng-mark-error)
+  ;; (ad-deactivate 'xmltok-add-error)
+  (ad-disable-advice 'syntax-ppss 'around 'mumamo-ad-syntax-ppss)
+  (ad-disable-advice 'syntax-ppss-flush-cache 'around 'mumamo-ad-syntax-ppss-flush-cache)
+  (ad-disable-advice 'syntax-ppss-stats 'around 'mumamo-ad-syntax-ppss-stats)
+  (ad-disable-advice 'rng-do-some-validation-1 'around 'mumamo-ad-rng-do-some-validation-1)
+  (ad-disable-advice 'rng-mark-error 'around 'mumamo-ad-rng-mark-error)
+  (ad-disable-advice 'rng-after-change-function 'around 'mumamo-ad-rng-after-change-function)
+  (ad-disable-advice 'rng-validate-while-idle 'around 'mumamo-ad-rng-validate-while-idle)
+  (ad-disable-advice 'rng-validate-quick-while-idle 'around 'mumamo-ad-rng-validate-quick-while-idle)
+  (ad-disable-advice 'xmltok-add-error 'around 'mumamo-ad-xmltok-add-error)
   )
 
 (font-lock-add-keywords
  'emacs-lisp-mode
  '(("\\<define-mumamo-multi-major-mode\\>" . font-lock-keyword-face)))
 
+
+(when buffer-file-name (message "\nFinished evaluating %s\n" buffer-file-name))
+(when load-file-name (message "\nFinished loading %s\n" load-file-name))
+
 (provide 'mumamo)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; mumamo.el ends here
+;;; mumamo.el ends bere
diff --git a/elpa-to-submit/nxhtml/util/n-back.el b/elpa-to-submit/nxhtml/util/n-back.el
new file mode 100644
index 0000000000..fd4a0e308e
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/n-back.el
@@ -0,0 +1,1277 @@
+;;; n-back.el --- n-back game
+;;
+;; Author: Lennart Borgman (lennart O borgman A gmail O com)
+;; Created: 2009-05-23 Sat
+(defconst n-back:version "0.5");; Version:
+;; Last-Updated: 2009-08-04 Tue
+;; URL:
+;; Keywords:
+;; Compatibility:
+;;
+;; Features that might be required by this library:
+;;
+  ;; `winsize'.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; n-back game for brain training.  See `n-back-game' for more
+;; information.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Change log:
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program 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 3, or
+;; (at your option) any later version.
+;;
+;; This program 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+;; (setq n-back-trials 2)
+
+(require 'winsize) ;; Ehum...
+;;(require 'new-key-seq-widget)
+
+(defvar n-back-game-window nil)
+(defvar n-back-game-buffer nil)
+
+(defvar n-back-ctrl-window nil)
+(defvar n-back-ctrl-buffer nil)
+
+(defvar n-back-info-window nil)
+(defvar n-back-info-buffer nil)
+
+(defvar n-back-trials-left nil)
+(defvar n-back-timer nil)
+(defvar n-back-clear-timer nil)
+
+(defvar n-back-result nil)
+(defvar n-back-this-result nil)
+
+(defvar n-back-ring nil)
+
+(defvar n-back-num-active nil)
+
+
+(defgroup n-back nil
+  "Customizations for `n-back-game' game."
+  :group 'games)
+
+(defgroup n-back-feel nil
+  "Customizations for `n-back-game' game keys, faces etc."
+  :group 'n-back)
+
+(defface n-back-ok
+  '((t (:foreground "black" :background "green")))
+  "Face for OK answer."
+  :group 'n-back-feel)
+
+(defface n-back-bad
+  '((t (:foreground "black" :background "OrangeRed1")))
+  "Face for bad answer."
+  :group 'n-back-feel)
+
+(defface n-back-hint
+  '((t (:foreground "black" :background "gold")))
+  "Face for bad answer."
+  :group 'n-back-feel)
+
+(defface n-back-do-now
+  '((((background dark)) (:foreground "yellow"))
+    (t (:foreground "blue")))
+  "Face for start and stop hints."
+  :group 'n-back-feel)
+
+(defface n-back-game-word
+  '((t (:foreground "black")))
+  "Face for word displayed in game."
+  :group 'n-back-feel)
+
+(defface n-back-header
+  '((((background dark)) (:background "OrangeRed4"))
+    (t (:background "gold")))
+  "Face for headers."
+  :group 'n-back-feel)
+
+(defface n-back-keybinding
+  '((((background dark)) (:background "purple4"))
+    (t (:background "OliveDrab1")))
+  "Face for key bindings."
+  :group 'n-back-feel)
+
+(defface n-back-last-result
+  '((((background dark)) (:background "OliveDrab4"))
+    (t (:background "yellow")))
+  "Face for last game result header."
+  :group 'n-back-feel)
+
+(defface n-back-welcome
+  '((((background dark)) (:foreground "OliveDrab3"))
+    (t (:foreground "OliveDrab4")))
+  "Face for welcome string"
+  :group 'n-back-feel)
+
+(defface n-back-welcome-header
+  '((t (:height 2.0)))
+  "Face for welcome header."
+  :group 'n-back-feel)
+
+(defcustom n-back-level 1
+  "The n-Back level."
+  :type '(radio (const 1)
+                 (const 2)
+                 (const 3)
+                 (const 4))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (featurep 'n-back)
+           (n-back-update-control-buffer)
+           (n-back-update-info)))
+  :group 'n-back)
+
+(defcustom n-back-active-match-types '(position color sound)
+  "Active match types."
+  :type '(set (const position)
+              (const color)
+              (const sound)
+              (const word))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (setq n-back-num-active (length val))
+         (when (featurep 'n-back)
+           (n-back-init-control-status)
+           (n-back-update-control-buffer)
+           (n-back-update-info)))
+  :group 'n-back)
+
+(defcustom n-back-allowed-match-types '(position color sound word)
+  "Match types allowed in auto challenging."
+  :type '(set (const position)
+              (const color)
+              (const sound)
+              (const word))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (featurep 'n-back)
+           (n-back-set-random-match-types (length n-back-active-match-types) nil)
+           (n-back-init-control-status)
+           (n-back-update-control-buffer)
+           (n-back-update-info)))
+  :group 'n-back)
+
+(defcustom n-back-auto-challenge t
+  "Automatic challenge decrease/increase."
+  :type 'boolean
+  :group 'n-back)
+
+(defun n-back-toggle-auto-challenge ()
+  "Toggle `n-back-auto-challenge'."
+  (interactive)
+  (let ((val (not n-back-auto-challenge)))
+    (customize-set-variable 'n-back-auto-challenge val)
+    (customize-set-value 'n-back-auto-challenge val)))
+
+(defcustom n-back-colors
+  '("gold" "orange red" "lawn green" "peru" "pink" "gray" "light blue")
+  "Random colors to display."
+  :type '(repeat color)
+  :group 'n-back)
+
+(defcustom n-back-words "you cat going me forest crying brown"
+  "Random words to display."
+  :type 'string
+  :group 'n-back)
+
+(defcustom n-back-sound-volume 0.2
+  "Sound volume 0-1."
+  :type 'float
+  :group 'n-back-feel)
+
+(defcustom n-back-sounds '("c:/program files/brain workshop/res" "piano-")
+  "Random sounds location."
+  :type '(list (directory :tag "Directory")
+               (regexp :tag "File name regexp"))
+  :group 'n-back)
+
+(defvar n-back-control-mode-map nil)
+
+(defun n-back-key-binding (what)
+  "Return key binding used for WHAT match answers."
+  (nth
+   (case what
+    (position 0)
+    (color    1)
+    (sound    2)
+    (word     3))
+   n-back-keys))
+
+(defun n-back-make-keymap ()
+  "Make keymap for the game."
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?1] 'n-back-change-level)
+    (define-key map [?2] 'n-back-change-level)
+    (define-key map [?3] 'n-back-change-level)
+    (define-key map [?4] 'n-back-change-level)
+    (define-key map [?5] 'n-back-change-level)
+    (define-key map [?6] 'n-back-change-level)
+    (define-key map [??] 'n-back-help)
+    (define-key map [?\ ] 'n-back-play)
+    (define-key map [(control ?g)] 'n-back-stop)
+    (define-key map [?-] 'n-back-decrease-speed)
+    (define-key map [?+] 'n-back-increase-speed)
+
+    (define-key map [(control ?r)] 'n-back-reset-game-to-saved)
+    (define-key map [(control ?s)] 'n-back-save-game-settings)
+
+    (define-key map [?t ?p] 'n-back-toggle-position)
+    (define-key map [?t ?c] 'n-back-toggle-color)
+    (define-key map [?t ?s] 'n-back-toggle-sound)
+    (define-key map [?t ?w] 'n-back-toggle-word)
+
+    (define-key map [?T ?a] 'n-back-toggle-auto-challenge)
+    (define-key map [up]    'n-back-challenge-up)
+    (define-key map [down]  'n-back-challenge-down)
+
+    (define-key map [?T ?p] 'n-back-toggle-allowed-position)
+    (define-key map [?T ?c] 'n-back-toggle-allowed-color)
+    (define-key map [?T ?s] 'n-back-toggle-allowed-sound)
+    (define-key map [?T ?w] 'n-back-toggle-allowed-word)
+
+    (define-key map (n-back-key-binding 'position) 'n-back-position-answer)
+    (define-key map (n-back-key-binding 'color)    'n-back-color-answer)
+    (define-key map (n-back-key-binding 'sound)    'n-back-sound-answer)
+    (define-key map (n-back-key-binding 'word)     'n-back-word-answer)
+    ;;(define-key map [t] 'ignore)
+    (setq n-back-control-mode-map map)))
+
+(defcustom n-back-keys
+  '(
+    [?p]
+    [?c]
+    [?s]
+    [?w]
+    )
+  "Key bindings for answering."
+  :type '(list
+          (key-sequence :tag "position key")
+          (key-sequence :tag "color key")
+          (key-sequence :tag "sound key")
+          (key-sequence :tag "word key")
+          )
+  :set (lambda (sym val)
+         (set-default sym val)
+         (n-back-make-keymap))
+  :group 'n-back-feel)
+
+(defvar n-back-display-hint nil)
+(defcustom n-back-hint t
+  "Display hints - learning mode."
+  :type 'boolean
+  :group 'n-back)
+
+
+
+(defvar n-back-sound-files nil)
+;;(n-back-get-sound-files)
+(defun n-back-get-sound-files ()
+  "Get sound file names."
+  (let ((dir (nth 0 n-back-sounds))
+        (regexp (nth 1 n-back-sounds)))
+    (when (file-directory-p dir)
+      (setq n-back-sound-files (directory-files dir nil regexp)))))
+
+(defun n-back-toggle-position ()
+  "Toggle use of position in `n-back-active-match-types'."
+  (interactive)
+  (n-back-toggle 'position))
+
+(defun n-back-toggle-color ()
+  "Toggle use of color in `n-back-active-match-types'."
+  (interactive)
+  (n-back-toggle 'color))
+
+(defun n-back-toggle-sound ()
+  "Toggle use of sound in `n-back-active-match-types'."
+  (interactive)
+  (n-back-toggle 'sound))
+
+(defun n-back-toggle-word ()
+  "Toggle use of word in `n-back-active-match-types'."
+  (interactive)
+  (n-back-toggle 'word))
+
+(defun n-back-toggle (match-type)
+  "Toggle use of MATCH-TYPE in `n-back-active-match-types'."
+  (n-back-toggle-1 match-type 'n-back-active-match-types))
+
+(defun n-back-toggle-allowed-position ()
+  "Toggle use of position in `n-back-allowed-match-types'."
+  (interactive)
+  (n-back-toggle-allowed 'position))
+
+(defun n-back-toggle-allowed-color ()
+  "Toggle use of color in `n-back-allowed-match-types'."
+  (interactive)
+  (n-back-toggle-allowed 'color))
+
+(defun n-back-toggle-allowed-sound ()
+  "Toggle use of sound in `n-back-allowed-match-types'."
+  (interactive)
+  (n-back-toggle-allowed 'sound))
+
+(defun n-back-toggle-allowed-word ()
+  "Toggle use of word in `n-back-allowed-match-types'."
+  (interactive)
+  (n-back-toggle-allowed 'word))
+
+(defun n-back-toggle-allowed (match-type)
+  "Toggle use of MATCH-TYPE in `n-back-allowed-match-types'."
+  (n-back-toggle-1 match-type 'n-back-allowed-match-types))
+
+(defun n-back-sort-types (types)
+  "Sort TYPES to order used in defcustoms here."
+  (sort types
+        (lambda (a b)
+          (let ((all '(position color sound word)))
+            (< (length (memq a all))
+               (length (memq b all)))))))
+
+(defun n-back-toggle-1 (match-type active-list-sym)
+  "Toggle use of MATCH-TYPE in list ACTIVE-LIST-SYM."
+  (let (active-types)
+    (if (memq match-type (symbol-value active-list-sym))
+        (setq active-types (delq match-type (symbol-value active-list-sym)))
+      (setq active-types (cons match-type (symbol-value active-list-sym))))
+    (setq active-types (n-back-sort-types active-types))
+    (customize-set-variable active-list-sym active-types)
+    (customize-set-value active-list-sym active-types)))
+
+(defcustom n-back-sec-per-trial 3.0
+  "Seconds per trial."
+  :type 'float
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (featurep 'n-back)
+           (n-back-update-info)))
+  :group 'n-back)
+
+(defun n-back-decrease-speed ()
+  "Decrease speed of trials."
+  (interactive)
+  (setq n-back-sec-per-trial (+ n-back-sec-per-trial 0.25))
+  (when (> n-back-sec-per-trial 5.0)
+    (setq n-back-sec-per-trial 5.0))
+  (n-back-update-info))
+
+(defun n-back-increase-speed ()
+  "Increase speed of trials."
+  (interactive)
+  (let ((sec (- n-back-sec-per-trial 0.25)))
+    (when (< sec 1.0)
+      (setq sec 1.0))
+    (customize-set-variable 'n-back-sec-per-trial sec)
+    (customize-set-value 'n-back-sec-per-trial sec)))
+
+(defun n-back-help ()
+  "Show help for `n-back-game' game."
+  (interactive)
+  (save-selected-window
+    (describe-function 'n-back-game)))
+
+(defun n-back-change-level (level)
+  "Change n-Back level to LEVEL."
+  (interactive (progn
+                 (if (and (numberp last-input-event)
+                          (>= last-input-event ?1)
+                          (<= last-input-event ?9))
+                     (list (- last-input-event ?0))
+                   (list (string-to-number (read-string "n Back: "))))))
+  (customize-set-variable 'n-back-level level)
+  (customize-set-value 'n-back-level level))
+
+(defvar n-back-frame nil)
+
+;;;###autoload
+(defun n-back-game ()
+  "Emacs n-Back game.
+This game is supposed to increase your working memory and fluid
+intelligence.
+
+In this game something is shown for half a second on the screen
+and maybe a sound is played.  You should then answer if parts of
+it is the same as you have seen or heard before.  This is
+repeated for about 20 trials.
+
+You answer with the keys shown in the bottom window.
+
+In the easiest version of the game you should answer if you have
+just seen or heard what is shown now.  By default the game gets
+harder as you play it with success.  Then first the number of
+items presented in a trial grows.  After that it gets harder by
+that you have to somehow remember not the last item, but the item
+before that \(or even earlier). That is what \"n-Back\" stands
+for.
+
+Note that remember does not really mean remember clearly.  The
+game is for training your brain getting used to keep those things
+in the working memory, maybe as a cross-modal unit.  You are
+supposed to just nearly be able to do what you do in the game.
+And you are supposed to have fun, that is what your brain like.
+
+You should probably not overdue this. Half an hour a day playing
+might be an optimal time according to some people.
+
+The game is shamelessly modeled after Brain Workshop, see URL
+`http://brainworkshop.sourceforge.net/' just for the fun of
+getting it into Emacs.  The game resembles but it not the same as
+that used in the report by Jaeggi mentioned at the above URL.
+
+Not all features in Brain Workshop are implemented here, but some
+new are maybe ... - and you have it available here in Emacs."
+;; -----
+;; Below is a short excerpt from the report by Jaeggi et al which
+;; gave the idea to the game:
+
+;; Training task.  For the training task, we used the same material
+;; as described by Jaeggi et al.  (33), which was a dual n-Back task
+;; where squares at eight different locations were presented
+;; sequentially on a computer screen at a rate of 3 s (stimulus
+;; length, 500 ms; interstimulus interval, 2,500 ms).
+;; Simultaneously with the presentation of the squares, one of eight
+;; consonants was presented sequentially through headphones.  A
+;; response was required whenever one of the presented stimuli
+;; matched the one presented n positions back in the sequence.  The
+;; value of n was the same for both streams of stimuli.  There were
+;; six auditory and six visual targets per block (four appearing in
+;; only one modality, and two appearing in both modalities
+;; simultaneously), and their positions were determined randomly.
+;; Participants made responses manually by pressing on the letter
+;; ‘‘A’’ of a standard keyboard with their left index finger for
+;; visual targets, and on the letter ‘‘L’’ with their right index
+;; finger for auditory targets.  No responses were required for
+;; non-targets.
+  (interactive)
+  (when window-system
+    (unless (frame-live-p n-back-frame)
+      (setq n-back-frame (make-frame
+                          (list '(name . "n-back game")
+                                '(tool-bar-lines . 0)
+                                '(menu-bar-lines . 0)
+                                (case (frame-parameter nil 'background-mode)
+                                  ('light '(background-color . "cornsilk"))
+                                  ('dark  '(background-color . "MidnightBlue"))
+                                  (t nil))
+                                '(height . 45)
+                                '(width . 150)))))
+    (select-frame n-back-frame)
+    (raise-frame n-back-frame))
+  (n-back-cancel-timers)
+  (n-back-get-sound-files)
+  (unless n-back-sound-files
+    (when (memq 'sound n-back-allowed-match-types)
+      (n-back-toggle-allowed-sound))
+    (when (memq 'sound n-back-active-match-types)
+      (n-back-toggle-sound)))
+  (n-back-init-control-status)
+  (n-back-setup-windows)
+  )
+
+(defconst n-back-match-types
+  '((position ": position match" nil)
+    (color    ": color match" nil)
+    (sound    ": sound match" nil)
+    (word     ": word match" nil)
+    ))
+
+(defconst n-back-control-status nil
+  "For showing status in control window.")
+
+;;(n-back-set-match-status 'position 'bad)
+(defun n-back-set-match-status (match-type status)
+  "Set MATCH-TYPE status to STATUS for control window."
+  (unless (memq status '(ok bad miss nil)) (error "n-back: Bad status=%s" status))
+  (let ((entry (assoc match-type n-back-control-status)))
+    (setcar (cddr entry) status)
+    ))
+
+;;(n-back-clear-match-status)
+(defun n-back-clear-match-status ()
+  "Clear match status for control window."
+  ;;(dolist (entry n-back-control-status)
+  (dolist (entry n-back-match-types)
+    (setcar (cddr entry) nil)
+    ))
+
+;; (n-back-init-control-status)
+(defun n-back-init-control-status ()
+  "Init match status for control window."
+  (setq n-back-control-status nil)
+  (dolist (what n-back-active-match-types)
+    (setq n-back-control-status
+          (cons (assoc what n-back-match-types)
+                n-back-control-status))))
+
+(defsubst n-back-is-playing ()
+  "Return non-nil when game is active."
+  (timerp n-back-timer))
+
+;;(n-back-update-control-buffer)
+(defun n-back-update-control-buffer ()
+  "Update content of control buffer."
+  (save-match-data ;; runs in timer
+    (when (buffer-live-p n-back-ctrl-buffer)
+      (with-current-buffer n-back-ctrl-buffer
+        (setq buffer-read-only nil)
+        (erase-buffer)
+        (insert (propertize (format "%s %s-back"
+                                    (let ((n (length n-back-active-match-types)))
+                                      (cond
+                                       ((= 1 n) "Single")
+                                       ((= 2 n) "Dual")
+                                       ((= 3 n) "Triple")
+                                       ))
+                                    n-back-level
+                                    ) 'face 'n-back-header)
+                (propertize
+                 (if (n-back-is-playing) "  Press C-g to stop" "  Press SPACE to play")
+                 'face 'n-back-do-now)
+                (if (n-back-is-playing) (format "  Left %s" n-back-trials-left) "")
+                "\n")
+        ;;(unless n-back-control-status (n-back-init-control-status))
+        (dolist (entry n-back-control-status)
+          (let* ((what (nth 0 entry))
+                 (msg  (nth 1 entry))
+                 (sts  (nth 2 entry))
+                 (key (key-description (n-back-key-binding what))))
+            ;;(setq msg (concat (key-description (n-back-key-binding what)) msg))
+            (cond
+             ((eq sts 'bad)
+              (setq msg (propertize (concat key msg) 'face 'n-back-bad)))
+             ((eq sts 'ok)
+              (setq msg (propertize (concat key msg) 'face 'n-back-ok)))
+             ((eq sts 'miss)
+              (setq msg (concat
+                         (if n-back-display-hint
+                             (propertize key 'face 'n-back-header)
+                           key)
+                         msg)))
+             ((not sts)
+              (setq msg (concat key msg)))
+             (t
+              (error "n-back:Unknown sts=%s" sts)
+              ))
+            (insert msg "   "))
+          )
+        (when n-back-display-hint
+          (setq n-back-display-hint nil)
+          (run-with-timer 0.1 nil 'n-back-update-control-buffer))
+        (setq buffer-read-only t)
+        (if (window-live-p n-back-ctrl-window)
+            (with-selected-window n-back-ctrl-window
+              (goto-char 1))
+          (goto-char 1))))))
+
+(defcustom n-back-trials 20
+  "Number of trials per session."
+  :type 'integer
+  :group 'n-back)
+
+;;(n-back-compute-result-values n-back-result)
+(defvar n-back-result-values nil)
+(defun n-back-compute-single-result-value (entry)
+  "Compute result stored in ENTRY."
+  (let* ((what (nth 0 entry))
+         (good (nth 1 entry))
+         (bad  (nth 2 entry))
+         (miss (nth 3 entry))
+         (err (+ bad miss))
+         ;;(tot  (+ good bad miss 0.0))
+         ;;(gnum 6)
+         ;;(weighted-err (* err (/ gnum tot)))
+         )
+    (cons what (if (= 0 good)
+                   0
+                 (/ (- n-back-trials err 0.0)
+                    n-back-trials)))))
+
+(defun n-back-compute-result-values (result)
+  "Compute result values from game result RESULT."
+  (let ((results nil))
+    (dolist (entry result)
+      (let ((res (n-back-compute-single-result-value entry)))
+        (setq results (cons res results))))
+    (setq n-back-result-values (reverse results))))
+
+;; Thresholds
+(defun n-back-view-threshold-discussion-page ()
+  "View some discussion of threshold."
+  (interactive)
+  (browse-url "http://groups.google.com/group/brain-training/browse_thread/thread/f4bfa452943c2a2d/ba31adfd0b97771c?lnk=gst&q=threshold#ba31adfd0b97771c"))
+
+;;(n-back-set-next-challenge)
+(defvar n-back-worst nil)
+
+(defvar n-back-challenge-change nil)
+
+(defun n-back-set-next-challenge ()
+  "Set next game difficulty level from last game result."
+  (let ((r 2.8)) ;; stay as default
+    (setq n-back-worst nil)
+    (dolist (res n-back-result-values)
+      (when (< (cdr res) r)
+        (setq r (cdr res))
+        (setq n-back-worst res)))
+    (setq n-back-challenge-change (if (< r 0.74)
+                                      'down
+                                    (if (> r 0.91)
+                                        'up
+                                      'stay)))
+    (n-back-change-challenge n-back-challenge-change)))
+
+(defun n-back-challenge-up ()
+  "Make the game harder."
+  (interactive)
+  (n-back-change-challenge 'up))
+
+(defun n-back-challenge-down ()
+  "Make the game easier."
+  (interactive)
+  (n-back-change-challenge 'down))
+
+(defun n-back-change-challenge (challenge-change)
+  "Change game difficulty level by CHALLENGE-CHANGE."
+  (let ((new-level n-back-level)
+        (new-num-active n-back-num-active)
+        (num-allowed (length n-back-allowed-match-types)))
+    (case challenge-change
+      (down
+       (if (= 1 n-back-num-active)
+           (unless (= 1 n-back-level)
+             (setq new-num-active (min 3 num-allowed))
+             (setq new-level (1- n-back-level)))
+         (setq new-num-active (1- n-back-num-active))))
+      (up
+       (if (or (<= 3 n-back-num-active)
+               (<= num-allowed n-back-num-active))
+           (progn
+             (setq new-level (1+ n-back-level))
+             (setq new-num-active 1))
+         (setq new-num-active (min 3 (1+ n-back-num-active))))))
+    ;;(when (= new-level 0) (setq new-level 1))
+    ;;(when (= new-num-active 0) (setq new-num-active 1))
+    (when (and (= new-level n-back-level)
+               (= new-num-active n-back-num-active))
+      (setq n-back-challenge-change 'stay))
+    (unless (= new-level n-back-level)
+      (customize-set-variable 'n-back-level new-level)
+      (customize-set-value 'n-back-level new-level))
+    (n-back-set-random-match-types new-num-active (car n-back-worst))))
+
+(defun n-back-set-random-match-types (num worst)
+  "Select NUM random match types.
+If type WORST is non-nil try to include that."
+  (let ((alen (length n-back-allowed-match-types))
+        (old-types n-back-active-match-types)
+        types)
+    (unless (<= num alen)
+      (error "n-back: Too many match types required = %s" num))
+    (when (and worst
+               (< 1 num)
+               (memq worst n-back-allowed-match-types))
+      (add-to-list 'types worst))
+    (while (< (length types) num)
+      (add-to-list 'types (nth (random alen) n-back-allowed-match-types)))
+    (setq types (n-back-sort-types types))
+    (unless (equal old-types types)
+      (customize-set-variable 'n-back-active-match-types types)
+      (customize-set-value 'n-back-active-match-types types))))
+
+;; (defcustom n-back-keybinding-color "OliveDrab1"
+;;   "Background color for key binding hints."
+;;   :type 'color
+;;   :group 'n-back)
+
+(defun n-back-update-info ()
+  "Update info buffer."
+  (when (buffer-live-p n-back-info-buffer)
+    (when (window-live-p n-back-info-window)
+      (set-window-buffer n-back-info-window n-back-info-buffer))
+    (with-current-buffer n-back-info-buffer
+      (setq buffer-read-only nil)
+      (erase-buffer)
+
+      (insert (propertize "n-back" 'face 'n-back-header)
+              "  "
+              (propertize "Help: ?" 'face 'n-back-keybinding))
+
+      ;; Auto challenging
+      (insert "\n\nAuto challenging: "
+              (if n-back-auto-challenge "on " "off ")
+              (propertize "toggle: Ta" 'face 'n-back-keybinding))
+
+      (insert "\n  Manually change challenging: "
+              (propertize "up-arrow/down-arrow" 'face 'n-back-keybinding))
+
+      (insert "\n  Allowed match types: ")
+      (dolist (type n-back-allowed-match-types)
+        (insert (format "%s " type)))
+      (insert (propertize "toggle: T" 'face 'n-back-keybinding))
+
+      ;; Current game
+      (insert "\n\nCurrent game:")
+
+      (insert (format "\n  n Back: %s " n-back-level)
+              (propertize "change: number 1-9" 'face 'n-back-keybinding))
+      (insert "\n  Match types: ")
+      (dolist (type n-back-active-match-types)
+        (insert (format "%s " type)))
+      (insert (propertize "toggle: t" 'face 'n-back-keybinding))
+
+      (insert (format "\n  %.2f seconds per trial " n-back-sec-per-trial)
+              (propertize "change: +/-" 'face 'n-back-keybinding))
+
+      ;; Save and restore
+      (insert "\n\n")
+      (insert "Game settings: "
+              (propertize "reset: C-r" 'face 'n-back-keybinding)
+              " "
+              (propertize "save: C-s" 'face 'n-back-keybinding))
+
+      (insert "\n\n")
+      (unless (or (n-back-is-playing)
+                  (not n-back-result))
+        (insert (propertize (format "Last result, %s" n-back-challenge-change)
+                            'face 'n-back-last-result)
+                "\n  Good-Bad-Miss:")
+        (dolist (entry n-back-result)
+          (let* ((what (nth 0 entry))
+                 (good (nth 1 entry))
+                 (bad  (nth 2 entry))
+                 (miss (nth 3 entry))
+                 (tot  (+ good bad miss 0.0))
+                 (res (n-back-compute-single-result-value entry)))
+            (insert (format "  %s: %s-%s-%s (%d%%)"
+                            (key-description (n-back-key-binding what))
+                            good
+                            bad
+                            miss
+                            (floor (* 100 (cdr res))))))))
+
+    (setq buffer-read-only t))))
+
+(defun n-back-show-welcome (msg)
+  "Show welcome startup info and message MSG."
+  (with-current-buffer n-back-game-buffer
+    (let ((src (or (when (boundp 'nxhtml-install-dir)
+                     (expand-file-name "nxhtml/doc/img/fun-brain-2.png" nxhtml-install-dir))
+                   "c:/program files/brain workshop/res/brain_graphic.png"))
+          img
+          buffer-read-only)
+      (erase-buffer)
+      ;;(insert (propertize "\nEmacs n-back game (after Brain Workshop)\n\n" 'face '(:height 2.0)))
+      (insert (propertize "\nEmacs n-back game (after Brain Workshop)\n\n" 'face 'n-back-welcome-header))
+      (if (file-exists-p src)
+          (condition-case err
+              (setq img (create-image src nil nil
+                                      :relief 0
+                                      ;;:margin inlimg-margins
+                                      ))
+            (error (setq img (error-message-string err))))
+        (setq img (concat "Image not found: " src)))
+      (if (stringp img)
+          (insert img)
+        (insert-image img))
+      (insert (propertize "\n\nPlay for fun and maybe a somewhat happier brain"
+                          'face 'n-back-welcome))
+      (when msg (insert "\n\n" msg))
+      )))
+
+(defun n-back-setup-windows ()
+  "Setup game frame and windows."
+  (delete-other-windows)
+  ;; Info
+  (split-window-horizontally)
+  (setq n-back-info-window (next-window (frame-first-window)))
+  (setq n-back-info-buffer (get-buffer-create "* n-back info *"))
+  (when (< 75 (window-width n-back-info-window))
+    (with-selected-window n-back-info-window
+      (enlarge-window (- 75 (window-width n-back-info-window)) t)))
+  (with-current-buffer n-back-info-buffer
+    (n-back-control-mode)
+    (setq wrap-prefix "      "))
+  (n-back-update-info)
+  ;; Control
+  (split-window-vertically)
+  (setq n-back-ctrl-window (next-window (frame-first-window)))
+  (setq n-back-ctrl-buffer (get-buffer-create "* n-back control *"))
+  (set-window-buffer n-back-ctrl-window n-back-ctrl-buffer)
+  (with-current-buffer n-back-ctrl-buffer (n-back-control-mode))
+  (n-back-update-control-buffer)
+  (fit-window-to-buffer n-back-ctrl-window)
+  (set-window-dedicated-p n-back-ctrl-window t)
+  ;; Game
+  (setq n-back-game-window (frame-first-window))
+  (setq n-back-game-buffer (get-buffer-create "*n-back game*"))
+  (set-window-buffer n-back-game-window n-back-game-buffer)
+  (set-window-dedicated-p n-back-game-window t)
+  (with-current-buffer n-back-game-buffer (n-back-control-mode))
+  (n-back-show-welcome nil)
+  ;; Position in control window
+  (select-window n-back-ctrl-window)
+  )
+
+;;(n-back-display "str" 1 0 3 3 6)
+(defun n-back-display (str x y cols rows max-strlen color)
+  "Display a trial.
+Display item with text STR at column X in row Y using COLS
+columns and ROWS rows.  Strings to display have max length
+MAX-STRLEN.  Display item with background color COLOR."
+  (unless (< x cols) (error "n-back: Not x=%s < cols=%s" x cols))
+  (unless (< y rows) (error "Not y=%s < rows=%s" y rows))
+  (unless str (setq str ""))
+  (with-current-buffer n-back-game-buffer
+    (let* (buffer-read-only
+           (tot-str "")
+           ;; Pad spaces left, two right, four between
+           (game-w (window-width n-back-game-window))
+           (pad-x 0)
+           (scale (if (not window-system)
+                      1.0
+                    (/ (* 1.0 game-w)
+                       (+ (* 2 pad-x)
+                          (* (1- cols) 4)
+                          (* cols max-strlen)))))
+           (str-diff (- max-strlen (length str)))
+           (str-l-len (/ str-diff 2))
+           (str-r-len (- max-strlen (length str) str-l-len))
+           (face-spec (if window-system
+                          (list :inherit 'n-back-game-word :background color :height scale)
+                        (list :inherit 'n-back-game-word :background color)))
+           (str-disp (propertize
+                      (concat (make-string str-l-len 32) str (make-string str-r-len 32))
+                      'face face-spec))
+           (col-str (concat
+                     (make-string pad-x ?p)
+                     (make-string
+                      (+ (* x (+ 4 max-strlen)))
+                      32
+                      ;;?x
+                      )))
+           ;; Pad lines above and below, two between
+           (pad-y 0)
+           (game-h (window-body-height n-back-game-window))
+           (game-h-scaled (/ game-h scale))
+           (lines-between (/ (- game-h-scaled rows (* 2 pad-y))
+                             (1- rows)))
+           (row-scaled (+ pad-y (* y (1+ lines-between)) (1- y)))
+           (row-num (if (= y 0)
+                        pad-y
+                      (round row-scaled)))
+           (row-str (make-string row-num ?\n)))
+      (setq show-trailing-whitespace nil)
+      ;;(setq cursor-type nil)
+      (erase-buffer)
+      (setq tot-str row-str)
+      (setq tot-str (concat tot-str col-str))
+      (insert (propertize tot-str 'face (list :height scale)))
+      (insert str-disp)
+      )))
+
+;; (setq timer-list nil)
+;;(n-back-display-in-timer)
+;; (setq n-back-trials-left 3)
+
+(defun n-back-clear-game-window ()
+  "Erase game buffer."
+  (save-match-data ;; runs in timer
+    (with-current-buffer n-back-game-buffer
+      (let (buffer-read-only)
+        (erase-buffer)))))
+
+(defun n-back-play ()
+  "Start playing."
+  (interactive)
+  (message "  ") ;; For easier reading *Messages*
+  (n-back-update-info)
+  (if (not n-back-active-match-types)
+    (message (propertize "No active match types"
+                         'face 'secondary-selection))
+    ;;(setq n-back-result nil)
+    (n-back-init-control-status)
+    (n-back-init-this-result)
+    (n-back-cancel-timers)
+    (winsize-set-mode-line-colors t)
+    (setq n-back-ring (make-ring (1+ n-back-level)))
+    (n-back-clear-game-window)
+    (setq n-back-trials-left (+ n-back-trials n-back-level))
+    (random t)
+    (n-back-start-main-timer)
+    (n-back-update-control-buffer)))
+
+(defun n-back-start-main-timer ()
+  "Start main game timer."
+  (setq n-back-timer
+        (run-with-timer
+         n-back-sec-per-trial
+         nil ;;n-back-sec-per-trial
+         'n-back-display-in-timer)))
+
+(defun n-back-finish-game ()
+  "Finish the game."
+  (n-back-cancel-timers)
+  (fit-window-to-buffer n-back-ctrl-window)
+  (setq n-back-result n-back-this-result)
+  (n-back-compute-result-values n-back-result)
+  (when n-back-auto-challenge (n-back-set-next-challenge))
+  (n-back-update-info)
+  (n-back-init-control-status)
+  (n-back-clear-match-status)
+  (n-back-update-control-buffer)
+  (n-back-show-welcome "Game over")
+  (with-current-buffer n-back-game-buffer
+    ;;(setq n-back-challenge-change 'up)
+    (let (buffer-read-only)
+      (insert
+       "\n\n"
+       (case n-back-challenge-change
+         (up "Congratulations! I see you need more challenge, raising difficulty!")
+         (down "Making it a bit easier for now to make your playing more fun.")
+         (t "This game challenges seems the right way for you now.")))
+      (let* ((dir (when (boundp 'nxhtml-install-dir)
+                    (expand-file-name "nxhtml/doc/img/" nxhtml-install-dir)))
+             (up-imgs '("rembrandt-self-portrait.jpg"
+                        "bacchante2.jpg"
+                        "giraffe.jpg"
+                        "Las_Medulas.jpg"
+                        ))
+             (t-imgs '("continue-play.jpg"
+                       "Toco_toucan.jpg"
+                       "raindrops2.jpg"
+                       "divine2.jpg"
+                       ;;"butterflies.png"
+                       "volga.jpg"
+                       "healthy_feet2.jpg"
+                       ))
+             ;; (setq n-back-trials 1)
+             (pic (when dir (case n-back-challenge-change
+                              (up (nth (random (length up-imgs)) up-imgs))
+                              (t  (nth (random (length t-imgs))  t-imgs)))))
+             (src (when dir (expand-file-name pic dir)))
+             img)
+           (when (and src (file-exists-p src))
+             (condition-case err
+                 (setq img (create-image src nil nil
+                                         :relief 0
+                                         ))
+               (error (setq img (error-message-string err)))))
+           (if (stringp img)
+               img
+             (insert "\n\n")
+             (insert-image img)))))
+  (message "Game over"))
+
+(defun n-back-display-random ()
+  "Display a random item."
+  (when (current-message) (message ""))
+  ;;(message "here start display")
+  (let* ((use-position (memq 'position n-back-active-match-types))
+         (use-color (memq 'color n-back-active-match-types))
+         (use-sound (memq 'sound n-back-active-match-types))
+         (use-word  (memq 'word  n-back-active-match-types))
+         (old-rec (when (n-back-match-possible)
+                    (ring-ref n-back-ring (1- n-back-level))))
+         (cols 3)
+         (rows 3)
+         (x (if use-position (random 3) 1))
+         (y (if use-position (random 3) 1))
+         (old-x (if use-position (nth 1 old-rec)))
+         (old-y (if use-position (nth 2 old-rec)))
+         (color (nth (if use-color (random (length n-back-colors)) 0) n-back-colors))
+         (old-color (if use-color (nth 3 old-rec)))
+         (sound (when use-sound (expand-file-name (nth (random (length n-back-sound-files))
+                                                       n-back-sound-files)
+                                                  (nth 0 n-back-sounds))))
+         (old-sound (if use-sound (nth 4 old-rec)))
+         (words (when use-word (split-string n-back-words)))
+         (word (when use-word (nth (random (length words)) words)))
+         (old-word (when use-word (nth 5 old-rec)))
+         (str (if word word "")) ;(format "%s" n-back-trials-left))
+         (max-strlen (if words
+                         (+ 2 (apply 'max (mapcar (lambda (w) (length w)) words)))
+                       5))
+         (compensate 24)
+         )
+    ;; To get more targets make it more plausible that it is the same here.
+    ;; (/ (- 6 (/ 20.0 8)) 20)
+    (when old-rec
+      (when (and use-position
+                 (not (and (= x old-x)
+                           (= y old-y)))
+                 (< (random 100) compensate))
+        (setq x (nth 1 old-rec))
+        (setq y (nth 2 old-rec)))
+      (when (and use-color
+                 (not (equal color old-color))
+                 (< (random 100) compensate))
+        (setq color (nth 3 old-rec)))
+      (when (and use-sound
+                 (not (equal sound old-sound))
+                 (< (random 100) compensate))
+        (setq sound (nth 4 old-rec)))
+      (when (and use-word
+                 (not (equal word old-word))
+                 (< (random 100) compensate))
+        (setq word (nth 5 old-rec))))
+    (setq str word) ;; fix-me
+    (ring-insert n-back-ring (list str x y color sound word))
+    ;;(message "here before display")
+    (n-back-display str x y cols rows max-strlen color)
+    ;;(when sound (play-sound (list 'sound :file sound)))
+    ;;(message "here before clear-m")
+    (n-back-clear-match-status)
+    ;;(message "here before position")
+    (when (and use-position (n-back-matches 'position)) (n-back-set-match-status 'position 'miss))
+    ;;(message "here before color")
+    (when (and use-color (n-back-matches 'color)) (n-back-set-match-status 'color 'miss))
+    ;;(message "here before sound")
+    (when (and use-sound (n-back-matches 'sound)) (n-back-set-match-status 'sound 'miss))
+    ;;(message "here before word")
+    (when (and use-word (n-back-matches 'word)) (n-back-set-match-status 'word 'miss))
+    (setq n-back-display-hint n-back-hint)
+    ;;(message "here before control")
+    (n-back-update-control-buffer)
+    ;;(message "here before clear timer")
+    (setq n-back-clear-timer (run-with-timer 0.5 nil 'n-back-clear-game-window))
+    ;;(message "here before sound timer")
+    (when sound (run-with-timer 0.01 nil 'n-back-play-sound-in-timer sound))
+    ;;(message "here exit display")
+    ))
+
+(defun n-back-display-in-timer ()
+  "Display a trial in a timer."
+  (condition-case err
+      (save-match-data ;; runs in timer
+        (n-back-add-result)
+        (if (>= 0 (setq n-back-trials-left (1- n-back-trials-left)))
+            (n-back-finish-game)
+          (n-back-display-random)
+          (n-back-start-main-timer)
+          ;;(message "after start-main-timer")
+          ))
+    (error (message "n-back-display: %s" (error-message-string err))
+           (n-back-cancel-timers))))
+
+(defun n-back-play-sound-in-timer (sound-file)
+  "Play sound SOUND-FILE in a timer."
+  (condition-case err
+      (save-match-data ;; runs in timer
+        (play-sound (list 'sound :file sound-file :volume n-back-sound-volume)))
+    (error (message "n-back-sound: %s" (error-message-string err))
+           (n-back-cancel-timers))))
+
+
+;;; Answers
+
+;;(defvar n-back-answers nil)
+
+(defun n-back-init-this-result ()
+  "Init `n-back-this-result'."
+  (setq n-back-this-result nil)
+  (dolist (sts-entry n-back-control-status)
+    (let* ((what (nth 0 sts-entry))
+           (res-entry (list what 0 0 0)))
+      (setq n-back-this-result (cons res-entry n-back-this-result)))))
+
+(defun n-back-match-possible ()
+  "Return t if enouch entries have been shown to match."
+  (= (ring-length n-back-ring) (1+ n-back-level)))
+
+(defun n-back-add-result ()
+  "Add result of last trial."
+  (when (n-back-match-possible)
+    (dolist (sts-entry n-back-control-status)
+      (let* ((what (nth 0 sts-entry))
+             (sts  (nth 2 sts-entry))
+             (matches (n-back-matches what))
+             (num (cond
+                   ((eq sts 'ok) 1)
+                   ((eq sts 'bad) 2)
+                   ;;((eq sts nil) (when matches 3))
+                   ((eq sts 'miss) 3)
+                   ((not sts) nil)
+                   (t (error "n-back: Bad status=%s" sts))))
+             (res-entry (when num (assoc what n-back-this-result)))
+             (lst (when num (nthcdr num res-entry))))
+        (when num
+          (if res-entry
+              (setcar lst (1+ (car lst)))
+            (setq res-entry (list what 0 0 0))
+            ;;(setq lst (nthcdr num res-entry))
+            (setq n-back-this-result (cons res-entry n-back-this-result))))))))
+
+(defun n-back-matches-position ()
+  "Return non-nil iff last trial position match."
+  (when (n-back-match-possible)
+    (let* ((comp-item (ring-ref n-back-ring n-back-level))
+           (curr-item (ring-ref n-back-ring 0))
+           (comp-x (nth 1 comp-item))
+           (curr-x (nth 1 curr-item))
+           (comp-y (nth 2 comp-item))
+           (curr-y (nth 2 curr-item)))
+      (and (= comp-y curr-y)
+           (= comp-x curr-x)))))
+
+(defun n-back-matches-color ()
+  "Return non-nil iff last trial color match."
+  (when (n-back-match-possible)
+    (let* ((comp-item (ring-ref n-back-ring n-back-level))
+           (curr-item (ring-ref n-back-ring 0))
+           (comp-color (nth 3 comp-item))
+           (curr-color (nth 3 curr-item)))
+      (equal comp-color curr-color))))
+
+(defun n-back-matches-sound ()
+  "Return non-nil iff last trial sound match."
+  (when (n-back-match-possible)
+    (let* ((comp-item (ring-ref n-back-ring n-back-level))
+           (curr-item (ring-ref n-back-ring 0))
+           (comp-sound (nth 4 comp-item))
+           (curr-sound (nth 4 curr-item)))
+      (equal comp-sound curr-sound))))
+
+(defun n-back-matches-word ()
+  "Return non-nil iff last trial word match."
+  (when (n-back-match-possible)
+    (let* ((comp-item (ring-ref n-back-ring n-back-level))
+           (curr-item (ring-ref n-back-ring 0))
+           (comp-word (nth 5 comp-item))
+           (curr-word (nth 5 curr-item)))
+      (equal comp-word curr-word))))
+
+(defun n-back-matches (what)
+  "Return non-nil iff last trial part WHAT match."
+  (cond
+   ((eq what 'position) (n-back-matches-position))
+   ((eq what 'color) (n-back-matches-color))
+   ((eq what 'sound) (n-back-matches-sound))
+   ((eq what 'word)  (n-back-matches-word))
+   (t (error "n-back: Unknown match type: %s" what))))
+
+(defun n-back-answer (what)
+  "Tell that you think WHAT matched."
+  (when (n-back-is-playing)
+    (if (memq what n-back-active-match-types)
+        (if (n-back-match-possible)
+            (let ((sts (if (n-back-matches what) 'ok 'bad)))
+              (n-back-set-match-status what sts)
+              (n-back-update-control-buffer))
+          (message "%s n-back items must be displayed before anything can match"
+                   n-back-level))
+      (message "%s match is not active" what)
+      (ding t))))
+
+(defun n-back-position-answer ()
+  "Tell that you think position matched."
+  (interactive)
+  (n-back-answer 'position))
+
+(defun n-back-color-answer ()
+  "Tell that you think color matched."
+  (interactive)
+  (n-back-answer 'color))
+
+(defun n-back-sound-answer ()
+  "Tell that you think sound matched."
+  (interactive)
+  (n-back-answer 'sound))
+
+(defun n-back-word-answer ()
+  "Tell that you think word matched."
+  (interactive)
+  (n-back-answer 'word))
+
+(defun n-back-stop ()
+  "Stop playing."
+  (interactive)
+  (n-back-cancel-timers)
+  (n-back-update-control-buffer)
+  (message "Stopped n-back game")
+  (n-back-show-welcome "Stopped"))
+
+(define-derived-mode n-back-control-mode nil "N-back"
+  "Mode for controlling n-back game."
+  (setq cursor-type nil)
+  (setq buffer-read-only t)
+  (set (make-local-variable 'viper-emacs-state-mode-list) '(n-back-control-mode))
+  (set (make-local-variable 'viper-emacs-state-hook) nil) ;; in vis cursor
+  (abbrev-mode -1)
+  (setq show-trailing-whitespace nil)
+  (when (fboundp 'visual-line-mode) (visual-line-mode 1))
+  (n-back-make-keymap))
+
+(defun n-back-cancel-timers ()
+  "Cancel game timers."
+  (when (timerp n-back-timer)
+    (cancel-timer n-back-timer))
+  (setq n-back-timer nil)
+  (when (timerp n-back-clear-timer)
+    (cancel-timer n-back-clear-timer))
+  (setq n-back-clear-timer nil)
+  (winsize-set-mode-line-colors nil))
+
+(defvar n-back-game-settings-symbols
+    '(
+      ;;n-back-keys
+      n-back-level
+      n-back-active-match-types
+      n-back-allowed-match-types
+      n-back-auto-challenge
+      ;;n-back-colors
+      ;;n-back-words
+      ;;n-back-sound-volume
+      ;;n-back-sounds
+      n-back-sec-per-trial
+      ;;n-back-keybinding-color
+      ;;n-back-trials
+      ))
+
+(defun n-back-save-game-settings ()
+  "Save game settings."
+  (interactive)
+  (dolist (var n-back-game-settings-symbols)
+  )
+  (custom-save-all))
+
+(defun n-back-reset-game-to-saved ()
+  "Reset game playing options to saved values."
+  (interactive)
+  (dolist (pass '(1 2))
+    (dolist (var n-back-game-settings-symbols)
+      (if (= pass 1)
+          ;; pass 1 is for my lousy programming:
+          (condition-case err
+              (custom-reevaluate-setting var)
+            (error nil))
+        (custom-reevaluate-setting var)))))
+
+(provide 'n-back)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; n-back.el ends here
diff --git a/elpa-to-submit/nxhtml/util/new-key-seq-widget.el b/elpa-to-submit/nxhtml/util/new-key-seq-widget.el
index 06656e87ca..079a4a8458 100644
--- a/elpa-to-submit/nxhtml/util/new-key-seq-widget.el
+++ b/elpa-to-submit/nxhtml/util/new-key-seq-widget.el
@@ -19,6 +19,8 @@
 ;;  New version of Kim's Emacs key-sequence widget. For inclusion in
 ;;  Emacs I hope.
 ;;
+;;  Fix-me: check what was included.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Change log:
diff --git a/elpa-to-submit/nxhtml/util/nxml-mode-os-additions.el b/elpa-to-submit/nxhtml/util/nxml-mode-os-additions.el
index 7513c00f6c..711cb78b1c 100644
--- a/elpa-to-submit/nxhtml/util/nxml-mode-os-additions.el
+++ b/elpa-to-submit/nxhtml/util/nxml-mode-os-additions.el
@@ -51,8 +51,13 @@
 ;; 2004-08-08 (version 1.0):
 ;;   * Initial public release
 
+;; Added require rng-valid (Lennart Borgman)
+
 ;;; Code:
 
+(require 'nxml-mode)
+(require 'rng-valid)
+
 (defun rng-mode-os-additions-set-key-bindings ()
   (define-key nxml-mode-map "\C-c\C-s\C-r" 'rng-reload-schema-file)
   ; move the rng-set-schema-file-and-validate to another key binding
diff --git a/elpa-to-submit/nxhtml/util/org-panel.el b/elpa-to-submit/nxhtml/util/org-panel.el
index 4743cf407e..019a6aa38e 100644
--- a/elpa-to-submit/nxhtml/util/org-panel.el
+++ b/elpa-to-submit/nxhtml/util/org-panel.el
@@ -138,6 +138,26 @@ active.)"
     org-demote-subtree))
 
 
+(defvar orgpan-panel-window nil
+  "The window showing `orgpan-panel-buffer'.")
+
+(defvar orgpan-panel-buffer nil
+  "The panel buffer.
+There can be only one such buffer at any time.")
+
+(defvar orgpan-org-window nil)
+;;(make-variable-buffer-local 'orgpan-org-window)
+
+;; Fix-me: used?
+(defvar orgpan-org-buffer nil)
+;;(make-variable-buffer-local 'orgpan-org-buffer)
+
+(defvar orgpan-last-org-buffer nil)
+;;(make-variable-buffer-local 'orgpan-last-org-buffer)
+
+(defvar orgpan-point nil)
+;;(make-variable-buffer-local 'orgpan-point)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Hook functions etc
 
@@ -308,17 +328,20 @@ This refers to the functions `orgpan-paste-subtree',
 
 (defun orgpan-check-panel-mode ()
   (unless (derived-mode-p 'orgpan-mode)
-    (error "Not orgpan-mode in buffer: " major-mode)))
+    (error "Not orgpan-mode in buffer: %s" major-mode)))
 
 (defun orgpan-display-bindings-help ()
-  (orgpan-check-panel-mode)
-  (setq orgpan-point (point))
-  (let* ((ovls (overlays-at (point)))
+  ;;(orgpan-check-panel-mode)
+  (setq orgpan-point (point-marker))
+  (let* ((ovls (overlays-at orgpan-point))
          (ovl (car ovls))
          (help (when ovl (overlay-get ovl 'orgpan-explain))))
     (dolist (o (overlays-in (point-min) (point-max)))
+      (unless ovl (setq ovl o))
       (overlay-put o 'face orgpan-field-face))
     (overlay-put ovl 'face orgpan-active-field-face)
+    (unless orgpan-ovl-help
+      (setq orgpan-ovl-help (make-overlay orgpan-point orgpan-point)))
     (overlay-put orgpan-ovl-help 'before-string help)))
 
 (defun orgpan-forward-field ()
@@ -352,7 +375,15 @@ This refers to the functions `orgpan-paste-subtree',
   "Start agenda"
   (interactive)
   (orgpan-delete-panel)
-  (org-agenda))
+  (call-interactively 'org-agenda))
+
+(defun orgpan-outline-up-heading (arg &optional invisible-ok)
+  (interactive "p")
+  (outline-back-to-heading invisible-ok)
+  (let ((start-level (funcall outline-level)))
+    (if (<= start-level 1)
+        (message "Already at top level of the outline")
+      (outline-up-heading arg invisible-ok))))
 
 (defconst orgpan-mode-map
   ;; Fix-me: clean up here!
@@ -382,7 +413,7 @@ This refers to the functions `orgpan-paste-subtree',
     (define-key map [(shift control ?p)] 'outline-backward-same-level)
     (define-key map [(shift control ?n)] 'outline-forward-same-level)
     ;; A mnemunic for up:
-    (define-key map [(control ?u)] 'outline-up-heading)
+    (define-key map [(control ?u)] 'orgpan-outline-up-heading)
     ;; Search sparse tree:
     (define-key map [?s] 'org-sparse-tree)
     ;;(define-key map [?s] 'orgpan-occur)
@@ -446,26 +477,6 @@ r      Show entries matching a regular expression"
       (call-interactively 'org-occur))
      (t (error "No such sparse tree command \"%c\"" ans)))))
 
-(defvar orgpan-panel-window nil
-  "The window showing `orgpan-panel-buffer'.")
-
-(defvar orgpan-panel-buffer nil
-  "The panel buffer.
-There can be only one such buffer at any time.")
-
-(defvar orgpan-org-window nil)
-;;(make-variable-buffer-local 'orgpan-org-window)
-
-;; Fix-me: used?
-(defvar orgpan-org-buffer nil)
-;;(make-variable-buffer-local 'orgpan-org-buffer)
-
-(defvar orgpan-last-org-buffer nil)
-;;(make-variable-buffer-local 'orgpan-last-org-buffer)
-
-(defvar orgpan-point nil)
-;;(make-variable-buffer-local 'orgpan-point)
-
 ;; (defun orgpan-avoid-viper-in-buffer ()
 ;;   ;; Fix-me: This is ugly. However see `this-major-mode-requires-vi-state':
 ;;   (set (make-local-variable 'viper-emacs-state-mode-list) '(orgpan-mode))
@@ -479,6 +490,7 @@ There can be only one such buffer at any time.")
     (add-hook 'pre-command-hook 'orgpan-mode-pre-command nil t)
     (add-hook 'post-command-hook 'orgpan-mode-post-command t))
   (set (make-local-variable 'cursor-type) nil)
+  (setq yas/dont-activate t)
   ;; Avoid emulation modes here (cua, viper):
   (set (make-local-variable 'emulation-mode-map-alists) nil))
 
@@ -516,7 +528,7 @@ There can be only one such buffer at any time.")
     ;;(define-key map [tab] 'org-cycle)
     ;;(define-key map [(shift tab)] 'org-global-cycle)
     ;; Navigate:
-    (define-key map [left] 'outline-up-heading)
+    (define-key map [left] 'orgpan-outline-up-heading)
     (define-key map [right] 'org-cycle)
     (define-key map [up] 'outline-previous-visible-heading)
     (define-key map [down] 'outline-next-visible-heading)
@@ -614,13 +626,14 @@ There can be only one such buffer at any time.")
       )
     (insert "   ? for help, q quit\n")
     (orgpan-display-bindings-help)
-    (setq orgpan-ovl-help (make-overlay (point) (point)))
+    (set-keymap-parent orgpan-mode-map orgpan-with-keymap)
     ))
 
 (defun orgpan-make-panel-buffer ()
   "Make the panel buffer."
   (let* ((buf-name "*Org Panel*"))
     (when orgpan-panel-buffer (kill-buffer orgpan-panel-buffer))
+    ;;(with-current-buffer orgpan-panel-buffer (orgpan-mode))
     (setq orgpan-panel-buffer (get-buffer-create buf-name))
     (if orgpan-panel-buttons
         (orgpan-make-panel-with-buttons orgpan-panel-buffer)
@@ -639,6 +652,12 @@ There can be only one such buffer at any time.")
   (set-keymap-parent orgpan-without-keymap org-mode-map)
   (message "Use 'l' to get back to last viewed org file"))
 
+(defcustom orgpan-panel-height 5
+  "Panel height"
+  :type '(choice (integer :tag "One line" 2)
+                 (integer :tag "All lines" 5))
+  :group 'orgpan)
+
 (defun orgpan-panel ()
   "Create a control panel for current `org-mode' buffer.
 The control panel may be used to quickly move around and change
@@ -694,11 +713,12 @@ button changes the binding of the arrow keys."
     (orgpan-panel-minor-mode 1)
     (add-hook 'post-command-hook 'orgpan-minor-post-command t)))
 
-(defcustom orgpan-panel-height 5
-  "Panel height"
-  :type '(choice (integer :tag "One line" 2)
-                 (integer :tag "All lines" 5))
-  :group 'orgpan)
+(define-minor-mode orgpan-panel-minor-mode
+  "Minor mode used in `org-mode' buffer when showing panel."
+  :keymap orgpan-mode-map
+  :lighter " PANEL"
+  :group 'orgpan
+  )
 
 (defun orgpan-minor-post-command ()
   ;; Check org window and buffer
@@ -717,13 +737,6 @@ button changes the binding of the arrow keys."
       (setq cursor-type nil)
     (orgpan-delete-panel)))
 
-(define-minor-mode orgpan-panel-minor-mode
-  "Minor mode used in `org-mode' buffer when showing panel."
-  :keymap orgpan-mode-map
-  :lighter " PANEL"
-  :group 'orgpan
-  )
-
 
 (provide 'org-panel)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/util/ourcomments-util.el b/elpa-to-submit/nxhtml/util/ourcomments-util.el
index 7627b7baa8..975a4ba91d 100644
--- a/elpa-to-submit/nxhtml/util/ourcomments-util.el
+++ b/elpa-to-submit/nxhtml/util/ourcomments-util.el
@@ -1,9 +1,9 @@
 ;;; ourcomments-util.el --- Utility routines
 ;;
 ;; Author: Lennart Borgman <lennart dot borgman at gmail dot com>
-;; Created: Wed Feb 21 23:19:07 2007
-(defconst ourcomments-util:version "0.24") ;;Version:
-;; Last-Updated: 2008-08-11T12:25:12+0200 Mon
+;; Created: Wed Feb 21 2007
+(defconst ourcomments-util:version "0.25") ;;Version:
+;; Last-Updated: 2009-08-04 Tue
 ;; Keywords:
 ;; Compatibility: Emacs 22
 ;;
@@ -44,7 +44,12 @@
 ;;
 ;;; Code:
 
-
+(eval-when-compile (require 'apropos))
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'grep))
+(eval-when-compile (require 'ido))
+;;(eval-when-compile (require 'mumamo))
+(eval-when-compile (require 'recentf))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Popups etc.
@@ -358,19 +363,14 @@ To create a menu item something similar to this can be used:
 ;; (major-modep 'laszlo-nxml-mumamo-mode)
 ;; (major-modep 'genshi-nxhtml-mumamo-mode)
 ;; (major-modep 'javascript-mode)
+;; (major-modep 'espresso-mode)
 ;; (major-modep 'css-mode)
 
 ;;;###autoload
 (defun major-or-multi-majorp (value)
-  (or (multi-major-modep value)
+  (or (mumamo-multi-major-modep value)
       (major-modep value)))
 
-;;;###autoload
-(defun multi-major-modep (value)
-  "Return t if VALUE is a multi major mode function."
-  (and (fboundp value)
-       (rassq value mumamo-defined-turn-on-functions)))
-
 ;;;###autoload
 (defun major-modep (value)
   "Return t if VALUE is a major mode function."
@@ -401,6 +401,7 @@ To create a menu item something similar to this can be used:
                            nxhtml-mode
                            css-mode
                            javascript-mode
+                           espresso-mode
                            php-mode
                            ))
                    (and (intern-soft (concat sym-name "-hook"))
@@ -439,11 +440,24 @@ To create a menu item something similar to this can be used:
   "Move point to beginning of line or indentation.
 See `beginning-of-line' for ARG.
 
-If `physical-line-mode' is on then the visual line beginning is
-first tried."
+If `line-move-visual' is non-nil then the visual line beginning
+is first tried."
   (interactive "p")
-  (let ((pos (point)))
+  (let ((pos (point))
+        vis-pos)
+    (when line-move-visual
+      (line-move-visual -1 t)
+      (beginning-of-line)
+      (setq vis-pos (point))
+      (goto-char pos))
     (call-interactively 'beginning-of-line arg)
+    (when (and vis-pos
+               (= vis-pos (point)))
+      (while (and (> pos (point))
+                  (not (eobp)))
+        (let (last-command)
+          (line-move-visual 1 t)))
+      (line-move-visual -1 t))
     (when (= pos (point))
       (if (= 0 (current-column))
           (skip-chars-forward " \t")
@@ -453,15 +467,30 @@ first tried."
 
 ;;;###autoload
 (defun ourcomments-move-end-of-line(arg)
-  "Move point to end of line or indentation.
+  "Move point to end of line or after last non blank char.
 See `end-of-line' for ARG.
 
-If `physical-line-mode' is on then the visual line ending is
-first tried."
+Similar to `ourcomments-move-beginning-of-line' but for end of
+line."
   (interactive "p")
   (or arg (setq arg 1))
-  (let ((pos (point)))
+  (let ((pos (point))
+        vis-pos
+        eol-pos)
+    (when line-move-visual
+      (let (last-command) (line-move-visual 1 t))
+      (end-of-line)
+      (setq vis-pos (point))
+      (goto-char pos))
     (call-interactively 'end-of-line arg)
+    (when (and vis-pos
+               (= vis-pos (point)))
+      (setq eol-pos (point))
+      (beginning-of-line)
+      (let (last-command) (line-move-visual 1 t))
+      ;; move backwards if we moved to a new line
+      (unless (= (point) eol-pos)
+        (backward-char)))
     (when (= pos (point))
       (if (= (line-end-position) (point))
           (skip-chars-backward " \t")
@@ -543,6 +572,7 @@ for the keymap to be active \(minor mode levels only)."
         (maps (current-active-maps))
         map
         map-sym
+        map-rec
         binding
         keymaps
         minor-maps
@@ -831,33 +861,6 @@ what they will do ;-)."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Wrapping
 
-;; Fix-me: There is a confusion between buffer and window margins
-;; here. Also the doc says that left-margin-width and dito right may
-;; be nil. However they seem to be 0 by default, but when displaying a
-;; buffer in a window then window-margins returns (nil).
-(defun wrap-to-fill-set-values ()
-  "Use `fill-column' display columns in buffer windows."
-  ;;(message "wrap-to-fill-set-values here")
-  (let ((buf-windows (get-buffer-window-list (current-buffer))))
-    (dolist (win buf-windows)
-      (if wrap-to-fill-column-mode
-          (let* ((edges (window-edges win))
-                 (win-width (- (nth 2 edges) (nth 0 edges)))
-                 (extra-width (- win-width fill-column))
-                 (left-marg (if wrap-to-fill-left-marg-use
-                                wrap-to-fill-left-marg-use
-                              (- (/ extra-width 2) 1)))
-                 (right-marg (- win-width fill-column left-marg))
-                 (win-margs (window-margins win))
-                 (old-left (or (car win-margs) 0))
-                 (old-right (or (cdr win-margs) 0)))
-            (unless (> left-marg 0) (setq left-marg 0))
-            (unless (> right-marg 0) (setq right-marg 0))
-            (unless (and (= old-left left-marg)
-                         (= old-right right-marg))
-              (set-window-margins win left-marg right-marg)))
-        (set-window-buffer win (current-buffer))))))
-
 ;;;###autoload
 (defcustom wrap-to-fill-left-marg nil
   "Left margin handling for `wrap-to-fill-column-mode'.
@@ -882,6 +885,10 @@ the left margin."
   :group 'convenience)
 
 (defun wrap-to-fill-set-prefix (min max)
+  ;;(wrap-to-fill-set-prefix-1 min max)
+  )
+
+(defun wrap-to-fill-set-prefix-1 (min max)
   "Set `wrap-prefix' text property from point MIN to MAX."
   ;; Fix-me: If first word gets wrapped we have a problem.
   ;;(message "wrap-to-fill-set-prefix here")
@@ -924,6 +931,8 @@ the left margin."
        (forward-line)))
     (goto-char here)))
 
+(defvar wrap-to-fill-after-change-range nil)
+
 (defun wrap-to-fill-after-change (min max old-len)
   "For `after-change-functions'.
 See the hook for MIN, MAX and OLD-LEN."
@@ -933,6 +942,21 @@ See the hook for MIN, MAX and OLD-LEN."
     (setq min (line-beginning-position))
     (goto-char max)
     (setq max (line-end-position))
+    ;;(wrap-to-fill-set-prefix min max)
+    (wrap-to-fill-save-min-max min max)
+    ))
+
+(defun wrap-to-fill-save-min-max (min max)
+  (let* ((old-min (car wrap-to-fill-after-change-range))
+         (old-max (cdr wrap-to-fill-after-change-range))
+         (new-min (if old-min (min old-min min) min))
+         (new-max (if old-max (max old-max max) max)))
+    (setq wrap-to-fill-after-change-range (cons new-min new-max))))
+
+(defun wrap-to-fill-post-command ()
+  (let* ((min (car wrap-to-fill-after-change-range))
+         (max (cdr wrap-to-fill-after-change-range)))
+    (setq wrap-to-fill-after-change-range nil)
     (wrap-to-fill-set-prefix min max)))
 
 (defun wrap-to-fill-scroll-fun (window start-pos)
@@ -940,7 +964,8 @@ See the hook for MIN, MAX and OLD-LEN."
 See the hook for WINDOW and START-POS."
   (let ((min (or start-pos (window-start window)))
         (max (window-end window t)))
-    (wrap-to-fill-set-prefix min max)))
+    (wrap-to-fill-save-min-max min max)))
+    ;;(wrap-to-fill-set-prefix min max)))
 
 (defun wrap-to-fill-wider ()
   "Increase `fill-column' with 10."
@@ -960,7 +985,6 @@ See the hook for WINDOW and START-POS."
     (define-key map [(control ?c) left] 'wrap-to-fill-narrower)
     map))
 
-(put 'wrap-to-fill-column-mode 'permanent-local t)
 ;;;###autoload
 (define-minor-mode wrap-to-fill-column-mode
   "Use `fill-column' display columns in buffer windows.
@@ -982,7 +1006,11 @@ Key bindings added by this minor mode:
   :group 'convenience
   ;;(message "wrap-to-fill-column-mode here %s" wrap-to-fill-column-mode)
   (if wrap-to-fill-column-mode
-      (progn
+      (let* ((win (get-buffer-window (current-buffer)))
+             (win-margs (when win (window-margins win))))
+        (when win-margs
+          (setq wrap-to-fill-left-marg (or (car win-margs)
+                                           wrap-to-fill-left-marg)))
         (setq wrap-to-fill-left-marg-use wrap-to-fill-left-marg)
         (unless (or wrap-to-fill-left-marg-use
                     (memq major-mode wrap-to-fill-left-marg-modes))
@@ -991,6 +1019,8 @@ Key bindings added by this minor mode:
         (add-hook 'window-configuration-change-hook 'wrap-to-fill-set-values nil t)
         (add-hook 'after-change-functions 'wrap-to-fill-after-change nil t)
         (add-hook 'window-scroll-functions 'wrap-to-fill-scroll-fun nil t)
+        (add-hook 'post-command-hook 'wrap-to-fill-post-command nil t)
+        ;;(add-hook 'post-command-hook window-scroll-functions 'wrap-to-fill-scroll-fun nil t)
         (if (fboundp 'visual-line-mode)
             (visual-line-mode 1)
           (longlines-mode 1))
@@ -1024,6 +1054,41 @@ Key bindings added by this minor mode:
           '(wrap-to-fill-prefix)))
        (goto-char here))))
   (wrap-to-fill-set-values))
+(put 'wrap-to-fill-column-mode 'permanent-local t)
+
+;; Fix-me: There is a confusion between buffer and window margins
+;; here. Also the doc says that left-margin-width and dito right may
+;; be nil. However they seem to be 0 by default, but when displaying a
+;; buffer in a window then window-margins returns (nil).
+(defun wrap-to-fill-set-values ()
+  (condition-case err
+      (wrap-to-fill-set-values-1)
+    (error (message "ERROR wrap-to-fill-set-values-1: %s" (error-message-string err)))))
+
+(defun wrap-to-fill-set-values-1 ()
+  "Use `fill-column' display columns in buffer windows."
+  ;;(message "wrap-to-fill-set-values window-configuration-change-hook=%s, wrap-to-fill-column-mode=%s, cb=%s" window-configuration-change-hook wrap-to-fill-column-mode (current-buffer))
+  (let ((buf-windows (get-buffer-window-list (current-buffer))))
+    ;;(message "buf-windows=%s" buf-windows)
+    (dolist (win buf-windows)
+      (if wrap-to-fill-column-mode
+          (let* ((edges (window-edges win))
+                 (win-width (- (nth 2 edges) (nth 0 edges)))
+                 (extra-width (- win-width fill-column))
+                 (left-marg (if wrap-to-fill-left-marg-use
+                                wrap-to-fill-left-marg-use
+                              (- (/ extra-width 2) 1)))
+                 (right-marg (- win-width fill-column left-marg))
+                 (win-margs (window-margins win))
+                 (old-left (or (car win-margs) 0))
+                 (old-right (or (cdr win-margs) 0)))
+            ;;(message "left-marg=%s, right-marg=%s, old-left=%s, old-right=%s" left-marg right-marg old-left old-right)
+            (unless (> left-marg 0) (setq left-marg 0))
+            (unless (> right-marg 0) (setq right-marg 0))
+            (unless (and (= old-left left-marg)
+                         (= old-right right-marg))
+              (set-window-margins win left-marg right-marg)))
+        (set-window-buffer win (current-buffer))))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1042,7 +1107,8 @@ Key bindings added by this minor mode:
              bottom-right-angle bottom-right-angle
              bottom-left-angle bottom-left-angle
              ))
-          (indicators (copy-list fringe-indicator-alist)))
+          ;;(indicators (copy-list fringe-indicator-alist)))
+          (indicators (copy-sequence fringe-indicator-alist)))
       (setq indicators (assq-delete-all 'bottom indicators))
       (set-default 'fringe-indicator-alist (cons better indicators)))))
 
@@ -1148,7 +1214,13 @@ and go to the same line number as in the current buffer."
 The purpose of this function is to make it eaiser to start
 `ediff-files' from a shell through Emacs Client.
 
-This is used in EmacsW32 in the file ediff.cmd."
+This is used in EmacsW32 in the file ediff.cmd where Emacs Client
+is called like this:
+
+  @%emacs_client% -e \"(setq default-directory \\\"%emacs_cd%\\\")\"
+  @%emacs_client% -n  -e \"(ediff-files \\\"%f1%\\\" \\\"%f2%\\\")\"
+
+It can of course be done in a similar way with other shells."
   (let ((default-directory def-dir))
     (ediff-files file-a file-b)))
 
@@ -1179,9 +1251,8 @@ This is used in EmacsW32 in the file ediff.cmd."
            "oldXMenu/ChangeLog"
            "src/ChangeLog"
            "test/ChangeLog"))
-        )
-    (emacs-root (expand-file-name ".." exec-directory)
-    )))
+	(emacs-root (expand-file-name ".." exec-directory)
+        ))))
 
 (defun ourcomments-read-symbol (prompt predicate)
   "Basic function for reading a symbol for describe-* functions.
@@ -1233,6 +1304,26 @@ PREDICATE.  PREDICATE takes one argument, the symbol."
       (- (point-max)
          (point-min))))
 
+;;;###autoload
+(defun narrow-to-comment ()
+  (interactive)
+  (let* ((here (point-marker))
+         (size 1000)
+         (beg (progn (forward-comment (- size))
+                     ;; It looks like the wrong syntax-table is used here:
+                     ;;(message "skipped %s " (skip-chars-forward "[:space:]"))
+                     (message "skipped %s " (skip-chars-forward " \t\r\n"))
+                     (point)))
+         (end (progn (forward-comment size)
+                     ;;(message "skipped %s " (skip-chars-backward "[:space:]"))
+                     (message "skipped %s " (skip-chars-backward " \t\r\n"))
+                     (point))))
+    (goto-char here)
+    (if (not (and (>= here beg)
+                  (<= here end)))
+        (error "Not in a comment")
+      (narrow-to-region beg end))))
+
 (defvar describe-symbol-alist nil)
 
 (defun describe-symbol-add-known(property description)
@@ -1324,6 +1415,7 @@ The can include 'variable, 'function and variaus 'cl-*."
    (list
     (ourcomments-read-symbol "Customization group"
                              'ourcomments-custom-group-p)))
+  ;; Fix-me:
   (message "g=%s" symbol))
 ;; nxhtml
 
@@ -1508,33 +1600,98 @@ function."
   (setq ourcomments-ido-visit-method 'raise-frame)
   (call-interactively 'ido-exit-minibuffer))
 
+(defun ourcomments-ido-switch-buffer-or-next-entry ()
+  (interactive)
+  (if (active-minibuffer-window)
+      (ido-next-match)
+    (ido-switch-buffer)))
+
 (defun ourcomments-ido-mode-advice()
+  (message "ourcomments-ido-mode-advice running")
   (when (memq ido-mode '(both buffer))
     (let ((the-ido-minor-map (cdr ido-minor-mode-map-entry)))
-      (define-key the-ido-minor-map [(control tab)] 'ido-switch-buffer))
-    (let ((map ido-buffer-completion-map))
-      (define-key map [(control tab)]       'ido-next-match)
-      (define-key map [(control shift tab)] 'ido-prev-match)
-      (define-key map [(control backtab)]   'ido-prev-match)
-      (define-key map [(shift return)]   'ourcomments-ido-buffer-other-window)
-      (define-key map [(control return)] 'ourcomments-ido-buffer-other-frame)
-      (define-key map [(meta return)]   'ourcomments-ido-buffer-raise-frame))))
+      ;;(define-key the-ido-minor-map [(control tab)] 'ido-switch-buffer))
+      (define-key the-ido-minor-map [(control tab)] 'ourcomments-ido-switch-buffer-or-next-entry))
+    (dolist (the-map (list ido-buffer-completion-map ido-completion-map ido-common-completion-map))
+      (when the-map
+        (let ((map the-map))
+          (define-key map [(control tab)]       'ido-next-match)
+          (define-key map [(control shift tab)] 'ido-prev-match)
+          (define-key map [(control backtab)]   'ido-prev-match)
+          (define-key map [(shift return)]   'ourcomments-ido-buffer-other-window)
+          (define-key map [(control return)] 'ourcomments-ido-buffer-other-frame)
+          (define-key map [(meta return)]   'ourcomments-ido-buffer-raise-frame))))))
+
+;; (defun ourcomments-ido-setup-completion-map ()
+;;   "Set up the keymap for `ido'."
+
+;;   (ourcomments-ido-mode-advice)
+
+;;   ;; generated every time so that it can inherit new functions.
+;;   (let ((map (make-sparse-keymap))
+;; 	(viper-p (if (boundp 'viper-mode) viper-mode)))
+
+;;     (when viper-p
+;;       (define-key map [remap viper-intercept-ESC-key] 'ignore))
+
+;;     (cond
+;;      ((memq ido-cur-item '(file dir))
+;;       (when ido-context-switch-command
+;; 	(define-key map "\C-x\C-b" ido-context-switch-command)
+;; 	(define-key map "\C-x\C-d" 'ignore))
+;;       (when viper-p
+;; 	(define-key map [remap viper-backward-char] 'ido-delete-backward-updir)
+;; 	(define-key map [remap viper-del-backward-char-in-insert] 'ido-delete-backward-updir)
+;; 	(define-key map [remap viper-delete-backward-word] 'ido-delete-backward-word-updir))
+;;       (set-keymap-parent map
+;; 			 (if (eq ido-cur-item 'file)
+;; 			     ido-file-completion-map
+;; 			   ido-file-dir-completion-map)))
+
+;;      ((eq ido-cur-item 'buffer)
+;;       (when ido-context-switch-command
+;; 	(define-key map "\C-x\C-f" ido-context-switch-command))
+;;       (set-keymap-parent map ido-buffer-completion-map))
+
+;;      (t
+;;       (set-keymap-parent map ido-common-completion-map)))
+
+;;     ;; ctrl-tab etc
+;;     (define-key map [(control tab)]       'ido-next-match)
+;;     (define-key map [(control shift tab)] 'ido-prev-match)
+;;     (define-key map [(control backtab)]   'ido-prev-match)
+;;     (define-key map [(shift return)]   'ourcomments-ido-buffer-other-window)
+;;     (define-key map [(control return)] 'ourcomments-ido-buffer-other-frame)
+;;     (define-key map [(meta return)]   'ourcomments-ido-buffer-raise-frame)
+
+;;     (setq ido-completion-map map)))
+
+;; (defadvice ido-setup-completion-map (around
+;;                                      ourcomments-advice-ido-setup-completion-map
+;;                                      disable)
+;;   (setq ad-return-value (ourcomments-ido-setup-completion-map))
+;;   )
 
 ;;(add-hook 'ido-setup-hook 'ourcomments-ido-mode-advice)
 ;;(remove-hook 'ido-setup-hook 'ourcomments-ido-mode-advice)
 (defvar ourcomments-ido-adviced nil)
 (unless ourcomments-ido-adviced
 (defadvice ido-mode (after
-                     ourcomments-ido-add-ctrl-tab
+                     ourcomments-advice-ido-mode
+                     ;;activate
+                     ;;compile
                      disable)
   "Add C-tab to ido buffer completion."
   (ourcomments-ido-mode-advice)
-  ad-return-value)
+  ;;ad-return-value
+  )
 ;; (ad-activate 'ido-mode)
 ;; (ad-deactivate 'ido-mode)
 
 (defadvice ido-visit-buffer (before
-                             ourcomments-ido-visit-buffer-other
+                             ourcomments-advice-ido-visit-buffer
+                             ;;activate
+                             ;;compile
                              disable)
   "Advice to show buffers in other window, frame etc."
   (when ourcomments-ido-visit-method
@@ -1544,11 +1701,31 @@ function."
 (setq ourcomments-ido-adviced t)
 )
 
+(message "after advising ido")
 ;;(ad-deactivate 'ido-visit-buffer)
 ;;(ad-activate 'ido-visit-buffer)
 
 (defvar ourcomments-ido-old-state ido-mode)
 
+(defun ourcomments-ido-ctrl-tab-activate ()
+  (message "ourcomments-ido-ctrl-tab-activate running")
+  ;;(ad-update 'ido-visit-buffer)
+  ;;(unless (ad-get-advice-info 'ido-visit-buffer)
+  ;; Fix-me: The advice must be enabled before activation. Send bug report.
+  (ad-enable-advice 'ido-visit-buffer 'before 'ourcomments-advice-ido-visit-buffer)
+  (unless (cdr (assoc 'active (ad-get-advice-info 'ido-visit-buffer)))
+    (ad-activate 'ido-visit-buffer))
+  ;; (ad-enable-advice 'ido-setup-completion-map 'around 'ourcomments-advice-ido-setup-completion-map)
+  ;; (unless (cdr (assoc 'active (ad-get-advice-info 'ido-setup-completion-map)))
+  ;;   (ad-activate 'ido-setup-completion-map))
+  ;;(ad-update 'ido-mode)
+  (ad-enable-advice 'ido-mode 'after 'ourcomments-advice-ido-mode)
+  (unless (cdr (assoc 'active (ad-get-advice-info 'ido-mode)))
+    (ad-activate 'ido-mode))
+  (setq ourcomments-ido-old-state ido-mode)
+  (ido-mode (or ido-mode 'buffer)))
+
+;;;###autoload
 (defcustom ourcomments-ido-ctrl-tab nil
   "Enable buffer switching using C-Tab with function `ido-mode'.
 This changes buffer switching with function `ido-mode' the
@@ -1569,28 +1746,17 @@ of those in for example common web browsers."
   :set (lambda (sym val)
          (set-default sym val)
          (if val
-             (progn
-               (ad-activate 'ido-visit-buffer)
-               (ad-update 'ido-visit-buffer)
-               (ad-enable-advice 'ido-visit-buffer 'before
-                                 'ourcomments-ido-visit-buffer-other)
-               (ad-activate 'ido-mode)
-               (ad-update 'ido-mode)
-               (ad-enable-advice 'ido-mode 'after
-                                 'ourcomments-ido-add-ctrl-tab)
-               (setq ourcomments-ido-old-state ido-mode)
-               (ido-mode (or ido-mode 'buffer))
-               )
+             (ourcomments-ido-ctrl-tab-activate)
            (ad-disable-advice 'ido-visit-buffer 'before
-                              'ourcomments-ido-visit-buffer-other)
+                              'ourcomments-advice-ido-visit-buffer)
            (ad-disable-advice 'ido-mode 'after
-                              'ourcomments-ido-add-ctrl-tab)
+                              'ourcomments-advice-ido-mode)
            ;; For some reason this little complicated construct is
            ;; needed. If they are not there the defadvice
            ;; disappears. Huh.
-           (if ourcomments-ido-old-state
-               (ido-mode ourcomments-ido-old-state)
-             (when ido-mode (ido-mode -1)))
+           ;;(if ourcomments-ido-old-state
+           ;;    (ido-mode ourcomments-ido-old-state)
+           ;;  (when ido-mode (ido-mode -1)))
            ))
   :group 'emacsw32
   :group 'convenience)
@@ -1606,6 +1772,30 @@ of those in for example common web browsers."
                ;; in executable-find, why?
                ))
 
+(defvar ourcomments-restart-server-mode nil)
+
+(defun emacs-restart-in-kill ()
+  "Last step in restart Emacs and start `server-mode' if on before."
+  (let ((restart-args (when ourcomments-restart-server-mode
+                        ;; Delay 3+2 sec to be sure the old server has stopped.
+                        (list "--eval=(run-with-idle-timer 5 nil 'server-mode 1)"))))
+    (apply 'call-process (ourcomments-find-emacs) nil 0 nil restart-args)
+    ;; Wait to give focus to new Emacs instance:
+    (sleep-for 3)))
+
+;;;###autoload
+(defun emacs-restart ()
+  "Restart Emacs and start `server-mode' if on before."
+  (interactive)
+  (let ((wait 4))
+    (while (> (setq wait (1- wait)) 0)
+      (message (propertize (format "Will restart Emacs in %d seconds..." wait)
+                           'face 'secondary-selection))
+      (sit-for 1)))
+  (setq ourcomments-restart-server-mode server-mode)
+  (add-hook 'kill-emacs-hook 'emacs-restart-in-kill t)
+  (save-buffers-kill-emacs))
+
 ;;;###autoload
 (defun emacs()
   "Start a new Emacs."
@@ -1617,16 +1807,20 @@ of those in for example common web browsers."
 ;;;###autoload
 (defun emacs-buffer-file()
   "Start a new Emacs showing current buffer file.
-If there is no buffer file start with `dired'."
+Go to the current line and column in that file.
+If there is no buffer file then instead start with `dired'."
   (interactive)
   (recentf-save-list)
-  (let ((file (buffer-file-name)))
+  (let ((file (buffer-file-name))
+        (lin (line-number-at-pos))
+        (col (current-column)))
     ;;(unless file (error "No buffer file name"))
     (if file
         (progn
-          (call-process (ourcomments-find-emacs) nil 0 nil file)
+          (call-process (ourcomments-find-emacs) nil 0 nil "--no-desktop"
+                        (format "+%d:%d" lin col) file)
           (message "Started 'emacs buffer-file-name' - it will be ready soon ..."))
-      (call-process (ourcomments-find-emacs) nil 0 nil "--eval"
+      (call-process (ourcomments-find-emacs) nil 0 nil "--no-desktop" "--eval"
                     (format "(dired \"%s\")" default-directory)))))
 
 ;;;###autoload
@@ -1635,6 +1829,12 @@ If there is no buffer file start with `dired'."
   (call-process (ourcomments-find-emacs) nil 0 nil "--debug-init")
   (message "Started 'emacs --debug-init' - it will be ready soon ..."))
 
+;;;###autoload
+(defun emacs--no-desktop()
+  (interactive)
+  (call-process (ourcomments-find-emacs) nil 0 nil "--no-desktop")
+  (message "Started 'emacs --no-desktop' - it will be ready soon ..."))
+
 ;;;###autoload
 (defun emacs-Q()
   "Start new Emacs without any customization whatsoever."
@@ -1725,10 +1925,10 @@ This runs `query-replace-regexp' in selected files.
 See `dired-do-query-replace-regexp' for DELIMETED and more
 information."
   (interactive (dir-replace-read-parameters nil nil))
-  (message "%s" (list from to file-regexp root delimited))
+  (message "%s" (list from to files dir delimited))
   ;;(let ((files (directory-files root nil file-regexp))) (message "files=%s" files))
   (tags-query-replace from to delimited
-                      `(directory-files ,root t ,file-regexp)))
+                      `(directory-files ,dir t ,files)))
 
 (defun rdir-query-replace (from to file-regexp root &optional delimited)
   "Replace FROM with TO in FILES in directory tree ROOT.
@@ -1838,6 +2038,188 @@ information."
      (list name)))
   (info info-file))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Exec path etc
+
+(defun ourcomments-which (prog)
+  "Look for first program PROG in `exec-path' using `exec-suffixes'.
+Return full path if found."
+  (interactive "sProgram: ")
+  ;;(let ((path (locate-file prog exec-path exec-suffixes 'executable)))
+  (let ((path (executable-find prog)))
+    (when (called-interactively-p) (message "%s found in %s" prog path))
+    path))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Custom faces and keys
+
+;;;###autoload
+(defun use-custom-style ()
+  "Setup like in `Custom-mode', but without things specific to Custom."
+  (make-local-variable 'widget-documentation-face)
+  (setq widget-documentation-face 'custom-documentation)
+  (make-local-variable 'widget-button-face)
+  (setq widget-button-face custom-button)
+  (setq show-trailing-whitespace nil)
+
+  ;; We need this because of the "More" button on docstrings.
+  ;; Otherwise clicking on "More" can push point offscreen, which
+  ;; causes the window to recenter on point, which pushes the
+  ;; newly-revealed docstring offscreen; which is annoying.  -- cyd.
+  (set (make-local-variable 'widget-button-click-moves-point) t)
+
+  (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
+  (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
+
+  ;; When possible, use relief for buttons, not bracketing.  This test
+  ;; may not be optimal.
+  (when custom-raised-buttons
+    (set (make-local-variable 'widget-push-button-prefix) "")
+    (set (make-local-variable 'widget-push-button-suffix) "")
+    (set (make-local-variable 'widget-link-prefix) "")
+    (set (make-local-variable 'widget-link-suffix) ""))
+
+  ;; From widget-keymap
+  (local-set-key "\t" 'widget-forward)
+  (local-set-key "\e\t" 'widget-backward)
+  (local-set-key [(shift tab)] 'advertised-widget-backward)
+  (local-set-key [backtab] 'widget-backward)
+  (local-set-key [down-mouse-2] 'widget-button-click)
+  (local-set-key [down-mouse-1] 'widget-button-click)
+  (local-set-key [(control ?m)] 'widget-button-press)
+  ;; From custom-mode-map
+  (local-set-key " " 'scroll-up)
+  (local-set-key "\177" 'scroll-down)
+  (local-set-key "n" 'widget-forward)
+  (local-set-key "p" 'widget-backward))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Bookmarks
+
+(defun bookmark-next-marked ()
+  (interactive)
+  (let ((bb (get-buffer "*Bookmark List*"))
+        pos)
+    (when bb
+      (with-current-buffer bb
+        (setq pos (re-search-forward "^>" nil t))
+        (unless pos
+          (goto-char (point-min))
+          (setq pos (re-search-forward "^>" nil t)))))
+    (if pos
+        (with-current-buffer bb
+	  ;; Defined in bookmark.el, should be loaded now.
+          (bookmark-bmenu-this-window))
+      (call-interactively 'bookmark-bmenu-list)
+      (message "Please select bookmark for bookmark next command, then press n"))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Org Mode
+
+(defun ourcomments-org-complete-and-replace-file-link ()
+  "If on a org file link complete file name and replace it."
+  (interactive)
+  (let* ((here (point-marker))
+         (on-link (eq 'org-link (get-text-property (point) 'face)))
+         (link-beg (when on-link
+                     (previous-single-property-change (1+ here) 'face)))
+         (link-end (when on-link
+                     (next-single-property-change here 'face)))
+         (link (when on-link (buffer-substring-no-properties link-beg link-end)))
+         type+link
+         link-link
+         link-link-beg
+         link-link-end
+         new-link
+         dir
+         ovl)
+    (when (and on-link
+               (string-match (rx string-start "[["
+                                 (group (0+ (not (any "]"))))) link))
+      (setq type+link (match-string 1 link))
+      (when (string-match "^file:\\(.*\\)" type+link)
+        (setq link-link (match-string 1 type+link))
+        (setq link-link-beg (+ 2 link-beg (match-beginning 1)))
+        (setq link-link-end (+ 2 link-beg (match-end 1)))
+        (unwind-protect
+            (progn
+              (setq ovl (make-overlay link-link-beg link-link-end))
+              (overlay-put ovl 'face 'highlight)
+              (when link-link
+                (setq link-link (org-link-unescape link-link))
+                (setq dir (when (and link-link (> (length link-link) 0))
+                            (file-name-directory link-link)))
+                (setq new-link (read-file-name "Org file:" dir nil nil (file-name-nondirectory link-link)))
+                (delete-overlay ovl)
+                (setq new-link (expand-file-name new-link))
+                (setq new-link (file-relative-name new-link))
+                (delete-region link-link-beg link-link-end)
+                (goto-char link-link-beg)
+                (insert (org-link-escape new-link))
+                t))
+          (delete-overlay ovl)
+          (goto-char here))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Menu commands to M-x history
+
+;; (where-is-internal 'mumamo-mark-chunk nil nil)
+;; (where-is-internal 'mark-whole-buffer nil nil)
+;; (where-is-internal 'save-buffer nil nil)
+;; (where-is-internal 'revert-buffer nil nil)
+;; (setq extended-command-history nil)
+(defun ourcomments-M-x-menu-pre ()
+  "Add menu command to M-x history."
+  (let ((is-menu-command (equal '(menu-bar)
+                                (elt (this-command-keys-vector) 0)))
+        (pre-len (length extended-command-history)))
+    (when (and is-menu-command
+               (not (memq this-command '(ourcomments-M-x-menu-mode))))
+      (pushnew (symbol-name this-command) extended-command-history)
+      (when (< pre-len (length extended-command-history))
+        ;; This message is given pre-command and is therefore likely
+        ;; to be overwritten, but that is ok in this case. If the user
+        ;; has seen one of these messages s?he knows.
+        (message (propertize "(Added %s to M-x history so you can run it from there)"
+                             'face 'file-name-shadow)
+                 this-command)))))
+
+;;;###autoload
+(define-minor-mode ourcomments-M-x-menu-mode
+  "Add commands started from Emacs menus to M-x history.
+The purpose of this is to make it easier to redo them and easier
+to learn how to do them from the command line \(which is often
+faster if you know how to do it).
+
+Only commands that are not already in M-x history are added."
+  :global t
+  (if ourcomments-M-x-menu-mode
+      (add-hook 'pre-command-hook 'ourcomments-M-x-menu-pre)
+    (remove-hook 'pre-command-hook 'ourcomments-M-x-menu-pre)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Warnings etc
+
+(defvar ourcomments-warnings nil)
+
+(defun ourcomments-display-warnings ()
+  (condition-case err
+      (let ((msg (mapconcat 'identity (reverse ourcomments-warnings) "\n")))
+        (setq ourcomments-warnings nil)
+        (message "%s" (propertize msg 'face 'secondary-selection)))
+    (error (message "ourcomments-display-warnings: %s" err))))
+
+(defun ourcomments-warning-post ()
+  (condition-case err
+      (run-with-idle-timer 0.5 nil 'ourcomments-display-warnings)
+    (error (message "ourcomments-warning-post: %s" err))))
+
+;;;###autoload
+(defun ourcomments-warning (format-string &rest args)
+  (setq ourcomments-warnings (cons (apply 'format format-string args)
+                                   ourcomments-warnings))
+  (add-hook 'post-command-hook 'ourcomments-warning-post))
+
 (provide 'ourcomments-util)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; ourcomments-util.el ends here
diff --git a/elpa-to-submit/nxhtml/util/pause.el b/elpa-to-submit/nxhtml/util/pause.el
index e56bd5f292..0481314a3e 100644
--- a/elpa-to-submit/nxhtml/util/pause.el
+++ b/elpa-to-submit/nxhtml/util/pause.el
@@ -1,9 +1,9 @@
 ;;; pause.el --- Take a break!
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-01-19T02:51:39+0100 Sat
-;; Version: 0.64
-;; Last-Updated: 2008-06-15T11:55:21+0200 Sun
+;; Created: 2008-01-19 Sat
+(defconst pause:version "0.64");; Version:
+;; Last-Updated: 2009-08-04 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
@@ -97,7 +97,7 @@
 (defun pause-one-minute ()
   "Give you another minute ..."
   (pause-start-timer 60)
-  (message (propertize " OK, I will come back in a minute! -- greatings from pause "
+  (message (propertize " OK, I will come back in a minute! -- greatings from pause"
                        'face (list :background pause-message-color))))
 
 (defun pause-save-me ()
@@ -138,9 +138,10 @@
 (defun pause-pre-break ()
   (setq pause-timer nil)
   (condition-case err
-      (if pause-idle-delay
-          (setq pause-idle-timer (run-with-idle-timer pause-idle-delay nil 'pause-break-in-timer))
-        (setq pause-idle-timer (run-with-timer 0 nil 'pause-break-in-timer)))
+      (save-match-data ;; runs in timer
+        (if pause-idle-delay
+            (setq pause-idle-timer (run-with-idle-timer pause-idle-delay nil 'pause-break-in-timer))
+          (setq pause-idle-timer (run-with-idle-timer 5 nil 'pause-break-in-timer))))
     (error
      (lwarn 'pause-pre-break
             :error "%s" (error-message-string err)))))
@@ -159,15 +160,106 @@
   "Mode used during pause.
 
 \\[pause-break-mode-exit]"
-  (set (make-local-variable 'buffer-read-only) t))
+  (set (make-local-variable 'buffer-read-only) t)
+  ;;(set (make-local-variable 'cursor-type) nil)
+  ;; Fix-me: workaround for emacs bug
+  (run-with-idle-timer 0 nil 'pause-hide-cursor)
+  )
+
+(defun pause-kill-buffer ()
+  ;; runs in timer, save-match-data
+  (when (buffer-live-p pause-break-buffer) (kill-buffer pause-break-buffer)))
+
+(defvar pause-break-was-in-minibuffer nil)
+(defun pause-break-mode-exit-2 ()
+  ;;(message "pause-break-mode-exit-2, active-minibuffer-window=%s" (active-minibuffer-window))
+  (if (active-minibuffer-window)
+      (setq pause-break-was-in-minibuffer t)
+    (unless pause-break-was-in-minibuffer
+      ;;(message "pause-break-mode-exit-2 exit state")
+      (dolist (win (get-buffer-window-list pause-break-buffer nil t))
+        (set-window-margins win 0 0))
+      (remove-hook 'window-configuration-change-hook 'pause-break-mode-exit-2)
+      ;;(when (buffer-live-p pause-break-buffer) (kill-buffer pause-break-buffer))
+      ;; Fix-me: This is a work around for an emacs crash
+      (run-with-idle-timer 0 nil 'pause-kill-buffer)
+      (pause-save-me))
+    (setq pause-break-was-in-minibuffer nil)
+    ))
 
 (defun pause-break-mode-exit ()
   (interactive)
-  (kill-buffer pause-break-buffer)
+  (when (buffer-live-p pause-break-buffer)
+    (kill-buffer pause-break-buffer))
   (set-frame-configuration pause-break-frmcfg)
   (pause-save-me))
 
+(defcustom pause-break-text
+  (concat "\n\tHi there,"
+          "\n\tYou are worth a PAUSE!"
+          "\n\nTry some mindfulness:"
+          "\n\t- Look around and observe."
+          "\n\t- Listen."
+          "\n\t- Feel your body.")
+  "Text to show during pause."
+  :type 'integer
+  :group 'pause)
+
+(defvar pause-default-img-dir
+  (let* ((this-file (or load-file-name
+                       buffer-file-name))
+         (this-dir (file-name-directory this-file)))
+    (expand-file-name "../etc/img/pause/" this-dir)))
+
+(defcustom pause-img-dir pause-default-img-dir
+  "Image directory for pause."
+  :type 'directory
+  :group 'pause)
+
+(defun pause-insert-img ()
+  (let* ((inhibit-read-only t)
+        img
+        src
+        (slice '(0 0 200 300))
+        (imgs (directory-files pause-img-dir nil nil t))
+        skip
+        )
+    (setq imgs (delete nil
+                       (mapcar (lambda (d)
+                                 (unless (file-directory-p d) d))
+                               imgs)))
+    ;;(message "imgs=%s" imgs)
+    (setq skip (random (length imgs)))
+    (while (> skip 0)
+      (setq skip (1- skip))
+      (setq imgs (cdr imgs)))
+    (setq src (expand-file-name (car imgs) pause-img-dir))
+    (if (file-exists-p src)
+        (condition-case err
+            (setq img (create-image src nil nil
+                                    :relief 1
+                                    ;;:margin inlimg-margins
+                                    ))
+          (error (setq img (error-message-string err))))
+      (setq img (concat "Image not found: " src)))
+    (if (stringp img)
+        (insert img)
+      (insert-image img nil 'left-margin slice)
+      )
+    ;;(message "After insert img=%s" img)
+    ))
+
+(defun pause-hide-cursor ()
+  ;; runs in timer, save-match-data
+  (with-current-buffer pause-break-buffer
+    (set (make-local-variable 'cursor-type) nil)))
+
+(defun pause-add-to-conf-hook ()
+  ;; runs in timer, save-match-data
+  (add-hook 'window-configuration-change-hook 'pause-break-mode-exit-2))
+
 (defun pause-break ()
+  ;;(message "pause-break")
   (pause-cancel-timer)
   (setq pause-break-frmcfg (current-frame-configuration))
   (dolist (frm (frame-list))
@@ -175,44 +267,58 @@
       (delete-other-windows)
       (setq pause-break-buffer
             (switch-to-buffer (get-buffer-create "* P A U S E *")))
+      (set-window-margins (selected-window) 25 0)
       (when (= 0 (buffer-size))
-        (insert (propertize "\n\tHi there,\n\n\tYou are worth a PAUSE!\n"
-                            'face (list 'bold
-                                        :height 2.0
-                                        :foreground pause-text-color)))
         (pause-break-mode)
+        (pause-insert-img)
+        ;;(insert (propertize "\n\tHi there,\n\n\tYou are worth a PAUSE!\n"
         (let ((inhibit-read-only t))
-          (insert "\n\nTo exit use ")
-          (where-is 'pause-break-mode-exit t)))))
-  (top-level))
+          (insert (propertize pause-break-text
+                              'face (list 'bold
+                                          :height 1.5
+                                          :foreground pause-text-color)))
+          (insert (propertize "\n\nTo exit switch buffer\n"
+                              'face (list :foreground "lawn green")))
+          ;;(where-is 'pause-break-mode-exit t)
+          )
+        (goto-char 1)
+        )))
+  (run-with-idle-timer 0 nil 'pause-add-to-conf-hook)
+  (setq pause-break-was-in-minibuffer (active-minibuffer-window))
+  ;;(message "pause-break-was-in-minibuffer before top-level=%s" pause-break-was-in-minibuffer)
+  (top-level)
+  )
 
 (defun pause-cancel-timer ()
   (when (timerp pause-idle-timer) (cancel-timer pause-idle-timer))
   (setq pause-idle-timer nil))
 
 (defun pause-break-in-timer ()
-  (pause-cancel-timer)
-  (if (or (active-minibuffer-window)
-          edebug-active)
-      (let ((pause-idle-delay 5))
-        (pause-pre-break))
-    (let ((there-was-an-error nil))
-      (message "calling break in timer")
-      (condition-case err
-          (pause-break)
-        (error
-         (message "pause-break-in-timer: %s" (error-message-string err))
-         (setq there-was-an-error t)))
-      (when there-was-an-error
+  (save-match-data ;; runs in timer
+    (pause-cancel-timer)
+    (if (or (active-minibuffer-window)
+            (and (boundp 'edebug-active)
+                 edebug-active))
+        (let ((pause-idle-delay 5))
+          (pause-pre-break))
+      (let ((there-was-an-error nil))
+        ;;(message "calling break in timer")
         (condition-case err
-            (progn
-              (select-frame last-event-frame)
-              (let ((pause-idle-delay nil))
-                (pause-pre-break)))
+            (pause-break)
           (error
-           (lwarn 'pause-break-in-timer2 :error "%s" (error-message-string err))
-           ))))))
+           (message "pause-break-in-timer: %s" (error-message-string err))
+           (setq there-was-an-error t)))
+        (when there-was-an-error
+          (condition-case err
+              (progn
+                (select-frame last-event-frame)
+                (let ((pause-idle-delay nil))
+                  (pause-pre-break)))
+            (error
+             (lwarn 'pause-break-in-timer2 :error "%s" (error-message-string err))
+             )))))))
 
+;;;###autoload
 (define-minor-mode pause-mode
   "This minor mode tries to make you take a break!
 To customize it see:
diff --git a/elpa-to-submit/nxhtml/util/physical-line.el b/elpa-to-submit/nxhtml/util/physical-line.el
deleted file mode 100644
index 9f4bc7360c..0000000000
--- a/elpa-to-submit/nxhtml/util/physical-line.el
+++ /dev/null
@@ -1,436 +0,0 @@
-;; $Id: physical-line.el,v 1.11 2004/04/16 02:29:04 komatsu Exp $
-;;
-;; physical-line.el            by Hiroyuki Komatsu <komatsu@taiyaki.org>
-;;
-;; Don't you get annoyed with Emacs cursor skipping lines?
-;;
-;; Physical-line-mode.el provides a minor mode to move a cursor
-;; across "physical lines", which are actual lines displayed on your
-;; Emacs screen. Usually Emacs takes a line as "logical" one, which
-;; is defined as a string between two newline characters. So if you
-;; type C-p (or C-n) on a sentence which stretches for several lines,
-;; it seems to skip the part you really want to move
-;; to. Physical-line-mode.el makes your Emacs recognize physical
-;; lines correctly in the following commands: previous-line,
-;; next-line, beginning-of-line, end-of-line. It will make your
-;; Emacs-life much more comfortable!
-;;
-;; Physical-line-mode.el comes with ABSOLUTELY NO WARRANTY.
-;; This software is distributed under the GNU General Public License.
-;;
-;; = How To Use =
-;; M-x load-file [physical-line.el]
-;; M-x physical-line-mode
-;;
-; TODO
-;  ʪÍý¹Ôɽ¼¨¤ÎÉü³è.
-;
-; BUGS
-;  dired-mode ¤È¤ÏÁêÀ­¤¬°­¤¤.
-
-;; ============================================================
-;; Mell (2002-05-18)
-;; ============================================================
-
-(or (boundp 'running-xemacs)
-    (setq running-xemacs nil))
-
-(defun mell-set-minor-mode (name modeline &optional key-map)
-  (make-variable-buffer-local name)
-  (setq minor-mode-alist
-	(mell-alist-add minor-mode-alist (list name modeline)))
-  (and key-map
-       (setq minor-mode-map-alist
-	     (mell-alist-add minor-mode-map-alist (cons name key-map)))
-       )
-  )
-
-(or (fboundp 'add-local-hook)
-    (defun add-local-hook (hook function &optional append)
-      (make-local-hook hook)
-      (add-hook hook function append t))
-    )
-
-(or (fboundp 'remove-local-hook)
-    (defun remove-local-hook (hook function)
-      (if (local-variable-p hook (current-buffer))
-	  (remove-hook hook function t)))
-    )
-
-(defun mell-alist-add! (alist new-cons)
-  (if (null alist)
-      (error "mell-alist-add! can not deal nil as an alist.")
-    (let ((current-cons (assoc (car new-cons) alist)))
-      (if current-cons
-	  (setcdr current-cons (cdr new-cons))
-	(if (car alist)
-	    (nconc alist (list new-cons))
-	  (setcar alist new-cons))
-	)
-      alist)))
-
-(defun mell-alist-add (alist new-cons)
-  (if (null alist)
-      (list new-cons)
-    (let ((return-alist (copy-alist alist)))
-      (mell-alist-add! return-alist new-cons)
-      return-alist)))
-
-(defun mell-transient-region-stay ()
-  (and running-xemacs
-       (setq zmacs-region-stays t))
-  )
-;;;; ------------------------------------------------------------
-;(defvar physical-line-mode-map (make-sparse-keymap))
-;(substitute-key-definition 'beginning-of-line 'physical-line-beginning-of-line
-;			   physical-line-mode-map global-map)
-;(substitute-key-definition 'end-of-line 'physical-line-end-of-line
-;			   physical-line-mode-map global-map)
-
-(defvar physical-line nil
-  "*Non-nil means move cursor to same column of frame line.
--1 means move cursor to same column of logical line")
-
-(defvar physical-line-mode nil
-  "*Non-nil means move cursor to same column of frame line buffer-locally.")
-(mell-set-minor-mode 'physical-line-mode " PL" nil)
-;(mell-set-minor-mode 'physical-line-mode " PL" physical-line-mode-map)
-
-(defcustom physical-line-keep-goal-column-command-list
-  '(previous-line next-line
-    physical-line-previous-line physical-line-next-line
-    physical-line-previous-logical-line physical-line-next-logical-line
-    )
-  "Keep tempororay-goal-column as physical line goal column
-after the function in the list")
-
-(defvar physical-line-ignoring-mode-list '(dired-mode)
-  "physical-line-mode does not work under a mode in the list.")
-
-(defvar physical-line-mode-exception '(dired-mode)
-  "physical-line-move-without-exception except modes of this list.")
-
-(defun physical-line-init (&optional arg)
-  (if (> (prefix-numeric-value arg) 0)
-      (progn
-	(ad-enable-advice 'line-move 'around 'physical-line-move)
-	(ad-enable-advice 'beginning-of-line
-			  'around 'physical-line-beginning-of-line)
-	(ad-enable-advice 'end-of-line
-			  'around 'physical-line-end-of-line)
-	)
-    (ad-disable-advice 'line-move 'around 'physical-line-move)
-    (ad-disable-advice 'beginning-of-line
-		       'around 'physical-line-beginning-of-line)
-    (ad-disable-advice 'end-of-line
-		       'around 'physical-line-end-of-line)
-    )
-  (ad-activate 'line-move)
-  (ad-activate 'beginning-of-line)
-  (ad-activate 'end-of-line)
-  )
-
-(defun physical-line-on ()
-  (interactive)
-  (setq physical-line t)
-  (physical-line-init)
-  )
-
-(defun physical-line-off ()
-  (interactive)
-  (setq physical-line nil)
-  )
-
-(defun physical-line-mode (&optional arg)
-  "Toggle Physical Line mode.
-With ARG, turn Physical Line mode on iff ARG is positive.
-When Physical Line mode is enabled, cursor moving style is changed
-from Logical to Physical."
-  (interactive "P")
-  (setq physical-line-mode (if (null arg)
-                              (not physical-line-mode)
-                            (> (prefix-numeric-value arg) 0)))
-  )
-
-(defun physical-line-mode-on ()
-  "Turn on Physical Line mode."
-  (interactive)
-  (physical-line-mode t))
-
-(defun physical-line-mode-off ()
-  "Turn off Physical Line mode."
-  (interactive)
-  (physical-line-mode -1))
-
-(defun physical-line-mode-without-exception ()
-  "Turn on Physical Line mode without modes which are members of physical-line-move-exceptionthe."
-  (physical-line-mode
-   (if (memq major-mode physical-line-mode-exception) -1 t)
-   ))
-
-(defadvice line-move (around physical-line-move disable)
-  "Move cursor to same column of frame line down ARG lines."
-  (if (not (physical-line-active-p))
-      ;; physical-line ¤¬Í­¸ú¤Ç¤Ê¤±¤ì¤Ð²¿¤â¤·¤Ê¤¤
-      ad-do-it
-    (or (physical-line-keep-goal-column-p)
-	 ;; temporary-goal-column ¤Ï pline-mode °ÊÁ°¤Î line-move ¤È¶¦ÍÑ
-	(setq temporary-goal-column (physical-current-column)))
-    (physical-line-line-move-function (ad-get-arg 0))
-    ))
-
-(defun physical-line-line-move-function (arg)
-  (let ((moved (physical-line-the-vertical-motion arg)))
-    (cond
-     ((> moved arg)
-      (signal 'beginning-of-buffer nil))
-     ((< moved arg)
-      (goto-char (point-max))
-      (signal 'end-of-buffer nil))
-     ))
-  (physical-line-move-to-column temporary-goal-column)
-  )
-
-(defadvice beginning-of-line (around physical-line-beginning-of-line disable)
-  (if (or (eq last-command this-command)
-	  (null (physical-line-active-p))
-	  (null (interactive-p))
-	  (/=  (prefix-numeric-value (ad-get-arg 0)) 1)
-	  )
-      ad-do-it
-    (physical-line-the-vertical-motion
-     (1- (prefix-numeric-value (ad-get-arg 0))))
-    )
-  (mell-transient-region-stay)
-  )
-
-(defadvice end-of-line (around physical-line-end-of-line disable)
-  (if (or (eq last-command this-command)
-	  (null (physical-line-active-p))
-	  (null (interactive-p))
-	  (/=  (prefix-numeric-value (ad-get-arg 0)) 1)
-	  )
-      ad-do-it
-    (if (= (physical-line-the-vertical-motion
-	    (prefix-numeric-value (ad-get-arg 0)))
-	   (prefix-numeric-value (ad-get-arg 0)))
-	(backward-char 1)
-      ))
-  (mell-transient-region-stay)
-  )
-
-(defun physical-line-active-p ()
-  (and (not (eq physical-line -1))
-       (or  physical-line
-	    physical-line-mode)
-       (null (member major-mode physical-line-ignoring-mode-list))
-       ))
-
-(defun physical-line-keep-goal-column-p ()
-  (member last-command physical-line-keep-goal-column-command-list)
-  )
-
-(defun physical-line-previous-logical-line (&optional count)
-  (interactive "P")
-  (let ((physical-line -1))
-      (call-interactively 'previous-line)
-    ))
-
-(defun physical-line-next-logical-line (&optional count)
-  (interactive "P")
-  (let ((physical-line -1))
-      (call-interactively 'next-line)
-    ))
-
-(defun physical-line-end-of-logical-line (&optional count)
-  (interactive "P")
-  (let ((physical-line -1))
-      (call-interactively 'end-of-line)
-    ))
-
-(defun physical-line-beginning-of-logical-line (&optional count)
-  (interactive "P")
-  (let ((physical-line -1))
-      (call-interactively 'beginning-of-line)
-    ))
-
-(defun physical-line-previous-line (&optional count)
-  (interactive "P")
-  (let ((physical-line t))
-      (call-interactively 'previous-line)
-    ))
-
-(defun physical-line-next-line (&optional count)
-  (interactive "P")
-  (let ((physical-line t))
-      (call-interactively 'next-line)
-    ))
-
-(defun physical-line-end-of-line (&optional count)
-  (interactive "P")
-  (let ((physical-line t))
-      (call-interactively 'end-of-line)
-    ))
-
-(defun physical-line-beginning-of-line (&optional count)
-  (interactive "P")
-  (let ((physical-line t))
-      (call-interactively 'beginning-of-line)
-    ))
-
-
-(defun physical-current-column ()
-  (let ((cur (current-column))
-	(bol (progn (physical-line-the-vertical-motion 0)
-		    (current-column))))
-    (move-to-column cur)
-    (- cur bol)))
-
-(defun physical-line-move-to-column (arg)
-  (and (> arg 0)
-       (move-to-column (+ (current-column) arg -1))
-       (not (eolp))
-       (let ((column (physical-current-column)))
-	 (catch 'loop
-	   (while (not (or (> column arg)
-			   (and (= column 0) (> arg 1))))
-	     (forward-char 1)
-	     (setq column (physical-current-column))
-	     (and (= column 0) (throw 'loop t))
-	     )
-	   )
-	 (forward-char -1)
-	 )))
-
-;;;; The vertical motion
-(if (and (boundp 'running-xemacs) running-xemacs)
-    (defalias 'physical-line-the-vertical-motion 'vertical-motion)
-  (defalias 'physical-line-the-vertical-motion
-    'physical-line-the-vertical-motion--for-emacs21)
-  )
-
-;; Emacs21 ¤Î vertical-motion ¤Ï WIDE ʸ»ú¤È¥¿¥Ö¤Ë̤Âбþ
-;; Emacs21 ¤Ç¿®Íê¤Ç¤­¤ë¤Î¤Ï¡Ö¹ÔƬ¤Ç¤Î vertical-motion arg (> 0)¡× ¤Î¤ß
-(defun physical-line-the-vertical-motion--for-emacs21 (arg)
-  (let* ((bol-list (physical-line-get-bol-list arg))
-	 (last-index (1- (length bol-list)))
-	 (i 0))
-
-    ;; (vertical-motion 0) ¤Î¾ì½ê¤ò¸«¤Ä¤±¤ë.
-    (while (and (<= i last-index)
-		(>= (point) (nth i bol-list)))
-      (setq i (1+ i)))
-    (setq i (1- i))
-
-    ;; ¥Ð¥Ã¥Õ¥¡Ëö¤ÎÆÃÊ̽èÍý
-    (if (and (eobp) (not (bolp)))
-	(setq i (1- i)))
-
-    ;; arg ʬ°ÜÆ°¤µ¤»¤ë.
-    (if (< (+ i arg) 0)
-	(setq arg (- i)))
-    (if (> (+ i arg) last-index)
-	(setq arg (- last-index i)))
-
-    (goto-char (nth (+ i arg) bol-list))
-    (if (and (eobp) (not (bolp)))
-	(1+ arg)
-      arg)))
-
-
-(defun physical-line-get-bol-list (&optional arg)
-  (let ((cur-point (point))
-	(eol-point (point-at-eol))
-	(bol-point (point-at-bol))
-	phy-bol-list)
-    (if (integerp arg)
-	(progn
-	  ;; Though this function is only used on FSF Emacs21,
-	  ;; forward-visible-line is not available on XEmacs21.
-	  (forward-visible-line arg)
-	  (if (> arg 0)
-	      (setq eol-point (point-at-eol))
-	    (setq bol-point (point-at-bol))
-	    )))
-    (goto-char bol-point)
-    (while (< (point) eol-point)
-      (setq phy-bol-list (cons (point) phy-bol-list))
-      (physical-line-the-vertical-motion-one--for-emacs21)
-      )
-    (if (= (point) eol-point)
-	(setq phy-bol-list (cons (point) phy-bol-list)))
-    (goto-char cur-point)
-    (reverse phy-bol-list)
-    ))
-
-(defun physical-line-the-vertical-motion-one--for-emacs21 ()
-  ;; FIXME: Adhoc solution for FSF Emacs 21.3.1.
-  ;; FIXME: (2004-06-16) <komatsu@taiyaki.org>
-  (and
-   (or (string= "21.3.1" emacs-version)
-       (string< "21.3.1" emacs-version))
-   (or (eolp) (forward-char 1)))
-  ;;
-  (vertical-motion 1))
-
-; ʪÍý¹Ôɽ¼¨¤ÏÊ̤Υޥ¤¥Ê¡¼¥â¡¼¥É¤Ë¤¹¤ë.
-;(defun physical-line-mode (&optional arg refresh)
-;  "Toggle Physical Line mode.
-;With ARG, turn Physical Line mode on iff ARG is positive.
-;When Physical Line mode is enabled, cursor moving style is changed
-;from Logical to Physical.
-;And with REFRESH, reset lisp function line-move for Logical Line
-;which is normal cursor moving style."
-;  (interactive "P")
-;  (setq physical-line-mode (if (null arg)
-;                             (not physical-line-mode)
-;                           (> (prefix-numeric-value arg) 0)))
-;  (or (boundp 'original-mode-line-format)
-;      (progn
-;       (make-local-variable 'original-mode-line-format)
-;       (setq original-mode-line-format mode-line-format)
-;       (setq physical-mode-line-format
-;             (physical-line-modeline mode-line-format))))
-;  (make-local-hook 'post-command-hook)
-;  (if physical-line-mode
-;      (progn
-;       (ad-enable-advice 'line-move 'around 'physical-line-move)
-;       (setq mode-line-format physical-mode-line-format)
-;       (add-hook 'post-command-hook 'physical-line-set-position))
-;    (ad-disable-advice 'line-move 'around 'physical-line-move)
-;    (setq mode-line-format original-mode-line-format)
-;    (remove-hook 'post-command-hook 'physical-line-set-position))
-;  (ad-activate 'line-move))
-
-;ʪÍý¹Ôɽ¼¨ÍѤʤΤÇ, ¸½ºß̤»ÈÍÑ.
-;(defun physical-line-modeline (&optional ml)
-;  "Make modeline for display Physical Line and Column."
-;  (make-local-variable 'physical-line)
-;  (make-local-variable 'physical-column)
-;  (physical-line-set-position)
-;  (or ml (setq ml mode-line-format))
-;  (mapcar
-;   (function (lambda (arg)
-;	       (cond ((and (listp arg) (eq (car arg) 'line-number-mode))
-;		      '(line-number-mode ("PL" physical-line "--")))
-;		     ((and (listp arg) (eq (car arg) 'column-number-mode))
-;		      '(column-number-mode ("PC" physical-column "--")))
-;		     (t arg))))
-;   ml))
-
-;ʪÍý¹Ôɽ¼¨ÍѤʤΤÇ, ¸½ºß̤»ÈÍÑ.
-;(defun physical-line-set-position ()
-;  "Set strings of Physical Column and Line for modeline."
-;  (setq physical-column (number-to-string (physical-current-column)))
-;  (setq physical-line
-;	(let ((pos (point))
-;	      (line (vertical-motion -10000)))
-;	  (goto-char pos)
-;	  (if (= line -10000)
-;	      "****"
-;	    (number-to-string (- 1 line))))))
-
-
-(physical-line-init)
-(provide 'physical-line)
-
diff --git a/elpa-to-submit/nxhtml/util/pointback.el b/elpa-to-submit/nxhtml/util/pointback.el
new file mode 100644
index 0000000000..7a17943e6f
--- /dev/null
+++ b/elpa-to-submit/nxhtml/util/pointback.el
@@ -0,0 +1,93 @@
+;;; pointback.el --- Restore window points when returning to buffers
+
+;; Copyright (C) 2009  Markus Triska
+
+;; Author: Markus Triska <markus.triska@gmx.at>
+;; Keywords: convenience
+
+;; This program 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 3 of the License, or
+;; (at your option) any later version.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; When you have two windows X and Y showing different sections of the
+;; same buffer B, then switch to a different buffer in X, and then
+;; show B in X again, the new point in X will be the same as in Y.
+;; With pointback-mode, window points are preserved instead, and point
+;; will be where it originally was in X for B when you return to B.
+
+;; Use M-x pointback-mode RET to enable pointback-mode for a buffer.
+;; Use M-x global-pointback-mode RET to enable it for all buffers.
+
+;;; Code:
+
+(require 'assoc)
+
+(defconst pointback-version "0.2")
+
+(defvar pointback-windows nil
+  "Association list of windows to buffers and window points.")
+
+(defun pointback-store-point ()
+  "Save window point and start for the current buffer of the
+selected window."
+  (sit-for 0)                       ; redisplay to update window-start
+  (let* ((buffers (cdr (assq (selected-window) pointback-windows)))
+         (b (assq (current-buffer) buffers))
+         (p (cons (point) (window-start))))
+    (if b
+        (setcdr b p)
+      (let ((current (cons (current-buffer) p)))
+        (aput 'pointback-windows (selected-window) (cons current buffers))))))
+
+(defun pointback-restore ()
+  "Restore previously stored window point for the selected window."
+  (let* ((buffers (cdr (assq (selected-window) pointback-windows)))
+         (b (assq (current-buffer) buffers))
+         (p (cdr b)))
+    (when b
+      (goto-char (car p))
+      (set-window-start (selected-window) (cdr p) t)))
+  ;; delete dead windows from pointback-windows
+  (dolist (w pointback-windows)
+    (unless (window-live-p (car w))
+      (adelete 'pointback-windows (car w))))
+  ;; delete window points of dead buffers
+  (dolist (w pointback-windows)
+    (let (buffers)
+      (dolist (b (cdr w))
+        (when (buffer-live-p (car b))
+          (push b buffers)))
+      (aput 'pointback-windows (car w) buffers))))
+
+;;;###autoload
+(define-minor-mode pointback-mode
+  "Restore previous window point when switching back to a buffer."
+  :lighter ""
+  (if pointback-mode
+      (progn
+        (add-hook 'post-command-hook 'pointback-store-point nil t)
+        (add-hook 'window-configuration-change-hook
+                  'pointback-restore nil t))
+    (remove-hook 'post-command-hook 'pointback-store-point t)
+    (remove-hook 'window-configuration-change-hook 'pointback-restore t)
+    (setq pointback-windows nil)))
+
+;;;###autoload
+(define-globalized-minor-mode global-pointback-mode pointback-mode pointback-on)
+
+(defun pointback-on ()
+  (pointback-mode 1))
+
+(provide 'pointback)
+;;; pointback.el ends here
diff --git a/elpa-to-submit/nxhtml/util/popcmp.el b/elpa-to-submit/nxhtml/util/popcmp.el
index b1f7af69e4..75c2ae4383 100644
--- a/elpa-to-submit/nxhtml/util/popcmp.el
+++ b/elpa-to-submit/nxhtml/util/popcmp.el
@@ -43,7 +43,7 @@
 ;;
 ;;; Code:
 
-(require 'ourcomments-util)
+(eval-when-compile (require 'ourcomments-util))
 
 (defgroup popcmp nil
   "Customization group for popup completion."
@@ -51,21 +51,103 @@
   :group 'nxhtml
   :group 'convenience)
 
-(define-toggle popcmp-popup-completion t
-  "Use a popup menu for some completions if non-nil.
-When completion is used for alternatives tighed to text at the
-point in buffer it may make sense to use a popup menu for
-completion.  This variable let you decide whether normal style
-completion or popup style completion should be used then.
+;; (define-toggle popcmp-popup-completion t
+;;   "Use a popup menu for some completions if non-nil.
 
-This style of completion is not implemented for all completions.
-It is implemented for specific cases but the choice of completion
-style is managed generally by this variable for all these cases.
+;; ***** Obsolete: Use `popcmp-completion-style' instead.
+
+;; When completion is used for alternatives tighed to text at the
+;; point in buffer it may make sense to use a popup menu for
+;; completion.  This variable let you decide whether normal style
+;; completion or popup style completion should be used then.
+
+;; This style of completion is not implemented for all completions.
+;; It is implemented for specific cases but the choice of completion
+;; style is managed generally by this variable for all these cases.
+
+;; See also the options `popcmp-short-help-beside-alts' and
+;; `popcmp-group-alternatives' which are also availabe when popup
+;; completion is available."
+;;   :tag "Popup style completion"
+;;   :group 'popcmp)
+
+(defun popcmp-cant-use-style (style)
+  (save-match-data ;; runs in timer
+    (describe-variable 'popcmp-completion-style)
+    (message (propertize "popcmp-completion-style: style `%s' is not available"
+                         'face 'secondary-selection)
+             style)))
+
+
+
+
+
+;;(popcmp-set-completion-style 'company-mode)
+(defun popcmp-set-completion-style (val)
+  "Internal use, set `popcmp-completion-style' to VAL."
+  (assert (memq val '(popcmp-popup emacs-default company-mode anything)) t)
+  (case val
+    ('company-mode (unless (fboundp 'company-mode)
+                     (require 'company-mode nil t))
+                   (unless (fboundp 'company-mode)
+                     (run-with-idle-timer 1 nil 'popcmp-cant-use-style val)
+                     (setq val 'popcmp-popup)))
+    ('anything     (unless (fboundp 'anything)
+                     (require 'anything nil t))
+                   (unless (fboundp 'anything)
+                     (run-with-idle-timer 1 nil 'popcmp-cant-use-style val)
+                     (setq val 'popcmp-popup))))
+  (set-default 'popcmp-completion-style val)
+  (unless (eq val 'company-mode)
+    (when (and (boundp 'global-company-mode)
+               global-company-mode)
+      (global-company-mode -1))
+    (remove-hook 'after-change-major-mode-hook 'company-set-major-mode-backend)
+    (remove-hook 'mumamo-after-change-major-mode-hook 'mumamo-turn-on-company-mode))
+  (when (eq val 'company-mode)
+    (unless (and (boundp 'global-company-mode)
+                 global-company-mode)
+      (global-company-mode 1))
+    (add-hook 'after-change-major-mode-hook 'company-set-major-mode-backend)
+    (add-hook 'mumamo-after-change-major-mode-hook 'mumamo-turn-on-company-mode)))
+
+;; fix-me: move to mumamo.el
+(defun mumamo-turn-on-company-mode ()
+  (when (and (boundp 'company-mode)
+             company-mode)
+    (company-mode 1)
+    (company-set-major-mode-backend)))
+
+(defcustom popcmp-completion-style (cond
+                                    ;;((and (fboundp 'global-company-mode) 'company-mode) 'company-mode)
+                                    (t 'popcmp-popup))
+  "Completion style.
+The currently available completion styles are:
+
+- popcmp-popup: Use OS popup menus (default).
+- emacs-default: Emacs default completion.
+- Company Mode completion.
+- anything: The Anything elisp lib completion style.
+
+The style of completion set here is not implemented for all
+completions.  The scope varies however with which completion
+style you have choosen.
+
+For information about Company Mode and how to use it see URL
+`http://www.emacswiki.org/emacs/CompanyMode'.
+
+For information about Anything and how to use it see URL
+`http://www.emacswiki.org/emacs/Anything'.
 
 See also the options `popcmp-short-help-beside-alts' and
 `popcmp-group-alternatives' which are also availabe when popup
 completion is available."
-  :tag "Popup style completion"
+  :type '(choice (const company-mode)
+                 (const popcmp-popup)
+                 (const emacs-default)
+                 (const anything))
+  :set (lambda (sym val)
+         (popcmp-set-completion-style val))
   :group 'popcmp)
 
 (define-toggle popcmp-short-help-beside-alts t
@@ -74,7 +156,7 @@ If this is non-nil a short help text is shown beside each
 alternative for which such a help text is available.
 
 This works in the same circumstances as
-`popcmp-popup-completion'."
+`popcmp-completion-style'."
   :tag "Short help beside alternatives"
   :group 'popcmp)
 
@@ -85,7 +167,7 @@ sets. If this option is non-nil then you will first choose a set
 and then an alternative within this set.
 
 This works in the same circumstances as
-`popcmp-popup-completion'."
+`popcmp-completion-style'."
   :tag "Group alternatives"
   :group 'popcmp)
 
@@ -134,9 +216,41 @@ This works in the same circumstances as
     alt))
 
 (defun popcmp-remove-help (alt-with-help)
-  (replace-regexp-in-string " -- .*" "" alt-with-help))
+  (when alt-with-help
+    (replace-regexp-in-string " -- .*" "" alt-with-help)))
+
+(defun popcmp-anything (prompt collection
+                               predicate require-match
+                               initial-input hist def inherit-input-method
+                               alt-help alt-sets)
+  (let* ((table collection)
+         (alt-sets2 (apply 'append (mapcar 'cdr alt-sets)))
+         (cands (cond ((not (listp table)) alt-sets2)
+                     (t table)))
+         ret-val
+         (source `((name . "Completion candidates")
+                   (candidates . ,cands)
+                   (action . (("Select current alternative (press TAB to see it again)" . (lambda (candidate)
+                                            (setq ret-val candidate))))))))
+    (anything (list source) initial-input prompt)
+    ret-val))
 
-(defun popcmp-completing-read-nopop (prompt
+(defun popcmp-completing-read-1 (prompt collection
+                                        predicate require-match
+                                        initial-input hist2 def inherit-input-method alt-help alt-sets)
+  ;; Fix-me: must rename hist to hist2 in par list. Emacs bug?
+  (cond
+   ((eq popcmp-completion-style 'emacs-default)
+    (completing-read prompt collection predicate require-match initial-input hist2 def inherit-input-method))
+   ((eq popcmp-completion-style 'anything)
+    (popcmp-anything prompt collection predicate require-match initial-input hist2 def inherit-input-method
+                     alt-help alt-sets))
+   ((eq popcmp-completion-style 'company-mode)
+    ;; No way to read this from company-mode, use emacs-default
+    (completing-read prompt collection predicate require-match initial-input hist2 def inherit-input-method))
+   (t (error "Do not know popcmp-completion-style %S" popcmp-completion-style))))
+
+(defun popcmp-completing-read-other (prompt
                                     table
                                     &optional predicate require-match
                                     initial-input pop-hist def inherit-input-method
@@ -155,27 +269,33 @@ This works in the same circumstances as
                                 sets))
              set)
         (setq set
-              (downcase
-               (completing-read (concat
-                                 (substring prompt 0 (- (length prompt) 2))
-                                 ", select group: ")
-                                set-names
-                                nil t
-                                nil nil nil inherit-input-method)))
-        (if (= 0 (length set))
+              (popcmp-completing-read-1 (concat
+                                         (substring prompt 0 (- (length prompt) 2))
+                                         ", select group: ")
+                                        set-names
+                                        nil t
+                                        nil nil nil inherit-input-method nil nil))
+        (if (or (not set) (= 0 (length set)))
             (setq alts nil)
+          (setq set (downcase set))
           (setq alts (popcmp-getset-alts set sets)))))
     (if (not alts)
         ""
-      (when popcmp-short-help-beside-alts
-        (setq alts (mapcar (lambda (a)
-                             (popcmp-add-help a alt-help))
-                           alts)))
-      (popcmp-remove-help
-       (completing-read prompt
-                        alts ;table
-                        predicate require-match
-                        initial-input pop-hist def inherit-input-method)))))
+      (if (= 1 (length alts))
+          (car alts)
+        (when popcmp-short-help-beside-alts
+          (setq alts (mapcar (lambda (a)
+                               (popcmp-add-help a alt-help))
+                             alts)))
+        (popcmp-remove-help
+         ;;(completing-read prompt
+         (popcmp-completing-read-1 prompt
+                                   alts ;table
+                                   predicate require-match
+                                   initial-input pop-hist def inherit-input-method
+                                   ;;alt-help alt-sets
+                                   nil nil
+                                   ))))))
 
 (defun popcmp-completing-read-pop (prompt
                                   table
@@ -192,7 +312,6 @@ This works in the same circumstances as
           (message "No alternative found")
           nil)
       (let ((pop-map (make-sparse-keymap prompt))
-            (where (point-to-coord (point)))
             (sets (when (and popcmp-group-alternatives alt-sets)
                     (popcmp-getsets matching-alts alt-sets)))
             (add-alt (lambda (k tg)
@@ -218,6 +337,7 @@ This works in the same circumstances as
         (popup-menu-at-point pop-map)
         completion))))
 
+(defvar popcmp-in-buffer-allowed nil)
 (defun popcmp-completing-read (prompt
                               table
                               &optional predicate require-match
@@ -230,7 +350,7 @@ purpose is to provide a popup style menu for completion when
 completion is tighed to text at point in a buffer. If a popup
 menu is used it will be shown at window point. Whether a popup
 menu or minibuffer completion is used is governed by
-`popcmp-popup-completion'.
+`popcmp-completion-style'.
 
 The variables PROMPT, TABLE, PREDICATE, REQUIRE-MATCH,
 INITIAL-INPUT, POP-HIST, DEF and INHERIT-INPUT-METHOD all have the
@@ -245,24 +365,51 @@ ALT-SETS should be nil or an association list that has as keys
 groups and as second element an alternative that should go into
 this group.
 "
-  (popcmp-mark-completing initial-input)
-  (unwind-protect
-      (if popcmp-popup-completion
-          (popcmp-completing-read-pop
-           prompt
-           table
-           predicate require-match
-           initial-input pop-hist def inherit-input-method
-           alt-help
-           alt-sets)
-        (popcmp-completing-read-nopop
-         prompt
-         table
-         predicate require-match
-         initial-input pop-hist def inherit-input-method
-         alt-help
-         alt-sets))
-    (popcmp-unmark-completing)))
+  (if (and popcmp-in-buffer-allowed
+           (eq popcmp-completion-style 'company-mode)
+           (boundp 'company-mode)
+           company-mode)
+      (progn
+        (add-hook 'company-completion-finished-hook 'nxhtml-complete-tag-do-also-for-state-completion t)
+        ;;(remove-hook 'company-completion-finished-hook 'nxhtml-complete-tag-do-also-for-state-completion)
+        (call-interactively 'company-nxml)
+        initial-input)
+
+    (popcmp-mark-completing initial-input)
+    (let ((err-sym 'quit)
+          (err-val nil)
+          ret)
+      (unwind-protect
+          (if (eq popcmp-completion-style 'popcmp-popup)
+              (progn
+                (setq err-sym nil)
+                (popcmp-completing-read-pop
+                 prompt
+                 table
+                 predicate require-match
+                 initial-input pop-hist def inherit-input-method
+                 alt-help
+                 alt-sets))
+            ;;(condition-case err
+                (prog1
+                    (setq ret (popcmp-completing-read-other
+                               prompt
+                               table
+                               predicate require-match
+                               initial-input pop-hist def inherit-input-method
+                               alt-help
+                               alt-sets))
+                  ;; Unless quit or error in Anything we come here:
+                  ;;(message "ret=(%S)" ret)
+                  (when (and ret (not (string= ret "")))
+                    (setq err-sym nil)))
+              ;; (error
+              ;;  ;;(message "err=%S" err)
+              ;;  (setq err-sym (car err))
+              ;;  (setq err-val (cdr err))))
+                )
+        (popcmp-unmark-completing)
+        (when err-sym (signal err-sym err-val))))))
 
 (defvar popcmp-mark-completing-ovl nil)
 
diff --git a/elpa-to-submit/nxhtml/util/rnc-mode.el b/elpa-to-submit/nxhtml/util/rnc-mode.el
index 179d897cd9..5829a50d67 100644
--- a/elpa-to-submit/nxhtml/util/rnc-mode.el
+++ b/elpa-to-submit/nxhtml/util/rnc-mode.el
@@ -57,6 +57,8 @@
 ;;   Changes since 1.0b:
 ;;     Added a couple of defvars for faces to handle differences
 ;;     between GNU Emacs and XEmacs.
+;;
+;; 2008-12-28: Changed forward-char-command => forward-char
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'font-lock)
@@ -79,7 +81,7 @@
 (defun rnc-make-regexp-choice (operands)
   "(op1 op2 ...) -> \"\\(op1\\|op2\\|...\\)\""
   (let ((result "\\("))
-    (mapcar (lambda (op) (setq result (concat result op "\\|"))) operands)
+    (mapc (lambda (op) (setq result (concat result op "\\|"))) operands)
     (concat (substring result 0 -2) "\\)")))
 
 ;; Font lock treats face names differently in GNU Emacs and XEmacs
@@ -210,7 +212,7 @@
 	    (beginning-of-line)
 	    (let ((pos (re-search-forward "\\S " (point-max) t)))
 	      (and pos (= (- pos 1) p))))
-      (forward-char-command))))
+      (forward-char))))
 
 (defvar rnc-mode-map () "Keymap used in RNC mode.")
 (when (not rnc-mode-map)
diff --git a/elpa-to-submit/nxhtml/util/search-form.el b/elpa-to-submit/nxhtml/util/search-form.el
index 19edf5bdb4..e962757ec3 100644
--- a/elpa-to-submit/nxhtml/util/search-form.el
+++ b/elpa-to-submit/nxhtml/util/search-form.el
@@ -20,6 +20,8 @@
 ;;
 ;;  http://lists.gnu.org/archive/html/emacs-devel/2008-05/msg00152.html
 ;;
+;; NOT QUITE READY! Tagged files have not been tested.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Change log:
@@ -69,33 +71,50 @@
       (setq ido-ignore-item-temp-list bufs))
     (nreverse (mapcar #'get-buffer bufs))))
 
-(defun search-form-notify-1 (use-search-field use-replace-field w &rest ignore)
+(defun search-form-notify-1 (use-search-field
+                             use-replace-field
+                             w
+                             hide-form
+                             display-orig-buf)
   (let ((search-string  (when use-search-field  (widget-value search-form-sfield)))
         (replace-string (when use-replace-field (widget-value search-form-rfield)))
         (search-form-buffer (current-buffer))
         (this-search (widget-get w :do-search))
         (do-it t))
-    (when (and use-search-field
+    (if (and use-search-field
                (= 0 (length search-string)))
-      (setq do-it nil)
-      (message "Please specify a search string"))
-    (when (and use-replace-field
-               (= 0 (length replace-string)))
-      (setq do-it nil)
-      (message "Please specify a replace string"))
+        (progn
+          (setq do-it nil)
+          (message "Please specify a search string"))
+      (when (and use-replace-field
+                 (= 0 (length replace-string)))
+        (setq do-it nil)
+        (message "Please specify a replace string")))
     (when do-it
-      (set-window-configuration search-form-win-config)
-      (funcall this-search w)
-      (kill-buffer search-form-buffer))))
+      (if hide-form
+          (progn
+            (set-window-configuration search-form-win-config)
+            (funcall this-search search-string)
+            ;;(kill-buffer search-form-buffer)
+            )
+        (when display-orig-buf
+          (let ((win (display-buffer search-form-current-buffer t)))
+            (select-window win t)))
+        ;;(funcall this-search search-string))
+        (funcall this-search w)
+        ))))
 
 (defun search-form-notify-no-field (w &rest ignore)
-  (search-form-notify-1 nil nil w))
+  (search-form-notify-1 nil nil w nil t))
 
 (defun search-form-notify-sfield (w &rest ignore)
-  (search-form-notify-1 t nil w))
+  (search-form-notify-1 t nil w nil t))
+
+(defun search-form-notify-sfield-nobuf (w &rest ignore)
+  (search-form-notify-1 t nil w nil nil))
 
 (defun search-form-notify-both-fields (w &rest ignore)
-  (search-form-notify-1 t t w))
+  (search-form-notify-1 t t w nil t))
 
 (defvar search-form-current-buffer nil)
 
@@ -110,14 +129,21 @@
   (widget-insert " " descr)
   (widget-insert "\n"))
 
-(defun search-form-insert-search (title search-fun descr do-search-fun)
+(defun search-form-insert-search (title search-fun descr do-search-fun no-buf)
   (widget-insert "  ")
   (let ((button-title (format " %-15s " title)))
-    (widget-create 'push-button
-                   :do-search do-search-fun
-                   :notify 'search-form-notify-sfield
-                   :current-buffer search-form-current-buffer
-                   button-title))
+    (if no-buf
+        (widget-create 'push-button
+                       :do-search do-search-fun
+                       :notify 'search-form-notify-sfield-nobuf
+                       :current-buffer search-form-current-buffer
+                       button-title)
+      (widget-create 'push-button
+                     :do-search do-search-fun
+                     :notify 'search-form-notify-sfield
+                     :current-buffer search-form-current-buffer
+                     button-title)
+      ))
   (widget-insert " " descr " ")
   (search-form-insert-help search-fun)
   (widget-insert "\n"))
@@ -131,9 +157,11 @@
   (widget-insert (format "  %s: " descr))
   (widget-create 'push-button
                  :do-search do-forward-fun
-                 :notify (if use-sfield
-                             'search-form-notify-sfield
-                           'search-form-notify-no-field)
+                 :use-sfield use-sfield
+                 :notify '(lambda (widget &rest event)
+                            (if (widget-get widget :use-sfield)
+                                (search-form-notify-sfield widget)
+                              (search-form-notify-no-field widget)))
                  :current-buffer search-form-current-buffer
                  " Forward ")
   (widget-insert " ")
@@ -141,9 +169,11 @@
   (widget-insert "  ")
   (widget-create 'push-button
                  :do-search do-backward-fun
-                 :notify (if use-sfield
-                             'search-form-notify-sfield
-                           'search-form-notify-no-field)
+                 :use-sfield use-sfield
+                 :notify '(lambda (widget &rest event)
+                            (if (widget-get widget :use-sfield)
+                                (search-form-notify-sfield widget)
+                              (search-form-notify-no-field widget)))
                  :current-buffer search-form-current-buffer
                  " Backward ")
   (widget-insert " ")
@@ -174,7 +204,9 @@
 (make-variable-buffer-local 'search-form-win-config)
 (put 'search-form-win-config 'permanent-local t)
 
+;;;###autoload
 (defun search-form ()
+  "Display a form for search and replace."
   (interactive)
   (let* ((buf-name "*Search Form*")
          (cur-buf (current-buffer))
@@ -200,8 +232,12 @@
       (set (make-local-variable 'widget-link-prefix) "")
       (set (make-local-variable 'widget-link-suffix) ""))
 
-    (widget-insert (propertize "Emacs Search/Replace Form" 'face 'font-lock-comment-face)
-                   "\n\n")
+    (widget-insert (propertize "Search/Replace, buffer: " 'face 'font-lock-comment-face))
+    (widget-insert (format "%s" (buffer-name search-form-current-buffer)))
+    (let ((file (buffer-file-name search-form-current-buffer)))
+      (when file
+        (insert " (" file ")")))
+    (widget-insert "\n\n")
     (search-form-insert-fb
      "Incremental String Search" nil
      'isearch-forward
@@ -216,81 +252,73 @@
      'isearch-backward-regexp
      (lambda (w) (call-interactively 'isearch-backward-regexp)))
 
+    ;; Fix-me: in multiple buffers, from buffer-list
+
     (widget-insert (make-string (window-width) ?-) "\n")
 
-    (widget-insert "Search:")
+    (widget-insert "Search: ")
     (setq search-form-sfield
           (widget-create 'editable-field
-                         :size 60))
+                         :size 58))
     (widget-insert "\n\n")
     (widget-insert (propertize "* Buffers:" 'face 'font-lock-comment-face) "\n")
-    (search-form-insert-fb
-     "String Search" t
-     'nonincremental-search-forward
-     (lambda (w) (call-interactively 'nonincremental-search-forward search-string))
-     'nonincremental-search-backward
-     (lambda (w) (call-interactively 'nonincremental-search-backward search-string)))
-
-    (search-form-insert-fb
-     "Regexp Search" t
-     'nonincremental-re-search-forward
-     (lambda (w) (call-interactively 'nonincremental-re-search-forward search-string))
-     'nonincremental-re-search-backward
-     (lambda (w) (call-interactively 'nonincremental-re-search-backward search-string)))
+    (search-form-insert-fb "String Search" t
+                           'nonincremental-search-forward
+                           (lambda (w) (nonincremental-search-forward search-string))
+                           'nonincremental-search-backward
+                           (lambda (w) (nonincremental-search-backward search-string)))
+
+    (search-form-insert-fb "Regexp Search" t
+                           'nonincremental-re-search-forward
+                           (lambda (w) (nonincremental-re-search-forward search-string))
+                           'nonincremental-re-search-backward
+                           (lambda (w) (nonincremental-re-search-backward search-string)))
 
     ;; occur
-    (search-form-insert-search
-     "Occur"
-     'occur
-     "Lines in buffer"
-     (lambda (w)
-       (with-current-buffer (widget-get w :current-buffer)
-         (occur search-string))))
+    (search-form-insert-search "Occur" 'occur
+                               "Lines in buffer"
+                               (lambda (w)
+                                 (with-current-buffer (widget-get w :current-buffer)
+                                   (occur search-string)))
+                               t)
 
     ;; multi-occur
-    (search-form-insert-search
-     "Multi-Occur"
-     'multi-occur
-     "Lines in specified buffers"
-     (lambda (w)
-       (let ((bufs (search-form-multi-occur-get-buffers)))
-         (multi-occur bufs search-string))))
+    ;; Fix-me: This should be done from buffer-list. Have juri finished that?
+    (search-form-insert-search "Multi-Occur" 'multi-occur
+                               "Lines in specified buffers"
+                               (lambda (w)
+                                 (let ((bufs (search-form-multi-occur-get-buffers)))
+                                   (multi-occur bufs search-string)))
+                               t)
     ;;
     (widget-insert "\n")
     (widget-insert (propertize "* Files:" 'face 'font-lock-comment-face)
                    "\n")
 
-    (search-form-insert-search
-     "lgrep"
-     'lgrep
-     "Grep in directory"
-     (lambda (w)
-       (with-current-buffer (widget-get w :current-buffer)
-         (lgrep search-string))))
-    (search-form-insert-search
-     "rgrep"
-     'rgrep
-     "Grep in directory tree"
-     (lambda (w)
-       (with-current-buffer (widget-get w :current-buffer)
-         (rgrep search-string))))
+    (search-form-insert-search "Search in Dir" 'lgrep
+                               "Grep in directory"
+                               'search-form-lgrep
+                               t)
+    (search-form-insert-search "Search in Tree" 'rgrep
+                               "Grep in directory tree"
+                               'search-form-rgrep
+                               t)
 
     (widget-insert "\n")
 
-    (search-form-insert-search
-     "Tagged Files"
-     'tags-search
-     "Search files in tags table"
-     (lambda (w)
-       (with-current-buffer (widget-get w :current-buffer)
-         (tags-search search-string))))
+    (search-form-insert-search "Tagged Files" 'tags-search
+                               "Search files in tags table"
+                               (lambda (w)
+                                 (with-current-buffer (widget-get w :current-buffer)
+                                   (tags-search search-string)))
+                               t)
 
     (widget-insert (make-string (window-width) ?-) "\n")
 
-    (widget-insert "Replace:")
+    (widget-insert "Replace: ")
     (setq search-form-rfield
           (widget-create 'editable-field
-                         :size 60))
+                         :size 58))
     (widget-insert "\n\n")
 
     (widget-insert (propertize "* Buffers:" 'face 'font-lock-comment-face) "\n")
@@ -308,6 +336,18 @@
 
     (widget-insert "\n" (propertize "* Files:" 'face 'font-lock-comment-face) "\n")
 
+    ;; fix-me: rdir-query-replace (from to file-regexp root &optional delimited)
+    (search-form-insert-replace "Replace in Dir"
+                                'query-replace-regexp
+                                "Replace in files in directory"
+                                'search-form-ldir-replace)
+    (search-form-insert-replace "Replace in Tree"
+                                'query-replace-regexp
+                                "Replace in files in directory tree"
+                                'search-form-rdir-replace)
+
+    (widget-insert "\n")
+
     (search-form-insert-replace "Tagged Files"
                                 'query-replace-regexp
                                 "Replace in files in tags tables"
@@ -322,6 +362,42 @@
     (widget-forward 1)
     ))
 
+(defun search-form-lgrep (w)
+  (search-form-r-or-lgrep w t))
+
+(defun search-form-rgrep (w)
+  (search-form-r-or-lgrep w nil))
+
+(defun search-form-r-or-lgrep (w l)
+  (with-current-buffer (widget-get w :current-buffer)
+    (let* ((regexp search-string)
+           (files (grep-read-files regexp))
+           (dir (read-directory-name (if l "In directory: "
+                                       "Base directory: ")
+                                     nil default-directory t)))
+      (if l
+          (lgrep regexp files dir)
+        (rgrep regexp files dir)
+        ))))
+
+(defun search-form-ldir-replace (w)
+  (search-form-l-or-r-dir-replace w t))
+
+(defun search-form-rdir-replace (w)
+  (search-form-l-or-r-dir-replace w nil))
+
+(defun search-form-l-or-r-dir-replace (w l)
+  (let ((files (replace-read-files search-string replace-string))
+        (dir (read-directory-name (if l
+                                      "In directory: "
+                                    "In directory tree: ")
+                                  nil
+                                  (file-name-directory
+                                   (buffer-file-name search-form-current-buffer))
+                                  t)))
+    (if l
+        (ldir-query-replace search-string replace-string files dir)
+      (rdir-query-replace search-string replace-string files dir))))
 
 (provide 'search-form)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/util/sex-mode.el b/elpa-to-submit/nxhtml/util/sex-mode.el
index 88ed71b600..560278e28c 100644
--- a/elpa-to-submit/nxhtml/util/sex-mode.el
+++ b/elpa-to-submit/nxhtml/util/sex-mode.el
@@ -3,7 +3,7 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-06-01T18:41:50+0200 Sun
 (defconst sex-mode:version "0.71")
-;; Last-Updated: 2008-08-01T20:03:51+0200 Fri
+;; Last-Updated: 2009-01-06 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
@@ -73,6 +73,9 @@
 ;;; Code:
 
 ;;(org-open-file "c:/EmacsW32/nxhtml/nxhtml/doc/nxhtml-changes.html")
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'org))
+(eval-when-compile (require 'mailcap))
 
 (defcustom sex-file-apps
   '(
@@ -151,7 +154,7 @@ If no entry was found return `emacs' for opening inside Emacs."
     (when (eq cmd 'mailcap)
       (require 'mailcap)
       (mailcap-parse-mailcaps)
-      (let* ((mime-type (mailcap-extension-to-mime (or ext "")))
+      (let* ((mime-type (mailcap-extension-to-mime (or key "")))
 	     (command (mailcap-mime-info mime-type)))
 	(if (stringp command)
 	    (setq cmd command)
@@ -160,7 +163,8 @@ If no entry was found return `emacs' for opening inside Emacs."
     cmd))
 
 (defgroup sex nil
-  "Customization group for `sex-mode'.")
+  "Customization group for `sex-mode'."
+  :group 'external)
 
 ;;(setq sex-handle-urls t)
 (defcustom sex-handle-urls nil
@@ -248,7 +252,7 @@ file to system again."
       (if success
           (progn
             (insert success-header)
-            (sex-setup-restore-window-config)
+            (sex-setup-restore-window-config window-config)
             (message "%s" msg))
         (insert (propertize "Error: " 'face 'font-lock-warning-face)
                 fail-header msg
@@ -297,7 +301,7 @@ file to system again."
 ;; anyway do that.)
 (put 'sex-file-handler 'operations '(insert-file-contents))
 
-(defun sex-setup-restore-window-config ()
+(defun sex-setup-restore-window-config (window-config)
   (when (not (eq sex-keep-dummy-buffer 'visible))
     (run-with-idle-timer 0 nil
                          'sex-restore-window-config
@@ -307,9 +311,10 @@ file to system again."
                            (current-buffer)))))
 
 (defun sex-restore-window-config (frame win-config buffer)
-  (with-selected-frame frame
-    (set-window-configuration win-config))
-  (when buffer (kill-buffer buffer)))
+  (save-match-data ;; runs in timer
+    (with-selected-frame frame
+      (set-window-configuration win-config))
+    (when buffer (kill-buffer buffer))))
 
 (defun sex-handle-by-external (&optional file)
   "Give file FILE to external program.
@@ -358,6 +363,7 @@ informational message."
 (defvar sex-old-url-insert-file-contents nil)
 (defvar sex-old-url-handler-mode nil)
 
+;;;###autoload
 (define-minor-mode sex-mode
   "Open certain files in external programs.
 See `sex-get-file-open-cmd' for how to determine which files to
@@ -416,12 +422,14 @@ handled is governed by `sex-keep-dummy-buffer'."
             ;;(message "after url-handler-mode 1")
             )))
     ;; Remove from the lists:
-    (let ((handler-list (copy-list file-name-handler-alist)))
+    ;;(let ((handler-list (copy-list file-name-handler-alist)))
+    (let ((handler-list (copy-sequence file-name-handler-alist)))
       (dolist (handler handler-list)
         (when (eq 'sex-file-handler (cdr handler))
           (setq file-name-handler-alist
                 (delete handler file-name-handler-alist)))))
-    (let ((mode-alist (copy-list auto-mode-alist)))
+    ;;(let ((mode-alist (copy-list auto-mode-alist)))
+    (let ((mode-alist (copy-sequence auto-mode-alist)))
       (dolist (auto-mode mode-alist)
         (when (eq 'sex-file-mode (cdr auto-mode))
           (setq auto-mode-alist
diff --git a/elpa-to-submit/nxhtml/util/tabkey2.el b/elpa-to-submit/nxhtml/util/tabkey2.el
index f16b40f9ff..98fc04fc14 100644
--- a/elpa-to-submit/nxhtml/util/tabkey2.el
+++ b/elpa-to-submit/nxhtml/util/tabkey2.el
@@ -1,16 +1,16 @@
 ;;; tabkey2.el --- Use second tab key pressed for what you want
 ;;
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Created: 2008-03-15T14:40:28+0100 Sat
-(defconst tabkey2:version "1.39")
-;; Last-Updated: 2008-07-21T22:24:55+0200 Mon
+;; Created: 2008-03-15
+(defconst tabkey2:version "1.40")
+;; Last-Updated: 2009-07-15 Wed
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/tabkey2.el
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `appmenu', `cl'.
+  ;; `appmenu', `cl'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -226,6 +226,9 @@
 ;; Version 1.39:
 ;; - Try first [tab] and then [?\t] when looking for command.
 ;;
+;; Version 1.40:
+;; - Added Company Mode completion.
+;;
 ;; Fix-me: maybe add \\_>> option to behave like smart-tab. But this
 ;; will only works for modes that does not do completion of empty
 ;; words (like in smart-tab).
@@ -259,8 +262,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-;;(require 'popcmp nil t)
-(require 'appmenu nil t)
+(eval-when-compile (require 'appmenu nil t))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Custom
@@ -349,8 +351,37 @@ If value is a number then delay message that number of seconds."
     (yas/template-condition-predicate
      yas/buffer-local-condition)))
 
+(defvar tabkey2-company-backends
+  "List of frontends and their backends."
+  '((company-mode (NONE                   company-abbrev . "Abbrev")
+                  (NONE                   company-css . "CSS")
+                  (dabbrev-expan          company-dabbrev . "dabbrev for plain text")
+                  (NONE                   company-dabbrev-code . "dabbrev for code")
+                  (NONE                   company-eclim . "eclim (an Eclipse interace)")
+                  (lisp-symbol-complete   company-elisp . "Emacs Lisp")
+                  (complete-tag           company-etags . "etags")
+                  (NONE                   company-files . "Files")
+                  (NONE                   company-gtags . "GNU Global")
+                  (ispell-complete-word   company-ispell . "ispell")
+                  (flyspell-correct-word-before-point company-ispell . "ispell")
+                  (NONE                   company-keywords . "Programming language keywords")
+                  (nxml-complete          company-nxml . "nxml")
+                  (NONE                   company-oddmuse . "Oddmuse")
+                  (NONE                   company-pysmell . "PySmell")
+                  (NONE                   company-ropemacs . "ropemacs")
+                  (senator-complete-symbol company-semantic . "CEDET Semantic")
+                  (NONE                   company-tempo . "Tempo templates")
+                  (NONE                   company-xcode . "Xcode"))))
+
+(defun tabkey2-find-front-end (fun)
+  (let ((
+         ))))
+
 (defcustom tabkey2-completion-functions
   '(
+    ;; Front ends (should take care of the rest, ie temporary things,
+    ;; snippets etc...)
+    ("Company Mode completion" company-complete company-mode)
     ;; Temporary things
     ("Spell check word" flyspell-correct-word-before-point)
     ;; Snippets
@@ -363,7 +394,7 @@ If value is a number then delay message that number of seconds."
     ("Widget complete" widget-complete)
     ("Comint Dynamic Complete" comint-dynamic-complete)
     ("PHP completion" php-complete-function)
-    ("Tags completion" complete-symbol)
+    ("Tags completion" complete-tag)
     ;; General word completion
     ("Predictive word" complete-word-at-point predictive-mode)
     ("Predictive abbreviations" pabbrev-expand-maybe)
@@ -482,6 +513,7 @@ This key is always bound to `tabkey2-cycle-completion-functions'."
     makefile-mode
     org-mode
     Custom-mode
+    custom-mode ;; For Emacs 22
     ;; other
     cmd-mode
     )
@@ -497,7 +529,9 @@ You can do use S-Tab in other modes too if you want too."
   :group 'tabkey2)
 
 (defcustom tabkey2-modes-that-just-complete
-  '(shell-mode)
+  '(shell-mode
+    fundamental-mode
+    text-mode)
   "Tab is only used for completion in these modes.
 Therefore `tabkey2-first' just calls the function on Tab."
   :type '(repeat (choice (command :tag "Currently known command")
@@ -529,6 +563,12 @@ Therefore `tabkey2-first' just calls the function on Tab."
 (defvar tabkey2-keymap-overlay nil
   "Hold the keymap for tab key 2.")
 
+(defvar tabkey2-current-tab-info nil
+  "Saved information message for Tab completion state.")
+(defvar tabkey2-current-tab-function nil
+  "Tab completion state current completion function.")
+(make-variable-buffer-local 'tabkey2-current-tab-function)
+
 (defun tabkey2-completion-state-p ()
   "Return t if Tab completion state should continue.
 Otherwise return nil."
@@ -551,12 +591,6 @@ Otherwise return nil."
                       (string= name-prefix (substring last-name 0 prefix-len)))))
            ))))
 
-(defvar tabkey2-current-tab-info nil
-  "Saved information message for Tab completion state.")
-(defvar tabkey2-current-tab-function nil
-  "Tab completion state current completion function.")
-(make-variable-buffer-local 'tabkey2-current-tab-function)
-
 (defun tabkey2-read-only-p ()
   "Return non-nil if buffer seems to be read-only at point."
   (or buffer-read-only
@@ -649,6 +683,10 @@ check and return the value from `tabkey2-is-active'."
                    (throw 'chk (nth 2 rec)))))))
     (tabkey2-is-active fun chk)))
 
+(defvar tabkey2-chosen-completion-function nil)
+(make-variable-buffer-local 'tabkey2-chosen-completion-function)
+(put 'tabkey2-chosen-completion-function 'permanent-local t)
+
 (defun tabkey2-first-active-from-completion-functions ()
   "Return first active completion function.
 Look in `tabkey2-completion-functions' for the first function
@@ -671,6 +709,8 @@ See `tabkey2-first' for the list considered."
       (tabkey2-first-active-from-completion-functions)
       tabkey2-fallback))
 
+(defvar tabkey2-overlay-message nil)
+
 (defvar tabkey2-completion-state-mode nil)
 ;;(make-variable-buffer-local 'tabkey2-completion-state-mode)
 (defun tabkey2-completion-state-mode (arg)
@@ -712,8 +752,8 @@ See `tabkey2-first' for more information."
           ;;(set-keymap-parent emul-map (overlay-get tabkey2-keymap-overlay
           ;;                                         'keymap))
           ;; Set up for pre/post-command-hook
-          (add-hook 'pre-command-hook 'tabkey2-pre-command)
-          (add-hook 'post-command-hook 'tabkey2-post-command))
+          (add-hook 'pre-command-hook 'tabkey2-completion-state-pre-command)
+          (add-hook 'post-command-hook 'tabkey2-completion-state-post-command))
       ;;(set-keymap-parent emul-map nil)
       (setq tabkey2-current-tab-function nil)
       (when (and old-wincfg
@@ -726,8 +766,8 @@ See `tabkey2-first' for more information."
           (delete-overlay tabkey2-keymap-overlay))
         (when tabkey2-overlay
           (delete-overlay tabkey2-overlay)))
-      (remove-hook 'pre-command-hook 'tabkey2-pre-command)
-      (remove-hook 'post-command-hook 'tabkey2-post-command)
+      (remove-hook 'pre-command-hook 'tabkey2-completion-state-pre-command)
+      (remove-hook 'post-command-hook 'tabkey2-completion-state-post-command)
       (tabkey2-overlay-message nil)
       ;;(message "")
       )))
@@ -736,7 +776,19 @@ See `tabkey2-first' for more information."
   "Quit Tab completion state."
   (interactive)
   (tabkey2-completion-state-mode -1)
-  (message "Quit"))
+  (let ((C-g-binding (or (key-binding [(control ?g)])
+                         (key-binding "\C-g")))
+        did-more)
+    (when company-mode
+      ;;(message "tabkey2:company-abort")
+      (company-abort)
+      (setq did-more t))
+    (when (and C-g-binding
+             (not (eq C-g-binding this-command)))
+        ;;(message "tabkey2:c-g=%s" C-g-binding)
+        (call-interactively C-g-binding)
+        (setq did-more t))
+    (message "Quit")))
 
 (defvar tabkey2-message-is-shown nil)
 (defun tabkey2-message-is-shown ()
@@ -747,12 +799,12 @@ See `tabkey2-first' for more information."
     ('echo-area
      (get (current-message) 'tabkey2))))
 
-(defun tabkey2-pre-command ()
+(defun tabkey2-completion-state-pre-command ()
   "Run this in `pre-command-hook'.
 Check if message is shown.
 Remove overlay message.
 Cancel delayed message."
-  ;;(message "=====> tabkey2-pre-command")
+  ;;(message "=====> tabkey2-completion-state-pre-command")
   (condition-case err
       (progn
         (setq tabkey2-message-is-shown (tabkey2-message-is-shown))
@@ -763,12 +815,12 @@ Cancel delayed message."
         )
     (error (message "tabkey2 pre: %s" (error-message-string err)))))
 
-(defun tabkey2-post-command ()
+(defun tabkey2-completion-state-post-command ()
   "Turn off Tab completion state if not feasable any more.
 This is run in `post-command-hook' after each command."
   (condition-case err
       (save-match-data
-        ;; Delayd messages
+        ;; Delayed messages
         (if (not (tabkey2-completion-state-p))
             (tabkey2-completion-state-mode -1)
           ;;(message "tabkey2-current-tab-function=%s" tabkey2-current-tab-function)
@@ -806,8 +858,6 @@ This is run in `post-command-hook' after each command."
           (or (memq prop buffer-invisibility-spec)
               (assq prop buffer-invisibility-spec)))))))
 
-(defvar tabkey2-overlay-message nil)
-
 ;; (defun test-scroll ()
 ;;   (interactive)
 ;;   (setq debug-on-error t)
@@ -938,12 +988,13 @@ Shown with the face `tabkey2-highlight-message'."
 (defun tabkey2-timer-deliver-message (txt where)
   "Show message TXT to user.
 Protect from errors cause this is run during a timer."
-  (when (and tabkey2-completion-state-mode
-             (equal (point-marker) where))
-    (condition-case err
-        (tabkey2-deliver-message txt)
-      (error (message "tabkey2-timer-deliver-message: %s"
-                      (error-message-string err))))))
+  (save-match-data ;; runs in timer
+    (when (and tabkey2-completion-state-mode
+               (equal (point-marker) where))
+      (condition-case err
+          (tabkey2-deliver-message txt)
+        (error (message "tabkey2-timer-deliver-message: %s"
+                        (error-message-string err)))))))
 
 (defvar tabkey2-delayed-timer nil)
 
@@ -994,10 +1045,6 @@ Consider only those in `tabkey2-completion-functions'."
                     (when (tabkey2-is-active fun chk) rec)))
                 tabkey2-completion-functions)))
 
-(defvar tabkey2-chosen-completion-function nil)
-(make-variable-buffer-local 'tabkey2-chosen-completion-function)
-(put 'tabkey2-chosen-completion-function 'permanent-local t)
-
 (defun tabkey2-make-current-default ()
   "Make current Tab completion function default.
 Set the current Tab completion function at point as default for
@@ -1060,6 +1107,30 @@ If PREFIX is given just show what this command will do."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; Handling of Tab and alternate key
 
+;;;###autoload
+(defun tabkey2-emma-without-tabkey2 ()
+  ;; Remove keymaps from tabkey2 in this copy:
+  (delq 'tabkey2--emul-keymap-alist
+        (copy-sequence emulation-mode-map-alists)))
+
+(defvar tabkey2-step-out-of-the-way nil)
+;;(remove-hook 'pre-command-hook 'tabkey2-pre-command)
+;;(remove-hook 'post-command-hook 'tabkey2-pre-command)
+;;(remove-hook 'post-command-hook 'tabkey2-post-command-2)
+(defun tabkey2-post-command ()
+  (setq tabkey2-step-out-of-the-way nil)
+  (condition-case err
+      (when tabkey2-mode
+        (when (and (boundp 'company-overriding-keymap-bound) company-overriding-keymap-bound)
+          (setq tabkey2-step-out-of-the-way
+                (let ((emulation-mode-map-alists (tabkey2-emma-without-tabkey2)))
+                  (key-binding (this-command-keys))))
+          ;;(message "tabkey2-step-out=%s, %s" (this-command-keys) tabkey2-step-out-of-the-way)
+          ))
+    (error "tabkey2-pre-command: %s" err)))
+  ;; (and (boundp 'company-preview-overlay)
+  ;;                                    (or company-preview-overlay
+  ;;                                        company-pseudo-tooltip-overlay)))
 (defun tabkey2-first (prefix)
   "Do something else after first Tab.
 This function is bound to the Tab key \(or whatever key
@@ -1128,6 +1199,11 @@ through the completion functions too choose which one to use.)
 NOTE: This uses `emulation-mode-map-alists' and it supposes that
 nothing else is bound to Tab there."
   (interactive "P")
+          (message "first:tabkey2-step-out=%s, %s" (this-command-keys) tabkey2-step-out-of-the-way)
+  (if tabkey2-step-out-of-the-way
+      (progn
+        (message "step-out=%s" tabkey2-step-out-of-the-way)
+        (call-interactively tabkey2-step-out-of-the-way))
   (if (and tabkey2-keymap-overlay
            (eq (overlay-buffer tabkey2-keymap-overlay) (current-buffer))
            (eq (overlay-get tabkey2-keymap-overlay 'window) (selected-window))
@@ -1139,16 +1215,16 @@ nothing else is bound to Tab there."
       (if (memq 'shift (event-modifiers last-input-event))
           (call-interactively 'tabkey2-cycle-completion-functions)
         (call-interactively 'tabkey2-complete prefix))
-    (let* ((emma-without-tabkey2
-            ;; Remove keymaps from tabkey2 in this copy:
-            (delq 'tabkey2--emul-keymap-alist
-                  (copy-sequence emulation-mode-map-alists)))
-           (just-complete (memq major-mode tabkey2-modes-that-just-complete))
+    (let* ((emma-without-tabkey2 (tabkey2-emma-without-tabkey2))
+           (at-word-end (looking-at "\\_>"))
+           (just-complete (or (memq major-mode tabkey2-modes-that-just-complete)
+                              at-word-end))
            (what (if just-complete
                      'complete
                    (if (or (unless tabkey2-in-minibuffer
                              (active-minibuffer-window))
                            (when (fboundp 'use-region-p) (use-region-p))
+                           (not at-word-end)
                            (memq major-mode tabkey2-modes-that-use-more-tabs))
                        'indent
                      'indent-complete
@@ -1165,11 +1241,11 @@ nothing else is bound to Tab there."
                         (or (key-binding [tab] t)
                             (key-binding [?\t] t))
                         )))
-           (to-do-2 (unless (or
-                             ;;(memq what '(complete))
-                             (memq what '(indent))
-                             (memq to-do-1 '(widget-forward button-forward)))
+           (to-do-2 (unless (or ;;(memq what '(complete))
+                                (memq what '(indent))
+                                (memq to-do-1 '(widget-forward button-forward)))
                       (tabkey2-get-default-completion-fun))))
+      ;;(message "step-out-of-the-way=%s to-do=%s/%s, emmaa-without-tabkey2=%s" step-out-of-the-way to-do-1 to-do-2 emma-without-tabkey2)
       (if prefix
           (if (memq 'shift (event-modifiers last-input-event))
               (message
@@ -1183,7 +1259,7 @@ nothing else is bound to Tab there."
               (tabkey2-call-interactively to-do-1)))
         (unless (tabkey2-read-only-p)
           (when to-do-2
-            (tabkey2-completion-state-mode 1)))))))
+            (tabkey2-completion-state-mode 1))))))))
 
 (defun tabkey2-call-interactively (function)
   "Like `call-interactively, but handle `this-command'."
@@ -1260,12 +1336,14 @@ first in tabkey2-mode."
   (if tabkey2-mode
       (progn
         (add-hook 'minibuffer-setup-hook 'tabkey2-minibuffer-setup)
+        (add-hook 'post-command-hook 'tabkey2-post-command)
         ;; Update emul here if keymap have changed
         (setq tabkey2--emul-keymap-alist
               (list (cons 'tabkey2-mode
                           tabkey2-mode-emul-map)))
         (add-to-list 'emulation-mode-map-alists 'tabkey2--emul-keymap-alist))
     (tabkey2-completion-state-mode -1)
+    (remove-hook 'post-command-hook 'tabkey2-post-command)
     (remove-hook 'minibuffer-setup-hook 'tabkey2-minibuffer-setup)
     (setq emulation-mode-map-alists (delq 'tabkey2--emul-keymap-alist
                                           emulation-mode-map-alists))))
@@ -1352,11 +1430,11 @@ again.")
 
 
 
-(defun tabkey2-get-key-binding (fun)
+(defun tabkey2-get-key-binding (fun t2)
   "Get key binding for FUN during 'Tab completion state'."
   (let* ((remapped (command-remapping fun))
          (key (where-is-internal fun
-                                 tabkey2-completion-state-emul-map
+                                 (when t2 tabkey2-completion-state-emul-map)
                                  t
                                  nil
                                  remapped)))
@@ -1372,9 +1450,10 @@ again.")
 Build message but don't show it."
   ;;(tabkey2-reset-completion-functions)
   (let* ((chs-fun 'tabkey2-cycle-completion-functions)
-         (key (tabkey2-get-key-binding chs-fun))
-         (def-fun (tabkey2-get-default-completion-fun))
+         (key (tabkey2-get-key-binding chs-fun t))
+         ;;(def-fun (tabkey2-get-default-completion-fun))
          what
+         (comp-fun-key (tabkey2-get-key-binding comp-fun nil))
          reset)
     (setq tabkey2-current-tab-function comp-fun)
     (dolist (rec tabkey2-completion-functions)
@@ -1385,6 +1464,9 @@ Build message but don't show it."
           (eval res)
           (setq what txt))))
     (let ((info (concat (format "Tab: %s" what)
+                        (if comp-fun-key
+                            (format " (%s)" (key-description comp-fun-key))
+                          "")
                         (if (cdr (tabkey2-get-active-completion-functions))
                             (format ", other %s, help F1"
                                     (key-description key))
diff --git a/elpa-to-submit/nxhtml/util/udev-cedet.el b/elpa-to-submit/nxhtml/util/udev-cedet.el
index a2ad581850..2114dbf69e 100644
--- a/elpa-to-submit/nxhtml/util/udev-cedet.el
+++ b/elpa-to-submit/nxhtml/util/udev-cedet.el
@@ -20,10 +20,13 @@
 ;;
 ;; See `udev-cedet-update' for more information.
 ;;
+;; TODO: http://cedet.sourceforge.net/setup.shtml
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Change log:
 ;;
+;; Fix-me: http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -46,71 +49,102 @@
 ;;
 ;;; Code:
 
-(require 'udev)
+(eval-when-compile (require 'udev))
 
 (defgroup udev-cedet nil
   "Customization group for udev-cedet."
   :group 'nxhtml)
 
-(defcustom udev-cedet-dir "~/cedet-cvs/"
+(defcustom udev-cedet-dir "~/.emacs.d/udev/cedet-cvs/"
   "Directory where to put CVS CEDET sources."
   :type 'directory
   :group 'udev-cedet)
 
+(defun udev-cedet-el-file ()
+  (expand-file-name "cedet/common/cedet.el" udev-cedet-dir))
+
 (defun udev-cedet-load-cedet (must-be-fetched)
-  (let ((cedet-el (expand-file-name "cedet/common/cedet.el"
-                                    udev-cedet-dir)))
+  ;;(message "udev-cedet-load-cedet called, backtrace\n%s" (with-output-to-string (backtrace)))
+  (let ((cedet-el (udev-cedet-el-file)))
     ;;(message "cedet-el=%s, exists=%s, mbf=%s" cedet-el (file-exists-p cedet-el) must-be-fetched)
     (unless (featurep 'cedet)
-      (when (file-exists-p cedet-el)
-        (condition-case-no-debug err
-            (load-file cedet-el)
-          (error (message "%s" err))))
+      (if (file-exists-p cedet-el)
+          (let ((missing-path (file-name-as-directory (expand-file-name "cedet/semantic/bovine/" udev-cedet-dir))))
+            ;; Fix-me: reported as bug on cedet-devel 2009-08-31:
+            (add-to-list 'load-path missing-path)
+            (load-file cedet-el))
+        (when must-be-fetched
+          (error "Can't find %s" cedet-el)))
       (unless (featurep 'cedet)
-        (when must-be-fetche
-          (error "Could not load ecb???"))
-        (when (y-or-n-p "Could not load CEDET, update from dev sources? ")
+        (when (y-or-n-p "Could not find CEDET, fetch it from dev sources? ")
           (udev-cedet-update)
-          (load-file cedet-el))))))
+          (load-file cedet-el))))
+    ;; From Joakim Verona, http://article.gmane.org/gmane.emacs.cedet/2599
+    (when (featurep 'semantic)
+      (when (string= semanticdb-default-save-directory (expand-file-name "~/.semanticdb"))
+        (message "Semantic found, using Joakims easier defaults for semanticdb dirs ...,\n\told default=%s"
+                 semanticdb-default-save-directory)
+        (unless (file-exists-p "~/.semanticdb") (make-directory "~/.semanticdb"))
+        (setq semanticdb-default-save-directory (expand-file-name "~/.semanticdb/project"))
+        (unless (file-exists-p semanticdb-default-save-directory) (make-directory semanticdb-default-save-directory))
+        (setq semanticdb-default-system-save-directory (expand-file-name "~/.semanticdb/system"))
+        (unless (file-exists-p semanticdb-default-system-save-directory) (make-directory semanticdb-default-system-save-directory))
+        ))
+    ;; Fix-me: workaround, can't get :set-after to work
+    (when (featurep 'cedet)
+      (require 'udev-ecb)
+      (when udev-ecb-load-ecb (udev-ecb-load-ecb)))))
+
+(defun udev-cedet-load-cedet-set (sym val)
+  (set-default sym val)
+  (when val
+    (udev-cedet-load-cedet nil)
+    (when (featurep 'cedet)
+      (let* ((val-list (if (listp val) val nil))
+             (use-ede (or (eq val t) (memq 'ede val-list)))
+             (use-min-features (memq 'min-features val-list))
+             (use-code-helpers (memq 'code-helpers val-list))
+             (use-gaudy-code-helpers (memq 'gaudy-code-helpers val-list))
+             (use-excessive-code-helpers (memq 'excessive-code-helpers val-list))
+             (use-debugging-helpers (memq 'debugging-helpers val-list))
+             (use-ia (memq 'sem-ia val-list))
+             (use-gcc (memq 'sem-gcc val-list))
+             )
+        (global-ede-mode (if use-ede 1 -1))
+        (when use-min-features
+          (semantic-load-enable-minimum-features))
+        (when use-code-helpers
+          (semantic-load-enable-code-helpers))
+        (when use-gaudy-code-helpers
+                   (semantic-load-enable-gaudy-code-helpers))
+        (when (or (eq val t) use-excessive-code-helpers)
+          (semantic-load-enable-excessive-code-helpers))
+        (when use-debugging-helpers
+          (semantic-load-enable-semantic-debugging-helpers))
+        (when (or (eq val t) use-ia)
+          (require 'semantic-ia))
+        (when (or (eq val t) use-gcc)
+          (require 'semantic-gcc))
+        ))))
 
 (defcustom udev-cedet-load-cedet nil
-  "To load or not to load CEDET..."
+  "To load or not to load CEDET...
+Note: This applies only to the CEDET sources fetched by nXhtml."
   :type '(choice (const :tag "Don't load CEDET" nil)
                  (set :tag "Choose what to load"
                       (const :tag "EDE Project Management" ede)
                       (radio :tag "Choose parsing and completion features"
-                             (const :tag "Minimum features (database+idle reparse)" min-parse)
-                             (const :tag "Semantic navigator etc" code-helpers)
-                             (const :tag "Intellisense etc" gaudy-code-helpers))
+                             (const :tag "Minimum features (database+idle reparse)" min-features)
+                             (const :tag "Above + Semantic navigator etc" code-helpers)
+                             (const :tag "Above + Intellisense etc" gaudy-code-helpers)
+                             (const :tag "Above + which-func-mode" excessive-code-helpers)
+                             (const :tag "Above + Semantic debugging helpers" debugging-helpers))
+                      (const :tag "Semantic IA - names completion, info for tags & classes" sem-ia)
+                      (const :tag "Semantic special GCC support" sem-gcc)
                       (const srecode))
-                 (const :tag "Load whole CEDET" t))
+                 (const :tag "Load whole CEDET (except debugging)" t))
   :require 'udev-cedet
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when val
-           (udev-cedet-load-cedet nil)
-           (when (featurep 'cedet)
-             (let ((use-ede
-                    (or (eq val t)
-                        (memq 'ede val)))
-                   (use-min-parse
-                    (or (eq val t)
-                        (memq 'min-parse val)))
-                   (use-code-helpers
-                    (or (eq val t)
-                        (memq 'code-helpers val)))
-                   (use-gaudy-code-helpers
-                    (or (eq val t)
-                        (memq 'gaudy-code-helpers val)))
-                   )
-                 (global-ede-mode (if use-ede 1 -1))
-                 (when use-min-parse
-                   (semantic-load-enable-minimum-features))
-                 (when use-code-helpers
-                   (semantic-load-enable-code-helpers))
-                 (when use-gaudy-code-helpers
-                   (semantic-load-enable-gaudy-code-helpers))
-                 ))))
+  :set 'udev-cedet-load-cedet-set
   :group 'udev-cedet)
 
 ;; (defun udev-cedet-fontify-marker (limit)
@@ -137,7 +171,7 @@
 
 (defun udev-cedet-buffer-name (mode)
   "Return a name for current compilation buffer ignoring MODE."
-  (udev-buffer-name " *Updating CEDET %s*" udev-cedet-update-buffer mode))
+  (udev-buffer-name "*Updating CEDET %s*" udev-cedet-update-buffer mode))
 
 (defvar udev-cedet-update-buffer nil)
 
@@ -164,28 +198,46 @@
 
 ;;;###autoload
 (defun udev-cedet-update ()
-  "Fetch and install CEDET from the devel sources.
+  "Fetch and install CEDET from the development sources.
 To determine where to store the sources see `udev-cedet-dir'.
-For how to start CEDET see `udev-cedet-load-cedet'."
+For how to start CEDET see `udev-cedet-load-cedet'.
+
+Note that if you install CEDET yourself you should not use this function."
   (interactive)
-  (setq udev-cedet-update-buffer
-        (udev-call-first-step "*Update CEDET*"
-                              ;;udev-cedet-update-buffer
-                              udev-cedet-steps
-                              "Starting updating CEDET from development sources"
-                              'udev-cedet-setup-when-finished)))
+  (let* ((has-it (file-exists-p (udev-cedet-el-file)))
+         (prompt (if has-it
+                     "Do you want to update CEDET from devel sources? "
+                   "Do you want to install CEDET from devel sources? ")))
+    (when (y-or-n-p prompt)
+      (setq udev-cedet-update-buffer
+            (udev-call-first-step "*Update CEDET*"
+                                  ;;udev-cedet-update-buffer
+                                  udev-cedet-steps
+                                  "Starting updating CEDET from development sources"
+                                  'udev-cedet-setup-when-finished)))))
+
+;;;###autoload
+(defun udev-cedet-customize-startup ()
+  "Customize CEDET dev nXhtml startup group."
+  (interactive)
+  (if (file-exists-p (udev-cedet-el-file))
+      (customize-group-other-window 'udev-cedet)
+    (message (propertize "You must fetch CEDET from nXhtml first"
+                         'face 'secondary-selection))))
 
 (defun udev-cedet-fetch (log-buffer)
   "Fetch CEDET sources (asynchronously)."
   (let ((default-directory (file-name-as-directory udev-cedet-dir)))
     (unless (file-directory-p default-directory)
-      (make-directory default-directory))
-    (with-current-buffer
-        (compilation-start
-         "cvs -z3 -d:pserver:anonymous@cedet.cvs.sourceforge.net:/cvsroot/cedet co -P cedet"
-         'compilation-mode
-         'udev-cedet-buffer-name)
-      (current-buffer))))
+      (when (yes-or-no-p (concat "Directory " default-directory " does not exist. Create it? "))
+        (make-directory default-directory t)))
+    (when (file-directory-p default-directory)
+      (with-current-buffer
+          (compilation-start
+           "cvs -z3 -d:pserver:anonymous@cedet.cvs.sourceforge.net:/cvsroot/cedet co -P cedet"
+           'compilation-mode
+           'udev-cedet-buffer-name)
+        (current-buffer)))))
 
 (defun udev-cedet-cvs-dir ()
   "Return cvs root directory."
@@ -201,12 +253,37 @@ For how to start CEDET see `udev-cedet-load-cedet'."
                                           (udev-cedet-cvs-dir))
                         udev-cedet-update-buffer))
 
+(defun udev-cedet-install-add-debug ()
+  (with-current-buffer (find-file-noselect "cedet-build.el")
+    (widen)
+    (goto-char (point-min))
+    (insert "(setq debug-on-error t)\n")
+    (basic-save-buffer)))
+
 (defun udev-cedet-install (log-buffer)
   "Install the CEDET sources just fetched.
 Note that they will not be installed in current Emacs session."
-  (udev-batch-compile "-l cedet-build.el -f cedet-build"
-                      (udev-cedet-cvs-dir)
-                      'udev-cedet-buffer-name))
+  (let ((default-directory (file-name-as-directory (expand-file-name "cedet" udev-cedet-dir))))
+    (udev-cedet-install-add-debug)
+    (udev-batch-compile "-l cedet-build.el -f cedet-build"
+                        (udev-cedet-cvs-dir)
+                        'udev-cedet-buffer-name)))
+
+;;;###autoload
+(defun udev-cedet-utest ()
+  "Start CEDET unit tests.
+These runs in a fresh Emacs."
+  (interactive)
+  (let ((cedet-el (locate-library "cedet"))
+        (default-directory (udev-cedet-cvs-dir)))
+    (if (not cedet-el)
+        (message (propertize "Can't find CEDET, have you installed and loaded it?" 'face 'secondary-selection))
+      (call-process (ourcomments-find-emacs) nil 0 nil "-Q"
+                    "-l" "common/cedet.el"
+                    "-f" "semantic-load-enable-minimum-features"
+                    "-f" "cedet-utest"
+                    )
+      (message "Started CEDET unit tests in a fresh Emacs - it will show up soon ..."))))
 
 (provide 'udev-cedet)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/util/udev-ecb.el b/elpa-to-submit/nxhtml/util/udev-ecb.el
index 9fe6e8f425..9316394862 100644
--- a/elpa-to-submit/nxhtml/util/udev-ecb.el
+++ b/elpa-to-submit/nxhtml/util/udev-ecb.el
@@ -45,29 +45,36 @@
 ;;; Code:
 
 
-(require 'udev)
+(eval-when-compile (require 'udev))
 
 (defgroup udev-ecb nil
   "Customization group for udev-ecb."
   :group 'nxhtml)
 
-(defcustom udev-ecb-dir "~/ecb-cvs/"
+(defcustom udev-ecb-dir "~/.emacs.d/udev/ecb-cvs/"
   "Directory where to put CVS ECB sources."
   :type 'directory
   :group 'udev-ecb)
 
+(defun udev-ecb-cvs-dir ()
+  "Return cvs root directory."
+  (file-name-as-directory (expand-file-name "ecb" udev-ecb-dir)))
+
+(defvar udev-ecb-miss-cedet nil)
+
 (defun udev-ecb-load-ecb ()
-  (let ((semantic-found (locate-library "semantic"))
-        (eieio-found (locate-library "eieio")))
-    ;; Speedbar is included in Emacs now
-    (unless semantic-found (message "Can't find semantic"))
-    (unless eieio-found (message "Can't find eieio"))
-    (if (not (and semantic-found eieio-found))
-        (progn
-          (message "Can't load ECB")
-          (message "Try M-x udev-cedet-update first"))
-      (let ((ecb-path (expand-file-name "ecb/" udev-ecb-dir)))
-        (add-to-list 'load-path ecb-path)
+  "Load fetched ECB."
+  (setq udev-ecb-miss-cedet nil)
+  (unless (featurep 'ecb)
+    (add-to-list 'load-path (udev-ecb-cvs-dir))
+    (let ((msg nil))
+      (unless (or msg (featurep 'cedet)) (setq msg "CEDET is not loaded"))
+      (unless (or msg (locate-library "semantic")) (setq msg "can't find CEDET Semantic"))
+      (unless (or msg (locate-library "eieio")) (setq msg "can't find CEDET eieio"))
+      (if msg
+          (progn
+            (setq udev-ecb-miss-cedet (format "Can't load ECB because %s." msg))
+            (ourcomments-warning udev-ecb-miss-cedet))
         (require 'ecb nil t)))))
 
 (defcustom udev-ecb-load-ecb nil
@@ -79,10 +86,12 @@
          (when val
            (udev-ecb-load-ecb)))
   ;; ecb-activate, ecb-customize-most-important to menu
+  :set-after '(udev-cedet-load-cedet)
   :group 'udev-ecb)
 
 (defvar udev-ecb-steps
   '(udev-ecb-fetch
+    udev-ecb-fix-bad-files
     udev-ecb-fetch-diff
     udev-ecb-check-diff
     udev-ecb-install
@@ -90,17 +99,22 @@
 
 (defun udev-ecb-buffer-name (mode)
   "Return a name for current compilation buffer ignoring MODE."
-  (udev-buffer-name " *Updating ECB %s*" udev-ecb-update-buffer mode))
+  (udev-buffer-name "*Updating ECB %s*" udev-ecb-update-buffer mode))
 
 (defvar udev-ecb-update-buffer nil)
 
-(defun udev-ecb-check-cedet ()
-  (unless (and (locate-library "semantic")
-               (locate-library "eieio"))
-    (if (not (y-or-n-p "CEDET must be installed first.  Do that now? "))
-        (error "Can't install ECB without CEDET")
-      (require 'udev-cedet)
-      (udev-cedet-update))))
+(defun udev-ecb-has-cedet ()
+  (cond
+   ((not (and (locate-library "semantic")
+                (locate-library "eieio")))
+    (message (propertize "CEDET must be installed and loaded first"
+                         'face 'secondary-selection))
+    nil)
+   ((not (featurep 'cedet))
+    (message (propertize "CEDET must be loaded first"
+                         'face 'secondary-selection))
+    nil)
+   (t t)))
 
 (defun udev-ecb-setup-when-finished (log-buffer)
   (require 'cus-edit)
@@ -129,11 +143,25 @@
 To determine where to store the sources see `udev-ecb-dir'.
 For how to start ECB see `udev-ecb-load-ecb'."
   (interactive)
-  (udev-ecb-check-cedet)
-  (setq udev-ecb-update-buffer (get-buffer-create "*Update ECB*"))
-  (udev-call-first-step udev-ecb-update-buffer udev-ecb-steps
-                        "Starting updating ECB from development sources"
-                        'udev-ecb-setup-when-finished))
+  (when (udev-ecb-has-cedet)
+    (let* ((has-it (file-exists-p (udev-ecb-cvs-dir)))
+           (prompt (if has-it
+                       "Do you want to update ECB from devel sources? "
+                     "Do you want to install ECB from devel sources? ")))
+      (when (y-or-n-p prompt)
+        (setq udev-ecb-update-buffer (get-buffer-create "*Update ECB*"))
+        (udev-call-first-step udev-ecb-update-buffer udev-ecb-steps
+                              "Starting updating ECB from development sources"
+                              'udev-ecb-setup-when-finished)))))
+
+;;;###autoload
+(defun udev-ecb-customize-startup ()
+  "Customize ECB dev nXhtml startup group."
+  (interactive)
+  (if (file-exists-p (udev-ecb-cvs-dir))
+      (customize-group-other-window 'udev-ecb)
+    (message (propertize "You must fetch ECB from nXhtml first"
+                         'face 'secondary-selection))))
 
 (defun udev-ecb-fetch (log-buffer)
   "Fetch ECB sources (asynchronously)."
@@ -147,9 +175,30 @@ For how to start ECB see `udev-ecb-load-ecb'."
          'udev-ecb-buffer-name)
       (current-buffer))))
 
-(defun udev-ecb-cvs-dir ()
-  "Return cvs root directory."
-  (file-name-as-directory (expand-file-name "ecb" udev-ecb-dir)))
+;;(udev-ecb-fix-bad-files nil)
+(defun udev-ecb-fix-bad-files (log-buffer)
+  "Change files that can not be compiled."
+  (let* ((bad-file (expand-file-name "ecb/ecb-advice-test.el" udev-ecb-dir))
+         (bad-file-buffer (find-buffer-visiting bad-file))
+         (this-log-buf (get-buffer-create "*Fix bad ECB files*"))
+         (fixed-it nil))
+    (when (file-exists-p bad-file)
+      (with-current-buffer (find-file-noselect bad-file)
+        (save-restriction
+          (widen)
+          (goto-char (point-min))
+          (save-match-data
+            (while (re-search-forward "\r" nil t)
+              (setq fixed-it t)
+              (replace-match ""))))
+        (basic-save-buffer)
+        (with-current-buffer this-log-buf
+          (erase-buffer)
+          (if fixed-it
+              (insert "Fixed " bad-file "\n")
+            (insert "The file " bad-file " was already ok\n")))
+        (unless bad-file-buffer (kill-buffer (current-buffer)))))
+    this-log-buf))
 
 (defun udev-ecb-fetch-diff (log-buffer)
   "Fetch diff between local ECB sources and repository."
@@ -168,6 +217,13 @@ Note that they will not be installed in current Emacs session."
                       udev-this-dir
                       'udev-ecb-buffer-name))
 
+;;(udev-ecb-install-help (get-buffer-create "*temp online-help*"))
+(defun udev-ecb-install-help (log-buffer)
+  (let ((trc-buf (get-buffer-create "*temp online-help*")))
+    (with-current-buffer trc-buf
+      (setq default-directory (udev-ecb-cvs-dir))
+      (w32shell-with-shell "msys" (shell-command "make online-help&" trc-buf)))))
+
 (provide 'udev-ecb)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; udev-ecb.el ends here
diff --git a/elpa-to-submit/nxhtml/util/udev-nxhtml.el b/elpa-to-submit/nxhtml/util/udev-nxhtml.el
index 7bb53eeb7d..a76aeb5856 100644
--- a/elpa-to-submit/nxhtml/util/udev-nxhtml.el
+++ b/elpa-to-submit/nxhtml/util/udev-nxhtml.el
@@ -44,7 +44,7 @@
 ;;
 ;;; Code:
 
-(require 'udev)
+(eval-when-compile (require 'udev))
 
 (defvar udev-nxhtml-install-dir nil)
 
@@ -142,9 +142,11 @@ Your current nXhtml dir will be renamed by adding '-old' to the name."))
     (fill-region here (point))
     ))
 
+(defvar udev-nxhtml-update-buffer nil)
+
 (defun udev-nxhtml-buffer-name (mode)
   "Return a name for current compilation buffer ignoring MODE."
-  (udev-buffer-name " *Updating/installing nXhtml %s*" udev-nxhtml-update-buffer mode))
+  (udev-buffer-name "*Updating/installing nXhtml %s*" udev-nxhtml-update-buffer mode))
 
 (defvar udev-nxhtml-first-fetch-steps
   '(
diff --git a/elpa-to-submit/nxhtml/util/udev-rinari.el b/elpa-to-submit/nxhtml/util/udev-rinari.el
index 92375410bc..59bf807385 100644
--- a/elpa-to-submit/nxhtml/util/udev-rinari.el
+++ b/elpa-to-submit/nxhtml/util/udev-rinari.el
@@ -44,7 +44,7 @@
 ;;
 ;;; Code:
 
-(require 'udev)
+(eval-when-compile (require 'udev))
 
 (defgroup udev-rinari nil
   "Customization group for udev-rinari."
@@ -82,11 +82,11 @@
     ;;udev-rinari-install
     ))
 
+(defvar udev-rinari-update-buffer nil)
+
 (defun udev-rinari-buffer-name (mode)
   "Return a name for current compilation buffer ignoring MODE."
-  (udev-buffer-name " *Updating Rinari %s*" udev-rinari-update-buffer mode))
-
-(defvar udev-rinari-update-buffer nil)
+  (udev-buffer-name "*Updating Rinari %s*" udev-rinari-update-buffer mode))
 
 (defun udev-rinari-check-conflicts ()
   "Check if Rinari and ruby-mode already loaded and from where.
@@ -154,6 +154,7 @@ see `udev-rinari-dir' and `udev-rinari-load-rinari'."
       (setq udev-rinari-fetch-buffer (current-buffer)))))
 
 (defvar udev-rinari-diff-file nil)
+(defvar udev-rinari-fetch-diff-buffer nil)
 
 (defun udev-rinari-fetch-diff (log-buffer)
   "Fetch diff between local Rinari sources and dev repository."
@@ -172,8 +173,6 @@ see `udev-rinari-dir' and `udev-rinari-load-rinari'."
                 (setq udev-continue-on-error-function 'udev-cvs-diff-continue)
                 (current-buffer)))))))
 
-(defvar udev-rinari-fetch-diff-buffer nil)
-
 (defun udev-rinari-check-diff (log-buffer)
   "Check output from svn diff command for merge conflicts."
   ;; Fix-me: How can this be checked?
diff --git a/elpa-to-submit/nxhtml/util/udev.el b/elpa-to-submit/nxhtml/util/udev.el
index 2fbf90f25b..f34f655fdb 100644
--- a/elpa-to-submit/nxhtml/util/udev.el
+++ b/elpa-to-submit/nxhtml/util/udev.el
@@ -3,14 +3,14 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Created: 2008-08-24
 (defconst udev:version "0.5");; Version:
-;; Last-Updated: 2008-08-24T18:19:41+0200 Sun
+;; Last-Updated: 2009-01-06 Tue
 ;; URL:
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `cl'.
+  ;; `cus-edit', `cus-face', `cus-load', `cus-start', `wid-edit'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -125,10 +125,12 @@
   "Udev-Src"
   "Mode for udev control buffer."
   (setq show-trailing-whitespace nil)
-  (setq buffer-read-only t))
+  (setq buffer-read-only t)
+  (nxhtml-minor-mode 1))
 
 ;;; Calling steps
 
+;;;###autoload
 (defun udev-call-first-step (log-buffer steps header finish-fun)
   "Set up and call first step.
 Set up buffer LOG-BUFFER to be used for log messages and
@@ -145,13 +147,13 @@ after last step with LOG-BUFFER as parameter."
   (switch-to-buffer log-buffer)
   (udev-control-mode)
   (setq udev-is-log-buffer t)
-  (setq this-chain
-        (cons nil
-              (cons log-buffer
-                    (cons (copy-tree steps)
-                          (cons finish-fun nil)))))
-  (setcar this-chain (caddr this-chain))
-  (setq udev-this-chain this-chain)
+  (let ((this-chain
+         (cons nil
+               (cons log-buffer
+                     (cons (copy-tree steps)
+                           (cons finish-fun nil))))))
+    (setcar this-chain (caddr this-chain))
+    (setq udev-this-chain this-chain))
   (assert (eq (car steps) (udev-this-step log-buffer)) t)
   (assert (eq finish-fun (udev-finish-function log-buffer)) t)
   (widen)
@@ -363,14 +365,11 @@ in the default directory DEFDIR.
 Set the buffer name for the inferior process with NAME-FUNCTION
 by giving this to `compilation-start'."
   (let ((default-directory (file-name-as-directory defdir))
-        ;; Fix-me:
-        (this-emacs "emacs"))
-    (with-current-buffer
-        (compilation-start
-         (concat this-emacs " -Q -batch " emacs-args)
-         'compilation-mode
-         name-function)
-      (current-buffer))))
+        (this-emacs (ourcomments-find-emacs)))
+    (compilation-start
+     (concat this-emacs " -Q -batch " emacs-args)
+     'compilation-mode
+     name-function)))
 
 ;;; Convenience functions for CVS
 
@@ -436,6 +435,21 @@ Return buffer containing DIFF-FILE."
 ;;(add-to-list 'compilation-error-regexp-alist 'cvs)
 ;;(setq compilation-error-regexp-alist (delq 'cvs compilation-error-regexp-alist))
 
+;;; Misc
+
+(defun udev-send-buffer-process (str)
+  (interactive "sString to send to process: ")
+  (let* ((procs (process-list))
+         (proc (catch 'found
+                 (dolist (p procs)
+                   (when (eq (process-buffer p) (current-buffer))
+                     (throw 'found p))))))
+    (unless proc (error "Can't find process in buffer"))
+    ;;(message "str=%s" str)
+    ;;(message "proc=%s" proc)
+    (process-send-string proc (concat str "\n"))
+  ))
+
 
 (provide 'udev)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/elpa-to-submit/nxhtml/util/viper-tut.el b/elpa-to-submit/nxhtml/util/viper-tut.el
index 702f67a1e9..e2e6dbead4 100644
--- a/elpa-to-submit/nxhtml/util/viper-tut.el
+++ b/elpa-to-submit/nxhtml/util/viper-tut.el
@@ -1,8 +1,8 @@
 ;;; viper-tut.el --- Viper tutorial
 ;;
 ;; Author: Lennart Borgman
-;; Created: Fri Sep 08 16:55:42 2006
-;; Version: 0.1
+;; Created: Fri Sep 08 2006
+(defconst viper-tut:version "0.2") ;;Version: 0.2
 ;; Last-Updated:
 ;; Keywords:
 ;; Compatibility: Emacs 22
@@ -55,92 +55,7 @@
     map)
   "Keymap that allows tabbing between buttons.")
 
-(defun viper-tut--detailed-help (button)
-  "Give detailed help about changed keys."
-  (with-output-to-temp-buffer (help-buffer)
-    (help-setup-xref (list #'viper-tut--detailed-help button)
-                     (interactive-p))
-    (with-current-buffer (help-buffer)
-      (let* ((tutorial-buffer  (button-get button 'tutorial-buffer))
-             ;;(tutorial-arg     (button-get button 'tutorial-arg))
-             (explain-key-desc (button-get button 'explain-key-desc))
-             (part             (button-get button 'part))
-             (changed-keys (with-current-buffer tutorial-buffer
-                             (let ((tutorial--lang "English"))
-                               (tutorial--find-changed-keys
-                                (if (= part viper-tut--emacs-part)
-                                    tutorial--default-keys
-                                  viper-tut--default-keys))))))
-        (when changed-keys
-          (insert
-           "The following key bindings used in the tutorial had been changed\n"
-           (if (= part viper-tut--emacs-part)
-               "from Emacs default in the "
-             "from Viper default in the ")
-           (buffer-name tutorial-buffer) " buffer:\n\n" )
-          (let ((frm "   %-9s %-27s %-11s %s\n"))
-            (insert (format frm "Key" "Standard Binding" "Is Now On" "Remark")))
-          (dolist (tk changed-keys)
-            (let* ((def-fun     (nth 1 tk))
-                   (key         (nth 0 tk))
-                   (def-fun-txt (nth 2 tk))
-                   (where       (nth 3 tk))
-                   (remark      (nth 4 tk))
-                   (rem-fun (command-remapping def-fun))
-                   (key-txt (key-description key))
-                   (key-fun (with-current-buffer tutorial-buffer (key-binding key)))
-                   tot-len)
-              (unless (eq def-fun key-fun)
-                ;; Insert key binding description:
-                (when (string= key-txt explain-key-desc)
-                  (put-text-property 0 (length key-txt) 'face '(:background "yellow") key-txt))
-                (insert "   " key-txt " ")
-                (setq tot-len (length key-txt))
-                (when (> 9 tot-len)
-                  (insert (make-string (- 9 tot-len) ? ))
-                  (setq tot-len 9))
-                ;; Insert a link describing the old binding:
-                (insert-button def-fun-txt
-                               'value def-fun
-                               'action
-                               (lambda(button) (interactive)
-                                 (describe-function
-                                  (button-get button 'value)))
-                               'follow-link t)
-                (setq tot-len (+ tot-len (length def-fun-txt)))
-                (when (> 36 tot-len)
-                  (insert (make-string (- 36 tot-len) ? )))
-                (when (listp where)
-                  (setq where "list"))
-                ;; Tell where the old binding is now:
-                (insert (format " %-11s " where))
-                ;; Insert a link with more information, for example
-                ;; current binding and keymap or information about
-                ;; cua-mode replacements:
-                (insert-button (car remark)
-                               'action
-                               (lambda(b) (interactive)
-                                 (let ((value (button-get b 'value)))
-                                   (tutorial--describe-nonstandard-key value)))
-                               'value (cdr remark)
-                               'follow-link t)
-                (insert "\n")))))
-
-
-
-        (insert "
-It is legitimate to change key bindings, but changed bindings do not
-correspond to what the tutorial says.  (See also " )
-        (insert-button "Key Binding Conventions"
-                       'action
-                       (lambda(button) (interactive)
-                         (info
-                          "(elisp) Key Binding Conventions")
-                         (message "Type C-x 0 to close the new window"))
-                       'follow-link t)
-        (insert ".)\n\n")
-        (print-help-return-message)))))
-
+(defconst viper-tut--emacs-part 6)
 
 (defconst viper-tut--default-keys
   `(
@@ -393,7 +308,7 @@ correspond to what the tutorial says.  (See also " )
     (viper-info-on-file [?\C-c ?\C-g])
     ;; ^L	Refresh screen
     ;;(recenter [(control ?l)])
-    (recenter [?\C-l])
+    (recenter-top-bottom [?\C-l])
 
     ;; !}fmt	Format the paragraph, joining and filling lines to
     ;; !}sort	Sort lines of a paragraph alphabetically
@@ -406,6 +321,93 @@ correspond to what the tutorial says.  (See also " )
 
     ))
 
+(defun viper-tut--detailed-help (button)
+  "Give detailed help about changed keys."
+  (with-output-to-temp-buffer (help-buffer)
+    (help-setup-xref (list #'viper-tut--detailed-help button)
+                     (interactive-p))
+    (with-current-buffer (help-buffer)
+      (let* ((tutorial-buffer  (button-get button 'tutorial-buffer))
+             ;;(tutorial-arg     (button-get button 'tutorial-arg))
+             (explain-key-desc (button-get button 'explain-key-desc))
+             (part             (button-get button 'part))
+             (changed-keys (with-current-buffer tutorial-buffer
+                             (let ((tutorial--lang "English"))
+                               (tutorial--find-changed-keys
+                                (if (= part viper-tut--emacs-part)
+                                    tutorial--default-keys
+                                  viper-tut--default-keys))))))
+        (when changed-keys
+          (insert
+           "The following key bindings used in the tutorial had been changed\n"
+           (if (= part viper-tut--emacs-part)
+               "from Emacs default in the "
+             "from Viper default in the ")
+           (buffer-name tutorial-buffer) " buffer:\n\n" )
+          (let ((frm "   %-9s %-27s %-11s %s\n"))
+            (insert (format frm "Key" "Standard Binding" "Is Now On" "Remark")))
+          (dolist (tk changed-keys)
+            (let* ((def-fun     (nth 1 tk))
+                   (key         (nth 0 tk))
+                   (def-fun-txt (nth 2 tk))
+                   (where       (nth 3 tk))
+                   (remark      (nth 4 tk))
+                   (rem-fun (command-remapping def-fun))
+                   (key-txt (key-description key))
+                   (key-fun (with-current-buffer tutorial-buffer (key-binding key)))
+                   tot-len)
+              (unless (eq def-fun key-fun)
+                ;; Insert key binding description:
+                (when (string= key-txt explain-key-desc)
+                  (put-text-property 0 (length key-txt) 'face '(:background "yellow") key-txt))
+                (insert "   " key-txt " ")
+                (setq tot-len (length key-txt))
+                (when (> 9 tot-len)
+                  (insert (make-string (- 9 tot-len) ? ))
+                  (setq tot-len 9))
+                ;; Insert a link describing the old binding:
+                (insert-button def-fun-txt
+                               'value def-fun
+                               'action
+                               (lambda(button) (interactive)
+                                 (describe-function
+                                  (button-get button 'value)))
+                               'follow-link t)
+                (setq tot-len (+ tot-len (length def-fun-txt)))
+                (when (> 36 tot-len)
+                  (insert (make-string (- 36 tot-len) ? )))
+                (when (listp where)
+                  (setq where "list"))
+                ;; Tell where the old binding is now:
+                (insert (format " %-11s " where))
+                ;; Insert a link with more information, for example
+                ;; current binding and keymap or information about
+                ;; cua-mode replacements:
+                (insert-button (car remark)
+                               'action
+                               (lambda(b) (interactive)
+                                 (let ((value (button-get b 'value)))
+                                   (tutorial--describe-nonstandard-key value)))
+                               'value (cdr remark)
+                               'follow-link t)
+                (insert "\n")))))
+
+
+
+        (insert "
+It is legitimate to change key bindings, but changed bindings do not
+correspond to what the tutorial says.  (See also " )
+        (insert-button "Key Binding Conventions"
+                       'action
+                       (lambda(button) (interactive)
+                         (info
+                          "(elisp) Key Binding Conventions")
+                         (message "Type C-x 0 to close the new window"))
+                       'follow-link t)
+        (insert ".)\n\n")
+        (print-help-return-message)))))
+
+
 (defvar viper-tut--part nil
   "Viper tutorial part.")
 (make-variable-buffer-local 'viper-tut--part)
@@ -446,15 +448,13 @@ tutorial buffer."
     (6 "(no file)" "Emacs tutorial for Viper Users")
     ))
 
-(defconst viper-tut--emacs-part 6)
-
 (defcustom viper-tut-directory
   (let* ((this-file (if load-file-name
                         load-file-name
                       (buffer-file-name)))
          (this-dir (file-name-directory this-file)))
     (file-name-as-directory
-     (expand-file-name "viper-tut" this-dir)))
+     (expand-file-name "../etc/viper-tut" this-dir)))
   "Directory where the Viper tutorial files lives."
   :type 'directory
   :group 'viper)
@@ -471,6 +471,11 @@ tutorial buffer."
           viper-tut--parts)
     tut-file))
 
+(defun viper-tut-viper-is-on ()
+  ;;(message "viper-tut-viper-is-on, vms=%s, cb=%s" (boundp 'viper-mode-string) (current-buffer))
+  ;;(boundp 'viper-mode-string)
+  (boundp 'viper-current-state))
+
 (defun viper-tut--display-changes (changed-keys part)
   "Display changes to some default Viper key bindings.
 If some of the default key bindings that the Viper tutorial
@@ -480,15 +485,14 @@ tutorial buffer with some explanatory links.
 CHANGED-KEYS should be a list in the format returned by
 `tutorial--find-changed-keys'."
   (when (or changed-keys
-            (not viper-is-on))
+            (viper-tut-viper-is-on))
     ;; Need the custom button face for viper buttons:
     ;;(when (and (boundp 'viper-mode) viper-mode) (require 'cus-edit))
     (goto-char tutorial--point-before-chkeys)
     (let* ((start (point))
            end
-           (viper-is-on (boundp 'viper-mode-string))
            (head
-            (if viper-is-on
+            (if (viper-tut-viper-is-on)
                 (if (= part viper-tut--emacs-part)
                     "
  NOTICE: This part of the Viper tutorial runs the Emacs tutorial.
@@ -511,7 +515,7 @@ CHANGED-KEYS should be a list in the format returned by
   NOTICE: You have currently not turned on Viper. Nothing in this
   tutorial \(the Viper Tutorial\) will work unless you do that. ["
               ))
-           (head2 (if viper-is-on
+           (head2 (if (viper-tut-viper-is-on)
                       (get-lang-string tutorial--lang 'tut-chgdhead2)
                     "More information")))
       (when (and head head2)
@@ -522,7 +526,7 @@ CHANGED-KEYS should be a list in the format returned by
                        ;;'tutorial-arg arg
                        'part part
                        'action
-                       (if viper-is-on
+                       (if (viper-tut-viper-is-on)
                            'viper-tut--detailed-help
                          'go-home-blaha)
                        'follow-link t
@@ -582,7 +586,7 @@ CHANGED-KEYS should be a list in the format returned by
                           ;;(concat "** The key " key-desc " has been rebound, but you can use " where " instead ["))
                           (when (and s s2)
                             (setq s (format s key-desc where s2))
-                            (insert s)
+                            (insert s " [")
                             (insert-button s2
                                            'tutorial-buffer
                                            (current-buffer)
@@ -686,8 +690,7 @@ later."
                              (= part old-tut-part)
                              (not (buffer-modified-p old-tut-buf)))))
            old-tut-file
-           (old-tut-point 1)
-           viper-is-on)
+           (old-tut-point 1))
       (unless (file-exists-p filename) (error "Can't fine %s" filename))
       (setq tutorial--point-after-chkeys (point-min))
       ;; Try to display the tutorial buffer before asking to revert it.
@@ -716,7 +719,6 @@ later."
       (unless old-tut-is-ok
         (switch-to-buffer (get-buffer-create tut-buf-name))
         (unless old-tut-buf (text-mode))
-        (setq viper-is-on (boundp 'viper-mode-string))
         (setq viper-tut--part part)
         (setq old-tut-file (file-exists-p (viper-tut--saved-file)))
         (when (= part 0) (setq old-tut-file nil)) ;; You do not edit in the intro
@@ -762,7 +764,8 @@ later."
           (save-excursion
             (goto-char (point-min))
             (while (re-search-forward "'\\([][+a-zA-Z~<>!;,:.'\"%/?(){}$^0|-]\\)'" nil t)
-              (let ((matched-char (match-string 1)))
+              (let ((matched-char (match-string 1))
+                    (inhibit-read-only t))
                 (put-text-property 0 1 'vi-char t matched-char)
                 (put-text-property 0 1 'face '(:foreground "blue") matched-char)
                 (replace-match matched-char))))
diff --git a/elpa-to-submit/nxhtml/util/vline.el b/elpa-to-submit/nxhtml/util/vline.el
index a430acc66f..6613b73f9e 100644
--- a/elpa-to-submit/nxhtml/util/vline.el
+++ b/elpa-to-submit/nxhtml/util/vline.el
@@ -88,6 +88,7 @@ in the currently selected window."
   :type 'boolean
   :group 'vline)
 
+;;;###autoload
 (define-minor-mode vline-mode
   "Display vertical line mode."
   :global nil
@@ -98,6 +99,7 @@ in the currently selected window."
     (vline-clear)
     (remove-hook 'post-command-hook 'vline-post-command-hook t)))
 
+;;;###autoload
 (define-minor-mode vline-global-mode
   "Display vertical line mode as globally."
   :global t
diff --git a/elpa-to-submit/nxhtml/util/whelp.el b/elpa-to-submit/nxhtml/util/whelp.el
index fd447f6387..c0311b529e 100644
--- a/elpa-to-submit/nxhtml/util/whelp.el
+++ b/elpa-to-submit/nxhtml/util/whelp.el
@@ -96,9 +96,8 @@ The third argument DOC is a documentation string for the widget."
   (setq describe-temp-help-buffer (get-buffer-create "*Copy of *Help* Buffer for Description*")))
 
 (defun describe-field (pos)
-  "Describe field at point or cursor."
-  (interactive
-   (list (point)))
+  "Describe field at marker POS."
+  (interactive (list (point)))
   (unless (markerp pos) (setq pos (copy-marker pos)))
   (when (eq (marker-buffer pos) (get-buffer (help-buffer)))
     (with-current-buffer (describe-get-temp-help-buffer)
@@ -107,25 +106,27 @@ The third argument DOC is a documentation string for the widget."
                 (buffer-string)))
       (goto-char (marker-position pos))
       (setq pos (point-marker))))
-  (cond ((let* ((field (get-char-property pos 'field))
-                (wbutton (get-char-property pos 'button))
-                (doc (get-char-property pos 'widget-doc))
-                (widget (or field wbutton doc)))
-           (and widget
+  (let (field wbutton doc button widget)
+    (with-current-buffer (marker-buffer pos)
+      (setq field (get-char-property pos 'field))
+      (setq wbutton (get-char-property pos 'button))
+      (setq doc (get-char-property pos 'widget-doc))
+      (setq button (button-at pos))
+      (setq widget (or field wbutton doc)))
+    (cond ((and widget
                 (if (symbolp widget)
                     (get widget 'widget-type)
                   (and (consp widget)
-                       (get (widget-type widget) 'widget-type)))))
-         (describe-widget pos)
-         )
-        ((button-at pos)
-         (describe-button pos))
-        ((and (eq major-mode 'Info-mode)
-              (memq (get-text-property (point) 'font-lock-face)
-                    '(info-xref info-xref-visited)))
-         (message "info link"))
-        (t
-         (message "No widget or button at point"))))
+                       (get (widget-type widget) 'widget-type))))
+           (describe-widget pos))
+          (button
+           (describe-button pos))
+          ((and (eq major-mode 'Info-mode)
+                (memq (get-text-property pos 'font-lock-face)
+                      '(info-xref info-xref-visited)))
+           (message "info link"))
+          (t
+           (message "No widget or button at point")))))
 
 (defun describe-insert-header (pos)
   (widget-insert
@@ -980,3 +981,5 @@ The :value of the widget shuld be the button to be browsed."
            )
          )
         (print-help-return-message)))))
+
+(provide 'whelp)
diff --git a/elpa-to-submit/nxhtml/util/winsav.el b/elpa-to-submit/nxhtml/util/winsav.el
index cb9efb2577..de74cb2d5c 100644
--- a/elpa-to-submit/nxhtml/util/winsav.el
+++ b/elpa-to-submit/nxhtml/util/winsav.el
@@ -1,22 +1,46 @@
 ;;; winsav.el --- Save and restore window structure
 ;;
 ;; Author: Lennart Borgman
-;; Created: Sun Jan 14 00:27:19 2007
-;; Version: 0.70
-;; Last-Updated: Wed Jan 09 00:50:22 2008 (3600 +0100)
+;; Created: Sun Jan 14 2007
+(defconst winsav:version "0.77") ;;Version: 0.77
+;; Last-Updated: 2009-08-04 Tue
 ;; Keywords:
 ;; Compatibility:
 ;;
 ;; Features that might be required by this library:
 ;;
-;;   `cl'.
+;;   None
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
 ;;
+;; This library contains both user level commands and options and
+;; functions for use in other elisp libraries.
+;;
+;;;; User level commands and options
+;;
+;; The user level commands and options are for saving frame, windows
+;; and buffers between Emacs sessions.  To do that you can customize
+;; the options `desktop-save-mode' and `winsav-save-mode' or put this
+;; at the end of your .emacs:
+;;
+;;   (desktop-save-mode 1)
+;;   (winsav-save-mode 1)
+;;
+;; You can also save configurations that you later switch between.
+;; For more information see the command `winsav-save-mode'.
+;;
+;; (There is also a command in this library for rotating window
+;; borders in a frame, `winsav-rotate'.  It is here just because the
+;; needed support functions lives here.)
+;;
+;;
+;;
+;;;; Commands for other elisp libraries
+;;
 ;; This library was orignally written to solve the problem of adding a
-;; window to the left of some windows in a frame
+;; window to the left of some windows in a frame like the one below
 ;;
 ;; ___________
 ;; |    |    |
@@ -57,6 +81,7 @@
 ;; above, under etc.)
 ;;
 ;;
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Bugs and limitations:
@@ -88,6 +113,14 @@
 ;;
 ;;; Change log:
 ;;
+;; Version 0.72:
+;;
+;; - Format of window structure changed in Emacs 23. Adopted to that.
+;; - Added save and restore of frame/window configurations between
+;;   Emacs sessions.
+;; - Added named winsav configurations for save and restore of frames,
+;;   windows, buffers and files.
+;;
 ;; Version 0.71:
 ;;
 ;; - Added rotation of window structure.
@@ -120,27 +153,32 @@
 
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'desktop))
 
-(defun winsav-upper-left-window(&optional frame w)
-  (let* ((tree (if w w (car (window-tree frame))))
-         (is-split (not (windowp tree))))
-    (if (not is-split)
-        tree
-      (winsav-upper-left-window frame (nth 2 tree)))))
+;; (defun winsav-upper-left-window(&optional frame w)
+;;   (let* ((tree (if w w (car (window-tree frame))))
+;;          (is-split (not (windowp tree))))
+;;     (if (not is-split)
+;;         tree
+;;       (winsav-upper-left-window frame (nth 2 tree)))))
 
 
-(defvar winsav-after-get-hooks nil
+(defcustom winsav-after-get-hook nil
   "Hook to run after at the end of `winsav-get-window-tree'.
 The functions in this hook are called with one parameter which is
-the same as the return value from the function above.")
+the same as the return value from the function above."
+  :type 'hook
+  :group 'winsav)
 
-(defvar winsav-after-put-hooks nil
+(defcustom winsav-after-put-hook nil
   "Hook to run after at the end of `winsav-put-window-tree'.
 The functions in this hook are called with one parameter which is
 a list where each element is a list \(old-win new-win) where
 OLD-WIN are the window from `winsav-get-window-tree' and NEW-WIN
 is the newly created corresponding window.  This list is the same
-as the return value from the function above.")
+as the return value from the function above."
+  :type 'hook
+  :group 'winsav)
 
 (defun winsav-get-window-tree(&optional frame)
   "Get window structure.
@@ -151,7 +189,8 @@ FRAME is the frame to save structure from. If nil use selected.
 
 At the very end of this function the hook `winsav-after-get' is
 run."
-  (let* ((upper-left (winsav-upper-left-window))
+  ;;(let* ((upper-left (winsav-upper-left-window frame))
+  (let* ((upper-left (frame-first-window frame))
          (num -1)
          sel-num)
     (dolist (w (window-list frame nil upper-left))
@@ -160,28 +199,36 @@ run."
         (setq sel-num num)))
     (let ((ret (list sel-num
                      (winsav-get-window-tree-1 frame nil))))
-      (run-hook-with-args 'winsav-after-get-hooks ret)
+      (run-hook-with-args 'winsav-after-get-hook ret)
       ret)))
 
+;; Fix-me: add window-hscroll
 (defun winsav-get-window-tree-1(frame w)
   (let ((tree (if w w (car (window-tree frame)))))
     (if (windowp tree)
-        (list (window-buffer tree)
-              (format "Buffer: %s"
-                      (let ((bn (buffer-file-name (window-buffer tree))))
-                        (if bn
-                            bn
-                          (window-buffer tree))))
-              (window-point tree)
-              (window-edges tree)
-              (window-dedicated-p tree)
-              (window-scroll-bars tree)
-              (window-fringes tree)
-              (window-margins tree)
-              (window-hscroll tree)
-              (window-redisplay-end-trigger tree)
-              (window-start tree)
-              tree)
+        ;; Note: Desktop is used for saving buffers.
+        (with-current-buffer (window-buffer tree)
+          (list (window-buffer tree)
+                ;; buffer
+                (buffer-name)
+                (buffer-file-name)
+                ;;buffer-read-only
+                ;;(if mumamo-multi-major-mode mumamo-multi-major-mode major-mode)
+                ;;minor-modes
+                ;;buffer locals
+                ;;(cons (+ 0 (mark-marker)) (mark-active))
+                ;; window
+                (window-point tree)
+                (window-edges tree)
+                (window-scroll-bars tree)
+                (window-fringes tree)
+                (window-margins tree)
+                (window-hscroll tree)
+                ;; misc
+                (window-dedicated-p tree)
+                (window-redisplay-end-trigger tree)
+                (window-start tree)
+                tree))
       (let* ((dir (nth 0 tree))
              (split (nth 1 tree))
              (wt (cddr tree))
@@ -190,6 +237,7 @@ run."
                             wt)))
         (append (list dir split) wsubs)))))
 
+;;;###autoload
 (defun winsav-put-window-tree (saved-tree window &optional copy-win-ovl win-ovl-all-bufs)
   "Put window structure SAVED-TREE into WINDOW.
 Restore a structure SAVED-TREE returned from
@@ -229,28 +277,39 @@ run."
       (setq scale-h (unless (= oh nh) (/ nh (float oh)))))
     (setq first-win (winsav-put-window-tree-1 tree window scale-w scale-h t 1))
     (select-window first-win)
-    (other-window sel-num)
+    (when sel-num (other-window sel-num))
     (winsav-fix-win-ovl winsav-put-return copy-win-ovl win-ovl-all-bufs)
-    (run-hook-with-args 'winsav-after-put-hooks winsav-put-return)
+    (run-hook-with-args 'winsav-after-put-hook winsav-put-return)
     winsav-put-return))
 
 (defun winsav-put-window-tree-1 (saved-tree window scale-w scale-h first-call level)
+  "Helper for `winsav-put-window-tree'.
+For the arguments SAVED-TREE and WINDOW see that function.
+
+The arguments SCALE-W and SCALE-H are used to make the saved
+window config fit into its new place.  FIRST-CALL is a state
+variable telling if this is the first round.  LEVEL helps
+debugging by tells how far down we are in the call chain."
   (if (or (bufferp (car saved-tree))
           ;;(not (car saved-tree))
           (eq 'buffer (car saved-tree))
           )
       (let ((buffer  (nth 0 saved-tree))
-            (bufstr  (nth 1 saved-tree))
-            (point   (nth 2 saved-tree))
-            (edges   (nth 3 saved-tree))
-            (dedic   (nth 4 saved-tree))
+            ;; buffer
+            (bufnam  (nth 1 saved-tree))
+            (filnam  (nth 2 saved-tree))
+            ;;(mark    (nth 3 saved-tree))
+            ;; window
+            (point   (nth 3 saved-tree))
+            (edges   (nth 4 saved-tree))
             (scroll  (nth 5 saved-tree))
             (fringe  (nth 6 saved-tree))
             (margs   (nth 7 saved-tree))
             (hscroll (nth 8 saved-tree))
-            (trigger (nth 9 saved-tree))
-            (start   (nth 10 saved-tree))
-            (ovlwin  (nth 11 saved-tree))
+            (dedic   (nth 9 saved-tree))
+            (trigger (nth 10 saved-tree))
+            (start   (nth 11 saved-tree))
+            (ovlwin  (nth 12 saved-tree))
             scr2
             (misbuf  " *Winsav information: Buffer is gone*"))
         (or (windowp ovlwin)
@@ -259,22 +318,23 @@ run."
         (when first-call
           (add-to-list 'winsav-put-return (list ovlwin window))
           (when (eq 'buffer buffer)
-            (let ((buf-file bufstr))
-              (setq buf-file (substring buf-file 8))
-              (setq buffer (winsav-find-file-noselect buf-file))))
-          (unless (buffer-live-p buffer)
-            (setq buffer (get-buffer-create misbuf))
-            (with-current-buffer buffer
-              (when (= 0 (length (buffer-string)))
-                (insert "The buffer that this window should show is gone:\n\n")
-                (put-text-property (point-min) (1- (point-max))
-                                   'face 'font-lock-warning-face)
-                (setq buffer-read-only t))
-              (let ((o (make-overlay (point-max) (point-max))))
-                (overlay-put o 'window window)
-                (overlay-put o 'before-string bufstr))))
+            (when filnam
+              (setq buffer (winsav-find-file-noselect filnam)))
+            (if (buffer-live-p buffer)
+                (or (string= bufnam (buffer-name buffer))
+                    (eq (string-to-char bufnam) 32) ;; Avoid system buffer names
+                    (rename-buffer bufnam))
+              (when (eq (string-to-char bufnam) 32)
+                (setq bufnam " *Winsav dummy buffer*"))
+              ;; Fix-me, this might need some tweaking: Don't restore
+              ;; buffers without a file name and without
+              ;; content. (desktop-mode will make that when
+              ;; necessary.)  Just show the scratch buffer instead.
+              (setq buffer (get-buffer bufnam))
+              (unless (and buffer
+                           (< 0 (buffer-size buffer)))
+                (setq buffer (get-buffer-create "*scratch*")))))
           (set-window-buffer window buffer)
-          (set-window-point window point)
           (set-window-dedicated-p window dedic)
           ;; Strange incompatibility in scroll args:
           (setq scr2 (list (nth 0 scroll) (nth 2 scroll) (nth 3 scroll)))
@@ -283,13 +343,6 @@ run."
           (set-window-margins window (car margs) (cdr margs))
           (set-window-hscroll window hscroll)
           (set-window-redisplay-end-trigger window trigger))
-        (unless (buffer-live-p buffer)
-          (setq point 1)
-          (setq start 1))
-        (set-window-start window start)
-        ;; Maybe point got off screen?
-        (when (/= point (window-point window))
-          (set-window-point window point))
         (let* ((nsiz (window-edges window))
                (nh (- (nth 3 nsiz) (nth 1 nsiz)))
                (nw (- (nth 2 nsiz) (nth 0 nsiz)))
@@ -309,6 +362,16 @@ run."
             (bw-adjust-window window diff-h nil))
           (when (> (abs diff-w) 1)
             (bw-adjust-window window diff-w t)))
+        ;; Fix-me: there were some problems getting point correctly. Don't know why...
+        (with-selected-window window
+          (with-current-buffer (window-buffer window)
+            (goto-char point))
+          (set-window-point window point)
+          ;;(unless (buffer-live-p buffer) (setq point 1) (setq start 1))
+          (set-window-start window start)
+          ;; Maybe point got off screen?
+          (when (/= point (window-point window))
+            (set-window-point window point)))
         window)
     (let* ((ver (car saved-tree))
            (wtree (list (cons window (caddr saved-tree))))
@@ -320,7 +383,7 @@ run."
       (when first-call
         (dolist (subtree (cdddr saved-tree))
           (setq pwin nwin)
-          (message "nwin edges=%s, ver=%s" (window-edges nwin) ver)
+          ;;(message "nwin edges=%s, ver=%s" (window-edges nwin) ver)
           (let ((split-err nil)
                 (window-min-height 1)
                 (window-min-width 1))
@@ -408,6 +471,7 @@ run."
                           (overlay-put newovl key val))))))))))))))
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Window rotating and mirroring
 
 (defun winsav-rotate (mirror transpose)
@@ -447,6 +511,7 @@ quarter clockwise (or counter clockwise with prefix)."
     ))
 
 (defun winsav-transform-edges (edges)
+  "Just rotate the arguments in EDGES to make them fit next function."
   (let ((le (nth 0 edges))
         (te (nth 1 edges))
         (re (nth 2 edges))
@@ -454,6 +519,10 @@ quarter clockwise (or counter clockwise with prefix)."
     (list te le be re)))
 
 (defun winsav-transform-1 (tree mirror transpose)
+  "Mirroring of the window tree TREE.
+MIRROR could be 'mirror-top-bottom or 'mirror-left-right which I
+think explain what it does here.  TRANSPOSE shifts the tree
+between a horisontal and vertical tree."
   (let* ((vertical (nth 0 tree))
          (edges    (nth 1 tree))
          (subtrees (nthcdr 2 tree))
@@ -471,9 +540,9 @@ quarter clockwise (or counter clockwise with prefix)."
     (dolist (subtree subtrees)
       (if (bufferp (car subtree))
           (when transpose
-            (let ((edges    (nth 3 subtree)))
+            (let ((edges    (nth 4 subtree)))
               ;;(winsav-log "subtree 1" subtree)
-              (setcar (nthcdr 3 subtree) (winsav-transform-edges edges))
+              (setcar (nthcdr 4 subtree) (winsav-transform-edges edges))
               ;;(winsav-log "subtree 2" subtree)
               ))
         (winsav-transform-1 subtree mirror transpose)))
@@ -487,14 +556,879 @@ quarter clockwise (or counter clockwise with prefix)."
       )
     ))
 
-;;(global-set-key [f11] 'winsav-rotate)
+(defun winsav-find-file-noselect (filename)
+  "Read file FILENAME into a buffer and return the buffer.
+Like `find-file-noselect', but if file is not find then creates a
+buffer with a message about that."
+  (let ((buf (find-file-noselect filename)))
+    (unless buf
+      (setq buf (generate-new-buffer filename))
+      (with-current-buffer buf
+        (insert "Winsav could not find the file " filename)
+        (set-buffer-modified-p nil)))
+    buf))
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; winsav+.el ends here
+;;; Session saving and restore etc
+
+(defgroup winsav nil
+  "Save frames and windows when you exit Emacs."
+  :group 'frames)
+
+;;;###autoload
+(define-minor-mode winsav-save-mode
+  "Toggle winsav configuration saving mode.
+With numeric ARG, turn winsav saving on if ARG is positive, off
+otherwise.
+
+When this mode is turned on, winsav configurations are saved from
+one session to another.  A winsav configuration consists of
+frames, windows and visible buffers configurations plus
+optionally buffers and files managed by the functions used by
+option `desktop-save-mode'
+
+By default this is integrated with `desktop-save-mode'.  If
+`desktop-save-mode' is on and `winsav-handle-also-desktop' is
+non-nil then save and restore also desktop.
+
+See the command `winsav-switch-config' for more information and
+other possibilities.
+
+Note: If you want to avoid saving when you exit just turn off
+this minor mode.
+
+For information about what is saved and restored and how to save
+and restore additional information see the function
+`winsav-save-configuration'."
+  :global t
+  :group 'winsav)
+
+(defun winsav-save-mode-on ()
+  "Ensable option `winsav-save-mode'.  Provided for use in hooks."
+  (winsav-save-mode 1))
+
+(defun winsav-save-mode-off ()
+  "Disable option `winsav-save-mode'.  Provided for use in hooks."
+  (winsav-save-mode -1))
+
+(defcustom winsav-save 'ask-if-new
+  "Specifies whether the winsav config should be saved when it is killed.
+A winsav config \(winsav frame configuration) is killed when the
+user changes winsav directory or quits Emacs.
+
+Possible values are:
+   t             -- always save.
+   ask           -- always ask.
+   ask-if-new    -- ask if no winsav file exists, otherwise just save.
+   ask-if-exists -- ask if winsav file exists, otherwise don't save.
+   if-exists     -- save if winsav file exists, otherwise don't save.
+   nil           -- never save.
+The winsav config is never saved when the option `winsav-save-mode' is nil.
+The variables `winsav-dirname' and `winsav-base-file-name'
+determine where the winsav config is saved."
+  :type
+  '(choice
+    (const :tag "Always save" t)
+    (const :tag "Always ask" ask)
+    (const :tag "Ask if winsav file is new, else do save" ask-if-new)
+    (const :tag "Ask if winsav file exists, else don't save" ask-if-exists)
+    (const :tag "Save if winsav file exists, else don't" if-exists)
+    (const :tag "Never save" nil))
+  :group 'winsav)
+
+(defcustom winsav-handle-also-desktop t
+  "If this is non-nil then desktop is also saved and restored.
+See option `winsav-save-mode' for more information."
+  :type 'boolean
+  :group 'winsav)
+
+(defcustom winsav-base-file-name
+  (convert-standard-filename ".emacs.winsav")
+  "Base name of file for Emacs winsav, excluding directory part.
+The actual file name will have a system identifier added too."
+  :type 'file
+  :group 'winsav)
+
+(defvar winsav-dirname nil
+  "The directory in which the winsav file should be saved.")
+
+(defun winsav-current-default-dir ()
+  "Current winsav configuration directory."
+  (or winsav-dirname "~/"))
+
+;;(find-file (winsav-full-file-name))
+(defun winsav-full-file-name (&optional dirname)
+  "Return the full name of the winsav session file in DIRNAME.
+DIRNAME omitted or nil means use `~'.
+
+The file name consist of `winsav-base-file-name' with a system
+identifier added.  This will be '-nw' for a terminal and '-' +
+the value of `window-system' otherwise."
+  ;; Fix-me: Different frames in different files? Can multi-tty be handled??
+  (let* ((sys-id (if (not window-system)
+                     "nw"
+                   (format "%s" window-system)))
+         (base-file (concat winsav-base-file-name "-" sys-id)))
+    (expand-file-name base-file (or dirname
+                                    (winsav-current-default-dir)))))
+
+
+
+(defun winsav-serialize (obj)
+  "Return a string with the printed representation of OBJ.
+This should be possible to eval and get a similar object like OBJ
+again."
+  (prin1-to-string obj))
+
+(defcustom winsav-before-save-configuration-hook nil
+  "Hook called before saving frames.
+Hook for writing elisp code at the beginning of a winsav
+configuration file.  When this hook is called the current buffer
+and point is where the code should be written.
+
+This is a normal hook.  For more information see
+`winsav-save-configuration'."
+  :type 'hook
+  :group 'winsav)
+
+(defcustom winsav-after-save-configuration-hook nil
+  "Hook called after saving frames.
+Hook for writing elisp code at the end of a winsav configuration
+file.  When this hook is called the current buffer and point is
+where the code should be written.
+
+This is a normal hook.  For more information see
+`winsav-save-configuration'."
+  :type 'hook
+  :group 'winsav)
+
+(defcustom winsav-after-save-frame-hook nil
+  "Hook called when saving a frame after saving frame data.
+Hook for writing elisp code in a winsav configuration file after
+each frame creation.  When this hook is called code for restoring
+a frame has been written and code that sets
+`winsav-last-loaded-frame' to point to it.  Point is in the
+configuration file buffer right after this.
+
+This is a normal hook.  For more information see
+`winsav-save-configuration'."
+  :type 'hook
+  :group 'winsav)
+
+(defvar winsav-loaded-frames nil)
+(defvar winsav-last-loaded-frame nil)
+
+(defun winsav-restore-frame (frame-params
+                             window-tree-params
+                             use-minibuffer-frame
+                             was-max)
+  "Restore a frame with specified values.
+If this is a minibuffer only frame then just apply the frame
+parameters FRAME-PARAMS.  Otherwise create a new frame using
+FRAME-PARAMS and set up windows and buffers according to
+WINDOW-TREE-PARAMS.  Also, if USE-MINIBUFFER-FRAME let the new
+frame have this minibuffer frame."
+  (let* ((default-minibuffer-frame use-minibuffer-frame)
+         (frame-name (cdr (assoc 'name frame-params)))
+         (minibuffer-val (cdr (assoc 'minibuffer frame-params)))
+         (minibuffer-only (eq 'only minibuffer-val))
+         (mini-frames
+          (delq nil (mapcar (lambda (frm)
+                              (when (eq 'only (frame-parameter frm 'minibuffer))
+                                frm))
+                            (frame-list))))
+         (frame-with-that-name
+          (when (and frame-name minibuffer-only)
+            (catch 'frame
+              (dolist (frame (frame-list))
+                (when (string= frame-name (frame-parameter frame 'name))
+                  (throw 'frame frame))))))
+         ;; If this is a minibuffer only frame then if it is already
+         ;; there under a correct name then do not create it because
+         ;; there might be variables pointing to it; just set the
+         ;; parameters. Perhaps even better: if it is not already
+         ;; there give an error - because it might be impossible to
+         ;; set things up correctly then.
+         (frame-with-that-name-has-mini
+          (when frame-with-that-name
+            (eq 'only
+                (frame-parameter frame-with-that-name 'minibuffer))))
+         (this-mini-frame (when minibuffer-only
+                            (or frame-with-that-name
+                                (and (= 1 (length mini-frames))
+                                     (car mini-frames)))))
+         (create-new
+          (if minibuffer-only
+              (if this-mini-frame ;frame-with-that-name-has-mini
+                  nil
+                (error "Winsav: Can't find minibuffer only frame with name %s"
+                       frame-name))
+            t))
+         (this-frame (if create-new
+                         (make-frame frame-params)
+                       this-mini-frame))
+         (win (frame-first-window this-frame)))
+    ;;(message "create-new=%s, frame-with-that-name=%s" create-new frame-with-that-name)
+    (if create-new
+        (winsav-put-window-tree window-tree-params win)
+      (modify-frame-parameters this-frame frame-params))
+    (setq winsav-last-loaded-frame this-frame)
+    (setq winsav-loaded-frames (cons this-frame winsav-loaded-frames))
+    (when was-max (winsav-set-maximized-size this-frame))))
+
+(defvar winsav-frame-parameters-to-save
+  '(
+    ;;explicit-name
+    ;;name
+    ;;parent-id
+    ;;title
+    alpha
+    auto-lower
+    auto-raise
+    background-color
+    background-mode
+    border-color
+    border-width
+    buffer-predicate
+    cursor-color
+    cursor-type
+    font
+    font-backend
+    foreground-color
+    fullscreen
+    icon-name
+    icon-type
+    icon-left
+    icon-top
+    internal-border-width
+    left-fringe
+    line-spacing
+    menu-bar-lines
+    modeline
+    mouse-color
+    right-fringe
+    screen-gamma
+    scroll-bar-width
+    tool-bar-lines
+    top left width height
+    tty-color-mode ;; ??
+    unsplittable
+    user-position
+    user-size
+    vertical-scroll-bars
+    visibility
+    )
+  "Parameters saved for frames by `winsav-save-configuration'.")
+
+;;(winsav-set-restore-size nil)
+(defun winsav-set-restore-size (frame)
+  (when (fboundp 'w32-send-sys-command)
+    (select-frame-set-input-focus frame)
+    (w32-send-sys-command #xf120)
+    ;; Note: sit-for must be used, not sleep-for. Using the latter
+    ;; prevents the fetching of the new size (for some reason I do not
+    ;; understand).
+    (sit-for 0.5)
+    t))
+
+(defun winsav-set-maximized-size (frame)
+  (when (fboundp 'w32-send-sys-command)
+    (select-frame-set-input-focus frame)
+    (w32-send-sys-command #xf030)
+    t))
+
+(defun winsav-save-frame (frame mb-frm-nr buffer)
+  "Write into current buffer elisp code to recreate frame FRAME.
+If MB-FRM-NR is a number then it is the order number of the frame
+whose minibuffer should be used."
+  (with-current-buffer buffer
+    (let* ((start nil)
+           (end nil)
+           (obj (winsav-get-window-tree frame))
+           (frm-size-now (cons (frame-pixel-height frame)
+                               (frame-pixel-width frame)))
+           (frm-size-rst (when (winsav-set-restore-size frame)
+                           (cons (frame-pixel-height frame)
+                                 (frame-pixel-width frame))))
+           (was-max (and frm-size-rst
+                         (not (equal frm-size-now frm-size-rst))))
+           (frm-par (frame-parameters frame)))
+      (setq frm-par
+            (delq nil
+                  (mapcar (lambda (elt)
+                            (cond
+                             ((memq (car elt) winsav-frame-parameters-to-save)
+                              elt)
+                             ((eq (car elt) 'minibuffer)
+                              (let ((val (cdr elt)))
+                                (if (not (windowp val))
+                                    elt
+                                  (if (eq (window-frame val) frame)
+                                      nil
+                                    (cons 'minibuffer nil)))))))
+                          frm-par)))
+      (insert "(winsav-restore-frame\n'"
+              ;;make-frame-params
+              (winsav-serialize frm-par))
+      ;;window-tree-params
+      (setq start (point))
+      (insert "'" (winsav-serialize obj) "\n")
+      (setq end (copy-marker (point) t))
+      (replace-regexp (rx "#<buffer "
+                          (1+ (not (any ">")))
+                          (1+ ">")) ;; 1+ for indirect buffers ...
+                      "buffer"
+                      nil start end)
+      (replace-regexp (rx "#<window "
+                          (1+ (not (any ">")))
+                          (1+ ">"))
+                      "nil"
+                      nil start end)
+      (goto-char end)
+      ;;use-minibuffer-frame
+      (insert (if mb-frm-nr
+                  (format "(nth %s (reverse winsav-loaded-frames))" mb-frm-nr)
+                "nil")
+              (if was-max " t " " nil ")
+              ")\n\n")
+
+      (insert "    ;; ---- before after-save-frame-hook ----\n")
+      ;; (dolist (fun winsav-after-save-frame-hook)
+      ;;   (funcall fun frame (current-buffer)))
+      (run-hooks winsav-after-save-frame-hook)
+      (insert "    ;; ---- after after-save-frame-hook  ----\n")
+
+      ;;(insert "  )\n\n\n")
+      )))
+
+(defvar winsav-file-version "1"
+  "Version number of winsav file format.
+Written into the winsav file and used at winsav read to provide
+backward compatibility.")
+
+
+;; fix-me: This should be in desktop.el
+(defun winsav-restore-indirect-file-buffer (file name)
+  "Make indirect buffer from file buffer visiting file FILE.
+Give it the name NAME."
+  (let* ((fbuf (find-file-noselect file)))
+    (when fbuf
+      (make-indirect-buffer fbuf name))))
+(defun winsav-save-indirect-buffers ()
+  "Save information about indirect buffers.
+Only file visiting buffers currently.  Clone the base buffers."
+  (dolist (buf (buffer-list))
+    (when (buffer-base-buffer buf)
+      (let* ((base-buf (buffer-base-buffer buf))
+             (file (buffer-file-name base-buf))
+             )
+        (when file
+          (insert "(winsav-restore-indirect-file-buffer \""
+                  file "\" \"" (buffer-name buf) "\")\n"))))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;; TEST ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Fix-me: test
+;; (defun winsav-restore-minibuffer (frame-num frm-num win-num)
+;;   (let* ((frame (nth (1- frame-num) winsav-loaded-frames))
+;;          (mini-frm (nth (1- frm-num) winsav-loaded-frames))
+;;          (mini-win (nth (1- win-num) (reverse (window-list mini-frm))))
+;;          )
+;;     (with-selected-frame frame
+;;       (set-minibuffer-window mini-win))))
+
+(defvar winsav-minibuffer-alist nil)
+(defun winsav-save-minibuffers (sorted-frames)
+  "Save information about minibuffer frames.
+SORTED-FRAMES should be a list of all frames sorted using
+`winsav-frame-sort-predicate'."
+  (setq winsav-minibuffer-alist nil)
+  (dolist (frame sorted-frames)
+    (let* ((num-frames (length sorted-frames))
+           (mini-win (minibuffer-window frame))
+           (mini-frm (window-frame mini-win))
+           (win-num (length
+                     (memq mini-win
+                           (window-list mini-frm t (frame-first-window mini-frm)))))
+           (frm-num (- num-frames (length (memq mini-frm sorted-frames))))
+           (frame-num (- num-frames (length (memq frame sorted-frames))))
+           )
+      (unless (and (eq mini-frm frame)
+                   (= win-num 1))
+        ;; Not the normal minibuffer window
+        ;;(insert (format ";;(winsav-restore-minibuffer %s %s %s)\n"
+        ;;(insert (format "'(%s %s)\n" frame-num frm-num)
+        (setq winsav-minibuffer-alist (cons (list frame-num frm-num) winsav-minibuffer-alist))
+        )))
+  (insert "(setq winsav-minibuffer-alist '"
+          (winsav-serialize winsav-minibuffer-alist)
+          ")\n"))
+
+(defun winsav-restore-dedicated-window (frame-num win-num dedicate-flag)
+  "Set dedicated window flag.
+On frame number FRAME-NUM in `winsav-loaded-frames' set the
+dedicated flag on window number WIN-NUM to DEDICATE-FLAG."
+  (let* ((frame (nth (1- frame-num) winsav-loaded-frames))
+         (win (nth (1- win-num) (reverse (window-list frame t
+                                                      (frame-first-window frame))))))
+    (set-window-dedicated-p win dedicate-flag)))
+
+(defun winsav-save-dedicated-windows (sorted-frames)
+  "Save information about dedicated windows on frames in SORTED-FRAMES.
+Write this to current buffer."
+  (dolist (frame sorted-frames)
+    (dolist (win (window-list frame))
+      (when (window-dedicated-p win)
+        (let ((frame-num (length (memq frame sorted-frames)))
+              (win-num (length
+                        (memq win
+                              (window-list frame t (frame-first-window frame)))))
+              (flag (window-dedicated-p win)))
+          (insert (format "(winsav-restore-dedicated-window %s %s %S)\n" frame-num win-num flag))
+          )))))
+
+(defun winsav-restore-ecb (frame-num layout-ecb)
+  "Restore ECB.
+On frame number FRAME-NUM-ECB in `winsav-loaded-frames' restore
+ECB layout LAYOUT-ECB."
+  (when (boundp 'ecb-minor-mode)
+    (let* ((frame (nth (1- frame-num) winsav-loaded-frames)))
+      (select-frame frame)
+      (unless (string= layout-ecb ecb-layout-name)
+        (setq ecb-layout-name layout-ecb))
+      (ecb-minor-mode 1))))
+
+(defun winsav-save-ecb (frame-ecb layout-ecb sorted-frames)
+  "Save information about ECB layout on frames in SORTED-FRAMES.
+Write this in current buffer."
+  (dolist (frame sorted-frames)
+    (when (eq frame frame-ecb)
+      (let ((frame-num (length (memq frame sorted-frames))))
+        (insert (format "(winsav-restore-ecb %s %S)\n" frame-num layout-ecb))))))
+
+;; (make-frame '((minibuffer)))
+;; (sort (frame-list) 'winsav-frame-sort-predicate)
+(defun winsav-frame-sort-predicate (a b)
+  "Compare frame A and B for sorting.
+Sort in the order frames can be created.  Frames without
+minibuffers will come later."
+  (let* ((a-mbw (minibuffer-window a))
+         (a-mbw-frm (window-frame a-mbw))
+         (b-mbw (minibuffer-window b))
+         (b-mbw-frm (window-frame b-mbw))
+         )
+    ;;(message "a-mbw-frm=%s, b=%s" a-mbw-frm b)
+    ;;(message "b-mbw-frm=%s, a=%s" a-mbw-frm b)
+    (when (or (eq a-mbw-frm b)
+              (not (eq b-mbw-frm b)))
+      ;;(message "a > b")
+      t
+      )))
+
+(defun winsav-can-read-config (config-version)
+  "Return t we can read config file version CONFIG-VERSION."
+  (when (<= config-version 1)
+    t))
+
+(defvar winsav-file-modtime nil)
+
+;; Like desktop-save, fix-me
+(defun winsav-save-configuration (&optional dirname release)
+  "Write elisp code to recreate all frames.
+Write into the file name computed by `winsav-full-file-name'
+given the argument DIRNAME.
+
+The information that is saved for each frame is its size and
+position, the window configuration including buffers and the
+parameters in `winsav-frame-parameters-to-save'.  If you want save
+more information for frames you can do that in the hook
+`winsav-after-save-frame-hook'.
+
+See also the hook variables
+`winsav-before-save-configuration-hook' and
+`winsav-after-save-configuration-hook'.
+
+Fix-me: RELEASE is not implemented."
+  (let ((file (winsav-full-file-name dirname))
+        start
+        end
+        (sorted-frames (sort (frame-list) 'winsav-frame-sort-predicate))
+        (frm-nr 0)
+        frame-ecb
+        layout-ecb
+        )
+    ;; Recreating invisible frames hits Emacs bug 3859
+    (setq sorted-frames
+          (delq nil
+                (mapcar (lambda (f)
+                          (when (frame-parameter f 'visibility) f))
+                        sorted-frames)))
+    (when (and (boundp 'ecb-minor-mode) ecb-minor-mode)
+      (when (frame-live-p ecb-frame)
+        (setq layout-ecb ecb-layout-name)
+        (setq frame-ecb ecb-frame))
+      (ecb-minor-mode -1)
+      (sit-for 0) ;; Fix-me: is this needed?
+      )
+    (with-temp-buffer
+      ;;(erase-buffer)
+      (insert
+       ";; -*- mode: emacs-lisp; coding: utf-8; -*-\n"
+       ";; --------------------------------------------------------------------------\n"
+       ";; Winsav File for Emacs\n"
+       ";; --------------------------------------------------------------------------\n"
+       ";; Created " (current-time-string) "\n"
+       ";; Winsav file format version " winsav-file-version "\n"
+       ";; Emacs version " emacs-version "\n\n"
+       "(if (not (winsav-can-read-config " winsav-file-version "))\n\n"
+       "    (message \"Winsav: Can't read config file with version " winsav-file-version "\")\n")
+      (insert ";; ---- indirect buffers ------------------------\n")
+      (winsav-save-indirect-buffers)
+      ;;(insert ";; ---- special minibuffers ------------------------\n")
+      (winsav-save-minibuffers sorted-frames)
+      (insert "(setq winsav-loaded-frames nil)\n")
+      (insert ";; ---- before winsav-before-save-configuration-hook ------------------------\n")
+      (run-hooks 'winsav-before-save-configuration-hook)
+      (insert ";; ---- after winsav-before-save-configuration-hook  ------------------------\n\n")
+      (dolist (frm sorted-frames)
+        (let ((mb-frm-nr (cadr (assoc frm-nr winsav-minibuffer-alist)))
+              ;;(mb-frm (when mb-frm-nr (nth mb-frm-nr sorted-frames)))
+              )
+          (winsav-save-frame frm mb-frm-nr (current-buffer))
+          (setq frm-nr (1+ frm-nr))))
+      (insert ";; ---- dedicated windows ------------------------\n")
+      (winsav-save-dedicated-windows sorted-frames)
+      (insert ";; ---- ECB --------------------------------------\n")
+      (winsav-save-ecb frame-ecb layout-ecb sorted-frames)
+      (insert "\n\n;; ---- before winsav-after-save-configuration-hook  ------------------------\n")
+      (run-hooks 'winsav-after-save-configuration-hook)
+      (insert ";; ---- after winsav-after-save-configuration-hook   ------------------------\n")
+      (insert "\n)\n")
+      (emacs-lisp-mode)
+      (pp-buffer)
+      (indent-region (point-min) (point-max))
+      ;;(save-buffer 0) ;; No backups
+      ;;(kill-buffer)
+
+      ;;(with-current-buffer (find-file-noselect file)
+      (let ((coding-system-for-write 'utf-8))
+        (write-region (point-min) (point-max) file nil 'nomessage))
+      (setq winsav-file-modtime (nth 5 (file-attributes file)))
+      (setq winsav-dirname (file-name-as-directory (file-name-directory file)))
+      )))
+
+(defvar winsav-current-config-name nil)
+
+;;(winsav-restore-configuration)
+;;(winsav-full-file-name "~")
+;; (defun winsav-restore-winsav-configuration ()
+;;   )
+
+;; Like desktop-read, fix-me
+(defun winsav-restore-configuration (&optional dirname)
+  "Restore frames from file in directory DIRNAME.
+The file was probably written by `winsav-save-configuration'.
+Delete the frames that were used before."
+  ;;(message "winsav-restore-configuration %s" dirname)
+  (let ((old-frames (sort (frame-list) 'winsav-frame-sort-predicate))
+        (conf-file (winsav-full-file-name dirname)))
+    ;;(message "winsav:conf-file=%s" conf-file)
+    (if (or (not conf-file)
+            (not (file-exists-p conf-file)))
+        (progn
+          (message (propertize "Winsav: No default configuration file found"
+                               'face 'secondary-selection))
+          t) ;; Ok
+      (setq debug-on-error t) ;; fix-me
+      (if (file-exists-p conf-file)
+          (progn
+            (load conf-file nil nil t)
+            (setq winsav-file-modtime (nth 5 (file-attributes conf-file)))
+            (setq winsav-dirname (file-name-as-directory (file-name-directory conf-file)))
+            (when (< 0 (length winsav-loaded-frames))
+              (dolist (old (reverse old-frames))
+                (unless (eq 'only (frame-parameter old 'minibuffer))
+                  (delete-frame old)))
+              ;;(winsav-maximize-all-nearly-max-frames)
+              )
+            (message "Winsav: %s frame(s) restored" (length winsav-loaded-frames))
+            t)
+        ;; No winsav file found
+        ;;(winsav-clear)
+        (message "No winsav file: %s" conf-file)
+        nil))))
+
+;; (defcustom winsav-add-to-desktop nil
+;;   "Set this to let desktop save and restore also winsav configurations."
+;;   :type 'boolean
+;;   :set (lambda (sym val)
+;;          (set-default sym val)
+;;          (if value
+;;              (progn
+;;                (add-hook 'desktop-after-read-hook 'winsav-restore-configuration)
+;;                (add-hook 'desktop-save-hook 'winsav-save-configuration))
+;;            (remove-hook 'desktop-after-read-hook 'winsav-restore-configuration)
+;;            (remove-hook 'desktop-save-hook 'winsav-save-configuration)) )
+;;   :group 'winsav)
+
+(defun winsav-restore-configuration-protected (&optional dirname)
+  "Like `winsav-restore-configuration' but protect for errors.
+DIRNAME has the same meaning."
+  (condition-case err
+      (winsav-restore-configuration dirname)
+    (error
+     (message "winsav-restore-configuration: %s" err))))
+
+(defun winsav-relative-~-or-full (dirname)
+  (let* ((rel-dir (file-relative-name dirname
+                                      (file-name-directory
+                                       (winsav-full-file-name "~"))))
+         (confname (if (string= ".." (substring rel-dir 0 2))
+                       winsav-dirname
+                     (if (string= rel-dir "./")
+                         "(default)"
+                       (concat "~/" rel-dir)))))
+    confname))
+
+(defun winsav-tell-configuration ()
+  "Tell which winsav configuration that is used."
+  (interactive)
+  (save-match-data ;; runs in timer
+    (let ((confname (if (not winsav-dirname)
+                        "(none)"
+                      (winsav-relative-~-or-full winsav-dirname))))
+      (if t ;;(called-interactively-p)
+          (message (propertize (format "Current winsav config is '%s'" confname)
+                               'face 'secondary-selection))
+        (save-window-excursion
+          (delete-other-windows)
+          (set-window-buffer (selected-window)
+                             (get-buffer-create " *winsav*"))
+          (with-current-buffer (window-buffer)
+            (momentary-string-display
+             (propertize
+              (format "\n\n\n  Current winsav config is '%s'\n\n\n\n" confname)
+              'face 'secondary-selection)
+             (window-start)
+             (kill-buffer))))))))
+
+(defun winsav-tell-configuration-request ()
+  "Start an idle timer to call `winsav-tell-configuration'."
+  (run-with-idle-timer 1 nil 'winsav-tell-configuration))
+
+(defun winsav-nearly-maximized (frame)
+  "Return non-nil if size of frame FRAME is nearly full screen."
+  (let* ((top (frame-parameter frame 'top))
+         (left (frame-parameter frame 'left))
+         (width (frame-pixel-width frame))
+         (height (frame-pixel-height frame))
+         (display-width (display-pixel-width))
+         (display-height (display-pixel-height))
+         (char-height (frame-char-height frame))
+         (height-diff (- display-height height))
+         (terminal-type (framep frame)))
+    ;;(message "w=%s/%s, h=%s/%s, ch=%s, hd=%s" width display-width height display-height char-height height-diff)
+    (cond
+     ((eq 'w32 terminal-type)
+      (and (equal top '(+ -4))
+           (equal left '(+ -4))
+           (= width display-width)
+           (< height-diff (* 4 char-height))
+           )))))
+
+;; (defun winsav-maximize-nearly-maximized (frame)
+;;   "Maximize frame FRAME if size is nearly full screen."
+;;   (when (winsav-nearly-maximized frame)
+;;     (let ((terminal-type (framep frame)))
+;;       (cond
+;;        ((eq 'w32 terminal-type)
+;;         ;;(message "max %s" frame)
+;;         ;;(select-frame-set-input-focus frame)
+;;         (select-frame frame)
+;;         (w32-send-sys-command 61488))))))
+
+;;(winsav-maximize-all-nearly-max-frames)
+;; (defun winsav-maximize-all-nearly-max-frames ()
+;;   "Maximizes all frames whose size is nearly full screen."
+;;   (let ((sel-frm (selected-frame)))
+;;     (dolist (frame (frame-list))
+;;       (winsav-maximize-nearly-maximized frame))
+;;     (run-with-idle-timer 0 nil 'select-frame-set-input-focus sel-frm)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Startup and shut down
+
+;; Run after desktop at startup so that desktop has loaded files and
+;; buffers.
+(defun winsav-after-init ()
+  "Restore frames and windows.
+Run this once after Emacs startup, after desktop in the
+`after-init-hook'."
+  ;; Turn off with --no-deskttop:
+  (unless desktop-save-mode (winsav-save-mode -1))
+  (when winsav-save-mode
+    ;;(run-with-idle-timer 0.1 nil 'winsav-restore-configuration-protected)
+    ;;(message "winsav-after-init")
+    ;;(winsav-restore-configuration-protected)
+    ;; In case of error make sure winsav-save-mode is turned off
+    (setq inhibit-startup-screen t)
+    (winsav-save-mode -1)
+    (winsav-restore-configuration)
+    (winsav-save-mode 1)
+    ))
+
+(add-hook 'after-init-hook 'winsav-after-init t)
+
+(add-hook 'kill-emacs-hook 'winsav-kill)
+;;(remove-hook 'kill-emacs-hook 'winsav-kill)
+
+(defun winsav-kill ()
+  "Save winsav frame configuration.
+Run this before Emacs exits."
+  ;; (when winsav-save-mode
+  ;;   (let ((conf-dir (when winsav-current-config-name
+  ;;                     (winsav-full-config-dir-name winsav-current-config-name))))
+  ;;     (winsav-save-configuration conf-dir))))
+  (when (and winsav-save-mode
+             (let ((exists (file-exists-p (winsav-full-file-name))))
+               (or (eq winsav-save t)
+                   (and exists (memq winsav-save '(ask-if-new if-exists)))
+                   (and
+                    (or (memq winsav-save '(ask ask-if-new))
+                        (and exists (eq winsav-save 'ask-if-exists)))
+                    (y-or-n-p "Save winsav? ")))))
+    (unless winsav-dirname
+      ;; Fix-me: Since this can be a new user of winsav I think the
+      ;; best thing to do here is to encourage the user to save in the
+      ;; default directory since otherwise the winsav file will not be
+      ;; loaded at startup. Desktop does not currently do that however
+      ;; (report that!).
+      (let* ((full-file (winsav-full-file-name))
+             (default-directory (directory-file-name
+                                 (file-name-directory full-file))))
+        (setq winsav-dirname
+              (file-name-as-directory
+               (expand-file-name
+                (read-directory-name "Directory for winsav file: " nil nil t))))))
+    (condition-case err
+	;;(winsav-save winsav-dirname t)
+	(winsav-save-configuration winsav-dirname)
+      (file-error
+       (unless (yes-or-no-p
+                (format "Error while saving winsav config: %s  Save anyway? "
+                        (error-message-string err)))
+	 (signal (car err) (cdr err))))))
+  ;; If we own it, we don't anymore.
+  ;;(when (eq (emacs-pid) (winsav-owner)) (winsav-release-lock))
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Switching configurations
+
+(defun winsav-restore-full-config (dirname)
+  "Restore the winsav configuration in directory DIRNAME.
+If NAME is nil then restore the startup configuration."
+  ;;(desktop-change-dir dirname)
+  (when (and winsav-handle-also-desktop desktop-save-mode)
+    (when (eq (emacs-pid) (desktop-owner)) (desktop-release-lock))
+    (desktop-clear)
+    (desktop-read dirname))
+  (winsav-restore-configuration dirname)
+  ;;(setq winsav-current-config-name name)
+  (winsav-tell-configuration-request))
+
+(defun winsav-full-config-dir-name (name)
+  "Return full directory path where configuration NAME is stored."
+  (let* ((base-dir (concat (winsav-full-file-name) ".d"))
+         (conf-dir (expand-file-name name base-dir)))
+    (setq conf-dir (file-name-as-directory conf-dir))
+    ;;(message "conf-dir=%s" conf-dir)
+    conf-dir))
+
+;;;###autoload
+(defun winsav-save-full-config (dirname)
+  "Saved current winsav configuration in directory DIRNAME.
+Then change to this configuration.
+
+See also `winsav-switch-config'."
+  (unless (file-name-absolute-p dirname)
+    (error "Directory ame must be absolute: %s" dirname))
+  (let* ((conf-dir (or dirname "~"))
+         (old-conf-dir winsav-dirname))
+    (mkdir conf-dir t)
+    (winsav-save-configuration conf-dir)
+    (when (and winsav-handle-also-desktop desktop-save-mode)
+      (desktop-release-lock)
+      (desktop-save conf-dir))
+    ;;(unless (string= winsav-current-config-name name)
+    (unless (string= old-conf-dir conf-dir)
+      ;;(setq winsav-current-config-name name)
+      (winsav-tell-configuration-request))))
+
+;; Fix-me: remove named configurations, use just dir as desktop
+(defun winsav-switch-to-default-config ()
+  "Change to default winsav configuration.
+See also `winsav-switch-config'."
+  (interactive)
+  (winsav-switch-config "~"))
+
+;;;###autoload
+(defun winsav-switch-config (dirname)
+  "Change to winsav configuration in directory DIRNAME.
+If DIRNAME is the current winsav configuration directory then
+offer to save it or restore it from saved values.
+
+Otherwise, before switching offer to save the current winsav
+configuration.  Then finally switch to the new winsav
+configuration, creating it if it does not exist.
+
+If option `desktop-save-mode' is on then buffers and files are also
+restored and saved the same way.
+
+See also option `winsav-save-mode' and command
+`winsav-tell-configuration'."
+  (interactive
+   (list
+    (let ((default-directory (or winsav-dirname default-directory))
+          (base-dir (concat (winsav-full-file-name) ".d"))
+          new-dir)
+      (mkdir base-dir t)
+      (setq new-dir
+            (read-directory-name "Winsav: Switch config directory: "))
+      (when (string= "" new-dir) (setq new-dir nil))
+      (or new-dir
+          "~"))))
+  (setq dirname (file-name-as-directory (expand-file-name dirname)))
+  (catch 'stop
+    (let ((conf-file (expand-file-name winsav-base-file-name dirname))
+          config-exists)
+      (if (file-exists-p conf-file)
+          (setq config-exists t)
+        (unless (y-or-n-p (format "%s was not found.  Create it? " conf-file))
+          (throw 'stop nil)))
+      (if (string= winsav-dirname dirname)
+          (if (y-or-n-p "You are already using this configuration, restore it from saved values? ")
+              (winsav-restore-full-config winsav-dirname)
+            (when (y-or-n-p "You are already using this winsav configuration, save it? ")
+              (winsav-save-full-config winsav-dirname)))
+        (when (y-or-n-p
+               (format "Save current config, %s,\n first before switching to %s? "
+                       (if (and winsav-dirname
+                                (not (string= winsav-dirname
+                                              (file-name-directory (winsav-full-file-name "~")))))
+                           winsav-dirname
+                         "the startup config")
+                       dirname))
+          (winsav-save-full-config winsav-dirname))
+        (if config-exists
+            (winsav-restore-full-config dirname)
+          (winsav-save-full-config dirname))))))
+
+
+
+
+;;; Old things
 
 ;; (defun winsav-log-buffer ()
 ;;   (get-buffer-create "winsav log buffer"))
@@ -518,68 +1452,59 @@ quarter clockwise (or counter clockwise with prefix)."
 ;;     ;;(message "ret=%s" ret)
 ;;     ))
 
-(defun winsav-serialize (obj)
-  (prin1-to-string obj))
+;; (defun winsav-serialize-to-file (obj file)
+;;   (with-current-buffer (find-file-noselect file)
+;;     ;;(erase-buffer)
+;;     (save-restriction
+;;       (widen)
+;;       (goto-char (point-max))
+;;       (insert (winsav-serialize obj)
+;;               "\n"))
+;;     ;;(basic-save-buffer)
+;;     ))
 
-(defun winsav-de-serialize (str)
-  (save-match-data
-    (let ((read-str
-           (replace-regexp-in-string (rx "#<buffer "
-                                         (1+ (not (any ">")))
-                                         ">")
-                                     "buffer"
-                                     str))
-          obj-last
-          obj
-          last)
-      (setq read-str
-            (replace-regexp-in-string (rx "#<window "
-                                          (1+ (not (any ">")))
-                                          ">")
-                                      "nil"
-                                      read-str))
-      (setq obj-last (read-from-string read-str))
-      (setq obj (car obj-last))
-      (setq last (cdr obj-last))
-      ;; Fix me, maby check there are only spaces left (or trim them above...)
-      obj)))
-
-(defun winsav-serialize-to-file (obj file)
-  (with-current-buffer (find-file-noselect file)
-    (erase-buffer)
-    (insert (winsav-serialize obj))
-    (save-buffer)))
-
-(defun winsav-de-serialize-from-file (file)
-  (with-current-buffer (find-file-noselect file)
-    (save-restriction
-      (goto-char (point-min))
-      (winsav-de-serialize (buffer-substring-no-properties (point-min) (point-max))))))
-
-(defun winsav-save-frame-to-file (file frame)
-  (serialize-to-file
-   (winsav-get-window-tree frame)
-   file))
-
-(defun winsav-restore-from-file (file)
-  (winsav-put-window-tree
-   (winsav-de-serialize-from-file file)
-   (selected-window)))
+;;(global-set-key [f11] 'winsav-rotate)
 
-(defun winsav-find-file-noselect (filename)
-  (let ((buf (find-file-noselect filename)))
-    (unless buf
-      (setq buf (generate-new-buffer filename))
-      (with-current-buffer buf
-        (insert "Winsav could not find the file " filename)
-        (set-buffer-modified-p nil)))
-    buf))
+;; (defun winsav-de-serialize-window-tree-from-file (file)
+;;   (with-current-buffer (find-file-noselect file)
+;;     (save-restriction
+;;       (widen)
+;;       (let ((start (point))
+;;             (end nil))
+;;         (forward-list)
+;;         (setq end (point))
+;;         ;;(goto-char (point-min))
+;;         (winsav-de-serialize-window-tree (buffer-substring-no-properties start end))))))
 
-;; (defun test ()
-;;   (let ((obj (list "a" 1 "b" 2)))
-;;     (equal (de-serialize (serialize obj))
-;;            obj)))
+;; (defun winsav-restore-from-file (file)
+;;   (winsav-put-window-tree
+;;    (winsav-de-serialize-window-tree-from-file file)
+;;    (selected-window)))
+
+;; (defun winsav-de-serialize-window-tree (str)
+;;   (save-match-data
+;;     (let ((read-str
+;;            (replace-regexp-in-string (rx "#<buffer "
+;;                                          (1+ (not (any ">")))
+;;                                          ">")
+;;                                      "buffer"
+;;                                      str))
+;;           obj-last
+;;           obj
+;;           last)
+;;       (setq read-str
+;;             (replace-regexp-in-string (rx "#<window "
+;;                                           (1+ (not (any ">")))
+;;                                           ">")
+;;                                       "nil"
+;;                                       read-str))
+;;       (setq obj-last (read-from-string read-str))
+;;       (setq obj (car obj-last))
+;;       (setq last (cdr obj-last))
+;;       ;; Fix me, maby check there are only spaces left (or trim them above...)
+;;       obj)))
 
 (provide 'winsav)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; winsav.el ends here
diff --git a/elpa-to-submit/nxhtml/util/winsize.el b/elpa-to-submit/nxhtml/util/winsize.el
index 2026e12a72..cd21035e79 100644
--- a/elpa-to-submit/nxhtml/util/winsize.el
+++ b/elpa-to-submit/nxhtml/util/winsize.el
@@ -3,7 +3,7 @@
 ;; Author: Lennart Borgman <lennart dot borgman at gmail dot com >
 ;; Maintainer:
 ;; Created: Wed Dec 07 15:35:09 2005
-;; Version: 0.97
+(defconst winsize:version "0.98") ;;Version: 0.97
 ;; Lxast-Updated: Sun Nov 18 02:14:52 2007 (3600 +0100)
 ;; Keywords:
 ;; Compatibility:
@@ -64,10 +64,69 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'windmove))
+(eval-when-compile (require 'winsav nil t))
 
-;;; Keymap, interactive functions etc
+;;; Custom variables
+
+(defcustom winsize-juris-way t
+  ""
+  :type 'boolean
+  :group 'winsize)
+
+(defcustom winsize-autoselect-borders t
+  "Determines how borders are selected by default.
+If nil hever select borders automatically (but keep them on the
+same side while changing window).  If 'when-single select border
+automatically if there is only one possible choice.  If t alwasy
+select borders automatically if they are not selected."
+  :type '(choice (const :tag "Always" t)
+                 (const :tag "When only one possbility" when-single)
+                 (const :tag "Never" nil))
+  :group 'winsize)
+
+(defcustom winsize-mode-line-colors (list t (list "green" "green4"))
+  "Mode line colors used during resizing."
+  :type '(list (boolean :tag "Enable mode line color changes during resizing")
+               (list
+                (color :tag "- Active window mode line color")
+                (color :tag "- Inactive window mode line color")))
+  :group 'winsize)
 
-(require 'winsav nil t)
+(defcustom winsize-mark-selected-window t
+  "Mark selected window if non-nil."
+  :type 'boolean
+  :group 'winsize)
+
+(defcustom winsize-make-mouse-prominent t
+  "Try to make mouse more visible during resizing.
+The mouse is positioned next to the borders that you can move.
+It can however be hard to see if where it is.  Setting this to on
+makes the mouse jump a few times."
+  :type 'boolean
+  :group 'winsize)
+
+(defvar widget-command-prompt-value-history nil
+  "History of input to `widget-function-prompt-value'.")
+
+(define-widget 'command 'restricted-sexp
+  "A Lisp function."
+  :complete-function (lambda ()
+                       (interactive)
+                       (lisp-complete-symbol 'commandp))
+  :prompt-value 'widget-field-prompt-value
+  :prompt-internal 'widget-symbol-prompt-internal
+  :prompt-match 'commandp
+  :prompt-history 'widget-command-prompt-value-history
+  :action 'widget-field-action
+  :match-alternatives '(commandp)
+  :validate (lambda (widget)
+              (unless (commandp (widget-value widget))
+                (widget-put widget :error (format "Invalid command: %S"
+                                                  (widget-value widget)))
+                widget))
+  :value 'ignore
+  :tag "Command")
 
 (defvar winsize-keymap nil
   "Keymap used by `resize-windows'.")
@@ -156,6 +215,97 @@
 
     (setq winsize-keymap map)))
 
+(defcustom winsize-let-me-use '(next-line ;;[(control ?n)]
+                                previous-line ;;[(control ?p)]
+                                forward-char ;;[(control ?f)]
+                                backward-char ;;[(control ?b)]
+                                [(home)]
+                                [(end)]
+                                ;; Fix-me: replace this with something
+                                ;; pulling in help-event-list:
+                                [(f1)]
+                                execute-extended-command
+                                eval-expression)
+  "Key sequences or commands that should not be overriden during resize.
+The purpose is to make it easier to switch windows.  The functions
+`windmove-left' etc depends on the position when chosing the
+window to move to."
+  :type '(repeat
+          (choice
+           ;; Note: key-sequence must be before command here, since
+           ;; the key sequences seems to match command too.
+           key-sequence command))
+  :set (lambda (sym val)
+         (set-default sym val)
+         (winsize-make-keymap val))
+  :group 'winsize)
+
+(defcustom winsize-selected-window-face 'winsize-selected-window-face
+  "Variable holding face for marking selected window.
+This variable may be nil or a face symbol."
+  :type '(choice (const :tag "Do not mark selected window" nil)
+                 face)
+  :group 'winsize)
+
+(defface winsize-selected-window-face
+  '((t (:inherit secondary-selection)))
+  "Face for marking selected window."
+  :group 'winsize)
+
+
+;;; These variables all holds values to be reset when exiting resizing:
+
+(defvar winsize-old-mode-line-bg nil)
+(defvar winsize-old-mode-line-inactive-bg nil)
+(defvar winsize-old-overriding-terminal-local-map nil)
+(defvar winsize-old-overriding-local-map-menu-flag nil)
+(defvar winsize-old-temp-buffer-show-function nil)
+(defvar winsize-old-mouse-avoidance-mode nil
+  "Hold the value of `mouse-avoidance-mode' at resizing start.")
+(defvar winsize-old-view-exit-action nil)
+(make-variable-buffer-local 'winsize-old-view-exit-action)
+
+(defvar winsize-message-end nil
+  "Marker, maybe at end of message buffer.")
+
+(defvar winsize-resizing nil
+  "t during resizing, nil otherwise.")
+
+(defvar winsize-window-config-init nil
+  "Hold window configuration from resizing start.")
+
+(defvar winsize-frame nil
+  "Frame that `resize-windows' is operating on.")
+
+
+;;; Borders
+
+(defvar winsize-window-for-side-hor nil
+  "Window used internally for resizing in vertical direction.")
+
+(defvar winsize-window-for-side-ver nil
+  "Window used internally for resizing in horizontal direction.")
+
+(defvar winsize-border-hor nil
+  "Use internally to remember border choice.
+This is set by `winsize-pre-command' and checked by
+`winsize-post-command', see the latter for more information.
+
+The value should be either nil, 'left or 'right.")
+
+(defvar winsize-border-ver nil
+  "Use internally to remember border choice.
+This is set by `winsize-pre-command' and checked by
+`winsize-post-command', see the latter for more information.
+
+The value should be either nil, 'up or 'down.")
+
+(defvar winsize-window-at-entry nil
+  "Window that was selected when `resize-windows' started.")
+
+
+;;; Keymap, interactive functions etc
+
 (defun winsize-pre-command ()
   "Do this before every command.
 Runs this in `pre-command-hook'.
@@ -187,7 +337,7 @@ can therefore not select the border sides.)
 
 Give the user feedback about selected window and borders.  Also
 give a short help message unless last command gave some message."
-  (unless juris-way
+  (unless winsize-juris-way
     (unless winsize-border-hor
       (winsize-select-initial-border-hor))
     (when winsize-border-hor
@@ -268,12 +418,12 @@ windows.  To make this indication more prominent the text in the
 selected window is marked with the face hold in the variable
 `winsize-selected-window-face'.
 
-The option `juris-way' decides how the borders to move are
-selected. If this option is non-nil then the right or bottom
+The option `winsize-juris-way' decides how the borders to move
+are selected. If this option is non-nil then the right or bottom
 border are the ones that are moved with the arrow keys and the
 opposite border with shift arrow keys.
 
-If `juris-way' is nil then the following apply:
+If `winsize-juris-way' is nil then the following apply:
 
 As you select other borders or move to new a window the mouse
 pointer is moved inside the selected window to show which borders
@@ -420,15 +570,15 @@ Save current keymaps."
   (setq winsize-old-overriding-local-map-menu-flag nil))
 
 
-(defvar winsize-window-config-init nil
-  "Hold window configuration from resizing start.")
-
 (defvar winsize-window-config-help nil
   "Hold window configuration when help is shown.")
 
 (defvar winsize-window-config-init-help nil
   "Hold window configuration from resizing start during help.")
 
+(defvar winsize-help-frame nil
+  "The frame from which help was called.")
+
 (defun winsize-restore-after-help (buffer)
   "Restore window configuration after help.
 Raise frame and reactivate resizing."
@@ -455,9 +605,6 @@ Raise frame and reactivate resizing."
     (resize-windows)
     (setq winsize-window-config-init winsize-window-config-init-help)))
 
-(defvar winsize-help-frame nil
-  "The frame from which help was called.")
-
 (defun winsize-help-mode-hook-function ()
   "Setup temp buffer show function to only run second step.
 The first step, `winsize-temp-buffer-show-function', has already been run."
@@ -616,121 +763,9 @@ For more information see `winsize-to-border-or-window-left'."
   (interactive) (winsize-resize 'down t))
 
 
-;;; Custom variables
-
-(defcustom winsize-autoselect-borders t
-  "Determines how borders are selected by default.
-If nil hever select borders automatically (but keep them on the
-same side while changing window).  If 'when-single select border
-automatically if there is only one possible choice.  If t alwasy
-select borders automatically if they are not selected."
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "When only one possbility" when-single)
-                 (const :tag "Never" nil))
-  :group 'winsize)
-
-(defcustom winsize-mode-line-colors (list t (list "green" "green4"))
-  "Mode line colors used during resizing."
-  :type '(list (boolean :tag "Enable mode line color changes during resizing")
-               (list
-                (color :tag "- Active window mode line color")
-                (color :tag "- Inactive window mode line color")))
-  :group 'winsize)
-
-(defcustom winsize-mark-selected-window t
-  "Mark selected window if non-nil."
-  :type 'boolean
-  :group 'winsize)
-
-(defcustom winsize-make-mouse-prominent t
-  "Try to make mouse more visible during resizing.
-The mouse is positioned next to the borders that you can move.
-It can however be hard to see if where it is.  Setting this to on
-makes the mouse jump a few times."
-  :type 'boolean
-  :group 'winsize)
-
-(defvar widget-command-prompt-value-history nil
-  "History of input to `widget-function-prompt-value'.")
-
-(define-widget 'command 'restricted-sexp
-  "A Lisp function."
-  :complete-function (lambda ()
-                       (interactive)
-                       (lisp-complete-symbol 'commandp))
-  :prompt-value 'widget-field-prompt-value
-  :prompt-internal 'widget-symbol-prompt-internal
-  :prompt-match 'commandp
-  :prompt-history 'widget-command-prompt-value-history
-  :action 'widget-field-action
-  :match-alternatives '(commandp)
-  :validate (lambda (widget)
-              (unless (commandp (widget-value widget))
-                (widget-put widget :error (format "Invalid command: %S"
-                                                  (widget-value widget)))
-                widget))
-  :value 'ignore
-  :tag "Command")
-
-(defcustom winsize-let-me-use '(next-line ;;[(control ?n)]
-                                previous-line ;;[(control ?p)]
-                                forward-char ;;[(control ?f)]
-                                backward-char ;;[(control ?b)]
-                                [(home)]
-                                [(end)]
-                                ;; Fix-me: replace this with something
-                                ;; pulling in help-event-list:
-                                [(f1)]
-                                execute-extended-command
-                                eval-expression)
-  "Key sequences or commands that should not be overriden during resize.
-The purpose is to make it easier to switch windows.  The functions
-`windmove-left' etc depends on the position when chosing the
-window to move to."
-  :type '(repeat
-          (choice
-           ;; Note: key-sequence must be before command here, since
-           ;; the key sequences seems to match command too.
-           key-sequence command))
-  :set (lambda (sym val)
-         (set-default sym val)
-         (winsize-make-keymap val))
-  :group 'winsize)
-
-(defcustom winsize-selected-window-face 'winsize-selected-window-face
-  "Variable holding face for marking selected window.
-This variable may be nil or a face symbol."
-  :type '(choice (const :tag "Do not mark selected window" nil)
-                 face)
-  :group 'winsize)
-
-(defface winsize-selected-window-face
-  '((t (:inherit secondary-selection)))
-  "Face for marking selected window."
-  :group 'winsize)
-
 ;;; Internals
 
-;; These variables all holds values to be reset when exiting resizing:
-(defvar winsize-old-mode-line-bg nil)
-(defvar winsize-old-mode-line-inactive-bg nil)
-(defvar winsize-old-overriding-terminal-local-map nil)
-(defvar winsize-old-overriding-local-map-menu-flag nil)
-(defvar winsize-old-temp-buffer-show-function nil)
-(defvar winsize-old-mouse-avoidance-mode nil
-  "Hold the value of `mouse-avoidance-mode' at resizing start.")
-(defvar winsize-old-view-exit-action nil)
-(make-variable-buffer-local 'winsize-old-view-exit-action)
-
 
-(defvar winsize-resizing nil
-  "t during resizing, nil otherwise.")
-
-(defvar winsize-window-at-entry nil
-  "Window that was selected when `resize-windows' started.")
-
-(defvar winsize-frame nil
-  "Frame that `resize-windows' is operating on.")
 
 (defun winsize-exit-resizing (put-back-last-event &optional stay)
   "Stop window resizing.
@@ -776,26 +811,6 @@ event on the input queue."
 
 ;;; Borders
 
-(defvar winsize-window-for-side-hor nil
-  "Window used internally for resizing in vertical direction.")
-
-(defvar winsize-window-for-side-ver nil
-  "Window used internally for resizing in horizontal direction.")
-
-(defvar winsize-border-hor nil
-  "Use internally to remember border choice.
-This is set by `winsize-pre-command' and checked by
-`winsize-post-command', see the latter for more information.
-
-The value should be either nil, 'left or 'right.")
-
-(defvar winsize-border-ver nil
-  "Use internally to remember border choice.
-This is set by `winsize-pre-command' and checked by
-`winsize-post-command', see the latter for more information.
-
-The value should be either nil, 'up or 'down.")
-
 (defun winsize-border-used-hor ()
   "Return the border side used for horizontal resizing."
   (let ((hor (when winsize-window-for-side-hor
@@ -821,7 +836,7 @@ border."
                               dir nil (selected-window))))
     (when (window-minibuffer-p window-in-that-dir)
       (setq window-in-that-dir nil))
-    (if juris-way
+    (if winsize-juris-way
         (if (not window-in-that-dir)
             (message "No window in that direction")
           (windmove-do-window-select dir nil))
@@ -844,7 +859,7 @@ border."
 
 (defun winsize-select-initial-border-hor ()
   "Select a default border horizontally."
-  (if juris-way
+  (if winsize-juris-way
       (winsize-set-border 'right t)
     (let ((has-left  (winsize-window-beside (selected-window) 'left))
           (has-right (winsize-window-beside (selected-window) 'right)))
@@ -858,7 +873,7 @@ border."
 
 (defun winsize-select-initial-border-ver ()
   "Select a default border vertically."
-  (if juris-way
+  (if winsize-juris-way
       (winsize-set-border 'up t)
     (let ((has-up  (winsize-window-beside (selected-window) 'up))
           (has-down (winsize-window-beside (selected-window) 'down)))
@@ -903,15 +918,10 @@ The actually setting is done in `post-command-hook'."
             (setq winsize-window-for-side-hor window-for-side)
           (setq winsize-window-for-side-ver window-for-side))))))
 
-(defcustom juris-way t
-  ""
-  :type 'boolean
-  :group 'winsize)
-
 (defun winsize-resize (dir other-side)
   "Choose border to move.  Or if border is chosen move that border.
 Used by `winsize-move-border-left' etc."
-  (when juris-way
+  (when winsize-juris-way
     (let ((bside (if (memq dir '(left right))
                      (if other-side 'left 'right)
                    (if other-side 'up 'down))))
@@ -1014,9 +1024,11 @@ should be one of 'left, 'up, 'right and 'down."
           (when use-colors
             (set-face-attribute 'mode-line-inactive nil :background inactive-color)
             (set-face-attribute 'mode-line nil :background active-color))))
-    (set-face-attribute 'mode-line-inactive nil :background winsize-old-mode-line-inactive-bg)
+    (when winsize-old-mode-line-inactive-bg
+      (set-face-attribute 'mode-line-inactive nil :background winsize-old-mode-line-inactive-bg))
     (setq winsize-old-mode-line-inactive-bg nil)
-    (set-face-attribute 'mode-line nil :background winsize-old-mode-line-bg)
+    (when winsize-old-mode-line-bg
+      (set-face-attribute 'mode-line nil :background winsize-old-mode-line-bg))
     (setq winsize-old-mode-line-bg nil)))
 
 (defvar winsize-short-help-message nil
@@ -1070,7 +1082,7 @@ should be one of 'left, 'up, 'right and 'down."
     (setq winsize-selected-window-overlay nil))
   (when active
     (with-current-buffer (window-buffer (selected-window))
-      (let ((ovl (make-overlay (point-min) (point-max))))
+      (let ((ovl (make-overlay (point-min) (point-max) nil t)))
         (setq winsize-selected-window-overlay ovl)
         (overlay-put ovl 'window (selected-window))
         (overlay-put ovl 'pointer 'arrow)
@@ -1078,9 +1090,6 @@ should be one of 'left, 'up, 'right and 'down."
         (when winsize-selected-window-face
           (overlay-put ovl 'face winsize-selected-window-face))))))
 
-(defvar winsize-message-end nil
-  "Marker, maybe at end of message buffer.")
-
 (defun winsize-message-end ()
   "Return a marker at the end of the message buffer."
   (with-current-buffer (get-buffer-create "*Messages*")
@@ -1088,21 +1097,22 @@ should be one of 'left, 'up, 'right and 'down."
 
 (defvar winsize-move-mouse 1)
 
+(defvar winsize-make-mouse-prominent-timer nil)
+
 (defun winsize-move-mouse ()
   ;;(setq winsize-move-mouse (- winsize-move-mouse))
-  (let* ((fxy (mouse-pixel-position))
-         (f (car fxy))
-         (x (cadr fxy))
-         (y (cddr fxy))
-         (m (mod winsize-move-mouse 2))
-         (d (* (if (= 0 m) 1 -1) 1)))
-    (set-mouse-pixel-position f (+ d x) (+ d y))
-    (when (< 1 winsize-move-mouse)
-      (setq winsize-move-mouse (1- winsize-move-mouse))
-      (setq winsize-make-mouse-prominent-timer
-            (run-with-timer 0.2 nil 'winsize-move-mouse)))))
-
-(defvar winsize-make-mouse-prominent-timer nil)
+  (save-match-data ;; runs in timer
+    (let* ((fxy (mouse-pixel-position))
+           (f (car fxy))
+           (x (cadr fxy))
+           (y (cddr fxy))
+           (m (mod winsize-move-mouse 2))
+           (d (* (if (= 0 m) 1 -1) 1)))
+      (set-mouse-pixel-position f (+ d x) (+ d y))
+      (when (< 1 winsize-move-mouse)
+        (setq winsize-move-mouse (1- winsize-move-mouse))
+        (setq winsize-make-mouse-prominent-timer
+              (run-with-timer 0.2 nil 'winsize-move-mouse))))))
 
 (defun winsize-make-mouse-prominent-f (doit)
   (when (and winsize-make-mouse-prominent-timer
@@ -1117,7 +1127,7 @@ should be one of 'left, 'up, 'right and 'down."
   "Give the user feedback."
   (when winsize-mark-selected-window
     (winsize-mark-selected-window t))
-  (unless juris-way
+  (unless winsize-juris-way
     (let ((move-mouse (not (member this-command
                                    '(mouse-drag-mode-line
                                      mouse-drag-vertical-line
diff --git a/elpa-to-submit/paredit.el b/elpa-to-submit/paredit.el
index d0d4eb18a4..b59754aec2 100644
--- a/elpa-to-submit/paredit.el
+++ b/elpa-to-submit/paredit.el
@@ -1,9 +1,13 @@
 ;;; -*- Mode: Emacs-Lisp; outline-regexp: "\n;;;;+" -*-
 
 ;;;;;; Paredit: Parenthesis-Editing Minor Mode
-;;;;;; Version 21
+;;;;;; Version 22 (beta)
 
-;;; Copyright (c) 2008, Taylor R. Campbell
+;;; NOTE:  THIS IS A BETA VERSION OF PAREDIT.  USE AT YOUR OWN RISK.
+;;; THIS FILE IS SUBJECT TO CHANGE, AND NOT SUITABLE FOR DISTRIBUTION
+;;; BY PACKAGE MANAGERS SUCH AS APT, PKGSRC, MACPORTS, &C.
+
+;;; Copyright (c) 2008, 2009, Taylor R. Campbell
 ;;;
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -34,7 +38,7 @@
 ;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ;;; This file is permanently stored at
-;;;   <http://mumble.net/~campbell/emacs/paredit-21.el>.
+;;;   <http://mumble.net/~campbell/emacs/paredit-22.el>.
 ;;;
 ;;; The currently released version of paredit is available at
 ;;;   <http://mumble.net/~campbell/emacs/paredit.el>.
@@ -174,8 +178,8 @@
 
 ;;; This assumes Unix-style LF line endings.
 
-(defconst paredit-version 21)
-(defconst paredit-beta-p nil)
+(defconst paredit-version 22)
+(defconst paredit-beta-p t)
 
 (eval-and-compile
 
@@ -232,8 +236,14 @@ Signal an error if no clause matches."
 (defvar paredit-mode-map (make-sparse-keymap)
   "Keymap for the paredit minor mode.")
 
+;;;###autoload
 (define-minor-mode paredit-mode
   "Minor mode for pseudo-structurally editing Lisp code.
+With a prefix argument, enable Paredit Mode even if there are
+  imbalanced parentheses in the buffer.
+Paredit behaves badly if parentheses are imbalanced, so exercise
+  caution when forcing Paredit Mode to be enabled, and consider
+  fixing imbalanced parentheses instead.
 \\<paredit-mode-map>"
   :lighter " Paredit"
   ;; If we're enabling paredit-mode, the prefix to this code that
@@ -613,6 +623,11 @@ Deprecated: use `paredit-mode' instead."
 
 ;;;; Delimiter Insertion
 
+(defvar paredit-space-delimiter-chars (list ?w ?_ ?\")
+  "Characters for which a space should be inserted between them
+and a delimiter. Set this to (list ?\\\") as a buffer-local value
+for non-lisp languages.")
+
 (eval-and-compile
   (defun paredit-conc-name (&rest strings)
     (intern (apply 'concat strings)))
@@ -774,9 +789,9 @@ If such a comment exists, delete the comment (including all leading
   ;; close the string), do insert a space.
   (and (not (if endp (eobp) (bobp)))
        (memq (char-syntax (if endp (char-after) (char-before)))
-             (list ?w ?_ ?\"
-                   (let ((matching (matching-paren delimiter)))
-                     (and matching (char-syntax matching)))))))
+             (append paredit-space-delimiter-chars
+                     (list (let ((matching (matching-paren delimiter)))
+                             (and matching (char-syntax matching))))))))
 
 (defun paredit-move-past-close-and-reindent (close)
   (let ((open (paredit-missing-close)))
@@ -979,11 +994,35 @@ If the point is in a string or a comment, fill the paragraph instead,
           (paredit-in-comment-p))
       (fill-paragraph argument)
     (save-excursion
+      (end-of-defun)
       (beginning-of-defun)
       (indent-sexp))))
 
 ;;;; Comment Insertion
 
+;;; This is all a horrible, horrible hack, primarily for GNU Emacs 21,
+;;; in which there is no `comment-or-uncomment-region'.
+
+(autoload 'comment-forward "newcomment")
+(autoload 'comment-normalize-vars "newcomment")
+(autoload 'comment-region "newcomment")
+(autoload 'comment-search-forward "newcomment")
+(autoload 'uncomment-region "newcomment")
+
+(defun paredit-initialize-comment-dwim ()
+  (require 'newcomment)
+  (if (not (fboundp 'comment-or-uncomment-region))
+      (defalias 'comment-or-uncomment-region
+        (lambda (beginning end &optional argument)
+          (interactive "*r\nP")
+          (if (save-excursion (goto-char beginning)
+                              (comment-forward (point-max))
+                              (<= end (point)))
+              (uncomment-region beginning end argument)
+              (comment-region beginning end argument)))))
+  (defalias 'paredit-initialize-comment-dwim 'comment-normalize-vars)
+  (comment-normalize-vars))
+
 (defun paredit-comment-dwim (&optional argument)
   "Call the Lisp comment command you want (Do What I Mean).
 This is like `comment-dwim', but it is specialized for Lisp editing.
@@ -1012,38 +1051,22 @@ At the top level, where indentation is calculated to be at column 0,
              (comment-kill (if (integerp argument) argument nil))
              (comment-indent)))
         (t (paredit-insert-comment))))
-
-;;; This is all a horrible, horrible hack, primarily for GNU Emacs 21,
-;;; in which there is no `comment-or-uncomment-region'.
-
-(defun paredit-initialize-comment-dwim ()
-  (require 'newcomment)
-  (if (not (fboundp 'comment-or-uncomment-region))
-      (defalias 'comment-or-uncomment-region
-        (lambda (beginning end &optional argument)
-         (interactive "*r\nP")
-         (funcall (if (save-excursion (goto-char beginning)
-                                      (comment-forward (point-max))
-                                      (<= end (point)))
-                      'uncomment-region
-                      'comment-region)
-                  beginning end argument))))
-  (defalias 'paredit-initialize-comment-dwim 'comment-normalize-vars)
-  (comment-normalize-vars))
 
 (defun paredit-comment-on-line-p ()
+  "True if there is a comment on the line following point.
+This is expected to be called only in `paredit-comment-dwim'; do not
+  call it elsewhere."
   (save-excursion
     (beginning-of-line)
     (let ((comment-p nil))
       ;; Search forward for a comment beginning.  If there is one, set
       ;; COMMENT-P to true; if not, it will be nil.
-      (while (progn (setq comment-p
-                          (search-forward ";" (point-at-eol)
-                                          ;; t -> no error
-                                          t))
-                    (and comment-p
-                         (or (paredit-in-string-p)
-                             (paredit-in-char-p (1- (point))))))
+      (while (progn
+               (setq comment-p          ;t -> no error
+                     (comment-search-forward (point-at-eol) t))
+               (and comment-p
+                    (or (paredit-in-string-p)
+                        (paredit-in-char-p (1- (point))))))
         (forward-char))
       comment-p)))
 
@@ -1054,35 +1077,28 @@ At the top level, where indentation is calculated to be at column 0,
         (code-before-p
          (save-excursion (paredit-skip-whitespace nil (point-at-bol))
                          (not (bolp)))))
-    (if (and (bolp)
-             ;; We have to use EQ 0 here and not ZEROP because ZEROP
-             ;; signals an error if its argument is non-numeric, but
-             ;; CALCULATE-LISP-INDENT may return nil.
-             (eq (let ((indent (calculate-lisp-indent)))
-                   (if (consp indent)
-                       (car indent)
-                     indent))
-                 0))
-        ;; Top-level comment
-        (progn (if code-after-p (save-excursion (newline)))
-               (insert ";;; "))
-      (if code-after-p
-          ;; Code comment
-          (progn (if code-before-p
-                     ;++ Why NEWLINE-AND-INDENT here and not just
-                     ;++ NEWLINE, or PAREDIT-NEWLINE?
-                     (newline-and-indent))
+    (cond ((and (bolp)
+                (let ((indent
+                       (let ((indent (calculate-lisp-indent)))
+                         (if (consp indent) (car indent) indent))))
+                  (and indent (zerop indent))))
+           ;; Top-level comment
+           (if code-after-p (save-excursion (newline)))
+           (insert ";;; "))
+          ((or code-after-p (not code-before-p))
+           ;; Code comment
+           (if code-before-p (newline))
+           (lisp-indent-line)
+           (insert ";; ")
+           (if code-after-p
+               (save-excursion
+                 (newline)
                  (lisp-indent-line)
-                 (insert ";; ")
-                 ;; Move the following code.  (NEWLINE-AND-INDENT will
-                 ;; delete whitespace after the comment, though, so use
-                 ;; NEWLINE & LISP-INDENT-LINE manually here.)
-                 (save-excursion (newline)
-                                 (lisp-indent-line)))
-          ;; Margin comment
-          (progn (indent-to comment-column
-                            1)          ; 1 -> force one leading space
-                 (insert ?\; ))))))
+                 (indent-sexp))))
+          (t
+           ;; Margin comment
+           (indent-to comment-column 1) ; 1 -> force one leading space
+           (insert ?\; )))))
 
 ;;;; Character Deletion
 
@@ -1456,6 +1472,29 @@ With a numeric prefix argument N, do `kill-line' that many times."
 ;;                              nil nil parse-state)
          )
         (t parse-state)))
+
+(defun paredit-copy-as-kill ()
+  "Save in the kill ring the region that `paredit-kill' would kill."
+  (interactive)
+  (save-excursion
+    (if (paredit-in-char-p)
+        (backward-char 2))
+    (let ((beginning (point))
+          (eol (point-at-eol)))
+      (let ((end-of-list-p (paredit-forward-sexps-to-kill beginning eol)))
+        (if end-of-list-p (progn (up-list) (backward-char)))
+        (copy-region-as-kill beginning
+                             (cond (kill-whole-line
+                                    (or (save-excursion
+                                          (paredit-skip-whitespace t)
+                                          (and (not (eq (char-after) ?\; ))
+                                               (point)))
+                                        (point-at-eol)))
+                                   ((and (not end-of-list-p)
+                                         (eq (point-at-eol) eol))
+                                    eol)
+                                   (t
+                                    (point))))))))
 
 ;;;; Cursor and Screen Movement
 
@@ -1671,25 +1710,33 @@ With a prefix argument N, kill only the following N S-expressions."
 (defun paredit-raise-sexp (&optional n)
   "Raise the following S-expression in a tree, deleting its siblings.
 With a prefix argument N, raise the following N S-expressions.  If N
-  is negative, raise the preceding N S-expressions."
+  is negative, raise the preceding N S-expressions.
+If the point is on an S-expression, such as a string or a symbol, not
+  between them, that S-expression is considered to follow the point."
   (interactive "p")
-  (paredit-lose-if-not-in-sexp 'paredit-raise-sexp)
-  ;; Select the S-expressions we want to raise in a buffer substring.
-  (let* ((bound (save-excursion (forward-sexp n) (point)))
-         (sexps (if (and n (< n 0))
-                    (buffer-substring bound
-                                      (paredit-point-at-sexp-end))
-                    (buffer-substring (paredit-point-at-sexp-start)
-                                      bound))))
-    ;; Move up to the list we're raising those S-expressions out of and
-    ;; delete it.
-    (backward-up-list)
-    (delete-region (point) (save-excursion (forward-sexp) (point)))
-    (save-excursion (insert sexps))     ; Insert & reindent the sexps.
-    (save-excursion (let ((n (abs (or n 1))))
-                      (while (> n 0)
-                        (paredit-forward-and-indent)
-                        (setq n (1- n)))))))
+  (save-excursion
+    (cond ((paredit-in-string-p)
+           (goto-char (car (paredit-string-start+end-points))))
+          ((paredit-in-char-p)
+           (backward-sexp))
+          ((paredit-in-comment-p)
+           (error "No S-expression to raise in comment.")))
+    ;; Select the S-expressions we want to raise in a buffer substring.
+    (let* ((bound (save-excursion (forward-sexp n) (point)))
+           (sexps (if (and n (< n 0))
+                      (buffer-substring bound
+                                        (paredit-point-at-sexp-end))
+                      (buffer-substring (paredit-point-at-sexp-start)
+                                        bound))))
+      ;; Move up to the list we're raising those S-expressions out of and
+      ;; delete it.
+      (backward-up-list)
+      (delete-region (point) (save-excursion (forward-sexp) (point)))
+      (save-excursion (insert sexps))   ; Insert & reindent the sexps.
+      (save-excursion (let ((n (abs (or n 1))))
+                        (while (> n 0)
+                          (paredit-forward-and-indent)
+                          (setq n (1- n))))))))
 
 (defun paredit-convolute-sexp (&optional n)
   "Convolute S-expressions.
@@ -1810,7 +1857,7 @@ If in a string, move the opening double-quote forward by one
 Automatically reindent the newly barfed S-expression with respect to
   its new enclosing form."
   (interactive)
-  (paredit-lose-if-not-in-sexp 'paredit-forward-slurp-sexp)
+  (paredit-lose-if-not-in-sexp 'paredit-forward-barf-sexp)
   (save-excursion
     (up-list)                           ; Up to the end of the list to
     (let ((close (char-before)))        ;   save and delete the closing
@@ -1882,7 +1929,7 @@ If in a string, move the opening double-quote backward by one
 Automatically reindent the barfed S-expression and the form from which
   it was barfed."
   (interactive)
-  (paredit-lose-if-not-in-sexp 'paredit-forward-slurp-sexp)
+  (paredit-lose-if-not-in-sexp 'paredit-backward-barf-sexp)
   (save-excursion
     (backward-up-list)
     (let ((open (char-after)))
diff --git a/init.el b/init.el
index fd399b8910..257392465b 100644
--- a/init.el
+++ b/init.el
@@ -9,6 +9,12 @@
 ;; and brighter; it simply makes everything else vanish."
 ;; -Neal Stephenson, "In the Beginning was the Command Line"
 
+;; Turn off mouse interface early in startup to avoid momentary display
+;; You really don't need these; trust me.
+(if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
+(if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
+(if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
+
 ;; Load path etc.
 
 (setq dotfiles-dir (file-name-directory
@@ -35,16 +41,14 @@
 ;; backport some functionality to Emacs 22 if needed
 (require 'dominating-file)
 
-;; this must be loaded before ELPA since it bundles its own
-;; out-of-date js stuff. TODO: fix it to use ELPA dependencies
-(load "elpa-to-submit/nxhtml/autostart")
-
 ;; Load up ELPA, the package manager
 
 (require 'package)
 (package-initialize)
 (require 'starter-kit-elpa)
 
+(load "elpa-to-submit/nxhtml/autostart")
+
 ;; Load up starter kit customizations
 
 (require 'starter-kit-defuns)
diff --git a/starter-kit-bindings.el b/starter-kit-bindings.el
index 6ca0a37a64..447da92c3a 100644
--- a/starter-kit-bindings.el
+++ b/starter-kit-bindings.el
@@ -2,8 +2,6 @@
 ;;
 ;; Part of the Emacs Starter Kit.
 
-;; TODO: switch to kbd invocations everywhere
-
 ;; You know, like Readline.
 (global-set-key (kbd "C-M-h") 'backward-kill-word)
 
@@ -17,7 +15,7 @@
 (global-set-key (kbd "C-c n") 'cleanup-buffer)
 
 ;; Turn on the menu bar for exploring new modes
-(global-set-key [f1] 'menu-bar-mode)
+(global-set-key (kbd "C-<f10>") 'menu-bar-mode)
 
 ;; Font size
 (define-key global-map (kbd "C-+") 'text-scale-increase)
@@ -36,7 +34,6 @@
 (global-set-key (kbd "C-x M-f") 'ido-find-file-other-window)
 (global-set-key (kbd "C-x C-M-f") 'find-file-in-project)
 (global-set-key (kbd "C-x f") 'recentf-ido-find-file)
-(global-set-key (kbd "C-x C-p") 'find-file-at-point)
 (global-set-key (kbd "C-c y") 'bury-buffer)
 (global-set-key (kbd "C-c r") 'revert-buffer)
 (global-set-key (kbd "M-`") 'file-cache-minibuffer-complete)
@@ -96,5 +93,9 @@
     (let ((case-fold-search isearch-case-fold-search))
       (occur (if isearch-regexp isearch-string (regexp-quote isearch-string))))))
 
+;; Org
+(define-key global-map "\C-cl" 'org-store-link)
+(define-key global-map "\C-ca" 'org-agenda)
+
 (provide 'starter-kit-bindings)
 ;;; starter-kit-bindings.el ends here
\ No newline at end of file
diff --git a/starter-kit-defuns.el b/starter-kit-defuns.el
index c019ee654f..dd0f540a61 100644
--- a/starter-kit-defuns.el
+++ b/starter-kit-defuns.el
@@ -86,6 +86,12 @@ Symbols matching the text at point are put first in the completion list."
 (defun turn-on-whitespace ()
   (whitespace-mode t))
 
+(defun turn-on-paredit ()
+  (paredit-mode t))
+
+(defun turn-off-tool-bar ()
+  (tool-bar-mode -1))
+
 (add-hook 'coding-hook 'local-column-number-mode)
 (add-hook 'coding-hook 'local-comment-auto-fill)
 (add-hook 'coding-hook 'turn-on-hl-line-mode)
@@ -159,10 +165,9 @@ Symbols matching the text at point are put first in the completion list."
         (update-directory-autoloads autoload-dir))))
   (load autoload-file))
 
-;; TODO: fix this
 (defun sudo-edit (&optional arg)
   (interactive "p")
-  (if arg
+  (if (or arg (not buffer-file-name))
       (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: ")))
     (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
 
@@ -197,11 +202,19 @@ Symbols matching the text at point are put first in the completion list."
 
 (defun esk-paredit-nonlisp ()
   "Turn on paredit mode for non-lisps."
-  (set (make-local-variable 'paredit-space-for-delimiter-predicate)
-       (lambda (endp delimiter)
-         (equal (char-syntax (char-before)) ?\")))
+  (set (make-local-variable 'paredit-space-delimiter-chars)
+       (list ?\"))
   (paredit-mode 1))
 
+(defun toggle-fullscreen ()
+  (interactive)
+  ;; TODO: this only works for X. patches welcome for other OSes.
+  (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+                         '(2 "_NET_WM_STATE_MAXIMIZED_VERT" 0))
+  (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+                         '(2 "_NET_WM_STATE_MAXIMIZED_HORZ" 0)))
+
+
 ;; A monkeypatch to cause annotate to ignore whitespace
 (defun vc-git-annotate-command (file buf &optional rev)
   (let ((name (file-relative-name file)))
diff --git a/starter-kit-elpa.el b/starter-kit-elpa.el
index 0fc494f73a..e230802728 100644
--- a/starter-kit-elpa.el
+++ b/starter-kit-elpa.el
@@ -7,8 +7,8 @@
                                    'inf-ruby
                                    'js2-mode
                                    'css-mode
-                                   ;; 'nxml
                                    'gist
+                                   'nxml-mode
                                    'paredit)
   "Libraries that should be installed by default.")
 
diff --git a/starter-kit-js.el b/starter-kit-js.el
index 3bfb4be77a..67f36261e2 100644
--- a/starter-kit-js.el
+++ b/starter-kit-js.el
@@ -2,16 +2,6 @@
 ;;
 ;; Part of the Emacs Starter Kit
 
-(font-lock-add-keywords
- 'espresso-mode `(("\\(function *\\)("
-                   (0 (progn (compose-region (match-beginning 1) (match-end 1)
-                                             "Æ’")
-                             nil)))))
-
-(font-lock-add-keywords 'espresso-mode
-                        '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):"
-                           1 font-lock-warning-face t)))
-
 (autoload 'espresso-mode "espresso" "Start espresso-mode" t)
 (add-to-list 'auto-mode-alist '("\\.js$" . espresso-mode))
 (add-to-list 'auto-mode-alist '("\\.json$" . espresso-mode))
@@ -21,10 +11,19 @@
 (add-hook 'espresso-mode-hook 'idle-highlight)
 (setq espresso-indent-level 2)
 
-;; espresso's insert-and-indent doesn't play nicely with pretty-lambda
 (eval-after-load 'espresso
-  '(progn (define-key espresso-mode-map "{" 'paredit-open-brace)
-          (define-key espresso-mode-map "}" 'paredit-close-brace-and-newline)))
+  '(progn (define-key espresso-mode-map "{" 'paredit-open-curly)
+          (define-key espresso-mode-map "}" 'paredit-close-curly-and-newline)
+          ;; fixes problem with pretty function font-lock
+          (define-key espresso-mode-map (kbd ",") 'self-insert-command)
+          (font-lock-add-keywords 'espresso-mode
+                        '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):"
+                           1 font-lock-warning-face t)))
+          (font-lock-add-keywords
+           'espresso-mode `(("\\(function *\\)("
+                             (0 (progn (compose-region (match-beginning 1)
+                                                       (match-end 1) "Æ’")
+                                       nil)))))))
 
 (provide 'starter-kit-js)
 ;;; starter-kit-js.el ends here
\ No newline at end of file
diff --git a/starter-kit-lisp.el b/starter-kit-lisp.el
index 0368d29d33..4970ad68cb 100644
--- a/starter-kit-lisp.el
+++ b/starter-kit-lisp.el
@@ -8,13 +8,6 @@
 (define-key lisp-mode-shared-map (kbd "C-\\") 'lisp-complete-symbol)
 (define-key lisp-mode-shared-map (kbd "C-c v") 'eval-buffer)
 
-(defun turn-on-paredit ()
-  (paredit-mode +1))
-
-;; (eval-after-load 'paredit
-;;      ;; Not sure why paredit behaves this way with comments; it's annoying
-;;   '(define-key paredit-mode-map (kbd ";")   'self-insert-command))
-
 (defface esk-paren-face
    '((((class color) (background dark))
       (:foreground "grey50"))
@@ -26,10 +19,7 @@
 ;;; Emacs Lisp
 
 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
-(add-hook 'emacs-lisp-mode-hook 'run-coding-hook)
 (add-hook 'emacs-lisp-mode-hook 'esk-remove-elc-on-save)
-(add-hook 'emacs-lisp-mode-hook 'idle-highlight)
-(add-hook 'emacs-lisp-mode-hook 'turn-on-paredit)
 
 (defun esk-remove-elc-on-save ()
   "If you're saving an elisp file, likely the .elc is no longer valid."
@@ -39,80 +29,24 @@
               (if (file-exists-p (concat buffer-file-name "c"))
                   (delete-file (concat buffer-file-name "c"))))))
 
-(font-lock-add-keywords 'emacs-lisp-mode
-			'(("(\\|)" . 'esk-paren-face)))
+(define-key emacs-lisp-mode-map (kbd "M-.") 'find-function-at-point)
 
 ;;; Clojure
 
-(add-hook 'clojure-mode-hook 'run-coding-hook)
-(add-hook 'clojure-mode-hook 'idle-highlight)
-
-(font-lock-add-keywords 'clojure-mode
-                        '(("(\\|)" . 'esk-paren-face)))
-
-(defface esk-clojure-trace-face
-   '((((class color) (background dark))
-      (:foreground "grey50"))
-     (((class color) (background light))
-      (:foreground "grey55")))
-   "Face used to dim parentheses."
-   :group 'starter-kit-faces)
-
-(setq esk-clojure-trace-face 'esk-clojure-trace-face)
-
-;; This will make relevant lines stand out more in stack traces
-(defun sldb-font-lock ()
-  (font-lock-add-keywords nil
-                          '(("[0-9]+: \\(clojure\.\\(core\\|lang\\).*\\)"
-                             1 esk-clojure-trace-face)
-                            ("[0-9]+: \\(java.*\\)"
-                             1 esk-clojure-trace-face)
-                            ("[0-9]+: \\(swank.*\\)"
-                             1 esk-clojure-trace-face)
-                            ("\\[\\([A-Z]+\\)\\]"
-                             1 font-lock-function-name-face))))
-
-(add-hook 'sldb-mode-hook 'sldb-font-lock)
-
-(defun slime-jump-to-trace (&optional on)
-  "Jump to the file/line that the current stack trace line references.
-Only works with files in your project root's src/, not in dependencies."
-  (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (search-forward-regexp "[0-9]: \\([^$(]+\\).*?\\([0-9]*\\))")
-    (let ((line (string-to-number (match-string 2)))
-          (ns-path (split-string (match-string 1) "\\."))
-          (project-root (locate-dominating-file default-directory "src/")))
-      (find-file (format "%s/src/%s.clj" project-root
-                         (mapconcat 'identity ns-path "/")))
-      (goto-line line))))
-
-(eval-after-load 'slime
-  '(progn
-     (defalias 'sldb-toggle-details 'slime-jump-to-trace)
-     (defun sldb-prune-initial-frames (frames)
-       "Show all stack trace lines by default."
-       frames)))
-
 (eval-after-load 'find-file-in-project
   '(add-to-list 'ffip-patterns "*.clj"))
 
-;; You might like this, but it's a bit disorienting at first:
-(add-hook 'clojure-mode-hook 'turn-on-paredit)
-
 (defun clojure-project (path)
   "Setup classpaths for a clojure project and starts a new SLIME session.
-
-Kills existing SLIME session, if any."
+  Kills existing SLIME session, if any."
   (interactive (list
                 (ido-read-directory-name
                  "Project root: "
-                 (locate-dominating-file default-directory "pom.xml"))))
+                 (locate-dominating-file default-directory "src"))))
+  (require 'swank-clojure)
+  (require 'slime)
   (when (get-buffer "*inferior-lisp*")
     (kill-buffer "*inferior-lisp*"))
-  (defvar swank-clojure-extra-vm-args nil)
-  (defvar slime-lisp-implementations nil)
   (add-to-list 'swank-clojure-extra-vm-args
                (format "-Dclojure.compile.path=%s"
                        (expand-file-name "target/classes/" path)))
@@ -128,23 +62,25 @@ Kills existing SLIME session, if any."
         (cons `(clojure ,(swank-clojure-cmd) :init swank-clojure-init)
               (remove-if #'(lambda (x) (eq (car x) 'clojure))
                          slime-lisp-implementations)))
+  (message "Deprecated: use swank-clojure-project from swank-clojure.")
   (save-window-excursion
     (slime)))
 
-;;; Scheme
-
-(add-hook 'scheme-mode-hook 'run-coding-hook)
-(add-hook 'scheme-mode-hook 'idle-highlight)
-(font-lock-add-keywords 'scheme-mode
-			'(("(\\|)" . 'esk-paren-face)))
-
-;;; Common Lisp
-
-(add-hook 'lisp-mode-hook 'run-coding-hook)
-(add-hook 'lisp-mode-hook 'idle-highlight)
-(add-hook 'lisp-mode-hook 'turn-on-paredit)
-(font-lock-add-keywords 'lisp-mode
-			'(("(\\|)" . 'esk-paren-face)))
+;;; Enhance Lisp Modes
+
+(eval-after-load 'paredit
+  '(define-key paredit-mode-map (kbd ";") 'self-insert-command))
+
+(dolist (x '(scheme emacs-lisp lisp clojure))
+  (font-lock-add-keywords
+   (intern (concat (symbol-name x) "-mode"))
+   '(("(\\|)" . 'esk-paren-face)))
+  (add-hook
+   (intern (concat (symbol-name x) "-mode-hook"))
+   (lambda ()
+     (paredit-mode +1)
+     (idle-highlight +1)
+     (run-coding-hook))))
 
 (provide 'starter-kit-lisp)
 ;; starter-kit-lisp.el ends here
\ No newline at end of file
diff --git a/starter-kit-misc.el b/starter-kit-misc.el
index 84b58447f1..3d8547563c 100644
--- a/starter-kit-misc.el
+++ b/starter-kit-misc.el
@@ -5,9 +5,10 @@
 (when window-system
   (setq frame-title-format '(buffer-file-name "%f" ("%b")))
   (tooltip-mode -1)
-  (tool-bar-mode -1)
   (blink-cursor-mode -1))
 
+(add-hook 'before-make-frame-hook 'turn-off-tool-bar)
+
 (mouse-wheel-mode t)
 (set-terminal-coding-system 'utf-8)
 (set-keyboard-coding-system 'utf-8)
@@ -47,9 +48,6 @@
 ;; Enable syntax highlighting for older Emacsen that have it off
 (global-font-lock-mode t)
 
-;; You really don't need this; trust me.
-(menu-bar-mode -1)
-
 ;; Save a list of recent files visited.
 (recentf-mode 1)
 
@@ -62,7 +60,7 @@
   (setq ido-enable-prefix nil
         ido-enable-flex-matching t
         ido-create-new-buffer 'always
-        ido-use-filename-at-point t
+        ido-use-filename-at-point 'guess
         ido-max-prospects 10))
 
 (set-default 'indent-tabs-mode nil)
@@ -117,9 +115,13 @@
      (set-face-foreground 'magit-diff-add "green3")
      (set-face-foreground 'magit-diff-del "red3")))
 
-(eval-after-load 'nxhtml
+(eval-after-load 'mumamo
   '(eval-after-load 'zenburn
-     '(set-face-background 'mumamo-background-chunk-submode "gray22")))
+     '(ignore-errors (set-face-background 'mumamo-background-chunk-submode "gray22"))))
+
+;; make emacs use the clipboard
+(setq x-select-enable-clipboard t)
+(setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
 
 (provide 'starter-kit-misc)
 ;;; starter-kit-misc.el ends here
\ No newline at end of file
diff --git a/starter-kit-ruby.el b/starter-kit-ruby.el
index bf16f9af9a..8f6aef5aec 100644
--- a/starter-kit-ruby.el
+++ b/starter-kit-ruby.el
@@ -81,7 +81,10 @@ exec-to-string command, but it works and seems fast"
                  (when (and buffer-file-name
                             (file-writable-p
                              (file-name-directory buffer-file-name))
-                            (file-writable-p buffer-file-name))
+                            (file-writable-p buffer-file-name)
+                            (not (subsetp
+                                  (list (current-buffer))
+                                  (tramp-list-remote-buffers))))
                    (local-set-key (kbd "C-c d")
                                   'flymake-display-err-menu-for-current-line)
                    (flymake-mode t))))))