Commit 20db1522 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

Fix typos.

parent 29291ef1
2011-11-24 Juanma Barranquero <lekktu@gmail.com>
* configure.in (HAVE_XPM): Fix typo.
2011-11-22 Glenn Morris <rgm@gnu.org> 2011-11-22 Glenn Morris <rgm@gnu.org>
* configure.in (EMACSDATA, EMACSDOC): If set, print, since they can * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
......
...@@ -2436,7 +2436,7 @@ no_return_alloc_pixels ...@@ -2436,7 +2436,7 @@ no_return_alloc_pixels
fi fi
if test "${HAVE_XPM}" = "yes"; then if test "${HAVE_XPM}" = "yes"; then
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).]) AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
LIBXPM=-lXpm LIBXPM=-lXpm
fi fi
fi fi
......
2011-11-24 Juanma Barranquero <lekktu@gmail.com>
* display.texi (Font Lock): Fix typo.
2011-11-24 Glenn Morris <rgm@gnu.org> 2011-11-24 Glenn Morris <rgm@gnu.org>
* rmail.texi (Rmail Output): * rmail.texi (Rmail Output):
......
...@@ -762,7 +762,7 @@ relies on analysis of the syntactic structure of the buffer text. For ...@@ -762,7 +762,7 @@ relies on analysis of the syntactic structure of the buffer text. For
the sake of speed, some modes, including Lisp mode, rely on a special the sake of speed, some modes, including Lisp mode, rely on a special
convention: an open-parenthesis or open-brace in the leftmost column convention: an open-parenthesis or open-brace in the leftmost column
always defines the beginning of a defun, and is thus always outside always defines the beginning of a defun, and is thus always outside
any string or comment. Therefore, you should avoid placing a an any string or comment. Therefore, you should avoid placing an
open-parenthesis or open-brace in the leftmost column, if it is inside open-parenthesis or open-brace in the leftmost column, if it is inside
a string or comment. @xref{Left Margin Paren}, for details. a string or comment. @xref{Left Margin Paren}, for details.
......
2011-11-24 Juanma Barranquero <lekktu@gmail.com>
* allout.el (allout-setup, allout-auto-save-temporarily-disabled)
(allout-lead-with-comment-string, allout-structure-deleted-hook)
(allout-mode, allout-chart-subtree, allout-hotspot-key-handler)
(allout-rebullet-heading, allout-open-sibtopic)
(allout-toggle-current-subtree-encryption)
(allout-toggle-subtree-encryption, allout-encrypt-string)
(allout-next-topic-pending-encryption, allout-adjust-file-variable)
(allout-distinctive-bullets-string, allout-auto-activation):
* window.el (window-normalize-buffer-to-display):
* progmodes/verilog-mode.el (verilog-batch-indent):
* textmodes/bibtex.el (bibtex-field-braces-opt)
(bibtex-field-strings-opt):
* vc/cvs-status.el (cvs-tree-merge):
Fix typos.
2011-11-23 Michael Albinus <michael.albinus@gmx.de> 2011-11-23 Michael Albinus <michael.albinus@gmx.de>
* rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind
......
...@@ -11362,7 +11362,7 @@ ...@@ -11362,7 +11362,7 @@
* blackbox.el (bb-init-board): Use (random 8) to get # in [0,7]. * blackbox.el (bb-init-board): Use (random 8) to get # in [0,7].
* dissociate.el: Likewise. * dissociate.el: Likewise.
* fill.el (justify-current-line): Likewise. * fill.el (justify-current-line): Likewise.
* flame.el (define-element, psychoanalize-flamer): Likewise. * flame.el (define-element, psychoanalyze-flamer): Likewise.
* yow.el (yow): Likewise. * yow.el (yow): Likewise.
* doctor.el: Use (random N), not (random-range N). * doctor.el: Use (random N), not (random-range N).
(random-range): Function deleted. (random-range): Function deleted.
......
...@@ -2021,7 +2021,7 @@ ...@@ -2021,7 +2021,7 @@
newbuffile out of the loop, in the newbuffile-nd local var. newbuffile out of the loop, in the newbuffile-nd local var.
Use dolist (cosmetic change). Compute the proposed name for the most Use dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item. common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a a list (uniquify-rationalize-file-buffer-names): Used to return a list
of buffer whose name was changed, but that return value was never used. of buffer whose name was changed, but that return value was never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on (uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker. the cached proposed name, does much less consing and is quicker.
......
...@@ -279,7 +279,7 @@ Intended to be used as the `allout-auto-activation' :set function." ...@@ -279,7 +279,7 @@ Intended to be used as the `allout-auto-activation' :set function."
;;;_ > allout-setup () ;;;_ > allout-setup ()
;;;###autoload ;;;###autoload
(defun allout-setup () (defun allout-setup ()
"Do fundamental emacs session for allout auto-activation. "Do fundamental Emacs session for allout auto-activation.
Establishes allout processing as part of visiting a file if Establishes allout processing as part of visiting a file if
`allout-auto-activation' is non-nil, or removes it otherwise. `allout-auto-activation' is non-nil, or removes it otherwise.
...@@ -298,7 +298,7 @@ Control whether and how allout outline mode is automatically ...@@ -298,7 +298,7 @@ Control whether and how allout outline mode is automatically
activated when files are visited with non-nil buffer-specific activated when files are visited with non-nil buffer-specific
file variable `allout-layout'. file variable `allout-layout'.
When allout-auto-activation is \"On\" \(t), allout mode is When allout-auto-activation is \"On\" (t), allout mode is
activated in buffers with non-nil `allout-layout', and the activated in buffers with non-nil `allout-layout', and the
specified layout is applied. specified layout is applied.
...@@ -560,7 +560,7 @@ of this var to take effect." ...@@ -560,7 +560,7 @@ of this var to take effect."
These bullets are distinguish topics with particular character. These bullets are distinguish topics with particular character.
They are not used by default in the topic creation routines, but They are not used by default in the topic creation routines, but
are offered as options when you modify topic creation with a are offered as options when you modify topic creation with a
universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]). universal argument (\\[universal-argument]), or during rebulleting (\\[allout-rebullet-current-heading]).
Distinctive bullets are not cycled when topics are shifted or Distinctive bullets are not cycled when topics are shifted or
otherwise automatically rebulleted, so their marking is otherwise automatically rebulleted, so their marking is
...@@ -844,7 +844,7 @@ such topics are encrypted.)" ...@@ -844,7 +844,7 @@ such topics are encrypted.)"
(defvar allout-auto-save-temporarily-disabled nil (defvar allout-auto-save-temporarily-disabled nil
"True while topic encryption is pending and auto-saving was active. "True while topic encryption is pending and auto-saving was active.
The value of buffer-saved-size at the time of decryption is used, The value of `buffer-saved-size' at the time of decryption is used,
for restoring when all encryptions are established.") for restoring when all encryptions are established.")
(defvar allout-just-did-undo nil (defvar allout-just-did-undo nil
"True just after undo commands, until allout-post-command-business.") "True just after undo commands, until allout-post-command-business.")
...@@ -910,7 +910,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring." ...@@ -910,7 +910,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
(defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL -- see docstring. (defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL -- see docstring.
"Buffer-specific setting for allout layout. "Buffer-specific setting for allout layout.
In buffers where this is non-nil \(and if `allout-auto-activation' In buffers where this is non-nil (and if `allout-auto-activation'
has been customized to enable this behavior), `allout-mode' will be has been customized to enable this behavior), `allout-mode' will be
automatically activated. The layout dictated by the value will be used to automatically activated. The layout dictated by the value will be used to
set the initial exposure when `allout-mode' is activated. set the initial exposure when `allout-mode' is activated.
...@@ -1037,7 +1037,7 @@ suitably economical.") ...@@ -1037,7 +1037,7 @@ suitably economical.")
(defun allout-lead-with-comment-string (&optional header-lead) (defun allout-lead-with-comment-string (&optional header-lead)
"Set the topic-header leading string to specified string. "Set the topic-header leading string to specified string.
Useful when for encapsulating outline structure in programming Useful for encapsulating outline structure in programming
language comments. Returns the leading string." language comments. Returns the leading string."
(interactive "P") (interactive "P")
...@@ -1440,7 +1440,7 @@ Functions on the hook must take two arguments: ...@@ -1440,7 +1440,7 @@ Functions on the hook must take two arguments:
- DEPTH -- integer indicating the depth of the subtree that was deleted. - DEPTH -- integer indicating the depth of the subtree that was deleted.
- REMOVED-FROM -- integer indicating the point where the subtree was removed. - REMOVED-FROM -- integer indicating the point where the subtree was removed.
Some edits that remove or invalidate items may missed by this hook: Some edits that remove or invalidate items may be missed by this hook:
specifically edits that native allout routines do not control. specifically edits that native allout routines do not control.
This hook might be invoked multiple times by a single command.") This hook might be invoked multiple times by a single command.")
...@@ -1472,10 +1472,10 @@ that was affected by the undo. ...@@ -1472,10 +1472,10 @@ that was affected by the undo.
Functions on the hook should not require any arguments.") Functions on the hook should not require any arguments.")
;;;_ = allout-outside-normal-auto-fill-function ;;;_ = allout-outside-normal-auto-fill-function
(defvar allout-outside-normal-auto-fill-function nil (defvar allout-outside-normal-auto-fill-function nil
"Value of normal-auto-fill-function outside of allout mode. "Value of `normal-auto-fill-function' outside of allout mode.
Used by allout-auto-fill to do the mandated normal-auto-fill-function Used by `allout-auto-fill' to do the mandated `normal-auto-fill-function'
wrapped within allout's automatic fill-prefix setting.") wrapped within allout's automatic `fill-prefix' setting.")
(make-variable-buffer-local 'allout-outside-normal-auto-fill-function) (make-variable-buffer-local 'allout-outside-normal-auto-fill-function)
;;;_ = prevent redundant activation by desktop mode: ;;;_ = prevent redundant activation by desktop mode:
(add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil)) (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil))
...@@ -1576,7 +1576,7 @@ message if an error is encountered. The message will serve as a ...@@ -1576,7 +1576,7 @@ message if an error is encountered. The message will serve as a
non-nil return on `write-contents-functions' to prevent saving of non-nil return on `write-contents-functions' to prevent saving of
the buffer while it has decrypted content. the buffer while it has decrypted content.
This behavior depends on emacs versions that implement the This behavior depends on Emacs versions that implement the
`write-contents-functions' hook." `write-contents-functions' hook."
(if (or (not (allout-mode-p)) (if (or (not (allout-mode-p))
...@@ -1627,7 +1627,7 @@ and the place for the cursor after the decryption is done." ...@@ -1627,7 +1627,7 @@ and the place for the cursor after the decryption is done."
) )
;;;_ > allout-called-interactively-p () ;;;_ > allout-called-interactively-p ()
(defmacro allout-called-interactively-p () (defmacro allout-called-interactively-p ()
"A version of called-interactively-p independent of emacs version." "A version of `called-interactively-p' independent of Emacs version."
;; ... to ease maintenance of allout without betraying deprecation. ;; ... to ease maintenance of allout without betraying deprecation.
(if (equal (subr-arity (symbol-function 'called-interactively-p)) (if (equal (subr-arity (symbol-function 'called-interactively-p))
'(0 . 0)) '(0 . 0))
...@@ -1712,7 +1712,7 @@ Allout outline mode is a minor mode that provides extensive ...@@ -1712,7 +1712,7 @@ Allout outline mode is a minor mode that provides extensive
outline oriented formatting and manipulation. It enables outline oriented formatting and manipulation. It enables
structural editing of outlines, as well as navigation and structural editing of outlines, as well as navigation and
exposure. It also is specifically aimed at accommodating exposure. It also is specifically aimed at accommodating
syntax-sensitive text like programming languages. \(For example, syntax-sensitive text like programming languages. (For example,
see the allout code itself, which is organized as an allout see the allout code itself, which is organized as an allout
outline.) outline.)
...@@ -1733,7 +1733,7 @@ Below is a description of the key bindings, and then description ...@@ -1733,7 +1733,7 @@ Below is a description of the key bindings, and then description
of special `allout-mode' features and terminology. See also the of special `allout-mode' features and terminology. See also the
outline menubar additions for quick reference to many of the outline menubar additions for quick reference to many of the
features. Customize `allout-auto-activation' to prepare your features. Customize `allout-auto-activation' to prepare your
emacs session for automatic activation of `allout-mode'. Emacs session for automatic activation of `allout-mode'.
The bindings are those listed in `allout-prefixed-keybindings' The bindings are those listed in `allout-prefixed-keybindings'
and `allout-unprefixed-keybindings'. We recommend customizing and `allout-unprefixed-keybindings'. We recommend customizing
...@@ -1781,7 +1781,7 @@ the HOT-SPOT Operation section. ...@@ -1781,7 +1781,7 @@ the HOT-SPOT Operation section.
\\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for
current topic current topic
\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and \\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and
its' offspring -- distinctive bullets are not changed, others its offspring -- distinctive bullets are not changed, others
are alternated according to nesting depth. are alternated according to nesting depth.
\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -- \\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings --
the offspring are not affected. the offspring are not affected.
...@@ -1791,12 +1791,12 @@ the HOT-SPOT Operation section. ...@@ -1791,12 +1791,12 @@ the HOT-SPOT Operation section.
---------------------------------- ----------------------------------
\\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. \\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring.
\\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring.
\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. \\[allout-kill-line] `allout-kill-line' Kill line, attending to outline structure.
\\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. \\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it.
\\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to \\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to
depth of heading if yanking into bare topic depth of heading if yanking into bare topic
heading (ie, prefix sans text). heading (ie, prefix sans text).
\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank \\[allout-yank-pop] `allout-yank-pop' Is to `allout-yank' as `yank-pop' is to `yank'.
Topic-oriented Encryption: Topic-oriented Encryption:
------------------------- -------------------------
...@@ -1836,7 +1836,7 @@ for a save, it is automatically decrypted for continued editing. ...@@ -1836,7 +1836,7 @@ for a save, it is automatically decrypted for continued editing.
NOTE: A few GnuPG v2 versions improperly preserve incorrect NOTE: A few GnuPG v2 versions improperly preserve incorrect
symmetric decryption keys, preventing entry of the correct key on symmetric decryption keys, preventing entry of the correct key on
subsequent decryption attempts until the cache times-out. That subsequent decryption attempts until the cache times-out. That
can take several minutes. \(Decryption of other entries is not can take several minutes. (Decryption of other entries is not
affected.) Upgrade your EasyPG version, if you can, and you can affected.) Upgrade your EasyPG version, if you can, and you can
deliberately clear your gpg-agent's cache by sending it a '-HUP' deliberately clear your gpg-agent's cache by sending it a '-HUP'
signal. signal.
...@@ -1877,7 +1877,7 @@ hooks, by which independent code can cooperate with allout ...@@ -1877,7 +1877,7 @@ hooks, by which independent code can cooperate with allout
without changes to the allout core. Here are key ones: without changes to the allout core. Here are key ones:
`allout-mode-hook' `allout-mode-hook'
`allout-mode-deactivate-hook' \(deprecated) `allout-mode-deactivate-hook' (deprecated)
`allout-mode-off-hook' `allout-mode-off-hook'
`allout-exposure-change-hook' `allout-exposure-change-hook'
`allout-structure-added-hook' `allout-structure-added-hook'
...@@ -1939,7 +1939,7 @@ PREFIX-LEAD: ...@@ -1939,7 +1939,7 @@ PREFIX-LEAD:
When the PREFIX-LEAD is set to the comment-string of a When the PREFIX-LEAD is set to the comment-string of a
programming language, outline structuring can be embedded in programming language, outline structuring can be embedded in
program code without interfering with processing of the text program code without interfering with processing of the text
(by emacs or the language processor) as program code. This (by Emacs or the language processor) as program code. This
setting happens automatically when allout mode is used in setting happens automatically when allout mode is used in
programming-mode buffers. See `allout-use-mode-specific-leader' programming-mode buffers. See `allout-use-mode-specific-leader'
docstring for more detail. docstring for more detail.
...@@ -1951,7 +1951,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of ...@@ -1951,7 +1951,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
`allout-distinctive-bullets-string'. When creating a TOPIC, `allout-distinctive-bullets-string'. When creating a TOPIC,
plain BULLETs are by default used, according to the DEPTH of the plain BULLETs are by default used, according to the DEPTH of the
TOPIC. Choice among the distinctive BULLETs is offered when you TOPIC. Choice among the distinctive BULLETs is offered when you
provide a universal argugment \(\\[universal-argument]) to the provide a universal argument (\\[universal-argument]) to the
TOPIC creation command, or when explictly rebulleting a TOPIC. The TOPIC creation command, or when explictly rebulleting a TOPIC. The
significance of the various distinctive bullets is purely by significance of the various distinctive bullets is purely by
convention. See the documentation for the above bullet strings for convention. See the documentation for the above bullet strings for
...@@ -2250,7 +2250,7 @@ to return the current prefix." ...@@ -2250,7 +2250,7 @@ to return the current prefix."
allout-recent-prefix-end)) allout-recent-prefix-end))
;;;_ > allout-recent-bullet () ;;;_ > allout-recent-bullet ()
(defmacro allout-recent-bullet () (defmacro allout-recent-bullet ()
"Like allout-recent-prefix, but returns bullet of last encountered prefix. "Like `allout-recent-prefix', but returns bullet of last encountered prefix.
All outline functions which directly do string matches to assess All outline functions which directly do string matches to assess
headings set the variables `allout-recent-prefix-beginning' and headings set the variables `allout-recent-prefix-beginning' and
...@@ -2625,13 +2625,13 @@ The remaining optional args are for internal use by the function. ...@@ -2625,13 +2625,13 @@ The remaining optional args are for internal use by the function.
Point is left at the end of the subtree. Point is left at the end of the subtree.
Charts are used to capture outline structure, so that outline-altering Charts are used to capture outline structure, so that outline-altering
routines need assess the structure only once, and then use the chart routines need to assess the structure only once, and then use the chart
for their elaborate manipulations. for their elaborate manipulations.
The chart entries for the topics are in reverse order, so the The chart entries for the topics are in reverse order, so the
last topic is listed first. The entry for each topic consists of last topic is listed first. The entry for each topic consists of
an integer indicating the point at the beginning of the topic an integer indicating the point at the beginning of the topic
prefix. Charts for offspring consists of a list containing, prefix. Charts for offspring consist of a list containing,
recursively, the charts for the respective subtopics. The chart recursively, the charts for the respective subtopics. The chart
for a topics' offspring precedes the entry for the topic itself. for a topics' offspring precedes the entry for the topic itself.
...@@ -3186,7 +3186,7 @@ Presumes point is at the start of a topic prefix." ...@@ -3186,7 +3186,7 @@ Presumes point is at the start of a topic prefix."
(if (allout-called-interactively-p) (allout-end-of-prefix))))) (if (allout-called-interactively-p) (allout-end-of-prefix)))))
;;;_ > allout-next-visible-heading (arg) ;;;_ > allout-next-visible-heading (arg)
(defun allout-next-visible-heading (arg) (defun allout-next-visible-heading (arg)
"Move to the next ARG'th visible heading line, backward if arg is negative. "Move to the next ARGth visible heading line, backward if ARG is negative.
Move to buffer limit in indicated direction if headings are exhausted." Move to buffer limit in indicated direction if headings are exhausted."
...@@ -3388,8 +3388,8 @@ return to regular interpretation of self-insert characters." ...@@ -3388,8 +3388,8 @@ return to regular interpretation of self-insert characters."
"Catchall handling of key bindings in hot-spots. "Catchall handling of key bindings in hot-spots.
Translates unmodified keystrokes to corresponding allout commands, when Translates unmodified keystrokes to corresponding allout commands, when
they would qualify if prefixed with the allout-command-prefix, and sets they would qualify if prefixed with the `allout-command-prefix', and sets
this-command accordingly. `this-command' accordingly.
Returns the qualifying command, if any, else nil." Returns the qualifying command, if any, else nil."
(interactive) (interactive)
...@@ -3533,7 +3533,7 @@ the current topics' depth. ...@@ -3533,7 +3533,7 @@ the current topics' depth.
If INSTEAD is: If INSTEAD is:
- nil, then the bullet char for the context is used, per distinction or depth - nil, then the bullet char for the context is used, per distinction or depth
- a \(numeric) character, then character's string representation is used - a (numeric) character, then character's string representation is used
- a string, then the user is asked for bullet with the first char as default - a string, then the user is asked for bullet with the first char as default
- anything else, the user is solicited with bullet char per context as default - anything else, the user is solicited with bullet char per context as default
...@@ -3849,7 +3849,7 @@ Nuances: ...@@ -3849,7 +3849,7 @@ Nuances:
(defun allout-open-subtopic (arg) (defun allout-open-subtopic (arg)
"Open new topic header at deeper level than the current one. "Open new topic header at deeper level than the current one.
Negative universal arg means to open deeper, but place the new topic Negative universal ARG means to open deeper, but place the new topic
prior to the current one." prior to the current one."
(interactive "p") (interactive "p")
(allout-open-topic 1 (> 0 arg) (< 1 arg))) (allout-open-topic 1 (> 0 arg) (< 1 arg)))
...@@ -3857,9 +3857,9 @@ prior to the current one." ...@@ -3857,9 +3857,9 @@ prior to the current one."
(defun allout-open-sibtopic (arg) (defun allout-open-sibtopic (arg)
"Open new topic header at same level as the current one. "Open new topic header at same level as the current one.
Positive universal arg means to use the bullet of the prior sibling. Positive universal ARG means to use the bullet of the prior sibling.
Negative universal arg means to place the new topic prior to the current Negative universal ARG means to place the new topic prior to the current
one." one."
(interactive "p") (interactive "p")
(allout-open-topic 0 (> 0 arg) (not (= 1 arg)))) (allout-open-topic 0 (> 0 arg) (not (= 1 arg))))
...@@ -3867,7 +3867,7 @@ one." ...@@ -3867,7 +3867,7 @@ one."
(defun allout-open-supertopic (arg) (defun allout-open-supertopic (arg)
"Open new topic header at shallower level than the current one. "Open new topic header at shallower level than the current one.
Negative universal arg means to open shallower, but place the new Negative universal ARG means to open shallower, but place the new
topic prior to the current one." topic prior to the current one."
(interactive "p") (interactive "p")
...@@ -3992,7 +3992,7 @@ All args are optional. ...@@ -3992,7 +3992,7 @@ All args are optional.
If INSTEAD is: If INSTEAD is:
- nil, then the bullet char for the context is used, per distinction or depth - nil, then the bullet char for the context is used, per distinction or depth
- a \(numeric) character, then character's string representation is used - a (numeric) character, then character's string representation is used
- a string, then the user is asked for bullet with the first char as default - a string, then the user is asked for bullet with the first char as default
- anything else, the user is solicited with bullet char per context as default - anything else, the user is solicited with bullet char per context as default
...@@ -4033,7 +4033,7 @@ this function." ...@@ -4033,7 +4033,7 @@ this function."
number-control number-control
index))) index)))
;; Is new one is identical to old? ;; Is new one identical to old?
(if (and (= current-depth new-depth) (if (and (= current-depth new-depth)
(string= current-bullet (string= current-bullet
(substring new-prefix (1- (length new-prefix))))) (substring new-prefix (1- (length new-prefix)))))
...@@ -4407,7 +4407,7 @@ subtopics into siblings of the item." ...@@ -4407,7 +4407,7 @@ subtopics into siblings of the item."
(run-hook-with-args 'allout-structure-deleted-hook depth (point)))))) (run-hook-with-args 'allout-structure-deleted-hook depth (point))))))
;;;_ > allout-copy-line-as-kill () ;;;_ > allout-copy-line-as-kill ()
(defun allout-copy-line-as-kill () (defun allout-copy-line-as-kill ()
"Like allout-kill-topic, but save to kill ring instead of deleting." "Like `allout-kill-topic', but save to kill ring instead of deleting."
(interactive) (interactive)
(let ((buffer-read-only t)) (let ((buffer-read-only t))
(condition-case nil (condition-case nil
...@@ -5854,12 +5854,12 @@ With repeat count, copy the exposed portions of entire buffer." ...@@ -5854,12 +5854,12 @@ With repeat count, copy the exposed portions of entire buffer."
(defun allout-toggle-current-subtree-encryption (&optional keymode-cue) (defun allout-toggle-current-subtree-encryption (&optional keymode-cue)
"Encrypt clear or decrypt encoded topic text. "Encrypt clear or decrypt encoded topic text.
Allout uses emacs 'epg' libary to perform encryption. Symmetric Allout uses Emacs 'epg' library to perform encryption. Symmetric
and keypair encryption are supported. All encryption is ascii and keypair encryption are supported. All encryption is ascii
armored. armored.
Entry encryption defaults to symmetric key mode unless keypair Entry encryption defaults to symmetric key mode unless keypair
recipients are associated with the file \(see recipients are associated with the file (see
`epa-file-encrypt-to') or the function is invoked with a `epa-file-encrypt-to') or the function is invoked with a
\(KEYMODE-CUE) universal argument greater than 1. \(KEYMODE-CUE) universal argument greater than 1.
...@@ -5881,7 +5881,7 @@ pending encryption or encrypted. `*' asterisk immediately after ...@@ -5881,7 +5881,7 @@ pending encryption or encrypted. `*' asterisk immediately after
the bullet signals that the body is encrypted, its absence means the bullet signals that the body is encrypted, its absence means
the topic is meant to be encrypted but is not currently. When a the topic is meant to be encrypted but is not currently. When a
file with topics pending encryption is saved, topics pending file with topics pending encryption is saved, topics pending
encryption are encrypted. See allout-encrypt-unencrypted-on-saves encryption are encrypted. See `allout-encrypt-unencrypted-on-saves'
for auto-encryption specifics. for auto-encryption specifics.
\*NOTE WELL* that automatic encryption that happens during saves will \*NOTE WELL* that automatic encryption that happens during saves will
...@@ -5900,7 +5900,7 @@ encrypted. If you want to encrypt the contents of a top-level topic, use ...@@ -5900,7 +5900,7 @@ encrypted. If you want to encrypt the contents of a top-level topic, use
"Encrypt clear text or decrypt encoded topic contents (body and subtopics.) "Encrypt clear text or decrypt encoded topic contents (body and subtopics.)
Entry encryption defaults to symmetric key mode unless keypair Entry encryption defaults to symmetric key mode unless keypair
recipients are associated with the file \(see recipients are associated with the file (see
`epa-file-encrypt-to') or the function is invoked with a `epa-file-encrypt-to') or the function is invoked with a
\(KEYMODE-CUE) universal argument greater than 1. \(KEYMODE-CUE) universal argument greater than 1.
...@@ -5916,7 +5916,7 @@ associated with it. This can be used to deassociate any ...@@ -5916,7 +5916,7 @@ associated with it. This can be used to deassociate any
recipients with the file, by selecting no recipients in the recipients with the file, by selecting no recipients in the
dialog. dialog.
Encryption and decryption uses the emacs epg library. Encryption and decryption uses the Emacs 'epg' library.
Encrypted text will be ascii-armored. Encrypted text will be ascii-armored.
...@@ -6033,7 +6033,7 @@ If DECRYPT is true (default false), then decrypt instead of encrypt. ...@@ -6033,7 +6033,7 @@ If DECRYPT is true (default false), then decrypt instead of encrypt.
ALLOUT-BUFFER identifies the buffer containing the text. ALLOUT-BUFFER identifies the buffer containing the text.
Entry encryption defaults to symmetric key mode unless keypair Entry encryption defaults to symmetric key mode unless keypair
recipients are associated with the file \(see recipients are associated with the file (see
`epa-file-encrypt-to') or the function is invoked with a `epa-file-encrypt-to') or the function is invoked with a
\(KEYMODE-CUE) universal argument greater than 1. \(KEYMODE-CUE) universal argument greater than 1.
...@@ -6057,7 +6057,7 @@ rejections due to matches against ...@@ -6057,7 +6057,7 @@ rejections due to matches against
NOTE: A few GnuPG v2 versions improperly preserve incorrect NOTE: A few GnuPG v2 versions improperly preserve incorrect
symmetric decryption keys, preventing entry of the correct key on symmetric decryption keys, preventing entry of the correct key on
subsequent decryption attempts until the cache times-out. That subsequent decryption attempts until the cache times-out. That
can take several minutes. \(Decryption of other entries is not can take several minutes. (Decryption of other entries is not
affected.) Upgrade your EasyPG version, if you can, and you can affected.) Upgrade your EasyPG version, if you can, and you can
deliberately clear your gpg-agent's cache by sending it a '-HUP' deliberately clear your gpg-agent's cache by sending it a '-HUP'
signal." signal."
...@@ -6196,7 +6196,7 @@ signal." ...@@ -6196,7 +6196,7 @@ signal."
(defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size) (defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size)
"Temporarily prevent auto-saves in this buffer when an item is decrypted. "Temporarily prevent auto-saves in this buffer when an item is decrypted.
WAS-BUFFER-SAVED-SIZE is the value of buffer-saved-size *before* WAS-BUFFER-SAVED-SIZE is the value of `buffer-saved-size' *before*
the decryption." the decryption."
(when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1))) (when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1)))
(setq allout-auto-save-temporarily-disabled was-buffer-saved-size (setq allout-auto-save-temporarily-disabled was-buffer-saved-size
...@@ -6229,8 +6229,8 @@ the decryption." ...@@ -6229,8 +6229,8 @@ the decryption."
"Return the point of the next topic pending encryption, or nil if none. "Return the point of the next topic pending encryption, or nil if none.
Such a topic has the `allout-topic-encryption-bullet' without an Such a topic has the `allout-topic-encryption-bullet' without an
immediately following '*' that would mark the topic as being encrypted. It immediately following '*' that would mark the topic as being encrypted.
must also have content." It must also have content."
(let (done got content-beg) (let (done got content-beg)
(save-match-data (save-match-data
(while (not done) (while (not done)
...@@ -6332,7 +6332,7 @@ save. See `allout-encrypt-unencrypted-on-saves' for more info." ...@@ -6332,7 +6332,7 @@ save. See `allout-encrypt-unencrypted-on-saves' for more info."
"Activate outline mode and establish file var so it is started subsequently. "Activate outline mode and establish file var so it is started subsequently.
See `allout-layout' and customization of `allout-auto-activation' See `allout-layout' and customization of `allout-auto-activation'
for details on preparing emacs for automatic allout activation."