summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-13 12:09:56 +0100
committerBastien Guerry <bzg@altern.org>2013-02-13 12:09:56 +0100
commit718b210009e69bb92dcd1730065b9b848a2b0aa9 (patch)
tree26b8554f348b928cfff8a0c2fff2a38eaa6c7af7
parent784b952818610257a118eb1dd4f84326850d8646 (diff)
downloadorg-mode-718b210009e69bb92dcd1730065b9b848a2b0aa9.tar.gz
Backport typo fixes from Emacs revno 111250 by Paul Eggert.
-rw-r--r--doc/org.texi4
-rw-r--r--lisp/org-element.el2
-rw-r--r--lisp/org.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/org.texi b/doc/org.texi
index a05b6ce..a687fa0 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1427,7 +1427,7 @@ level).
Move subtree down (swap with next subtree of same level).
@orgcmd{M-h,org-mark-element}
Mark the element at point. Hitting repeatedly will mark subsequent elements
-of the one just marked. E.g. hitting @key{M-h} on a paragraph will mark it,
+of the one just marked. E.g., hitting @key{M-h} on a paragraph will mark it,
hitting @key{M-h} immediately again will mark the next one.
@orgcmd{C-c @@,org-mark-subtree}
Mark the subtree at point. Hitting repeatedly will mark subsequent subtrees
@@ -11991,7 +11991,7 @@ resource or resource node which is known to TaskJuggler, such as
@samp{efficiency}, @samp{journalentry}, @samp{rate} for resources or
@samp{account}, @samp{start}, @samp{note}, @samp{duration}, @samp{end},
@samp{journalentry}, @samp{milestone}, @samp{reference}, @samp{responsible},
-@samp{scheduling}, etc for tasks.
+@samp{scheduling}, etc.@: for tasks.
@subsection Dependencies
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 6a0b8ee..5be1477 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3668,7 +3668,7 @@ containing the secondary string. It is used to set correctly
(defun org-element-map (data types fun &optional info first-match no-recursion)
"Map a function on selected elements or objects.
-DATA is an Org buffer parse tree, as returned by, i.e,
+DATA is an Org buffer parse tree, as returned by, i.e.,
`org-element-parse-buffer'. TYPES is a symbol or list of symbols
of elements or objects types (see `org-element-all-elements' and
`org-element-all-objects' for a complete list of types). FUN is
diff --git a/lisp/org.el b/lisp/org.el
index 623c374..24fe451 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -928,7 +928,7 @@ nil, don't do anything special at the beginning of the buffer."
(defcustom org-cycle-level-after-item/entry-creation t
"Non-nil means cycle entry level or item indentation in new empty entries.
-When the cursor is at the end of an empty headline, i.e with only stars
+When the cursor is at the end of an empty headline, i.e., with only stars
and maybe a TODO keyword, TAB will then switch the entry to become a child,
and then all possible ancestor states, before returning to the original state.
This makes data entry extremely fast: M-RET to create a new headline,