@@ 3,7 3,7 @@
;; Copyright (C) 2020 Andreas Nolda
;; Author: Andreas Nolda <andreas@nolda.org>
-;; Version: 1.8
+;; Version: 1.9
;; 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
@@ 231,27 231,27 @@ It takes the same arguments as `comment-
(defun sgml-forward-tag ()
"Move forward in a tag."
- (interactive)
+ (interactive "^")
(unless (looking-at "\"?[/?]?>")
(sgml-with-syntax-table (forward-sexp))))
(defun sgml-forward-pi ()
"Move forward over a processing instruction."
- (interactive)
+ (interactive "^")
(if (looking-back "\\?")
(skip-chars-backward "?"))
(search-forward "?>"))
(defun sgml-forward-comment ()
"Move forward over a comment."
- (interactive)
+ (interactive "^")
(if (looking-back "-+")
(skip-chars-backward "-"))
(search-forward "-->"))
(defun sgml-forward-dwim ()
"Move forward over markup."
- (interactive)
+ (interactive "^")
(sgml-parse-to-here)
(if sgml-markup-type
(cond ((eq sgml-markup-type 'start-tag)
@@ 275,27 275,27 @@ It takes the same arguments as `comment-
(defun sgml-backward-tag ()
"Move backward in a tag."
- (interactive)
+ (interactive "^")
(unless (looking-back "<[/?]?")
(sgml-with-syntax-table (backward-sexp))))
(defun sgml-backward-pi ()
"Move backward over a processing instruction."
- (interactive)
+ (interactive "^")
(if (looking-at "\\?")
(skip-chars-forward "?"))
(search-backward "<?"))
(defun sgml-backward-comment ()
"Move backward over a comment."
- (interactive)
+ (interactive "^")
(if (looking-at "!?-+")
(skip-chars-forward "!-"))
(search-backward "<!--"))
(defun sgml-backward-dwim ()
"Move backward over markup."
- (interactive)
+ (interactive "^")
(sgml-parse-to-here)
(if sgml-markup-type
(cond ((eq sgml-markup-type 'start-tag)
@@ 321,12 321,12 @@ It takes the same arguments as `comment-
(defun sgml-down-current-element ()
"Move down into the current element."
- (interactive)
+ (interactive "^")
(search-forward ">"))
(defun sgml-down-dwim ()
"Move down into markup."
- (interactive)
+ (interactive "^")
(sgml-parse-to-here)
(if (eq sgml-markup-type 'start-tag)
(sgml-down-current-element)
@@ 334,19 334,19 @@ It takes the same arguments as `comment-
(defun sgml-forward-up-pi ()
"Move forward up out of a processing instruction."
- (interactive)
+ (interactive "^")
(skip-chars-backward "?")
(search-forward "?>"))
(defun sgml-forward-up-comment ()
"Move forward up out of a comment."
- (interactive)
+ (interactive "^")
(skip-chars-backward "-")
(search-forward "-->"))
(defun sgml-forward-up-dwim ()
"Move forward up out of markup."
- (interactive)
+ (interactive "^")
(sgml-parse-to-here)
(cond ((eq sgml-markup-type 'pi)
(sgml-forward-up-pi))
@@ 357,19 357,19 @@ It takes the same arguments as `comment-
(defun sgml-backward-up-pi ()
"Move backward up out of a processing instruction."
- (interactive)
+ (interactive "^")
(skip-chars-forward "?")
(search-backward "<?"))
(defun sgml-backward-up-comment ()
"Move backward up out of a comment."
- (interactive)
+ (interactive "^")
(skip-chars-forward "!-")
(search-backward "<!--"))
(defun sgml-backward-up-dwim ()
"Move backward up out of markup."
- (interactive)
+ (interactive "^")
(sgml-parse-to-here)
(cond ((eq sgml-markup-type 'pi)
(sgml-backward-up-pi))