From 8857f4c45ae0892b2c44475c0dc121d38a1f56b8 Mon Sep 17 00:00:00 2001
From: Gerard Vermeulen <gerard.vermeulen@posteo.net>
Date: Sun, 4 Jun 2023 22:22:57 +0200
Subject: [PATCH] Fix `org-my-html-svg-contents' error reporting and clean up

---
 site-lisp/ox-my-html/ox-my-html.el | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/site-lisp/ox-my-html/ox-my-html.el b/site-lisp/ox-my-html/ox-my-html.el
index 8cfbc47..436321a 100644
--- a/site-lisp/ox-my-html/ox-my-html.el
+++ b/site-lisp/ox-my-html/ox-my-html.el
@@ -38,7 +38,6 @@
 
 (require 'cl-lib)
 (require 'ox-html)
-(require 'nxml-mode)
 
 
 ;;; Define Backend
@@ -117,13 +116,13 @@ lists of SVG files to include in and/or to exclude from embedding."
 
 (defun org-my-html-svg-contents (path)
   "Return the SVG contents of the file named PATH."
-  ;; https://emacs.stackexchange.com/a/57433
   (with-temp-buffer
     (insert-file-contents path)
-    (with-syntax-table nxml-mode-syntax-table
-      ;; Barf if contents contains no valid SVG.
-      (while (and (search-forward "<svg")
-                  (nth 8 (syntax-ppss)))))
+    ;; Delete text preceding something starting as an SVG root element.
+    ;; See https://emacs.stackexchange.com/a/57433 the for original code.
+    (let ((case-fold-search t))
+      (unless (search-forward "<svg" nil 'noerror)
+        (user-error "Can't find an SVG root element in file `%s'." path)))
     (delete-region (point-min) (match-beginning 0))
     (buffer-string)))