From 3eeb76cf44b0e1dac74cbc2c0155bf16c8ffc16b Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Nov 2023 16:27:11 +0100 Subject: [PATCH] fix rhtml-mode Signed-off-by: Andreas Gerler --- elpa/rhtml-mode-20130422.1311/rhtml-erb.el | 8 ++++---- elpa/rhtml-mode-20130422.1311/rhtml-mode.el | 4 ++-- elpa/rhtml-mode-20130422.1311/rhtml-sgml-hacks.el | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/elpa/rhtml-mode-20130422.1311/rhtml-erb.el b/elpa/rhtml-mode-20130422.1311/rhtml-erb.el index b2328117..4823cf83 100644 --- a/elpa/rhtml-mode-20130422.1311/rhtml-erb.el +++ b/elpa/rhtml-mode-20130422.1311/rhtml-erb.el @@ -100,7 +100,7 @@ I don't think this has any restrictions.") (defun rhtml-erb-delim-type (start-delim) "Return `exec', `out', `comment' or nil dependin on the type of delimeter this is." - (flet ((match? (regex) + (cl-flet ((match? (regex) (eq (string-match regex start-delim) 0))) (cond ((match? rhtml-erb-exec-tag-open-re) 'exec) @@ -241,7 +241,7 @@ If POINT is specified it will be used instead of (POINT)." (throw 'done regions)) ;; erb tag (push (list - (case (char-after (+ tag-start 2)) + (cl-case (char-after (+ tag-start 2)) (?= 'out) (?# 'comment) (t 'exec)) tag-start (point)) regions)))))) @@ -274,7 +274,7 @@ If POINT is specified it will be used instead of (POINT)." ;; erb tag (push (list - (case (char-after (+ tag-start 2)) + (cl-case (char-after (+ tag-start 2)) (?= 'out) (?# 'comment) (t 'exec)) tag-start (point)) regions)))))) @@ -318,4 +318,4 @@ contains an ERB tag." (skip-chars-forward " \t\r\n")) ;; -(provide 'rhtml-erb) \ No newline at end of file +(provide 'rhtml-erb) diff --git a/elpa/rhtml-mode-20130422.1311/rhtml-mode.el b/elpa/rhtml-mode-20130422.1311/rhtml-mode.el index a36ef9ef..2880d213 100644 --- a/elpa/rhtml-mode-20130422.1311/rhtml-mode.el +++ b/elpa/rhtml-mode-20130422.1311/rhtml-mode.el @@ -81,14 +81,14 @@ will have a dash added. If MODE is `auto' or nil then ERb blocks which are followed by a newline will have a dash added while all other blocks will have the dash removed." (interactive "cDashize mode: s) strip, a) add, x) auto (default)") - (let ((real-mode (case mode + (let ((real-mode (cl-case mode ((?s strip) 'strip) ((?a add) 'add)))) (mapc (lambda (i) (let ((end (nth 2 i))) (save-excursion (goto-char (- end 2)) - (case (or real-mode + (cl-case (or real-mode (if (eq (char-after end) ?\n) 'add 'strip)) diff --git a/elpa/rhtml-mode-20130422.1311/rhtml-sgml-hacks.el b/elpa/rhtml-mode-20130422.1311/rhtml-sgml-hacks.el index 77a63a4f..23f0d146 100644 --- a/elpa/rhtml-mode-20130422.1311/rhtml-sgml-hacks.el +++ b/elpa/rhtml-mode-20130422.1311/rhtml-sgml-hacks.el @@ -239,7 +239,7 @@ LCON is the lexical context, if any." (save-excursion (goto-char (cdr lcon)) (looking-at "