aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2008-01-27 01:07:20 +0000
committerRichard M. Stallman2008-01-27 01:07:20 +0000
commitea18b2b19e76217cc97565b4e50a98b4dd8aa196 (patch)
treed4be29573fbbd70066f46b2c55c8e583c2fa0845
parent60c7bbd2ad7f57a88dd0001e6a39e44fb6a4e7c4 (diff)
downloademacs-ea18b2b19e76217cc97565b4e50a98b4dd8aa196.tar.gz
emacs-ea18b2b19e76217cc97565b4e50a98b4dd8aa196.zip
More trivial doc fixes.
Comment change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/allout.el18
2 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e55184caea3..ab60c3e144b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-01-27 Richard Stallman <rms@gnu.org>
2
3 * allout.el: Many doc fixes.
4 (allout-encrypt-string): Fix error message.
5
12008-01-26 Alan Mackenzie <acm@muc.de> 62008-01-26 Alan Mackenzie <acm@muc.de>
2 7
3 * progmodes/cc-vars.el (c-hanging-braces-alist): new element for 8 * progmodes/cc-vars.el (c-hanging-braces-alist): new element for
diff --git a/lisp/allout.el b/lisp/allout.el
index 08c0c4a391f..075a41bdba1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -982,7 +982,7 @@ invoking it directly."
982 nil 982 nil
983 (setq allout-header-prefix leader) 983 (setq allout-header-prefix leader)
984 (if (not allout-old-style-prefixes) 984 (if (not allout-old-style-prefixes)
985 ;; setting allout-primary-bullet makes the top level topics use - 985 ;; setting allout-primary-bullet makes the top level topics use --
986 ;; actually, be -- the special prefix: 986 ;; actually, be -- the special prefix:
987 (setq allout-primary-bullet leader)) 987 (setq allout-primary-bullet leader))
988 allout-header-prefix))) 988 allout-header-prefix)))
@@ -1444,7 +1444,7 @@ substition is used against the regexp matches, a la `replace-match'.")
1444 "Variable for regexps matching plaintext to remove before encryption. 1444 "Variable for regexps matching plaintext to remove before encryption.
1445 1445
1446This is for the sake of redoing encryption in cases where the ciphertext 1446This is for the sake of redoing encryption in cases where the ciphertext
1447incidentally contains strings that would disrupt mode operation - 1447incidentally contains strings that would disrupt mode operation --
1448for example, a line that happens to look like an allout-mode topic prefix. 1448for example, a line that happens to look like an allout-mode topic prefix.
1449 1449
1450Entries must be symbols that are bound to the desired regexp values. 1450Entries must be symbols that are bound to the desired regexp values.
@@ -1637,7 +1637,7 @@ the following two lines in your Emacs init file:
1637 (put 'allout-exposure-category 'invisible 'allout) 1637 (put 'allout-exposure-category 'invisible 'allout)
1638 (put 'allout-exposure-category 'evaporate t) 1638 (put 'allout-exposure-category 'evaporate t)
1639 ;; XXX We use isearch-open-invisible *and* isearch-mode-end-hook. The 1639 ;; XXX We use isearch-open-invisible *and* isearch-mode-end-hook. The
1640 ;; latter would be sufficient, but it seems that a separate behavior - 1640 ;; latter would be sufficient, but it seems that a separate behavior --
1641 ;; the _transient_ opening of invisible text during isearch -- is keyed to 1641 ;; the _transient_ opening of invisible text during isearch -- is keyed to
1642 ;; presence of the isearch-open-invisible property -- even though this 1642 ;; presence of the isearch-open-invisible property -- even though this
1643 ;; property controls the isearch _arrival_ behavior. This is the case at 1643 ;; property controls the isearch _arrival_ behavior. This is the case at
@@ -1734,7 +1734,7 @@ This is described further in the HOT-SPOT Operation section.
1734\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and 1734\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and
1735 its' offspring -- distinctive bullets are not changed, others 1735 its' offspring -- distinctive bullets are not changed, others
1736 are alternated according to nesting depth. 1736 are alternated according to nesting depth.
1737\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings - 1737\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings --
1738 the offspring are not affected. 1738 the offspring are not affected.
1739 With repeat count, revoke numbering. 1739 With repeat count, revoke numbering.
1740 1740
@@ -1940,7 +1940,7 @@ OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
1940 1940
1941 (cond 1941 (cond
1942 1942
1943 ;; Provision for v19.18, 19.19 bug - 1943 ;; Provision for v19.18, 19.19 bug --
1944 ;; Emacs v 19.18, 19.19 file-var code invokes prop-line-designated 1944 ;; Emacs v 19.18, 19.19 file-var code invokes prop-line-designated
1945 ;; modes twice when file is visited. We have to avoid toggling mode 1945 ;; modes twice when file is visited. We have to avoid toggling mode
1946 ;; off on second invocation, so we detect it as best we can, and 1946 ;; off on second invocation, so we detect it as best we can, and
@@ -2480,7 +2480,7 @@ Outermost is first."
2480;;;_ > allout-end-of-current-line () 2480;;;_ > allout-end-of-current-line ()
2481(defun allout-end-of-current-line () 2481(defun allout-end-of-current-line ()
2482 "Move to the end of line, past concealed text if any." 2482 "Move to the end of line, past concealed text if any."
2483 ;; XXX This is for symmetry with `allout-beginning-of-current-line' - 2483 ;; XXX This is for symmetry with `allout-beginning-of-current-line' --
2484 ;; `move-end-of-line' doesn't suffer the same problem as 2484 ;; `move-end-of-line' doesn't suffer the same problem as
2485 ;; `move-beginning-of-line'. 2485 ;; `move-beginning-of-line'.
2486 (let ((inhibit-field-text-motion t)) 2486 (let ((inhibit-field-text-motion t))
@@ -3874,7 +3874,7 @@ Note that refill of indented paragraphs is not done."
3874 old-margin))) 3874 old-margin)))
3875 ;; Text starts left of old margin -- don't adjust: 3875 ;; Text starts left of old margin -- don't adjust:
3876 nil 3876 nil
3877 ;; Text was hanging at or right of old left margin - 3877 ;; Text was hanging at or right of old left margin --
3878 ;; reindent it, preserving its existing indentation 3878 ;; reindent it, preserving its existing indentation
3879 ;; beyond the old margin: 3879 ;; beyond the old margin:
3880 (delete-region old-indent-begin old-indent-end) 3880 (delete-region old-indent-begin old-indent-end)
@@ -6087,7 +6087,7 @@ Returns the resulting string, or nil if the transformation fails."
6087 (if decrypt "de" "en") 6087 (if decrypt "de" "en")
6088 "try again with different passphrase")))) 6088 "try again with different passphrase"))))
6089 6089
6090 ;; encrypt 'keypair: 6090 ;; encrypt `keypair':
6091 ((not decrypt) 6091 ((not decrypt)
6092 6092
6093 (setq status 6093 (setq status
@@ -6100,7 +6100,7 @@ Returns the resulting string, or nil if the transformation fails."
6100 (error (pgg-remove-passphrase-from-cache target-cache-id t) 6100 (error (pgg-remove-passphrase-from-cache target-cache-id t)
6101 (error "encryption failed")))) 6101 (error "encryption failed"))))
6102 6102
6103 ;; decrypt 'keypair: 6103 ;; decrypt `keypair':
6104 (t 6104 (t
6105 6105
6106 (setq status 6106 (setq status