annotate lisp/allout.el @ 75139:685bae49b575

(battery-search-for-one-match-in-files): Fix typo in docstring.
author Juanma Barranquero <lekktu@gmail.com>
date Mon, 08 Jan 2007 23:00:24 +0000
parents 3a115c11d329
children e3694f1cb928 17e0dd217877 bc10a33dd40b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
1 ;;; allout.el --- extensive outline mode for use alone and with other modes
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64474
diff changeset
3 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
69124
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
4 ;; 2005, 2006 Free Software Foundation, Inc.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
7 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
8 ;; Created: Dec 1991 - first release to usenet
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
9 ;; Version: 2.2.1
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
10 ;; Keywords: outlines wp languages
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
11 ;; Website: http://myriadicity.net/Sundry/EmacsAllout
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; This file is part of GNU Emacs.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14
6736
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
15 ;; GNU Emacs is free software; you can redistribute it and/or modify
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
16 ;; it under the terms of the GNU General Public License as published by
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
17 ;; the Free Software Foundation; either version 2, or (at your option)
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
18 ;; any later version.
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19
6736
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
20 ;; GNU Emacs is distributed in the hope that it will be useful,
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
23 ;; GNU General Public License for more details.
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
24
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5310
diff changeset
25 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13964
diff changeset
26 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61969
diff changeset
27 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61969
diff changeset
28 ;; Boston, MA 02110-1301, USA.
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
30 ;;; Commentary:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
31
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
32 ;; Allout outline minor mode provides extensive outline formatting and
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
33 ;; and manipulation beyond standard emacs outline mode. Some features:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
34 ;;
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
35 ;; - Classic outline-mode topic-oriented navigation and exposure adjustment
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
36 ;; - Topic-oriented editing including coherent topic and subtopic
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
37 ;; creation, promotion, demotion, cut/paste across depths, etc.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
38 ;; - Incremental search with dynamic exposure and reconcealment of text
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
39 ;; - Customizable bullet format - enables programming-language specific
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
40 ;; outlining, for code-folding editing. (Allout code itself is to try it;
71625
22433275348d Comment munging; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 70673
diff changeset
41 ;; formatted as an outline - do ESC-x eval-buffer in allout.el; but
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
42 ;; emacs local file variables need to be enabled when the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
43 ;; file was visited - see `enable-local-variables'.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
44 ;; - Configurable per-file initial exposure settings
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
45 ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
46 ;; mnemonic support, with verification against an established passphrase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
47 ;; (using a stashed encrypted dummy string) and user-supplied hint
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
48 ;; maintenance. (See allout-toggle-current-subtree-encryption docstring.
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
49 ;; Currently only GnuPG encryption is supported, and integration
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
50 ;; with gpg-agent is not yet implemented.)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
51 ;; - Automatic topic-number maintenance
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
52 ;; - "Hot-spot" operation, for single-keystroke maneuvering and
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
53 ;; exposure control (see the allout-mode docstring)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
54 ;; - Easy rendering of exposed portions into numbered, latex, indented, etc
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
55 ;; outline styles
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
56 ;; - Careful attention to whitespace - enabling blank lines between items
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
57 ;; and maintenance of hanging indentation (in paragraph auto-fill and
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
58 ;; across topic promotion and demotion) of topic bodies consistent with
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
59 ;; indentation of their topic header.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
60 ;;
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
61 ;; and more.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
62 ;;
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
63 ;; See the `allout-mode' function's docstring for an introduction to the
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
64 ;; mode.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
65 ;;
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
66 ;; The latest development version and helpful notes are available at
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
67 ;; http://myriadicity.net/Sundry/EmacsAllout .
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
68 ;;
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
69 ;; The outline menubar additions provide quick reference to many of
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
70 ;; the features, and see the docstring of the variable `allout-init'
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
71 ;; for instructions on priming your Emacs session for automatic
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
72 ;; activation of allout-mode.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
73 ;;
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
74 ;; See the docstring of the variables `allout-layout' and
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
75 ;; `allout-auto-activation' for details on automatic activation of
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
76 ;; `allout-mode' as a minor mode. (It has changed since allout
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
77 ;; 3.x, for those of you that depend on the old method.)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
78 ;;
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
79 ;; Note - the lines beginning with `;;;_' are outline topic headers.
71625
22433275348d Comment munging; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 70673
diff changeset
80 ;; Just `ESC-x eval-buffer' to give it a whirl.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
81
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
82 ;; ken manheimer (ken dot manheimer at gmail dot com)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
83
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
84 ;;; Code:
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
85
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
86 ;;;_* Dependency autoloads
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
87 (require 'overlay)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
88 (eval-when-compile
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
89 ;; Most of the requires here are for stuff covered by autoloads.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
90 ;; Since just byte-compiling doesn't trigger autoloads, so that
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
91 ;; "function not found" warnings would occur without these requires.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
92 (progn
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
93 (require 'pgg)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
94 (require 'pgg-gpg)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
95 (require 'overlay)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
96 ;; `cl' is required for `assert'. `assert' is not covered by a standard
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
97 ;; autoload, but it is a macro, so that eval-when-compile is sufficient
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
98 ;; to byte-compile it in, or to do the require when the buffer evalled.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
99 (require 'cl)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
100 ))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
101
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
102 ;;;_* USER CUSTOMIZATION VARIABLES:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
103
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
104 ;;;_ > defgroup allout
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
105 (defgroup allout nil
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
106 "Extensive outline mode for use alone and with other modes."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
107 :prefix "allout-"
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
108 :group 'outlines)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
109
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
110 ;;;_ + Layout, Mode, and Topic Header Configuration
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
111
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
112 ;;;_ = allout-auto-activation
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
113 (defcustom allout-auto-activation nil
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
114 "*Regulates auto-activation modality of allout outlines - see `allout-init'.
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
115
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
116 Setq-default by `allout-init' to regulate whether or not allout
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
117 outline mode is automatically activated when the buffer-specific
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
118 variable `allout-layout' is non-nil, and whether or not the layout
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
119 dictated by `allout-layout' should be imposed on mode activation.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
120
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
121 With value t, auto-mode-activation and auto-layout are enabled.
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
122 \(This also depends on `allout-find-file-hook' being installed in
54952
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
123 `find-file-hook', which is also done by `allout-init'.)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
124
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
125 With value `ask', auto-mode-activation is enabled, and endorsement for
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
126 performing auto-layout is asked of the user each time.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
127
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
128 With value `activate', only auto-mode-activation is enabled,
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
129 auto-layout is not.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
130
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
131 With value nil, neither auto-mode-activation nor auto-layout are
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
132 enabled.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
133
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
134 See the docstring for `allout-init' for the proper interface to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
135 this variable."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
136 :type '(choice (const :tag "On" t)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
137 (const :tag "Ask about layout" "ask")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
138 (const :tag "Mode only" "activate")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
139 (const :tag "Off" nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
140 :group 'allout)
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
141 ;;;_ = allout-default-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
142 (defcustom allout-default-layout '(-2 : 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
143 "*Default allout outline layout specification.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
144
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
145 This setting specifies the outline exposure to use when
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
146 `allout-layout' has the local value `t'. This docstring describes the
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
147 layout specifications.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
148
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
149 A list value specifies a default layout for the current buffer,
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
150 to be applied upon activation of `allout-mode'. Any non-nil
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
151 value will automatically trigger `allout-mode', provided
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
152 `allout-init' has been called to enable this behavior.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
153
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
154 The types of elements in the layout specification are:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
155
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
156 integer - dictate the relative depth to open the corresponding topic(s),
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
157 where:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
158 - negative numbers force the topic to be closed before opening
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
159 to the absolute value of the number, so all siblings are open
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
160 only to that level.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
161 - positive numbers open to the relative depth indicated by the
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
162 number, but do not force already opened subtopics to be closed.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
163 - 0 means to close topic - hide all subitems.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
164 : - repeat spec - apply the preceeding element to all siblings at
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
165 current level, *up to* those siblings that would be covered by specs
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
166 following the `:' on the list. Ie, apply to all topics at level but
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
167 trailing ones accounted for by trailing specs. (Only the first of
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
168 multiple colons at the same level is honored - later ones are ignored.)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
169 * - completely exposes the topic, including bodies
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
170 + - exposes all subtopics, but not the bodies
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
171 - - exposes the body of the corresponding topic, but not subtopics
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
172 list - a nested layout spec, to be applied intricately to its
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
173 corresponding item(s)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
174
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
175 Examples:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
176 '(-2 : 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
177 Collapse the top-level topics to show their children and
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
178 grandchildren, but completely collapse the final top-level topic.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
179 '(-1 () : 1 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
180 Close the first topic so only the immediate subtopics are shown,
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
181 leave the subsequent topics exposed as they are until the second
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
182 second to last topic, which is exposed at least one level, and
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
183 completely close the last topic.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
184 '(-2 : -1 *)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
185 Expose children and grandchildren of all topics at current
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
186 level except the last two; expose children of the second to
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
187 last and completely expose the last one, including its subtopics.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
188
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
189 See `allout-expose-topic' for more about the exposure process.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
190
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
191 Also, allout's mode-specific provisions will make topic prefixes default
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
192 to the comment-start string, if any, of the language of the file. This
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
193 is modulo the setting of `allout-use-mode-specific-leader', which see."
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
194 :type 'allout-layout-type
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
195 :group 'allout)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
196 ;;;_ : allout-layout-type
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
197 (define-widget 'allout-layout-type 'lazy
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
198 "Allout layout format customization basic building blocks."
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
199 :type '(repeat
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
200 (choice (integer :tag "integer (<= zero is strict)")
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
201 (const :tag ": (repeat prior)" :)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
202 (const :tag "* (completely expose)" *)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
203 (const :tag "+ (expose all offspring, headlines only)" +)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
204 (const :tag "- (expose topic body but not offspring)" -)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
205 (allout-layout-type :tag "<Nested layout>"))))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
206
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
207 ;;;_ = allout-show-bodies
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
208 (defcustom allout-show-bodies nil
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
209 "*If non-nil, show entire body when exposing a topic, rather than
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
210 just the header."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
211 :type 'boolean
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
212 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
213 (make-variable-buffer-local 'allout-show-bodies)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
214 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
215 (put 'allout-show-bodies 'safe-local-variable
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
216 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
217
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
218 ;;;_ = allout-beginning-of-line-cycles
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
219 (defcustom allout-beginning-of-line-cycles t
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
220 "*If non-nil, \\[allout-beginning-of-line] will cycle through smart-placement options.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
221
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
222 Cycling only happens on when the command is repeated, not when it
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
223 follows a different command.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
224
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
225 Smart-placement means that repeated calls to this function will
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
226 advance as follows:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
227
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
228 - if the cursor is on a non-headline body line and not on the first column:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
229 then it goes to the first column
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
230 - if the cursor is on the first column of a non-headline body line:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
231 then it goes to the start of the headline within the item body
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
232 - if the cursor is on the headline and not the start of the headline:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
233 then it goes to the start of the headline
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
234 - if the cursor is on the start of the headline:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
235 then it goes to the bullet character (for hotspot navigation)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
236 - if the cursor is on the bullet character:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
237 then it goes to the first column of that line (the headline)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
238 - if the cursor is on the first column of the headline:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
239 then it goes to the start of the headline within the item body.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
240
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
241 In this fashion, you can use the beginning-of-line command to do
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
242 its normal job and then, when repeated, advance through the
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
243 entry, cycling back to start.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
244
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
245 If this configuration variable is nil, then the cursor is just
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
246 advanced to the beginning of the line and remains there on
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
247 repeated calls."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
248 :type 'boolean :group 'allout)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
249 ;;;_ = allout-end-of-line-cycles
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
250 (defcustom allout-end-of-line-cycles t
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
251 "*If non-nil, \\[allout-end-of-line] will cycle through smart-placement options.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
252
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
253 Cycling only happens on when the command is repeated, not when it
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
254 follows a different command.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
255
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
256 Smart-placement means that repeated calls to this function will
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
257 advance as follows:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
258
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
259 - if the cursor is not on the end-of-line,
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
260 then it goes to the end-of-line
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
261 - if the cursor is on the end-of-line but not the end-of-entry,
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
262 then it goes to the end-of-entry, exposing it if necessary
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
263 - if the cursor is on the end-of-entry,
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
264 then it goes to the end of the head line
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
265
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
266 In this fashion, you can use the end-of-line command to do its
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
267 normal job and then, when repeated, advance through the entry,
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
268 cycling back to start.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
269
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
270 If this configuration variable is nil, then the cursor is just
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
271 advanced to the end of the line and remains there on repeated
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
272 calls."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
273 :type 'boolean :group 'allout)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
274
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
275 ;;;_ = allout-header-prefix
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
276 (defcustom allout-header-prefix "."
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
277 ;; this string is treated as literal match. it will be `regexp-quote'd, so
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
278 ;; one cannot use regular expressions to match varying header prefixes.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
279 "*Leading string which helps distinguish topic headers.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
280
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
281 Outline topic header lines are identified by a leading topic
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
282 header prefix, which mostly have the value of this var at their front.
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
283 Level 1 topics are exceptions. They consist of only a single
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
284 character, which is typically set to the `allout-primary-bullet'."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
285 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
286 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
287 (make-variable-buffer-local 'allout-header-prefix)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
288 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
289 (put 'allout-header-prefix 'safe-local-variable 'stringp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
290 ;;;_ = allout-primary-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
291 (defcustom allout-primary-bullet "*"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
292 "Bullet used for top-level outline topics.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
293
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
294 Outline topic header lines are identified by a leading topic header
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
295 prefix, which is concluded by bullets that includes the value of this
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
296 var and the respective allout-*-bullets-string vars.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
297
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
298 The value of an asterisk (`*') provides for backwards compatibility
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
299 with the original Emacs outline mode. See `allout-plain-bullets-string'
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
300 and `allout-distinctive-bullets-string' for the range of available
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
301 bullets."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
302 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
303 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
304 (make-variable-buffer-local 'allout-primary-bullet)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
305 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
306 (put 'allout-primary-bullet 'safe-local-variable 'stringp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
307 ;;;_ = allout-plain-bullets-string
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
308 (defcustom allout-plain-bullets-string ".,"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
309 "*The bullets normally used in outline topic prefixes.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
310
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
311 See `allout-distinctive-bullets-string' for the other kind of
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
312 bullets.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
313
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
314 DO NOT include the close-square-bracket, `]', as a bullet.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
315
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
316 Outline mode has to be reactivated in order for changes to the value
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
317 of this var to take effect."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
318 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
319 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
320 (make-variable-buffer-local 'allout-plain-bullets-string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
321 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
322 (put 'allout-plain-bullets-string 'safe-local-variable 'stringp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
323 ;;;_ = allout-distinctive-bullets-string
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
324 (defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
325 "*Persistent outline header bullets used to distinguish special topics.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
326
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
327 These bullets are used to distinguish topics from the run-of-the-mill
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
328 ones. They are not used in the standard topic headers created by
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
329 the topic-opening, shifting, and rebulleting (eg, on topic shift,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
330 topic paste, blanket rebulleting) routines, but are offered among the
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
331 choices for rebulleting. They are not altered by the above automatic
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
332 rebulleting, so they can be used to characterize topics, eg:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
333
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
334 `?' question topics
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
335 `(' parenthetic comment (with a matching close paren inside)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
336 `[' meta-note (with a matching close ] inside)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
337 `\"' a quotation
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
338 `=' value settings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
339 `~' \"more or less\"
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
340 `^' see above
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
341
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
342 ... for example. (`#' typically has a special meaning to the software,
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
343 according to the value of `allout-numbered-bullet'.)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
344
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
345 See `allout-plain-bullets-string' for the selection of
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
346 alternating bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
347
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
348 You must run `set-allout-regexp' in order for outline mode to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
349 reconcile to changes of this value.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
350
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
351 DO NOT include the close-square-bracket, `]', on either of the bullet
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
352 strings."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
353 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
354 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
355 (make-variable-buffer-local 'allout-distinctive-bullets-string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
356 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
357 (put 'allout-distinctive-bullets-string 'safe-local-variable 'stringp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
358
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
359 ;;;_ = allout-use-mode-specific-leader
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
360 (defcustom allout-use-mode-specific-leader t
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
361 "*When non-nil, use mode-specific topic-header prefixes.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
362
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
363 Allout outline mode will use the mode-specific `allout-mode-leaders' or
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
364 comment-start string, if any, to lead the topic prefix string, so topic
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
365 headers look like comments in the programming language. It will also use
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
366 the comment-start string, with an '_' appended, for `allout-primary-bullet'.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
368 String values are used as literals, not regular expressions, so
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
369 do not escape any regulare-expression characters.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
370
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
371 Value t means to first check for assoc value in `allout-mode-leaders'
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
372 alist, then use comment-start string, if any, then use default (`.').
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
373 \(See note about use of comment-start strings, below.)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
374
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
375 Set to the symbol for either of `allout-mode-leaders' or
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
376 `comment-start' to use only one of them, respectively.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
377
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
378 Value nil means to always use the default (`.') and leave
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
379 `allout-primary-bullet' unaltered.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
380
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
381 comment-start strings that do not end in spaces are tripled in
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
382 the header-prefix, and an `_' underscore is tacked on the end, to
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
383 distinguish them from regular comment strings. comment-start
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
384 strings that do end in spaces are not tripled, but an underscore
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
385 is substituted for the space. [This presumes that the space is
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
386 for appearance, not comment syntax. You can use
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
387 `allout-mode-leaders' to override this behavior, when
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
388 undesired.]"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
389 :type '(choice (const t) (const nil) string
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
390 (const allout-mode-leaders)
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
391 (const comment-start))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
392 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
393 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
394 (put 'allout-use-mode-specific-leader 'safe-local-variable
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
395 '(lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start))
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
396 (stringp x))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
397 ;;;_ = allout-mode-leaders
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
398 (defvar allout-mode-leaders '()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
399 "Specific allout-prefix leading strings per major modes.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
400
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
401 Use this if the mode's comment-start string isn't what you
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
402 prefer, or if the mode lacks a comment-start string. See
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
403 `allout-use-mode-specific-leader' for more details.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
404
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
405 If you're constructing a string that will comment-out outline
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
406 structuring so it can be included in program code, append an extra
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
407 character, like an \"_\" underscore, to distinguish the lead string
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
408 from regular comments that start at the beginning-of-line.")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
409
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
410 ;;;_ = allout-old-style-prefixes
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
411 (defcustom allout-old-style-prefixes nil
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
412 "*When non-nil, use only old-and-crusty `outline-mode' `*' topic prefixes.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
413
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
414 Non-nil restricts the topic creation and modification
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
415 functions to asterix-padded prefixes, so they look exactly
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
416 like the original Emacs-outline style prefixes.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
417
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
418 Whatever the setting of this variable, both old and new style prefixes
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
419 are always respected by the topic maneuvering functions."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
420 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
421 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
422 (make-variable-buffer-local 'allout-old-style-prefixes)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
423 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
424 (put 'allout-old-style-prefixes 'safe-local-variable
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
425 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
426 ;;;_ = allout-stylish-prefixes - alternating bullets
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
427 (defcustom allout-stylish-prefixes t
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
428 "*Do fancy stuff with topic prefix bullets according to level, etc.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
429
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
430 Non-nil enables topic creation, modification, and repositioning
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
431 functions to vary the topic bullet char (the char that marks the topic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
432 depth) just preceding the start of the topic text) according to level.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
433 Otherwise, only asterisks (`*') and distinctive bullets are used.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
434
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
435 This is how an outline can look (but sans indentation) with stylish
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
436 prefixes:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
437
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
438 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
439 .* A topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
440 . + One level 3 subtopic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
441 . . One level 4 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
442 . . A second 4 subtopic
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
443 . + Another level 3 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
444 . #1 A numbered level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
445 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
446 . ! Another level 4 subtopic with a different distinctive bullet
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
447 . #4 And another numbered level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
448
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
449 This would be an outline with stylish prefixes inhibited (but the
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
450 numbered and other distinctive bullets retained):
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
451
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
452 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
453 .* A topic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
454 . * One level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
455 . * One level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
456 . * A second 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
457 . * Another level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
458 . #1 A numbered level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
459 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
460 . ! Another level 4 subtopic with a different distinctive bullet
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
461 . #4 And another numbered level 4 subtopic
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
462
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
463 Stylish and constant prefixes (as well as old-style prefixes) are
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
464 always respected by the topic maneuvering functions, regardless of
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
465 this variable setting.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
466
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
467 The setting of this var is not relevant when `allout-old-style-prefixes'
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
468 is non-nil."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
469 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
470 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
471 (make-variable-buffer-local 'allout-stylish-prefixes)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
472 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
473 (put 'allout-stylish-prefixes 'safe-local-variable
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
474 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
475
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
476 ;;;_ = allout-numbered-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
477 (defcustom allout-numbered-bullet "#"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
478 "*String designating bullet of topics that have auto-numbering; nil for none.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
479
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
480 Topics having this bullet have automatic maintenance of a sibling
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
481 sequence-number tacked on, just after the bullet. Conventionally set
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
482 to \"#\", you can set it to a bullet of your choice. A nil value
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
483 disables numbering maintenance."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
484 :type '(choice (const nil) string)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
485 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
486 (make-variable-buffer-local 'allout-numbered-bullet)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
487 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
488 (put 'allout-numbered-bullet 'safe-local-variable
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
489 (if (fboundp 'string-or-null-p)
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
490 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
491 '(lambda (x) (or (stringp x) (null x)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
492 ;;;_ = allout-file-xref-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
493 (defcustom allout-file-xref-bullet "@"
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
494 "*Bullet signifying file cross-references, for `allout-resolve-xref'.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
495
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
496 Set this var to the bullet you want to use for file cross-references."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
497 :type '(choice (const nil) string)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
498 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
499 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
500 (put 'allout-file-xref-bullet 'safe-local-variable
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
501 (if (fboundp 'string-or-null-p)
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
502 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
503 '(lambda (x) (or (stringp x) (null x)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
504 ;;;_ = allout-presentation-padding
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
505 (defcustom allout-presentation-padding 2
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
506 "*Presentation-format white-space padding factor, for greater indent."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
507 :type 'integer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
508 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
509
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
510 (make-variable-buffer-local 'allout-presentation-padding)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
511 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
512 (put 'allout-presentation-padding 'safe-local-variable 'integerp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
513
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
514 ;;;_ = allout-abbreviate-flattened-numbering
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
515 (defcustom allout-abbreviate-flattened-numbering nil
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
516 "*If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
517 numbers to minimal amount with some context. Otherwise, entire
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
518 numbers are always used."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
519 :type 'boolean
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
520 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
521
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
522 ;;;_ + LaTeX formatting
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
523 ;;;_ - allout-number-pages
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
524 (defcustom allout-number-pages nil
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
525 "*Non-nil turns on page numbering for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
526 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
527 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
528 ;;;_ - allout-label-style
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
529 (defcustom allout-label-style "\\large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
530 "*Font and size of labels for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
531 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
532 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
533 ;;;_ - allout-head-line-style
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
534 (defcustom allout-head-line-style "\\large\\sl "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
535 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
536 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
537 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
538 ;;;_ - allout-body-line-style
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
539 (defcustom allout-body-line-style " "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
540 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
541 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
542 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
543 ;;;_ - allout-title-style
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
544 (defcustom allout-title-style "\\Large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
545 "*Font and size of titles for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
546 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
547 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
548 ;;;_ - allout-title
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
549 (defcustom allout-title '(or buffer-file-name (buffer-name))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
550 "*Expression to be evaluated to determine the title for LaTeX
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
551 formatted copy."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
552 :type 'sexp
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
553 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
554 ;;;_ - allout-line-skip
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
555 (defcustom allout-line-skip ".05cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
556 "*Space between lines for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
557 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
558 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
559 ;;;_ - allout-indent
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
560 (defcustom allout-indent ".3cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
561 "*LaTeX formatted depth-indent spacing."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
562 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
563 :group 'allout)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
564
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
565 ;;;_ + Topic encryption
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
566 ;;;_ = allout-encryption group
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
567 (defgroup allout-encryption nil
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
568 "Settings for topic encryption features of allout outliner."
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
569 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
570 ;;;_ = allout-topic-encryption-bullet
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
571 (defcustom allout-topic-encryption-bullet "~"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
572 "*Bullet signifying encryption of the entry's body."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
573 :type '(choice (const nil) string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
574 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
575 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
576 ;;;_ = allout-passphrase-verifier-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
577 (defcustom allout-passphrase-verifier-handling t
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
578 "*Enable use of symmetric encryption passphrase verifier if non-nil.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
579
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
580 See the docstring for the `allout-enable-file-variable-adjustment'
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
581 variable for details about allout ajustment of file variables."
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
582 :type 'boolean
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
583 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
584 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
585 (make-variable-buffer-local 'allout-passphrase-verifier-handling)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
586 ;;;_ = allout-passphrase-hint-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
587 (defcustom allout-passphrase-hint-handling 'always
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
588 "*Dictate outline encryption passphrase reminder handling:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
589
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
590 always - always show reminder when prompting
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
591 needed - show reminder on passphrase entry failure
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
592 disabled - never present or adjust reminder
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
593
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
594 See the docstring for the `allout-enable-file-variable-adjustment'
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
595 variable for details about allout ajustment of file variables."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
596 :type '(choice (const always)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
597 (const needed)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
598 (const disabled))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
599 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
600 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
601 (make-variable-buffer-local 'allout-passphrase-hint-handling)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
602 ;;;_ = allout-encrypt-unencrypted-on-saves
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
603 (defcustom allout-encrypt-unencrypted-on-saves t
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
604 "*When saving, should topics pending encryption be encrypted?
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
605
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
606 The idea is to prevent file-system exposure of any un-encrypted stuff, and
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
607 mostly covers both deliberate file writes and auto-saves.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
608
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
609 - Yes: encrypt all topics pending encryption, even if it's the one
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
610 currently being edited. (In that case, the currently edited topic
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
611 will be automatically decrypted before any user interaction, so they
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
612 can continue editing but the copy on the file system will be
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
613 encrypted.)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
614 Auto-saves will use the \"All except current topic\" mode if this
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
615 one is selected, to avoid practical difficulties - see below.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
616 - All except current topic: skip the topic currently being edited, even if
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
617 it's pending encryption. This may expose the current topic on the
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
618 file sytem, but avoids the nuisance of prompts for the encryption
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
619 passphrase in the middle of editing for, eg, autosaves.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
620 This mode is used for auto-saves for both this option and \"Yes\".
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
621 - No: leave it to the user to encrypt any unencrypted topics.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
622
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
623 For practical reasons, auto-saves always use the 'except-current policy
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
624 when auto-encryption is enabled. (Otherwise, spurious passphrase prompts
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
625 and unavoidable timing collisions are too disruptive.) If security for a
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
626 file requires that even the current topic is never auto-saved in the clear,
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
627 disable auto-saves for that file."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
628
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
629 :type '(choice (const :tag "Yes" t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
630 (const :tag "All except current topic" except-current)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
631 (const :tag "No" nil))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
632 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
633 :group 'allout-encryption)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
634 (make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
635
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
636 ;;;_ + Developer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
637 ;;;_ = allout-developer group
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
638 (defgroup allout-developer nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
639 "Settings for topic encryption features of allout outliner."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
640 :group 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
641 ;;;_ = allout-run-unit-tests-on-load
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
642 (defcustom allout-run-unit-tests-on-load nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
643 "*When non-nil, unit tests will be run at end of loading the allout module.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
644
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
645 Generally, allout code developers are the only ones who'll want to set this.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
646
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
647 \(If set, this makes it an even better practice to exercise changes by
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
648 doing byte-compilation with a repeat count, so the file is loaded after
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
649 compilation.)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
650
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
651 See `allout-run-unit-tests' to see what's run."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
652 :type 'boolean
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
653 :group 'allout-developer)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
654
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
655 ;;;_ + Miscellaneous customization
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
656
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
657 ;;;_ = allout-command-prefix
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
658 (defcustom allout-command-prefix "\C-c "
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
659 "*Key sequence to be used as prefix for outline mode command key bindings.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
660
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
661 Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
662 willing to let allout use a bunch of \C-c keybindings."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
663 :type 'string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
664 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
665
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
666 ;;;_ = allout-keybindings-list
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
667 ;;; You have to reactivate allout-mode - `(allout-mode t)' - to
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
668 ;;; institute changes to this var.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
669 (defvar allout-keybindings-list ()
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
670 "*List of `allout-mode' key / function bindings, for `allout-mode-map'.
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
671
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
672 String or vector key will be prefaced with `allout-command-prefix',
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
673 unless optional third, non-nil element is present.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
674 (setq allout-keybindings-list
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
675 '(
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
676 ; Motion commands:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
677 ("\C-n" allout-next-visible-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
678 ("\C-p" allout-previous-visible-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
679 ("\C-u" allout-up-current-level)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
680 ("\C-f" allout-forward-current-level)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
681 ("\C-b" allout-backward-current-level)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
682 ("\C-a" allout-beginning-of-current-entry)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
683 ("\C-e" allout-end-of-entry)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
684 ; Exposure commands:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
685 ("\C-i" allout-show-children)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
686 ("\C-s" allout-show-current-subtree)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
687 ("\C-h" allout-hide-current-subtree)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
688 ("h" allout-hide-current-subtree)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
689 ("\C-o" allout-show-current-entry)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
690 ("!" allout-show-all)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
691 ("x" allout-toggle-current-subtree-encryption)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
692 ; Alteration commands:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
693 (" " allout-open-sibtopic)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
694 ("." allout-open-subtopic)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
695 ("," allout-open-supertopic)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
696 ("'" allout-shift-in)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
697 (">" allout-shift-in)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
698 ("<" allout-shift-out)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
699 ("\C-m" allout-rebullet-topic)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
700 ("*" allout-rebullet-current-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
701 ("#" allout-number-siblings)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
702 ("\C-k" allout-kill-line t)
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
703 ("\M-k" allout-copy-line-as-kill t)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
704 ("\C-y" allout-yank t)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
705 ("\M-y" allout-yank-pop t)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
706 ("\C-k" allout-kill-topic)
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
707 ("\M-k" allout-copy-topic-as-kill)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
708 ; Miscellaneous commands:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
709 ;([?\C-\ ] allout-mark-topic)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
710 ("@" allout-resolve-xref)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
711 ("=c" allout-copy-exposed-to-buffer)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
712 ("=i" allout-indented-exposed-to-buffer)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
713 ("=t" allout-latexify-exposed)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
714 ("=p" allout-flatten-exposed-to-buffer)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
715
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
716 ;;;_ = allout-inhibit-auto-fill
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
717 (defcustom allout-inhibit-auto-fill nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
718 "*If non-nil, auto-fill will be inhibited in the allout buffers.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
719
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
720 You can customize this setting to set it for all allout buffers, or set it
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
721 in individual buffers if you want to inhibit auto-fill only in particular
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
722 buffers. (You could use a function on `allout-mode-hook' to inhibit
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
723 auto-fill according, eg, to the major mode.)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
724
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
725 If you don't set this and auto-fill-mode is enabled, allout will use the
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
726 value that `normal-auto-fill-function', if any, when allout mode starts, or
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
727 else allout's special hanging-indent maintaining auto-fill function,
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
728 `allout-auto-fill'."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
729 :type 'boolean
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
730 :group 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
731 (make-variable-buffer-local 'allout-inhibit-auto-fill)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
732
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
733 ;;;_ = allout-use-hanging-indents
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
734 (defcustom allout-use-hanging-indents t
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
735 "*If non-nil, topic body text auto-indent defaults to indent of the header.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
736 Ie, it is indented to be just past the header prefix. This is
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
737 relevant mostly for use with indented-text-mode, or other situations
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
738 where auto-fill occurs."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
739 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
740 :group 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
741 (make-variable-buffer-local 'allout-use-hanging-indents)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
742 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
743 (put 'allout-use-hanging-indents 'safe-local-variable
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
744 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
745
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
746 ;;;_ = allout-reindent-bodies
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
747 (defcustom allout-reindent-bodies (if allout-use-hanging-indents
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
748 'text)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
749 "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
750
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
751 When active, topic body lines that are indented even with or beyond
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
752 their topic header are reindented to correspond with depth shifts of
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
753 the header.
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
754
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
755 A value of t enables reindent in non-programming-code buffers, ie
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
756 those that do not have the variable `comment-start' set. A value of
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
757 `force' enables reindent whether or not `comment-start' is set."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
758 :type '(choice (const nil) (const t) (const text) (const force))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
759 :group 'allout)
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
760
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
761 (make-variable-buffer-local 'allout-reindent-bodies)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
762 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
763 (put 'allout-reindent-bodies 'safe-local-variable
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
764 '(lambda (x) (memq x '(nil t text force))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
765
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
766 ;;;_ = allout-enable-file-variable-adjustment
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
767 (defcustom allout-enable-file-variable-adjustment t
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
768 "*If non-nil, some allout outline actions edit Emacs local file var text.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
769
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
770 This can range from changes to existing entries, addition of new ones,
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
771 and creation of a new local variables section when necessary.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
772
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
773 Emacs file variables adjustments are also inhibited if `enable-local-variables'
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
774 is nil.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
775
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
776 Operations potentially causing edits include allout encryption routines.
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
777 For details, see `allout-toggle-current-subtree-encryption's docstring."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
778 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
779 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
780 (make-variable-buffer-local 'allout-enable-file-variable-adjustment)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
781
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
782 ;;;_* CODE - no user customizations below.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
783
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
784 ;;;_ #1 Internal Outline Formatting and Configuration
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
785 ;;;_ : Version
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
786 ;;;_ = allout-version
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
787 (defvar allout-version "2.2.1"
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
788 "Version of currently loaded outline package. (allout.el)")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
789 ;;;_ > allout-version
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
790 (defun allout-version (&optional here)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
791 "Return string describing the loaded outline version."
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
792 (interactive "P")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
793 (let ((msg (concat "Allout Outline Mode v " allout-version)))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
794 (if here (insert msg))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
795 (message "%s" msg)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
796 msg))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
797 ;;;_ : Mode activation (defined here because it's referenced early)
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
798 ;;;_ = allout-mode
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
799 (defvar allout-mode nil "Allout outline mode minor-mode flag.")
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
800 (make-variable-buffer-local 'allout-mode)
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
801 ;;;_ = allout-layout nil
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
802 (defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL - see docstring.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
803 "Buffer-specific setting for allout layout.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
804
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
805 In buffers where this is non-nil (and if `allout-init' has been run, to
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
806 enable this behavior), `allout-mode' will be automatically activated. The
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
807 layout dictated by the value will be used to set the initial exposure when
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
808 `allout-mode' is activated.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
809
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
810 \*You should not setq-default this variable non-nil unless you want every
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
811 visited file to be treated as an allout file.*
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
812
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
813 The value would typically be set by a file local variable. For
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
814 example, the following lines at the bottom of an Emacs Lisp file:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
815
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
816 ;;;Local variables:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
817 ;;;allout-layout: (0 : -1 -1 0)
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
818 ;;;End:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
819
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
820 dictate activation of `allout-mode' mode when the file is visited
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
821 \(presuming allout-init was already run), followed by the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
822 equivalent of `(allout-expose-topic 0 : -1 -1 0)'. (This is
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
823 the layout used for the allout.el source file.)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
824
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
825 `allout-default-layout' describes the specification format.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
826 `allout-layout' can additionally have the value `t', in which
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
827 case the value of `allout-default-layout' is used.")
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
828 (make-variable-buffer-local 'allout-layout)
70002
e753e12d2f33 (allout-layout): Autoload its `safe-local-variable' property.
Eli Zaretskii <eliz@gnu.org>
parents: 69481
diff changeset
829 ;;;###autoload
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
830 (put 'allout-layout 'safe-local-variable
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
831 '(lambda (x) (or (numberp x) (listp x) (memq x '(: * + -)))))
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
832
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
833 ;;;_ : Topic header format
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
834 ;;;_ = allout-regexp
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
835 (defvar allout-regexp ""
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
836 "*Regular expression to match the beginning of a heading line.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
837
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
838 Any line whose beginning matches this regexp is considered a
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
839 heading. This var is set according to the user configuration vars
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
840 by `set-allout-regexp'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
841 (make-variable-buffer-local 'allout-regexp)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
842 ;;;_ = allout-bullets-string
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
843 (defvar allout-bullets-string ""
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
844 "A string dictating the valid set of outline topic bullets.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
845
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
846 This var should *not* be set by the user - it is set by `set-allout-regexp',
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
847 and is produced from the elements of `allout-plain-bullets-string'
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
848 and `allout-distinctive-bullets-string'.")
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
849 (make-variable-buffer-local 'allout-bullets-string)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
850 ;;;_ = allout-bullets-string-len
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
851 (defvar allout-bullets-string-len 0
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
852 "Length of current buffers' `allout-plain-bullets-string'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
853 (make-variable-buffer-local 'allout-bullets-string-len)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
854 ;;;_ = allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
855 (defvar allout-depth-specific-regexp ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
856 "*Regular expression to match a heading line prefix for a particular depth.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
857
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
858 This expression is used to search for depth-specific topic
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
859 headers at depth 2 and greater. Use `allout-depth-one-regexp'
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
860 for to seek topics at depth one.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
861
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
862 This var is set according to the user configuration vars by
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
863 `set-allout-regexp'. It is prepared with format strings for two
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
864 decimal numbers, which should each be one less than the depth of the
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
865 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
866 (make-variable-buffer-local 'allout-depth-specific-regexp)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
867 ;;;_ = allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
868 (defvar allout-depth-one-regexp ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
869 "*Regular expression to match a heading line prefix for depth one.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
870
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
871 This var is set according to the user configuration vars by
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
872 `set-allout-regexp'. It is prepared with format strings for two
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
873 decimal numbers, which should each be one less than the depth of the
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
874 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
875 (make-variable-buffer-local 'allout-depth-one-regexp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
876 ;;;_ = allout-line-boundary-regexp
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
877 (defvar allout-line-boundary-regexp ()
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
878 "`allout-regexp' with outline style beginning-of-line anchor.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
879
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
880 This is properly set by `set-allout-regexp'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
881 (make-variable-buffer-local 'allout-line-boundary-regexp)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
882 ;;;_ = allout-bob-regexp
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
883 (defvar allout-bob-regexp ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
884 "Like `allout-line-boundary-regexp', for headers at beginning of buffer.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
885 (make-variable-buffer-local 'allout-bob-regexp)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
886 ;;;_ = allout-header-subtraction
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
887 (defvar allout-header-subtraction (1- (length allout-header-prefix))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
888 "Allout-header prefix length to subtract when computing topic depth.")
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
889 (make-variable-buffer-local 'allout-header-subtraction)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
890 ;;;_ = allout-plain-bullets-string-len
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
891 (defvar allout-plain-bullets-string-len (length allout-plain-bullets-string)
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
892 "Length of `allout-plain-bullets-string', updated by `set-allout-regexp'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
893 (make-variable-buffer-local 'allout-plain-bullets-string-len)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
894
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
895 ;;;_ = allout-doublecheck-at-and-shallower
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
896 (defconst allout-doublecheck-at-and-shallower 2
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
897 "Validate apparent topics of this depth and shallower as being non-aberrant.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
898
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
899 Verified with `allout-aberrant-container-p'. This check's usefulness is
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
900 limited to shallow depths, because the determination of aberrance
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
901 is according to the mistaken item being followed by a legitimate item of
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
902 excessively greater depth.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
903 ;;;_ X allout-reset-header-lead (header-lead)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
904 (defun allout-reset-header-lead (header-lead)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
905 "*Reset the leading string used to identify topic headers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
906 (interactive "sNew lead string: ")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
907 (setq allout-header-prefix header-lead)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
908 (setq allout-header-subtraction (1- (length allout-header-prefix)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
909 (set-allout-regexp))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
910 ;;;_ X allout-lead-with-comment-string (header-lead)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
911 (defun allout-lead-with-comment-string (&optional header-lead)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
912 "*Set the topic-header leading string to specified string.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
913
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
914 Useful when for encapsulating outline structure in programming
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
915 language comments. Returns the leading string."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
916
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
917 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
918 (if (not (stringp header-lead))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
919 (setq header-lead (read-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
920 "String prefix for topic headers: ")))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
921 (setq allout-reindent-bodies nil)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
922 (allout-reset-header-lead header-lead)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
923 header-lead)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
924 ;;;_ > allout-infer-header-lead-and-primary-bullet ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
925 (defun allout-infer-header-lead-and-primary-bullet ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
926 "Determine appropriate `allout-header-prefix' and `allout-primary-bullet'.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
927
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
928 Works according to settings of:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
929
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
930 `comment-start'
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
931 `allout-header-prefix' (default)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
932 `allout-use-mode-specific-leader'
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
933 and `allout-mode-leaders'.
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
934
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
935 Apply this via (re)activation of `allout-mode', rather than
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
936 invoking it directly."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
937 (let* ((use-leader (and (boundp 'allout-use-mode-specific-leader)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
938 (if (or (stringp allout-use-mode-specific-leader)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
939 (memq allout-use-mode-specific-leader
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
940 '(allout-mode-leaders
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
941 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
942 t)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
943 allout-use-mode-specific-leader
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
944 ;; Oops - garbled value, equate with effect of 't:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
945 t)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
946 (leader
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
947 (cond
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
948 ((not use-leader) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
949 ;; Use the explicitly designated leader:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
950 ((stringp use-leader) use-leader)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
951 (t (or (and (memq use-leader '(t allout-mode-leaders))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
952 ;; Get it from outline mode leaders?
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
953 (cdr (assq major-mode allout-mode-leaders)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
954 ;; ... didn't get from allout-mode-leaders...
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
955 (and (memq use-leader '(t comment-start))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
956 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
957 ;; Use comment-start, maybe tripled, and with
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
958 ;; underscore:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
959 (concat
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
960 (if (string= " "
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
961 (substring comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
962 (1- (length comment-start))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
963 ;; Use comment-start, sans trailing space:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
964 (substring comment-start 0 -1)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
965 (concat comment-start comment-start comment-start))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
966 ;; ... and append underscore, whichever:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
967 "_")))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
968 (if (not leader)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
969 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
970 (setq allout-header-prefix leader)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
971 (if (not allout-old-style-prefixes)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
972 ;; setting allout-primary-bullet makes the top level topics use -
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
973 ;; actually, be - the special prefix:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
974 (setq allout-primary-bullet leader))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
975 allout-header-prefix)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
976 (defalias 'allout-infer-header-lead
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
977 'allout-infer-header-lead-and-primary-bullet)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
978 ;;;_ > allout-infer-body-reindent ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
979 (defun allout-infer-body-reindent ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
980 "Determine proper setting for `allout-reindent-bodies'.
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
981
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
982 Depends on default setting of `allout-reindent-bodies' (which see)
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
983 and presence of setting for `comment-start', to tell whether the
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
984 file is programming code."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
985 (if (and allout-reindent-bodies
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
986 comment-start
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
987 (not (eq 'force allout-reindent-bodies)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
988 (setq allout-reindent-bodies nil)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
989 ;;;_ > set-allout-regexp ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
990 (defun set-allout-regexp ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
991 "Generate proper topic-header regexp form for outline functions.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
992
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
993 Works with respect to `allout-plain-bullets-string' and
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
994 `allout-distinctive-bullets-string'.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
995
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
996 Also refresh various data structures that hinge on the regexp."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
997
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
998 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
999 ;; Derive allout-bullets-string from user configured components:
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1000 (setq allout-bullets-string "")
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1001 (let ((strings (list 'allout-plain-bullets-string
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1002 'allout-distinctive-bullets-string
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1003 'allout-primary-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1004 cur-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1005 cur-len
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1006 cur-char
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1007 index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1008 (while strings
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1009 (setq index 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1010 (setq cur-len (length (setq cur-string (symbol-value (car strings)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1011 (while (< index cur-len)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1012 (setq cur-char (aref cur-string index))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1013 (setq allout-bullets-string
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1014 (concat allout-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1015 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1016 ; Single dash would denote a
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1017 ; sequence, repeated denotes
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1018 ; a dash:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1019 ((eq cur-char ?-) "--")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1020 ; literal close-square-bracket
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021 ; doesn't work right in the
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1022 ; expr, exclude it:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1023 ((eq cur-char ?\]) "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1024 (t (regexp-quote (char-to-string cur-char))))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1025 (setq index (1+ index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1026 (setq strings (cdr strings)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1027 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1028 ;; Derive next for repeated use in allout-pending-bullet:
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1029 (setq allout-plain-bullets-string-len (length allout-plain-bullets-string))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1030 (setq allout-header-subtraction (1- (length allout-header-prefix)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1031
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1032 (let (new-part old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1033 (setq new-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1034 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1035 "[ \t]*"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1036 ;; already regexp-quoted in a custom way:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1037 "[" allout-bullets-string "]"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1038 "\\)")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1039 old-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1040 (regexp-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1041 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1042 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1043 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1044 "+"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1045 " ?[^" allout-primary-bullet "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1046 allout-regexp (concat new-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1047 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1048 old-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1049 "\\|\^l")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1050
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1051 allout-line-boundary-regexp (concat "\n" new-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1052 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1053 "\n" old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1054
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1055 allout-bob-regexp (concat "\\`" new-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1056 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1057 "\\`" old-part))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1058
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1059 (setq allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1060 (concat "\\(^\\|\\`\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1061 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1062
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1063 ;; new-style spacers-then-bullet string:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1064 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1065 (allout-format-quote (regexp-quote allout-header-prefix))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1066 " \\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1067 "[" (allout-format-quote allout-bullets-string) "]"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1068 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1069
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1070 ;; old-style all-bullets string, if primary not multi-char:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1071 (if (< 0 allout-header-subtraction)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1072 ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1073 (concat "\\|\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1074 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1075 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1076 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1077 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1078 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1079 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1080 "\\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1081 ;; disqualify greater depths:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1082 "[^"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1083 (allout-format-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1084 "]\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1085 ))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1086 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1087 ))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1088 (setq allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1089 (concat "\\(^\\|\\`\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1090 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1091
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1092 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1093 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1094 ;; disqualify any bullet char following any amount of
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1095 ;; intervening whitespace:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1096 " *"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1097 (concat "[^ " allout-bullets-string "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1098 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1099 (if (< 0 allout-header-subtraction)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1100 ;; Need not support anything like the old
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1101 ;; bullet style if the prefix is multi-char.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1102 ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1103 (concat "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1104 (regexp-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1105 ;; disqualify deeper primary-bullet sequences:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1106 "[^" allout-primary-bullet "]"))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1107 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1108 ))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1109 ;;;_ : Key bindings
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1110 ;;;_ = allout-mode-map
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1111 (defvar allout-mode-map nil "Keybindings for (allout) outline minor mode.")
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1112 ;;;_ > produce-allout-mode-map (keymap-alist &optional base-map)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1113 (defun produce-allout-mode-map (keymap-list &optional base-map)
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1114 "Produce keymap for use as allout-mode-map, from KEYMAP-LIST.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1115
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1116 Built on top of optional BASE-MAP, or empty sparse map if none specified.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1117 See doc string for allout-keybindings-list for format of binding list."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1118 (let ((map (or base-map (make-sparse-keymap)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1119 (pref (list allout-command-prefix)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1120 (mapcar (function
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1121 (lambda (cell)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1122 (let ((add-pref (null (cdr (cdr cell))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1123 (key-suff (list (car cell))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1124 (apply 'define-key
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1125 (list map
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1126 (apply 'concat (if add-pref
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1127 (append pref key-suff)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1128 key-suff))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1129 (car (cdr cell)))))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1130 keymap-list)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1131 map))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1132 ;;;_ : Menu bar
54952
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1133 (defvar allout-mode-exposure-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1134 (defvar allout-mode-editing-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1135 (defvar allout-mode-navigation-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1136 (defvar allout-mode-misc-menu)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1137 (defun produce-allout-mode-menubar-entries ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1138 (require 'easymenu)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1139 (easy-menu-define allout-mode-exposure-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1140 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1141 "Allout outline exposure menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1142 '("Exposure"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1143 ["Show Entry" allout-show-current-entry t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1144 ["Show Children" allout-show-children t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1145 ["Show Subtree" allout-show-current-subtree t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1146 ["Hide Subtree" allout-hide-current-subtree t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1147 ["Hide Leaves" allout-hide-current-leaves t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1148 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1149 ["Show All" allout-show-all t]))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1150 (easy-menu-define allout-mode-editing-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1151 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1152 "Allout outline editing menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1153 '("Headings"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1154 ["Open Sibling" allout-open-sibtopic t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1155 ["Open Subtopic" allout-open-subtopic t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1156 ["Open Supertopic" allout-open-supertopic t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1157 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1158 ["Shift Topic In" allout-shift-in t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1159 ["Shift Topic Out" allout-shift-out t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1160 ["Rebullet Topic" allout-rebullet-topic t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1161 ["Rebullet Heading" allout-rebullet-current-heading t]
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1162 ["Number Siblings" allout-number-siblings t]
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1163 "----"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1164 ["Toggle Topic Encryption"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1165 allout-toggle-current-subtree-encryption
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1166 (> (allout-current-depth) 1)]))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1167 (easy-menu-define allout-mode-navigation-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1168 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1169 "Allout outline navigation menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1170 '("Navigation"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1171 ["Next Visible Heading" allout-next-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1172 ["Previous Visible Heading"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1173 allout-previous-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1174 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1175 ["Up Level" allout-up-current-level t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1176 ["Forward Current Level" allout-forward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1177 ["Backward Current Level"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1178 allout-backward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1179 "----"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1180 ["Beginning of Entry"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1181 allout-beginning-of-current-entry t]
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1182 ["End of Entry" allout-end-of-entry t]
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1183 ["End of Subtree" allout-end-of-current-subtree t]))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1184 (easy-menu-define allout-mode-misc-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1185 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1186 "Allout outlines miscellaneous bindings."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1187 '("Misc"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1188 ["Version" allout-version t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1189 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1190 ["Duplicate Exposed" allout-copy-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1191 ["Duplicate Exposed, numbered"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1192 allout-flatten-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1193 ["Duplicate Exposed, indented"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1194 allout-indented-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1195 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1196 ["Set Header Lead" allout-reset-header-lead t]
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1197 ["Set New Exposure" allout-expose-topic t])))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1198 ;;;_ : Allout Modal-Variables Utilities
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1199 ;;;_ = allout-mode-prior-settings
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1200 (defvar allout-mode-prior-settings nil
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1201 "Internal `allout-mode' use; settings to be resumed on mode deactivation.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1202
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1203 See `allout-add-resumptions' and `allout-do-resumptions'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1204 (make-variable-buffer-local 'allout-mode-prior-settings)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1205 ;;;_ > allout-add-resumptions (&rest pairs)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1206 (defun allout-add-resumptions (&rest pairs)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1207 "Set name/value PAIRS.
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1208
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1209 Old settings are preserved for later resumption using `allout-do-resumptions'.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1210
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1211 The new values are set as a buffer local. On resumption, the prior buffer
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1212 scope of the variable is restored along with its value. If it was a void
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1213 buffer-local value, then it is left as nil on resumption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1214
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1215 The pairs are lists whose car is the name of the variable and car of the
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1216 cdr is the new value: '(some-var some-value)'. The pairs can actually be
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1217 triples, where the third element qualifies the disposition of the setting,
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1218 as described further below.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1219
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1220 If the optional third element is the symbol 'extend, then the new value
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1221 created by `cons'ing the second element of the pair onto the front of the
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1222 existing value.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1223
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1224 If the optional third element is the symbol 'append, then the new value is
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1225 extended from the existing one by `append'ing a list containing the second
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1226 element of the pair onto the end of the existing value.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1227
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1228 Extension, and resumptions in general, should not be used for hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1229 functions - use the 'local mode of `add-hook' for that, instead.
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1230
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1231 The settings are stored on `allout-mode-prior-settings'."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1232 (while pairs
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1233 (let* ((pair (pop pairs))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1234 (name (car pair))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1235 (value (cadr pair))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1236 (qualifier (if (> (length pair) 2)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1237 (caddr pair)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1238 prior-value)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1239 (if (not (symbolp name))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1240 (error "Pair's name, %S, must be a symbol, not %s"
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1241 name (type-of name)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1242 (setq prior-value (condition-case nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1243 (symbol-value name)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1244 (void-variable nil)))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1245 (when (not (assoc name allout-mode-prior-settings))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1246 ;; Not already added as a resumption, create the prior setting entry.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1247 (if (local-variable-p name)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1248 ;; is already local variable - preserve the prior value:
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1249 (push (list name prior-value) allout-mode-prior-settings)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1250 ;; wasn't local variable, indicate so for resumption by killing
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1251 ;; local value, and make it local:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1252 (push (list name) allout-mode-prior-settings)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1253 (make-local-variable name)))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1254 (if qualifier
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1255 (cond ((eq qualifier 'extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1256 (if (not (listp prior-value))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1257 (error "extension of non-list prior value attempted")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1258 (set name (cons value prior-value))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1259 ((eq qualifier 'append)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1260 (if (not (listp prior-value))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1261 (error "appending of non-list prior value attempted")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1262 (set name (append prior-value (list value)))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1263 (t (error "unrecognized setting qualifier `%s' encountered"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1264 qualifier)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1265 (set name value)))))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1266 ;;;_ > allout-do-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1267 (defun allout-do-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1268 "Resume all name/value settings registered by `allout-add-resumptions'.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1269
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1270 This is used when concluding allout-mode, to resume selected variables to
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1271 their settings before allout-mode was started."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1272
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1273 (while allout-mode-prior-settings
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1274 (let* ((pair (pop allout-mode-prior-settings))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1275 (name (car pair))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1276 (value-cell (cdr pair)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1277 (if (not value-cell)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1278 ;; Prior value was global:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1279 (kill-local-variable name)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1280 ;; Prior value was explicit:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1281 (set name (car value-cell))))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1282 ;;;_ : Mode-specific incidentals
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1283 ;;;_ > allout-unprotected (expr)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1284 (defmacro allout-unprotected (expr)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1285 "Enable internal outline operations to alter invisible text."
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
1286 `(let ((inhibit-read-only (if (not buffer-read-only) t))
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
1287 (inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1288 ,expr))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1289 ;;;_ = allout-mode-hook
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1290 (defvar allout-mode-hook nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1291 "*Hook that's run when allout mode starts.")
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1292 ;;;_ = allout-mode-deactivate-hook
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1293 (defvar allout-mode-deactivate-hook nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1294 "*Hook that's run when allout mode ends.")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1295 ;;;_ = allout-exposure-category
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1296 (defvar allout-exposure-category nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1297 "Symbol for use as allout invisible-text overlay category.")
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
1298 ;;;_ x allout-view-change-hook
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1299 (defvar allout-view-change-hook nil
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1300 "*(Deprecated) A hook run after allout outline exposure changes.
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1301
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1302 Switch to using `allout-exposure-change-hook' instead. Both hooks are
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1303 currently respected, but the other conveys the details of the exposure
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1304 change via explicit parameters, and this one will eventually be disabled in
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1305 a subsequent allout version.")
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
1306 ;;;_ = allout-exposure-change-hook
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
1307 (defvar allout-exposure-change-hook nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1308 "*Hook that's run after allout outline subtree exposure changes.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1309
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1310 It is run at the conclusion of `allout-flag-region'.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1311
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1312 Functions on the hook must take three arguments:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1313
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1314 - from - integer indicating the point at the start of the change.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1315 - to - integer indicating the point of the end of the change.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1316 - flag - change mode: nil for exposure, otherwise concealment.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1317
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1318 This hook might be invoked multiple times by a single command.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1319
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1320 This hook is replacing `allout-view-change-hook', which is being deprecated
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1321 and eventually will not be invoked.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1322 ;;;_ = allout-structure-added-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1323 (defvar allout-structure-added-hook nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1324 "*Hook that's run after addition of items to the outline.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1325
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1326 Functions on the hook should take two arguments:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1327
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1328 - new-start - integer indicating the point at the start of the first new item.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1329 - new-end - integer indicating the point of the end of the last new item.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1330
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1331 Some edits that introduce new items may missed by this hook -
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1332 specifically edits that native allout routines do not control.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1333
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1334 This hook might be invoked multiple times by a single command.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1335 ;;;_ = allout-structure-deleted-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1336 (defvar allout-structure-deleted-hook nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1337 "*Hook that's run after disciplined deletion of subtrees from the outline.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1338
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1339 Functions on the hook must take two arguments:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1340
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1341 - depth - integer indicating the depth of the subtree that was deleted.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1342 - removed-from - integer indicating the point where the subtree was removed.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1343
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1344 Some edits that remove or invalidate items may missed by this hook -
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1345 specifically edits that native allout routines do not control.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1346
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1347 This hook might be invoked multiple times by a single command.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1348 ;;;_ = allout-structure-shifted-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1349 (defvar allout-structure-shifted-hook nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1350 "*Hook that's run after shifting of items in the outline.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1351
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1352 Functions on the hook should take two arguments:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1353
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1354 - depth-change - integer indicating depth increase, negative for decrease
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1355 - start - integer indicating the start point of the shifted parent item.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1356
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1357 Some edits that shift items can be missed by this hook - specifically edits
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1358 that native allout routines do not control.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1359
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1360 This hook might be invoked multiple times by a single command.")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1361 ;;;_ = allout-outside-normal-auto-fill-function
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1362 (defvar allout-outside-normal-auto-fill-function nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1363 "Value of normal-auto-fill-function outside of allout mode.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1364
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1365 Used by allout-auto-fill to do the mandated normal-auto-fill-function
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1366 wrapped within allout's automatic fill-prefix setting.")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1367 (make-variable-buffer-local 'allout-outside-normal-auto-fill-function)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1368 ;;;_ = file-var-bug hack
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1369 (defvar allout-v18/19-file-var-hack nil
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1370 "Horrible hack used to prevent invalid multiple triggering of outline
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
1371 mode from prop-line file-var activation. Used by `allout-mode' function
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1372 to track repeats.")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1373 ;;;_ = allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1374 (defvar allout-passphrase-verifier-string nil
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1375 "Setting used to test solicited encryption passphrases against the one
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1376 already associated with a file.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1377
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1378 It consists of an encrypted random string useful only to verify that a
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1379 passphrase entered by the user is effective for decryption. The passphrase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1380 itself is \*not* recorded in the file anywhere, and the encrypted contents
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1381 are random binary characters to avoid exposing greater susceptibility to
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1382 search attacks.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1383
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1384 The verifier string is retained as an Emacs file variable, as well as in
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
1385 the Emacs buffer state, if file variable adjustments are enabled. See
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1386 `allout-enable-file-variable-adjustment' for details about that.")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1387 (make-variable-buffer-local 'allout-passphrase-verifier-string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1388 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1389 (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1390 ;;;_ = allout-passphrase-hint-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1391 (defvar allout-passphrase-hint-string ""
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1392 "Variable used to retain reminder string for file's encryption passphrase.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1393
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1394 See the description of `allout-passphrase-hint-handling' for details about how
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1395 the reminder is deployed.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1396
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
1397 The hint is retained as an Emacs file variable, as well as in the Emacs buffer
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1398 state, if file variable adjustments are enabled. See
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1399 `allout-enable-file-variable-adjustment' for details about that.")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1400 (make-variable-buffer-local 'allout-passphrase-hint-string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1401 (setq-default allout-passphrase-hint-string "")
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1402 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1403 (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1404 ;;;_ = allout-after-save-decrypt
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1405 (defvar allout-after-save-decrypt nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1406 "Internal variable, is nil or has the value of two points:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1407
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1408 - the location of a topic to be decrypted after saving is done
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1409 - where to situate the cursor after the decryption is performed
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1410
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1411 This is used to decrypt the topic that was currently being edited, if it
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1412 was encrypted automatically as part of a file write or autosave.")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1413 (make-variable-buffer-local 'allout-after-save-decrypt)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1414 ;;;_ = allout-encryption-plaintext-sanitization-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1415 (defvar allout-encryption-plaintext-sanitization-regexps nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1416 "List of regexps whose matches are removed from plaintext before encryption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1417
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1418 This is for the sake of removing artifacts, like escapes, that are added on
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1419 and not actually part of the original plaintext. The removal is done just
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1420 prior to encryption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1421
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1422 Entries must be symbols that are bound to the desired values.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1423
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1424 Each value can be a regexp or a list with a regexp followed by a
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1425 substitution string. If it's just a regexp, all its matches are removed
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1426 before the text is encrypted. If it's a regexp and a substitution, the
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1427 substition is used against the regexp matches, a la `replace-match'.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1428 (make-variable-buffer-local 'allout-encryption-text-removal-regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1429 ;;;_ = allout-encryption-ciphertext-rejection-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1430 (defvar allout-encryption-ciphertext-rejection-regexps nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1431 "Variable for regexps matching plaintext to remove before encryption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1432
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1433 This is for the sake of redoing encryption in cases where the ciphertext
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1434 incidentally contains strings that would disrupt mode operation -
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1435 for example, a line that happens to look like an allout-mode topic prefix.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1436
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1437 Entries must be symbols that are bound to the desired regexp values.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1438
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1439 The encryption will be retried up to
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1440 `allout-encryption-ciphertext-rejection-limit' times, after which an error
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1441 is raised.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1442
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1443 (make-variable-buffer-local 'allout-encryption-ciphertext-rejection-regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1444 ;;;_ = allout-encryption-ciphertext-rejection-ceiling
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1445 (defvar allout-encryption-ciphertext-rejection-ceiling 5
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1446 "Limit on number of times encryption ciphertext is rejected.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1447
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1448 See `allout-encryption-ciphertext-rejection-regexps' for rejection reasons.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1449 (make-variable-buffer-local 'allout-encryption-ciphertext-rejection-ceiling)
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1450 ;;;_ > allout-mode-p ()
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1451 ;; Must define this macro above any uses, or byte compilation will lack
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1452 ;; proper def, if file isn't loaded - eg, during emacs build!
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1453 (defmacro allout-mode-p ()
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1454 "Return t if `allout-mode' is active in current buffer."
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1455 'allout-mode)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1456 ;;;_ > allout-write-file-hook-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1457 (defun allout-write-file-hook-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1458 "Implement `allout-encrypt-unencrypted-on-saves' policy for file writes."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1459
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1460 (if (or (not (allout-mode-p))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1461 (not (boundp 'allout-encrypt-unencrypted-on-saves))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1462 (not allout-encrypt-unencrypted-on-saves))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1463 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1464 (let ((except-mark (and (equal allout-encrypt-unencrypted-on-saves
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1465 'except-current)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1466 (point-marker))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1467 (if (save-excursion (goto-char (point-min))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1468 (allout-next-topic-pending-encryption except-mark))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1469 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1470 (message "auto-encrypting pending topics")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1471 (sit-for 0)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1472 (condition-case failure
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1473 (setq allout-after-save-decrypt
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1474 (allout-encrypt-decrypted except-mark))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1475 (error (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1476 (message
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1477 "allout-write-file-hook-handler suppressing error %s"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1478 failure)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1479 (sit-for 2))))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1480 ))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1481 nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1482 ;;;_ > allout-auto-save-hook-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1483 (defun allout-auto-save-hook-handler ()
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1484 "Implement `allout-encrypt-unencrypted-on-saves' policy for auto save."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1485
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1486 (if (and (allout-mode-p) allout-encrypt-unencrypted-on-saves)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1487 ;; Always implement 'except-current policy when enabled.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1488 (let ((allout-encrypt-unencrypted-on-saves 'except-current))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1489 (allout-write-file-hook-handler))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1490 ;;;_ > allout-after-saves-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1491 (defun allout-after-saves-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1492 "Decrypt topic encrypted for save, if it's currently being edited.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1493
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1494 Ie, if it was pending encryption and contained the point in its body before
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1495 the save.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1496
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1497 We use values stored in `allout-after-save-decrypt' to locate the topic
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1498 and the place for the cursor after the decryption is done."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1499 (if (not (and (allout-mode-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1500 (boundp 'allout-after-save-decrypt)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1501 allout-after-save-decrypt))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1502 t
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1503 (goto-char (car allout-after-save-decrypt))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1504 (let ((was-modified (buffer-modified-p)))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1505 (allout-toggle-subtree-encryption)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1506 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1507 (set-buffer-modified-p nil)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1508 (goto-char (cadr allout-after-save-decrypt))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1509 (setq allout-after-save-decrypt nil))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1510 )
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1511 ;;;_ = allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1512 ;; In some exceptional moments, disparate topic depths need to be allowed
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1513 ;; momentarily, eg when one topic is being yanked into another and they're
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1514 ;; about to be reconciled. let-binding allout-inhibit-aberrance-doublecheck
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1515 ;; prevents the aberrance doublecheck to allow, eg, the reconciliation
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1516 ;; processing to happen in the presence of such discrepancies. It should
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1517 ;; almost never be needed, however.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1518 (defvar allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1519 "Internal state, for momentarily inhibits aberrance doublecheck.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1520
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1521 This should only be momentarily let-bound non-nil, not set
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1522 non-nil in a lasting way.")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1523
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1524 ;;;_ #2 Mode activation
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1525 ;;;_ = allout-explicitly-deactivated
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1526 (defvar allout-explicitly-deactivated nil
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1527 "If t, `allout-mode's last deactivation was deliberate.
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
1528 So `allout-post-command-business' should not reactivate it...")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1529 (make-variable-buffer-local 'allout-explicitly-deactivated)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1530 ;;;_ > allout-init (&optional mode)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1531 (defun allout-init (&optional mode)
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
1532 "Prime `allout-mode' to enable/disable auto-activation, wrt `allout-layout'.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1533
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1534 MODE is one of the following symbols:
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1535
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1536 - nil (or no argument) deactivate auto-activation/layout;
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1537 - `activate', enable auto-activation only;
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1538 - `ask', enable auto-activation, and enable auto-layout but with
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1539 confirmation for layout operation solicited from user each time;
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1540 - `report', just report and return the current auto-activation state;
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1541 - anything else (eg, t) for auto-activation and auto-layout, without
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1542 any confirmation check.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1543
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1544 Use this function to setup your Emacs session for automatic activation
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1545 of allout outline mode, contingent to the buffer-specific setting of
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1546 the `allout-layout' variable. (See `allout-layout' and
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1547 `allout-expose-topic' docstrings for more details on auto layout).
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1548
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1549 `allout-init' works by setting up (or removing) the `allout-mode'
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1550 find-file-hook, and giving `allout-auto-activation' a suitable
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1551 setting.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1552
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1553 To prime your Emacs session for full auto-outline operation, include
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1554 the following two lines in your Emacs init file:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1555
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1556 \(require 'allout)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1557 \(allout-init t)"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1558
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1559 (interactive)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1560 (if (interactive-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1561 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1562 (setq mode
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1563 (completing-read
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1564 (concat "Select outline auto setup mode "
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1565 "(empty for report, ? for options) ")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1566 '(("nil")("full")("activate")("deactivate")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1567 ("ask") ("report") (""))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1568 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1569 t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1570 (if (string= mode "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1571 (setq mode 'report)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1572 (setq mode (intern-soft mode)))))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1573 (let
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1574 ;; convenience aliases, for consistent ref to respective vars:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1575 ((hook 'allout-find-file-hook)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1576 (find-file-hook-var-name (if (boundp 'find-file-hook)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1577 'find-file-hook
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1578 'find-file-hooks))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1579 (curr-mode 'allout-auto-activation))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1580
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1581 (cond ((not mode)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1582 (set find-file-hook-var-name
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1583 (delq hook (symbol-value find-file-hook-var-name)))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1584 (if (interactive-p)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1585 (message "Allout outline mode auto-activation inhibited.")))
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1586 ((eq mode 'report)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1587 (if (not (memq hook (symbol-value find-file-hook-var-name)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1588 (allout-init nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1589 ;; Just punt and use the reports from each of the modes:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1590 (allout-init (symbol-value curr-mode))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1591 (t (add-hook find-file-hook-var-name hook)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1592 (set curr-mode ; `set', not `setq'!
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1593 (cond ((eq mode 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1594 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1595 "Outline mode auto-activation enabled.")
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1596 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1597 ((eq mode 'report)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1598 ;; Return the current mode setting:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1599 (allout-init mode))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1600 ((eq mode 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1601 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1602 (concat "Outline mode auto-activation and "
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1603 "-layout (upon confirmation) enabled."))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1604 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1605 ((message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1606 "Outline mode auto-activation and -layout enabled.")
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1607 'full)))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1608 ;;;_ > allout-setup-menubar ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1609 (defun allout-setup-menubar ()
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
1610 "Populate the current buffer's menubar with `allout-mode' stuff."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1611 (let ((menus (list allout-mode-exposure-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1612 allout-mode-editing-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1613 allout-mode-navigation-menu
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1614 allout-mode-misc-menu))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1615 cur)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1616 (while menus
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1617 (setq cur (car menus)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1618 menus (cdr menus))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1619 (easy-menu-add cur))))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1620 ;;;_ > allout-overlay-preparations
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1621 (defun allout-overlay-preparations ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1622 "Set the properties of the allout invisible-text overlay and others."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1623 (setplist 'allout-exposure-category nil)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1624 (put 'allout-exposure-category 'invisible 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1625 (put 'allout-exposure-category 'evaporate t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1626 ;; XXX We use isearch-open-invisible *and* isearch-mode-end-hook. The
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1627 ;; latter would be sufficient, but it seems that a separate behavior -
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1628 ;; the _transient_ opening of invisible text during isearch - is keyed to
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1629 ;; presence of the isearch-open-invisible property - even though this
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1630 ;; property controls the isearch _arrival_ behavior. This is the case at
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1631 ;; least in emacs 21, 22.0, and xemacs 21.4.
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1632 (put 'allout-exposure-category 'isearch-open-invisible
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1633 'allout-isearch-end-handler)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1634 (if (featurep 'xemacs)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1635 (put 'allout-exposure-category 'start-open t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1636 (put 'allout-exposure-category 'insert-in-front-hooks
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1637 '(allout-overlay-insert-in-front-handler)))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1638 (put 'allout-exposure-category 'modification-hooks
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1639 '(allout-overlay-interior-modification-handler)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1640 ;;;_ > allout-mode (&optional toggle)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1641 ;;;_ : Defun:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1642 ;;;###autoload
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1643 (defun allout-mode (&optional toggle)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1644 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1645 "Toggle minor mode for controlling exposure and editing of text outlines.
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1646 \\<allout-mode-map>
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1647
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1648 Optional arg forces mode to re-initialize iff arg is positive num or
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1649 symbol. Allout outline mode always runs as a minor mode.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1650
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
1651 Allout outline mode provides extensive outline oriented formatting and
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1652 manipulation. It enables structural editing of outlines, as well as
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1653 navigation and exposure. It also is specifically aimed at
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1654 accommodating syntax-sensitive text like programming languages. (For
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1655 an example, see the allout code itself, which is organized as an allout
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1656 outline.)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1657
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1658 In addition to typical outline navigation and exposure, allout includes:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1659
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1660 - topic-oriented authoring, including keystroke-based topic creation,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1661 repositioning, promotion/demotion, cut, and paste
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1662 - incremental search with dynamic exposure and reconcealment of hidden text
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1663 - adjustable format, so programming code can be developed in outline-structure
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1664 - easy topic encryption and decryption
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1665 - \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1666 - integral outline layout, for automatic initial exposure when visiting a file
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1667 - independent extensibility, using comprehensive exposure and authoring hooks
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1668
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1669 and many other features.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1670
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1671 Below is a description of the key bindings, and then explanation of
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
1672 special `allout-mode' features and terminology. See also the outline
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1673 menubar additions for quick reference to many of the features, and see
54458
a0176bcc103f (allout-mode): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54223
diff changeset
1674 the docstring of the function `allout-init' for instructions on
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1675 priming your emacs session for automatic activation of `allout-mode'.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1676
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1677 The bindings are dictated by the customizable `allout-keybindings-list'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1678 variable. We recommend customizing `allout-command-prefix' to use just
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1679 `\\C-c' as the command prefix, if the allout bindings don't conflict with
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1680 any personal bindings you have on \\C-c. In any case, outline structure
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1681 navigation and authoring is simplified by positioning the cursor on an
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1682 item's bullet character, the \"hot-spot\" - then you can invoke allout
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1683 commands with just the un-prefixed, un-control-shifted command letters.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1684 This is described further in the HOT-SPOT Operation section.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1685
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1686 Exposure Control:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1687 ----------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1688 \\[allout-hide-current-subtree] `allout-hide-current-subtree'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1689 \\[allout-show-children] `allout-show-children'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1690 \\[allout-show-current-subtree] `allout-show-current-subtree'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1691 \\[allout-show-current-entry] `allout-show-current-entry'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1692 \\[allout-show-all] `allout-show-all'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1693
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1694 Navigation:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1695 ----------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1696 \\[allout-next-visible-heading] `allout-next-visible-heading'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1697 \\[allout-previous-visible-heading] `allout-previous-visible-heading'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1698 \\[allout-up-current-level] `allout-up-current-level'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1699 \\[allout-forward-current-level] `allout-forward-current-level'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1700 \\[allout-backward-current-level] `allout-backward-current-level'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1701 \\[allout-end-of-entry] `allout-end-of-entry'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1702 \\[allout-beginning-of-current-entry] `allout-beginning-of-current-entry' (alternately, goes to hot-spot)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1703 \\[allout-beginning-of-line] `allout-beginning-of-line' - like regular beginning-of-line, but
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1704 if immediately repeated cycles to the beginning of the current item
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1705 and then to the hot-spot (if `allout-beginning-of-line-cycles' is set).
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1706
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1707
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1708 Topic Header Production:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1709 -----------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1710 \\[allout-open-sibtopic] `allout-open-sibtopic' Create a new sibling after current topic.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1711 \\[allout-open-subtopic] `allout-open-subtopic' ... an offspring of current topic.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1712 \\[allout-open-supertopic] `allout-open-supertopic' ... a sibling of the current topic's parent.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1713
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1714 Topic Level and Prefix Adjustment:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1715 ---------------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1716 \\[allout-shift-in] `allout-shift-in' Shift current topic and all offspring deeper
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1717 \\[allout-shift-out] `allout-shift-out' ... less deep
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1718 \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1719 current topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1720 \\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1721 its' offspring - distinctive bullets are not changed, others
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1722 are alternated according to nesting depth.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1723 \\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1724 the offspring are not affected.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1725 With repeat count, revoke numbering.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1726
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1727 Topic-oriented Killing and Yanking:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1728 ----------------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1729 \\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1730 \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1731 \\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1732 \\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1733 \\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1734 depth of heading if yanking into bare topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1735 heading (ie, prefix sans text).
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1736 \\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1737
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1738 Topic-oriented Encryption:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1739 -------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1740 \\[allout-toggle-current-subtree-encryption] `allout-toggle-current-subtree-encryption'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1741 Encrypt/Decrypt topic content
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1742
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1743 Misc commands:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1744 -------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1745 M-x outlineify-sticky Activate outline mode for current buffer,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1746 and establish a default file-var setting
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1747 for `allout-layout'.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1748 \\[allout-mark-topic] `allout-mark-topic'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1749 \\[allout-copy-exposed-to-buffer] `allout-copy-exposed-to-buffer'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1750 Duplicate outline, sans concealed text, to
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1751 buffer with name derived from derived from that
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1752 of current buffer - \"*BUFFERNAME exposed*\".
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1753 \\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1754 Like above 'copy-exposed', but convert topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1755 prefixes to section.subsection... numeric
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1756 format.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1757 \\[eval-expression] (allout-init t) Setup Emacs session for outline mode
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1758 auto-activation.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1759
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1760 Topic Encryption
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1761
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1762 Outline mode supports gpg encryption of topics, with support for
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1763 symmetric and key-pair modes, passphrase timeout, passphrase
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1764 consistency checking, user-provided hinting for symmetric key
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1765 mode, and auto-encryption of topics pending encryption on save.
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1766
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1767 Topics pending encryption are, by default, automatically
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1768 encrypted during file saves. If the contents of the topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1769 containing the cursor was encrypted for a save, it is
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1770 automatically decrypted for continued editing.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1771
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1772 The aim of these measures is reliable topic privacy while
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1773 preventing accidents like neglected encryption before saves,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1774 forgetting which passphrase was used, and other practical
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1775 pitfalls.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1776
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1777 See `allout-toggle-current-subtree-encryption' function docstring
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1778 and `allout-encrypt-unencrypted-on-saves' customization variable
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1779 for details.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1780
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1781 HOT-SPOT Operation
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1782
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1783 Hot-spot operation provides a means for easy, single-keystroke outline
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1784 navigation and exposure control.
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1785
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1786 When the text cursor is positioned directly on the bullet character of
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1787 a topic, regular characters (a to z) invoke the commands of the
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1788 corresponding allout-mode keymap control chars. For example, \"f\"
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1789 would invoke the command typically bound to \"C-c<space>C-f\"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1790 \(\\[allout-forward-current-level] `allout-forward-current-level').
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1791
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1792 Thus, by positioning the cursor on a topic bullet, you can
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1793 execute the outline navigation and manipulation commands with a
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1794 single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) don't get
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1795 this special translation, so you can use them to get out of the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1796 hot-spot and back to normal editing operation.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1797
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1798 In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1799 replaced with one that makes it easy to get to the hot-spot. If you
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1800 repeat it immediately it cycles (if `allout-beginning-of-line-cycles'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1801 is set) to the beginning of the item and then, if you hit it again
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1802 immediately, to the hot-spot. Similarly, `allout-beginning-of-current-entry'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1803 \(\\[allout-beginning-of-current-entry]) moves to the hot-spot when the cursor is already located
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1804 at the beginning of the current entry.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1805
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1806 Extending Allout
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1807
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1808 Allout exposure and authoring activites all have associated
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1809 hooks, by which independent code can cooperate with allout
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1810 without changes to the allout core. Here are key ones:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1811
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1812 `allout-mode-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1813 `allout-mode-deactivate-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1814 `allout-exposure-change-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1815 `allout-structure-added-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1816 `allout-structure-deleted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1817 `allout-structure-shifted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1818
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1819 Terminology
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1820
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1821 Topic hierarchy constituents - TOPICS and SUBTOPICS:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1822
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1823 ITEM: A unitary outline element, including the HEADER and ENTRY text.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1824 TOPIC: An ITEM and any ITEMs contained within it, ie having greater DEPTH
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1825 and with no intervening items of lower DEPTH than the container.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1826 CURRENT ITEM:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1827 The visible ITEM most immediately containing the cursor.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1828 DEPTH: The degree of nesting of an ITEM; it increases with containment.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1829 The DEPTH is determined by the HEADER PREFIX. The DEPTH is also
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1830 called the:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1831 LEVEL: The same as DEPTH.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1832
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1833 ANCESTORS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1834 Those ITEMs whose TOPICs contain an ITEM.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1835 PARENT: An ITEM's immediate ANCESTOR. It has a DEPTH one less than that
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1836 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1837 OFFSPRING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1838 The ITEMs contained within an ITEM's TOPIC.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1839 SUBTOPIC:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1840 An OFFSPRING of its ANCESTOR TOPICs.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1841 CHILD:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1842 An immediate SUBTOPIC of its PARENT.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1843 SIBLINGS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1844 TOPICs having the same PARENT and DEPTH.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1845
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1846 Topic text constituents:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1847
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1848 HEADER: The first line of an ITEM, include the ITEM PREFIX and HEADER
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1849 text.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1850 ENTRY: The text content of an ITEM, before any OFFSPRING, but including
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1851 the HEADER text and distinct from the ITEM PREFIX.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1852 BODY: Same as ENTRY.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1853 PREFIX: The leading text of an ITEM which distinguishes it from normal
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1854 ENTRY text. Allout recognizes the outline structure according
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1855 to the strict PREFIX format. It consists of a PREFIX-LEAD string,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1856 PREFIX-PADDING, and a BULLET. The BULLET might be followed by a
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1857 number, indicating the ordinal number of the topic among its
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1858 siblings, or an asterisk indicating encryption, plus an optional
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1859 space. After that is the ITEM HEADER text, which is not part of
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1860 the PREFIX.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1861
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1862 The relative length of the PREFIX determines the nesting DEPTH
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1863 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1864 PREFIX-LEAD:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1865 The string at the beginning of a HEADER PREFIX, by default a `.'.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1866 It can be customized by changing the setting of
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1867 `allout-header-prefix' and then reinitializing `allout-mode'.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1868
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1869 When the PREFIX-LEAD is set to the comment-string of a
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1870 programming language, outline structuring can be embedded in
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1871 program code without interfering with processing of the text
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1872 (by emacs or the language processor) as program code. This
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1873 setting happens automatically when allout mode is used in
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1874 programming-mode buffers. See `allout-use-mode-specific-leader'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1875 docstring for more detail.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1876 PREFIX-PADDING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1877 Spaces or asterisks which separate the PREFIX-LEAD and the
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1878 bullet, determining the ITEM's DEPTH.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1879 BULLET: A character at the end of the ITEM PREFIX, it must be one of
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1880 the characters listed on `allout-plain-bullets-string' or
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1881 `allout-distinctive-bullets-string'. (See the documentation
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1882 for these variables for more details.) The default choice of
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1883 BULLET when generating ITEMs varies in a cycle with the DEPTH of
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1884 the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1885
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1886 EXPOSURE:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1887 The state of a TOPIC which determines the on-screen visibility
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1888 of its OFFSPRING and contained ENTRY text.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1889 CONCEALED:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1890 TOPICs and ENTRY text whose EXPOSURE is inhibited. Concealed
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1891 text is represented by \"...\" ellipses.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1892
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1893 CONCEALED TOPICs are effectively collapsed within an ANCESTOR.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1894 CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1895 OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1896 ;;;_ . Code
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1897 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1898
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1899 (let* ((active (and (not (equal major-mode 'outline))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1900 (allout-mode-p)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1901 ; Massage universal-arg `toggle' val:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1902 (toggle (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1903 (or (and (listp toggle)(car toggle))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1904 toggle)))
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1905 ; Activation specifically demanded?
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1906 (explicit-activation (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1907 (or (symbolp toggle)
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1908 (and (wholenump toggle)
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1909 (not (zerop toggle))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1910 ;; allout-mode already called once during this complex command?
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1911 (same-complex-command (eq allout-v18/19-file-var-hack
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1912 (car command-history)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1913 (write-file-hook-var-name (cond ((boundp 'write-file-functions)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1914 'write-file-functions)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1915 ((boundp 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1916 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1917 (t 'local-write-file-hooks)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1918 do-layout
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1919 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1920
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1921 ; See comments below re v19.18,.19 bug.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1922 (setq allout-v18/19-file-var-hack (car command-history))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1923
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1924 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1925
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1926 ;; Provision for v19.18, 19.19 bug -
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1927 ;; Emacs v 19.18, 19.19 file-var code invokes prop-line-designated
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1928 ;; modes twice when file is visited. We have to avoid toggling mode
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1929 ;; off on second invocation, so we detect it as best we can, and
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1930 ;; skip everything.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1931 ((and same-complex-command ; Still in same complex command
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1932 ; as last time `allout-mode' invoked.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1933 active ; Already activated.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1934 (not explicit-activation) ; Prop-line file-vars don't have args.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1935 (string-match "^19.1[89]" ; Bug only known to be in v19.18 and
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1936 emacs-version)); 19.19.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1937 t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1938
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1939 ;; Deactivation:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1940 ((and (not explicit-activation)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1941 (or active toggle))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1942 ; Activation not explicitly
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1943 ; requested, and either in
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1944 ; active state or *de*activation
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1945 ; specifically requested:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1946 (setq allout-explicitly-deactivated t)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1947
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1948 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1949
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1950 (remove-from-invisibility-spec '(allout . t))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1951 (remove-hook 'pre-command-hook 'allout-pre-command-business t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1952 (remove-hook 'post-command-hook 'allout-post-command-business t)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1953 (remove-hook 'before-change-functions 'allout-before-change-handler t)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1954 (remove-hook 'isearch-mode-end-hook 'allout-isearch-end-handler t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1955 (remove-hook write-file-hook-var-name 'allout-write-file-hook-handler t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1956 (remove-hook 'auto-save-hook 'allout-auto-save-hook-handler t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1957
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1958 (remove-overlays (point-min) (point-max)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1959 'category 'allout-exposure-category)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1960
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1961 (setq allout-mode nil)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1962 (run-hooks 'allout-mode-deactivate-hook))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1963
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1964 ;; Activation:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1965 ((not active)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1966 (setq allout-explicitly-deactivated nil)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1967 (if allout-old-style-prefixes
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1968 ;; Inhibit all the fancy formatting:
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1969 (allout-add-resumptions '(allout-primary-bullet "*")))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1970
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1971 (allout-overlay-preparations) ; Doesn't hurt to redo this.
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1972
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1973 (allout-infer-header-lead-and-primary-bullet)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1974 (allout-infer-body-reindent)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1975
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1976 (set-allout-regexp)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1977 (allout-add-resumptions
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1978 '(allout-encryption-ciphertext-rejection-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1979 allout-line-boundary-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1980 extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1981 '(allout-encryption-ciphertext-rejection-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1982 allout-bob-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1983 extend))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1984
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1985 ;; Produce map from current version of allout-keybindings-list:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1986 (allout-setup-mode-map)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1987 (produce-allout-mode-menubar-entries)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1988
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1989 ;; Include on minor-mode-map-alist, if not already there:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1990 (if (not (member '(allout-mode . allout-mode-map)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1991 minor-mode-map-alist))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1992 (setq minor-mode-map-alist
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1993 (cons '(allout-mode . allout-mode-map)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1994 minor-mode-map-alist)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1995
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1996 (add-to-invisibility-spec '(allout . t))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1997 (allout-add-resumptions '(line-move-ignore-invisible t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1998 (add-hook 'pre-command-hook 'allout-pre-command-business nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1999 (add-hook 'post-command-hook 'allout-post-command-business nil t)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2000 (add-hook 'before-change-functions 'allout-before-change-handler
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2001 nil t)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2002 (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2003 (add-hook write-file-hook-var-name 'allout-write-file-hook-handler
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2004 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2005 (add-hook 'auto-save-hook 'allout-auto-save-hook-handler
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2006 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2007
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2008 ;; Stash auto-fill settings and adjust so custom allout auto-fill
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2009 ;; func will be used if auto-fill is active or activated. (The
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2010 ;; custom func respects topic headline, maintains hanging-indents,
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2011 ;; etc.)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2012 (if (and auto-fill-function (not allout-inhibit-auto-fill))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2013 ;; allout-auto-fill will use the stashed values and so forth.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2014 (allout-add-resumptions '(auto-fill-function allout-auto-fill)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2015 (allout-add-resumptions (list 'allout-former-auto-filler
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2016 auto-fill-function)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2017 ;; Register allout-auto-fill to be used if
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2018 ;; filling is active:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2019 (list 'allout-outside-normal-auto-fill-function
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2020 normal-auto-fill-function)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2021 '(normal-auto-fill-function allout-auto-fill)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2022 ;; Paragraphs are broken by topic headlines.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2023 (list 'paragraph-start
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2024 (concat paragraph-start "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2025 allout-regexp "\\)"))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2026 (list 'paragraph-separate
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2027 (concat paragraph-separate "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2028 allout-regexp "\\)")))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2029 (or (assq 'allout-mode minor-mode-alist)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2030 (setq minor-mode-alist
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
2031 (cons '(allout-mode " Allout") minor-mode-alist)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2032
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2033 (allout-setup-menubar)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2034
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2035 (if allout-layout
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2036 (setq do-layout t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2037
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2038 (setq allout-mode t)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2039 (run-hooks 'allout-mode-hook))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2040
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2041 ;; Reactivation:
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
2042 ((setq do-layout t)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2043 (allout-infer-body-reindent))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2044 ) ;; end of activation-mode cases.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2045
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2046 ;; Do auto layout if warranted:
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2047 (let ((use-layout (if (listp allout-layout)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2048 allout-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2049 allout-default-layout)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2050 (if (and do-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2051 allout-auto-activation
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2052 use-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2053 (and (not (eq allout-auto-activation 'activate))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2054 (if (eq allout-auto-activation 'ask)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2055 (if (y-or-n-p (format "Expose %s with layout '%s'? "
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2056 (buffer-name)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2057 use-layout))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2058 t
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2059 (message "Skipped %s layout." (buffer-name))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2060 nil)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2061 t)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2062 (save-excursion
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2063 (message "Adjusting '%s' exposure..." (buffer-name))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2064 (goto-char 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2065 (allout-this-or-next-heading)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2066 (condition-case err
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2067 (progn
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2068 (apply 'allout-expose-topic (list use-layout))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2069 (message "Adjusting '%s' exposure... done." (buffer-name)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2070 ;; Problem applying exposure - notify user, but don't
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2071 ;; interrupt, eg, file visit:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2072 (error (message "%s" (car (cdr err)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2073 (sit-for 1))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2074 allout-mode
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2075 ) ; let*
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2076 ) ; defun
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2077
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2078 (defun allout-setup-mode-map ()
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2079 "Establish allout-mode bindings."
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2080 (setq-default allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2081 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2082 (setq allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2083 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2084 (substitute-key-definition 'beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2085 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2086 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2087 (substitute-key-definition 'move-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2088 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2089 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2090 (substitute-key-definition 'end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2091 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2092 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2093 (substitute-key-definition 'move-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2094 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2095 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2096 (fset 'allout-mode-map allout-mode-map))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2097
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2098 ;; ensure that allout-mode-map has some setting even if allout-mode hasn't
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2099 ;; been invoked:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2100 (allout-setup-mode-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2101
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2102 ;;;_ > allout-minor-mode
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2103 (defalias 'allout-minor-mode 'allout-mode)
68956
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2104
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2105 ;;;_ - Position Assessment
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2106 ;;;_ > allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2107 (defsubst allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2108 "Non-nil if the character after point is invisible."
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
2109 (eq (get-char-property (or pos (point)) 'invisible) 'allout))
68956
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2110
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2111 ;;;_ > allout-overlay-insert-in-front-handler (ol after beg end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2112 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2113 (defun allout-overlay-insert-in-front-handler (ol after beg end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2114 &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2115 "Shift the overlay so stuff inserted in front of it are excluded."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2116 (if after
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2117 (move-overlay ol (1+ beg) (overlay-end ol))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2118 ;;;_ > allout-overlay-interior-modification-handler (ol after beg end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2119 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2120 (defun allout-overlay-interior-modification-handler (ol after beg end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2121 &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2122 "Get confirmation before making arbitrary changes to invisible text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2123
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2124 We expose the invisible text and ask for confirmation. Refusal or
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2125 keyboard-quit abandons the changes, with keyboard-quit additionally
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2126 reclosing the opened text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2127
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2128 No confirmation is necessary when inhibit-read-only is set - eg, allout
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2129 internal functions use this feature cohesively bunch changes."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2130
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2131 (when (and (not inhibit-read-only) (not after))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2132 (let ((start (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2133 (ol-start (overlay-start ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2134 (ol-end (overlay-end ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2135 first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2136 (goto-char beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2137 (while (< (point) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2138 (when (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2139 (allout-show-to-offshoot)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2140 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2141 (save-excursion (forward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2142 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2143 (when (not first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2144 (setq first (point))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2145 (goto-char (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2146 (next-property-change (1+ (point)) nil end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2147 (next-char-property-change (1+ (point)) end))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2148 (when first
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2149 (goto-char first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2150 (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2151 (if (not
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2152 (yes-or-no-p
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2153 (substitute-command-keys
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2154 (concat "Modify concealed text? (\"no\" just aborts,"
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2155 " \\[keyboard-quit] also reconceals) "))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2156 (progn (goto-char start)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2157 (error "Concealed-text change refused.")))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2158 (quit (allout-flag-region ol-start ol-end nil)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2159 (allout-flag-region ol-start ol-end t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2160 (error "Concealed-text change abandoned, text reconcealed."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2161 (goto-char start))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2162 ;;;_ > allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2163 (defun allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2164 "Protect against changes to invisible text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2165
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
2166 See allout-overlay-interior-modification-handler for details."
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2167
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2168 (if (and (allout-mode-p) undo-in-progress (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2169 (allout-show-to-offshoot))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2170
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2171 ;; allout-overlay-interior-modification-handler on an overlay handles
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2172 ;; this in other emacs, via `allout-exposure-category's 'modification-hooks.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2173 (when (and (featurep 'xemacs) (allout-mode-p))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2174 ;; process all of the pending overlays:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2175 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2176 (got-char beg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2177 (let ((overlay (allout-get-invisibility-overlay)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2178 (allout-overlay-interior-modification-handler
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2179 overlay nil beg end nil)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2180 ;;;_ > allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2181 (defun allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2182 "Reconcile allout outline exposure on arriving in hidden text after isearch.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2183
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2184 Optional OVERLAY parameter is for when this function is used by
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2185 `isearch-open-invisible' overlay property. It is otherwise unused, so this
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2186 function can also be used as an `isearch-mode-end-hook'."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2187
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2188 (if (and (allout-mode-p) (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2189 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2190
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2191 ;;;_ #3 Internal Position State-Tracking - "allout-recent-*" funcs
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2192 ;;; All the basic outline functions that directly do string matches to
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2193 ;;; evaluate heading prefix location set the variables
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2194 ;;; `allout-recent-prefix-beginning' and `allout-recent-prefix-end'
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2195 ;;; when successful. Functions starting with `allout-recent-' all
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2196 ;;; use this state, providing the means to avoid redundant searches
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2197 ;;; for just-established data. This optimization can provide
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2198 ;;; significant speed improvement, but it must be employed carefully.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2199 ;;;_ = allout-recent-prefix-beginning
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2200 (defvar allout-recent-prefix-beginning 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2201 "Buffer point of the start of the last topic prefix encountered.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2202 (make-variable-buffer-local 'allout-recent-prefix-beginning)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2203 ;;;_ = allout-recent-prefix-end
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2204 (defvar allout-recent-prefix-end 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2205 "Buffer point of the end of the last topic prefix encountered.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2206 (make-variable-buffer-local 'allout-recent-prefix-end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2207 ;;;_ = allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2208 (defvar allout-recent-depth 0
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2209 "Depth of the last topic prefix encountered.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2210 (make-variable-buffer-local 'allout-recent-depth)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2211 ;;;_ = allout-recent-end-of-subtree
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2212 (defvar allout-recent-end-of-subtree 0
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2213 "Buffer point last returned by `allout-end-of-current-subtree'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2214 (make-variable-buffer-local 'allout-recent-end-of-subtree)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2215 ;;;_ > allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2216 (defsubst allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2217 "Register allout-prefix state data.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2218
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2219 For reference by `allout-recent' funcs. Returns BEGINNING."
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2220 (setq allout-recent-prefix-end (or (match-end 1) (match-end 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2221 allout-recent-prefix-beginning (or (match-beginning 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2222 (match-beginning 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2223 allout-recent-depth (max 1 (- allout-recent-prefix-end
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2224 allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2225 allout-header-subtraction)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2226 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2227 ;;;_ > nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2228 (defsubst nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2229 "Mark allout prefix data as being uninformative."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2230 (setq allout-recent-prefix-end (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2231 allout-recent-prefix-beginning (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2232 allout-recent-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2233 allout-recent-prefix-beginning)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2234 ;;;_ > allout-recent-depth ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2235 (defsubst allout-recent-depth ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2236 "Return depth of last heading encountered by an outline maneuvering function.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2237
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2238 All outline functions which directly do string matches to assess
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2239 headings set the variables `allout-recent-prefix-beginning' and
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2240 `allout-recent-prefix-end' if successful. This function uses those settings
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2241 to return the current depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2242
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2243 allout-recent-depth)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2244 ;;;_ > allout-recent-prefix ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2245 (defsubst allout-recent-prefix ()
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2246 "Like `allout-recent-depth', but returns text of last encountered prefix.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2247
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2248 All outline functions which directly do string matches to assess
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2249 headings set the variables `allout-recent-prefix-beginning' and
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2250 `allout-recent-prefix-end' if successful. This function uses those settings
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2251 to return the current prefix."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2252 (buffer-substring-no-properties allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2253 allout-recent-prefix-end))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2254 ;;;_ > allout-recent-bullet ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2255 (defmacro allout-recent-bullet ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2256 "Like allout-recent-prefix, but returns bullet of last encountered prefix.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2257
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2258 All outline functions which directly do string matches to assess
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2259 headings set the variables `allout-recent-prefix-beginning' and
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
2260 `allout-recent-prefix-end' if successful. This function uses those settings
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2261 to return the current depth of the most recently matched topic."
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2262 '(buffer-substring-no-properties (1- allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2263 allout-recent-prefix-end))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2264
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2265 ;;;_ #4 Navigation
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2266
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2267 ;;;_ - Position Assessment
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2268 ;;;_ : Location Predicates
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2269 ;;;_ > allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2270 (defsubst allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2271 "True if current item conditions qualify for checking on topic aberrance."
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2272 (and
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2273 ;; presume integrity of outline and yanked content during yank - necessary,
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2274 ;; to allow for level disparity of yank location and yanked text:
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2275 (not allout-inhibit-aberrance-doublecheck)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2276 ;; allout-doublecheck-at-and-shallower is ceiling for doublecheck:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2277 (<= allout-recent-depth allout-doublecheck-at-and-shallower)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2278 ;;;_ > allout-aberrant-container-p ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2279 (defun allout-aberrant-container-p ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2280 "True if topic, or next sibling with children, contains them discontinuously.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2281
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2282 Discontinuous means an immediate offspring that is nested more
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2283 than one level deeper than the topic.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2284
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2285 If topic has no offspring, then the next sibling with offspring will
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2286 determine whether or not this one is determined to be aberrant.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2287
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2288 If true, then the allout-recent-* settings are calibrated on the
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2289 offspring that qaulifies it as aberrant, ie with depth that
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2290 exceeds the topic by more than one."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2291
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2292 ;; This is most clearly understood when considering standard-prefix-leader
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2293 ;; low-level topics, which can all too easily match text not intended as
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2294 ;; headers. For example, any line with a leading '.' or '*' and lacking a
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2295 ;; following bullet qualifies without this protection. (A sequence of
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2296 ;; them can occur naturally, eg a typical textual bullet list.) We
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2297 ;; disqualify such low-level sequences when they are followed by a
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2298 ;; discontinuously contained child, inferring that the sequences are not
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2299 ;; actually connected with their prospective context.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2300
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2301 (let ((depth (allout-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2302 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2303 done aberrant)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2304 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2305 (while (and (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2306 (re-search-forward allout-line-boundary-regexp nil 0))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2307 (allout-prefix-data)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2308 (goto-char allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2309 (cond
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2310 ;; sibling - continue:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2311 ((eq allout-recent-depth depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2312 ;; first offspring is excessive - aberrant:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2313 ((> allout-recent-depth (1+ depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2314 (setq done t aberrant t))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2315 ;; next non-sibling is lower-depth - not aberrant:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2316 (t (setq done t)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2317 (if aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2318 aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2319 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2320 ;; recalibrate allout-recent-*
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2321 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2322 nil)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2323 ;;;_ > allout-on-current-heading-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2324 (defun allout-on-current-heading-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2325 "Return non-nil if point is on current visible topics' header line.
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2326
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2327 Actually, returns prefix beginning point."
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2328 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2329 (allout-beginning-of-current-line)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2330 (and (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2331 (allout-prefix-data)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2332 (or (not (allout-do-doublecheck))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2333 (not (allout-aberrant-container-p))))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2334 ;;;_ > allout-on-heading-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2335 (defalias 'allout-on-heading-p 'allout-on-current-heading-p)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2336 ;;;_ > allout-e-o-prefix-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2337 (defun allout-e-o-prefix-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2338 "True if point is located where current topic prefix ends, heading begins."
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2339 (and (save-excursion (let ((inhibit-field-text-motion t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2340 (beginning-of-line))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2341 (looking-at allout-regexp))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2342 (= (point)(save-excursion (allout-end-of-prefix)(point)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2343 ;;;_ : Location attributes
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2344 ;;;_ > allout-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2345 (defun allout-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2346 "Return depth of topic most immediately containing point.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2347
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2348 Return zero if point is not within any topic.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2349
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2350 Like `allout-current-depth', but respects hidden as well as visible topics."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2351 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2352 (let ((start-point (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2353 (if (and (allout-goto-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2354 (not (< start-point (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2355 allout-recent-depth
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2356 (progn
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2357 ;; Oops, no prefix, nullify it:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2358 (nullify-allout-prefix-data)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2359 ;; ... and return 0:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2360 0)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2361 ;;;_ > allout-current-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2362 (defun allout-current-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2363 "Return depth of visible topic most immediately containing point.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2364
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2365 Return zero if point is not within any topic."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2366 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2367 (if (allout-back-to-current-heading)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2368 (max 1
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2369 (- allout-recent-prefix-end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2370 allout-recent-prefix-beginning
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2371 allout-header-subtraction))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2372 0)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2373 ;;;_ > allout-get-current-prefix ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2374 (defun allout-get-current-prefix ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2375 "Topic prefix of the current topic."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2376 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2377 (if (allout-goto-prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2378 (allout-recent-prefix))))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2379 ;;;_ > allout-get-bullet ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2380 (defun allout-get-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2381 "Return bullet of containing topic (visible or not)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2382 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2383 (and (allout-goto-prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2384 (allout-recent-bullet))))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2385 ;;;_ > allout-current-bullet ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2386 (defun allout-current-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2387 "Return bullet of current (visible) topic heading, or none if none found."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2388 (condition-case nil
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2389 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2390 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2391 (buffer-substring-no-properties (- allout-recent-prefix-end 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2392 allout-recent-prefix-end))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2393 ;; Quick and dirty provision, ostensibly for missing bullet:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2394 (args-out-of-range nil))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2395 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2396 ;;;_ > allout-get-prefix-bullet (prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2397 (defun allout-get-prefix-bullet (prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2398 "Return the bullet of the header prefix string PREFIX."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2399 ;; Doesn't make sense if we're old-style prefixes, but this just
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2400 ;; oughtn't be called then, so forget about it...
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2401 (if (string-match allout-regexp prefix)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2402 (substring prefix (1- (match-end 2)) (match-end 2))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2403 ;;;_ > allout-sibling-index (&optional depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2404 (defun allout-sibling-index (&optional depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2405 "Item number of this prospective topic among its siblings.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2406
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2407 If optional arg DEPTH is greater than current depth, then we're
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2408 opening a new level, and return 0.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2409
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2410 If less than this depth, ascend to that depth and count..."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2411
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2412 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2413 (cond ((and depth (<= depth 0) 0))
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2414 ((or (null depth) (= depth (allout-depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2415 (let ((index 1))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2416 (while (allout-previous-sibling allout-recent-depth nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2417 (setq index (1+ index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2418 index))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2419 ((< depth allout-recent-depth)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2420 (allout-ascend-to-depth depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2421 (allout-sibling-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2422 (0))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2423 ;;;_ > allout-topic-flat-index ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2424 (defun allout-topic-flat-index ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2425 "Return a list indicating point's numeric section.subsect.subsubsect...
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2426 Outermost is first."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2427 (let* ((depth (allout-depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2428 (next-index (allout-sibling-index depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2429 (rev-sibls nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2430 (while (> next-index 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2431 (setq rev-sibls (cons next-index rev-sibls))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2432 (setq depth (1- depth))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2433 (setq next-index (allout-sibling-index depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2434 rev-sibls)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2435 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2436
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2437 ;;;_ - Navigation routines
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2438 ;;;_ > allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2439 (defun allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2440 "Like beginning of line, but to visible text."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2441
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
2442 ;; This combination of move-beginning-of-line and beginning-of-line is
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
2443 ;; deliberate, but the (beginning-of-line) may now be superfluous.
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2444 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2445 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2446 (beginning-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2447 (while (and (not (bobp)) (or (not (bolp)) (allout-hidden-p)))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2448 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2449 (if (or (allout-hidden-p) (not (bolp)))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2450 (forward-char -1)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2451 ;;;_ > allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2452 (defun allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2453 "Move to the end of line, past concealed text if any."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2454 ;; XXX This is for symmetry with `allout-beginning-of-current-line' -
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2455 ;; `move-end-of-line' doesn't suffer the same problem as
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2456 ;; `move-beginning-of-line'.
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2457 (let ((inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2458 (end-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2459 (while (allout-hidden-p)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2460 (end-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2461 (if (allout-hidden-p) (forward-char 1)))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2462 ;;;_ > allout-beginning-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2463 (defun allout-beginning-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2464 "Beginning-of-line with `allout-beginning-of-line-cycles' behavior, if set."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2465
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2466 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2467
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2468 (if (or (not allout-beginning-of-line-cycles)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2469 (not (equal last-command this-command)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2470 (move-beginning-of-line 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2471 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2472 (let ((beginning-of-body
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2473 (save-excursion
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2474 (while (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2475 (allout-aberrant-container-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2476 (allout-previous-visible-heading 1)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2477 (allout-beginning-of-current-entry)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2478 (point))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2479 (cond ((= (current-column) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2480 (goto-char beginning-of-body))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2481 ((< (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2482 (allout-beginning-of-current-line))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2483 ((= (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2484 (goto-char (allout-current-bullet-pos)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2485 (t (allout-beginning-of-current-line)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2486 (if (< (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2487 ;; we were on the headline after its start:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2488 (goto-char beginning-of-body)))))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2489 ;;;_ > allout-end-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2490 (defun allout-end-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2491 "End-of-line with `allout-end-of-line-cycles' behavior, if set."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2492
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2493 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2494
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2495 (if (or (not allout-end-of-line-cycles)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2496 (not (equal last-command this-command)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2497 (allout-end-of-current-line)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2498 (let ((end-of-entry (save-excursion
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2499 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2500 (point))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2501 (cond ((not (eolp))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2502 (allout-end-of-current-line))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2503 ((or (allout-hidden-p) (save-excursion
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2504 (forward-char -1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2505 (allout-hidden-p)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2506 (allout-back-to-current-heading)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2507 (allout-show-current-entry)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2508 (allout-show-children)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2509 (allout-end-of-entry))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2510 ((>= (point) end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2511 (allout-back-to-current-heading)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2512 (allout-end-of-current-line))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2513 (t (allout-end-of-entry))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2514 ;;;_ > allout-next-heading ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2515 (defsubst allout-next-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2516 "Move to the heading for the topic (possibly invisible) after this one.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2517
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2518 Returns the location of the heading, or nil if none found.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2519
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2520 We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2521 (if (looking-at allout-regexp)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2522 (forward-char 1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2523
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2524 (when (re-search-forward allout-line-boundary-regexp nil 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2525 (allout-prefix-data)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2526 (and (allout-do-doublecheck)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2527 ;; this will set allout-recent-* on the first non-aberrant topic,
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2528 ;; whether it's the current one or one that disqualifies it:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2529 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2530 (goto-char allout-recent-prefix-beginning)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2531 ;;;_ > allout-this-or-next-heading
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2532 (defun allout-this-or-next-heading ()
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
2533 "Position cursor on current or next heading."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2534 ;; A throwaway non-macro that is defined after allout-next-heading
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2535 ;; and usable by allout-mode.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2536 (if (not (allout-goto-prefix-doublechecked)) (allout-next-heading)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2537 ;;;_ > allout-previous-heading ()
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2538 (defun allout-previous-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2539 "Move to the prior (possibly invisible) heading line.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2540
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2541 Return the location of the beginning of the heading, or nil if not found.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2542
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2543 We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2544
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2545 (if (bobp)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2546 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2547 (let ((start-point (point)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2548 ;; allout-goto-prefix-doublechecked calls us, so we can't use it here.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2549 (allout-goto-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2550 (when (or (re-search-backward allout-line-boundary-regexp nil 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2551 (looking-at allout-bob-regexp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2552 (goto-char (allout-prefix-data))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2553 (if (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2554 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2555 (or (allout-previous-heading)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2556 (and (goto-char start-point)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2557 ;; recalibrate allout-recent-*:
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2558 (allout-depth)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2559 nil))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2560 (point))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2561 ;;;_ > allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2562 (defun allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2563 "Return the overlay at point that dictates allout invisibility."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2564 (let ((overlays (overlays-at (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2565 got)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2566 (while (and overlays (not got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2567 (if (equal (overlay-get (car overlays) 'invisible) 'allout)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2568 (setq got (car overlays))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2569 (pop overlays)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2570 got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2571 ;;;_ > allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2572 (defun allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2573 "Move to most recent prior character that is visible, and return point."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2574 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2575 (goto-char (overlay-start (allout-get-invisibility-overlay))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2576 (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2577
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2578 ;;;_ - Subtree Charting
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2579 ;;;_ " These routines either produce or assess charts, which are
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2580 ;;; nested lists of the locations of topics within a subtree.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2581 ;;;
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2582 ;;; Charts enable efficient subtree navigation by providing a reusable basis
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2583 ;;; for elaborate, compound assessment and adjustment of a subtree.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2584
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2585 ;;;_ > allout-chart-subtree (&optional levels visible orig-depth prev-depth)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2586 (defun allout-chart-subtree (&optional levels visible orig-depth prev-depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2587 "Produce a location \"chart\" of subtopics of the containing topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2588
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2589 Optional argument LEVELS specifies a depth limit (relative to start
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2590 depth) for the chart. Null LEVELS means no limit.
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2591
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2592 When optional argument VISIBLE is non-nil, the chart includes
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2593 only the visible subelements of the charted subjects.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2594
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2595 The remaining optional args are for internal use by the function.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2596
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2597 Point is left at the end of the subtree.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2598
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2599 Charts are used to capture outline structure, so that outline-altering
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2600 routines need assess the structure only once, and then use the chart
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2601 for their elaborate manipulations.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2602
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2603 The chart entries for the topics are in reverse order, so the
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2604 last topic is listed first. The entry for each topic consists of
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2605 an integer indicating the point at the beginning of the topic
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2606 prefix. Charts for offspring consists of a list containing,
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2607 recursively, the charts for the respective subtopics. The chart
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2608 for a topics' offspring precedes the entry for the topic itself.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2609
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2610 The other function parameters are for internal recursion, and should
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2611 not be specified by external callers. ORIG-DEPTH is depth of topic at
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2612 starting point, and PREV-DEPTH is depth of prior topic."
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2613
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2614 (let ((original (not orig-depth)) ; `orig-depth' set only in recursion.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2615 chart curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2616
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2617 (if original ; Just starting?
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2618 ; Register initial settings and
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2619 ; position to first offspring:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2620 (progn (setq orig-depth (allout-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2621 (or prev-depth (setq prev-depth (1+ orig-depth)))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2622 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2623 (allout-next-visible-heading 1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2624 (allout-next-heading))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2625
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2626 ;; Loop over the current levels' siblings. Besides being more
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2627 ;; efficient than tail-recursing over a level, it avoids exceeding
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2628 ;; the typically quite constrained Emacs max-lisp-eval-depth.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2629 ;;
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2630 ;; Probably would speed things up to implement loop-based stack
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2631 ;; operation rather than recursing for lower levels. Bah.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2632
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2633 (while (and (not (eobp))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2634 ; Still within original topic?
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2635 (< orig-depth (setq curr-depth allout-recent-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2636 (cond ((= prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2637 ;; Register this one and move on:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2638 (setq chart (cons allout-recent-prefix-beginning chart))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2639 (if (and levels (<= levels 1))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2640 ;; At depth limit - skip sublevels:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2641 (or (allout-next-sibling curr-depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2642 ;; or no more siblings - proceed to
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2643 ;; next heading at lesser depth:
7676
5b8a573e9f69 (outline-chart-subtree): Include outline-next-heading in loop conditions
Richard M. Stallman <rms@gnu.org>
parents: 7639
diff changeset
2644 (while (and (<= curr-depth
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2645 allout-recent-depth)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2646 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2647 (allout-next-visible-heading 1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2648 (allout-next-heading)))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2649 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2650 (allout-next-visible-heading 1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2651 (allout-next-heading))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2652
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2653 ((and (< prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2654 (or (not levels)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2655 (> levels 0)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2656 ;; Recurse on deeper level of curr topic:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2657 (setq chart
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2658 (cons (allout-chart-subtree (and levels
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2659 (1- levels))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2660 visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2661 orig-depth
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2662 curr-depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2663 chart))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2664 ;; ... then continue with this one.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2665 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2666
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2667 ;; ... else nil if we've ascended back to prev-depth.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2668
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2669 )))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2670
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2671 (if original ; We're at the last sibling on
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2672 ; the original level. Position
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2673 ; to the end of it:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2674 (progn (and (not (eobp)) (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2675 (and (= (preceding-char) ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2676 (= (aref (buffer-substring (max 1 (- (point) 3))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2677 (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2678 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2679 ?\n)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2680 (forward-char -1))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2681 (setq allout-recent-end-of-subtree (point))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2682
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2683 chart ; (nreverse chart) not necessary,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2684 ; and maybe not preferable.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2685 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2686 ;;;_ > allout-chart-siblings (&optional start end)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2687 (defun allout-chart-siblings (&optional start end)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2688 "Produce a list of locations of this and succeeding sibling topics.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2689 Effectively a top-level chart of siblings. See `allout-chart-subtree'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2690 for an explanation of charts."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2691 (save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2692 (when (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2693 (let ((chart (list (point))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2694 (while (allout-next-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2695 (setq chart (cons (point) chart)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2696 (if chart (setq chart (nreverse chart)))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2697 ;;;_ > allout-chart-to-reveal (chart depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2698 (defun allout-chart-to-reveal (chart depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2699
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2700 "Return a flat list of hidden points in subtree CHART, up to DEPTH.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2701
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2702 If DEPTH is nil, include hidden points at any depth.
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2703
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2704 Note that point can be left at any of the points on chart, or at the
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2705 start point."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2706
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2707 (let (result here)
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2708 (while (and (or (null depth) (> depth 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2709 chart)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2710 (setq here (car chart))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2711 (if (listp here)
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2712 (let ((further (allout-chart-to-reveal here (if (null depth)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2713 depth
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2714 (1- depth)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2715 ;; We're on the start of a subtree - recurse with it, if there's
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2716 ;; more depth to go:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2717 (if further (setq result (append further result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2718 (setq chart (cdr chart)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2719 (goto-char here)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2720 (if (allout-hidden-p)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2721 (setq result (cons here result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2722 (setq chart (cdr chart))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2723 result))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2724 ;;;_ X allout-chart-spec (chart spec &optional exposing)
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2725 ;; (defun allout-chart-spec (chart spec &optional exposing)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2726 ;; "Not yet (if ever) implemented.
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2727
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2728 ;; Produce exposure directives given topic/subtree CHART and an exposure SPEC.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2729
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2730 ;; Exposure spec indicates the locations to be exposed and the prescribed
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2731 ;; exposure status. Optional arg EXPOSING is an integer, with 0
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2732 ;; indicating pending concealment, anything higher indicating depth to
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2733 ;; which subtopic headers should be exposed, and negative numbers
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2734 ;; indicating (negative of) the depth to which subtopic headers and
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2735 ;; bodies should be exposed.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2736
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2737 ;; The produced list can have two types of entries. Bare numbers
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2738 ;; indicate points in the buffer where topic headers that should be
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2739 ;; exposed reside.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2740
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2741 ;; - bare negative numbers indicates that the topic starting at the
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2742 ;; point which is the negative of the number should be opened,
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2743 ;; including their entries.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2744 ;; - bare positive values indicate that this topic header should be
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2745 ;; opened.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2746 ;; - Lists signify the beginning and end points of regions that should
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2747 ;; be flagged, and the flag to employ. (For concealment: `(\?r)', and
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2748 ;; exposure:"
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2749 ;; (while spec
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2750 ;; (cond ((listp spec)
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2751 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2752 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2753 ;; (setq spec (cdr spec)))
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2754 ;; )
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2755
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2756 ;;;_ - Within Topic
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2757 ;;;_ > allout-goto-prefix ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2758 (defun allout-goto-prefix ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2759 "Put point at beginning of immediately containing outline topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2760
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2761 Goes to most immediate subsequent topic if none immediately containing.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2762
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2763 Not sensitive to topic visibility.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2764
46161
29f1f32aee5b (outline-goto-prefix): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 44182
diff changeset
2765 Returns the point at the beginning of the prefix, or nil if none."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2766
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2767 (let (done)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2768 (while (and (not done)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2769 (search-backward "\n" nil 1))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2770 (forward-char 1)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2771 (if (looking-at allout-regexp)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2772 (setq done (allout-prefix-data))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2773 (forward-char -1)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2774 (if (bobp)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2775 (cond ((looking-at allout-regexp)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2776 (allout-prefix-data))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2777 ((allout-next-heading))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2778 (done))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2779 done)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2780 ;;;_ > allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2781 (defun allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2782 "Put point at beginning of immediately containing outline topic.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2783
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2784 Like `allout-goto-prefix', but shallow topics (according to
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2785 `allout-doublecheck-at-and-shallower') are checked and
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2786 disqualified for child containment discontinuity, according to
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2787 `allout-aberrant-container-p'."
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2788 (if (allout-goto-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2789 (if (and (allout-do-doublecheck)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2790 (allout-aberrant-container-p))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2791 (allout-previous-heading)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2792 (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2793
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2794 ;;;_ > allout-end-of-prefix ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2795 (defun allout-end-of-prefix (&optional ignore-decorations)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2796 "Position cursor at beginning of header text.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2797
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2798 If optional IGNORE-DECORATIONS is non-nil, put just after bullet,
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2799 otherwise skip white space between bullet and ensuing text."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2800
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2801 (if (not (allout-goto-prefix-doublechecked))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2802 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2803 (goto-char allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2804 (if ignore-decorations
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2805 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2806 (while (looking-at "[0-9]") (forward-char 1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2807 (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2808 ;; Reestablish where we are:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2809 (allout-current-depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2810 ;;;_ > allout-current-bullet-pos ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2811 (defun allout-current-bullet-pos ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2812 "Return position of current (visible) topic's bullet."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2813
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2814 (if (not (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2815 nil
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2816 (1- allout-recent-prefix-end)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2817 ;;;_ > allout-back-to-current-heading ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2818 (defun allout-back-to-current-heading ()
73315
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2819 "Move to heading line of current topic, or beginning if not in a topic.
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2820
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2821 If interactive, we position at the end of the prefix.
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2822
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2823 Return value of resulting point, unless we started outside
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2824 of (before any) topics, in which case we return nil."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2825
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2826 (allout-beginning-of-current-line)
73315
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2827 (let ((bol-point (point)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2828 (if (allout-goto-prefix-doublechecked)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2829 (if (<= (point) bol-point)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2830 (if (interactive-p)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2831 (allout-end-of-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2832 (point))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2833 (goto-char (point-min))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2834 nil))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2835 ;;;_ > allout-back-to-heading ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2836 (defalias 'allout-back-to-heading 'allout-back-to-current-heading)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2837 ;;;_ > allout-pre-next-prefix ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2838 (defun allout-pre-next-prefix ()
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2839 "Skip forward to just before the next heading line.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2840
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2841 Returns that character position."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2842
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2843 (if (allout-next-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2844 (goto-char (1- allout-recent-prefix-beginning))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2845 ;;;_ > allout-end-of-subtree (&optional current include-trailing-blank)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2846 (defun allout-end-of-subtree (&optional current include-trailing-blank)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2847 "Put point at the end of the last leaf in the containing topic.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2848
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2849 Optional CURRENT means put point at the end of the containing
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2850 visible topic.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2851
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2852 Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2853 any, as part of the subtree. Otherwise, that trailing blank will be
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2854 excluded as delimiting whitespace between topics.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2855
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2856 Returns the value of point."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2857 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2858 (if current
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2859 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2860 (allout-goto-prefix-doublechecked))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2861 (let ((level allout-recent-depth))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2862 (allout-next-heading)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2863 (while (and (not (eobp))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2864 (> allout-recent-depth level))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2865 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2866 (if (eobp)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2867 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2868 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2869 (if (and (not include-trailing-blank) (= ?\n (preceding-char)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2870 (forward-char -1))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2871 (setq allout-recent-end-of-subtree (point))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2872 ;;;_ > allout-end-of-current-subtree (&optional include-trailing-blank)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2873 (defun allout-end-of-current-subtree (&optional include-trailing-blank)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2874
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2875 "Put point at end of last leaf in currently visible containing topic.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2876
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2877 Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2878 any, as part of the subtree. Otherwise, that trailing blank will be
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2879 excluded as delimiting whitespace between topics.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2880
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2881 Returns the value of point."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2882 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2883 (allout-end-of-subtree t include-trailing-blank))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2884 ;;;_ > allout-beginning-of-current-entry ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2885 (defun allout-beginning-of-current-entry ()
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2886 "When not already there, position point at beginning of current topic header.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2887
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2888 If already there, move cursor to bullet for hot-spot operation.
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2889 \(See `allout-mode' doc string for details of hot-spot operation.)"
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2890 (interactive)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2891 (let ((start-point (point)))
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2892 (move-beginning-of-line 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2893 (if (< 0 (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2894 (goto-char allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2895 (goto-char (point-min)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2896 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2897 (if (and (interactive-p)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2898 (= (point) start-point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2899 (goto-char (allout-current-bullet-pos)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2900 ;;;_ > allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2901 (defun allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2902 "Position the point at the end of the current topics' entry.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2903
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2904 Optional INCLUSIVE means also include trailing empty line, if any. When
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2905 unset, whitespace between items separates them even when the items are
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2906 collapsed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2907 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2908 (allout-pre-next-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2909 (if (and (not inclusive) (not (bobp)) (= ?\n (preceding-char)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2910 (forward-char -1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2911 (point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2912 ;;;_ > allout-end-of-current-heading ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2913 (defun allout-end-of-current-heading ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2914 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2915 (allout-beginning-of-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2916 (search-forward "\n" nil t)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2917 (forward-char -1))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2918 (defalias 'allout-end-of-heading 'allout-end-of-current-heading)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2919 ;;;_ > allout-get-body-text ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2920 (defun allout-get-body-text ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2921 "Return the unmangled body text of the topic immediately containing point."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2922 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2923 (allout-end-of-prefix)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2924 (if (not (search-forward "\n" nil t))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2925 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2926 (backward-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2927 (let ((pre-body (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2928 (if (not pre-body)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2929 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2930 (allout-end-of-entry t)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2931 (if (not (= pre-body (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2932 (buffer-substring-no-properties (1+ pre-body) (point))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2933 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2934 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2935 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2936 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2937
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2938 ;;;_ - Depth-wise
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2939 ;;;_ > allout-ascend-to-depth (depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2940 (defun allout-ascend-to-depth (depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2941 "Ascend to depth DEPTH, returning depth if successful, nil if not."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2942 (if (and (> depth 0)(<= depth (allout-depth)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2943 (let (last-ascended)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2944 (while (and (< depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2945 (setq last-ascended (allout-ascend))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2946 (goto-char allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2947 (if (interactive-p) (allout-end-of-prefix))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2948 (and last-ascended allout-recent-depth))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2949 ;;;_ > allout-ascend ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2950 (defun allout-ascend (&optional dont-move-if-unsuccessful)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2951 "Ascend one level, returning resulting depth if successful, nil if not.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2952
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2953 Point is left at the beginning of the level whether or not
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2954 successful, unless optional DONT-MOVE-IF-UNSUCCESSFUL is set, in
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2955 which case point is returned to its original starting location."
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2956 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2957 (setq dont-move-if-unsuccessful (point)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2958 (prog1
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2959 (if (allout-beginning-of-level)
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2960 (let ((bolevel (point))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2961 (bolevel-depth allout-recent-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2962 (allout-previous-heading)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2963 (cond ((< allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2964 allout-recent-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2965 ((= allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2966 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2967 (goto-char dont-move-if-unsuccessful))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2968 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2969 nil)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2970 (t
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2971 ;; some topic after very first is lower depth than first:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2972 (goto-char bolevel)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2973 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2974 nil))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2975 (if (interactive-p) (allout-end-of-prefix))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2976 ;;;_ > allout-descend-to-depth (depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2977 (defun allout-descend-to-depth (depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2978 "Descend to depth DEPTH within current topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2979
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2980 Returning depth if successful, nil if not."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2981 (let ((start-point (point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2982 (start-depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2983 (while
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2984 (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2985 (not (= depth allout-recent-depth)) ; ... not there yet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2986 (allout-next-heading) ; ... go further
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2987 (< start-depth allout-recent-depth))) ; ... still in topic
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2988 (if (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2989 (= allout-recent-depth depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2990 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2991 (goto-char start-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2992 nil))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2993 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2994 ;;;_ > allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2995 (defun allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2996 "Move out ARG levels from current visible topic."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2997 (interactive "p")
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2998 (let ((start-point (point)))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2999 (allout-back-to-current-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3000 (if (not (allout-ascend))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3001 (progn (goto-char start-point)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3002 (error "Can't ascend past outermost level"))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3003 (if (interactive-p) (allout-end-of-prefix))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3004 allout-recent-prefix-beginning)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3005
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3006 ;;;_ - Linear
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3007 ;;;_ > allout-next-sibling (&optional depth backward)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3008 (defun allout-next-sibling (&optional depth backward)
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3009 "Like `allout-forward-current-level', but respects invisible topics.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3010
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3011 Traverse at optional DEPTH, or current depth if none specified.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3012
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3013 Go backward if optional arg BACKWARD is non-nil.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3014
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3015 Return the start point of the new topic if successful, nil otherwise."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3016
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3017 (if (if backward (bobp) (eobp))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3018 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3019 (let ((target-depth (or depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3020 (start-point (point))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3021 (start-prefix-beginning allout-recent-prefix-beginning)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3022 (count 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3023 leaping
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3024 last-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3025 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3026 ;; done too few single steps to resort to the leap routine:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3027 (not leaping)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3028 ;; not at limit:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3029 (not (if backward (bobp) (eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3030 ;; still traversable:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3031 (if backward (allout-previous-heading) (allout-next-heading))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3032 ;; we're below the target depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3033 (> (setq last-depth allout-recent-depth) target-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3034 (setq count (1+ count))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3035 (if (> count 7) ; lists are commonly 7 +- 2, right?-)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3036 (setq leaping t)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3037 (cond (leaping
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3038 (or (allout-next-sibling-leap target-depth backward)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3039 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3040 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3041 (if depth (allout-depth) target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3042 nil)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3043 ((and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3044 (and (> (or last-depth (allout-depth)) 0)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3045 (= allout-recent-depth target-depth))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3046 (not (= start-prefix-beginning
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3047 allout-recent-prefix-beginning)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3048 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3049 (t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3050 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3051 (if depth (allout-depth) target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3052 nil)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3053 ;;;_ > allout-next-sibling-leap (&optional depth backward)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3054 (defun allout-next-sibling-leap (&optional depth backward)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3055 "Like `allout-next-sibling', but by direct search for topic at depth.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3056
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3057 Traverse at optional DEPTH, or current depth if none specified.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3058
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3059 Go backward if optional arg BACKWARD is non-nil.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3060
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3061 Return the start point of the new topic if successful, nil otherwise.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3062
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3063 Costs more than regular `allout-next-sibling' for short traversals:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3064
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3065 - we have to check the prior (next, if travelling backwards)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3066 item to confirm connectivity with the prior topic, and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3067 - if confirmed, we have to reestablish the allout-recent-* settings with
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3068 some extra navigation
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3069 - if confirmation fails, we have to do more work to recover
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3070
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3071 It is an increasingly big win when there are many intervening
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3072 offspring before the next sibling, however, so
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3073 `allout-next-sibling' resorts to this if it finds itself in that
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3074 situation."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3075
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3076 (if (if backward (bobp) (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3077 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3078 (let* ((start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3079 (target-depth (or depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3080 (search-whitespace-regexp nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3081 (depth-biased (- target-depth 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3082 (expression (if (<= target-depth 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3083 allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3084 (format allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3085 depth-biased depth-biased)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3086 found
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3087 done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3088 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3089 (setq found (if backward
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3090 (re-search-backward expression nil 'to-limit)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3091 (forward-char 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3092 (re-search-forward expression nil 'to-limit)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3093 (if (and found (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3094 (setq found nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3095 (setq done (or found (if backward (bobp) (eobp)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3096 (if (not found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3097 (progn (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3098 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3099 ;; rationale: if any intervening items were at a lower depth, we
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3100 ;; would now be on the first offspring at the target depth - ie,
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3101 ;; the preceeding item (per the search direction) must be at a
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3102 ;; lesser depth. that's all we need to check.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3103 (if backward (allout-next-heading) (allout-previous-heading))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3104 (if (< allout-recent-depth target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3105 ;; return to start and reestablish allout-recent-*:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3106 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3107 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3108 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3109 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3110 (goto-char found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3111 ;; locate cursor and set allout-recent-*:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3112 (allout-goto-prefix))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3113 ;;;_ > allout-previous-sibling (&optional depth backward)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3114 (defun allout-previous-sibling (&optional depth backward)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3115 "Like `allout-forward-current-level' backwards, respecting invisible topics.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3116
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3117 Optional DEPTH specifies depth to traverse, default current depth.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3118
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3119 Optional BACKWARD reverses direction.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3120
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3121 Return depth if successful, nil otherwise."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3122 (allout-next-sibling depth (not backward))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3123 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3124 ;;;_ > allout-snug-back ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3125 (defun allout-snug-back ()
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
3126 "Position cursor at end of previous topic.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3127
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3128 Presumes point is at the start of a topic prefix."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3129 (if (or (bobp) (eobp))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3130 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3131 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3132 (if (or (bobp) (not (= ?\n (preceding-char))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3133 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3134 (forward-char -1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3135 (point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3136 ;;;_ > allout-beginning-of-level ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3137 (defun allout-beginning-of-level ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3138 "Go back to the first sibling at this level, visible or not."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3139 (allout-end-of-level 'backward))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3140 ;;;_ > allout-end-of-level (&optional backward)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3141 (defun allout-end-of-level (&optional backward)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3142 "Go to the last sibling at this level, visible or not."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3143
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3144 (let ((depth (allout-depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3145 (while (allout-previous-sibling depth nil))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3146 (prog1 allout-recent-depth
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3147 (if (interactive-p) (allout-end-of-prefix)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3148 ;;;_ > allout-next-visible-heading (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3149 (defun allout-next-visible-heading (arg)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3150 "Move to the next ARG'th visible heading line, backward if arg is negative.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3151
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3152 Move to buffer limit in indicated direction if headings are exhausted."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3153
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3154 (interactive "p")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3155 (let* ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3156 (backward (if (< arg 0) (setq arg (* -1 arg))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3157 (step (if backward -1 1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3158 prev got)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3159
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3160 (while (> arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3161 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3162 ;; Boundary condition:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3163 (not (if backward (bobp)(eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3164 ;; Move, skipping over all concealed lines in one fell swoop:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3165 (prog1 (condition-case nil (or (line-move step) t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3166 (error nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3167 (allout-beginning-of-current-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3168 ;; Deal with apparent header line:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3169 (if (not (looking-at allout-regexp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3170 ;; not a header line, keep looking:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3171 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3172 (allout-prefix-data)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3173 (if (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3174 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3175 ;; skip this aberrant prospective header line:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3176 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3177 ;; this prospective headerline qualifies - register:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3178 (setq got allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3179 ;; and break the loop:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3180 nil))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3181 ;; Register this got, it may be the last:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3182 (if got (setq prev got))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3183 (setq arg (1- arg)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3184 (cond (got ; Last move was to a prefix:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3185 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3186 (prev ; Last move wasn't, but prev was:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3187 (goto-char prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3188 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3189 ((not backward) (end-of-line) nil))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3190 ;;;_ > allout-previous-visible-heading (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3191 (defun allout-previous-visible-heading (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3192 "Move to the previous heading line.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3193
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3194 With argument, repeats or can move forward if negative.
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3195 A heading line is one that starts with a `*' (or that `allout-regexp'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3196 matches)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3197 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3198 (prog1 (allout-next-visible-heading (- arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3199 (if (interactive-p) (allout-end-of-prefix))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3200 ;;;_ > allout-forward-current-level (arg)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3201 (defun allout-forward-current-level (arg)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3202 "Position point at the next heading of the same level.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3203
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3204 Takes optional repeat-count, goes backward if count is negative.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3205
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3206 Returns resulting position, else nil if none found."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3207 (interactive "p")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3208 (let ((start-depth (allout-current-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3209 (start-arg arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3210 (backward (> 0 arg)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3211 (if (= 0 start-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3212 (error "No siblings, not in a topic..."))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3213 (if backward (setq arg (* -1 arg)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3214 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3215 (while (and (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3216 (if backward
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3217 (allout-previous-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3218 (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3219 (setq arg (1- arg)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3220 (if (not (interactive-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3221 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3222 (allout-end-of-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3223 (if (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3224 (error "Hit %s level %d topic, traversed %d of %d requested"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3225 (if backward "first" "last")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3226 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3227 (- (abs start-arg) arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3228 (abs start-arg))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3229 ;;;_ > allout-backward-current-level (arg)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3230 (defun allout-backward-current-level (arg)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3231 "Inverse of `allout-forward-current-level'."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3232 (interactive "p")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3233 (if (interactive-p)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3234 (let ((current-prefix-arg (* -1 arg)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3235 (call-interactively 'allout-forward-current-level))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3236 (allout-forward-current-level (* -1 arg))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3237
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3238 ;;;_ #5 Alteration
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3239
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3240 ;;;_ - Fundamental
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3241 ;;;_ = allout-post-goto-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3242 (defvar allout-post-goto-bullet nil
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3243 "Outline internal var, for `allout-pre-command-business' hot-spot operation.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3244
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3245 When set, tells post-processing to reposition on topic bullet, and
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3246 then unset it. Set by `allout-pre-command-business' when implementing
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3247 hot-spot operation, where literal characters typed over a topic bullet
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3248 are mapped to the command of the corresponding control-key on the
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3249 `allout-mode-map'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3250 (make-variable-buffer-local 'allout-post-goto-bullet)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3251 ;;;_ = allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3252 (defvar allout-command-counter 0
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3253 "Counter that monotonically increases in allout-mode buffers.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3254
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3255 Set by `allout-pre-command-business', to support allout addons in
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3256 coordinating with allout activity.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3257 (make-variable-buffer-local 'allout-command-counter)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3258 ;;;_ > allout-post-command-business ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3259 (defun allout-post-command-business ()
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3260 "Outline `post-command-hook' function.
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3261
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3262 - Implement (and clear) `allout-post-goto-bullet', for hot-spot
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3263 outline commands.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3264
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3265 - Decrypt topic currently being edited if it was encrypted for a save."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3266
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3267 ; Apply any external change func:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3268 (if (not (allout-mode-p)) ; In allout-mode.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3269 nil
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3270
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3271 (if (and (boundp 'allout-after-save-decrypt)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3272 allout-after-save-decrypt)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3273 (allout-after-saves-handler))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3274
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3275 ;; Implement allout-post-goto-bullet, if set:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3276 (if (and allout-post-goto-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3277 (allout-current-bullet-pos))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3278 (progn (goto-char (allout-current-bullet-pos))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3279 (setq allout-post-goto-bullet nil)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3280 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3281 ;;;_ > allout-pre-command-business ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3282 (defun allout-pre-command-business ()
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3283 "Outline `pre-command-hook' function for outline buffers.
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3284
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3285 Among other things, implements special behavior when the cursor is on the
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3286 topic bullet character.
49962
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3287
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3288 When the cursor is on the bullet character, self-insert characters are
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3289 reinterpreted as the corresponding control-character in the
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3290 `allout-mode-map'. The `allout-mode' `post-command-hook' insures that
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3291 the cursor which has moved as a result of such reinterpretation is
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3292 positioned on the bullet character of the destination topic.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3293
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3294 The upshot is that you can get easy, single (ie, unmodified) key
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3295 outline maneuvering operations by positioning the cursor on the bullet
49962
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3296 char. When in this mode you can use regular cursor-positioning
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3297 command/keystrokes to relocate the cursor off of a bullet character to
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3298 return to regular interpretation of self-insert characters."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3299
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3300 (if (not (allout-mode-p))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3301 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3302 ;; Increment allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3303 (setq allout-command-counter (1+ allout-command-counter))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3304 ;; Do hot-spot navigation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3305 (if (and (eq this-command 'self-insert-command)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3306 (eq (point)(allout-current-bullet-pos)))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3307 (allout-hotspot-key-handler))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3308 ;;;_ > allout-hotspot-key-handler ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3309 (defun allout-hotspot-key-handler ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3310 "Catchall handling of key bindings in hot-spots.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3311
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3312 Translates unmodified keystrokes to corresponding allout commands, when
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3313 they would qualify if prefixed with the allout-command-prefix, and sets
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3314 this-command accordingly.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3315
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3316 Returns the qualifying command, if any, else nil."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3317 (interactive)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3318 (let* ((key-string (if (numberp last-command-char)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3319 (char-to-string last-command-char)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3320 (key-num (cond ((numberp last-command-char) last-command-char)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3321 ;; for XEmacs character type:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3322 ((and (fboundp 'characterp)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3323 (apply 'characterp (list last-command-char)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3324 (apply 'char-to-int (list last-command-char)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3325 (t 0)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3326 mapped-binding)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3327
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3328 (if (zerop key-num)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3329 nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3330
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3331 (if (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3332 ;; exclude control chars and escape:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3333 (<= 33 key-num)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3334 (setq mapped-binding
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3335 (or (and (assoc key-string allout-keybindings-list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3336 ;; translate literal membership on list:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3337 (cadr (assoc key-string allout-keybindings-list)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3338 ;; translate as a keybinding:
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3339 (key-binding (concat allout-command-prefix
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3340 (char-to-string
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3341 (if (and (<= 97 key-num) ; "a"
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3342 (>= 122 key-num)) ; "z"
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3343 (- key-num 96) key-num)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3344 t))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3345 ;; Qualified as an allout command - do hot-spot operation.
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3346 (setq allout-post-goto-bullet t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3347 ;; accept-defaults nil, or else we'll get allout-item-icon-key-handler.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3348 (setq mapped-binding (key-binding (char-to-string key-num))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3349
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3350 (while (keymapp mapped-binding)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3351 (setq mapped-binding
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3352 (lookup-key mapped-binding (vector (read-char)))))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3353
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3354 (if mapped-binding
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
3355 (setq this-command mapped-binding)))))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3356
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3357 ;;;_ > allout-find-file-hook ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3358 (defun allout-find-file-hook ()
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
3359 "Activate `allout-mode' on non-nil `allout-auto-activation', `allout-layout'.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3360
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3361 See `allout-init' for setup instructions."
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3362 (if (and allout-auto-activation
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3363 (not (allout-mode-p))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3364 allout-layout)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3365 (allout-mode t)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3366
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3367 ;;;_ - Topic Format Assessment
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3368 ;;;_ > allout-solicit-alternate-bullet (depth &optional current-bullet)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3369 (defun allout-solicit-alternate-bullet (depth &optional current-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3370
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3371 "Prompt for and return a bullet char as an alternative to the current one.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3372
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3373 Offer one suitable for current depth DEPTH as default."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3374
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3375 (let* ((default-bullet (or (and (stringp current-bullet) current-bullet)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3376 (allout-bullet-for-depth depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3377 (sans-escapes (regexp-sans-escapes allout-bullets-string))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3378 choice)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3379 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3380 (goto-char (allout-current-bullet-pos))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3381 (setq choice (solicit-char-in-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3382 (format "Select bullet: %s ('%s' default): "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3383 sans-escapes
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3384 (substring-no-properties default-bullet))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3385 sans-escapes
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3386 t)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3387 (message "")
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3388 (if (string= choice "") default-bullet choice))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3389 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3390 ;;;_ > allout-distinctive-bullet (bullet)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3391 (defun allout-distinctive-bullet (bullet)
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
3392 "True if BULLET is one of those on `allout-distinctive-bullets-string'."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3393 (string-match (regexp-quote bullet) allout-distinctive-bullets-string))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3394 ;;;_ > allout-numbered-type-prefix (&optional prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3395 (defun allout-numbered-type-prefix (&optional prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3396 "True if current header prefix bullet is numbered bullet."
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3397 (and allout-numbered-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3398 (string= allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3399 (if prefix
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3400 (allout-get-prefix-bullet prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3401 (allout-get-bullet)))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3402 ;;;_ > allout-encrypted-type-prefix (&optional prefix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3403 (defun allout-encrypted-type-prefix (&optional prefix)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3404 "True if current header prefix bullet is for an encrypted entry (body)."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3405 (and allout-topic-encryption-bullet
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3406 (string= allout-topic-encryption-bullet
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3407 (if prefix
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3408 (allout-get-prefix-bullet prefix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3409 (allout-get-bullet)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3410 ;;;_ > allout-bullet-for-depth (&optional depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3411 (defun allout-bullet-for-depth (&optional depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3412 "Return outline topic bullet suited to optional DEPTH, or current depth."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3413 ;; Find bullet in plain-bullets-string modulo DEPTH.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3414 (if allout-stylish-prefixes
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3415 (char-to-string (aref allout-plain-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3416 (% (max 0 (- depth 2))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3417 allout-plain-bullets-string-len)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3418 allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3419 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3420
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3421 ;;;_ - Topic Production
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3422 ;;;_ > allout-make-topic-prefix (&optional prior-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3423 (defun allout-make-topic-prefix (&optional prior-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3424 new
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3425 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3426 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3427 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3428 index)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3429 ;; Depth null means use current depth, non-null means we're either
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3430 ;; opening a new topic after current topic, lower or higher, or we're
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3431 ;; changing level of current topic.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3432 ;; Solicit dominates specified bullet-char.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3433 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3434 "Generate a topic prefix suitable for optional arg DEPTH, or current depth.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3435
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3436 All the arguments are optional.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3437
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3438 PRIOR-BULLET indicates the bullet of the prefix being changed, or
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3439 nil if none. This bullet may be preserved (other options
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3440 notwithstanding) if it is on the `allout-distinctive-bullets-string',
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3441 for instance.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3442
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3443 Second arg NEW indicates that a new topic is being opened after the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3444 topic at point, if non-nil. Default bullet for new topics, eg, may
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3445 be set (contingent to other args) to numbered bullets if previous
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3446 sibling is one. The implication otherwise is that the current topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3447 is being adjusted - shifted or rebulleted - and we don't consider
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3448 bullet or previous sibling.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3449
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3450 Third arg DEPTH forces the topic prefix to that depth, regardless of
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3451 the current topics' depth.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3452
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3453 If SOLICIT is non-nil, then the choice of bullet is solicited from
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3454 user. If it's a character, then that character is offered as the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3455 default, otherwise the one suited to the context (according to
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3456 distinction or depth) is offered. (This overrides other options,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3457 including, eg, a distinctive PRIOR-BULLET.) If non-nil, then the
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3458 context-specific bullet is used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3459
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3460 Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3461 is non-nil *and* soliciting was not explicitly invoked. Then
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3462 NUMBER-CONTROL non-nil forces prefix to either numbered or
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3463 denumbered format, depending on the value of the sixth arg, INDEX.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3464
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3465 \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3466
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3467 If NUMBER-CONTROL is non-nil and sixth arg INDEX is non-nil then
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3468 the prefix of the topic is forced to be numbered. Non-nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3469 NUMBER-CONTROL and nil INDEX forces non-numbered format on the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3470 bullet. Non-nil NUMBER-CONTROL and non-nil, non-number INDEX means
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3471 that the index for the numbered prefix will be derived, by counting
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3472 siblings back to start of level. If INDEX is a number, then that
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3473 number is used as the index for the numbered prefix (allowing, eg,
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
3474 sequential renumbering to not require this function counting back the
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3475 index for each successive sibling)."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3476 ;;;_ . Code:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3477 ;; The options are ordered in likely frequence of use, most common
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3478 ;; highest, least lowest. Ie, more likely to be doing prefix
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3479 ;; adjustments than soliciting, and yet more than numbering.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3480 ;; Current prefix is least dominant, but most likely to be commonly
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3481 ;; specified...
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3482
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3483 (let* (body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3484 numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3485 denumbering
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3486 (depth (or depth (allout-depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3487 (header-lead allout-header-prefix)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3488 (bullet-char
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3489
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3490 ;; Getting value for bullet char is practically the whole job:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3491
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3492 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3493 ; Simplest situation - level 1:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3494 ((<= depth 1) (setq header-lead "") allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3495 ; Simple, too: all asterisks:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3496 (allout-old-style-prefixes
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3497 ;; Cheat - make body the whole thing, null out header-lead and
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3498 ;; bullet-char:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3499 (setq body (make-string depth
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3500 (string-to-char allout-primary-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3501 (setq header-lead "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3502 "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3503
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3504 ;; (Neither level 1 nor old-style, so we're space padding.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3505 ;; Sneak it in the condition of the next case, whatever it is.)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3506
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3507 ;; Solicitation overrides numbering and other cases:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3508 ((progn (setq body (make-string (- depth 2) ?\ ))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3509 ;; The actual condition:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3510 solicit)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3511 (let* ((got (allout-solicit-alternate-bullet depth solicit)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3512 ;; Gotta check whether we're numbering and got a numbered bullet:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3513 (setq numbering (and allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3514 (not (and number-control (not index)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3515 (string= got allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3516 ;; Now return what we got, regardless:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3517 got))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3518
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3519 ;; Numbering invoked through args:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3520 ((and allout-numbered-bullet number-control)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3521 (if (setq numbering (not (setq denumbering (not index))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3522 allout-numbered-bullet
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3523 (if (and prior-bullet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3524 (not (string= allout-numbered-bullet
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3525 prior-bullet)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3526 prior-bullet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3527 (allout-bullet-for-depth depth))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3528
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3529 ;;; Neither soliciting nor controlled numbering ;;;
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3530 ;;; (may be controlled denumbering, tho) ;;;
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3531
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3532 ;; Check wrt previous sibling:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3533 ((and new ; only check for new prefixes
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3534 (<= depth (allout-depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3535 allout-numbered-bullet ; ... & numbering enabled
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3536 (not denumbering)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3537 (let ((sibling-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3538 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3539 ;; Locate correct sibling:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3540 (or (>= depth (allout-depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3541 (allout-ascend-to-depth depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3542 (allout-get-bullet))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3543 (if (and sibling-bullet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3544 (string= allout-numbered-bullet sibling-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3545 (setq numbering sibling-bullet)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3546
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3547 ;; Distinctive prior bullet?
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3548 ((and prior-bullet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3549 (allout-distinctive-bullet prior-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3550 ;; Either non-numbered:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3551 (or (not (and allout-numbered-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3552 (string= prior-bullet allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3553 ;; or numbered, and not denumbering:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3554 (setq numbering (not denumbering)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3555 ;; Here 'tis:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3556 prior-bullet))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3557
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3558 ;; Else, standard bullet per depth:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3559 ((allout-bullet-for-depth depth)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3560
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3561 (concat header-lead
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3562 body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3563 bullet-char
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3564 (if numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3565 (format "%d" (cond ((and index (numberp index)) index)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3566 (new (1+ (allout-sibling-index depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3567 ((allout-sibling-index))))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3568 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3569 )
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3570 ;;;_ > allout-open-topic (relative-depth &optional before offer-recent-bullet)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3571 (defun allout-open-topic (relative-depth &optional before offer-recent-bullet)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3572 "Open a new topic at depth DEPTH.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3573
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3574 New topic is situated after current one, unless optional flag BEFORE
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3575 is non-nil, or unless current line is completely empty - lacking even
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3576 whitespace - in which case open is done on the current line.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3577
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3578 When adding an offspring, it will be added immediately after the parent if
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3579 the other offspring are exposed, or after the last child if the offspring
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3580 are hidden. (The intervening offspring will be exposed in the latter
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3581 case.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3582
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3583 If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3584
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3585 Nuances:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3586
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3587 - Creation of new topics is with respect to the visible topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3588 containing the cursor, regardless of intervening concealed ones.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3589
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3590 - New headers are generally created after/before the body of a
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3591 topic. However, they are created right at cursor location if the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3592 cursor is on a blank line, even if that breaks the current topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3593 body. This is intentional, to provide a simple means for
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3594 deliberately dividing topic bodies.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3595
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3596 - Double spacing of topic lists is preserved. Also, the first
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3597 level two topic is created double-spaced (and so would be
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3598 subsequent siblings, if that's left intact). Otherwise,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3599 single-spacing is used.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3600
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3601 - Creation of sibling or nested topics is with respect to the topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3602 you're starting from, even when creating backwards. This way you
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3603 can easily create a sibling in front of the current topic without
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
3604 having to go to its preceding sibling, and then open forward
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3605 from there."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3606
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3607 (allout-beginning-of-current-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3608 (let* ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3609 (depth (+ (allout-current-depth) relative-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3610 (opening-on-blank (if (looking-at "^\$")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3611 (not (setq before nil))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3612 ;; bunch o vars set while computing ref-topic
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3613 opening-numbered
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3614 ref-depth
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3615 ref-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3616 (ref-topic (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3617 (cond ((< relative-depth 0)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3618 (allout-ascend-to-depth depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3619 ((>= relative-depth 1) nil)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3620 (t (allout-back-to-current-heading)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3621 (setq ref-depth allout-recent-depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3622 (setq ref-bullet
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3623 (if (> allout-recent-prefix-end 1)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3624 (allout-recent-bullet)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3625 ""))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3626 (setq opening-numbered
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3627 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3628 (and allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3629 (or (<= relative-depth 0)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3630 (allout-descend-to-depth depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3631 (if (allout-numbered-type-prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3632 allout-numbered-bullet))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3633 (point)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3634 dbl-space
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3635 doing-beginning
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3636 start end)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3637
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3638 (if (not opening-on-blank)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3639 ; Positioning and vertical
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3640 ; padding - only if not
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3641 ; opening-on-blank:
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3642 (progn
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3643 (goto-char ref-topic)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3644 (setq dbl-space ; Determine double space action:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3645 (or (and (<= relative-depth 0) ; not descending;
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3646 (save-excursion
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
3647 ;; at b-o-b or preceded by a blank line?
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3648 (or (> 0 (forward-line -1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3649 (looking-at "^\\s-*$")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3650 (bobp)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3651 (save-excursion
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3652 ;; succeeded by a blank line?
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3653 (allout-end-of-current-subtree)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3654 (looking-at "\n\n")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3655 (and (= ref-depth 1)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3656 (or before
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3657 (= depth 1)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3658 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3659 ;; Don't already have following
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3660 ;; vertical padding:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3661 (not (allout-pre-next-prefix)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3662
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3663 ;; Position to prior heading, if inserting backwards, and not
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3664 ;; going outwards:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3665 (if (and before (>= relative-depth 0))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3666 (progn (allout-back-to-current-heading)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3667 (setq doing-beginning (bobp))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3668 (if (not (bobp))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3669 (allout-previous-heading)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3670 (if (and before (bobp))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3671 (open-line 1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3672
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3673 (if (<= relative-depth 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3674 ;; Not going inwards, don't snug up:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3675 (if doing-beginning
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3676 (if (not dbl-space)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3677 (open-line 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3678 (open-line 2))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3679 (if before
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3680 (progn (end-of-line)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3681 (allout-pre-next-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3682 (while (and (= ?\n (following-char))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3683 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3684 (forward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3685 (allout-hidden-p)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3686 (forward-char 1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3687 (if (not (looking-at "^$"))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3688 (open-line 1)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3689 (allout-end-of-current-subtree)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3690 (if (looking-at "\n\n") (forward-char 1))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3691 ;; Going inwards - double-space if first offspring is
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3692 ;; double-spaced, otherwise snug up.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3693 (allout-end-of-entry)
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3694 (if (eobp)
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3695 (newline 1)
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3696 (line-move 1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3697 (allout-beginning-of-current-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3698 (backward-char 1)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3699 (if (bolp)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3700 ;; Blank lines between current header body and next
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3701 ;; header - get to last substantive (non-white-space)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3702 ;; line in body:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3703 (progn (setq dbl-space t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3704 (re-search-backward "[^ \t\n]" nil t)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3705 (if (looking-at "\n\n")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3706 (setq dbl-space t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3707 (if (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3708 (allout-next-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3709 (when (> allout-recent-depth ref-depth)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3710 ;; This is an offspring.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3711 (forward-line -1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3712 (looking-at "^\\s-*$")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3713 (progn (forward-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3714 (open-line 1)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3715 (forward-line 1)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3716 (allout-end-of-current-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3717
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3718 ;;(if doing-beginning (goto-char doing-beginning))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3719 (if (not (bobp))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3720 ;; We insert a newline char rather than using open-line to
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3721 ;; avoid rear-stickiness inheritence of read-only property.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3722 (progn (if (and (not (> depth ref-depth))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3723 (not before))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3724 (open-line 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3725 (if (and (not dbl-space) (> depth ref-depth))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3726 (newline 1)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3727 (if dbl-space
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3728 (open-line 1)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3729 (if (not before)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3730 (newline 1)))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3731 (if (and dbl-space (not (> relative-depth 0)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3732 (newline 1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3733 (if (and (not (eobp))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3734 (or (not (bolp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3735 (and (not (bobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3736 ;; bolp doesnt detect concealed
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3737 ;; trailing newlines, compensate:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3738 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3739 (forward-char -1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3740 (allout-hidden-p)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3741 (forward-char 1))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3742 ))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3743 (setq start (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3744 (insert (concat (allout-make-topic-prefix opening-numbered t depth)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3745 " "))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3746 (setq end (1+ (point)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3747
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3748 (allout-rebullet-heading (and offer-recent-bullet ref-bullet)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3749 depth nil nil t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3750 (if (> relative-depth 0)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3751 (save-excursion (goto-char ref-topic)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3752 (allout-show-children)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3753 (end-of-line)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3754
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3755 (run-hook-with-args 'allout-structure-added-hook start end)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3756 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3757 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3758 ;;;_ > allout-open-subtopic (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3759 (defun allout-open-subtopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3760 "Open new topic header at deeper level than the current one.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3761
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3762 Negative universal arg means to open deeper, but place the new topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3763 prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3764 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3765 (allout-open-topic 1 (> 0 arg) (< 1 arg)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3766 ;;;_ > allout-open-sibtopic (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3767 (defun allout-open-sibtopic (arg)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3768 "Open new topic header at same level as the current one.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3769
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3770 Positive universal arg means to use the bullet of the prior sibling.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3771
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3772 Negative universal arg means to place the new topic prior to the current
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3773 one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3774 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3775 (allout-open-topic 0 (> 0 arg) (not (= 1 arg))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3776 ;;;_ > allout-open-supertopic (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3777 (defun allout-open-supertopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3778 "Open new topic header at shallower level than the current one.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3779
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3780 Negative universal arg means to open shallower, but place the new
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3781 topic prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3782
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3783 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3784 (allout-open-topic -1 (> 0 arg) (< 1 arg)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3785
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3786 ;;;_ - Outline Alteration
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3787 ;;;_ : Topic Modification
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3788 ;;;_ = allout-former-auto-filler
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3789 (defvar allout-former-auto-filler nil
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3790 "Name of modal fill function being wrapped by `allout-auto-fill'.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3791 ;;;_ > allout-auto-fill ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3792 (defun allout-auto-fill ()
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
3793 "`allout-mode' autofill function.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3794
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3795 Maintains outline hanging topic indentation if
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3796 `allout-use-hanging-indents' is set."
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3797
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3798 (when (not allout-inhibit-auto-fill)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3799 (let ((fill-prefix (if allout-use-hanging-indents
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3800 ;; Check for topic header indentation:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3801 (save-excursion
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3802 (beginning-of-line)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3803 (if (looking-at allout-regexp)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3804 ;; ... construct indentation to account for
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3805 ;; length of topic prefix:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3806 (make-string (progn (allout-end-of-prefix)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3807 (current-column))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3808 ?\ )))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3809 (use-auto-fill-function (or allout-outside-normal-auto-fill-function
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3810 auto-fill-function
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3811 'do-auto-fill)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3812 (if (or allout-former-auto-filler allout-use-hanging-indents)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3813 (funcall use-auto-fill-function)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3814 ;;;_ > allout-reindent-body (old-depth new-depth &optional number)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3815 (defun allout-reindent-body (old-depth new-depth &optional number)
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
3816 "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3817
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3818 Optional arg NUMBER indicates numbering is being added, and it must
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
3819 be accommodated.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3820
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3821 Note that refill of indented paragraphs is not done."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3822
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3823 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3824 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3825 (let* ((new-margin (current-column))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3826 excess old-indent-begin old-indent-end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3827 ;; We want the column where the header-prefix text started
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3828 ;; *before* the prefix was changed, so we infer it relative
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3829 ;; to the new margin and the shift in depth:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3830 (old-margin (+ old-depth (- new-margin new-depth))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3831
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3832 ;; Process lines up to (but excluding) next topic header:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3833 (allout-unprotected
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3834 (save-match-data
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3835 (while
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3836 (and (re-search-forward "\n\\(\\s-*\\)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3837 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3838 t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3839 ;; Register the indent data, before we reset the
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3840 ;; match data with a subsequent `looking-at':
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3841 (setq old-indent-begin (match-beginning 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3842 old-indent-end (match-end 1))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3843 (not (looking-at allout-regexp)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3844 (if (> 0 (setq excess (- (- old-indent-end old-indent-begin)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3845 old-margin)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3846 ;; Text starts left of old margin - don't adjust:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3847 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3848 ;; Text was hanging at or right of old left margin -
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3849 ;; reindent it, preserving its existing indentation
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3850 ;; beyond the old margin:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3851 (delete-region old-indent-begin old-indent-end)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3852 (indent-to (+ new-margin excess (current-column))))))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3853 ;;;_ > allout-rebullet-current-heading (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3854 (defun allout-rebullet-current-heading (arg)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3855 "Solicit new bullet for current visible heading."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3856 (interactive "p")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3857 (let ((initial-col (current-column))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3858 (on-bullet (eq (point)(allout-current-bullet-pos)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3859 from to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3860 (backwards (if (< arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3861 (setq arg (* arg -1)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3862 (while (> arg 0)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3863 (save-excursion (allout-back-to-current-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3864 (allout-end-of-prefix)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3865 (setq from allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3866 to allout-recent-prefix-end)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3867 (allout-rebullet-heading t ;;; solicit
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3868 nil ;;; depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3869 nil ;;; number-control
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3870 nil ;;; index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3871 t) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3872 (run-hook-with-args 'allout-exposure-change-hook
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3873 from to t))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3874 (setq arg (1- arg))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3875 (if (<= arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3876 nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3877 (setq initial-col nil) ; Override positioning back to init col
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3878 (if (not backwards)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3879 (allout-next-visible-heading 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3880 (allout-goto-prefix-doublechecked)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3881 (allout-next-visible-heading -1))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3882 (message "Done.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3883 (cond (on-bullet (goto-char (allout-current-bullet-pos)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3884 (initial-col (move-to-column initial-col)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3885 ;;;_ > allout-rebullet-heading (&optional solicit ...)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3886 (defun allout-rebullet-heading (&optional solicit
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3887 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3888 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3889 index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3890 do-successors)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3891
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3892 "Adjust bullet of current topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3893
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3894 All args are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3895
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3896 If SOLICIT is non-nil, then the choice of bullet is solicited from
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3897 user. If it's a character, then that character is offered as the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3898 default, otherwise the one suited to the context (according to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3899 distinction or depth) is offered. If non-nil, then the
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3900 context-specific bullet is just used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3901
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3902 Second arg DEPTH forces the topic prefix to that depth, regardless
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3903 of the topic's current depth.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3904
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3905 Third arg NUMBER-CONTROL can force the prefix to or away from
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3906 numbered form. It has effect only if `allout-numbered-bullet' is
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3907 non-nil and soliciting was not explicitly invoked (via first arg).
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3908 Its effect, numbering or denumbering, then depends on the setting
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3909 of the forth arg, INDEX.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3910
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3911 If NUMBER-CONTROL is non-nil and forth arg INDEX is nil, then the
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3912 prefix of the topic is forced to be non-numbered. Null index and
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3913 non-nil NUMBER-CONTROL forces denumbering. Non-nil INDEX (and
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3914 non-nil NUMBER-CONTROL) forces a numbered-prefix form. If non-nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3915 INDEX is a number, then that number is used for the numbered
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3916 prefix. Non-nil and non-number means that the index for the
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3917 numbered prefix will be derived by allout-make-topic-prefix.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3918
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3919 Fifth arg DO-SUCCESSORS t means re-resolve count on succeeding
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3920 siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3921
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3922 Cf vars `allout-stylish-prefixes', `allout-old-style-prefixes',
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3923 and `allout-numbered-bullet', which all affect the behavior of
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3924 this function."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3925
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3926 (let* ((current-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3927 (new-depth (or new-depth current-depth))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3928 (mb allout-recent-prefix-beginning)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3929 (me allout-recent-prefix-end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3930 (current-bullet (buffer-substring-no-properties (- me 1) me))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3931 (has-annotation (get-text-property mb 'allout-was-hidden))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3932 (new-prefix (allout-make-topic-prefix current-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3933 nil
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3934 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3935 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3936 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3937 index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3938
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3939 ;; Is new one is identical to old?
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3940 (if (and (= current-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3941 (string= current-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3942 (substring new-prefix (1- (length new-prefix)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3943 ;; Nothing to do:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3944 t
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3945
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3946 ;; New prefix probably different from old:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3947 ; get rid of old one:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3948 (allout-unprotected (delete-region mb me))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3949 (goto-char mb)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3950 ; Dispense with number if
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3951 ; numbered-bullet prefix:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3952 (if (and allout-numbered-bullet
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3953 (string= allout-numbered-bullet current-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3954 (looking-at "[0-9]+"))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3955 (allout-unprotected
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3956 (delete-region (match-beginning 0)(match-end 0))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3957
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3958 ;; convey 'allout-was-hidden annotation, if original had it:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3959 (if has-annotation
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3960 (put-text-property 0 (length new-prefix) 'allout-was-hidden t
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3961 new-prefix))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3962
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3963 ; Put in new prefix:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3964 (allout-unprotected (insert new-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3965
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3966 ;; Reindent the body if elected, margin changed, and not encrypted body:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3967 (if (and allout-reindent-bodies
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3968 (not (= new-depth current-depth))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3969 (not (allout-encrypted-topic-p)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3970 (allout-reindent-body current-depth new-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3971
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3972 ;; Recursively rectify successive siblings of orig topic if
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3973 ;; caller elected for it:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3974 (if do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3975 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3976 (while (allout-next-sibling new-depth nil)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3977 (setq index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3978 (cond ((numberp index) (1+ index))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3979 ((not number-control) (allout-sibling-index))))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3980 (if (allout-numbered-type-prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3981 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3982 new-depth ;;; new-depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3983 number-control;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3984 index ;;; index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3985 nil))))) ;;;(dont!)do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3986 ) ; (if (and (= current-depth new-depth)...))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3987 ) ; let* ((current-depth (allout-depth))...)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3988 ) ; defun
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3989 ;;;_ > allout-rebullet-topic (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3990 (defun allout-rebullet-topic (arg &optional sans-offspring)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3991 "Rebullet the visible topic containing point and all contained subtopics.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3992
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3993 Descends into invisible as well as visible topics, however.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3994
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3995 When optional sans-offspring is non-nil, subtopics are not
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3996 shifted. (Shifting a topic outwards without shifting its
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3997 offspring is disallowed, since this would create a \"containment
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3998 discontinuity\", where the depth difference between a topic and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3999 its immediate offspring is greater than one.)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4000
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4001 With repeat count, shift topic depth by that amount."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4002 (interactive "P")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4003 (let ((start-col (current-column)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4004 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4005 ;; Normalize arg:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4006 (cond ((null arg) (setq arg 0))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4007 ((listp arg) (setq arg (car arg))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4008 ;; Fill the user in, in case we're shifting a big topic:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4009 (if (not (zerop arg)) (message "Shifting..."))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4010 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4011 (if (<= (+ allout-recent-depth arg) 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4012 (error "Attempt to shift topic below level 1"))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4013 (allout-rebullet-topic-grunt arg nil nil nil nil sans-offspring)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4014 (if (not (zerop arg)) (message "Shifting... done.")))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4015 (move-to-column (max 0 (+ start-col arg)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4016 ;;;_ > allout-rebullet-topic-grunt (&optional relative-depth ...)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4017 (defun allout-rebullet-topic-grunt (&optional relative-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4018 starting-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4019 starting-point
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4020 index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4021 do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4022 sans-offspring)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4023 "Like `allout-rebullet-topic', but on nearest containing topic
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4024 \(visible or not).
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4025
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4026 See `allout-rebullet-heading' for rebulleting behavior.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4027
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4028 All arguments are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4029
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4030 First arg RELATIVE-DEPTH means to shift the depth of the entire
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4031 topic that amount.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4032
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4033 Several subsequent args are for internal recursive use by the function
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4034 itself: STARTING-DEPTH, STARTING-POINT, and INDEX.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4035
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4036 Finally, if optional SANS-OFFSPRING is non-nil then the offspring
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4037 are not shifted. (Shifting a topic outwards without shifting
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4038 its offspring is disallowed, since this would create a
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4039 \"containment discontinuity\", where the depth difference between
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4040 a topic and its immediate offspring is greater than one..)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4041
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4042 ;; XXX the recursion here is peculiar, and in general the routine may
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4043 ;; need simplification with refactoring.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4044
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4045 (if (and sans-offspring
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4046 relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4047 (< relative-depth 0))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4048 (error (concat "Attempt to shift topic outwards without offspring,"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4049 " would cause containment discontinuity.")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4050
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4051 (let* ((relative-depth (or relative-depth 0))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4052 (new-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4053 (starting-depth (or starting-depth new-depth))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4054 (on-starting-call (null starting-point))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4055 (index (or index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4056 ;; Leave index null on starting call, so rebullet-heading
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4057 ;; calculates it at what might be new depth:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4058 (and (or (zerop relative-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4059 (not on-starting-call))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4060 (allout-sibling-index))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4061 (starting-index index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4062 (moving-outwards (< 0 relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4063 (starting-point (or starting-point (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4064 (local-point (point)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4065
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4066 ;; Sanity check for excessive promotion done only on starting call:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4067 (and on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4068 moving-outwards
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4069 (> 0 (+ starting-depth relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4070 (error "Attempt to shift topic out beyond level 1"))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4071
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4072 (cond ((= starting-depth new-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4073 ;; We're at depth to work on this one.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4074
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4075 ;; When shifting out we work on the children before working on
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4076 ;; the parent to avoid interim `allout-aberrant-container-p'
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4077 ;; aberrancy, and vice-versa when shifting in:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4078 (if (>= relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4079 (allout-rebullet-heading nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4080 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4081 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4082 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4083 nil)) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4084 (when (not sans-offspring)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4085 ;; ... and work on subsequent ones which are at greater depth:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4086 (setq index 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4087 (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4088 (while (and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4089 (< starting-depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4090 (setq index (1+ index))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4091 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4092 (1+ starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4093 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4094 index)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4095 (when (< relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4096 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4097 (goto-char local-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4098 (allout-rebullet-heading nil ;;; solicit
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4099 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4100 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4101 starting-index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4102 nil)))) ;;; do-successors
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4103
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4104 ((< starting-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4105 ;; Rare case - subtopic more than one level deeper than parent.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4106 ;; Treat this one at an even deeper level:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4107 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4108 new-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4109 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4110 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4111 sans-offspring)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4112
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4113 (if on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4114 (progn
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4115 ;; Rectify numbering of former siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4116 ;; if topic has changed depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4117 (if (or do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4118 (and (not (zerop relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4119 (or (= allout-recent-depth starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4120 (= allout-recent-depth (+ starting-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4121 relative-depth)))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4122 (allout-rebullet-heading nil nil nil nil t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4123 ;; Now rectify numbering of new siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4124 ;; if depth has been changed:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4125 (progn (goto-char starting-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4126 (if (not (zerop relative-depth))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4127 (allout-rebullet-heading nil nil nil nil t)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4128 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4129 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4130 ;;;_ > allout-renumber-to-depth (&optional depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4131 (defun allout-renumber-to-depth (&optional depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4132 "Renumber siblings at current depth.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4133
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4134 Affects superior topics if optional arg DEPTH is less than current depth.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4135
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4136 Returns final depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4137
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4138 ;; Proceed by level, processing subsequent siblings on each,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4139 ;; ascending until we get shallower than the start depth:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4140
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4141 (let ((ascender (allout-depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4142 was-eobp)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4143 (while (and (not (eobp))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4144 (allout-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4145 (>= allout-recent-depth depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4146 (>= ascender depth))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4147 ; Skip over all topics at
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4148 ; lesser depths, which can not
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4149 ; have been disturbed:
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4150 (while (and (not (setq was-eobp (eobp)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4151 (> allout-recent-depth ascender))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4152 (allout-next-heading))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4153 ; Prime ascender for ascension:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4154 (setq ascender (1- allout-recent-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4155 (if (>= allout-recent-depth depth)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4156 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4157 nil ;;; depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4158 nil ;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4159 nil ;;; index
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4160 t)) ;;; do-successors
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4161 (if was-eobp (goto-char (point-max)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4162 allout-recent-depth)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4163 ;;;_ > allout-number-siblings (&optional denumber)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4164 (defun allout-number-siblings (&optional denumber)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4165 "Assign numbered topic prefix to this topic and its siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4166
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4167 With universal argument, denumber - assign default bullet to this
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4168 topic and its siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4169
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4170 With repeated universal argument (`^U^U'), solicit bullet for each
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4171 rebulleting each topic at this level."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4172
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4173 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4174
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4175 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4176 (allout-back-to-current-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4177 (allout-beginning-of-level)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4178 (let ((depth allout-recent-depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4179 (index (if (not denumber) 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4180 (use-bullet (equal '(16) denumber))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4181 (more t))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4182 (while more
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4183 (allout-rebullet-heading use-bullet ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4184 depth ;;; depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4185 t ;;; number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4186 index ;;; index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4187 nil) ;;; do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4188 (if index (setq index (1+ index)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4189 (setq more (allout-next-sibling depth nil))))))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4190 ;;;_ > allout-shift-in (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4191 (defun allout-shift-in (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4192 "Increase depth of current heading and any items collapsed within it.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4193
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4194 With a negative argument, the item is shifted out using
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4195 `allout-shift-out', instead.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4196
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4197 With an argument greater than one, shift-in the item but not its
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4198 offspring, making the item into a sibling of its former children,
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4199 and a child of sibling that formerly preceeded it.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4200
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4201 You are not allowed to shift the first offspring of a topic
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4202 inwards, because that would yield a \"containment
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4203 discontinuity\", where the depth difference between a topic and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4204 its immediate offspring is greater than one. The first topic in
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4205 the file can be adjusted to any positive depth, however."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4206
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4207 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4208 (if (< arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4209 (allout-shift-out (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4210 ;; refuse to create a containment discontinuity:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4211 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4212 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4213 (if (not (bobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4214 (let* ((current-depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4215 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4216 (predecessor-depth (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4217 (forward-char -1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4218 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4219 (if (< (point) start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4220 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4221 0))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4222 (if (and (> predecessor-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4223 (> (1+ current-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4224 (1+ predecessor-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4225 (error (concat "Disallowed shift deeper than"
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4226 " containing topic's children."))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4227 (allout-back-to-current-heading)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4228 (if (< allout-recent-depth (1+ current-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4229 (allout-show-children))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4230 (let ((where (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4231 (allout-rebullet-topic 1 (and (> arg 1) 'sans-offspring))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4232 (run-hook-with-args 'allout-structure-shifted-hook arg where))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4233 ;;;_ > allout-shift-out (arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4234 (defun allout-shift-out (arg)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4235 "Decrease depth of current heading and any topics collapsed within it.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4236 This will make the item a sibling of its former container.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4237
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4238 With a negative argument, the item is shifted in using
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4239 `allout-shift-in', instead.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4240
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4241 With an argument greater than one, shift-out the item's offspring
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4242 but not the item itself, making the former children siblings of
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4243 the item.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4244
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4245 With an argument greater than 1, the item's offspring are shifted
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4246 out without shifting the item. This will make the immediate
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4247 subtopics into siblings of the item."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4248 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4249 (if (< arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4250 (allout-shift-in (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4251 ;; Get proper exposure in this area:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4252 (save-excursion (if (allout-ascend)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4253 (allout-show-children)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4254 ;; Show collapsed children if there's a successor which will become
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4255 ;; their sibling:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4256 (if (and (allout-current-topic-collapsed-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4257 (save-excursion (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4258 (allout-show-children))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4259 (let ((where (and (allout-depth) allout-recent-prefix-beginning)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4260 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4261 (if (> arg 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4262 ;; Shift the offspring but not the topic:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4263 (let ((children-chart (allout-chart-subtree 1)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4264 (if (listp (car children-chart))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4265 ;; whoops:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4266 (setq children-chart (allout-flatten children-chart)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4267 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4268 (dolist (child-point children-chart)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4269 (goto-char child-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4270 (allout-shift-out 1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4271 (allout-rebullet-topic (* arg -1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4272 (run-hook-with-args 'allout-structure-shifted-hook (* arg -1) where))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4273 ;;;_ : Surgery (kill-ring) functions with special provisions for outlines:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4274 ;;;_ > allout-kill-line (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4275 (defun allout-kill-line (&optional arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4276 "Kill line, adjusting subsequent lines suitably for outline mode."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4277
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4278 (interactive "*P")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4279
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4280 (if (or (not (allout-mode-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4281 (not (bolp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4282 (not (looking-at allout-regexp)))
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
4283 ;; Just do a regular kill:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4284 (kill-line arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4285 ;; Ah, have to watch out for adjustments:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4286 (let* ((beg (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4287 end
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4288 (beg-hidden (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4289 (end-hidden (save-excursion (allout-end-of-current-line)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4290 (setq end (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4291 (allout-hidden-p)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4292 (depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4293
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4294 (allout-annotate-hidden beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4295 (if (and (not beg-hidden) (not end-hidden))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4296 (allout-unprotected (kill-line arg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4297 (kill-line arg))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4298 (allout-deannotate-hidden beg end)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4299
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4300 (if allout-numbered-bullet
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4301 (save-excursion ; Renumber subsequent topics if needed:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4302 (if (not (looking-at allout-regexp))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4303 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4304 (allout-renumber-to-depth depth)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4305 (run-hook-with-args 'allout-structure-deleted-hook depth (point)))))
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4306 ;;;_ > allout-copy-line-as-kill ()
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4307 (defun allout-copy-line-as-kill ()
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4308 "Like allout-kill-topic, but save to kill ring instead of deleting."
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4309 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4310 (let ((buffer-read-only t))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4311 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4312 (allout-kill-line)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4313 (buffer-read-only nil))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4314 ;;;_ > allout-kill-topic ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4315 (defun allout-kill-topic ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4316 "Kill topic together with subtopics.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4317
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4318 Trailing whitespace is killed with a topic if that whitespace:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4319
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4320 - would separate the topic from a subsequent sibling
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4321 - would separate the topic from the end of buffer
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4322 - would not be added to whitespace already separating the topic from the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4323 previous one.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4324
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4325 Topic exposure is marked with text-properties, to be used by
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4326 allout-yank-processing for exposure recovery."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4327
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4328 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4329 (let* ((inhibit-field-text-motion t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4330 (beg (prog1 (allout-back-to-current-heading) (beginning-of-line)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4331 end
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4332 (depth allout-recent-depth))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4333 (allout-end-of-current-subtree)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4334 (if (and (/= (current-column) 0) (not (eobp)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4335 (forward-char 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4336 (if (not (eobp))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4337 (if (and (looking-at "\n")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4338 (or (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4339 (or (not (allout-next-heading))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4340 (= depth allout-recent-depth)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4341 (and (> (- beg (point-min)) 3)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4342 (string= (buffer-substring (- beg 2) beg) "\n\n"))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4343 (forward-char 1)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4344
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4345 (allout-annotate-hidden beg (setq end (point)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4346 (unwind-protect
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4347 (allout-unprotected (kill-region beg end))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4348 (if buffer-read-only
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4349 ;; eg, during copy-as-kill.
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4350 (allout-deannotate-hidden beg end)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4351
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4352 (save-excursion
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4353 (allout-renumber-to-depth depth))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4354 (run-hook-with-args 'allout-structure-deleted-hook depth (point))))
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4355 ;;;_ > allout-copy-topic-as-kill ()
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4356 (defun allout-copy-topic-as-kill ()
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4357 "Like allout-kill-topic, but save to kill ring instead of deleting."
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4358 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4359 (let ((buffer-read-only t))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4360 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4361 (allout-kill-topic)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4362 (buffer-read-only (message "Topic copied...")))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4363 ;;;_ > allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4364 (defun allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4365 "Qualify text with properties to indicate exposure status."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4366
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4367 (let ((was-modified (buffer-modified-p))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4368 (buffer-read-only nil))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4369 (allout-deannotate-hidden begin end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4370 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4371 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4372 (let (done next prev overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4373 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4374 ;; at or advance to start of next hidden region:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4375 (if (not (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4376 (setq next
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4377 (max (1+ (point))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4378 (next-single-char-property-change (point)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4379 'invisible
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4380 nil end))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4381 (if (or (not next) (eq prev next))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4382 ;; still not at start of hidden area - must not be any left.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4383 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4384 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4385 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4386 (if (not (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4387 ;; still not at start of hidden area.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4388 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4389 (setq overlay (allout-get-invisibility-overlay))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4390 (setq next (overlay-end overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4391 prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4392 ;; advance to end of this hidden area:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4393 (when next
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4394 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4395 (allout-unprotected
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4396 (let ((buffer-undo-list t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4397 (put-text-property (overlay-start overlay) next
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4398 'allout-was-hidden t)))))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4399 (set-buffer-modified-p was-modified)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4400 ;;;_ > allout-deannotate-hidden (begin end)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4401 (defun allout-deannotate-hidden (begin end)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4402 "Remove allout hidden-text annotation between BEGIN and END."
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4403
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4404 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4405 (let ((inhibit-read-only t)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4406 (buffer-undo-list t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4407 ;(remove-text-properties begin end '(allout-was-hidden t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4408 )))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4409 ;;;_ > allout-hide-by-annotation (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4410 (defun allout-hide-by-annotation (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4411 "Translate text properties indicating exposure status into actual exposure."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4412 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4413 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4414 (let ((was-modified (buffer-modified-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4415 done next prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4416 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4417 ;; at or advance to start of next annotation:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4418 (if (not (get-text-property (point) 'allout-was-hidden))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4419 (setq next (next-single-char-property-change (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4420 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4421 nil end)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4422 (if (or (not next) (eq prev next))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4423 ;; no more or not advancing - must not be any left.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4424 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4425 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4426 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4427 (if (not (get-text-property (point) 'allout-was-hidden))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4428 ;; still not at start of annotation.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4429 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4430 ;; advance to just after end of this annotation:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4431 (setq next (next-single-char-property-change (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4432 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4433 nil end))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4434 (overlay-put (make-overlay prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4435 'category 'allout-exposure-category)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4436 (allout-deannotate-hidden prev next)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4437 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4438 (if next (goto-char next)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4439 (set-buffer-modified-p was-modified))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4440 ;;;_ > allout-yank-processing ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4441 (defun allout-yank-processing (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4442
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4443 "Incidental allout-specific business to be done just after text yanks.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4444
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4445 Does depth adjustment of yanked topics, when:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4446
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4447 1 the stuff being yanked starts with a valid outline header prefix, and
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4448 2 it is being yanked at the end of a line which consists of only a valid
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4449 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4450
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4451 Also, adjusts numbering of subsequent siblings when appropriate.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4452
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4453 Depth adjustment alters the depth of all the topics being yanked
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4454 the amount it takes to make the first topic have the depth of the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4455 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4456
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4457 The point is left in front of yanked, adjusted topics, rather than
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4458 at the end (and vice-versa with the mark). Non-adjusted yanks,
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4459 however, are left exactly like normal, non-allout-specific yanks."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4460
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4461 (interactive "*P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4462 ; Get to beginning, leaving
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4463 ; region around subject:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4464 (if (< (allout-mark-marker t) (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4465 (exchange-point-and-mark))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4466 (let* ((subj-beg (point))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4467 (into-bol (bolp))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4468 (subj-end (allout-mark-marker t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4469 ;; 'resituate' if yanking an entire topic into topic header:
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4470 (resituate (and (let ((allout-inhibit-aberrance-doublecheck t))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4471 (allout-e-o-prefix-p))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4472 (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4473 (allout-prefix-data)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4474 ;; `rectify-numbering' if resituating (where several topics may
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4475 ;; be resituating) or yanking a topic into a topic slot (bol):
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4476 (rectify-numbering (or resituate
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4477 (and into-bol (looking-at allout-regexp)))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4478 (if resituate
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4479 ;; Yanking a topic into the start of a topic - reconcile to fit:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4480 (let* ((inhibit-field-text-motion t)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4481 (prefix-len (if (not (match-end 1))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4482 1
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4483 (- (match-end 1) subj-beg)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4484 (subj-depth allout-recent-depth)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4485 (prefix-bullet (allout-recent-bullet))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4486 (adjust-to-depth
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4487 ;; Nil if adjustment unnecessary, otherwise depth to which
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4488 ;; adjustment should be made:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4489 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4490 (and (goto-char subj-end)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4491 (eolp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4492 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4493 (and (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4494 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4495 (beginning-of-line)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4496 (not (= (point) subj-beg)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4497 (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4498 (allout-prefix-data))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4499 allout-recent-depth)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4500 (more t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4501 (setq rectify-numbering allout-numbered-bullet)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4502 (if adjust-to-depth
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4503 ; Do the adjustment:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4504 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4505 (save-restriction
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4506 (narrow-to-region subj-beg subj-end)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4507 ; Trim off excessive blank
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4508 ; line at end, if any:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4509 (goto-char (point-max))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4510 (if (looking-at "^$")
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4511 (allout-unprotected (delete-char -1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4512 ; Work backwards, with each
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4513 ; shallowest level,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4514 ; successively excluding the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4515 ; last processed topic from
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4516 ; the narrow region:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4517 (while more
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4518 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4519 ; go as high as we can in each bunch:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4520 (while (allout-ascend t))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4521 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4522 (allout-unprotected
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4523 (allout-rebullet-topic-grunt (- adjust-to-depth
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4524 subj-depth)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4525 (allout-depth))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4526 (if (setq more (not (bobp)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4527 (progn (widen)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4528 (forward-char -1)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4529 (narrow-to-region subj-beg (point))))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4530 ;; Preserve new bullet if it's a distinctive one, otherwise
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4531 ;; use old one:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4532 (if (string-match (regexp-quote prefix-bullet)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4533 allout-distinctive-bullets-string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4534 ; Delete from bullet of old to
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4535 ; before bullet of new:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4536 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4537 (beginning-of-line)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4538 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4539 (delete-region (point) subj-beg))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4540 (set-marker (allout-mark-marker t) subj-end)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4541 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4542 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4543 ; Delete base subj prefix,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4544 ; leaving old one:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4545 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4546 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4547 (delete-region (point) (+ (point)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4548 prefix-len
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4549 (- adjust-to-depth
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4550 subj-depth)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4551 ; and delete residual subj
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4552 ; prefix digits and space:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4553 (while (looking-at "[0-9]") (delete-char 1))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4554 (if (looking-at " ") (delete-char 1))))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4555 (exchange-point-and-mark))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4556 (if rectify-numbering
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4557 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4558 (save-excursion
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4559 ; Give some preliminary feedback:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4560 (message "... reconciling numbers")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4561 ; ... and renumber, in case necessary:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4562 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4563 (if (allout-goto-prefix-doublechecked)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4564 (allout-unprotected
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4565 (allout-rebullet-heading nil ;;; solicit
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4566 (allout-depth) ;;; depth
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4567 nil ;;; number-control
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4568 nil ;;; index
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4569 t)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4570 (message ""))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4571 (if (or into-bol resituate)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4572 (allout-hide-by-annotation (point) (allout-mark-marker t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4573 (allout-deannotate-hidden (allout-mark-marker t) (point)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4574 (if (not resituate)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4575 (exchange-point-and-mark))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4576 (run-hook-with-args 'allout-structure-added-hook subj-beg subj-end)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4577 ;;;_ > allout-yank (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4578 (defun allout-yank (&optional arg)
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
4579 "`allout-mode' yank, with depth and numbering adjustment of yanked topics.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4580
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4581 Non-topic yanks work no differently than normal yanks.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4582
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4583 If a topic is being yanked into a bare topic prefix, the depth of the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4584 yanked topic is adjusted to the depth of the topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4585
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4586 1 we're yanking in an `allout-mode' buffer
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4587 2 the stuff being yanked starts with a valid outline header prefix, and
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4588 3 it is being yanked at the end of a line which consists of only a valid
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4589 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4590
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4591 If these conditions hold then the depth of the yanked topics are all
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4592 adjusted the amount it takes to make the first one at the depth of the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4593 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4594
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4595 The point is left in front of yanked, adjusted topics, rather than
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4596 at the end (and vice-versa with the mark). Non-adjusted yanks,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4597 however, (ones that don't qualify for adjustment) are handled
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4598 exactly like normal yanks.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4599
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4600 Numbering of yanked topics, and the successive siblings at the depth
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4601 into which they're being yanked, is adjusted.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4602
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
4603 `allout-yank-pop' works with `allout-yank' just like normal `yank-pop'
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
4604 works with normal `yank' in non-outline buffers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4605
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4606 (interactive "*P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4607 (setq this-command 'yank)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4608 (allout-unprotected
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4609 (yank arg))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4610 (if (allout-mode-p)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4611 (allout-yank-processing)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4612 ;;;_ > allout-yank-pop (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4613 (defun allout-yank-pop (&optional arg)
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4614 "Yank-pop like `allout-yank' when popping to bare outline prefixes.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4615
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4616 Adapts level of popped topics to level of fresh prefix.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4617
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4618 Note - prefix changes to distinctive bullets will stick, if followed
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4619 by pops to non-distinctive yanks. Bug..."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4620
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4621 (interactive "*p")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4622 (setq this-command 'yank)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4623 (yank-pop arg)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4624 (if (allout-mode-p)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4625 (allout-yank-processing)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4626
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4627 ;;;_ - Specialty bullet functions
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4628 ;;;_ : File Cross references
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4629 ;;;_ > allout-resolve-xref ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4630 (defun allout-resolve-xref ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4631 "Pop to file associated with current heading, if it has an xref bullet.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4632
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4633 \(Works according to setting of `allout-file-xref-bullet')."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4634 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4635 (if (not allout-file-xref-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4636 (error
64428
e55dd693f95b (allout-resolve-xref): Fix typos in error strings.
Juanma Barranquero <lekktu@gmail.com>
parents: 64400
diff changeset
4637 "Outline cross references disabled - no `allout-file-xref-bullet'")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4638 (if (not (string= (allout-current-bullet) allout-file-xref-bullet))
64428
e55dd693f95b (allout-resolve-xref): Fix typos in error strings.
Juanma Barranquero <lekktu@gmail.com>
parents: 64400
diff changeset
4639 (error "Current heading lacks cross-reference bullet `%s'"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4640 allout-file-xref-bullet)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4641 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4642 file-name)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4643 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4644 (let* ((text-start allout-recent-prefix-end)
15663
4f762e6ae80a (outline-resolve-xref): Do not mistake a blank line
Karl Heuer <kwzh@gnu.org>
parents: 14416
diff changeset
4645 (heading-end (progn (end-of-line) (point))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4646 (goto-char text-start)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4647 (setq file-name
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4648 (if (re-search-forward "\\s-\\(\\S-*\\)" heading-end t)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4649 (buffer-substring (match-beginning 1) (match-end 1))))))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
4650 (setq file-name (expand-file-name file-name))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4651 (if (or (file-exists-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4652 (if (file-writable-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4653 (y-or-n-p (format "%s not there, create one? "
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4654 file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4655 (error "%s not found and can't be created" file-name)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4656 (condition-case failure
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4657 (find-file-other-window file-name)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4658 (error failure))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4659 (error "%s not found" file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4660 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4661 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4662 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4663 )
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4664
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4665 ;;;_ #6 Exposure Control
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4666
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4667 ;;;_ - Fundamental
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4668 ;;;_ > allout-flag-region (from to flag)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4669 (defun allout-flag-region (from to flag)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4670 "Conceal text between FROM and TO if FLAG is non-nil, else reveal it.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4671
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4672 Exposure-change hook `allout-exposure-change-hook' is run with the same
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4673 arguments as this function, after the exposure changes are made. (The old
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4674 `allout-view-change-hook' is being deprecated, and eventually will not be
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4675 invoked.)"
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4676
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4677 ;; We use outline invisibility spec.
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4678 (remove-overlays from to 'category 'allout-exposure-category)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4679 (when flag
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4680 (let ((o (make-overlay from to)))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4681 (overlay-put o 'category 'allout-exposure-category)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4682 (when (featurep 'xemacs)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4683 (let ((props (symbol-plist 'allout-exposure-category)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4684 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4685 (overlay-put o (pop props) (pop props)))))))
70616
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
4686 (run-hooks 'allout-view-change-hook)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4687 (run-hook-with-args 'allout-exposure-change-hook from to flag))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4688 ;;;_ > allout-flag-current-subtree (flag)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4689 (defun allout-flag-current-subtree (flag)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4690 "Conceal currently-visible topic's subtree if FLAG non-nil, else reveal it."
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4691
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4692 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4693 (allout-back-to-current-heading)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4694 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4695 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4696 (allout-flag-region (point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4697 ;; Exposing must not leave trailing blanks hidden,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4698 ;; but can leave them exposed when hiding, so we
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4699 ;; can use flag's inverse as the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4700 ;; include-trailing-blank cue:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4701 (allout-end-of-current-subtree (not flag))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4702 flag)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4703
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4704 ;;;_ - Topic-specific
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4705 ;;;_ > allout-show-entry ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4706 (defun allout-show-entry ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4707 "Like `allout-show-current-entry', but reveals entries in hidden topics.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4708
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4709 This is a way to give restricted peek at a concealed locality without the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4710 expense of exposing its context, but can leave the outline with aberrant
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4711 exposure. `allout-show-offshoot' should be used after the peek to rectify
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4712 the exposure."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4713
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4714 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4715 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4716 (let (beg end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4717 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4718 (setq beg (if (allout-hidden-p) (1- (point)) (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4719 (setq end (allout-pre-next-prefix))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4720 (allout-flag-region beg end nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4721 (list beg end))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4722 ;;;_ > allout-show-children (&optional level strict)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4723 (defun allout-show-children (&optional level strict)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4724
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4725 "If point is visible, show all direct subheadings of this heading.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4726
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4727 Otherwise, do `allout-show-to-offshoot', and then show subheadings.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4728
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4729 Optional LEVEL specifies how many levels below the current level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4730 should be shown, or all levels if t. Default is 1.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4731
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4732 Optional STRICT means don't resort to -show-to-offshoot, no matter
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4733 what. This is basically so -show-to-offshoot, which is called by
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4734 this function, can employ the pure offspring-revealing capabilities of
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4735 it.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4736
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4737 Returns point at end of subtree that was opened, if any. (May get a
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4738 point of non-opened subtree?)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4739
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4740 (interactive "p")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4741 (let ((start-point (point)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4742 (if (and (not strict)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4743 (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4744
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4745 (progn (allout-show-to-offshoot) ; Point's concealed, open to
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4746 ; expose it.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4747 ;; Then recurse, but with "strict" set so we don't
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4748 ;; infinite regress:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4749 (allout-show-children level t))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4750
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4751 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4752 (allout-beginning-of-current-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4753 (save-restriction
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4754 (let* (depth
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4755 ;; translate the level spec for this routine to the ones
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4756 ;; used by -chart-subtree and -chart-to-reveal:
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4757 (chart-level (cond ((not level) 1)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4758 ((eq level t) nil)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4759 (t level)))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4760 (chart (allout-chart-subtree chart-level))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4761 (to-reveal (or (allout-chart-to-reveal chart chart-level)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4762 ;; interactive, show discontinuous children:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4763 (and chart
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4764 (interactive-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4765 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4766 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4767 (setq depth (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4768 (and (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4769 (> allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4770 (1+ depth))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4771 (message
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4772 "Discontinuous offspring; use `%s %s'%s."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4773 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4774 "\\[universal-argument]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4775 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4776 "\\[allout-shift-out]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4777 " to elevate them.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4778 (allout-chart-to-reveal
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4779 chart (- allout-recent-depth depth))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4780 (goto-char start-point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4781 (when (and strict (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4782 ;; Concealed root would already have been taken care of,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4783 ;; unless strict was set.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4784 (allout-flag-region (point) (allout-snug-back) nil)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4785 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4786 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4787 (allout-show-current-entry)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4788 (while to-reveal
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4789 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4790 (allout-flag-region (save-excursion (allout-snug-back) (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4791 (progn (search-forward "\n" nil t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4792 (1- (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4793 nil)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4794 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4795 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4796 (allout-show-current-entry))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4797 (setq to-reveal (cdr to-reveal)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4798 ;; Compensate for `save-excursion's maintenance of point
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4799 ;; within invisible text:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4800 (goto-char start-point)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4801 ;;;_ > allout-show-to-offshoot ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4802 (defun allout-show-to-offshoot ()
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4803 "Like `allout-show-entry', but reveals all concealed ancestors, as well.
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4804
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4805 Useful for coherently exposing to a random point in a hidden region."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4806 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4807 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4808 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4809 (orig-pt (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4810 (orig-pref (allout-goto-prefix-doublechecked))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4811 (last-at (point))
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4812 (bag-it 0))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4813 (while (or (> bag-it 1) (allout-hidden-p))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4814 (while (allout-hidden-p)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4815 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4816 (if (allout-hidden-p) (forward-char -1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4817 (if (= last-at (setq last-at (point)))
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4818 ;; Oops, we're not making any progress! Show the current topic
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4819 ;; completely, and try one more time here, if we haven't already.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4820 (progn (beginning-of-line)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4821 (allout-show-current-subtree)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4822 (goto-char orig-pt)
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4823 (setq bag-it (1+ bag-it))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4824 (if (> bag-it 1)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4825 (error "allout-show-to-offshoot: %s"
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4826 "Stumped by aberrant nesting.")))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4827 (if (> bag-it 0) (setq bag-it 0))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4828 (allout-show-children)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4829 (goto-char orig-pref)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4830 (goto-char orig-pt)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4831 (if (allout-hidden-p)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4832 (allout-show-entry)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4833 ;;;_ > allout-hide-current-entry ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4834 (defun allout-hide-current-entry ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4835 "Hide the body directly following this heading."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4836 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4837 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4838 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4839 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4840 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4841 (allout-flag-region (point)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4842 (progn (allout-end-of-entry) (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4843 t)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4844 ;;;_ > allout-show-current-entry (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4845 (defun allout-show-current-entry (&optional arg)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4846 "Show body following current heading, or hide entry with universal argument."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4847
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4848 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4849 (if arg
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4850 (allout-hide-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4851 (save-excursion (allout-show-to-offshoot))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4852 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4853 (allout-flag-region (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4854 (progn (allout-end-of-entry t) (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4855 nil)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4856 )))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4857 ;;;_ > allout-show-current-subtree (&optional arg)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4858 (defun allout-show-current-subtree (&optional arg)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4859 "Show everything within the current topic. With a repeat-count,
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4860 expose this topic and its siblings."
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4861 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4862 (save-excursion
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4863 (if (<= (allout-current-depth) 0)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4864 ;; Outside any topics - try to get to the first:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4865 (if (not (allout-next-heading))
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
4866 (error "No topics")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4867 ;; got to first, outermost topic - set to expose it and siblings:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4868 (message "Above outermost topic - exposing all.")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4869 (allout-flag-region (point-min)(point-max) nil))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4870 (allout-beginning-of-current-line)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4871 (if (not arg)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4872 (allout-flag-current-subtree nil)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4873 (allout-beginning-of-level)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4874 (allout-expose-topic '(* :))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4875 ;;;_ > allout-current-topic-collapsed-p (&optional include-single-liners)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4876 (defun allout-current-topic-collapsed-p (&optional include-single-liners)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4877 "True if the currently visible containing topic is already collapsed.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4878
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4879 Single line topics intrinsically can be considered as being both
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4880 collapsed and uncollapsed. If optional INCLUDE-SINGLE-LINERS is
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4881 true, then single-line topics are considered to be collapsed. By
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4882 default, they are treated as being uncollapsed."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4883 (save-excursion
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4884 (and
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4885 ;; Is the topic all on one line (allowing for trailing blank line)?
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4886 (>= (progn (allout-back-to-current-heading)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4887 (move-end-of-line 1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4888 (point))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4889 (allout-end-of-current-subtree (not (looking-at "\n\n"))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4890
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4891 (or include-single-liners
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4892 (progn (backward-char 1) (allout-hidden-p))))))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4893 ;;;_ > allout-hide-current-subtree (&optional just-close)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4894 (defun allout-hide-current-subtree (&optional just-close)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4895 "Close the current topic, or containing topic if this one is already closed.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4896
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4897 If this topic is closed and it's a top level topic, close this topic
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4898 and its siblings.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4899
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4900 If optional arg JUST-CLOSE is non-nil, do not close the parent or
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4901 siblings, even if the target topic is already closed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4902
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4903 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4904 (let* ((from (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4905 (sibs-msg "Top-level topic already closed - closing siblings...")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4906 (current-exposed (not (allout-current-topic-collapsed-p t))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4907 (cond (current-exposed (allout-flag-current-subtree t))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4908 (just-close nil)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4909 ((allout-ascend) (allout-hide-current-subtree))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4910 (t (goto-char 0)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4911 (message sibs-msg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4912 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4913 (allout-expose-topic '(0 :))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4914 (message (concat sibs-msg " Done."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4915 (goto-char from)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4916 ;;;_ > allout-show-current-branches ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4917 (defun allout-show-current-branches ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4918 "Show all subheadings of this heading, but not their bodies."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4919 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4920 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4921 (beginning-of-line))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4922 (allout-show-children t))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4923 ;;;_ > allout-hide-current-leaves ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4924 (defun allout-hide-current-leaves ()
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4925 "Hide the bodies of the current topic and all its offspring."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4926 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4927 (allout-back-to-current-heading)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4928 (allout-hide-region-body (point) (progn (allout-end-of-current-subtree)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4929 (point))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4930
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4931 ;;;_ - Region and beyond
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4932 ;;;_ > allout-show-all ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4933 (defun allout-show-all ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4934 "Show all of the text in the buffer."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4935 (interactive)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4936 (message "Exposing entire buffer...")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4937 (allout-flag-region (point-min) (point-max) nil)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4938 (message "Exposing entire buffer... Done."))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4939 ;;;_ > allout-hide-bodies ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4940 (defun allout-hide-bodies ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4941 "Hide all of buffer except headings."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4942 (interactive)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4943 (allout-hide-region-body (point-min) (point-max)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4944 ;;;_ > allout-hide-region-body (start end)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4945 (defun allout-hide-region-body (start end)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4946 "Hide all body lines in the region, but not headings."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4947 (save-excursion
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4948 (save-restriction
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4949 (narrow-to-region start end)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4950 (goto-char (point-min))
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4951 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4952 (while (not (eobp))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4953 (end-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4954 (allout-flag-region (point) (allout-end-of-entry) t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4955 (if (not (eobp))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4956 (forward-char
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4957 (if (looking-at "\n\n")
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4958 2 1))))))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4959
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4960 ;;;_ > allout-expose-topic (spec)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4961 (defun allout-expose-topic (spec)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4962 "Apply exposure specs to successive outline topic items.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4963
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4964 Use the more convenient frontend, `allout-new-exposure', if you don't
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4965 need evaluation of the arguments, or even better, the `allout-layout'
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4966 variable-keyed mode-activation/auto-exposure feature of allout outline
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4967 mode. See the respective documentation strings for more details.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4968
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4969 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4970
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4971 SPEC is either a number or a list.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4972
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4973 Successive specs on a list are applied to successive sibling topics.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4974
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4975 A simple spec (either a number, one of a few symbols, or the null
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4976 list) dictates the exposure for the corresponding topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4977
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4978 Non-null lists recursively designate exposure specs for respective
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4979 subtopics of the current topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4980
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4981 The `:' repeat spec is used to specify exposure for any number of
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4982 successive siblings, up to the trailing ones for which there are
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4983 explicit specs following the `:'.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4984
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4985 Simple (numeric and null-list) specs are interpreted as follows:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4986
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4987 Numbers indicate the relative depth to open the corresponding topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4988 - negative numbers force the topic to be closed before opening to the
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4989 absolute value of the number, so all siblings are open only to
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4990 that level.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4991 - positive numbers open to the relative depth indicated by the
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4992 number, but do not force already opened subtopics to be closed.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4993 - 0 means to close topic - hide all offspring.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4994 : - `repeat'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4995 apply prior element to all siblings at current level, *up to*
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4996 those siblings that would be covered by specs following the `:'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4997 on the list. Ie, apply to all topics at level but the last
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4998 ones. (Only first of multiple colons at same level is
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4999 respected - subsequent ones are discarded.)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5000 * - completely opens the topic, including bodies.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5001 + - shows all the sub headers, but not the bodies
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5002 - - exposes the body of the corresponding topic.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5003
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5004 Examples:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5005 \(allout-expose-topic '(-1 : 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5006 Close this and all following topics at current level, exposing
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5007 only their immediate children, but close down the last topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5008 at this current level completely.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5009 \(allout-expose-topic '(-1 () : 1 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5010 Close current topic so only the immediate subtopics are shown;
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5011 show the children in the second to last topic, and completely
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5012 close the last one.
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5013 \(allout-expose-topic '(-2 : -1 *))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5014 Expose children and grandchildren of all topics at current
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5015 level except the last two; expose children of the second to
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5016 last and completely open the last one."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5017
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5018 (interactive "xExposure spec: ")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5019 (if (not (listp spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5020 nil
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5021 (let ((depth (allout-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5022 (max-pos 0)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5023 prev-elem curr-elem
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5024 stay)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5025 (while spec
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5026 (setq prev-elem curr-elem
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5027 curr-elem (car spec)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5028 spec (cdr spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5029 (cond ; Do current element:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5030 ((null curr-elem) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5031 ((symbolp curr-elem)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5032 (cond ((eq curr-elem '*) (allout-show-current-subtree)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5033 (if (> allout-recent-end-of-subtree max-pos)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5034 (setq max-pos allout-recent-end-of-subtree)))
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5035 ((eq curr-elem '+)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5036 (if (not (allout-hidden-p))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5037 (save-excursion (allout-hide-current-subtree t)))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5038 (allout-show-current-branches)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5039 (if (> allout-recent-end-of-subtree max-pos)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5040 (setq max-pos allout-recent-end-of-subtree)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5041 ((eq curr-elem '-) (allout-show-current-entry))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5042 ((eq curr-elem ':)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5043 (setq stay t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5044 ;; Expand the `repeat' spec to an explicit version,
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5045 ;; w.r.t. remaining siblings:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5046 (let ((residue ; = # of sibs not covered by remaining spec
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5047 ;; Dang - could be nice to make use of the chart, sigh:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5048 (- (length (allout-chart-siblings))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5049 (length spec))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5050 (if (< 0 residue)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5051 ;; Some residue - cover it with prev-elem:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5052 (setq spec (append (make-list residue prev-elem)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5053 spec)))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5054 ((numberp curr-elem)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5055 (if (and (>= 0 curr-elem) (not (allout-hidden-p)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5056 (save-excursion (allout-hide-current-subtree t)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5057 (if (> 0 curr-elem)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5058 nil
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5059 (if (> allout-recent-end-of-subtree max-pos)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5060 (setq max-pos
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5061 allout-recent-end-of-subtree)))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5062 (if (> (abs curr-elem) 0)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5063 (progn (allout-show-children (abs curr-elem))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5064 (if (> allout-recent-end-of-subtree max-pos)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5065 (setq max-pos allout-recent-end-of-subtree)))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5066 ((listp curr-elem)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5067 (if (allout-descend-to-depth (1+ depth))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5068 (let ((got (allout-expose-topic curr-elem)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5069 (if (and got (> got max-pos)) (setq max-pos got))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5070 (cond (stay (setq stay nil))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5071 ((listp (car spec)) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5072 ((> max-pos (point))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5073 ;; Capitalize on max-pos state to get us nearer next sibling:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5074 (progn (goto-char (min (point-max) max-pos))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5075 (allout-next-heading)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5076 ((allout-next-sibling depth))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5077 max-pos)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5078 ;;;_ > allout-old-expose-topic (spec &rest followers)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5079 (defun allout-old-expose-topic (spec &rest followers)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5080
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5081 "Deprecated. Use `allout-expose-topic' (with different schema
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5082 format) instead.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5083
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5084 Dictate wholesale exposure scheme for current topic, according to SPEC.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5085
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5086 SPEC is either a number or a list. Optional successive args
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5087 dictate exposure for subsequent siblings of current topic.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5088
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5089 A simple spec (either a number, a special symbol, or the null list)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5090 dictates the overall exposure for a topic. Non null lists are
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5091 composite specs whose first element dictates the overall exposure for
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5092 a topic, with the subsequent elements in the list interpreted as specs
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5093 that dictate the exposure for the successive offspring of the topic.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5094
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5095 Simple (numeric and null-list) specs are interpreted as follows:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5096
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5097 - Numbers indicate the relative depth to open the corresponding topic:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5098 - negative numbers force the topic to be close before opening to the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5099 absolute value of the number.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5100 - positive numbers just open to the relative depth indicated by the number.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5101 - 0 just closes
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5102 - `*' completely opens the topic, including bodies.
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5103 - `+' shows all the sub headers, but not the bodies
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5104 - `-' exposes the body and immediate offspring of the corresponding topic.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5105
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5106 If the spec is a list, the first element must be a number, which
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5107 dictates the exposure depth of the topic as a whole. Subsequent
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5108 elements of the list are nested SPECs, dictating the specific exposure
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5109 for the corresponding offspring of the topic.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5110
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5111 Optional FOLLOWERS arguments dictate exposure for succeeding siblings."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5112
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5113 (interactive "xExposure spec: ")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5114 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5115 (depth (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5116 max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5117 (cond ((null spec) nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5118 ((symbolp spec)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5119 (if (eq spec '*) (allout-show-current-subtree))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5120 (if (eq spec '+) (allout-show-current-branches))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5121 (if (eq spec '-) (allout-show-current-entry)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5122 ((numberp spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5123 (if (>= 0 spec)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5124 (save-excursion (allout-hide-current-subtree t)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5125 (end-of-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5126 (if (or (not max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5127 (> (point) max-pos))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5128 (setq max-pos (point)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5129 (if (> 0 spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5130 (setq spec (* -1 spec)))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5131 (if (> spec 0)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5132 (allout-show-children spec)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5133 ((listp spec)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5134 ;(let ((got (allout-old-expose-topic (car spec))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5135 ; (if (and got (or (not max-pos) (> got max-pos)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5136 ; (setq max-pos got)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5137 (let ((new-depth (+ (allout-current-depth) 1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5138 got)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5139 (setq max-pos (allout-old-expose-topic (car spec)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5140 (setq spec (cdr spec))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5141 (if (and spec
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5142 (allout-descend-to-depth new-depth)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5143 (not (allout-hidden-p)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5144 (progn (setq got (apply 'allout-old-expose-topic spec))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5145 (if (and got (or (not max-pos) (> got max-pos)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5146 (setq max-pos got)))))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5147 (while (and followers
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5148 (progn (if (and max-pos (< (point) max-pos))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5149 (progn (goto-char max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5150 (setq max-pos nil)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5151 (end-of-line)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5152 (allout-next-sibling depth)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5153 (allout-old-expose-topic (car followers))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5154 (setq followers (cdr followers)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5155 max-pos))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5156 ;;;_ > allout-new-exposure '()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5157 (defmacro allout-new-exposure (&rest spec)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5158 "Literal frontend for `allout-expose-topic', doesn't evaluate arguments.
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
5159 Some arguments that would need to be quoted in `allout-expose-topic'
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
5160 need not be quoted in `allout-new-exposure'.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5161
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5162 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5163
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5164 Use this instead of obsolete `allout-exposure'.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5165
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5166 Examples:
61969
38ca28ee68d6 (allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents: 59996
diff changeset
5167 \(allout-new-exposure (-1 () () () 1) 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5168 Close current topic at current level so only the immediate
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5169 subtopics are shown, except also show the children of the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5170 third subtopic; and close the next topic at the current level.
61969
38ca28ee68d6 (allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents: 59996
diff changeset
5171 \(allout-new-exposure : -1 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5172 Close all topics at current level to expose only their
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5173 immediate children, except for the last topic at the current
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5174 level, in which even its immediate children are hidden.
61969
38ca28ee68d6 (allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents: 59996
diff changeset
5175 \(allout-new-exposure -2 : -1 *)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5176 Expose children and grandchildren of first topic at current
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5177 level, and expose children of subsequent topics at current
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5178 level *except* for the last, which should be opened completely."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5179 (list 'save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5180 '(if (not (or (allout-goto-prefix-doublechecked)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5181 (allout-next-heading)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5182 (error "allout-new-exposure: Can't find any outline topics"))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5183 (list 'allout-expose-topic (list 'quote spec))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5184
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5185 ;;;_ #7 Systematic outline presentation - copying, printing, flattening
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5186
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5187 ;;;_ - Mapping and processing of topics
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5188 ;;;_ ( See also Subtree Charting, in Navigation code.)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5189 ;;;_ > allout-stringify-flat-index (flat-index)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5190 (defun allout-stringify-flat-index (flat-index &optional context)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5191 "Convert list representing section/subsection/... to document string.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5192
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5193 Optional arg CONTEXT indicates interior levels to include."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5194 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5195 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5196 numstr
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5197 (context-depth (or (and context 2) 1)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5198 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5199 (while (> context-depth 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5200 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5201 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5202 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5203 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5204 (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5205 context-depth (if flat-index (1- context-depth) 0)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5206 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5207 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5208 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5209 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5210 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5211 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5212 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5213 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5214 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5215 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5216 (log10 (car flat-index)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5217 ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5218 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5219 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5220 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5221 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5222 (apply 'concat result)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5223 ;;;_ > allout-stringify-flat-index-plain (flat-index)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5224 (defun allout-stringify-flat-index-plain (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5225 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5226 (let ((delim ".")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5227 result)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5228 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5229 (setq result (cons (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5230 (if result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5231 (cons delim result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5232 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5233 (apply 'concat result)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5234 ;;;_ > allout-stringify-flat-index-indented (flat-index)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5235 (defun allout-stringify-flat-index-indented (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5236 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5237 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5238 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5239 numstr)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5240 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5241 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5242 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5243 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5244 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5245 (cons numstr result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5246 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5247 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5248 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5249 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5250 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5251 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5252 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5253 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5254 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5255 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5256 (log10 (car flat-index)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5257 ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5258 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5259 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5260 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5261 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5262 (apply 'concat result)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5263 ;;;_ > allout-listify-exposed (&optional start end format)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5264 (defun allout-listify-exposed (&optional start end format)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5265
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5266 "Produce a list representing exposed topics in current region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5267
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5268 This list can then be used by `allout-process-exposed' to manipulate
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5269 the subject region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5270
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5271 Optional START and END indicate bounds of region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5272
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5273 optional arg, FORMAT, designates an alternate presentation form for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5274 the prefix:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5275
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5276 list - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5277 section indicated by the list, innermost nesting first.
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5278 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5279 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5280
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5281 The elements of the list produced are lists that represents a topic
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5282 header and body. The elements of that list are:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5283
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5284 - a number representing the depth of the topic,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5285 - a string representing the header-prefix, including trailing whitespace and
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5286 bullet.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5287 - a string representing the bullet character,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5288 - and a series of strings, each containing one line of the exposed
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5289 portion of the topic entry."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5290
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5291 (interactive "r")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5292 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5293 (let*
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5294 ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5295 ;; state vars:
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5296 strings prefix result depth new-depth out gone-out bullet beg
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5297 next done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5298
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5299 (goto-char start)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5300 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5301 ;; Goto initial topic, and register preceeding stuff, if any:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5302 (if (> (allout-goto-prefix-doublechecked) start)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5303 ;; First topic follows beginning point - register preliminary stuff:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5304 (setq result (list (list 0 "" nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5305 (buffer-substring start (1- (point)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5306 (while (and (not done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5307 (not (eobp)) ; Loop until we've covered the region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5308 (not (> (point) end)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5309 (setq depth allout-recent-depth ; Current topics depth,
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5310 bullet (allout-recent-bullet) ; ... bullet,
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5311 prefix (allout-recent-prefix)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5312 beg (progn (allout-end-of-prefix t) (point))) ; and beginning.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5313 (setq done ; The boundary for the current topic:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5314 (not (allout-next-visible-heading 1)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5315 (setq new-depth allout-recent-depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5316 (setq gone-out out
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5317 out (< new-depth depth))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5318 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5319 (setq next (point))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5320 (goto-char beg)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5321 (setq strings nil)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5322 (while (> next (point)) ; Get all the exposed text in
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5323 (setq strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5324 (cons (buffer-substring
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5325 beg
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5326 ;To hidden text or end of line:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5327 (progn
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5328 (end-of-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5329 (allout-back-to-visible-text)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5330 strings))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5331 (when (< (point) next) ; Resume from after hid text, if any.
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5332 (line-move 1)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5333 (beginning-of-line))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5334 (setq beg (point)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5335 ;; Accumulate list for this topic:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5336 (setq strings (nreverse strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5337 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5338 (cons
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5339 (if format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5340 (let ((special (if (string-match
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5341 (regexp-quote bullet)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5342 allout-distinctive-bullets-string)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5343 bullet)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5344 (cond ((listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5345 (list depth
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5346 (if allout-abbreviate-flattened-numbering
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5347 (allout-stringify-flat-index format
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5348 gone-out)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5349 (allout-stringify-flat-index-plain
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5350 format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5351 strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5352 special))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5353 ((eq format 'indent)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5354 (if special
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5355 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5356 (concat (make-string (1+ depth) ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5357 (substring prefix -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5358 strings)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5359 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5360 (make-string depth ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5361 strings)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5362 (t (error "allout-listify-exposed: %s %s"
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5363 "invalid format" format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5364 (list depth prefix strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5365 result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5366 ;; Reasses format, if any:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5367 (if (and format (listp format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5368 (cond ((= new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5369 (setq format (cons (1+ (car format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5370 (cdr format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5371 ((> new-depth depth) ; descending - assume by 1:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5372 (setq format (cons 1 format)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5373 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5374 ; Pop the residue:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5375 (while (< new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5376 (setq format (cdr format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5377 (setq depth (1- depth)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5378 ; And increment the current one:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5379 (setq format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5380 (cons (1+ (or (car format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5381 -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5382 (cdr format)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5383 ;; Put the list with first at front, to last at back:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5384 (nreverse result))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5385 ;;;_ > my-region-active-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5386 (defmacro my-region-active-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5387 (if (fboundp 'region-active-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5388 '(region-active-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5389 'mark-active))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5390 ;;;_ > allout-process-exposed (&optional func from to frombuf
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5391 ;;; tobuf format)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5392 (defun allout-process-exposed (&optional func from to frombuf tobuf
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5393 format start-num)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5394 "Map function on exposed parts of current topic; results to another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5395
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5396 All args are options; default values itemized below.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5397
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5398 Apply FUNCTION to exposed portions FROM position TO position in buffer
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5399 FROMBUF to buffer TOBUF. Sixth optional arg, FORMAT, designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5400 alternate presentation form:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5401
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5402 `flat' - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5403 section indicated by the start-num, innermost nesting first.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5404 X`flat-indented' - Prefix is like `flat' for first topic at each
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5405 X level, but subsequent topics have only leaf topic
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5406 X number, padded with blanks to line up with first.
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5407 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5408 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5409
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5410 Defaults:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5411 FUNCTION: `allout-insert-listified'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5412 FROM: region start, if region active, else start of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5413 TO: region end, if region active, else end of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5414 FROMBUF: current buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5415 TOBUF: buffer name derived: \"*current-buffer-name exposed*\"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5416 FORMAT: nil"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5417
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5418 ; Resolve arguments,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5419 ; defaulting if necessary:
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5420 (if (not func) (setq func 'allout-insert-listified))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5421 (if (not (and from to))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5422 (if (my-region-active-p)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5423 (setq from (region-beginning) to (region-end))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5424 (setq from (point-min) to (point-max))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5425 (if frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5426 (if (not (bufferp frombuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5427 ;; Specified but not a buffer - get it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5428 (let ((got (get-buffer frombuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5429 (if (not got)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5430 (error (concat "allout-process-exposed: source buffer "
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5431 frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5432 " not found."))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5433 (setq frombuf got))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5434 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5435 (setq frombuf (current-buffer)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5436 (if tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5437 (if (not (bufferp tobuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5438 (setq tobuf (get-buffer-create tobuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5439 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5440 (setq tobuf (concat "*" (buffer-name frombuf) " exposed*")))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5441 (if (listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5442 (nreverse format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5443
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5444 (let* ((listified
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5445 (progn (set-buffer frombuf)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5446 (allout-listify-exposed from to format))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5447 (set-buffer tobuf)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5448 (mapcar func listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5449 (pop-to-buffer tobuf)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5450
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5451 ;;;_ - Copy exposed
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5452 ;;;_ > allout-insert-listified (listified)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5453 (defun allout-insert-listified (listified)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5454 "Insert contents of listified outline portion in current buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5455
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5456 LISTIFIED is a list representing each topic header and body:
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5457
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5458 \`(depth prefix text)'
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5459
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5460 or \`(depth prefix text bullet-plus)'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5461
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5462 If `bullet-plus' is specified, it is inserted just after the entire prefix."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5463 (setq listified (cdr listified))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5464 (let ((prefix (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5465 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5466 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5467 (text (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5468 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5469 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5470 (bullet-plus (car listified)))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5471 (insert prefix)
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5472 (if bullet-plus (insert (concat " " bullet-plus)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5473 (while text
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5474 (insert (car text))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5475 (if (setq text (cdr text))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5476 (insert "\n")))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5477 (insert "\n")))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5478 ;;;_ > allout-copy-exposed-to-buffer (&optional arg tobuf format)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5479 (defun allout-copy-exposed-to-buffer (&optional arg tobuf format)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5480 "Duplicate exposed portions of current outline to another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5481
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5482 Other buffer has current buffers name with \" exposed\" appended to it.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5483
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5484 With repeat count, copy the exposed parts of only the current topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5485
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5486 Optional second arg TOBUF is target buffer name.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5487
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5488 Optional third arg FORMAT, if non-nil, symbolically designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5489 alternate presentation format for the outline:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5491 `flat' - Convert topic header prefixes to numeric
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5492 section.subsection... identifiers.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5493 `indent' - Convert header prefixes to all white space, except for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5494 distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5495 `indent-flat' - The best of both - only the first of each level has
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5496 the full path, the rest have only the section number
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5497 of the leaf, preceded by the right amount of indentation."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5498
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5499 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5500 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5501 (setq tobuf (get-buffer-create (concat "*" (buffer-name) " exposed*"))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5502 (let* ((start-pt (point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5503 (beg (if arg (allout-back-to-current-heading) (point-min)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5504 (end (if arg (allout-end-of-current-subtree) (point-max)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5505 (buf (current-buffer))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5506 (start-list ()))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5507 (if (eq format 'flat)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5508 (setq format (if arg (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5509 (goto-char beg)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5510 (allout-topic-flat-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5511 '(1))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5512 (save-excursion (set-buffer tobuf)(erase-buffer))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5513 (allout-process-exposed 'allout-insert-listified
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5514 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5515 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5516 (current-buffer)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5517 tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5518 format start-list)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5519 (goto-char (point-min))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5520 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5521 (goto-char start-pt)))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5522 ;;;_ > allout-flatten-exposed-to-buffer (&optional arg tobuf)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5523 (defun allout-flatten-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5524 "Present numeric outline of outline's exposed portions in another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5525
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5526 The resulting outline is not compatible with outline mode - use
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5527 `allout-copy-exposed-to-buffer' if you want that.
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5528
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5529 Use `allout-indented-exposed-to-buffer' for indented presentation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5530
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5531 With repeat count, copy the exposed portions of only current topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5532
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5533 Other buffer has current buffer's name with \" exposed\" appended to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5534 it, unless optional second arg TOBUF is specified, in which case it is
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5535 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5536 (interactive "P")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5537 (allout-copy-exposed-to-buffer arg tobuf 'flat))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5538 ;;;_ > allout-indented-exposed-to-buffer (&optional arg tobuf)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5539 (defun allout-indented-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5540 "Present indented outline of outline's exposed portions in another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5541
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5542 The resulting outline is not compatible with outline mode - use
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5543 `allout-copy-exposed-to-buffer' if you want that.
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5544
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5545 Use `allout-flatten-exposed-to-buffer' for numeric sectional presentation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5546
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5547 With repeat count, copy the exposed portions of only current topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5548
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5549 Other buffer has current buffer's name with \" exposed\" appended to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5550 it, unless optional second arg TOBUF is specified, in which case it is
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5551 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5552 (interactive "P")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5553 (allout-copy-exposed-to-buffer arg tobuf 'indent))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5554
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5555 ;;;_ - LaTeX formatting
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5556 ;;;_ > allout-latex-verb-quote (string &optional flow)
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5557 (defun allout-latex-verb-quote (string &optional flow)
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5558 "Return copy of STRING for literal reproduction across LaTeX processing.
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5559 Expresses the original characters (including carriage returns) of the
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5560 string across LaTeX processing."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5561 (mapconcat (function
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5562 (lambda (char)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5563 (cond ((memq char '(?\\ ?$ ?% ?# ?& ?{ ?} ?_ ?^ ?- ?*))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5564 (concat "\\char" (number-to-string char) "{}"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5565 ((= char ?\n) "\\\\")
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5566 (t (char-to-string char)))))
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5567 string
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5568 ""))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5569 ;;;_ > allout-latex-verbatim-quote-curr-line ()
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5570 (defun allout-latex-verbatim-quote-curr-line ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5571 "Express line for exact (literal) representation across LaTeX processing.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5572
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5573 Adjust line contents so it is unaltered (from the original line)
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5574 across LaTeX processing, within the context of a `verbatim'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5575 environment. Leaves point at the end of the line."
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5576 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5577 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5578 (let ((beg (point))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5579 (end (progn (end-of-line)(point))))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5580 (goto-char beg)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5581 (while (re-search-forward "\\\\"
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5582 ;;"\\\\\\|\\{\\|\\}\\|\\_\\|\\$\\|\\\"\\|\\&\\|\\^\\|\\-\\|\\*\\|#"
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5583 end ; bounded by end-of-line
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5584 1) ; no matches, move to end & return nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5585 (goto-char (match-beginning 2))
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5586 (insert "\\")
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5587 (setq end (1+ end))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5588 (goto-char (1+ (match-end 2)))))))
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5589 ;;;_ > allout-insert-latex-header (buffer)
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5590 (defun allout-insert-latex-header (buffer)
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5591 "Insert initial LaTeX commands at point in BUFFER."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5592 ;; Much of this is being derived from the stuff in appendix of E in
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5593 ;; the TeXBook, pg 421.
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5594 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5595 (let ((doc-style (format "\n\\documentstyle{%s}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5596 "report"))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5597 (page-numbering (if allout-number-pages
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5598 "\\pagestyle{empty}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5599 ""))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5600 (titlecmd (format "\\newcommand{\\titlecmd}[1]{{%s #1}}\n"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5601 allout-title-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5602 (labelcmd (format "\\newcommand{\\labelcmd}[1]{{%s #1}}\n"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5603 allout-label-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5604 (headlinecmd (format "\\newcommand{\\headlinecmd}[1]{{%s #1}}\n"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5605 allout-head-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5606 (bodylinecmd (format "\\newcommand{\\bodylinecmd}[1]{{%s #1}}\n"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5607 allout-body-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5608 (setlength (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5609 "\\newlength{\\stepsize}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5610 "\\setlength{\\stepsize}{"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5611 allout-indent
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5612 "}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5613 (oneheadline (format "%s%s%s%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5614 "\\newcommand{\\OneHeadLine}[3]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5615 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5616 "\\hspace*{#2\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5617 "\\labelcmd{#1}\\hspace*{.2cm}"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5618 "\\headlinecmd{#3}\\\\["
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5619 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5620 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5621 (onebodyline (format "%s%s%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5622 "\\newcommand{\\OneBodyLine}[2]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5623 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5624 "\\hspace*{#1\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5625 "\\bodylinecmd{#2}\\\\["
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5626 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5627 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5628 (begindoc "\\begin{document}\n\\begin{center}\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5629 (title (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5630 "\\titlecmd{"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5631 (allout-latex-verb-quote (if allout-title
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5632 (condition-case nil
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5633 (eval allout-title)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5634 (error "<unnamed buffer>"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5635 "Unnamed Outline"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5636 "}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5637 "\\end{center}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5638 (hsize "\\hsize = 7.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5639 (hoffset "\\hoffset = -1.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5640 (vspace "\\vspace{.1cm}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5641 (insert (concat doc-style
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5642 page-numbering
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5643 titlecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5644 labelcmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5645 headlinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5646 bodylinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5647 setlength
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5648 oneheadline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5649 onebodyline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5650 begindoc
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5651 title
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5652 hsize
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5653 hoffset
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5654 vspace)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5655 )))
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5656 ;;;_ > allout-insert-latex-trailer (buffer)
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5657 (defun allout-insert-latex-trailer (buffer)
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5658 "Insert concluding LaTeX commands at point in BUFFER."
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5659 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5660 (insert "\n\\end{document}\n"))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5661 ;;;_ > allout-latexify-one-item (depth prefix bullet text)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5662 (defun allout-latexify-one-item (depth prefix bullet text)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5663 "Insert LaTeX commands for formatting one outline item.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5664
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5665 Args are the topics numeric DEPTH, the header PREFIX lead string, the
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5666 BULLET string, and a list of TEXT strings for the body."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5667 (let* ((head-line (if text (car text)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5668 (body-lines (cdr text))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5669 (curr-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5670 body-content bop)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5671 ; Do the head line:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5672 (insert (concat "\\OneHeadLine{\\verb\1 "
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5673 (allout-latex-verb-quote bullet)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5674 "\1}{"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5675 depth
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5676 "}{\\verb\1 "
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5677 (if head-line
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5678 (allout-latex-verb-quote head-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5679 "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5680 "\1}\n"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5681 (if (not body-lines)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5682 nil
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5683 ;;(insert "\\beginlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5684 (insert "\\begin{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5685 (while body-lines
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5686 (setq curr-line (car body-lines))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5687 (if (and (not body-content)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5688 (not (string-match "^\\s-*$" curr-line)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5689 (setq body-content t))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5690 ; Mangle any occurrences of
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5691 ; "\end{verbatim}" in text,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5692 ; it's special:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5693 (if (and body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5694 (setq bop (string-match "\\end{verbatim}" curr-line)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5695 (setq curr-line (concat (substring curr-line 0 bop)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5696 ">"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5697 (substring curr-line bop))))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5698 ;;(insert "|" (car body-lines) "|")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5699 (insert curr-line)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5700 (allout-latex-verbatim-quote-curr-line)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5701 (insert "\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5702 (setq body-lines (cdr body-lines)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5703 (if body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5704 (setq body-content nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5705 (forward-char -1)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5706 (insert "\\ ")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5707 (forward-char 1))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5708 ;;(insert "\\endlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5709 (insert "\\end{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5710 )))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5711 ;;;_ > allout-latexify-exposed (arg &optional tobuf)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5712 (defun allout-latexify-exposed (arg &optional tobuf)
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
5713 "Format current topics exposed portions to TOBUF for LaTeX processing.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5714 TOBUF defaults to a buffer named the same as the current buffer, but
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5715 with \"*\" prepended and \" latex-formed*\" appended.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5716
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5717 With repeat count, copy the exposed portions of entire buffer."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5718
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5719 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5720 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5721 (setq tobuf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5722 (get-buffer-create (concat "*" (buffer-name) " latexified*"))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5723 (let* ((start-pt (point))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5724 (beg (if arg (point-min) (allout-back-to-current-heading)))
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5725 (end (if arg (point-max) (allout-end-of-current-subtree)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5726 (buf (current-buffer)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5727 (set-buffer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5728 (erase-buffer)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5729 (allout-insert-latex-header tobuf)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5730 (goto-char (point-max))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5731 (allout-process-exposed 'allout-latexify-one-item
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5732 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5733 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5734 buf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5735 tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5736 (goto-char (point-max))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5737 (allout-insert-latex-trailer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5738 (goto-char (point-min))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5739 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5740 (goto-char start-pt)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5741
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5742 ;;;_ #8 Encryption
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5743 ;;;_ > allout-toggle-current-subtree-encryption (&optional fetch-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5744 (defun allout-toggle-current-subtree-encryption (&optional fetch-pass)
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5745 "Encrypt clear or decrypt encoded text of visibly-containing topic's contents.
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5746
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5747 Optional FETCH-PASS universal argument provokes key-pair encryption with
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5748 single universal argument. With doubled universal argument (value = 16),
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5749 it forces prompting for the passphrase regardless of availability from the
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5750 passphrase cache. With no universal argument, the appropriate passphrase
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5751 is obtained from the cache, if available, else from the user.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5752
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5753 Only GnuPG encryption is supported.
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5754
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5755 \*NOTE WELL* that the encrypted text must be ascii-armored. For gnupg
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5756 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5757
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5758 Both symmetric-key and key-pair encryption is implemented. Symmetric is
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5759 the default, use a single (x4) universal argument for keypair mode.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5760
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5761 Encrypted topic's bullet is set to a `~' to signal that the contents of the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5762 topic (body and subtopics, but not heading) is pending encryption or
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5763 encrypted. `*' asterisk immediately after the bullet signals that the body
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5764 is encrypted, its' absence means the topic is meant to be encrypted but is
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5765 not. When a file with topics pending encryption is saved, topics pending
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5766 encryption are encrypted. See allout-encrypt-unencrypted-on-saves for
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5767 auto-encryption specifics.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5768
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5769 \*NOTE WELL* that automatic encryption that happens during saves will
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5770 default to symmetric encryption - you must deliberately (re)encrypt key-pair
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5771 encrypted topics if you want them to continue to use the key-pair cipher.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5772
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5773 Level-one topics, with prefix consisting solely of an `*' asterisk, cannot be
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5774 encrypted. If you want to encrypt the contents of a top-level topic, use
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5775 \\[allout-shift-in] to increase its depth.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5776
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5777 Passphrase Caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5778
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5779 The encryption passphrase is solicited if not currently available in the
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5780 passphrase cache from a recent encryption action.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5781
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5782 The solicited passphrase is retained for reuse in a cache, if enabled. See
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5783 `pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' for details.
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5784
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5785 Symmetric Passphrase Hinting and Verification
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5786
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5787 If the file previously had no associated passphrase, or had a different
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5788 passphrase than specified, the user is prompted to repeat the new one for
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5789 corroboration. A random string encrypted by the new passphrase is set on
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5790 the buffer-specific variable `allout-passphrase-verifier-string', for
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5791 confirmation of the passphrase when next obtained, before encrypting or
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5792 decrypting anything with it. This helps avoid mistakenly shifting between
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5793 keys.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5794
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5795 If allout customization var `allout-passphrase-verifier-handling' is
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5796 non-nil, an entry for `allout-passphrase-verifier-string' and its value is
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5797 added to an Emacs 'local variables' section at the end of the file, which
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5798 is created if necessary. That setting is for retention of the passphrase
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
5799 verifier across Emacs sessions.
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5800
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5801 Similarly, `allout-passphrase-hint-string' stores a user-provided reminder
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5802 about their passphrase, and `allout-passphrase-hint-handling' specifies
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5803 when the hint is presented, or if passphrase hints are disabled. If
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5804 enabled (see the `allout-passphrase-hint-handling' docstring for details),
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5805 the hint string is stored in the local-variables section of the file, and
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5806 solicited whenever the passphrase is changed."
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5807 (interactive "P")
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5808 (save-excursion
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5809 (allout-back-to-current-heading)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5810 (allout-toggle-subtree-encryption fetch-pass)
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5811 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5812 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5813 ;;;_ > allout-toggle-subtree-encryption (&optional fetch-pass)
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5814 (defun allout-toggle-subtree-encryption (&optional fetch-pass)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5815 "Encrypt clear text or decrypt encoded topic contents (body and subtopics.)
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5816
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5817 Optional FETCH-PASS universal argument provokes key-pair encryption with
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5818 single universal argument. With doubled universal argument (value = 16),
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5819 it forces prompting for the passphrase regardless of availability from the
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5820 passphrase cache. With no universal argument, the appropriate passphrase
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5821 is obtained from the cache, if available, else from the user.
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5822
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
5823 Currently only GnuPG encryption is supported, and integration
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
5824 with gpg-agent is not yet implemented.
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5825
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5826 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5827 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file.
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5828
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5829 See `allout-toggle-current-subtree-encryption' for more details."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5830
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5831 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5832 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5833 (allout-end-of-prefix t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5834
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5835 (if (= allout-recent-depth 1)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5836 (error (concat "Cannot encrypt or decrypt level 1 topics -"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5837 " shift it in to make it encryptable")))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5838
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5839 (let* ((allout-buffer (current-buffer))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5840 ;; Assess location:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5841 (bullet-pos allout-recent-prefix-beginning)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5842 (after-bullet-pos (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5843 (was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5844 (progn (if (= (point-max) after-bullet-pos)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5845 (error "no body to encrypt"))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5846 (allout-encrypted-topic-p)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5847 (was-collapsed (if (not (search-forward "\n" nil t))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5848 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5849 (backward-char 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5850 (allout-hidden-p)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5851 (subtree-beg (1+ (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5852 (subtree-end (allout-end-of-subtree))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5853 (subject-text (buffer-substring-no-properties subtree-beg
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5854 subtree-end))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5855 (subtree-end-char (char-after (1- subtree-end)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5856 (subtree-trailing-char (char-after subtree-end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5857 ;; kluge - result-text needs to be nil, but we also want to
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5858 ;; check for the error condition
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5859 (result-text (if (or (string= "" subject-text)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5860 (string= "\n" subject-text))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5861 (error "No topic contents to %scrypt"
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5862 (if was-encrypted "de" "en"))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5863 nil))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5864 ;; Assess key parameters:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5865 (key-info (or
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5866 ;; detect the type by which it is already encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5867 (and was-encrypted
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5868 (allout-encrypted-key-info subject-text))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5869 (and (member fetch-pass '(4 (4)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5870 '(keypair nil))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5871 '(symmetric nil)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5872 (for-key-type (car key-info))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5873 (for-key-identity (cadr key-info))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5874 (fetch-pass (and fetch-pass (member fetch-pass '(16 (16)))))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5875 (was-coding-system buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5876
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5877 (when (not was-encrypted)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5878 ;; ensure that non-ascii chars pending encryption are noticed before
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5879 ;; they're encrypted, so the coding system is set to accomodate
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5880 ;; them.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5881 (setq buffer-file-coding-system
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5882 (select-safe-coding-system subtree-beg subtree-end))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5883 ;; if the coding system for the text being encrypted is different
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5884 ;; than that prevailing, then there a real risk that the coding
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5885 ;; system can't be noticed by emacs when the file is visited. to
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5886 ;; mitigate that, offer to preserve the coding system using a file
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5887 ;; local variable.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5888 (if (and (not (equal buffer-file-coding-system
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5889 was-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5890 (yes-or-no-p
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5891 (format (concat "Register coding system %s as file local"
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5892 " var? Necessary when only encrypted text"
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5893 " is in that coding system. ")
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5894 buffer-file-coding-system)))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5895 (allout-adjust-file-variable "buffer-file-coding-system"
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5896 buffer-file-coding-system)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5897
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5898 (setq result-text
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5899 (allout-encrypt-string subject-text was-encrypted
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5900 (current-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5901 for-key-type for-key-identity fetch-pass))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5902
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5903 ;; Replace the subtree with the processed product.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5904 (allout-unprotected
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5905 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5906 (set-buffer allout-buffer)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5907 (delete-region subtree-beg subtree-end)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5908 (insert result-text)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5909 (if was-collapsed
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5910 (allout-flag-region (1- subtree-beg) (point) t))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5911 ;; adjust trailing-blank-lines to preserve topic spacing:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5912 (if (not was-encrypted)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5913 (if (and (= subtree-end-char ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5914 (= subtree-trailing-char ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5915 (insert subtree-trailing-char)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5916 ;; Ensure that the item has an encrypted-entry bullet:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5917 (if (not (string= (buffer-substring-no-properties
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5918 (1- after-bullet-pos) after-bullet-pos)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5919 allout-topic-encryption-bullet))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5920 (progn (goto-char (1- after-bullet-pos))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5921 (delete-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5922 (insert allout-topic-encryption-bullet)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5923 (if was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5924 ;; Remove the is-encrypted bullet qualifier:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5925 (progn (goto-char after-bullet-pos)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5926 (delete-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5927 ;; Add the is-encrypted bullet qualifier:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5928 (goto-char after-bullet-pos)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5929 (insert "*"))))
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5930 (run-hook-with-args 'allout-structure-added-hook
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5931 bullet-pos subtree-end))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5932 ;;;_ > allout-encrypt-string (text decrypt allout-buffer key-type for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5933 ;;; fetch-pass &optional retried verifying
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5934 ;;; passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5935 (defun allout-encrypt-string (text decrypt allout-buffer key-type for-key
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5936 fetch-pass &optional retried rejected
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5937 verifying passphrase)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5938 "Encrypt or decrypt message TEXT.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5939
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5940 If DECRYPT is true (default false), then decrypt instead of encrypt.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5941
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5942 FETCH-PASS (default false) forces fresh prompting for the passphrase.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5943
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5944 KEY-TYPE indicates whether to use a 'symmetric or 'keypair cipher.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5945
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5946 FOR-KEY is human readable identification of the first of the user's
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5947 eligible secret keys a keypair decryption targets, or else nil.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5948
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5949 Optional RETRIED is for internal use - conveys the number of failed keys
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5950 that have been solicited in sequence leading to this current call.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5951
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5952 Optional PASSPHRASE enables explicit delivery of the decryption passphrase,
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5953 for verification purposes.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5954
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5955 Optional REJECTED is for internal use - conveys the number of
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5956 rejections due to matches against
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5957 `allout-encryption-ciphertext-rejection-regexps', as limited by
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5958 `allout-encryption-ciphertext-rejection-ceiling'.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5959
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5960 Returns the resulting string, or nil if the transformation fails."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5961
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5962 (require 'pgg)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5963
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5964 (if (not (fboundp 'pgg-encrypt-symmetric))
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5965 (error "Allout encryption depends on a newer version of pgg"))
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5966
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5967 (let* ((scheme (upcase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5968 (format "%s" (or pgg-scheme pgg-default-scheme "GPG"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5969 (for-key (and (equal key-type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5970 (or for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5971 (split-string (read-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5972 (format "%s message recipients: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5973 scheme))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5974 "[ \t,]+"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5975 (target-prompt-id (if (equal key-type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5976 (if (= (length for-key) 1)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5977 (car for-key) for-key)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5978 (buffer-name allout-buffer)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5979 (target-cache-id (format "%s-%s"
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5980 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5981 (if (equal key-type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5982 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5983 (or (buffer-file-name allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5984 target-prompt-id))))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5985 (encoding (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5986 buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5987 (multibyte (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5988 enable-multibyte-characters))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5989 (strip-plaintext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5990 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5991 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5992 'allout-encryption-plaintext-sanitization-regexps)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5993 (reject-ciphertext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5994 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5995 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5996 'allout-encryption-ciphertext-rejection-regexps)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5997 (rejected (or rejected 0))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5998 (rejections-left (- allout-encryption-ciphertext-rejection-ceiling
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5999 rejected))
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
6000 result-text status
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6001 ;; Inhibit gpg-agent use for symmetric keys in the scope of this let:
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6002 (pgg-gpg-use-agent (if (equal key-type 'keypair)
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6003 pgg-gpg-use-agent
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6004 nil)))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6005
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6006 (if (and fetch-pass (not passphrase))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6007 ;; Force later fetch by evicting passphrase from the cache.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6008 (pgg-remove-passphrase-from-cache target-cache-id t))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6009
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6010 (catch 'encryption-failed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6011
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6012 ;; We handle only symmetric-key passphrase caching.
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6013 (if (and (not passphrase)
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6014 (not (equal key-type 'keypair)))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6015 (setq passphrase (allout-obtain-passphrase for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6016 target-cache-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6017 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6018 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6019 allout-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6020 retried fetch-pass)))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6021
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6022 (with-temp-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6023
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6024 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6025
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6026 ;; convey the text characteristics of the original buffer:
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6027 (set-buffer-multibyte multibyte)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6028 (when encoding
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6029 (set-buffer-file-coding-system encoding)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6030 (if (not decrypt)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6031 (encode-coding-region (point-min) (point-max) encoding)))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6032
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6033 (when (and strip-plaintext-regexps (not decrypt))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6034 (dolist (re strip-plaintext-regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6035 (let ((re (if (listp re) (car re) re))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6036 (replacement (if (listp re) (cadr re) "")))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6037 (goto-char (point-min))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6038 (while (re-search-forward re nil t)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6039 (replace-match replacement nil nil)))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6040
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6041 (cond
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6042
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6043 ;; symmetric:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6044 ((equal key-type 'symmetric)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6045 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6046 (if decrypt
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6047
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6048 (pgg-decrypt (point-min) (point-max) passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6049
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6050 (pgg-encrypt-symmetric (point-min) (point-max)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6051 passphrase)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6052
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6053 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6054 (pgg-situate-output (point-min) (point-max))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6055 ;; failed - handle passphrase caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6056 (if verifying
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6057 (throw 'encryption-failed nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6058 (pgg-remove-passphrase-from-cache target-cache-id t)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6059 (error "Symmetric-cipher %scryption failed - %s"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6060 (if decrypt "de" "en")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6061 "try again with different passphrase."))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6062
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6063 ;; encrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6064 ((not decrypt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6065
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6066 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6067
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6068 (pgg-encrypt for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6069 nil (point-min) (point-max) passphrase))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6070
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6071 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6072 (pgg-situate-output (point-min) (point-max))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6073 (error (pgg-remove-passphrase-from-cache target-cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6074 (error "encryption failed"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6075
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6076 ;; decrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6077 (t
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6078
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6079 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6080 (pgg-decrypt (point-min) (point-max) passphrase))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6081
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6082 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6083 (pgg-situate-output (point-min) (point-max))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6084 (error (pgg-remove-passphrase-from-cache target-cache-id t)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6085 (error "decryption failed")))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6086
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6087 (setq result-text
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6088 (buffer-substring-no-properties
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6089 1 (- (point-max) (if decrypt 0 1))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6090 )
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6091
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6092 ;; validate result - non-empty
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6093 (cond ((not result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6094 (if verifying
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6095 nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6096 ;; transform was fruitless, retry w/new passphrase.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6097 (pgg-remove-passphrase-from-cache target-cache-id t)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6098 (allout-encrypt-string text decrypt allout-buffer
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6099 key-type for-key nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6100 (if retried (1+ retried) 1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6101 rejected verifying nil)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6102
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6103 ;; Retry (within limit) if ciphertext contains rejections:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6104 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6105 ;; Check for disqualification of this ciphertext:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6106 (let ((regexps reject-ciphertext-regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6107 reject-it)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6108 (while (and regexps (not reject-it))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6109 (setq reject-it (string-match (car regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6110 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6111 (pop regexps))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6112 reject-it))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6113 (setq rejections-left (1- rejections-left))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6114 (if (<= rejections-left 0)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6115 (error (concat "Ciphertext rejected too many times"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6116 " (%s), per `%s'")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6117 allout-encryption-ciphertext-rejection-ceiling
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6118 'allout-encryption-ciphertext-rejection-regexps)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6119 (allout-encrypt-string text decrypt allout-buffer
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6120 key-type for-key nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6121 retried (1+ rejected)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6122 verifying passphrase)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6123 ;; Barf if encryption yields extraordinary control chars:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6124 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6125 (string-match "[\C-a\C-k\C-o-\C-z\C-@]"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6126 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6127 (error (concat "Encryption produced non-armored text, which"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6128 "conflicts with allout mode - reconfigure!")))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6129
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6130 ;; valid result and just verifying or non-symmetric:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6131 ((or verifying (not (equal key-type 'symmetric)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6132 (if (or verifying decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6133 (pgg-add-passphrase-to-cache target-cache-id
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6134 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6135 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6136
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6137 ;; valid result and regular symmetric - "register"
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6138 ;; passphrase with mnemonic aids/cache.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6139 (t
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6140 (set-buffer allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6141 (if passphrase
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6142 (pgg-add-passphrase-to-cache target-cache-id
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6143 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6144 (allout-update-passphrase-mnemonic-aids for-key passphrase
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6145 allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6146 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6147 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6148 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6149 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6150 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6151 ;;;_ > allout-obtain-passphrase (for-key cache-id prompt-id key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6152 ;;; allout-buffer retried fetch-pass)
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6153 (defun allout-obtain-passphrase (for-key cache-id prompt-id key-type
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6154 allout-buffer retried fetch-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6155 "Obtain passphrase for a key from the cache or else from the user.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6156
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6157 When obtaining from the user, symmetric-cipher passphrases are verified
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6158 against either, if available and enabled, a random string that was
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6159 encrypted against the passphrase, or else against repeated entry by the
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6160 user for corroboration.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6161
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6162 FOR-KEY is the key for which the passphrase is being obtained.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6163
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6164 CACHE-ID is the cache id of the key for the passphrase.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6165
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6166 PROMPT-ID is the id for use when prompting the user.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6167
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6168 KEY-TYPE is either 'symmetric or 'keypair.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6169
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6170 ALLOUT-BUFFER is the buffer containing the entry being en/decrypted.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6171
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6172 RETRIED is the number of this attempt to obtain this passphrase.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6173
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6174 FETCH-PASS causes the passphrase to be solicited from the user, regardless
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6175 of the availability of a cached copy."
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6176
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6177 (if (not (equal key-type 'symmetric))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6178 ;; do regular passphrase read on non-symmetric passphrase:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6179 (pgg-read-passphrase (format "%s passphrase%s: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6180 (upcase (format "%s" (or pgg-scheme
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6181 pgg-default-scheme
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6182 "GPG")))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6183 (if prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6184 (format " for %s" prompt-id)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6185 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6186 cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6187
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6188 ;; Symmetric hereon:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6189
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6190 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6191 (set-buffer allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6192 (let* ((hint (if (and (not (string= allout-passphrase-hint-string ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6193 (or (equal allout-passphrase-hint-handling 'always)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6194 (and (equal allout-passphrase-hint-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6195 'needed)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6196 retried)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6197 (format " [%s]" allout-passphrase-hint-string)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6198 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6199 (retry-message (if retried (format " (%s retry)" retried) ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6200 (prompt-sans-hint (format "'%s' symmetric passphrase%s: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6201 prompt-id retry-message))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6202 (full-prompt (format "'%s' symmetric passphrase%s%s: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6203 prompt-id hint retry-message))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6204 (prompt full-prompt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6205 (verifier-string (allout-get-encryption-passphrase-verifier))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6206
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6207 (cached (and (not fetch-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6208 (pgg-read-passphrase-from-cache cache-id t)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6209 (got-pass (or cached
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6210 (pgg-read-passphrase full-prompt cache-id t)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6211 confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6212
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6213 (if (not got-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6214 nil
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6215
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6216 ;; Duplicate our handle on the passphrase so it's not clobbered by
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6217 ;; deactivate-passwd memory clearing:
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6218 (setq got-pass (copy-sequence got-pass))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6219
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6220 (cond (verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6221 (save-window-excursion
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6222 (if (allout-encrypt-string verifier-string 'decrypt
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6223 allout-buffer 'symmetric
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6224 for-key nil 0 0 'verifying
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6225 (copy-sequence got-pass))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6226 (setq confirmation (format "%s" got-pass))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6227
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6228 (if (and (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6229 (if (yes-or-no-p
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6230 (concat "Passphrase differs from established"
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6231 " - use new one instead? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6232 ;; deactivate password for subsequent
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6233 ;; confirmation:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6234 (progn
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6235 (pgg-remove-passphrase-from-cache cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6236 (setq prompt prompt-sans-hint)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6237 nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6238 t))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6239 (progn (pgg-remove-passphrase-from-cache cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6240 (error "Wrong passphrase."))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6241 ;; No verifier string - force confirmation by repetition of
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6242 ;; (new) passphrase:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6243 ((or fetch-pass (not cached))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6244 (pgg-remove-passphrase-from-cache cache-id t))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6245 ;; confirmation vs new input - doing pgg-read-passphrase will do the
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6246 ;; right thing, in either case:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6247 (if (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6248 (setq confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6249 (pgg-read-passphrase (concat prompt
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6250 " ... confirm spelling: ")
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6251 cache-id t)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6252 (prog1
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6253 (if (equal got-pass confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6254 confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6255 (if (yes-or-no-p (concat "spelling of original and"
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6256 " confirmation differ - retry? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6257 (progn (setq retried (if retried (1+ retried) 1))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6258 (pgg-remove-passphrase-from-cache cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6259 ;; recurse to this routine:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6260 (pgg-read-passphrase prompt-sans-hint cache-id t))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6261 (pgg-remove-passphrase-from-cache cache-id t)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6262 (error "Confirmation failed."))))))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6263 ;;;_ > allout-encrypted-topic-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6264 (defun allout-encrypted-topic-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6265 "True if the current topic is encryptable and encrypted."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6266 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6267 (allout-end-of-prefix t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6268 (and (string= (buffer-substring-no-properties (1- (point)) (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6269 allout-topic-encryption-bullet)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6270 (looking-at "\\*"))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6271 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6272 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6273 ;;;_ > allout-encrypted-key-info (text)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6274 ;; XXX gpg-specific, alas
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6275 (defun allout-encrypted-key-info (text)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6276 "Return a pair of the key type and identity of a recipient's secret key.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6277
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6278 The key type is one of 'symmetric or 'keypair.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6279
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6280 if 'keypair, and some of the user's secret keys are among those for which
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6281 the message was encoded, return the identity of the first. otherwise,
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6282 return nil for the second item of the pair.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6283
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6284 An error is raised if the text is not encrypted."
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6285 (require 'pgg-parse)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6286 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6287 (with-temp-buffer
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6288 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6289 (let* ((parsed-armor (pgg-parse-armor-region (point-min) (point-max)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6290 (type (if (pgg-gpg-symmetric-key-p parsed-armor)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6291 'symmetric
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6292 'keypair))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6293 secret-keys first-secret-key for-key-owner)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6294 (if (equal type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6295 (setq secret-keys (pgg-gpg-lookup-all-secret-keys)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6296 first-secret-key (pgg-gpg-select-matching-key parsed-armor
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6297 secret-keys)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6298 for-key-owner (and first-secret-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6299 (pgg-gpg-lookup-key-owner
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6300 first-secret-key))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6301 (list type (pgg-gpg-key-id-from-key-owner for-key-owner))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6302 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6303 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6304 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6305 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6306 ;;;_ > allout-create-encryption-passphrase-verifier (passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6307 (defun allout-create-encryption-passphrase-verifier (passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6308 "Encrypt random message for later validation of symmetric key's passphrase."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6309 ;; use 20 random ascii characters, across the entire ascii range.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6310 (random t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6311 (let ((spew (make-string 20 ?\0)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6312 (dotimes (i (length spew))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6313 (aset spew i (1+ (random 254))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6314 (allout-encrypt-string spew nil (current-buffer) 'symmetric
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6315 nil nil 0 0 passphrase))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6316 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6317 ;;;_ > allout-update-passphrase-mnemonic-aids (for-key passphrase
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6318 ;;; outline-buffer)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6319 (defun allout-update-passphrase-mnemonic-aids (for-key passphrase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6320 outline-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6321 "Update passphrase verifier and hint strings if necessary.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6322
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6323 See `allout-passphrase-verifier-string' and `allout-passphrase-hint-string'
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6324 settings.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6325
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6326 PASSPHRASE is the passphrase being mnemonicized
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6327
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6328 OUTLINE-BUFFER is the buffer of the outline being adjusted.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6329
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6330 These are used to help the user keep track of the passphrase they use for
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6331 symmetric encryption in the file.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6332
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6333 Behavior is governed by `allout-passphrase-verifier-handling',
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6334 `allout-passphrase-hint-handling', and also, controlling whether the values
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6335 are preserved on Emacs local file variables,
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6336 `allout-enable-file-variable-adjustment'."
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6337
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6338 ;; If passphrase doesn't agree with current verifier:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6339 ;; - adjust the verifier
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6340 ;; - if passphrase hint handling is enabled, adjust the passphrase hint
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6341 ;; - if file var settings are enabled, adjust the file vars
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6342
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6343 (let* ((new-verifier-needed (not (allout-verify-passphrase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6344 for-key passphrase outline-buffer)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6345 (new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6346 (if new-verifier-needed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6347 ;; Collapse to a single line and enclose in string quotes:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6348 (subst-char-in-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6349 ?\n ?\C-a (allout-create-encryption-passphrase-verifier
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6350 passphrase))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6351 new-hint)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6352 (when new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6353 ;; do the passphrase hint first, since it's interactive
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6354 (when (and allout-passphrase-hint-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6355 (not (equal allout-passphrase-hint-handling 'disabled)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6356 (setq new-hint
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6357 (read-from-minibuffer "Passphrase hint to jog your memory: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6358 allout-passphrase-hint-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6359 (when (not (string= new-hint allout-passphrase-hint-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6360 (setq allout-passphrase-hint-string new-hint)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6361 (allout-adjust-file-variable "allout-passphrase-hint-string"
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6362 allout-passphrase-hint-string)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6363 (when allout-passphrase-verifier-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6364 (setq allout-passphrase-verifier-string new-verifier-string)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6365 (allout-adjust-file-variable "allout-passphrase-verifier-string"
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6366 allout-passphrase-verifier-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6367 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6368 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6369 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6370 ;;;_ > allout-get-encryption-passphrase-verifier ()
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6371 (defun allout-get-encryption-passphrase-verifier ()
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6372 "Return text of the encrypt passphrase verifier, unmassaged, or nil if none.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6373
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6374 Derived from value of `allout-passphrase-verifier-string'."
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6375
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6376 (let ((verifier-string (and (boundp 'allout-passphrase-verifier-string)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6377 allout-passphrase-verifier-string)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6378 (if verifier-string
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6379 ;; Return it uncollapsed
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6380 (subst-char-in-string ?\C-a ?\n verifier-string))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6381 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6382 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6383 ;;;_ > allout-verify-passphrase (key passphrase allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6384 (defun allout-verify-passphrase (key passphrase allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6385 "True if passphrase successfully decrypts verifier, nil otherwise.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6386
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6387 \"Otherwise\" includes absence of passphrase verifier."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6388 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6389 (set-buffer allout-buffer)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6390 (and (boundp 'allout-passphrase-verifier-string)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6391 allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6392 (allout-encrypt-string (allout-get-encryption-passphrase-verifier)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6393 'decrypt allout-buffer 'symmetric
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6394 key nil 0 0 'verifying passphrase)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6395 t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6396 ;;;_ > allout-next-topic-pending-encryption (&optional except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6397 (defun allout-next-topic-pending-encryption (&optional except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6398 "Return the point of the next topic pending encryption, or nil if none.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6399
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6400 EXCEPT-MARK identifies a point whose containing topics should be excluded
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6401 from encryption. This supports 'except-current mode of
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6402 `allout-encrypt-unencrypted-on-saves'.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6403
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6404 Such a topic has the allout-topic-encryption-bullet without an
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6405 immediately following '*' that would mark the topic as being encrypted. It
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6406 must also have content."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6407 (let (done got content-beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6408 (while (not done)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6409
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6410 (if (not (re-search-forward
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6411 (format "\\(\\`\\|\n\\)%s *%s[^*]"
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6412 (regexp-quote allout-header-prefix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6413 (regexp-quote allout-topic-encryption-bullet))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6414 nil t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6415 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6416 done t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6417 (goto-char (setq got (match-beginning 0)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6418 (if (looking-at "\n")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6419 (forward-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6420 (setq got (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6421
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6422 (cond ((not got)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6423 (setq done t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6424
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6425 ((not (search-forward "\n"))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6426 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6427 done t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6428
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6429 ((eobp)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6430 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6431 done t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6432
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6433 (t
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6434 (setq content-beg (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6435 (backward-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6436 (allout-end-of-subtree)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6437 (if (or (<= (point) content-beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6438 (and except-mark
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6439 (<= content-beg except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6440 (>= (point) except-mark)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6441 ;; Continue looking
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6442 (setq got nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6443 ;; Got it!
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6444 (setq done t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6445 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6446 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6447 (if got
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6448 (goto-char got))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6449 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6450 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6451 ;;;_ > allout-encrypt-decrypted (&optional except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6452 (defun allout-encrypt-decrypted (&optional except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6453 "Encrypt topics pending encryption except those containing exemption point.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6454
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6455 EXCEPT-MARK identifies a point whose containing topics should be excluded
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6456 from encryption. This supports 'except-current mode of
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6457 `allout-encrypt-unencrypted-on-saves'.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6458
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6459 If a topic that is currently being edited was encrypted, we return a list
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6460 containing the location of the topic and the location of the cursor just
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6461 before the topic was encrypted. This can be used, eg, to decrypt the topic
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6462 and exactly resituate the cursor if this is being done as part of a file
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6463 save. See `allout-encrypt-unencrypted-on-saves' for more info."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6464
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6465 (interactive "p")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6466 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6467 (let* ((current-mark (point-marker))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6468 (current-mark-position (marker-position current-mark))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6469 was-modified
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6470 bo-subtree
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6471 editing-topic editing-point)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6472 (goto-char (point-min))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6473 (while (allout-next-topic-pending-encryption except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6474 (setq was-modified (buffer-modified-p))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6475 (when (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6476 (and (boundp 'allout-encrypt-unencrypted-on-saves)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6477 allout-encrypt-unencrypted-on-saves
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6478 (setq bo-subtree (re-search-forward "$"))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6479 (not (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6480 (>= current-mark (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6481 (allout-end-of-current-subtree)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6482 (<= current-mark (point))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6483 (setq editing-topic (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6484 ;; we had to wait for this 'til now so prior topics are
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6485 ;; encrypted, any relevant text shifts are in place:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6486 editing-point (- current-mark-position
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6487 (count-trailing-whitespace-region
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6488 bo-subtree current-mark-position))))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
6489 (allout-toggle-subtree-encryption)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6490 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6491 (set-buffer-modified-p nil))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6492 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6493 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6494 (set-buffer-modified-p nil))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6495 (if editing-topic (list editing-topic editing-point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6496 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6497 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6498 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6499
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6500 ;;;_ #9 miscellaneous
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6501 ;;;_ : Mode:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6502 ;;;_ > outlineify-sticky ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6503 ;; outlinify-sticky is correct spelling; provide this alias for sticklers:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6504 ;;;###autoload
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6505 (defalias 'outlinify-sticky 'outlineify-sticky)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6506 ;;;###autoload
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6507 (defun outlineify-sticky (&optional arg)
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
6508 "Activate outline mode and establish file var so it is started subsequently.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6509
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6510 See doc-string for `allout-layout' and `allout-init' for details on
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6511 setup for auto-startup."
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6512
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6513 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6514
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6515 (allout-mode t)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6516
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6517 (save-excursion
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6518 (goto-char (point-min))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
6519 (if (allout-goto-prefix)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6520 t
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6521 (allout-open-topic 2)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
6522 (insert (concat "Dummy outline topic header - see"
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6523 "`allout-mode' docstring: `^Hm'."))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6524 (allout-adjust-file-variable
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6525 "allout-layout" (or allout-layout '(-1 : 0))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6526 ;;;_ > allout-file-vars-section-data ()
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6527 (defun allout-file-vars-section-data ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6528 "Return data identifying the file-vars section, or nil if none.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6529
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6530 Returns list `(beginning-point prefix-string suffix-string)'."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6531 ;; minimally gleaned from emacs 21.4 files.el hack-local-variables function.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6532 (let (beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6533 (save-excursion
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6534 (goto-char (point-max))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6535 (search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6536 (if (let ((case-fold-search t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6537 (not (search-forward "Local Variables:" nil t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6538 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6539 (setq beg (- (point) 16))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6540 (setq suffix (buffer-substring-no-properties
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6541 (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6542 (progn (if (search-forward "\n" nil t)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6543 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6544 (point))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6545 (setq prefix (buffer-substring-no-properties
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6546 (progn (if (search-backward "\n" nil t)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6547 (forward-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6548 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6549 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6550 (list beg prefix suffix))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6551 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6552 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6553 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6554 ;;;_ > allout-adjust-file-variable (varname value)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6555 (defun allout-adjust-file-variable (varname value)
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
6556 "Adjust the setting of an Emacs file variable named VARNAME to VALUE.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6557
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6558 This activity is inhibited if either `enable-local-variables'
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6559 `allout-enable-file-variable-adjustment' are nil.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6560
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6561 When enabled, an entry for the variable is created if not already present,
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6562 or changed if established with a different value. The section for the file
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6563 variables, itself, is created if not already present. When created, the
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
6564 section lines (including the section line) exist as second-level topics in
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6565 a top-level topic at the end of the file.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6566
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
6567 `enable-local-variables' must be true for any of this to happen."
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6568 (if (not (and enable-local-variables
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6569 allout-enable-file-variable-adjustment))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6570 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6571 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6572 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6573 (section-data (allout-file-vars-section-data))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6574 beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6575 (if section-data
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6576 (setq beg (car section-data)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6577 prefix (cadr section-data)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6578 suffix (car (cddr section-data)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6579 ;; create the section
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6580 (goto-char (point-max))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6581 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6582 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6583 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6584 (insert "Local emacs vars.\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6585 (allout-open-topic 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6586 (setq beg (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6587 suffix ""
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6588 prefix (buffer-substring-no-properties (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6589 (beginning-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6590 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6591 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6592 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6593 (insert "Local variables:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6594 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6595 (insert "End:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6596 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6597 ;; look for existing entry or create one, leaving point for insertion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6598 ;; of new value:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6599 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6600 (allout-show-to-offshoot)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6601 (if (search-forward (concat "\n" prefix varname ":") nil t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6602 (let* ((value-beg (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6603 (line-end (progn (if (search-forward "\n" nil t)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6604 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6605 (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6606 (value-end (- line-end (length suffix))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6607 (if (> value-end value-beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6608 (delete-region value-beg value-end)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6609 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6610 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6611 (forward-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6612 (insert (concat prefix varname ":")))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6613 (insert (format " %S%s" value suffix))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6614 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6615 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6616 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6617 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6618 ;;;_ > allout-get-configvar-values (varname)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6619 (defun allout-get-configvar-values (configvar-name)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6620 "Return a list of values of the symbols in list bound to CONFIGVAR-NAME.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6621
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6622 The user is prompted for removal of symbols that are unbound, and they
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6623 otherwise are ignored.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6624
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6625 CONFIGVAR-NAME should be the name of the configuration variable,
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6626 not its value."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6627
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6628 (let ((configvar-value (symbol-value configvar-name))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6629 got)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6630 (dolist (sym configvar-value)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6631 (if (not (boundp sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6632 (if (yes-or-no-p (format "%s entry `%s' is unbound - remove it? "
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6633 configvar-name sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6634 (delq sym (symbol-value configvar-name)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6635 (push (symbol-value sym) got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6636 (reverse got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6637 ;;;_ : Topics:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6638 ;;;_ > allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6639 (defun allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6640 "Put the region around topic currently containing point."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6641 (interactive)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6642 (let ((inhibit-field-text-motion t))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6643 (beginning-of-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6644 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6645 (push-mark (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6646 (allout-end-of-current-subtree)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6647 (exchange-point-and-mark))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6648 ;;;_ : UI:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6649 ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6650 (defun solicit-char-in-string (prompt string &optional do-defaulting)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6651 "Solicit (with first arg PROMPT) choice of a character from string STRING.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6652
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6653 Optional arg DO-DEFAULTING indicates to accept empty input (CR)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6654
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6655 (let ((new-prompt prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6656 got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6657
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6658 (while (not got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6659 (message "%s" new-prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6660
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6661 ;; We do our own reading here, so we can circumvent, eg, special
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6662 ;; treatment for `?' character. (Oughta use minibuffer keymap instead.)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6663 (setq got
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6664 (char-to-string (let ((cursor-in-echo-area nil)) (read-char))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6665
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6666 (setq got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6667 (cond ((string-match (regexp-quote got) string) got)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6668 ((and do-defaulting (string= got "\r"))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6669 ;; Return empty string to default:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6670 "")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6671 ((string= got "\C-g") (signal 'quit nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6672 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6673 (setq new-prompt (concat prompt
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6674 got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6675 " ...pick from: "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6676 string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6677 ""))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6678 nil))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6679 ;; got something out of loop - return it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6680 got)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6681 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6682 ;;;_ : Strings:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6683 ;;;_ > regexp-sans-escapes (string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6684 (defun regexp-sans-escapes (regexp &optional successive-backslashes)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6685 "Return a copy of REGEXP with all character escapes stripped out.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6686
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6687 Representations of actual backslashes - '\\\\\\\\' - are left as a
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6688 single backslash.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6689
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6690 Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6691
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6692 (if (string= regexp "")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6693 ""
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6694 ;; Set successive-backslashes to number if current char is
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6695 ;; backslash, or else to nil:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6696 (setq successive-backslashes
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6697 (if (= (aref regexp 0) ?\\)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6698 (if successive-backslashes (1+ successive-backslashes) 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6699 nil))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6700 (if (or (not successive-backslashes) (= 2 successive-backslashes))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6701 ;; Include first char:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6702 (concat (substring regexp 0 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6703 (regexp-sans-escapes (substring regexp 1)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6704 ;; Exclude first char, but maintain count:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6705 (regexp-sans-escapes (substring regexp 1) successive-backslashes))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6706 ;;;_ > count-trailing-whitespace-region (beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6707 (defun count-trailing-whitespace-region (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6708 "Return number of trailing whitespace chars between BEG and END.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6709
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6710 If BEG is bigger than END we return 0."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6711 (if (> beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6712 0
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6713 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6714 (goto-char beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6715 (let ((count 0))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6716 (while (re-search-forward "[ ][ ]*$" end t)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6717 (goto-char (1+ (match-beginning 2)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6718 (setq count (1+ count)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6719 count))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6720 ;;;_ > allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6721 (defun allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6722 "Return a copy of string with all \"%\" characters doubled."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6723 (apply 'concat
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6724 (mapcar (lambda (char) (if (= char ?%) "%%" (char-to-string char)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6725 string)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6726 ;;;_ : lists
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6727 ;;;_ > allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6728 (defun allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6729 "Return a list of all atoms in list."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6730 ;; classic.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6731 (cond ((null list) nil)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
6732 ((atom (car list)) (cons (car list) (allout-flatten (cdr list))))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
6733 (t (append (allout-flatten (car list)) (allout-flatten (cdr list))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6734 ;;;_ : Compatability:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6735 ;;;_ > allout-mark-marker to accommodate divergent emacsen:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6736 (defun allout-mark-marker (&optional force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6737 "Accommodate the different signature for `mark-marker' across Emacsen.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6738
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6739 XEmacs takes two optional args, while mainline GNU Emacs does not,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6740 so pass them along when appropriate."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6741 (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6742 (apply 'mark-marker force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6743 (mark-marker)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6744 ;;;_ > subst-char-in-string if necessary
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6745 (if (not (fboundp 'subst-char-in-string))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6746 (defun subst-char-in-string (fromchar tochar string &optional inplace)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6747 "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6748 Unless optional argument INPLACE is non-nil, return a new string."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6749 (let ((i (length string))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6750 (newstr (if inplace string (copy-sequence string))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6751 (while (> i 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6752 (setq i (1- i))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6753 (if (eq (aref newstr i) fromchar)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6754 (aset newstr i tochar)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6755 newstr)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6756 ;;;_ > wholenump if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6757 (if (not (fboundp 'wholenump))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6758 (defalias 'wholenump 'natnump))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6759 ;;;_ > remove-overlays if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6760 (if (not (fboundp 'remove-overlays))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6761 (defun remove-overlays (&optional beg end name val)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6762 "Clear BEG and END of overlays whose property NAME has value VAL.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6763 Overlays might be moved and/or split.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6764 BEG and END default respectively to the beginning and end of buffer."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6765 (unless beg (setq beg (point-min)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6766 (unless end (setq end (point-max)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6767 (if (< end beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6768 (setq beg (prog1 end (setq end beg))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6769 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6770 (dolist (o (overlays-in beg end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6771 (when (eq (overlay-get o name) val)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6772 ;; Either push this overlay outside beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6773 ;; or split it to exclude beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6774 ;; or delete it entirely (if it is contained in beg...end).
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6775 (if (< (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6776 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6777 (progn
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6778 (move-overlay (copy-overlay o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6779 (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6780 (move-overlay o end (overlay-end o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6781 (move-overlay o (overlay-start o) beg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6782 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6783 (move-overlay o end (overlay-end o))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6784 (delete-overlay o)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6785 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6786 ;;;_ > copy-overlay if necessary - xemacs ~ 21.4
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6787 (if (not (fboundp 'copy-overlay))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6788 (defun copy-overlay (o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6789 "Return a copy of overlay O."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6790 (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6791 ;; FIXME: there's no easy way to find the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6792 ;; insertion-type of the two markers.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6793 (overlay-buffer o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6794 (props (overlay-properties o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6795 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6796 (overlay-put o1 (pop props) (pop props)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6797 o1)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6798 ;;;_ > add-to-invisibility-spec if necessary - xemacs ~ 21.4
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6799 (if (not (fboundp 'add-to-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6800 (defun add-to-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6801 "Add ELEMENT to `buffer-invisibility-spec'.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6802 See documentation for `buffer-invisibility-spec' for the kind of elements
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6803 that can be added."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6804 (if (eq buffer-invisibility-spec t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6805 (setq buffer-invisibility-spec (list t)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6806 (setq buffer-invisibility-spec
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6807 (cons element buffer-invisibility-spec))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6808 ;;;_ > remove-from-invisibility-spec if necessary - xemacs ~ 21.4
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6809 (if (not (fboundp 'remove-from-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6810 (defun remove-from-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6811 "Remove ELEMENT from `buffer-invisibility-spec'."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6812 (if (consp buffer-invisibility-spec)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6813 (setq buffer-invisibility-spec (delete element
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6814 buffer-invisibility-spec)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6815 ;;;_ > move-beginning-of-line if necessary - older emacs, xemacs
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6816 (if (not (fboundp 'move-beginning-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6817 (defun move-beginning-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6818 "Move point to beginning of current line as displayed.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6819 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6820 which are part of the text that an image rests on.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6821
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6822 With argument ARG not nil or 1, move forward ARG - 1 lines first.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6823 If point reaches the beginning or end of buffer, it stops there.
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6824 To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6825 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6826 (or arg (setq arg 1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6827 (if (/= arg 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6828 (condition-case nil (line-move (1- arg)) (error nil)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6829
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6830 ;; Move to beginning-of-line, ignoring fields and invisibles.
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6831 (skip-chars-backward "^\n")
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6832 (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6833 (goto-char (if (featurep 'xemacs)
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6834 (previous-property-change (point))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6835 (previous-char-property-change (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6836 (skip-chars-backward "^\n"))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6837 (vertical-motion 0))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6838 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6839 ;;;_ > move-end-of-line if necessary - older emacs, xemacs
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6840 (if (not (fboundp 'move-end-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6841 (defun move-end-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6842 "Move point to end of current line as displayed.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6843 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6844 which are part of the text that an image rests on.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6845
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6846 With argument ARG not nil or 1, move forward ARG - 1 lines first.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6847 If point reaches the beginning or end of buffer, it stops there.
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6848 To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6849 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6850 (or arg (setq arg 1))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6851 (let (done)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6852 (while (not done)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6853 (let ((newpos
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6854 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6855 (let ((goal-column 0))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6856 (and (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6857 (or (line-move arg) t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6858 (error nil))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6859 (not (bobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6860 (progn
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6861 (while (and (not (bobp))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6862 (line-move-invisible-p (1- (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6863 (goto-char
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6864 (previous-char-property-change (point))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6865 (backward-char 1)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6866 (point)))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6867 (goto-char newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6868 (if (and (> (point) newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6869 (eq (preceding-char) ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6870 (backward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6871 (if (and (> (point) newpos) (not (eobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6872 (not (eq (following-char) ?\n)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6873 ;; If we skipped something intangible
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6874 ;; and now we're not really at eol,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6875 ;; keep going.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6876 (setq arg 1)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6877 (setq done t)))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6878 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6879 ;;;_ > line-move-invisible-p if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6880 (if (not (fboundp 'line-move-invisible-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6881 (defun line-move-invisible-p (pos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6882 "Return non-nil if the character after POS is currently invisible."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6883 (let ((prop
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6884 (get-char-property pos 'invisible)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6885 (if (eq buffer-invisibility-spec t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6886 prop
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6887 (or (memq prop buffer-invisibility-spec)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6888 (assq prop buffer-invisibility-spec))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6889
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6890 ;;;_ #10 Unfinished
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6891 ;;;_ > allout-bullet-isearch (&optional bullet)
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6892 (defun allout-bullet-isearch (&optional bullet)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
6893 "Isearch (regexp) for topic with bullet BULLET."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6894 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6895 (if (not bullet)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6896 (setq bullet (solicit-char-in-string
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6897 "ISearch for topic with bullet: "
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6898 (regexp-sans-escapes allout-bullets-string))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
6899
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6900 (let ((isearch-regexp t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6901 (isearch-string (concat "^"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6902 allout-header-prefix
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6903 "[ \t]*"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6904 bullet)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6905 (isearch-repeat 'forward)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6906 (isearch-mode t)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6907
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6908 ;;;_ #11 Unit tests - this should be last item before "Provide"
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6909 ;;;_ > allout-run-unit-tests ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6910 (defun allout-run-unit-tests ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6911 "Run the various allout unit tests."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6912 (message "Running allout tests...")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6913 (allout-test-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6914 (message "Running allout tests... Done.")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6915 (sit-for .5))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6916 ;;;_ : test resumptions:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6917 ;;;_ > allout-tests-obliterate-variable (name)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6918 (defun allout-tests-obliterate-variable (name)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6919 "Completely unbind variable with NAME."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6920 (if (local-variable-p name) (kill-local-variable name))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6921 (while (boundp name) (makunbound name)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6922 ;;;_ > allout-test-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6923 (defvar allout-tests-globally-unbound nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6924 "Fodder for allout resumptions tests - defvar just for byte compiler.")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6925 (defvar allout-tests-globally-true nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6926 "Fodder for allout resumptions tests - defvar just just for byte compiler.")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6927 (defvar allout-tests-locally-true nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6928 "Fodder for allout resumptions tests - defvar just for byte compiler.")
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6929 (defun allout-test-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6930 "Exercise allout resumptions."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6931 ;; for each resumption case, we also test that the right local/global
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6932 ;; scopes are affected during resumption effects:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6933
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6934 ;; ensure that previously unbound variables return to the unbound state.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6935 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6936 (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6937 (allout-add-resumptions '(allout-tests-globally-unbound t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6938 (assert (not (default-boundp 'allout-tests-globally-unbound)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6939 (assert (local-variable-p 'allout-tests-globally-unbound))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6940 (assert (boundp 'allout-tests-globally-unbound))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6941 (assert (equal allout-tests-globally-unbound t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6942 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6943 (assert (not (local-variable-p 'allout-tests-globally-unbound)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6944 (assert (not (boundp 'allout-tests-globally-unbound))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6945
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6946 ;; ensure that variable with prior global value is resumed
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6947 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6948 (allout-tests-obliterate-variable 'allout-tests-globally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6949 (setq allout-tests-globally-true t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6950 (allout-add-resumptions '(allout-tests-globally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6951 (assert (equal (default-value 'allout-tests-globally-true) t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6952 (assert (local-variable-p 'allout-tests-globally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6953 (assert (equal allout-tests-globally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6954 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6955 (assert (not (local-variable-p 'allout-tests-globally-true)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6956 (assert (boundp 'allout-tests-globally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6957 (assert (equal allout-tests-globally-true t)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6958
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6959 ;; ensure that prior local value is resumed
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6960 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6961 (allout-tests-obliterate-variable 'allout-tests-locally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6962 (set (make-local-variable 'allout-tests-locally-true) t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6963 (assert (not (default-boundp 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6964 nil (concat "Test setup mistake - variable supposed to"
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6965 " not have global binding, but it does."))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6966 (assert (local-variable-p 'allout-tests-locally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6967 nil (concat "Test setup mistake - variable supposed to have"
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6968 " local binding, but it lacks one."))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6969 (allout-add-resumptions '(allout-tests-locally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6970 (assert (not (default-boundp 'allout-tests-locally-true)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6971 (assert (local-variable-p 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6972 (assert (equal allout-tests-locally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6973 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6974 (assert (boundp 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6975 (assert (local-variable-p 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6976 (assert (equal allout-tests-locally-true t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6977 (assert (not (default-boundp 'allout-tests-locally-true))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6978
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6979 ;; ensure that last of multiple resumptions holds, for various scopes.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6980 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6981 (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6982 (allout-tests-obliterate-variable 'allout-tests-globally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6983 (setq allout-tests-globally-true t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6984 (allout-tests-obliterate-variable 'allout-tests-locally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6985 (set (make-local-variable 'allout-tests-locally-true) t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6986 (allout-add-resumptions '(allout-tests-globally-unbound t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6987 '(allout-tests-globally-true nil)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6988 '(allout-tests-locally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6989 (allout-add-resumptions '(allout-tests-globally-unbound 2)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6990 '(allout-tests-globally-true 3)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6991 '(allout-tests-locally-true 4))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6992 ;; reestablish many of the basic conditions are maintained after re-add:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6993 (assert (not (default-boundp 'allout-tests-globally-unbound)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6994 (assert (local-variable-p 'allout-tests-globally-unbound))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6995 (assert (equal allout-tests-globally-unbound 2))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6996 (assert (default-boundp 'allout-tests-globally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6997 (assert (local-variable-p 'allout-tests-globally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6998 (assert (equal allout-tests-globally-true 3))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6999 (assert (not (default-boundp 'allout-tests-locally-true)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7000 (assert (local-variable-p 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7001 (assert (equal allout-tests-locally-true 4))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7002 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7003 (assert (not (local-variable-p 'allout-tests-globally-unbound)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7004 (assert (not (boundp 'allout-tests-globally-unbound)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7005 (assert (not (local-variable-p 'allout-tests-globally-true)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7006 (assert (boundp 'allout-tests-globally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7007 (assert (equal allout-tests-globally-true t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7008 (assert (boundp 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7009 (assert (local-variable-p 'allout-tests-locally-true))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7010 (assert (equal allout-tests-locally-true t))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7011 (assert (not (default-boundp 'allout-tests-locally-true))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7012
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7013 ;; ensure that deliberately unbinding registered variables doesn't foul things
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7014 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7015 (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7016 (allout-tests-obliterate-variable 'allout-tests-globally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7017 (setq allout-tests-globally-true t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7018 (allout-tests-obliterate-variable 'allout-tests-locally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7019 (set (make-local-variable 'allout-tests-locally-true) t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7020 (allout-add-resumptions '(allout-tests-globally-unbound t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7021 '(allout-tests-globally-true nil)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7022 '(allout-tests-locally-true nil))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7023 (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7024 (allout-tests-obliterate-variable 'allout-tests-globally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7025 (allout-tests-obliterate-variable 'allout-tests-locally-true)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7026 (allout-do-resumptions))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7027 )
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7028 ;;;_ % Run unit tests if `allout-run-unit-tests-after-load' is true:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7029 (when allout-run-unit-tests-on-load
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7030 (allout-run-unit-tests))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7031
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7032 ;;;_ #12 Provide
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
7033 (provide 'allout)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7034
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7035 ;;;_* Local emacs vars.
69124
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7036 ;; The following `allout-layout' local variable setting:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7037 ;; - closes all topics from the first topic to just before the third-to-last,
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7038 ;; - shows the children of the third to last (config vars)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7039 ;; - and the second to last (code section),
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7040 ;; - and closes the last topic (this local-variables section).
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7041 ;;Local variables:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7042 ;;allout-layout: (0 : -1 -1 0)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7043 ;;End:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7044
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7045 ;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
7046 ;;; allout.el ends here