summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-12 08:54:21 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-12 08:54:21 (GMT)
commit9305b41ceb4edf2c6c5ccacd90f497b29a0cc7c6 (patch)
treedf9866e56248eb6f1652ce5a80b727234c462593
parent89147ede728260627cc6093304c3f1a0e3f3c927 (diff)
downloadorg-mode-9305b41ceb4edf2c6c5ccacd90f497b29a0cc7c6.zip
org-mode-9305b41ceb4edf2c6c5ccacd90f497b29a0cc7c6.tar.gz
Backport typo fixes from Emacs revno 115988
-rw-r--r--lisp/org-list.el2
-rw-r--r--lisp/ox.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 69ad4da..d24dad2 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -1223,7 +1223,7 @@ some heuristics to guess the result."
;; When `org-blank-before-new-entry' says so, it is 1.
((eq insert-blank-p t) 1)
;; `plain-list-item' is 'auto. Count blank lines separating
- ;; neighbours items in list.
+ ;; neighbors' items in list.
(t (let ((next-p (org-list-get-next-item item struct prevs)))
(cond
;; Is there a next item?
diff --git a/lisp/ox.el b/lisp/ox.el
index fcf6aab..0102523 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -5093,7 +5093,7 @@ Return the new string."
;;;; Topology
;;
;; Here are various functions to retrieve information about the
-;; neighbourhood of a given element or object. Neighbours of interest
+;; neighborhood of a given element or object. Neighbors of interest
;; are direct parent (`org-export-get-parent'), parent headline
;; (`org-export-get-parent-headline'), first element containing an
;; object, (`org-export-get-parent-element'), parent table