summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--lisp/org/org-table.el2
-rw-r--r--lisp/org/org.el2
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index a7c2e0dbd66..d1e7af37375 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -562,7 +562,7 @@
dysfunctional routine. This possibly has crept in because of the
broken merges between "maint" and "origin" branches.
(org-odt-begin-table): Don't emit an empty paragraph when a table is
- neither labelled or captioned.
+ neither labeled nor captioned.
(org-odt-init-outfile): Remove reference to an unused variable.
2012-04-01 Viktor Rosenfeld <listuser36@googlemail.com>
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 9018bb4043b..62c24c2e35b 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -2931,7 +2931,7 @@ known that the table will be realigned a little later anyway."
(defun org-table-iterate (&optional arg)
"Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can choose a different value
+The maximum number of iterations is 10, but you can choose a different value
with the prefix ARG."
(interactive "P")
(let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index b7dcc0c3f1a..d238c072341 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -20477,7 +20477,7 @@ beyond the end of the headline."
(t refpos)))))
((org-at-item-p)
;; Being at an item and not looking at an the item means point
- ;; was previously moved to beginning of a visual line, whiche
+ ;; was previously moved to beginning of a visual line, which
;; doesn't contain the item. Therefore, do nothing special,
;; just stay here.
(when (looking-at org-list-full-item-re)