summaryrefslogtreecommitdiff
path: root/lisp/textmodes/rst.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-17 07:50:28 -0800
committerGlenn Morris <rgm@gnu.org>2018-02-17 07:50:28 -0800
commit4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch)
tree6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/textmodes/rst.el
parentcb3863370cbe574810f796726faa39ba0de0a429 (diff)
parente5a29330aae4491fd384bacaff6f453c6434d322 (diff)
downloademacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'lisp/textmodes/rst.el')
-rw-r--r--lisp/textmodes/rst.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index c93e4e474cb..48c01289347 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -631,7 +631,7 @@ After interpretation of ARGS the results are concatenated as for
&aux
(char (rst-Ado--validate-char char-arg))
(-style 'simple)))
- ;; Construct a over-and-under section header.
+ ;; Construct an over-and-under section header.
(:constructor
rst-Ado-new-over-and-under
(char-arg
@@ -696,7 +696,7 @@ Return CHAR if so or signal an error otherwise."
(defun rst-Ado-is-over-and-under (self)
;; testcover: ok.
- "Return non-nil if SELF is a over-and-under section adornment."
+ "Return non-nil if SELF is an over-and-under section adornment."
(cl-check-type self rst-Ado)
(eq (rst-Ado--style self) 'over-and-under))
@@ -834,7 +834,7 @@ Return ADO if so or signal an error otherwise."
(defun rst-Hdr-is-over-and-under (self)
;; testcover: ok.
- "Return non-nil if SELF is a over-and-under section header."
+ "Return non-nil if SELF is an over-and-under section header."
(cl-check-type self rst-Hdr)
(rst-Ado-is-over-and-under (rst-Hdr-ado self)))
@@ -937,7 +937,7 @@ This type is immutable."
(or (null und-beg) (integer-or-marker-p und-beg))
(or (null und-end) (integer-or-marker-p und-end)))
(signal 'args-out-of-range
- '("For a over-and-under section adornment all match pairs must be set."))))))
+ '("For an over-and-under section adornment all match pairs must be set."))))))
match)
(defun rst-Ttl--validate-indent (indent ado)
@@ -1224,7 +1224,7 @@ as well but give an additional message."
;; Makes paragraphs in region as a bullet list.
(rst-define-key map [?\C-c ?\C-l ?\C-b] #'rst-bullet-list-region
[?\C-c ?\C-b])
- ;; Makes paragraphs in region as a enumeration.
+ ;; Makes paragraphs in region an enumeration.
(rst-define-key map [?\C-c ?\C-l ?\C-e] #'rst-enumerate-region
[?\C-c ?\C-e])
;; Converts bullets to an enumeration.
@@ -1529,7 +1529,7 @@ file."
(defcustom rst-default-indent 1
"Number of characters to indent the section title.
This is only used while toggling adornment styles when switching
-from a simple adornment style to a over-and-under adornment
+from a simple adornment style to an over-and-under adornment
style. In addition this is used in cases where the adornments
found in the buffer are to be used but the indentation for
over-and-under adornments is inconsistent across the buffer."