aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Khan2016-10-18 09:42:54 +0300
committerEli Zaretskii2016-10-18 09:42:54 +0300
commit0956a3e41eea6a651a40bdbb8f8310a23733a739 (patch)
treeac9d6da58bdaa64695a00fa2e4429772d1dc7e56
parent73d4c86ee1cd8cf991ca5fde224adfbb2d626f4f (diff)
downloademacs-0956a3e41eea6a651a40bdbb8f8310a23733a739.tar.gz
emacs-0956a3e41eea6a651a40bdbb8f8310a23733a739.zip
Support Shift selection in nxml-mode commands
* lisp/nxml/nxml-mode.el (nxml-forward-balanced-item) (nxml-up-element, nxml-backward-up-element, nxml-down-element) (nxml-backward-down-element, nxml-forward-element) (nxml-backward-element, nxml-forward-paragraph) (nxml-backward-paragraph): Use "^p" as the interactive spec, to support shift-selection. Copyright-paperwork-exempt: yes
-rw-r--r--lisp/nxml/nxml-mode.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index cceb75ead63..0b9975f07fc 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1521,7 +1521,7 @@ references and character references. A processing instruction
1521consists of a target and a content string. A comment or a CDATA 1521consists of a target and a content string. A comment or a CDATA
1522section contains a single string. An entity reference contains a 1522section contains a single string. An entity reference contains a
1523single name. A character reference contains a character number." 1523single name. A character reference contains a character number."
1524 (interactive "p") 1524 (interactive "^p")
1525 (or arg (setq arg 1)) 1525 (or arg (setq arg 1))
1526 (cond ((> arg 0) 1526 (cond ((> arg 0)
1527 (while (progn 1527 (while (progn
@@ -1733,7 +1733,7 @@ single name. A character reference contains a character number."
1733 ret)) 1733 ret))
1734 1734
1735(defun nxml-up-element (&optional arg) 1735(defun nxml-up-element (&optional arg)
1736 (interactive "p") 1736 (interactive "^p")
1737 (or arg (setq arg 1)) 1737 (or arg (setq arg 1))
1738 (if (< arg 0) 1738 (if (< arg 0)
1739 (nxml-backward-up-element (- arg)) 1739 (nxml-backward-up-element (- arg))
@@ -1761,7 +1761,7 @@ single name. A character reference contains a character number."
1761 (apply #'error (cddr err)))))) 1761 (apply #'error (cddr err))))))
1762 1762
1763(defun nxml-backward-up-element (&optional arg) 1763(defun nxml-backward-up-element (&optional arg)
1764 (interactive "p") 1764 (interactive "^p")
1765 (or arg (setq arg 1)) 1765 (or arg (setq arg 1))
1766 (if (< arg 0) 1766 (if (< arg 0)
1767 (nxml-up-element (- arg)) 1767 (nxml-up-element (- arg))
@@ -1793,7 +1793,7 @@ single name. A character reference contains a character number."
1793 "Move forward down into the content of an element. 1793 "Move forward down into the content of an element.
1794With ARG, do this that many times. 1794With ARG, do this that many times.
1795Negative ARG means move backward but still down." 1795Negative ARG means move backward but still down."
1796 (interactive "p") 1796 (interactive "^p")
1797 (or arg (setq arg 1)) 1797 (or arg (setq arg 1))
1798 (if (< arg 0) 1798 (if (< arg 0)
1799 (nxml-backward-down-element (- arg)) 1799 (nxml-backward-down-element (- arg))
@@ -1811,7 +1811,7 @@ Negative ARG means move backward but still down."
1811 (setq arg (1- arg))))) 1811 (setq arg (1- arg)))))
1812 1812
1813(defun nxml-backward-down-element (&optional arg) 1813(defun nxml-backward-down-element (&optional arg)
1814 (interactive "p") 1814 (interactive "^p")
1815 (or arg (setq arg 1)) 1815 (or arg (setq arg 1))
1816 (if (< arg 0) 1816 (if (< arg 0)
1817 (nxml-down-element (- arg)) 1817 (nxml-down-element (- arg))
@@ -1839,7 +1839,7 @@ Negative ARG means move backward but still down."
1839 "Move forward over one element. 1839 "Move forward over one element.
1840With ARG, do it that many times. 1840With ARG, do it that many times.
1841Negative ARG means move backward." 1841Negative ARG means move backward."
1842 (interactive "p") 1842 (interactive "^p")
1843 (or arg (setq arg 1)) 1843 (or arg (setq arg 1))
1844 (if (< arg 0) 1844 (if (< arg 0)
1845 (nxml-backward-element (- arg)) 1845 (nxml-backward-element (- arg))
@@ -1858,7 +1858,7 @@ Negative ARG means move backward."
1858 "Move backward over one element. 1858 "Move backward over one element.
1859With ARG, do it that many times. 1859With ARG, do it that many times.
1860Negative ARG means move forward." 1860Negative ARG means move forward."
1861 (interactive "p") 1861 (interactive "^p")
1862 (or arg (setq arg 1)) 1862 (or arg (setq arg 1))
1863 (if (< arg 0) 1863 (if (< arg 0)
1864 (nxml-forward-element (- arg)) 1864 (nxml-forward-element (- arg))
@@ -1893,7 +1893,7 @@ The paragraph marked is the one that contains point or follows point."
1893 (nxml-backward-paragraph)) 1893 (nxml-backward-paragraph))
1894 1894
1895(defun nxml-forward-paragraph (&optional arg) 1895(defun nxml-forward-paragraph (&optional arg)
1896 (interactive "p") 1896 (interactive "^p")
1897 (or arg (setq arg 1)) 1897 (or arg (setq arg 1))
1898 (cond ((< arg 0) 1898 (cond ((< arg 0)
1899 (nxml-backward-paragraph (- arg))) 1899 (nxml-backward-paragraph (- arg)))
@@ -1903,7 +1903,7 @@ The paragraph marked is the one that contains point or follows point."
1903 (> (setq arg (1- arg)) 0)))))) 1903 (> (setq arg (1- arg)) 0))))))
1904 1904
1905(defun nxml-backward-paragraph (&optional arg) 1905(defun nxml-backward-paragraph (&optional arg)
1906 (interactive "p") 1906 (interactive "^p")
1907 (or arg (setq arg 1)) 1907 (or arg (setq arg 1))
1908 (cond ((< arg 0) 1908 (cond ((< arg 0)
1909 (nxml-forward-paragraph (- arg))) 1909 (nxml-forward-paragraph (- arg)))