summaryrefslogtreecommitdiff
path: root/lisp/allout.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /lisp/allout.el
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp/allout.el')
-rw-r--r--lisp/allout.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/allout.el b/lisp/allout.el
index d881e1177fa..ca72806b7d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -339,7 +339,7 @@ The types of elements in the layout specification are:
-- positive numbers open to the relative depth indicated by the
number, but do not force already opened subtopics to be closed.
-- 0 means to close topic -- hide all subitems.
- : -- repeat spec -- apply the preceeding element to all siblings at
+ : -- repeat spec -- apply the preceding element to all siblings at
current level, *up to* those siblings that would be covered by specs
following the `:' on the list. Ie, apply to all topics at level but
trailing ones accounted for by trailing specs. (Only the first of
@@ -3125,7 +3125,7 @@ situation."
nil)
;; rationale: if any intervening items were at a lower depth, we
;; would now be on the first offspring at the target depth -- ie,
- ;; the preceeding item (per the search direction) must be at a
+ ;; the preceding item (per the search direction) must be at a
;; lesser depth. that's all we need to check.
(if backward (allout-next-heading) (allout-previous-heading))
(if (< allout-recent-depth target-depth)
@@ -4246,7 +4246,7 @@ With a negative argument, the item is shifted out using
With an argument greater than one, shift-in the item but not its
offspring, making the item into a sibling of its former children,
-and a child of sibling that formerly preceeded it.
+and a child of sibling that formerly preceded it.
You are not allowed to shift the first offspring of a topic
inwards, because that would yield a \"containment
@@ -5364,7 +5364,7 @@ header and body. The elements of that list are:
(goto-char start)
(beginning-of-line)
- ;; Goto initial topic, and register preceeding stuff, if any:
+ ;; Goto initial topic, and register preceding stuff, if any:
(if (> (allout-goto-prefix-doublechecked) start)
;; First topic follows beginning point -- register preliminary stuff:
(setq result